Compare commits
27 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c8888cecde | |||
| c0de70431e | |||
| b0274e3265 | |||
| 8f36eca62a | |||
| 3c9799adda | |||
| 5f3e46c42d | |||
| 3d393c36a3 | |||
| d6de1c369a | |||
| 2e6c01670e | |||
| 17b610e1a1 | |||
| ca913c76ea | |||
| 20d4b12522 | |||
| ec43c0e0d1 | |||
| 93cc7b1a44 | |||
| 851e49e2d7 | |||
| 4101df566b | |||
| 9d04cad360 | |||
| e4e93ea6d3 | |||
| ae8a634450 | |||
| cd9e00f8d6 | |||
| f87e0f878c | |||
| e2e29a19fc | |||
| 6f76a6a9da | |||
| 366af55f19 | |||
| 4c1413d925 | |||
| 6db4a6d02e | |||
| 3c8b493aee |
@@ -12,16 +12,14 @@ on:
|
|||||||
description: Run name
|
description: Run name
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
id-token: write
|
contents: read
|
||||||
contents: write
|
|
||||||
pull-requests: write
|
|
||||||
issues: write
|
|
||||||
actions: read
|
|
||||||
checks: read
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
pullfrog:
|
pullfrog:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
id-token: write
|
||||||
|
contents: read
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v6
|
||||||
|
|||||||
@@ -72,16 +72,14 @@ on:
|
|||||||
description: 'Agent prompt'
|
description: 'Agent prompt'
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
id-token: write
|
contents: read
|
||||||
contents: write
|
|
||||||
pull-requests: write
|
|
||||||
issues: write
|
|
||||||
actions: read
|
|
||||||
checks: read
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
pullfrog:
|
pullfrog:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
id-token: write
|
||||||
|
contents: read
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v6
|
||||||
@@ -130,11 +128,7 @@ jobs:
|
|||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
id-token: write
|
id-token: write
|
||||||
contents: write
|
contents: read
|
||||||
issues: write
|
|
||||||
pull-requests: write
|
|
||||||
actions: read
|
|
||||||
checks: read
|
|
||||||
uses: ./.github/workflows/pullfrog.yml
|
uses: ./.github/workflows/pullfrog.yml
|
||||||
with:
|
with:
|
||||||
# pass the full event payload as the prompt
|
# pass the full event payload as the prompt
|
||||||
|
|||||||
@@ -36,8 +36,6 @@ outputs:
|
|||||||
runs:
|
runs:
|
||||||
using: "node24"
|
using: "node24"
|
||||||
main: "entry.ts"
|
main: "entry.ts"
|
||||||
post: "post.ts"
|
|
||||||
post-if: "failure() || cancelled()"
|
|
||||||
|
|
||||||
branding:
|
branding:
|
||||||
icon: "code"
|
icon: "code"
|
||||||
|
|||||||
+27
-1
@@ -210,6 +210,7 @@ async function runClaude(params: RunParams): Promise<ClaudeRunResult> {
|
|||||||
|
|
||||||
let finalOutput = "";
|
let finalOutput = "";
|
||||||
let sessionId: string | undefined;
|
let sessionId: string | undefined;
|
||||||
|
let resultErrorSubtype: string | null = null;
|
||||||
let accumulatedTokens = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
|
let accumulatedTokens = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
|
||||||
// Claude CLI reports a single end-of-run `total_cost_usd` on the result
|
// Claude CLI reports a single end-of-run `total_cost_usd` on the result
|
||||||
// event. per-message events don't carry cost, so there's nothing to sum —
|
// event. per-message events don't carry cost, so there's nothing to sum —
|
||||||
@@ -367,9 +368,14 @@ async function runClaude(params: RunParams): Promise<ClaudeRunResult> {
|
|||||||
tokensLogged = true;
|
tokensLogged = true;
|
||||||
}
|
}
|
||||||
} else if (subtype === "error_max_turns") {
|
} else if (subtype === "error_max_turns") {
|
||||||
|
resultErrorSubtype = subtype;
|
||||||
log.info(`» ${params.label} max turns reached: ${JSON.stringify(event)}`);
|
log.info(`» ${params.label} max turns reached: ${JSON.stringify(event)}`);
|
||||||
} else if (subtype === "error_during_execution") {
|
} else if (subtype === "error_during_execution") {
|
||||||
|
resultErrorSubtype = subtype;
|
||||||
log.info(`» ${params.label} execution error: ${JSON.stringify(event)}`);
|
log.info(`» ${params.label} execution error: ${JSON.stringify(event)}`);
|
||||||
|
} else if (subtype.startsWith("error")) {
|
||||||
|
resultErrorSubtype = subtype;
|
||||||
|
log.info(`» ${params.label} result: subtype=${subtype}, data=${JSON.stringify(event)}`);
|
||||||
} else {
|
} else {
|
||||||
log.info(`» ${params.label} result: subtype=${subtype}, data=${JSON.stringify(event)}`);
|
log.info(`» ${params.label} result: subtype=${subtype}, data=${JSON.stringify(event)}`);
|
||||||
}
|
}
|
||||||
@@ -401,6 +407,12 @@ async function runClaude(params: RunParams): Promise<ClaudeRunResult> {
|
|||||||
activityTimeout: 300_000,
|
activityTimeout: 300_000,
|
||||||
onActivityTimeout: params.onActivityTimeout,
|
onActivityTimeout: params.onActivityTimeout,
|
||||||
stdio: ["ignore", "pipe", "pipe"],
|
stdio: ["ignore", "pipe", "pipe"],
|
||||||
|
// run claude in its own process group so SIGKILL on activity timeout /
|
||||||
|
// outer cancellation reaches any subprocesses it spawns (rg, file
|
||||||
|
// watchers, mcp transports, etc). claude itself is a node bundle so
|
||||||
|
// there's no shim-orphan issue like opencode-ai/bin/opencode, but
|
||||||
|
// detached + killGroup is the right default for any agent runtime.
|
||||||
|
killGroup: true,
|
||||||
onStdout: async (chunk) => {
|
onStdout: async (chunk) => {
|
||||||
const text = chunk.toString();
|
const text = chunk.toString();
|
||||||
output += text;
|
output += text;
|
||||||
@@ -527,6 +539,16 @@ async function runClaude(params: RunParams): Promise<ClaudeRunResult> {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (resultErrorSubtype) {
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
output: finalOutput || output,
|
||||||
|
error: `result subtype: ${resultErrorSubtype}`,
|
||||||
|
usage,
|
||||||
|
sessionId,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
return { success: true, output: finalOutput || output, usage, sessionId };
|
return { success: true, output: finalOutput || output, usage, sessionId };
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
params.todoTracker?.cancel();
|
params.todoTracker?.cancel();
|
||||||
@@ -703,7 +725,11 @@ export const claude = agent({
|
|||||||
initialResult: result,
|
initialResult: result,
|
||||||
initialUsage: result.usage,
|
initialUsage: result.usage,
|
||||||
stopScript: ctx.stopScript,
|
stopScript: ctx.stopScript,
|
||||||
reflectionPrompt: buildLearningsReflectionPrompt("claude"),
|
summaryFilePath: ctx.summaryFilePath,
|
||||||
|
summarySeed: ctx.summarySeed,
|
||||||
|
reflectionPrompt: ctx.learningsFilePath
|
||||||
|
? buildLearningsReflectionPrompt(ctx.learningsFilePath)
|
||||||
|
: undefined,
|
||||||
canResume: (r) => Boolean(r.sessionId),
|
canResume: (r) => Boolean(r.sessionId),
|
||||||
resume: async (c) => {
|
resume: async (c) => {
|
||||||
const sessionId = c.previousResult.sessionId;
|
const sessionId = c.previousResult.sessionId;
|
||||||
|
|||||||
+252
-32
@@ -12,7 +12,7 @@
|
|||||||
* security is enforced at the tool layer, not the process layer.
|
* security is enforced at the tool layer, not the process layer.
|
||||||
*/
|
*/
|
||||||
import { execFileSync } from "node:child_process";
|
import { execFileSync } from "node:child_process";
|
||||||
import { mkdirSync } from "node:fs";
|
import { mkdirSync, writeFileSync } from "node:fs";
|
||||||
import { join } from "node:path";
|
import { join } from "node:path";
|
||||||
import { performance } from "node:perf_hooks";
|
import { performance } from "node:perf_hooks";
|
||||||
import { pullfrogMcpName } from "../external.ts";
|
import { pullfrogMcpName } from "../external.ts";
|
||||||
@@ -26,6 +26,11 @@ import { SPAWN_ACTIVITY_TIMEOUT_CODE, SpawnTimeoutError, spawn } from "../utils/
|
|||||||
import { ThinkingTimer } from "../utils/timer.ts";
|
import { ThinkingTimer } from "../utils/timer.ts";
|
||||||
import type { TodoTracker } from "../utils/todoTracking.ts";
|
import type { TodoTracker } from "../utils/todoTracking.ts";
|
||||||
import { getDevDependencyVersion } from "../utils/version.ts";
|
import { getDevDependencyVersion } from "../utils/version.ts";
|
||||||
|
import {
|
||||||
|
PULLFROG_BUS_EVENT_TYPE,
|
||||||
|
PULLFROG_OPENCODE_PLUGIN_FILENAME,
|
||||||
|
PULLFROG_OPENCODE_PLUGIN_SOURCE,
|
||||||
|
} from "./opencodePlugin.ts";
|
||||||
import { buildLearningsReflectionPrompt, runPostRunRetryLoop } from "./postRun.ts";
|
import { buildLearningsReflectionPrompt, runPostRunRetryLoop } from "./postRun.ts";
|
||||||
import { REVIEWER_AGENT_NAME, REVIEWER_SYSTEM_PROMPT } from "./reviewer.ts";
|
import { REVIEWER_AGENT_NAME, REVIEWER_SYSTEM_PROMPT } from "./reviewer.ts";
|
||||||
import { formatWithLabel, ORCHESTRATOR_LABEL, SessionLabeler } from "./sessionLabeler.ts";
|
import { formatWithLabel, ORCHESTRATOR_LABEL, SessionLabeler } from "./sessionLabeler.ts";
|
||||||
@@ -59,6 +64,22 @@ type OpenCodeConfig = {
|
|||||||
[key: string]: unknown;
|
[key: string]: unknown;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Per-inference `max_tokens` reservation the agent sends to the upstream
|
||||||
|
* model. OpenCode's default is 32_000 (sized for long-running TUI sessions
|
||||||
|
* where a human user might want big outputs). Pullfrog runs are headless and
|
||||||
|
* short — typical outputs are 1-3K tokens — so we cap at 5_000. This
|
||||||
|
* drastically reduces the upfront budget reservation OpenRouter requires per
|
||||||
|
* call (~$0.38 vs ~$2.40 for Opus), which is what lets low-wallet runs
|
||||||
|
* actually start.
|
||||||
|
*
|
||||||
|
* Plumbed via `OPENCODE_EXPERIMENTAL_OUTPUT_TOKEN_MAX` env var rather than the
|
||||||
|
* config JSON. OpenCode's `OUTPUT_TOKEN_MAX` (session/llm.ts) is sourced
|
||||||
|
* exclusively from this env var; top-level `limit.output` in the config
|
||||||
|
* has no read site and is silently dropped on merge.
|
||||||
|
*/
|
||||||
|
const PULLFROG_OPENCODE_OUTPUT_LIMIT = 5000;
|
||||||
|
|
||||||
function buildSecurityConfig(ctx: AgentRunContext, model: string | undefined): string {
|
function buildSecurityConfig(ctx: AgentRunContext, model: string | undefined): string {
|
||||||
const config: OpenCodeConfig = {
|
const config: OpenCodeConfig = {
|
||||||
permission: {
|
permission: {
|
||||||
@@ -254,7 +275,43 @@ interface OpenCodeErrorEvent {
|
|||||||
type: "error";
|
type: "error";
|
||||||
timestamp?: string;
|
timestamp?: string;
|
||||||
sessionID?: string;
|
sessionID?: string;
|
||||||
error?: { name?: string; message?: string; data?: unknown; [key: string]: unknown };
|
// opencode emits the error message under `error.data.message`, not at the
|
||||||
|
// top level. see anomalyco/opencode packages/opencode/src/cli/cmd/run.ts.
|
||||||
|
error?: {
|
||||||
|
name?: string;
|
||||||
|
data?: { message?: string; [key: string]: unknown };
|
||||||
|
[key: string]: unknown;
|
||||||
|
};
|
||||||
|
[key: string]: unknown;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Envelope event emitted by our `.opencode/plugin/pullfrog-events.ts` (the
|
||||||
|
* source lives in `opencodePlugin.ts`). The plugin subscribes to opencode's
|
||||||
|
* bus via `bus.subscribeAll()` and re-emits non-orchestrator
|
||||||
|
* `message.part.updated` events on stdout so subagent activity surfaces here.
|
||||||
|
*
|
||||||
|
* `bus_event.properties.part` matches the same `Part` shape that opencode's
|
||||||
|
* `cli/cmd/run.ts` uses to drive its own emit() calls, so we can route the
|
||||||
|
* inner part through the existing `tool_use` / `step_start` / `step_finish`
|
||||||
|
* / `text` handlers by synthesizing the equivalent OpenCode-style event.
|
||||||
|
*/
|
||||||
|
interface OpenCodeBusEnvelopeEvent {
|
||||||
|
type: "pullfrog_bus_event";
|
||||||
|
bus_event?: {
|
||||||
|
type?: string;
|
||||||
|
properties?: {
|
||||||
|
part?: {
|
||||||
|
sessionID?: string;
|
||||||
|
type?: string;
|
||||||
|
time?: { end?: number | string };
|
||||||
|
state?: { status?: string };
|
||||||
|
[key: string]: unknown;
|
||||||
|
};
|
||||||
|
[key: string]: unknown;
|
||||||
|
};
|
||||||
|
[key: string]: unknown;
|
||||||
|
};
|
||||||
[key: string]: unknown;
|
[key: string]: unknown;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -267,7 +324,8 @@ type OpenCodeEvent =
|
|||||||
| OpenCodeToolUseEvent
|
| OpenCodeToolUseEvent
|
||||||
| OpenCodeToolResultEvent
|
| OpenCodeToolResultEvent
|
||||||
| OpenCodeResultEvent
|
| OpenCodeResultEvent
|
||||||
| OpenCodeErrorEvent;
|
| OpenCodeErrorEvent
|
||||||
|
| OpenCodeBusEnvelopeEvent;
|
||||||
|
|
||||||
// ── runner ──────────────────────────────────────────────────────────────────────
|
// ── runner ──────────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
@@ -302,15 +360,12 @@ async function runOpenCode(params: RunParams): Promise<AgentResult> {
|
|||||||
// per-session labeler so parallel subagent log lines can be differentiated.
|
// per-session labeler so parallel subagent log lines can be differentiated.
|
||||||
// the orchestrator's task tool_use events seed the labeler; the next
|
// the orchestrator's task tool_use events seed the labeler; the next
|
||||||
// previously-unseen sessionID consumes the head of the pending-label queue.
|
// previously-unseen sessionID consumes the head of the pending-label queue.
|
||||||
// NB: opencode's runtime currently encapsulates subagent execution inside
|
// upstream opencode's `cli/cmd/run.ts` filters subagent events out of its
|
||||||
// the `task` tool — subagent-internal tool_use/tool_result events do not
|
// NDJSON stream (`part.sessionID !== sessionID`), so we ship a per-run
|
||||||
// surface on the parent's NDJSON stream. The labeler is therefore mostly
|
// plugin (`action/agents/opencodePlugin.ts`, written into the tmpdir at
|
||||||
// dormant in practice for opencode (no per-event session differentiation
|
// setup) that re-emits non-orchestrator `message.part.updated` events. those
|
||||||
// is needed because there are no per-subagent events). The orchestrator's
|
// arrive here as `pullfrog_bus_event` envelopes and feed the labeler with
|
||||||
// `task` dispatch log (with `description: <lens>`) and the per-task
|
// real data per subagent session.
|
||||||
// duration log below are the actual attribution surface available today.
|
|
||||||
// The labeler is kept in place defensively so that if/when opencode begins
|
|
||||||
// streaming subagent sessions, attribution flips on with no further work.
|
|
||||||
const labeler = new SessionLabeler();
|
const labeler = new SessionLabeler();
|
||||||
function eventLabel(event: Record<string, unknown>): string {
|
function eventLabel(event: Record<string, unknown>): string {
|
||||||
const sid = event.sessionID ?? event.session_id;
|
const sid = event.sessionID ?? event.session_id;
|
||||||
@@ -500,25 +555,31 @@ async function runOpenCode(params: RunParams): Promise<AgentResult> {
|
|||||||
// label is already bound); the dispatch label is for the next new
|
// label is already bound); the dispatch label is for the next new
|
||||||
// sessionID that appears.
|
// sessionID that appears.
|
||||||
if (toolName === "task") {
|
if (toolName === "task") {
|
||||||
const taskInput = (event.part?.state?.input ?? {}) as {
|
// may have been pre-registered via the plugin's early task-dispatch
|
||||||
description?: string;
|
// announcement (`pullfrog_bus_event` handler). dedupe on callID so
|
||||||
subagent_type?: string;
|
// we don't record the same dispatch twice (which would corrupt the
|
||||||
prompt?: string;
|
// FIFO label queue).
|
||||||
};
|
if (!taskDispatchByCallID.has(toolId)) {
|
||||||
const dispatchedLabel = labeler.recordTaskDispatch(taskInput);
|
const taskInput = (event.part?.state?.input ?? {}) as {
|
||||||
// dual-index by callID (fast path) AND in a FIFO queue (fallback path
|
description?: string;
|
||||||
// for when opencode's task tool_result carries a different callID).
|
subagent_type?: string;
|
||||||
const dispatch: TaskDispatch = {
|
prompt?: string;
|
||||||
label: dispatchedLabel,
|
};
|
||||||
startedAt: performance.now(),
|
const dispatchedLabel = labeler.recordTaskDispatch(taskInput);
|
||||||
toolUseCallID: toolId,
|
// dual-index by callID (fast path) AND in a FIFO queue (fallback path
|
||||||
};
|
// for when opencode's task tool_result carries a different callID).
|
||||||
taskDispatchByCallID.set(toolId, dispatch);
|
const dispatch: TaskDispatch = {
|
||||||
pendingTaskDispatches.push(dispatch);
|
label: dispatchedLabel,
|
||||||
log.info(
|
startedAt: performance.now(),
|
||||||
`» dispatching subagent: ${dispatchedLabel}` +
|
toolUseCallID: toolId,
|
||||||
(taskInput.subagent_type ? ` (subagent_type=${taskInput.subagent_type})` : "")
|
};
|
||||||
);
|
taskDispatchByCallID.set(toolId, dispatch);
|
||||||
|
pendingTaskDispatches.push(dispatch);
|
||||||
|
log.info(
|
||||||
|
`» dispatching subagent: ${dispatchedLabel}` +
|
||||||
|
(taskInput.subagent_type ? ` (subagent_type=${taskInput.subagent_type})` : "")
|
||||||
|
);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
// remember non-task callIDs so a later tool_result with that callID
|
// remember non-task callIDs so a later tool_result with that callID
|
||||||
// is correctly identified as not-a-task (and we don't FIFO-pop a
|
// is correctly identified as not-a-task (and we don't FIFO-pop a
|
||||||
@@ -548,6 +609,16 @@ async function runOpenCode(params: RunParams): Promise<AgentResult> {
|
|||||||
if (event.part?.state?.status === "completed" && event.part.state.output) {
|
if (event.part?.state?.status === "completed" && event.part.state.output) {
|
||||||
log.debug(withLabel(label, ` output: ${event.part.state.output}`));
|
log.debug(withLabel(label, ` output: ${event.part.state.output}`));
|
||||||
}
|
}
|
||||||
|
// surface tool errors at info level. opencode emits tool parts at
|
||||||
|
// status="error" through the same `tool_use` event the CLI's run-loop
|
||||||
|
// (and our injected plugin for subagent parts) emits — without this
|
||||||
|
// branch the only signal in the user's logs is `» <tool>(...)` with
|
||||||
|
// no indication the call failed. error info lives in `state.output`
|
||||||
|
// (an error string set by the tool layer).
|
||||||
|
if (event.part?.state?.status === "error") {
|
||||||
|
const errorMsg = event.part.state.output ?? "(no error message)";
|
||||||
|
log.info(withLabel(label, `» tool call failed: ${errorMsg}`));
|
||||||
|
}
|
||||||
|
|
||||||
// agent's explicit MCP report_progress takes priority over todo tracking
|
// agent's explicit MCP report_progress takes priority over todo tracking
|
||||||
if (toolName.includes("report_progress") && params.todoTracker) {
|
if (toolName.includes("report_progress") && params.todoTracker) {
|
||||||
@@ -630,6 +701,16 @@ async function runOpenCode(params: RunParams): Promise<AgentResult> {
|
|||||||
log.debug(withLabel(label, `tool output: ${outputStr}`));
|
log.debug(withLabel(label, `tool output: ${outputStr}`));
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
error: (event: OpenCodeErrorEvent) => {
|
||||||
|
// opencode emits a `type=error` event when a provider call fails (e.g.
|
||||||
|
// 401 Invalid authentication credentials). the underlying CLI still
|
||||||
|
// exits 0 because the error was returned cleanly by the LLM SDK, so
|
||||||
|
// unless we capture this event the run is reported as success.
|
||||||
|
agentErrorEvent = event;
|
||||||
|
const errorName = event.error?.name || "unknown";
|
||||||
|
const errorMessage = event.error?.data?.message || event.error?.name || JSON.stringify(event);
|
||||||
|
log.info(`» ${params.label} error event: ${errorName}: ${errorMessage}`);
|
||||||
|
},
|
||||||
result: async (event: OpenCodeResultEvent) => {
|
result: async (event: OpenCodeResultEvent) => {
|
||||||
const status = event.status || "unknown";
|
const status = event.status || "unknown";
|
||||||
const duration = event.stats?.duration_ms || 0;
|
const duration = event.stats?.duration_ms || 0;
|
||||||
@@ -658,11 +739,104 @@ async function runOpenCode(params: RunParams): Promise<AgentResult> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
[PULLFROG_BUS_EVENT_TYPE]: async (event: OpenCodeBusEnvelopeEvent) => {
|
||||||
|
// surface subagent activity that opencode's CLI run-loop discards (it
|
||||||
|
// filters `part.sessionID !== sessionID`). our injected plugin
|
||||||
|
// (action/agents/opencodePlugin.ts) re-emits non-orchestrator
|
||||||
|
// `message.part.updated` bus events; here we synthesize the equivalent
|
||||||
|
// CLI-style event for each known part type and dispatch through the
|
||||||
|
// existing handlers so labeling, attribution, and logging all reuse the
|
||||||
|
// same code path as the orchestrator's events. mirrors the dispatch
|
||||||
|
// logic in opencode-ai's `cli/cmd/run.ts` `loop()` function.
|
||||||
|
const busEvent = event.bus_event;
|
||||||
|
if (!busEvent || busEvent.type !== "message.part.updated") return;
|
||||||
|
const part = busEvent.properties?.part;
|
||||||
|
if (!part || typeof part.sessionID !== "string") return;
|
||||||
|
const sessionID = part.sessionID;
|
||||||
|
const partType = part.type;
|
||||||
|
|
||||||
|
// early task dispatch: the orchestrator's task tool fires bus events at
|
||||||
|
// status=running BEFORE the subagent's first message.part.updated, but
|
||||||
|
// the CLI's run-loop only emits the matching tool_use NDJSON event at
|
||||||
|
// status=completed (after the subagent finishes). without
|
||||||
|
// pre-registering the dispatch label here, the labeler binds the
|
||||||
|
// subagent's sessionID to a generic `subagent#N` fallback before the
|
||||||
|
// CLI's tool_use ever fires recordTaskDispatch. dedupe against
|
||||||
|
// taskDispatchByCallID so the late tool_use handler doesn't double-add.
|
||||||
|
if (partType === "tool") {
|
||||||
|
const status = part.state?.status;
|
||||||
|
const partWithToolFields = part as {
|
||||||
|
tool?: string;
|
||||||
|
callID?: string;
|
||||||
|
state?: { status?: string; input?: unknown };
|
||||||
|
};
|
||||||
|
// only running (not pending) — at pending state.input is still {}.
|
||||||
|
// by running, the LLM has filled in description/subagent_type/prompt.
|
||||||
|
// mirrors the same check in the plugin source.
|
||||||
|
const isOrchestratorTaskDispatch =
|
||||||
|
partWithToolFields.tool === "task" && status === "running";
|
||||||
|
if (isOrchestratorTaskDispatch) {
|
||||||
|
const callID = partWithToolFields.callID;
|
||||||
|
if (typeof callID === "string" && !taskDispatchByCallID.has(callID)) {
|
||||||
|
const taskInput = (partWithToolFields.state?.input ?? {}) as {
|
||||||
|
description?: string;
|
||||||
|
subagent_type?: string;
|
||||||
|
prompt?: string;
|
||||||
|
};
|
||||||
|
const dispatchedLabel = labeler.recordTaskDispatch(taskInput);
|
||||||
|
const dispatch: TaskDispatch = {
|
||||||
|
label: dispatchedLabel,
|
||||||
|
startedAt: performance.now(),
|
||||||
|
toolUseCallID: callID,
|
||||||
|
};
|
||||||
|
taskDispatchByCallID.set(callID, dispatch);
|
||||||
|
pendingTaskDispatches.push(dispatch);
|
||||||
|
log.info(
|
||||||
|
`» dispatching subagent: ${dispatchedLabel}` +
|
||||||
|
(taskInput.subagent_type ? ` (subagent_type=${taskInput.subagent_type})` : "")
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (status !== "completed" && status !== "error") return;
|
||||||
|
await handlers.tool_use({
|
||||||
|
type: "tool_use",
|
||||||
|
sessionID,
|
||||||
|
part,
|
||||||
|
} as OpenCodeToolUseEvent);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// intentionally NOT routing subagent step_start / step_finish through
|
||||||
|
// the orchestrator's handlers:
|
||||||
|
// - step_finish carries `tokens` and `cost` and the handler folds
|
||||||
|
// them into the run-wide accumulators. surfacing subagent steps
|
||||||
|
// here would inflate the orchestrator's usage telemetry — and
|
||||||
|
// either double-count (if opencode also bills child tokens back
|
||||||
|
// up to the parent session) or just over-report. the existing
|
||||||
|
// init/message/text handlers all gate on ORCHESTRATOR_LABEL for
|
||||||
|
// the same reason.
|
||||||
|
// - step_start mutates `currentStepId` / `currentStepType` /
|
||||||
|
// `stepHistory`, which are orchestrator-scoped — using them to
|
||||||
|
// attribute subagent activity in the orchestrator's tool-use
|
||||||
|
// timing log would be wrong.
|
||||||
|
// the subagent's tool calls and text still surface (handled below)
|
||||||
|
// — that's the user-visible activity.
|
||||||
|
if (partType === "step-start" || partType === "step-finish") return;
|
||||||
|
if (partType === "text" && part.time?.end !== undefined) {
|
||||||
|
await handlers.text({
|
||||||
|
type: "text",
|
||||||
|
sessionID,
|
||||||
|
part,
|
||||||
|
} as OpenCodeTextEvent);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
const recentStderr: string[] = [];
|
const recentStderr: string[] = [];
|
||||||
|
|
||||||
let lastProviderError: string | null = null;
|
let lastProviderError: string | null = null;
|
||||||
|
let agentErrorEvent: OpenCodeErrorEvent | null = null;
|
||||||
|
|
||||||
let output = "";
|
let output = "";
|
||||||
let stdoutBuffer = "";
|
let stdoutBuffer = "";
|
||||||
@@ -676,6 +850,20 @@ async function runOpenCode(params: RunParams): Promise<AgentResult> {
|
|||||||
activityTimeout: 300_000,
|
activityTimeout: 300_000,
|
||||||
onActivityTimeout: params.onActivityTimeout,
|
onActivityTimeout: params.onActivityTimeout,
|
||||||
stdio: ["ignore", "pipe", "pipe"],
|
stdio: ["ignore", "pipe", "pipe"],
|
||||||
|
// node_modules/opencode-ai/bin/opencode is a Node shim that spawnSyncs
|
||||||
|
// the native opencode-<plat>-<arch> binary with stdio:"inherit". without
|
||||||
|
// a process-group kill, SIGKILL hits only the shim, the native binary
|
||||||
|
// is reparented to PID 1, holds our stdout pipe open, and `child.close`
|
||||||
|
// never fires — producing zombie runs. detached + killGroup nukes the
|
||||||
|
// whole tree.
|
||||||
|
killGroup: true,
|
||||||
|
// NB: we used to pass `isPausedExternally: isSubagentInFlight` to suspend
|
||||||
|
// the activity timer during subagent dispatches. unnecessary now that
|
||||||
|
// our injected plugin (action/agents/opencodePlugin.ts) re-emits
|
||||||
|
// subagent `message.part.updated` events on opencode's stdout — those
|
||||||
|
// arrive at child.stdout here, fire updateActivity(), and reset
|
||||||
|
// lastActivityTime naturally. verified empirically in PR #634
|
||||||
|
// (~3.3 plugin events/sec during a typical subagent run).
|
||||||
onStdout: async (chunk) => {
|
onStdout: async (chunk) => {
|
||||||
const text = chunk.toString();
|
const text = chunk.toString();
|
||||||
output += text;
|
output += text;
|
||||||
@@ -824,6 +1012,19 @@ async function runOpenCode(params: RunParams): Promise<AgentResult> {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (agentErrorEvent) {
|
||||||
|
const errorEvent: OpenCodeErrorEvent = agentErrorEvent;
|
||||||
|
const errorName = errorEvent.error?.name || "agent error";
|
||||||
|
const errorMessage =
|
||||||
|
errorEvent.error?.data?.message || errorEvent.error?.name || JSON.stringify(errorEvent);
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
output: finalOutput || output,
|
||||||
|
error: `${errorName}: ${errorMessage}`,
|
||||||
|
usage,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
return { success: true, output: finalOutput || output, usage };
|
return { success: true, output: finalOutput || output, usage };
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
params.todoTracker?.cancel();
|
params.todoTracker?.cancel();
|
||||||
@@ -874,6 +1075,20 @@ export const opencode = agent({
|
|||||||
|
|
||||||
mkdirSync(join(homeEnv.XDG_CONFIG_HOME, "opencode"), { recursive: true });
|
mkdirSync(join(homeEnv.XDG_CONFIG_HOME, "opencode"), { recursive: true });
|
||||||
|
|
||||||
|
// drop our bus-event surfacing plugin into opencode's global config dir
|
||||||
|
// (which we've redirected to the per-run tmpdir via XDG_CONFIG_HOME).
|
||||||
|
// opencode auto-discovers plugins from `<Global.Path.config>/{plugin,plugins}/*.{ts,js}`
|
||||||
|
// (see `packages/opencode/src/config/config.ts:633` calling
|
||||||
|
// `ConfigPlugin.load(dir)`), so this lands in the loader without any
|
||||||
|
// config wiring. critically: this MUST be inside the tmpdir, never the
|
||||||
|
// user's repo working tree — see AGENTS.md.
|
||||||
|
const opencodePluginDir = join(homeEnv.XDG_CONFIG_HOME, "opencode", "plugin");
|
||||||
|
mkdirSync(opencodePluginDir, { recursive: true });
|
||||||
|
writeFileSync(
|
||||||
|
join(opencodePluginDir, PULLFROG_OPENCODE_PLUGIN_FILENAME),
|
||||||
|
PULLFROG_OPENCODE_PLUGIN_SOURCE
|
||||||
|
);
|
||||||
|
|
||||||
const agentBrowserVersion = getDevDependencyVersion("agent-browser");
|
const agentBrowserVersion = getDevDependencyVersion("agent-browser");
|
||||||
addSkill({
|
addSkill({
|
||||||
ref: `vercel-labs/agent-browser@v${agentBrowserVersion}`,
|
ref: `vercel-labs/agent-browser@v${agentBrowserVersion}`,
|
||||||
@@ -899,6 +1114,7 @@ export const opencode = agent({
|
|||||||
...homeEnv,
|
...homeEnv,
|
||||||
OPENCODE_CONFIG_CONTENT: buildSecurityConfig(ctx, model),
|
OPENCODE_CONFIG_CONTENT: buildSecurityConfig(ctx, model),
|
||||||
OPENCODE_PERMISSION: permissionOverride,
|
OPENCODE_PERMISSION: permissionOverride,
|
||||||
|
OPENCODE_EXPERIMENTAL_OUTPUT_TOKEN_MAX: PULLFROG_OPENCODE_OUTPUT_LIMIT.toString(),
|
||||||
GOOGLE_GENERATIVE_AI_API_KEY:
|
GOOGLE_GENERATIVE_AI_API_KEY:
|
||||||
process.env.GOOGLE_GENERATIVE_AI_API_KEY || process.env.GEMINI_API_KEY,
|
process.env.GOOGLE_GENERATIVE_AI_API_KEY || process.env.GEMINI_API_KEY,
|
||||||
};
|
};
|
||||||
@@ -932,7 +1148,11 @@ export const opencode = agent({
|
|||||||
initialResult: result,
|
initialResult: result,
|
||||||
initialUsage: result.usage,
|
initialUsage: result.usage,
|
||||||
stopScript: ctx.stopScript,
|
stopScript: ctx.stopScript,
|
||||||
reflectionPrompt: buildLearningsReflectionPrompt("opencode"),
|
summaryFilePath: ctx.summaryFilePath,
|
||||||
|
summarySeed: ctx.summarySeed,
|
||||||
|
reflectionPrompt: ctx.learningsFilePath
|
||||||
|
? buildLearningsReflectionPrompt(ctx.learningsFilePath)
|
||||||
|
: undefined,
|
||||||
resume: async (c) =>
|
resume: async (c) =>
|
||||||
runOpenCode({
|
runOpenCode({
|
||||||
...runParams,
|
...runParams,
|
||||||
|
|||||||
@@ -0,0 +1,139 @@
|
|||||||
|
/**
|
||||||
|
* Source for the opencode plugin we drop into the per-run tmpdir at
|
||||||
|
* `<XDG_CONFIG_HOME>/opencode/plugin/pullfrog-events.ts`. The harness already
|
||||||
|
* redirects `XDG_CONFIG_HOME` to `ctx.tmpdir/.config` (see `opencode.ts`
|
||||||
|
* `homeEnv`), so opencode's auto-discovery scans the tmpdir, never the user's
|
||||||
|
* working tree. opencode's `Global.Path.config` resolves to
|
||||||
|
* `path.join(xdgConfig, "opencode")` and the config layer auto-discovers
|
||||||
|
* plugins from every directory in its scan list — including
|
||||||
|
* `Global.Path.config` — by globbing `{plugin,plugins}/*.{ts,js}` via
|
||||||
|
* `ConfigPlugin.load(dir)`.
|
||||||
|
*
|
||||||
|
* We MUST NOT write into the user's repo working tree. The repo is a checkout
|
||||||
|
* the agent operates on; only the agent's own tools (gated by
|
||||||
|
* `OPENCODE_PERMISSION`) may modify it. The whole reason we redirect HOME and
|
||||||
|
* XDG_CONFIG_HOME is so harness-side files (config, plugins, scratch state)
|
||||||
|
* land in the tmpdir.
|
||||||
|
*
|
||||||
|
* Why this plugin exists: opencode's `task` tool runs subagents in-process and
|
||||||
|
* the CLI's `cli/cmd/run.ts` event loop filters `part.sessionID !== sessionID`,
|
||||||
|
* so subagent-internal `message.part.updated` events are silently discarded
|
||||||
|
* before reaching our parent NDJSON stream. plugins, by contrast, receive
|
||||||
|
* EVERY bus event via `bus.subscribeAll()` regardless of session.
|
||||||
|
*
|
||||||
|
* The plugin re-emits every relevant bus event onto opencode's stdout as a
|
||||||
|
* single JSON line wrapped in a sentinel envelope. our `runOpenCode` parser
|
||||||
|
* recognises the envelope, unpacks it, and routes the inner part through the
|
||||||
|
* existing handlers with a per-session label from `SessionLabeler` so each
|
||||||
|
* subagent's tool calls / text appear inline alongside the orchestrator's.
|
||||||
|
*
|
||||||
|
* Dumb plugin / smart parent split: the plugin emits every part for every
|
||||||
|
* session. the parent dedupes against the orchestrator's own session id (which
|
||||||
|
* it already knows from the `init` event). this keeps the plugin trivial and
|
||||||
|
* keeps the per-session attribution logic on the parent side where the
|
||||||
|
* SessionLabeler already lives.
|
||||||
|
*
|
||||||
|
* Event-name prefixing: the wrapped event-type sentinel is
|
||||||
|
* `pullfrog_bus_event` — picked to be unmistakably ours so a future opencode
|
||||||
|
* release that introduces a coincidentally-named event type won't collide.
|
||||||
|
*/
|
||||||
|
|
||||||
|
export const PULLFROG_BUS_EVENT_TYPE = "pullfrog_bus_event" as const;
|
||||||
|
|
||||||
|
export const PULLFROG_OPENCODE_PLUGIN_FILENAME = "pullfrog-events.ts" as const;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Source written verbatim to `<XDG_CONFIG_HOME>/opencode/plugin/pullfrog-events.ts`.
|
||||||
|
*
|
||||||
|
* - Structural typing only (no runtime import of `@opencode-ai/plugin`):
|
||||||
|
* opencode installs that dep into the directory containing the plugin
|
||||||
|
* alongside discovery, but a) the dep isn't required for the structural
|
||||||
|
* shape we use, and b) keeping zero imports avoids any module-resolution
|
||||||
|
* coupling to opencode's plugin-loader internals across versions.
|
||||||
|
* - default export is the plugin factory (opencode's plugin loader accepts
|
||||||
|
* default exports as the server entrypoint).
|
||||||
|
* - we only forward `message.part.updated`. that's where the user-visible
|
||||||
|
* subagent activity (tool calls, text, step transitions) lives. add more
|
||||||
|
* event types here if the parent needs them.
|
||||||
|
* - JSON.stringify+single write keeps the line atomic up to PIPE_BUF (4KB on
|
||||||
|
* Linux). longer parts may interleave with concurrent stdout writers; the
|
||||||
|
* parser tolerates non-JSON lines (logs them at debug) so a torn line is a
|
||||||
|
* missed event, not a crash.
|
||||||
|
*/
|
||||||
|
export const PULLFROG_OPENCODE_PLUGIN_SOURCE = `// AUTOGENERATED by Pullfrog. do not edit; it'll be overwritten on the next run.
|
||||||
|
// surfaces opencode subagent activity that the CLI's run-loop discards. see
|
||||||
|
// action/agents/opencodePlugin.ts in pullfrog/app for why this exists. lives
|
||||||
|
// inside the per-run tmpdir (XDG_CONFIG_HOME/opencode/plugin/), never inside
|
||||||
|
// the user's working tree.
|
||||||
|
|
||||||
|
const PULLFROG_BUS_EVENT_TYPE = ${JSON.stringify(PULLFROG_BUS_EVENT_TYPE)};
|
||||||
|
|
||||||
|
// the first sessionID we see on a message.part.updated event is the
|
||||||
|
// orchestrator — opencode's run command creates exactly one top-level session
|
||||||
|
// before any subagent is dispatched, and the user-prompt text part fires
|
||||||
|
// before the first task tool_use. we lock that sessionID in here and use it
|
||||||
|
// to filter: the orchestrator's events are already streamed by the CLI's
|
||||||
|
// run-loop, so we only forward (a) all subagent events, and (b) the
|
||||||
|
// orchestrator's task tool dispatches at status="running". the CLI only
|
||||||
|
// emits task tool_use at status=completed (after the subagent finishes), so
|
||||||
|
// without the early announce the parent's labeler binds subagent sessions
|
||||||
|
// before recordTaskDispatch fires and the lens label is lost.
|
||||||
|
let orchestratorSessionID: string | undefined;
|
||||||
|
|
||||||
|
function isOrchestratorTaskDispatch(part: {
|
||||||
|
type?: string;
|
||||||
|
tool?: string;
|
||||||
|
state?: { status?: string };
|
||||||
|
}): boolean {
|
||||||
|
if (part.type !== "tool") return false;
|
||||||
|
if (part.tool !== "task") return false;
|
||||||
|
// only forward at status="running" (not "pending"). at pending the
|
||||||
|
// state.input is still {} — the orchestrator has emitted the part shell
|
||||||
|
// but the LLM hasn't filled in description/subagent_type/prompt yet. by
|
||||||
|
// running, input is populated and recordTaskDispatch can derive the lens
|
||||||
|
// label correctly.
|
||||||
|
return part.state?.status === "running";
|
||||||
|
}
|
||||||
|
|
||||||
|
export default async function pullfrogEventsPlugin() {
|
||||||
|
return {
|
||||||
|
event: async (input: {
|
||||||
|
event: {
|
||||||
|
type: string;
|
||||||
|
properties?: {
|
||||||
|
part?: {
|
||||||
|
sessionID?: string;
|
||||||
|
type?: string;
|
||||||
|
tool?: string;
|
||||||
|
state?: { status?: string };
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}) => {
|
||||||
|
const event = input.event;
|
||||||
|
if (!event || typeof event !== "object") return;
|
||||||
|
if (event.type !== "message.part.updated") return;
|
||||||
|
const part = event.properties?.part;
|
||||||
|
const sessionID = part?.sessionID;
|
||||||
|
if (typeof sessionID !== "string" || sessionID.length === 0) return;
|
||||||
|
if (orchestratorSessionID === undefined) orchestratorSessionID = sessionID;
|
||||||
|
|
||||||
|
if (sessionID === orchestratorSessionID) {
|
||||||
|
// skip orchestrator events EXCEPT early task dispatches.
|
||||||
|
if (!part || !isOrchestratorTaskDispatch(part)) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const line = JSON.stringify({
|
||||||
|
type: PULLFROG_BUS_EVENT_TYPE,
|
||||||
|
bus_event: event,
|
||||||
|
});
|
||||||
|
process.stdout.write(line + "\\n");
|
||||||
|
} catch {
|
||||||
|
// a circular reference or BigInt etc. would throw; swallow rather
|
||||||
|
// than letting a single bad event take down the plugin.
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
`;
|
||||||
@@ -42,10 +42,10 @@ describe("runPostRunRetryLoop — reflection turn", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("does not flip a successful run to failed when reflection returns success:false", async () => {
|
it("does not flip a successful run to failed when reflection returns success:false", async () => {
|
||||||
// the reflection turn is a best-effort nudge (update_learnings). if it
|
// the reflection turn is a best-effort nudge (edit the learnings
|
||||||
// fails — e.g. the model API errors mid-turn — the underlying task has
|
// tmpfile). if it fails — e.g. the model API errors mid-turn — the
|
||||||
// already completed and been gated cleanly, so the run as a whole must
|
// underlying task has already completed and been gated cleanly, so the
|
||||||
// still be reported as successful.
|
// run as a whole must still be reported as successful.
|
||||||
const initial = successResult({ output: "task done" });
|
const initial = successResult({ output: "task done" });
|
||||||
const resume = vi
|
const resume = vi
|
||||||
.fn<(ctx: { prompt: string; previousResult: AgentResult }) => Promise<AgentResult>>()
|
.fn<(ctx: { prompt: string; previousResult: AgentResult }) => Promise<AgentResult>>()
|
||||||
@@ -56,7 +56,7 @@ describe("runPostRunRetryLoop — reflection turn", () => {
|
|||||||
initialUsage: undefined,
|
initialUsage: undefined,
|
||||||
stopScript: null,
|
stopScript: null,
|
||||||
resume,
|
resume,
|
||||||
reflectionPrompt: "REFLECTION: call update_learnings if anything is worth saving",
|
reflectionPrompt: "REFLECTION: edit learnings file if anything is worth saving",
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(result.success).toBe(true);
|
expect(result.success).toBe(true);
|
||||||
@@ -110,7 +110,7 @@ describe("runPostRunRetryLoop — reflection turn", () => {
|
|||||||
initialUsage: undefined,
|
initialUsage: undefined,
|
||||||
stopScript: null,
|
stopScript: null,
|
||||||
resume,
|
resume,
|
||||||
reflectionPrompt: "REFLECTION: consider update_learnings",
|
reflectionPrompt: "REFLECTION: consider editing learnings",
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(result.success).toBe(true);
|
expect(result.success).toBe(true);
|
||||||
@@ -135,7 +135,7 @@ describe("runPostRunRetryLoop — reflection turn", () => {
|
|||||||
initialUsage: undefined,
|
initialUsage: undefined,
|
||||||
stopScript: null,
|
stopScript: null,
|
||||||
resume,
|
resume,
|
||||||
reflectionPrompt: "REFLECTION: consider update_learnings",
|
reflectionPrompt: "REFLECTION: consider editing learnings",
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(result.success).toBe(true);
|
expect(result.success).toBe(true);
|
||||||
@@ -186,7 +186,7 @@ describe("runPostRunRetryLoop — reflection turn", () => {
|
|||||||
initialUsage: undefined,
|
initialUsage: undefined,
|
||||||
stopScript: null,
|
stopScript: null,
|
||||||
resume,
|
resume,
|
||||||
reflectionPrompt: "REFLECTION: consider update_learnings",
|
reflectionPrompt: "REFLECTION: consider editing learnings",
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(result.success).toBe(true);
|
expect(result.success).toBe(true);
|
||||||
|
|||||||
+101
-19
@@ -1,4 +1,4 @@
|
|||||||
import { type AgentId, formatMcpToolRef } from "../external.ts";
|
import { readFile } from "node:fs/promises";
|
||||||
import { LIFECYCLE_HOOK_TIMEOUT_MS } from "../lifecycle.ts";
|
import { LIFECYCLE_HOOK_TIMEOUT_MS } from "../lifecycle.ts";
|
||||||
import { log } from "../utils/cli.ts";
|
import { log } from "../utils/cli.ts";
|
||||||
import {
|
import {
|
||||||
@@ -92,13 +92,46 @@ export function buildStopHookPrompt(failure: StopHookFailure): string {
|
|||||||
].join("\n");
|
].join("\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** check whether the seeded summary file is byte-identical to its seed.
|
||||||
|
* a missing or unreadable file returns false (don't nudge — the agent
|
||||||
|
* may have legitimately deleted it, or the seed step failed; the read-
|
||||||
|
* back path in main.ts handles both cases by skipping persist). */
|
||||||
|
async function isSummaryUnchanged(filePath: string, seed: string): Promise<boolean> {
|
||||||
|
try {
|
||||||
|
const current = await readFile(filePath, "utf8");
|
||||||
|
return current === seed;
|
||||||
|
} catch {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildSummaryStalePrompt(filePath: string): string {
|
||||||
|
return [
|
||||||
|
`PR SUMMARY UNTOUCHED — the rolling PR summary file at \`${filePath}\` is byte-identical to its seed; this run did not edit it.`,
|
||||||
|
"",
|
||||||
|
"review the diff and update the file in place to reflect what changed in the PR. update intent, key changes, and any risks worth flagging — keep the existing section headings stable so incremental runs produce clean diffs.",
|
||||||
|
"",
|
||||||
|
"if the diff is genuinely too small or noisy to warrant rewriting (e.g. a one-line typo fix, a comment tweak, a formatting-only change), it's fine to leave the structure as-is — but at minimum confirm you considered it by appending one line to the appropriate section noting the run. silence is not an option; the snapshot is what the next review run reads as context.",
|
||||||
|
].join("\n");
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* check the two post-run gates: did the stop hook pass and is the working
|
* check the post-run gates: did the stop hook pass, is the working tree
|
||||||
* tree clean? returns everything that still needs fixing so the caller can
|
* clean, and (when applicable) did the agent touch the rolling PR summary
|
||||||
|
* snapshot? returns everything that still needs nudging so the caller can
|
||||||
* render a single combined resume prompt.
|
* render a single combined resume prompt.
|
||||||
|
*
|
||||||
|
* the summary-stale check is skipped when `summaryFilePath` / `summarySeed`
|
||||||
|
* are not provided; this is the common case (non-PR runs, runs where the
|
||||||
|
* dispatcher didn't request snapshot generation, runs where the seed step
|
||||||
|
* failed). loop callers also pass these as undefined after the agent has
|
||||||
|
* already been nudged once, to avoid burning the retry budget on a soft
|
||||||
|
* non-blocking gate.
|
||||||
*/
|
*/
|
||||||
export async function collectPostRunIssues(params: {
|
export async function collectPostRunIssues(params: {
|
||||||
stopScript: string | null | undefined;
|
stopScript: string | null | undefined;
|
||||||
|
summaryFilePath?: string | undefined;
|
||||||
|
summarySeed?: string | undefined;
|
||||||
}): Promise<PostRunIssues> {
|
}): Promise<PostRunIssues> {
|
||||||
const issues: PostRunIssues = {};
|
const issues: PostRunIssues = {};
|
||||||
if (params.stopScript) {
|
if (params.stopScript) {
|
||||||
@@ -107,6 +140,10 @@ export async function collectPostRunIssues(params: {
|
|||||||
}
|
}
|
||||||
const status = getGitStatus();
|
const status = getGitStatus();
|
||||||
if (status) issues.dirtyTree = status;
|
if (status) issues.dirtyTree = status;
|
||||||
|
if (params.summaryFilePath && params.summarySeed !== undefined) {
|
||||||
|
const stale = await isSummaryUnchanged(params.summaryFilePath, params.summarySeed);
|
||||||
|
if (stale) issues.summaryStale = { filePath: params.summaryFilePath };
|
||||||
|
}
|
||||||
return issues;
|
return issues;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -114,30 +151,35 @@ export function buildPostRunPrompt(issues: PostRunIssues): string {
|
|||||||
const parts: string[] = [];
|
const parts: string[] = [];
|
||||||
if (issues.stopHook) parts.push(buildStopHookPrompt(issues.stopHook));
|
if (issues.stopHook) parts.push(buildStopHookPrompt(issues.stopHook));
|
||||||
if (issues.dirtyTree) parts.push(buildCommitPrompt(issues.dirtyTree));
|
if (issues.dirtyTree) parts.push(buildCommitPrompt(issues.dirtyTree));
|
||||||
|
if (issues.summaryStale) parts.push(buildSummaryStalePrompt(issues.summaryStale.filePath));
|
||||||
return parts.join("\n\n---\n\n");
|
return parts.join("\n\n---\n\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* prompt for a dedicated post-run reflection turn nudging the agent to call
|
* prompt for a dedicated post-run reflection turn nudging the agent to edit
|
||||||
* `update_learnings` if it discovered anything worth persisting.
|
* the rolling learnings file if it discovered anything worth persisting.
|
||||||
*
|
*
|
||||||
* this exists because the learnings step baked into mode checklists is
|
* this exists because passive "if you learned something, write it down"
|
||||||
* frequently ignored — the agent stays focused on the task and the meta-ask
|
* instructions baked into mode checklists are frequently ignored — the agent
|
||||||
* falls through. delivering it as its own resume turn, with nothing competing
|
* stays focused on the task and the meta-ask falls through. delivering it
|
||||||
* for attention, raises the fire rate substantially.
|
* as its own resume turn, with nothing competing for attention, raises the
|
||||||
|
* fire rate substantially.
|
||||||
|
*
|
||||||
|
* the file is the single source of truth — there is no separate MCP tool
|
||||||
|
* call. the server reads the file at end-of-run and persists any edits to
|
||||||
|
* `Repo.learnings`.
|
||||||
*/
|
*/
|
||||||
export function buildLearningsReflectionPrompt(agentId: AgentId): string {
|
export function buildLearningsReflectionPrompt(filePath: string): string {
|
||||||
const t = (name: string) => formatMcpToolRef(agentId, name);
|
|
||||||
return [
|
return [
|
||||||
`REFLECTION — before you finish, think back over this task: did you discover anything about this repo's setup, test commands, conventions, or patterns that you are confident is correct and would reliably help future runs?`,
|
`REFLECTION — before you finish, think back over this task: did you discover anything about this repo's setup, test commands, conventions, or patterns that is high-confidence and would reliably help future runs?`,
|
||||||
"",
|
"",
|
||||||
`if so, call \`${t("update_learnings")}\` to persist it.`,
|
`the rolling learnings file is at \`${filePath}\`. read it first if you haven't already, then edit it in place using your native file tools. the server reads this file at end-of-run and persists any changes — there is no tool to call.`,
|
||||||
"",
|
"",
|
||||||
`rules:`,
|
`keep the file healthy:`,
|
||||||
`- only call \`${t("update_learnings")}\` when the finding is high-confidence and broadly useful. skip if unsure, speculative, or one-off.`,
|
`- only add bullets when the finding is high-confidence AND broadly useful. skip speculative, one-off, or "maybe" findings.`,
|
||||||
`- pass the FULL merged list: existing learnings from the original prompt + your new discoveries. one fact per bullet, lines starting with \`- \`.`,
|
`- prune bullets that are clearly wrong, no longer relevant, or low-signal (rarely useful). a focused, accurate file beats a long stale one.`,
|
||||||
`- deduplicate, and drop bullets that are clearly wrong or no longer relevant to the current codebase.`,
|
`- format: flat bullet list, one fact per line starting with \`- \`. deduplicate against existing entries — if a bullet covers the same fact, update it in place instead of adding a duplicate.`,
|
||||||
`- if you already called \`${t("update_learnings")}\` earlier in this run, or nothing new is worth capturing, just reply "done" and stop — do not edit the repo for this reflection.`,
|
`- leave the file alone if you have nothing substantively new to add and the existing entries still look healthy. silence is a valid outcome — just reply "done" and stop.`,
|
||||||
].join("\n");
|
].join("\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -164,6 +206,14 @@ export async function runPostRunRetryLoop<R extends AgentResult>(params: {
|
|||||||
initialResult: R;
|
initialResult: R;
|
||||||
initialUsage: AgentUsage | undefined;
|
initialUsage: AgentUsage | undefined;
|
||||||
stopScript: string | null | undefined;
|
stopScript: string | null | undefined;
|
||||||
|
/** absolute path to the seeded PR summary file. when set together with
|
||||||
|
* `summarySeed`, the loop checks after each agent attempt whether the
|
||||||
|
* file has been edited; if not, it nudges the agent ONCE via a resume
|
||||||
|
* turn (subsequent iterations skip the check so we don't keep burning
|
||||||
|
* retries on a soft gate when the agent has decided no edit is warranted). */
|
||||||
|
summaryFilePath?: string | undefined;
|
||||||
|
/** exact bytes of the seeded summary file used for the unchanged-check. */
|
||||||
|
summarySeed?: string | undefined;
|
||||||
resume: (context: { prompt: string; previousResult: R }) => Promise<R>;
|
resume: (context: { prompt: string; previousResult: R }) => Promise<R>;
|
||||||
canResume?: ((result: R) => boolean) | undefined;
|
canResume?: ((result: R) => boolean) | undefined;
|
||||||
reflectionPrompt?: string | undefined;
|
reflectionPrompt?: string | undefined;
|
||||||
@@ -173,10 +223,21 @@ export async function runPostRunRetryLoop<R extends AgentResult>(params: {
|
|||||||
let finalIssues: PostRunIssues = {};
|
let finalIssues: PostRunIssues = {};
|
||||||
let gateResumeCount = 0;
|
let gateResumeCount = 0;
|
||||||
let pendingReflection = params.reflectionPrompt;
|
let pendingReflection = params.reflectionPrompt;
|
||||||
|
// nudge for an untouched summary file fires AT MOST ONCE per run. after
|
||||||
|
// we've delivered the prompt, subsequent gate checks pass undefined so
|
||||||
|
// the loop doesn't keep flagging the same condition — the agent may have
|
||||||
|
// legitimately decided no edit is warranted, and re-prompting would
|
||||||
|
// burn the retry budget without adding signal.
|
||||||
|
let summaryStaleNudged = false;
|
||||||
|
|
||||||
while (gateResumeCount < MAX_POST_RUN_RETRIES) {
|
while (gateResumeCount < MAX_POST_RUN_RETRIES) {
|
||||||
if (!result.success) break;
|
if (!result.success) break;
|
||||||
const issues = await collectPostRunIssues({ stopScript: params.stopScript });
|
const issues = await collectPostRunIssues({
|
||||||
|
stopScript: params.stopScript,
|
||||||
|
summaryFilePath: summaryStaleNudged ? undefined : params.summaryFilePath,
|
||||||
|
summarySeed: summaryStaleNudged ? undefined : params.summarySeed,
|
||||||
|
});
|
||||||
|
if (issues.summaryStale) summaryStaleNudged = true;
|
||||||
finalIssues = issues;
|
finalIssues = issues;
|
||||||
|
|
||||||
if (!hasPostRunIssues(issues)) {
|
if (!hasPostRunIssues(issues)) {
|
||||||
@@ -230,8 +291,25 @@ export async function runPostRunRetryLoop<R extends AgentResult>(params: {
|
|||||||
|
|
||||||
log.info(`» post-run retry (attempt ${gateResumeCount + 1}/${MAX_POST_RUN_RETRIES})`);
|
log.info(`» post-run retry (attempt ${gateResumeCount + 1}/${MAX_POST_RUN_RETRIES})`);
|
||||||
const prompt = buildPostRunPrompt(issues);
|
const prompt = buildPostRunPrompt(issues);
|
||||||
|
// summary-stale is a soft gate that must never flip a successful run to
|
||||||
|
// failed. when it's the only issue and the resume itself errors out,
|
||||||
|
// restore the pre-resume successful result and break — persistSummary
|
||||||
|
// detects the unchanged file via its seed comparison and skips the DB
|
||||||
|
// write on its own, so no further coordination is needed here.
|
||||||
|
const onlySummaryStale =
|
||||||
|
issues.summaryStale !== undefined &&
|
||||||
|
issues.stopHook === undefined &&
|
||||||
|
issues.dirtyTree === undefined;
|
||||||
|
const preResume = result;
|
||||||
result = await params.resume({ prompt, previousResult: result });
|
result = await params.resume({ prompt, previousResult: result });
|
||||||
aggregatedUsage = mergeAgentUsage(aggregatedUsage, result.usage);
|
aggregatedUsage = mergeAgentUsage(aggregatedUsage, result.usage);
|
||||||
|
if (!result.success && onlySummaryStale) {
|
||||||
|
log.warning(
|
||||||
|
`» summary-stale resume turn failed (${result.error ?? "unknown error"}), preserving prior successful result`
|
||||||
|
);
|
||||||
|
result = preResume;
|
||||||
|
break;
|
||||||
|
}
|
||||||
gateResumeCount++;
|
gateResumeCount++;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -242,6 +320,10 @@ export async function runPostRunRetryLoop<R extends AgentResult>(params: {
|
|||||||
// already observed a clean state we skip: re-running the hook risks flaky
|
// already observed a clean state we skip: re-running the hook risks flaky
|
||||||
// false-positive failures right after it just passed.
|
// false-positive failures right after it just passed.
|
||||||
if (gateResumeCount > 0 && result.success && hasPostRunIssues(finalIssues)) {
|
if (gateResumeCount > 0 && result.success && hasPostRunIssues(finalIssues)) {
|
||||||
|
// re-check the gates that can actually fail the run (stop hook /
|
||||||
|
// dirty tree). summary-stale is intentionally NOT re-checked here:
|
||||||
|
// we already delivered the one-shot nudge, and a still-unchanged
|
||||||
|
// file at this point is the agent's deliberate choice.
|
||||||
finalIssues = await collectPostRunIssues({ stopScript: params.stopScript });
|
finalIssues = await collectPostRunIssues({ stopScript: params.stopScript });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+35
-1
@@ -42,13 +42,26 @@ export interface StopHookFailure {
|
|||||||
output: string;
|
output: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface SummaryStale {
|
||||||
|
/** absolute path to the seeded snapshot file the agent was meant to edit. */
|
||||||
|
filePath: string;
|
||||||
|
}
|
||||||
|
|
||||||
export interface PostRunIssues {
|
export interface PostRunIssues {
|
||||||
stopHook?: StopHookFailure;
|
stopHook?: StopHookFailure;
|
||||||
dirtyTree?: string;
|
dirtyTree?: string;
|
||||||
|
/** populated when the rolling PR summary file is byte-identical to its
|
||||||
|
* seed, i.e. the agent never touched it. soft gate — nudges once via a
|
||||||
|
* resume turn but never fails the run, parallel to dirtyTree semantics. */
|
||||||
|
summaryStale?: SummaryStale;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function hasPostRunIssues(issues: PostRunIssues): boolean {
|
export function hasPostRunIssues(issues: PostRunIssues): boolean {
|
||||||
return issues.stopHook !== undefined || issues.dirtyTree !== undefined;
|
return (
|
||||||
|
issues.stopHook !== undefined ||
|
||||||
|
issues.dirtyTree !== undefined ||
|
||||||
|
issues.summaryStale !== undefined
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -106,6 +119,27 @@ export interface AgentRunContext {
|
|||||||
* guidance. null when the repo has no stop hook configured.
|
* guidance. null when the repo has no stop hook configured.
|
||||||
*/
|
*/
|
||||||
stopScript?: string | null | undefined;
|
stopScript?: string | null | undefined;
|
||||||
|
/**
|
||||||
|
* absolute path to the rolling PR summary tmpfile, when one was seeded
|
||||||
|
* for this run (Review / IncrementalReview / pr-summary Task). enables
|
||||||
|
* a post-run sanity nudge that prompts the agent if the file is still
|
||||||
|
* byte-identical to its seed.
|
||||||
|
*/
|
||||||
|
summaryFilePath?: string | undefined;
|
||||||
|
/**
|
||||||
|
* exact bytes of the seeded summary file. compared against the current
|
||||||
|
* file content after each agent attempt to detect "agent forgot to edit
|
||||||
|
* the summary" — particularly common with smaller models that lose
|
||||||
|
* track of multi-step instructions.
|
||||||
|
*/
|
||||||
|
summarySeed?: string | undefined;
|
||||||
|
/**
|
||||||
|
* absolute path to the rolling repo-level learnings tmpfile. seeded for
|
||||||
|
* every run from `Repo.learnings`. used by the post-run reflection turn
|
||||||
|
* so the prompt can point the agent at a concrete path to edit; the
|
||||||
|
* file's content is read back and persisted by main.ts after the run.
|
||||||
|
*/
|
||||||
|
learningsFilePath?: string | undefined;
|
||||||
/**
|
/**
|
||||||
* called synchronously when the agent subprocess is killed for inner
|
* called synchronously when the agent subprocess is killed for inner
|
||||||
* activity timeout. lets main.ts tear down shared resources (MCP HTTP
|
* activity timeout. lets main.ts tear down shared resources (MCP HTTP
|
||||||
|
|||||||
+52
-26
@@ -2,8 +2,6 @@ import { dirname } from "node:path";
|
|||||||
import * as core from "@actions/core";
|
import * as core from "@actions/core";
|
||||||
import arg from "arg";
|
import arg from "arg";
|
||||||
import { main } from "../main.ts";
|
import { main } from "../main.ts";
|
||||||
import { log } from "../utils/cli.ts";
|
|
||||||
import { runPostCleanup } from "../utils/postCleanup.ts";
|
|
||||||
import { acquireInstallationToken, revokeInstallationToken } from "../utils/token.ts";
|
import { acquireInstallationToken, revokeInstallationToken } from "../utils/token.ts";
|
||||||
|
|
||||||
// GitHub Actions runs the action entry point with the node24 binary specified
|
// GitHub Actions runs the action entry point with the node24 binary specified
|
||||||
@@ -31,16 +29,6 @@ async function runMain(): Promise<void> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function runPost(): Promise<void> {
|
|
||||||
log.debug(`[post] script started at ${new Date().toISOString()}`);
|
|
||||||
try {
|
|
||||||
await runPostCleanup();
|
|
||||||
} catch (error) {
|
|
||||||
const message = error instanceof Error ? error.message : String(error);
|
|
||||||
log.error(`[post] unexpected error: ${message}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function tokenMain(): Promise<void> {
|
async function tokenMain(): Promise<void> {
|
||||||
const reposInput = core.getInput("repos");
|
const reposInput = core.getInput("repos");
|
||||||
const additionalRepos = reposInput
|
const additionalRepos = reposInput
|
||||||
@@ -73,7 +61,7 @@ async function tokenPost(): Promise<void> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function printGhaUsage(params: { stream: typeof console.log; prog: string }): void {
|
function printGhaUsage(params: { stream: typeof console.log; prog: string }): void {
|
||||||
params.stream(`usage: ${params.prog} gha [token] [--post]\n`);
|
params.stream(`usage: ${params.prog} gha [subcommand]\n`);
|
||||||
params.stream("run the github action runtime flow.");
|
params.stream("run the github action runtime flow.");
|
||||||
params.stream("");
|
params.stream("");
|
||||||
params.stream("subcommands:");
|
params.stream("subcommands:");
|
||||||
@@ -81,10 +69,31 @@ function printGhaUsage(params: { stream: typeof console.log; prog: string }): vo
|
|||||||
params.stream("");
|
params.stream("");
|
||||||
params.stream("options:");
|
params.stream("options:");
|
||||||
params.stream(" -h, --help show help");
|
params.stream(" -h, --help show help");
|
||||||
params.stream(" --post run post-cleanup flow");
|
}
|
||||||
|
|
||||||
|
function printGhaTokenUsage(params: { stream: typeof console.log; prog: string }): void {
|
||||||
|
params.stream(`usage: ${params.prog} gha token [--post]\n`);
|
||||||
|
params.stream("acquire a github app installation token, or revoke it in the post step.");
|
||||||
|
params.stream("");
|
||||||
|
params.stream("options:");
|
||||||
|
params.stream(" -h, --help show help");
|
||||||
|
params.stream(" --post revoke the previously-acquired token (post-step usage only)");
|
||||||
}
|
}
|
||||||
|
|
||||||
function parseGhaArgs(args: string[]) {
|
function parseGhaArgs(args: string[]) {
|
||||||
|
return arg(
|
||||||
|
{
|
||||||
|
"--help": Boolean,
|
||||||
|
"-h": "--help",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
argv: args,
|
||||||
|
stopAtPositional: true,
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseGhaTokenArgs(args: string[]) {
|
||||||
return arg(
|
return arg(
|
||||||
{
|
{
|
||||||
"--help": Boolean,
|
"--help": Boolean,
|
||||||
@@ -118,27 +127,46 @@ export async function runCli(params: GhaCliParams): Promise<void> {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const normalizedArgs = ["gha"];
|
|
||||||
const positional = parsed._;
|
const positional = parsed._;
|
||||||
|
const subcommand = positional[0];
|
||||||
|
|
||||||
if (positional.length > 1) {
|
if (!subcommand) {
|
||||||
console.error(`unexpected positional arguments for gha: ${positional.slice(1).join(" ")}\n`);
|
await run(["gha"]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (subcommand !== "token") {
|
||||||
|
console.error(`unknown gha subcommand: ${subcommand}\n`);
|
||||||
printGhaUsage({ stream: console.error, prog: params.prog });
|
printGhaUsage({ stream: console.error, prog: params.prog });
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (positional[0] === "token") {
|
// gha token [--post]
|
||||||
normalizedArgs.push("token");
|
let tokenParsed: ReturnType<typeof parseGhaTokenArgs>;
|
||||||
} else if (positional[0]) {
|
try {
|
||||||
console.error(`unknown gha subcommand: ${positional[0]}\n`);
|
tokenParsed = parseGhaTokenArgs(positional.slice(1));
|
||||||
printGhaUsage({ stream: console.error, prog: params.prog });
|
} catch (error) {
|
||||||
|
const message = error instanceof Error ? error.message : String(error);
|
||||||
|
console.error(`${message}\n`);
|
||||||
|
printGhaTokenUsage({ stream: console.error, prog: params.prog });
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (parsed["--post"]) {
|
if (tokenParsed["--help"]) {
|
||||||
|
printGhaTokenUsage({ stream: console.log, prog: params.prog });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (tokenParsed._.length > 0) {
|
||||||
|
console.error(`unexpected positional arguments for gha token: ${tokenParsed._.join(" ")}\n`);
|
||||||
|
printGhaTokenUsage({ stream: console.error, prog: params.prog });
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
const normalizedArgs = ["gha", "token"];
|
||||||
|
if (tokenParsed["--post"]) {
|
||||||
normalizedArgs.push("--post");
|
normalizedArgs.push("--post");
|
||||||
}
|
}
|
||||||
|
|
||||||
await run(normalizedArgs);
|
await run(normalizedArgs);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -150,8 +178,6 @@ export async function run(args: string[]) {
|
|||||||
} else {
|
} else {
|
||||||
await tokenMain();
|
await tokenMain();
|
||||||
}
|
}
|
||||||
} else if (args.includes("--post")) {
|
|
||||||
await runPost();
|
|
||||||
} else {
|
} else {
|
||||||
await runMain();
|
await runMain();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -281,6 +281,8 @@ export interface WriteablePayload {
|
|||||||
cwd?: string | undefined;
|
cwd?: string | undefined;
|
||||||
/** pre-created progress comment (ID + type) for updating status */
|
/** pre-created progress comment (ID + type) for updating status */
|
||||||
progressComment?: { id: string; type: "issue" | "review" } | undefined;
|
progressComment?: { id: string; type: "issue" | "review" } | undefined;
|
||||||
|
/** when true, seed the PR summary tmpfile + persist edits at run end */
|
||||||
|
generateSummary?: boolean | undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
// immutable payload type for agent execution
|
// immutable payload type for agent execution
|
||||||
|
|||||||
@@ -40,6 +40,10 @@ export {
|
|||||||
stripExistingFooter,
|
stripExistingFooter,
|
||||||
} from "../utils/buildPullfrogFooter.ts";
|
} from "../utils/buildPullfrogFooter.ts";
|
||||||
export type { ResourceUsage, UsageSummary } from "../utils/github.ts";
|
export type { ResourceUsage, UsageSummary } from "../utils/github.ts";
|
||||||
|
export {
|
||||||
|
isLeapingIntoActionCommentBody,
|
||||||
|
LEAPING_INTO_ACTION_PREFIX,
|
||||||
|
} from "../utils/leapingComment.ts";
|
||||||
export type {
|
export type {
|
||||||
CreateProgressCommentTarget,
|
CreateProgressCommentTarget,
|
||||||
ProgressComment,
|
ProgressComment,
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
// changes to tool permissions should be reflected in wiki/granular-tools.md
|
// changes to tool permissions should be reflected in wiki/granular-tools.md
|
||||||
|
|
||||||
import { existsSync, readdirSync } from "node:fs";
|
import { existsSync, readdirSync } from "node:fs";
|
||||||
|
import { readFile } from "node:fs/promises";
|
||||||
import { join } from "node:path";
|
import { join } from "node:path";
|
||||||
import * as core from "@actions/core";
|
import * as core from "@actions/core";
|
||||||
import { deleteProgressComment, reportProgress } from "./mcp/comment.ts";
|
import { deleteProgressComment, reportProgress } from "./mcp/comment.ts";
|
||||||
@@ -21,6 +22,7 @@ import {
|
|||||||
import { resolveAgent, resolveModel } from "./utils/agent.ts";
|
import { resolveAgent, resolveModel } from "./utils/agent.ts";
|
||||||
import { apiFetch } from "./utils/apiFetch.ts";
|
import { apiFetch } from "./utils/apiFetch.ts";
|
||||||
import { validateAgentApiKey } from "./utils/apiKeys.ts";
|
import { validateAgentApiKey } from "./utils/apiKeys.ts";
|
||||||
|
import { isLocalApiUrl } from "./utils/apiUrl.ts";
|
||||||
import { resolveBody } from "./utils/body.ts";
|
import { resolveBody } from "./utils/body.ts";
|
||||||
import { formatUsageSummary, log, writeSummary } from "./utils/cli.ts";
|
import { formatUsageSummary, log, writeSummary } from "./utils/cli.ts";
|
||||||
import { recordDiffReadFromToolUse } from "./utils/diffCoverage.ts";
|
import { recordDiffReadFromToolUse } from "./utils/diffCoverage.ts";
|
||||||
@@ -30,10 +32,13 @@ import { resolveGit, setGitAuthServer } from "./utils/gitAuth.ts";
|
|||||||
import { startGitAuthServer } from "./utils/gitAuthServer.ts";
|
import { startGitAuthServer } from "./utils/gitAuthServer.ts";
|
||||||
import { createOctokit, writeGitHubUsageSummaryToFile } from "./utils/github.ts";
|
import { createOctokit, writeGitHubUsageSummaryToFile } from "./utils/github.ts";
|
||||||
import { resolveInstructions } from "./utils/instructions.ts";
|
import { resolveInstructions } from "./utils/instructions.ts";
|
||||||
|
import { readLearningsFile, seedLearningsFile } from "./utils/learnings.ts";
|
||||||
import { executeLifecycleHook } from "./utils/lifecycle.ts";
|
import { executeLifecycleHook } from "./utils/lifecycle.ts";
|
||||||
import { normalizeEnv } from "./utils/normalizeEnv.ts";
|
import { normalizeEnv } from "./utils/normalizeEnv.ts";
|
||||||
import { aggregateUsage, patchWorkflowRunFields } from "./utils/patchWorkflowRunFields.ts";
|
import { aggregateUsage, patchWorkflowRunFields } from "./utils/patchWorkflowRunFields.ts";
|
||||||
import { resolvePayload, resolvePromptInput } from "./utils/payload.ts";
|
import { resolvePayload, resolvePromptInput } from "./utils/payload.ts";
|
||||||
|
import { isRouterKeylimitExhaustedError } from "./utils/providerErrors.ts";
|
||||||
|
import { readSummaryFile, seedSummaryFile } from "./utils/prSummary.ts";
|
||||||
import { postReviewCleanup } from "./utils/reviewCleanup.ts";
|
import { postReviewCleanup } from "./utils/reviewCleanup.ts";
|
||||||
import { handleAgentResult } from "./utils/run.ts";
|
import { handleAgentResult } from "./utils/run.ts";
|
||||||
import { type AccountPlan, isInfraCovered } from "./utils/runContext.ts";
|
import { type AccountPlan, isInfraCovered } from "./utils/runContext.ts";
|
||||||
@@ -160,70 +165,134 @@ class TransientError extends Error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Render a BillingError as user-facing markdown (shared between GH job summary
|
* Deep link into the right console section for the failing account. Anchors
|
||||||
* and the PR progress comment). Branches:
|
* are defined in `app/console/[owner]/page.tsx` (`#billing`, `#model-access`).
|
||||||
*
|
* `owner` is the GitHub login of the repo's account — i.e. the org or user
|
||||||
* - `router_requires_card`: the user is on Router mode with no card AND
|
* that pays for this repo's runs, which is the right scope for billing.
|
||||||
* no wallet balance. Points at the add-card flow in the console.
|
|
||||||
* - `needsReauthentication` (Stripe `authentication_required` decline): the
|
|
||||||
* issuer requires a 3D Secure challenge on each off-session charge —
|
|
||||||
* re-adding the card won't help because the issuer's policy persists
|
|
||||||
* across credentials. The escape valve is a manual top-up from the
|
|
||||||
* dashboard, where 3DS runs interactively inside Stripe Checkout.
|
|
||||||
* - default: generic "manage billing" with the declineCode appended if
|
|
||||||
* classified (insufficient_funds, lost_card, generic_decline, etc).
|
|
||||||
*/
|
*/
|
||||||
function formatBillingErrorSummary(error: BillingError): string {
|
function billingConsoleUrl(owner: string, anchor: "billing" | "model-access"): string {
|
||||||
|
return `https://pullfrog.com/console/${encodeURIComponent(owner)}#${anchor}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Render a BillingError as user-facing markdown (shared between GH job summary
|
||||||
|
* and the PR progress comment). Goals:
|
||||||
|
*
|
||||||
|
* - quiet, not alarmist — bold first line instead of an `### ❌` H3, since
|
||||||
|
* the comment already has Pullfrog branding in the footer
|
||||||
|
* - actionable — every branch ends in a single CTA deep-linked to the
|
||||||
|
* correct section of the owner's console
|
||||||
|
* - honest — say what actually went wrong (card declined vs. balance
|
||||||
|
* empty vs. 3DS required), don't lump them under "billing error"
|
||||||
|
*
|
||||||
|
* Branches:
|
||||||
|
* - `router_requires_card`: user is on Router mode with no card AND no
|
||||||
|
* wallet balance. Lead with the carrot ($20 free credit), link to
|
||||||
|
* `#model-access` where the Add Card flow lives.
|
||||||
|
* - `router_balance_exhausted`: user has a card on file but auto-reload is
|
||||||
|
* disabled and they've spent past their $5 overdraft buffer. Frame as
|
||||||
|
* "balance ran out" and surface both remediation paths (top up, or flip
|
||||||
|
* on auto-reload).
|
||||||
|
* - `router_keylimit_exhausted`: OpenRouter rejected mid-run because the
|
||||||
|
* per-run key budget was exhausted while the agent was working. The
|
||||||
|
* wallet is now negative; same remediation as `router_balance_exhausted`
|
||||||
|
* but framed for the after-the-fact case ("this run was cut short").
|
||||||
|
* - `needsReauthentication`: issuer requires 3DS on every off-session
|
||||||
|
* charge. Re-adding the card won't help — the only escape is a manual
|
||||||
|
* top-up where 3DS runs interactively in Stripe Checkout.
|
||||||
|
* - `declineCode` set: Stripe declined a real charge. Show the sub-code
|
||||||
|
* so support can act on it; tell the user we'll retry on next dispatch.
|
||||||
|
* - default: balance hit zero with no in-flight charge (auto-reload off
|
||||||
|
* or amount below threshold). Direct them to top up or enable auto-reload.
|
||||||
|
*/
|
||||||
|
function formatBillingErrorSummary(error: BillingError, owner: string): string {
|
||||||
if (error.code === "router_requires_card") {
|
if (error.code === "router_requires_card") {
|
||||||
return [
|
return [
|
||||||
"### ⛔ Pullfrog Router requires a card",
|
"**Add a card to start using Pullfrog Router.**",
|
||||||
"",
|
"",
|
||||||
"This run was going to use Pullfrog Router, which bills at raw OpenRouter cost and needs a card on file. Runs won't proceed until a card is added.",
|
"Router proxies OpenRouter at raw cost — no platform markup, and your first $20 of usage is on us.",
|
||||||
"",
|
"",
|
||||||
"[Add a card →](https://pullfrog.com/console#model-access) — your first $20 of Router usage is free.",
|
`[Add a card →](${billingConsoleUrl(owner, "model-access")})`,
|
||||||
|
].join("\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (error.code === "router_balance_exhausted") {
|
||||||
|
return [
|
||||||
|
"**Your Pullfrog Router balance is exhausted.**",
|
||||||
|
"",
|
||||||
|
"You have a card on file but auto-reload is disabled, so runs paused once your balance went past the overdraft buffer.",
|
||||||
|
"",
|
||||||
|
`[Top up balance →](${billingConsoleUrl(owner, "billing")}) · [Enable auto-reload →](${billingConsoleUrl(owner, "model-access")})`,
|
||||||
|
].join("\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (error.code === "router_keylimit_exhausted") {
|
||||||
|
return [
|
||||||
|
"**This run was cut short — your Pullfrog Router balance ran out mid-run.**",
|
||||||
|
"",
|
||||||
|
"OpenRouter stopped the agent because the per-run budget was exhausted. Your wallet is now negative; top up or enable auto-reload to keep runs flowing.",
|
||||||
|
"",
|
||||||
|
`[Top up balance →](${billingConsoleUrl(owner, "billing")}) · [Enable auto-reload →](${billingConsoleUrl(owner, "model-access")})`,
|
||||||
].join("\n");
|
].join("\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (error.needsReauthentication) {
|
if (error.needsReauthentication) {
|
||||||
|
const code = error.declineCode ?? "authentication_required";
|
||||||
return [
|
return [
|
||||||
"### ❌ Pullfrog billing error — card requires 3DS on every charge",
|
`**Your card issuer requires 3D Secure on every charge** (\`${code}\`).`,
|
||||||
"",
|
"",
|
||||||
`Your card issuer requires a 3D Secure challenge on each off-session charge (\`${error.declineCode ?? "authentication_required"}\`), which we can't run from the agent. Top up your Router credit balance manually — 3DS runs interactively in Stripe Checkout, and subsequent runs draw from the prepaid balance without triggering another off-session charge.`,
|
"Pullfrog can't complete a 3DS challenge from inside a workflow. Top up your Router balance once in Stripe Checkout — subsequent runs draw from the prepaid balance without re-triggering 3DS.",
|
||||||
"",
|
"",
|
||||||
"[Top up your Router credit balance →](https://pullfrog.com/console)",
|
`[Top up balance →](${billingConsoleUrl(owner, "billing")})`,
|
||||||
].join("\n");
|
].join("\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
const codeSuffix = error.declineCode ? ` (\`${error.declineCode}\`)` : "";
|
if (error.declineCode) {
|
||||||
return `### ❌ Pullfrog billing error\n\n${error.message}${codeSuffix}\n\n[Manage billing →](https://pullfrog.com/console)`;
|
return [
|
||||||
|
`**Your card was declined** (\`${error.declineCode}\`).`,
|
||||||
|
"",
|
||||||
|
"Update your payment method and Pullfrog will retry on the next run.",
|
||||||
|
"",
|
||||||
|
`[Update payment method →](${billingConsoleUrl(owner, "billing")})`,
|
||||||
|
].join("\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
return [
|
||||||
|
"**Your Pullfrog balance is empty.**",
|
||||||
|
"",
|
||||||
|
"Top up your balance or enable auto-reload to keep runs flowing.",
|
||||||
|
"",
|
||||||
|
`[Manage billing →](${billingConsoleUrl(owner, "billing")})`,
|
||||||
|
].join("\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Render a TransientError as user-facing markdown. Distinct framing from
|
* Render a TransientError as user-facing markdown. Distinct framing from
|
||||||
* BillingError so the user doesn't read "❌" and assume their card failed.
|
* BillingError so the user doesn't read an alarm and assume their card
|
||||||
|
* failed — this branch is "our fault, retry shortly", not theirs.
|
||||||
*/
|
*/
|
||||||
function formatTransientErrorSummary(error: TransientError): string {
|
function formatTransientErrorSummary(error: TransientError, owner: string): string {
|
||||||
return [
|
return [
|
||||||
"### ⚠️ Pullfrog temporarily unavailable",
|
"**Pullfrog billing is temporarily unavailable.**",
|
||||||
"",
|
"",
|
||||||
error.message,
|
error.message,
|
||||||
"",
|
"",
|
||||||
"This is typically transient — the next dispatch should succeed. If it persists, check [status.pullfrog.com](https://status.pullfrog.com).",
|
`Usually transient — the next dispatch should succeed. If it persists, check [status.pullfrog.com](https://status.pullfrog.com) or [your console](${billingConsoleUrl(owner, "billing")}).`,
|
||||||
].join("\n");
|
].join("\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
async function mintProxyKey(ctx: { oidcCredentials: OidcCredentials }): Promise<string | null> {
|
async function mintProxyKey(ctx: {
|
||||||
|
oidcCredentials: OidcCredentials | null;
|
||||||
|
repo: { owner: string; name: string };
|
||||||
|
}): Promise<string | null> {
|
||||||
try {
|
try {
|
||||||
process.env.ACTIONS_ID_TOKEN_REQUEST_URL = ctx.oidcCredentials.requestUrl;
|
const headers = await buildProxyTokenHeaders(ctx);
|
||||||
process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN = ctx.oidcCredentials.requestToken;
|
if (!headers) return null;
|
||||||
const oidcToken = await core.getIDToken("pullfrog-api");
|
|
||||||
delete process.env.ACTIONS_ID_TOKEN_REQUEST_URL;
|
|
||||||
delete process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN;
|
|
||||||
|
|
||||||
const response = await apiFetch({
|
const response = await apiFetch({
|
||||||
path: "/api/proxy-token",
|
path: "/api/proxy-token",
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: { Authorization: `Bearer ${oidcToken}` },
|
headers,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (response.status === 402) {
|
if (response.status === 402) {
|
||||||
@@ -269,12 +338,44 @@ async function mintProxyKey(ctx: { oidcCredentials: OidcCredentials }): Promise<
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* choose how to authenticate the `/api/proxy-token` request:
|
||||||
|
*
|
||||||
|
* - production: mint a fresh OIDC token via `core.getIDToken` and send as
|
||||||
|
* `Authorization: Bearer …` (the server verifies it cryptographically).
|
||||||
|
* - local dev (no OIDC + `API_URL` is localhost): send `x-dev-repo:
|
||||||
|
* owner/repo` instead. the server-side route only honors this header
|
||||||
|
* when `NODE_ENV === "development"`, so prod is never reachable through
|
||||||
|
* this branch even if the action is misconfigured.
|
||||||
|
*
|
||||||
|
* returns null when neither path is available — caller treats as soft skip.
|
||||||
|
*/
|
||||||
|
async function buildProxyTokenHeaders(ctx: {
|
||||||
|
oidcCredentials: OidcCredentials | null;
|
||||||
|
repo: { owner: string; name: string };
|
||||||
|
}): Promise<Record<string, string> | null> {
|
||||||
|
if (ctx.oidcCredentials) {
|
||||||
|
process.env.ACTIONS_ID_TOKEN_REQUEST_URL = ctx.oidcCredentials.requestUrl;
|
||||||
|
process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN = ctx.oidcCredentials.requestToken;
|
||||||
|
const oidcToken = await core.getIDToken("pullfrog-api");
|
||||||
|
delete process.env.ACTIONS_ID_TOKEN_REQUEST_URL;
|
||||||
|
delete process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN;
|
||||||
|
return { Authorization: `Bearer ${oidcToken}` };
|
||||||
|
}
|
||||||
|
if (isLocalApiUrl()) {
|
||||||
|
log.info(`» proxy: dev bypass (x-dev-repo) for ${ctx.repo.owner}/${ctx.repo.name}`);
|
||||||
|
return { "x-dev-repo": `${ctx.repo.owner}/${ctx.repo.name}` };
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
async function resolveProxyModel(ctx: {
|
async function resolveProxyModel(ctx: {
|
||||||
payload: ResolvedPayload;
|
payload: ResolvedPayload;
|
||||||
oss: boolean;
|
oss: boolean;
|
||||||
plan: AccountPlan;
|
plan: AccountPlan;
|
||||||
proxyModel?: string | undefined;
|
proxyModel?: string | undefined;
|
||||||
oidcCredentials: OidcCredentials | null;
|
oidcCredentials: OidcCredentials | null;
|
||||||
|
repo: { owner: string; name: string };
|
||||||
}): Promise<void> {
|
}): Promise<void> {
|
||||||
// env override = BYOK escape hatch, don't proxy
|
// env override = BYOK escape hatch, don't proxy
|
||||||
if (process.env.PULLFROG_MODEL?.trim()) return;
|
if (process.env.PULLFROG_MODEL?.trim()) return;
|
||||||
@@ -282,12 +383,15 @@ async function resolveProxyModel(ctx: {
|
|||||||
const needsProxy = isInfraCovered({ isOss: ctx.oss, plan: ctx.plan }) && ctx.proxyModel;
|
const needsProxy = isInfraCovered({ isOss: ctx.oss, plan: ctx.plan }) && ctx.proxyModel;
|
||||||
if (!needsProxy) return;
|
if (!needsProxy) return;
|
||||||
|
|
||||||
if (!ctx.oidcCredentials) {
|
// dev affordance: when talking to a localhost API, the server-side
|
||||||
|
// x-dev-repo bypass replaces OIDC verification, so a play run can
|
||||||
|
// exercise the proxy/router/oss path without GitHub Actions OIDC.
|
||||||
|
if (!ctx.oidcCredentials && !isLocalApiUrl()) {
|
||||||
log.warning("» proxy requested but no OIDC credentials available — skipping");
|
log.warning("» proxy requested but no OIDC credentials available — skipping");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const key = await mintProxyKey({ oidcCredentials: ctx.oidcCredentials });
|
const key = await mintProxyKey({ oidcCredentials: ctx.oidcCredentials, repo: ctx.repo });
|
||||||
if (!key) return;
|
if (!key) return;
|
||||||
|
|
||||||
process.env.OPENROUTER_API_KEY = key;
|
process.env.OPENROUTER_API_KEY = key;
|
||||||
@@ -297,6 +401,119 @@ async function resolveProxyModel(ctx: {
|
|||||||
log.info(`» proxy: ${label} → ${ctx.proxyModel}`);
|
log.info(`» proxy: ${label} → ${ctx.proxyModel}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fetch the most recent persisted PR summary snapshot for this PR.
|
||||||
|
* Returns null on first-time PRs, when summary is disabled, or on any error.
|
||||||
|
* Best-effort: a transient API failure should not block the run.
|
||||||
|
*/
|
||||||
|
async function fetchPreviousSnapshot(ctx: ToolContext, prNumber: number): Promise<string | null> {
|
||||||
|
if (!ctx.githubInstallationToken) return null;
|
||||||
|
try {
|
||||||
|
const response = await apiFetch({
|
||||||
|
path: `/api/repo/${ctx.repo.owner}/${ctx.repo.name}/pr/${prNumber}/summary-comment`,
|
||||||
|
method: "GET",
|
||||||
|
headers: { authorization: `Bearer ${ctx.githubInstallationToken}` },
|
||||||
|
signal: AbortSignal.timeout(10_000),
|
||||||
|
});
|
||||||
|
if (!response.ok) return null;
|
||||||
|
const data = (await response.json()) as { snapshot?: string | null };
|
||||||
|
return typeof data.snapshot === "string" && data.snapshot.length > 0 ? data.snapshot : null;
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Read the agent-edited PR summary tmpfile and persist to `WorkflowRun.summarySnapshot`.
|
||||||
|
*
|
||||||
|
* Best-effort: any failure is logged and does not affect the run's success
|
||||||
|
* status. Skips the PATCH when the file is byte-identical to its seed —
|
||||||
|
* persisting the seed verbatim would either re-write what the DB already has
|
||||||
|
* (on incremental runs) or serialize the placeholder scaffold (on first
|
||||||
|
* runs), neither of which is useful.
|
||||||
|
*/
|
||||||
|
/**
|
||||||
|
* Read the agent-edited repo-level learnings tmpfile and PATCH it to
|
||||||
|
* `Repo.learnings`.
|
||||||
|
*
|
||||||
|
* Best-effort: any failure is logged and does not affect the run's success
|
||||||
|
* status. Skips the PATCH when the file is byte-trim-identical to its seed —
|
||||||
|
* the agent didn't touch it, so writing the same content back would just
|
||||||
|
* burn a `LearningsRevision` row and an API round-trip.
|
||||||
|
*
|
||||||
|
* `model` is forwarded so `LearningsRevision.model` keeps populating; it
|
||||||
|
* powers the per-revision attribution badge in the UI history view.
|
||||||
|
*/
|
||||||
|
async function persistLearnings(ctx: ToolContext): Promise<void> {
|
||||||
|
const filePath = ctx.toolState.learningsFilePath;
|
||||||
|
if (!filePath) return;
|
||||||
|
if (ctx.toolState.learningsPersistAttempted) return;
|
||||||
|
ctx.toolState.learningsPersistAttempted = true;
|
||||||
|
const current = await readLearningsFile(filePath);
|
||||||
|
if (current === null) {
|
||||||
|
log.debug(`learnings tmpfile missing or unreadable at ${filePath} — skipping persist`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const seed = ctx.toolState.learningsSeed?.trim() ?? "";
|
||||||
|
if (current === seed) {
|
||||||
|
log.debug("learnings tmpfile unchanged from seed — skipping persist");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const response = await apiFetch({
|
||||||
|
path: `/api/repo/${ctx.repo.owner}/${ctx.repo.name}/learnings`,
|
||||||
|
method: "PATCH",
|
||||||
|
headers: {
|
||||||
|
authorization: `Bearer ${ctx.apiToken}`,
|
||||||
|
"content-type": "application/json",
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
learnings: current,
|
||||||
|
model: ctx.toolState.model,
|
||||||
|
}),
|
||||||
|
signal: AbortSignal.timeout(10_000),
|
||||||
|
});
|
||||||
|
if (!response.ok) {
|
||||||
|
const error = await response.text().catch(() => "(no body)");
|
||||||
|
log.debug(`learnings persist failed (${response.status}): ${error}`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
log.info("» learnings updated");
|
||||||
|
} catch (err) {
|
||||||
|
log.debug(`learnings persist failed: ${err instanceof Error ? err.message : String(err)}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function persistSummary(ctx: ToolContext): Promise<void> {
|
||||||
|
const filePath = ctx.toolState.summaryFilePath;
|
||||||
|
if (!filePath) return;
|
||||||
|
// already-completed guard: the error-path call (success path persisted,
|
||||||
|
// then a late step threw) and the SIGINT/SIGTERM handler all funnel
|
||||||
|
// through here; the first one to arrive wins.
|
||||||
|
if (ctx.toolState.summaryPersistAttempted) return;
|
||||||
|
ctx.toolState.summaryPersistAttempted = true;
|
||||||
|
const snapshot = await readSummaryFile(filePath);
|
||||||
|
if (!snapshot) {
|
||||||
|
log.debug(`pr summary tmpfile missing or invalid at ${filePath} — skipping persist`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// soft gate: agent never touched the seeded file. saving the seed back
|
||||||
|
// is a no-op at best (incremental run — DB already has it) and a bug at
|
||||||
|
// worst (first run — serializes the placeholder italics). log a warning
|
||||||
|
// so the failure mode is visible in CI without flipping the run to
|
||||||
|
// failed.
|
||||||
|
const seed = ctx.toolState.summarySeed?.trim();
|
||||||
|
if (seed !== undefined && snapshot === seed) {
|
||||||
|
log.warning(
|
||||||
|
"» pr summary tmpfile unchanged from seed — skipping persist (agent did not edit it)"
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
await patchWorkflowRunFields(ctx, { summarySnapshot: snapshot }).catch((err) => {
|
||||||
|
log.debug(`pr summary persist failed: ${err instanceof Error ? err.message : String(err)}`);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
async function writeJobSummary(toolState: ToolState): Promise<void> {
|
async function writeJobSummary(toolState: ToolState): Promise<void> {
|
||||||
const usageSummary = formatUsageSummary(toolState.usageEntries);
|
const usageSummary = formatUsageSummary(toolState.usageEntries);
|
||||||
const summaryParts = [toolState.lastProgressBody, usageSummary].filter(Boolean);
|
const summaryParts = [toolState.lastProgressBody, usageSummary].filter(Boolean);
|
||||||
@@ -392,10 +609,11 @@ export async function main(): Promise<MainResult> {
|
|||||||
plan: runContext.plan,
|
plan: runContext.plan,
|
||||||
proxyModel: runContext.proxyModel,
|
proxyModel: runContext.proxyModel,
|
||||||
oidcCredentials,
|
oidcCredentials,
|
||||||
|
repo: runContext.repo,
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof BillingError) {
|
if (error instanceof BillingError) {
|
||||||
const summary = formatBillingErrorSummary(error);
|
const summary = formatBillingErrorSummary(error, runContext.repo.owner);
|
||||||
await writeSummary(summary).catch(() => {});
|
await writeSummary(summary).catch(() => {});
|
||||||
// Mirror to the PR progress comment if the trigger created one
|
// Mirror to the PR progress comment if the trigger created one
|
||||||
// (mention / PR event). Without this, auto-reload declines are only
|
// (mention / PR event). Without this, auto-reload declines are only
|
||||||
@@ -405,7 +623,7 @@ export async function main(): Promise<MainResult> {
|
|||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
if (error instanceof TransientError) {
|
if (error instanceof TransientError) {
|
||||||
const summary = formatTransientErrorSummary(error);
|
const summary = formatTransientErrorSummary(error, runContext.repo.owner);
|
||||||
await writeSummary(summary).catch(() => {});
|
await writeSummary(summary).catch(() => {});
|
||||||
await reportErrorToComment({ toolState, error: summary }).catch(() => {});
|
await reportErrorToComment({ toolState, error: summary }).catch(() => {});
|
||||||
throw error;
|
throw error;
|
||||||
@@ -450,6 +668,12 @@ export async function main(): Promise<MainResult> {
|
|||||||
const resolvedModel = payload.proxyModel ? undefined : resolveModel({ slug: payload.model });
|
const resolvedModel = payload.proxyModel ? undefined : resolveModel({ slug: payload.model });
|
||||||
const agent = resolveAgent({ model: resolvedModel });
|
const agent = resolveAgent({ model: resolvedModel });
|
||||||
|
|
||||||
|
// surface the effective model in comment/review footers. payload.model is
|
||||||
|
// just the stored slug (often undefined for router/oss runs that derive
|
||||||
|
// the target from proxyModel). matching priority with resolveModelForLog
|
||||||
|
// so the "Using `…`" badge reflects what actually ran.
|
||||||
|
toolState.model = payload.proxyModel ?? resolvedModel ?? payload.model;
|
||||||
|
|
||||||
validateAgentApiKey({
|
validateAgentApiKey({
|
||||||
agent,
|
agent,
|
||||||
model: payload.proxyModel ?? resolvedModel ?? payload.model,
|
model: payload.proxyModel ?? resolvedModel ?? payload.model,
|
||||||
@@ -513,6 +737,81 @@ export async function main(): Promise<MainResult> {
|
|||||||
log.info(`» MCP server started at ${mcpHttpServer.url}`);
|
log.info(`» MCP server started at ${mcpHttpServer.url}`);
|
||||||
timer.checkpoint("mcpServer");
|
timer.checkpoint("mcpServer");
|
||||||
|
|
||||||
|
// seed the rolling repo-level learnings tmpfile for every run. the
|
||||||
|
// agent reads the file at startup (path is surfaced in the LEARNINGS
|
||||||
|
// section of the prompt) and may edit it during the post-run
|
||||||
|
// reflection turn. persistLearnings reads it back at end-of-run and
|
||||||
|
// PATCHes any changes to Repo.learnings, byte-trim equality against
|
||||||
|
// the seed gates the API call. always-seed (vs gated): learnings are
|
||||||
|
// universal — any run can produce them, and gating just hides the
|
||||||
|
// affordance.
|
||||||
|
//
|
||||||
|
// wrapped in best-effort try/catch: this block runs unconditionally,
|
||||||
|
// and an unwrapped filesystem failure (ENOSPC, EACCES, hostile sandbox)
|
||||||
|
// would unwind into the outer main() catch and flip an otherwise-
|
||||||
|
// successful run to "❌ Pullfrog failed" before the agent even starts.
|
||||||
|
// matches `persistLearnings`'s own best-effort contract — learnings
|
||||||
|
// are a peripheral artifact, not a load-bearing capability. on failure
|
||||||
|
// toolState.learningsFilePath stays unset, and downstream consumers
|
||||||
|
// (`persistLearnings`, agent harnesses, `resolveInstructions`) all
|
||||||
|
// treat undefined as "no learnings affordance this run".
|
||||||
|
try {
|
||||||
|
const learningsPath = await seedLearningsFile({
|
||||||
|
tmpdir,
|
||||||
|
current: runContext.repoSettings.learnings,
|
||||||
|
});
|
||||||
|
toolState.learningsFilePath = learningsPath;
|
||||||
|
try {
|
||||||
|
toolState.learningsSeed = await readFile(learningsPath, "utf8");
|
||||||
|
} catch {
|
||||||
|
// intentionally empty — learningsSeed stays undefined, persistLearnings
|
||||||
|
// will treat seed as "" and persist any non-empty content
|
||||||
|
}
|
||||||
|
log.info(
|
||||||
|
`» learnings seeded at ${learningsPath} (existing=${runContext.repoSettings.learnings ? "yes" : "no"})`
|
||||||
|
);
|
||||||
|
const ctxForExit = toolContext;
|
||||||
|
onExitSignal(() => persistLearnings(ctxForExit));
|
||||||
|
} catch (err) {
|
||||||
|
log.warning(
|
||||||
|
`» learnings seed failed: ${err instanceof Error ? err.message : String(err)} — continuing without learnings file`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// seed the rolling PR summary tmpfile when the dispatcher requested it.
|
||||||
|
// gated on event being a PR — issue/workflow_dispatch runs have no
|
||||||
|
// summarySnapshot to maintain. file path is exposed to the agent via
|
||||||
|
// the select_mode response addendum (action/mcp/selectMode.ts).
|
||||||
|
if (payload.generateSummary && payload.event.is_pr && payload.event.issue_number) {
|
||||||
|
const previousSnapshot = await fetchPreviousSnapshot(toolContext, payload.event.issue_number);
|
||||||
|
const filePath = await seedSummaryFile({ tmpdir, previousSnapshot });
|
||||||
|
toolState.summaryFilePath = filePath;
|
||||||
|
// capture the exact bytes the agent will see at startup. used by
|
||||||
|
// the post-run retry loop to detect the agent forgetting to edit
|
||||||
|
// the file (byte-identical to seed → nudge once via resume turn)
|
||||||
|
// and by persistSummary to skip the DB write when nothing changed.
|
||||||
|
// we just wrote the file, so the read shouldn't fail; the catch
|
||||||
|
// leaves summarySeed unset (its default), in which case the unchanged
|
||||||
|
// checks downstream are simply skipped.
|
||||||
|
try {
|
||||||
|
toolState.summarySeed = await readFile(filePath, "utf8");
|
||||||
|
} catch {
|
||||||
|
// intentionally empty — summarySeed stays undefined
|
||||||
|
}
|
||||||
|
log.info(
|
||||||
|
`» summary snapshot seeded at ${filePath} (previous=${previousSnapshot ? "yes" : "no"})`
|
||||||
|
);
|
||||||
|
// on SIGINT/SIGTERM we still want to persist whatever the agent has
|
||||||
|
// written so far. handler is best-effort: any failure inside is
|
||||||
|
// swallowed by Promise.allSettled in exitHandler.ts, and the
|
||||||
|
// summaryPersistAttempted guard prevents double-execution if the
|
||||||
|
// signal arrives after the normal path already persisted. capture a
|
||||||
|
// narrowed reference so the closure doesn't depend on the outer
|
||||||
|
// `toolContext` variable being defined later.
|
||||||
|
const ctxForExit = toolContext;
|
||||||
|
onExitSignal(() => persistSummary(ctxForExit));
|
||||||
|
}
|
||||||
|
|
||||||
startInstallation(toolContext);
|
startInstallation(toolContext);
|
||||||
|
|
||||||
const modelForLog = resolveModelForLog({ payload, resolvedModel });
|
const modelForLog = resolveModelForLog({ payload, resolvedModel });
|
||||||
@@ -530,7 +829,7 @@ export async function main(): Promise<MainResult> {
|
|||||||
modes,
|
modes,
|
||||||
agentId,
|
agentId,
|
||||||
outputSchema,
|
outputSchema,
|
||||||
learnings: runContext.repoSettings.learnings,
|
learningsFilePath: toolState.learningsFilePath ?? null,
|
||||||
});
|
});
|
||||||
const logParts = [
|
const logParts = [
|
||||||
instructions.eventInstructions
|
instructions.eventInstructions
|
||||||
@@ -578,10 +877,11 @@ export async function main(): Promise<MainResult> {
|
|||||||
toolState.todoTracker = todoTracker;
|
toolState.todoTracker = todoTracker;
|
||||||
|
|
||||||
// on cancellation, stop scheduling new tracker writes immediately. without this, a
|
// on cancellation, stop scheduling new tracker writes immediately. without this, a
|
||||||
// debounced write queued just before SIGTERM could land at GitHub *after* the post-step
|
// debounced write queued just before SIGTERM could land at GitHub *after* the
|
||||||
// writes its "This run was cancelled" message, clobbering it back to the task list.
|
// workflow_run.completed webhook has already replaced the comment with the
|
||||||
// we can't await in-flight writes (the process is exiting), but cancelling the timer
|
// "This run was cancelled" body, clobbering it back to the task list. we can't
|
||||||
// shrinks the race window. post-cleanup has its own verify-retry loop for the rest.
|
// await in-flight writes (the process is exiting), but cancelling the timer
|
||||||
|
// shrinks the race window.
|
||||||
onExitSignal(() => {
|
onExitSignal(() => {
|
||||||
todoTracker?.cancel();
|
todoTracker?.cancel();
|
||||||
});
|
});
|
||||||
@@ -624,6 +924,9 @@ export async function main(): Promise<MainResult> {
|
|||||||
instructions,
|
instructions,
|
||||||
todoTracker,
|
todoTracker,
|
||||||
stopScript: runContext.repoSettings.stopScript,
|
stopScript: runContext.repoSettings.stopScript,
|
||||||
|
summaryFilePath: toolState.summaryFilePath,
|
||||||
|
summarySeed: toolState.summarySeed,
|
||||||
|
learningsFilePath: toolState.learningsFilePath,
|
||||||
onActivityTimeout: onInnerActivityTimeout,
|
onActivityTimeout: onInnerActivityTimeout,
|
||||||
onToolUse: (event) => {
|
onToolUse: (event) => {
|
||||||
const wasTracked = recordDiffReadFromToolUse({
|
const wasTracked = recordDiffReadFromToolUse({
|
||||||
@@ -705,20 +1008,34 @@ export async function main(): Promise<MainResult> {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// clean up stranded progress comments. two cases:
|
// read the agent-edited summary tmpfile and persist to the DB. happens
|
||||||
// 1. wasUpdated=false: nothing wrote to the comment ("Leaping into action" orphan)
|
// after the agent exits so the file is in its final state.
|
||||||
// 2. tracker published a checklist but the agent never wrote a final summary
|
if (toolContext) {
|
||||||
// (hasPublished=true, finalSummaryWritten=false).
|
await persistSummary(toolContext);
|
||||||
// in both cases, delete the comment so it doesn't linger with stale content.
|
}
|
||||||
// wasUpdated is intentionally NOT set here — cleanup is not a real progress update.
|
|
||||||
// uses finalSummaryWritten (not todoTracker.enabled) so cleanup survives API failures
|
// same for the rolling repo-level learnings tmpfile. always seeded, so
|
||||||
// in report_progress where cancel() ran but the write didn't succeed.
|
// always read back; persistLearnings short-circuits when the file is
|
||||||
const trackerWasLastWriter = todoTracker?.hasPublished && !toolState.finalSummaryWritten;
|
// unchanged from its seed.
|
||||||
if (
|
if (toolContext) {
|
||||||
toolContext &&
|
await persistLearnings(toolContext);
|
||||||
toolState.progressComment &&
|
}
|
||||||
(!toolState.wasUpdated || trackerWasLastWriter)
|
|
||||||
) {
|
// clean up stranded progress comments. the comment is stale unless
|
||||||
|
// report_progress wrote a final summary to it — three sub-cases all reduce
|
||||||
|
// to !finalSummaryWritten:
|
||||||
|
// 1. nothing wrote to the comment ("Leaping into action" orphan)
|
||||||
|
// 2. tracker published a checklist but the agent never finalized it
|
||||||
|
// 3. the agent produced a substantive artifact via another MCP write tool
|
||||||
|
// (create_issue_comment, update_pull_request_body, reply_to_review_comment)
|
||||||
|
// and skipped report_progress — wasUpdated is true, but the progress
|
||||||
|
// comment itself was never touched.
|
||||||
|
// create_pull_request_review owns its own deletion (see action/mcp/review.ts),
|
||||||
|
// so progressComment is already null by the time we get here for that path.
|
||||||
|
// uses finalSummaryWritten (not todoTracker.enabled or wasUpdated) so cleanup
|
||||||
|
// survives API failures in report_progress where cancel() ran but the write
|
||||||
|
// didn't succeed, and isn't fooled by writes to *other* artifacts.
|
||||||
|
if (toolContext && toolState.progressComment && !toolState.finalSummaryWritten) {
|
||||||
await deleteProgressComment(toolContext).catch((error) => {
|
await deleteProgressComment(toolContext).catch((error) => {
|
||||||
log.debug(`stranded progress comment cleanup failed: ${error}`);
|
log.debug(`stranded progress comment cleanup failed: ${error}`);
|
||||||
});
|
});
|
||||||
@@ -744,16 +1061,32 @@ export async function main(): Promise<MainResult> {
|
|||||||
killTrackedChildren();
|
killTrackedChildren();
|
||||||
log.error(errorMessage);
|
log.error(errorMessage);
|
||||||
|
|
||||||
|
// Reclassify OpenRouter "key budget exhausted" mid-run errors as
|
||||||
|
// BillingError. The agent runtime surfaces this as a generic APIError,
|
||||||
|
// but it's a Pullfrog billing concern — the user's Router wallet ran
|
||||||
|
// out partway through the run. Route through the same formatBillingErrorSummary
|
||||||
|
// path as proxy-token 402s so the user gets actionable copy + a top-up
|
||||||
|
// CTA on both the job summary and the PR progress comment, instead of
|
||||||
|
// a generic "❌ Pullfrog failed" stack-trace dump.
|
||||||
|
const billingError = isRouterKeylimitExhaustedError(errorMessage)
|
||||||
|
? new BillingError(errorMessage, { code: "router_keylimit_exhausted" })
|
||||||
|
: null;
|
||||||
|
|
||||||
// best-effort summary — write the error so it's visible in the Actions summary tab
|
// best-effort summary — write the error so it's visible in the Actions summary tab
|
||||||
try {
|
try {
|
||||||
const errorSummary = `### ❌ Pullfrog failed\n\n\`\`\`\n${errorMessage}\n\`\`\``;
|
const errorSummary = billingError
|
||||||
|
? formatBillingErrorSummary(billingError, runContext.repo.owner)
|
||||||
|
: `### ❌ Pullfrog failed\n\n\`\`\`\n${errorMessage}\n\`\`\``;
|
||||||
const usageSummary = formatUsageSummary(toolState.usageEntries);
|
const usageSummary = formatUsageSummary(toolState.usageEntries);
|
||||||
const parts = [errorSummary, toolState.lastProgressBody, usageSummary].filter(Boolean);
|
const parts = [errorSummary, toolState.lastProgressBody, usageSummary].filter(Boolean);
|
||||||
await writeSummary(parts.join("\n\n"));
|
await writeSummary(parts.join("\n\n"));
|
||||||
} catch {}
|
} catch {}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await reportErrorToComment({ toolState, error: errorMessage });
|
const commentBody = billingError
|
||||||
|
? formatBillingErrorSummary(billingError, runContext.repo.owner)
|
||||||
|
: errorMessage;
|
||||||
|
await reportErrorToComment({ toolState, error: commentBody });
|
||||||
} catch {
|
} catch {
|
||||||
// error reporting failed, but don't let it mask the original error
|
// error reporting failed, but don't let it mask the original error
|
||||||
}
|
}
|
||||||
@@ -765,6 +1098,19 @@ export async function main(): Promise<MainResult> {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// best-effort summary persist on the error path: if the agent successfully
|
||||||
|
// edited the summary file before timing out / crashing, those edits are
|
||||||
|
// worth keeping for the next incremental run.
|
||||||
|
if (toolContext) {
|
||||||
|
await persistSummary(toolContext);
|
||||||
|
}
|
||||||
|
|
||||||
|
// same rationale for learnings: a partial edit before a crash is still
|
||||||
|
// worth keeping. persistLearnings is idempotent via learningsPersistAttempted.
|
||||||
|
if (toolContext) {
|
||||||
|
await persistLearnings(toolContext);
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
success: false,
|
success: false,
|
||||||
error: errorMessage,
|
error: errorMessage,
|
||||||
|
|||||||
+41
-1
@@ -1,5 +1,5 @@
|
|||||||
import { createHash } from "node:crypto";
|
import { createHash } from "node:crypto";
|
||||||
import { writeFileSync } from "node:fs";
|
import { statSync, unlinkSync, writeFileSync } from "node:fs";
|
||||||
import { join } from "node:path";
|
import { join } from "node:path";
|
||||||
import type { Octokit, RestEndpointMethodTypes } from "@octokit/rest";
|
import type { Octokit, RestEndpointMethodTypes } from "@octokit/rest";
|
||||||
import { type } from "arktype";
|
import { type } from "arktype";
|
||||||
@@ -275,6 +275,39 @@ type CheckoutPrBranchParams = GitContext & {
|
|||||||
beforeSha?: string | undefined;
|
beforeSha?: string | undefined;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// stale lock files left over from a crashed/cancelled prior git process block
|
||||||
|
// every subsequent fetch with `Unable to create '<path>': File exists`. only
|
||||||
|
// sweep locks older than this threshold so we never race a concurrent
|
||||||
|
// legitimate git op that's holding the lock.
|
||||||
|
const STALE_LOCK_AGE_MS = 30_000;
|
||||||
|
|
||||||
|
const GIT_LOCK_PATHS = [
|
||||||
|
".git/shallow.lock",
|
||||||
|
".git/index.lock",
|
||||||
|
".git/objects/maintenance.lock",
|
||||||
|
] as const;
|
||||||
|
|
||||||
|
function cleanupStaleGitLocks(): void {
|
||||||
|
const now = Date.now();
|
||||||
|
for (const relPath of GIT_LOCK_PATHS) {
|
||||||
|
let mtimeMs: number;
|
||||||
|
try {
|
||||||
|
mtimeMs = statSync(relPath).mtimeMs;
|
||||||
|
} catch {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (now - mtimeMs < STALE_LOCK_AGE_MS) continue;
|
||||||
|
try {
|
||||||
|
unlinkSync(relPath);
|
||||||
|
log.warning(`» removed stale ${relPath} from prior run`);
|
||||||
|
} catch (e) {
|
||||||
|
log.debug(
|
||||||
|
`» failed to remove stale ${relPath}: ${e instanceof Error ? e.message : String(e)}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Shared helper to checkout a PR branch and configure fork remotes.
|
* Shared helper to checkout a PR branch and configure fork remotes.
|
||||||
* Assumes origin remote is already configured with authentication.
|
* Assumes origin remote is already configured with authentication.
|
||||||
@@ -296,6 +329,12 @@ export async function checkoutPrBranch(
|
|||||||
rejectIfLeadingDash(pr.baseRef, "PR base ref");
|
rejectIfLeadingDash(pr.baseRef, "PR base ref");
|
||||||
rejectIfLeadingDash(pr.headRef, "PR head ref");
|
rejectIfLeadingDash(pr.headRef, "PR head ref");
|
||||||
|
|
||||||
|
// self-hosted runners and cancelled jobs frequently leave stale .git/*.lock
|
||||||
|
// files behind. without this sweep, the first fetch below aborts with
|
||||||
|
// `Unable to create '.git/shallow.lock': File exists` and the agent has to
|
||||||
|
// shell out to `rm -f` (issue #564).
|
||||||
|
cleanupStaleGitLocks();
|
||||||
|
|
||||||
const isFork = pr.headRepoFullName !== pr.baseRepoFullName;
|
const isFork = pr.headRepoFullName !== pr.baseRepoFullName;
|
||||||
|
|
||||||
// always use pr-{number} as local branch name for consistency
|
// always use pr-{number} as local branch name for consistency
|
||||||
@@ -545,6 +584,7 @@ export function CheckoutPrTool(ctx: ToolContext) {
|
|||||||
diffPath,
|
diffPath,
|
||||||
totalLines: countLines({ content: formatResult.content }),
|
totalLines: countLines({ content: formatResult.content }),
|
||||||
toc: formatResult.toc,
|
toc: formatResult.toc,
|
||||||
|
previous: ctx.toolState.diffCoverage,
|
||||||
});
|
});
|
||||||
log.debug(
|
log.debug(
|
||||||
`» diff coverage initialized: diffPath=${diffPath}, totalLines=${ctx.toolState.diffCoverage.totalLines}, tocEntries=${ctx.toolState.diffCoverage.tocEntries.length}`
|
`» diff coverage initialized: diffPath=${diffPath}, totalLines=${ctx.toolState.diffCoverage.totalLines}, tocEntries=${ctx.toolState.diffCoverage.tocEntries.length}`
|
||||||
|
|||||||
+25
-51
@@ -12,18 +12,11 @@ import {
|
|||||||
import type { ToolContext } from "./server.ts";
|
import type { ToolContext } from "./server.ts";
|
||||||
import { execute, tool } from "./shared.ts";
|
import { execute, tool } from "./shared.ts";
|
||||||
|
|
||||||
/**
|
// re-export for backward compat with anything importing the leaping helpers from mcp/comment
|
||||||
* The prefix text for the initial "leaping into action" comment.
|
export {
|
||||||
* This is used to identify if a comment is still in its initial state
|
isLeapingIntoActionCommentBody,
|
||||||
* and hasn't been updated with progress or error messages.
|
LEAPING_INTO_ACTION_PREFIX,
|
||||||
*/
|
} from "../utils/leapingComment.ts";
|
||||||
export const LEAPING_INTO_ACTION_PREFIX = "Leaping into action";
|
|
||||||
|
|
||||||
export function isLeapingIntoActionCommentBody(body: string): boolean {
|
|
||||||
const content = stripExistingFooter(body).trimStart();
|
|
||||||
const firstLine = content.split(/\r?\n/, 1)[0]?.trimEnd() ?? "";
|
|
||||||
return new RegExp(`(^|\\s)${LEAPING_INTO_ACTION_PREFIX}(\\.\\.\\.)?$`).test(firstLine);
|
|
||||||
}
|
|
||||||
|
|
||||||
function buildCommentFooter(ctx: ToolContext, customParts?: string[]): string {
|
function buildCommentFooter(ctx: ToolContext, customParts?: string[]): string {
|
||||||
const runId = ctx.runId;
|
const runId = ctx.runId;
|
||||||
@@ -63,10 +56,8 @@ export const Comment = type({
|
|||||||
issueNumber: type.number.describe("the issue number to comment on"),
|
issueNumber: type.number.describe("the issue number to comment on"),
|
||||||
body: type.string.describe("the comment body content"),
|
body: type.string.describe("the comment body content"),
|
||||||
type: type
|
type: type
|
||||||
.enumerated("Plan", "Summary", "Comment")
|
.enumerated("Plan", "Comment")
|
||||||
.describe(
|
.describe("Plan: record as the plan for this run. Comment: regular comment (default).")
|
||||||
"Plan: record as the plan for this run. Summary: record as the PR summary comment (one per PR, updated in place). Comment: regular comment (default)."
|
|
||||||
)
|
|
||||||
.optional(),
|
.optional(),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -74,35 +65,11 @@ export function CreateCommentTool(ctx: ToolContext) {
|
|||||||
return tool({
|
return tool({
|
||||||
name: "create_issue_comment",
|
name: "create_issue_comment",
|
||||||
description:
|
description:
|
||||||
"Create a comment on a GitHub issue or PR. For progress/plan updates on the current run use report_progress instead. Use type: 'Plan' for plan comments, type: 'Summary' for PR summary comments.",
|
"Create a comment on a GitHub issue or PR. For progress/plan updates on the current run use report_progress instead. Use type: 'Plan' for plan comments.",
|
||||||
parameters: Comment,
|
parameters: Comment,
|
||||||
execute: execute(async ({ issueNumber, body, type: commentType }) => {
|
execute: execute(async ({ issueNumber, body, type: commentType }) => {
|
||||||
const bodyWithFooter = addFooter(ctx, body);
|
const bodyWithFooter = addFooter(ctx, body);
|
||||||
|
|
||||||
// if a summary comment already exists (found by select_mode), update instead of creating
|
|
||||||
if (commentType === "Summary" && ctx.toolState.existingSummaryCommentId) {
|
|
||||||
log.info(
|
|
||||||
`» redirecting create_issue_comment(Summary) to update existing comment ${ctx.toolState.existingSummaryCommentId}`
|
|
||||||
);
|
|
||||||
const result = await ctx.octokit.rest.issues.updateComment({
|
|
||||||
owner: ctx.repo.owner,
|
|
||||||
repo: ctx.repo.name,
|
|
||||||
comment_id: ctx.toolState.existingSummaryCommentId,
|
|
||||||
body: bodyWithFooter,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (result.data.node_id) {
|
|
||||||
await patchWorkflowRunFields(ctx, { summaryCommentNodeId: result.data.node_id });
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
success: true,
|
|
||||||
commentId: result.data.id,
|
|
||||||
url: result.data.html_url,
|
|
||||||
body: result.data.body,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
const result = await ctx.octokit.rest.issues.createComment({
|
const result = await ctx.octokit.rest.issues.createComment({
|
||||||
owner: ctx.repo.owner,
|
owner: ctx.repo.owner,
|
||||||
repo: ctx.repo.name,
|
repo: ctx.repo.name,
|
||||||
@@ -110,6 +77,9 @@ export function CreateCommentTool(ctx: ToolContext) {
|
|||||||
body: bodyWithFooter,
|
body: bodyWithFooter,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
ctx.toolState.wasUpdated = true;
|
||||||
|
log.info(`» created comment ${result.data.id}`);
|
||||||
|
|
||||||
if (commentType === "Plan") {
|
if (commentType === "Plan") {
|
||||||
if (result.data.node_id) {
|
if (result.data.node_id) {
|
||||||
await patchWorkflowRunFields(ctx, { planCommentNodeId: result.data.node_id });
|
await patchWorkflowRunFields(ctx, { planCommentNodeId: result.data.node_id });
|
||||||
@@ -125,6 +95,7 @@ export function CreateCommentTool(ctx: ToolContext) {
|
|||||||
comment_id: result.data.id,
|
comment_id: result.data.id,
|
||||||
body: bodyWithPlanLink,
|
body: bodyWithPlanLink,
|
||||||
});
|
});
|
||||||
|
log.info(`» updated comment ${updateResult.data.id}`);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
success: true,
|
success: true,
|
||||||
@@ -134,10 +105,6 @@ export function CreateCommentTool(ctx: ToolContext) {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
if (commentType === "Summary" && result.data.node_id) {
|
|
||||||
await patchWorkflowRunFields(ctx, { summaryCommentNodeId: result.data.node_id });
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
success: true,
|
success: true,
|
||||||
commentId: result.data.id,
|
commentId: result.data.id,
|
||||||
@@ -167,6 +134,7 @@ export function EditCommentTool(ctx: ToolContext) {
|
|||||||
comment_id: commentId,
|
comment_id: commentId,
|
||||||
body: bodyWithFooter,
|
body: bodyWithFooter,
|
||||||
});
|
});
|
||||||
|
log.info(`» updated comment ${result.data.id}`);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
success: true,
|
success: true,
|
||||||
@@ -212,7 +180,7 @@ export async function reportProgress(
|
|||||||
// always track the body for job summary
|
// always track the body for job summary
|
||||||
ctx.toolState.lastProgressBody = body;
|
ctx.toolState.lastProgressBody = body;
|
||||||
|
|
||||||
// silent events (e.g., auto-label, PR summary) should never create or update progress comments.
|
// silent events (e.g., auto-label, pr-summary Task) should never create or update progress comments.
|
||||||
// the body is still tracked above for the GitHub Actions job summary.
|
// the body is still tracked above for the GitHub Actions job summary.
|
||||||
if (ctx.payload.event.silent) {
|
if (ctx.payload.event.silent) {
|
||||||
return { body, action: "skipped" };
|
return { body, action: "skipped" };
|
||||||
@@ -366,10 +334,6 @@ export function ReportProgressTool(ctx: ToolContext) {
|
|||||||
}
|
}
|
||||||
const result = await reportProgress(ctx, reportParams);
|
const result = await reportProgress(ctx, reportParams);
|
||||||
|
|
||||||
if (!params.target_plan_comment) {
|
|
||||||
ctx.toolState.finalSummaryWritten = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (result.action === "skipped") {
|
if (result.action === "skipped") {
|
||||||
return {
|
return {
|
||||||
success: true,
|
success: true,
|
||||||
@@ -378,6 +342,14 @@ export function ReportProgressTool(ctx: ToolContext) {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (result.commentId !== undefined) {
|
||||||
|
log.info(`» ${result.action} comment ${result.commentId}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!params.target_plan_comment) {
|
||||||
|
ctx.toolState.finalSummaryWritten = true;
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
success: true,
|
success: true,
|
||||||
...result,
|
...result,
|
||||||
@@ -442,8 +414,10 @@ export function ReplyToReviewCommentTool(ctx: ToolContext) {
|
|||||||
comment_id,
|
comment_id,
|
||||||
body: bodyWithFooter,
|
body: bodyWithFooter,
|
||||||
});
|
});
|
||||||
|
log.info(`» created review comment ${result.data.id} (in reply to ${comment_id})`);
|
||||||
|
|
||||||
// mark progress as updated so post script doesn't think the run failed
|
// mark progress as updated so error reporting + run-result handling know
|
||||||
|
// a substantive write happened (used by reportErrorToComment / handleAgentResult)
|
||||||
ctx.toolState.wasUpdated = true;
|
ctx.toolState.wasUpdated = true;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
+38
-3
@@ -351,6 +351,11 @@ export function PushBranchTool(ctx: ToolContext) {
|
|||||||
throw lastErr instanceof Error ? lastErr : new Error(String(lastErr));
|
throw lastErr instanceof Error ? lastErr : new Error(String(lastErr));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const pushedSha = $("git", ["rev-parse", "HEAD"], { log: false }).trim();
|
||||||
|
log.info(
|
||||||
|
`» pushed branch ${branch} to ${pushDest.remoteName}/${pushDest.remoteBranch} (sha ${pushedSha})`
|
||||||
|
);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
success: true,
|
success: true,
|
||||||
branch,
|
branch,
|
||||||
@@ -499,6 +504,21 @@ const GitFetch = type({
|
|||||||
depth: type.number.describe("Fetch depth (for shallow clones)").optional(),
|
depth: type.number.describe("Fetch depth (for shallow clones)").optional(),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// when an agent-supplied depth is too shallow to reach the merge base, git
|
||||||
|
// surfaces "Could not read <sha>" and "remote did not send all necessary
|
||||||
|
// objects". detect both wordings so a single deepen retry can recover before
|
||||||
|
// the error reaches the agent (issue #564). git emits the full OID via
|
||||||
|
// oid_to_hex, so the bound is 40 (SHA-1) or 64 (SHA-256).
|
||||||
|
const SHALLOW_UNREACHABLE_PATTERNS: RegExp[] = [
|
||||||
|
/Could not read [a-f0-9]{40,64}/,
|
||||||
|
/remote did not send all necessary objects/,
|
||||||
|
];
|
||||||
|
|
||||||
|
// large enough to clear the merge base on most real-world PRs without
|
||||||
|
// downloading the full history; matches the fallback used by checkoutPrBranch
|
||||||
|
// when the compare API is unavailable.
|
||||||
|
const DEEPEN_RETRY_DEPTH = 1000;
|
||||||
|
|
||||||
export function GitFetchTool(ctx: ToolContext) {
|
export function GitFetchTool(ctx: ToolContext) {
|
||||||
return tool({
|
return tool({
|
||||||
name: "git_fetch",
|
name: "git_fetch",
|
||||||
@@ -510,9 +530,22 @@ export function GitFetchTool(ctx: ToolContext) {
|
|||||||
if (params.depth !== undefined) {
|
if (params.depth !== undefined) {
|
||||||
fetchArgs.push(`--depth=${params.depth}`);
|
fetchArgs.push(`--depth=${params.depth}`);
|
||||||
}
|
}
|
||||||
await $git("fetch", fetchArgs, {
|
try {
|
||||||
token: ctx.gitToken,
|
await $git("fetch", fetchArgs, { token: ctx.gitToken });
|
||||||
});
|
} catch (err) {
|
||||||
|
const msg = err instanceof Error ? err.message : String(err);
|
||||||
|
const isShallowUnreachable = SHALLOW_UNREACHABLE_PATTERNS.some((p) => p.test(msg));
|
||||||
|
const isShallow =
|
||||||
|
isShallowUnreachable &&
|
||||||
|
$("git", ["rev-parse", "--is-shallow-repository"], { log: false }).trim() === "true";
|
||||||
|
if (!isShallow) throw err;
|
||||||
|
log.info(
|
||||||
|
`» git_fetch hit shallow-unreachable error, retrying with --deepen=${DEEPEN_RETRY_DEPTH}`
|
||||||
|
);
|
||||||
|
await $git("fetch", [`--deepen=${DEEPEN_RETRY_DEPTH}`, "--no-tags", "origin", params.ref], {
|
||||||
|
token: ctx.gitToken,
|
||||||
|
});
|
||||||
|
}
|
||||||
return { success: true, ref: params.ref };
|
return { success: true, ref: params.ref };
|
||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
@@ -567,6 +600,7 @@ export function DeleteBranchTool(ctx: ToolContext) {
|
|||||||
await $git("push", ["origin", "--delete", `refs/heads/${params.branchName}`], {
|
await $git("push", ["origin", "--delete", `refs/heads/${params.branchName}`], {
|
||||||
token: ctx.gitToken,
|
token: ctx.gitToken,
|
||||||
});
|
});
|
||||||
|
log.info(`» deleted branch ${params.branchName}`);
|
||||||
return { success: true, deleted: params.branchName };
|
return { success: true, deleted: params.branchName };
|
||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
@@ -597,6 +631,7 @@ export function PushTagsTool(ctx: ToolContext) {
|
|||||||
await $git("push", pushArgs, {
|
await $git("push", pushArgs, {
|
||||||
token: ctx.gitToken,
|
token: ctx.gitToken,
|
||||||
});
|
});
|
||||||
|
log.info(`» pushed tag ${params.tag}`);
|
||||||
return { success: true, tag: params.tag };
|
return { success: true, tag: params.tag };
|
||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { type } from "arktype";
|
import { type } from "arktype";
|
||||||
|
import { log } from "../utils/cli.ts";
|
||||||
import { fixDoubleEscapedString } from "../utils/fixDoubleEscapedString.ts";
|
import { fixDoubleEscapedString } from "../utils/fixDoubleEscapedString.ts";
|
||||||
import { patchWorkflowRunFields } from "../utils/patchWorkflowRunFields.ts";
|
import { patchWorkflowRunFields } from "../utils/patchWorkflowRunFields.ts";
|
||||||
import type { ToolContext } from "./server.ts";
|
import type { ToolContext } from "./server.ts";
|
||||||
@@ -32,6 +33,8 @@ export function IssueTool(ctx: ToolContext) {
|
|||||||
assignees: params.assignees ?? [],
|
assignees: params.assignees ?? [],
|
||||||
});
|
});
|
||||||
|
|
||||||
|
log.info(`» created issue #${result.data.number} (id ${result.data.id})`);
|
||||||
|
|
||||||
const nodeId = result.data.node_id;
|
const nodeId = result.data.node_id;
|
||||||
if (typeof nodeId === "string" && nodeId.length > 0) {
|
if (typeof nodeId === "string" && nodeId.length > 0) {
|
||||||
await patchWorkflowRunFields(ctx, {
|
await patchWorkflowRunFields(ctx, {
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { type } from "arktype";
|
import { type } from "arktype";
|
||||||
|
import { log } from "../utils/cli.ts";
|
||||||
import type { ToolContext } from "./server.ts";
|
import type { ToolContext } from "./server.ts";
|
||||||
import { execute, tool } from "./shared.ts";
|
import { execute, tool } from "./shared.ts";
|
||||||
|
|
||||||
@@ -20,6 +21,7 @@ export function AddLabelsTool(ctx: ToolContext) {
|
|||||||
issue_number,
|
issue_number,
|
||||||
labels,
|
labels,
|
||||||
});
|
});
|
||||||
|
log.info(`» added labels [${labels.join(", ")}] to issue #${issue_number}`);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
success: true,
|
success: true,
|
||||||
|
|||||||
@@ -1,41 +0,0 @@
|
|||||||
import { type } from "arktype";
|
|
||||||
import { apiFetch } from "../utils/apiFetch.ts";
|
|
||||||
import type { ToolContext } from "./server.ts";
|
|
||||||
import { execute, tool } from "./shared.ts";
|
|
||||||
|
|
||||||
const UpdateLearningsParams = type({
|
|
||||||
learnings: type.string.describe(
|
|
||||||
"the FULL merged learnings as a flat bullet list. each line starts with `- `. one discrete, actionable fact per bullet. combine existing bullets from the prompt with your new discoveries. deduplicate — if an existing bullet covers the same fact, update it in place rather than adding a new one. drop bullets that are clearly wrong or no longer relevant to the current codebase. keep the list focused and concise."
|
|
||||||
),
|
|
||||||
});
|
|
||||||
|
|
||||||
export function UpdateLearningsTool(ctx: ToolContext) {
|
|
||||||
return tool({
|
|
||||||
name: "update_learnings",
|
|
||||||
description:
|
|
||||||
"persist operational learnings about this repository (setup steps, test commands, key conventions, patterns). ONLY call this when you have high confidence the information is correct and broadly useful for future runs — not for one-off findings or uncertain observations. format: flat bullet list (`- ` per line, one fact per bullet). pass the FULL merged list — combine existing learnings from the prompt with new discoveries. deduplicate, and drop bullets that are clearly wrong or no longer relevant to the current codebase.",
|
|
||||||
parameters: UpdateLearningsParams,
|
|
||||||
execute: execute(async (params) => {
|
|
||||||
const response = await apiFetch({
|
|
||||||
path: `/api/repo/${ctx.repo.owner}/${ctx.repo.name}/learnings`,
|
|
||||||
method: "PATCH",
|
|
||||||
headers: {
|
|
||||||
authorization: `Bearer ${ctx.apiToken}`,
|
|
||||||
"content-type": "application/json",
|
|
||||||
},
|
|
||||||
body: JSON.stringify({
|
|
||||||
learnings: params.learnings,
|
|
||||||
model: ctx.toolState.model,
|
|
||||||
}),
|
|
||||||
signal: AbortSignal.timeout(10_000),
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
const error = await response.text();
|
|
||||||
throw new Error(`failed to update learnings: ${error}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
return { success: true };
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -48,6 +48,9 @@ export function UpdatePullRequestBodyTool(ctx: ToolContext) {
|
|||||||
pull_number: params.pull_number,
|
pull_number: params.pull_number,
|
||||||
body: bodyWithFooter,
|
body: bodyWithFooter,
|
||||||
});
|
});
|
||||||
|
log.info(`» updated pull request #${result.data.number}`);
|
||||||
|
|
||||||
|
ctx.toolState.wasUpdated = true;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
success: true,
|
success: true,
|
||||||
@@ -78,6 +81,7 @@ export function CreatePullRequestTool(ctx: ToolContext) {
|
|||||||
base: params.base,
|
base: params.base,
|
||||||
draft: params.draft ?? false,
|
draft: params.draft ?? false,
|
||||||
});
|
});
|
||||||
|
log.info(`» created pull request #${result.data.number} (id ${result.data.id})`);
|
||||||
|
|
||||||
// best-effort: request review from the user who triggered the workflow
|
// best-effort: request review from the user who triggered the workflow
|
||||||
const reviewer = ctx.payload.triggerer;
|
const reviewer = ctx.payload.triggerer;
|
||||||
|
|||||||
+2
-2
@@ -648,8 +648,8 @@ describe("reviewSkipDecision", () => {
|
|||||||
describe("duplicateReviewDecision", () => {
|
describe("duplicateReviewDecision", () => {
|
||||||
// regression: colinhacks/zod#5897 had two reviews submitted from the same
|
// regression: colinhacks/zod#5897 had two reviews submitted from the same
|
||||||
// workflow run 8 seconds apart — a substantive review followed by an empty
|
// workflow run 8 seconds apart — a substantive review followed by an empty
|
||||||
// "Reviewed — no issues found." follow-up. the agent re-classified the
|
// "No new issues found." follow-up. the agent re-classified the first
|
||||||
// first review's non-blocking observations as "no actionable issues" and
|
// review's non-blocking observations as "no actionable issues" and
|
||||||
// submitted the canonical body per modes.ts. this guard makes the second
|
// submitted the canonical body per modes.ts. this guard makes the second
|
||||||
// call a no-op without burning a GitHub API call or polluting the PR.
|
// call a no-op without burning a GitHub API call or polluting the PR.
|
||||||
|
|
||||||
|
|||||||
+70
-9
@@ -11,6 +11,7 @@ import {
|
|||||||
} from "../utils/diffCoverage.ts";
|
} from "../utils/diffCoverage.ts";
|
||||||
import { fixDoubleEscapedString } from "../utils/fixDoubleEscapedString.ts";
|
import { fixDoubleEscapedString } from "../utils/fixDoubleEscapedString.ts";
|
||||||
import { patchWorkflowRunFields } from "../utils/patchWorkflowRunFields.ts";
|
import { patchWorkflowRunFields } from "../utils/patchWorkflowRunFields.ts";
|
||||||
|
import { retry } from "../utils/retry.ts";
|
||||||
import { deleteProgressComment } from "./comment.ts";
|
import { deleteProgressComment } from "./comment.ts";
|
||||||
import type { ToolContext } from "./server.ts";
|
import type { ToolContext } from "./server.ts";
|
||||||
import { execute, tool } from "./shared.ts";
|
import { execute, tool } from "./shared.ts";
|
||||||
@@ -21,6 +22,29 @@ function getHttpStatus(err: unknown): number | undefined {
|
|||||||
return typeof status === "number" ? status : undefined;
|
return typeof status === "number" ? status : undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* detect GitHub's generic server-side 422 ("An internal error occurred,
|
||||||
|
* please try again.") that sometimes fires on `POST /pulls/{n}/reviews`.
|
||||||
|
*
|
||||||
|
* the body is stable across occurrences and distinct from every other 422
|
||||||
|
* cause we care about (anchor validation, body length, malformed suggestion
|
||||||
|
* blocks) — those all cite the specific problem. treating this as a
|
||||||
|
* transient server error unlocks bounded in-tool retry instead of surfacing
|
||||||
|
* it to the agent with the generic "likely causes (1)(2)(3)" prompt, which
|
||||||
|
* induces whack-a-mole comment dropping on content that was never the issue.
|
||||||
|
*/
|
||||||
|
export function isTransientReviewError(err: unknown): boolean {
|
||||||
|
if (getHttpStatus(err) !== 422) return false;
|
||||||
|
const msg = err instanceof Error ? err.message : String(err);
|
||||||
|
return /internal error occurred, please try again/i.test(msg);
|
||||||
|
}
|
||||||
|
|
||||||
|
// backoff schedule for transient GitHub 422 "internal error" responses on the
|
||||||
|
// reviews endpoint. 3 attempts total (initial + 2 retries) with 1s/3s delays
|
||||||
|
// — most transient GH errors clear within a few seconds, and longer delays
|
||||||
|
// push review submission past agent-perceived responsiveness.
|
||||||
|
export const TRANSIENT_REVIEW_RETRY_DELAYS_MS = [1_000, 3_000];
|
||||||
|
|
||||||
type PullFile = RestEndpointMethodTypes["pulls"]["listFiles"]["response"]["data"][number];
|
type PullFile = RestEndpointMethodTypes["pulls"]["listFiles"]["response"]["data"][number];
|
||||||
export type CommentableLines = { RIGHT: Set<number>; LEFT: Set<number> };
|
export type CommentableLines = { RIGHT: Set<number>; LEFT: Set<number> };
|
||||||
|
|
||||||
@@ -187,8 +211,8 @@ export type DuplicateReviewDecision = {
|
|||||||
* the agent is instructed to call create_pull_request_review exactly once per
|
* the agent is instructed to call create_pull_request_review exactly once per
|
||||||
* Review-mode session (see action/modes.ts), but in practice it sometimes
|
* Review-mode session (see action/modes.ts), but in practice it sometimes
|
||||||
* submits twice — once with substantive feedback, then again with the
|
* submits twice — once with substantive feedback, then again with the
|
||||||
* canonical "Reviewed — no issues found." body when the prompt's branch
|
* canonical "No new issues found." body when the prompt's branch logic
|
||||||
* logic re-classifies non-blocking observations. the second submission is
|
* re-classifies non-blocking observations. the second submission is
|
||||||
* always redundant: the first review is the record, and the duplicate just
|
* always redundant: the first review is the record, and the duplicate just
|
||||||
* adds noise to the PR.
|
* adds noise to the PR.
|
||||||
*
|
*
|
||||||
@@ -483,16 +507,50 @@ export function CreatePullRequestReviewTool(ctx: ToolContext) {
|
|||||||
|
|
||||||
// no body → single-step createReview (no footer needed)
|
// no body → single-step createReview (no footer needed)
|
||||||
// has body → pending + submit so we can build footer with Fix links using review ID
|
// has body → pending + submit so we can build footer with Fix links using review ID
|
||||||
|
//
|
||||||
|
// wrap the submission in `retry` so GitHub's transient 422 "internal
|
||||||
|
// error" body (distinct from anchor / body-length / suggestion 422s,
|
||||||
|
// which all cite the specific cause) clears on its own instead of
|
||||||
|
// surfacing through the generic 422 handler — that framing sent the
|
||||||
|
// agent dropping valid inline comments chasing a non-issue.
|
||||||
|
// `shouldRetry` scopes retries to the transient body only, so real
|
||||||
|
// validation 422s still fail fast.
|
||||||
let result;
|
let result;
|
||||||
try {
|
try {
|
||||||
result = body
|
result = await retry(
|
||||||
? await createAndSubmitWithFooter(ctx, params, {
|
() =>
|
||||||
body,
|
body
|
||||||
approved: approved ?? false,
|
? createAndSubmitWithFooter(ctx, params, {
|
||||||
hasComments: (params.comments?.length ?? 0) > 0,
|
body,
|
||||||
})
|
approved: approved ?? false,
|
||||||
: await createReviewWithStrandedRecovery(ctx, params);
|
hasComments: (params.comments?.length ?? 0) > 0,
|
||||||
|
})
|
||||||
|
: createReviewWithStrandedRecovery(ctx, params),
|
||||||
|
{
|
||||||
|
delaysMs: TRANSIENT_REVIEW_RETRY_DELAYS_MS,
|
||||||
|
shouldRetry: isTransientReviewError,
|
||||||
|
label: "review submission",
|
||||||
|
}
|
||||||
|
);
|
||||||
} catch (err: unknown) {
|
} catch (err: unknown) {
|
||||||
|
// GitHub's transient 422 "internal error" is distinct from anchor /
|
||||||
|
// body-length / suggestion validation failures — framing it with the
|
||||||
|
// generic "likely causes (1)(2)(3)" prompt sends the agent dropping
|
||||||
|
// comments that were never the problem. after bounded in-tool retry
|
||||||
|
// we surface a dedicated message that tells the agent to wait-and-
|
||||||
|
// retry or fall back to a body-only review.
|
||||||
|
if (isTransientReviewError(err)) {
|
||||||
|
const rawMsg = err instanceof Error ? err.message : String(err);
|
||||||
|
throw new Error(
|
||||||
|
`GitHub returned a transient 422 "internal error" on the reviews endpoint after ${TRANSIENT_REVIEW_RETRY_DELAYS_MS.length + 1} attempts. ` +
|
||||||
|
`This is a GitHub-side issue, not a problem with your review content. ` +
|
||||||
|
`Do NOT modify or drop inline comments — their content is not the cause. ` +
|
||||||
|
`Wait ~30 seconds and call this tool once more with the SAME arguments. ` +
|
||||||
|
`If it still fails, submit a body-only review (move all inline feedback into \`body\` as text) so nothing is lost. ` +
|
||||||
|
`GitHub said: ${rawMsg}`,
|
||||||
|
{ cause: err }
|
||||||
|
);
|
||||||
|
}
|
||||||
if (getHttpStatus(err) !== 422 || !params.comments?.length) throw err;
|
if (getHttpStatus(err) !== 422 || !params.comments?.length) throw err;
|
||||||
|
|
||||||
const details = params.comments.map((c) => {
|
const details = params.comments.map((c) => {
|
||||||
@@ -526,6 +584,7 @@ export function CreatePullRequestReviewTool(ctx: ToolContext) {
|
|||||||
}
|
}
|
||||||
const reviewId = result.data.id;
|
const reviewId = result.data.id;
|
||||||
const reviewNodeId = result.data.node_id;
|
const reviewNodeId = result.data.node_id;
|
||||||
|
log.info(`» created review ${reviewId} on pull request #${pull_number}`);
|
||||||
|
|
||||||
// reviewedSha = what the agent actually reviewed (checkout SHA), not the
|
// reviewedSha = what the agent actually reviewed (checkout SHA), not the
|
||||||
// submission anchor (current HEAD). this ensures postReviewCleanup dispatches
|
// submission anchor (current HEAD). this ensures postReviewCleanup dispatches
|
||||||
@@ -537,6 +596,8 @@ export function CreatePullRequestReviewTool(ctx: ToolContext) {
|
|||||||
reviewedSha: actuallyReviewedSha,
|
reviewedSha: actuallyReviewedSha,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
ctx.toolState.wasUpdated = true;
|
||||||
|
|
||||||
// a submitted review obsoletes the progress comment — the review IS the
|
// a submitted review obsoletes the progress comment — the review IS the
|
||||||
// durable artifact. owned here (not in main.ts) so cleanup is atomic with
|
// durable artifact. owned here (not in main.ts) so cleanup is atomic with
|
||||||
// submission and survives any path out of the run (success, timeout,
|
// submission and survives any path out of the run (success, timeout,
|
||||||
|
|||||||
@@ -735,7 +735,7 @@ export function ResolveReviewThreadTool(ctx: ToolContext) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const thread = response.resolveReviewThread.thread;
|
const thread = response.resolveReviewThread.thread;
|
||||||
log.debug(`resolved thread ${thread.id}, isResolved=${thread.isResolved}`);
|
log.info(`» resolved review thread ${thread.id}`);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
thread_id: thread.id,
|
thread_id: thread.id,
|
||||||
|
|||||||
+39
-61
@@ -1,14 +1,13 @@
|
|||||||
import { type } from "arktype";
|
import { type } from "arktype";
|
||||||
import { formatMcpToolRef } from "../external.ts";
|
import { formatMcpToolRef } from "../external.ts";
|
||||||
import { type Mode, PR_SUMMARY_FORMAT } from "../modes.ts";
|
import type { Mode } from "../modes.ts";
|
||||||
import { apiFetch } from "../utils/apiFetch.ts";
|
import { apiFetch } from "../utils/apiFetch.ts";
|
||||||
import { log } from "../utils/log.ts";
|
|
||||||
import type { ToolContext } from "./server.ts";
|
import type { ToolContext } from "./server.ts";
|
||||||
import { execute, tool } from "./shared.ts";
|
import { execute, tool } from "./shared.ts";
|
||||||
|
|
||||||
export const SelectModeParams = type({
|
export const SelectModeParams = type({
|
||||||
mode: type.string.describe(
|
mode: type.string.describe(
|
||||||
"the name of the mode to select (e.g., 'Build', 'Plan', 'Review', 'IncrementalReview', 'Fix', 'AddressReviews', 'Task', 'ResolveConflicts', 'Summarize')"
|
"the name of the mode to select (e.g., 'Build', 'Plan', 'Review', 'IncrementalReview', 'Fix', 'AddressReviews', 'Task', 'ResolveConflicts')"
|
||||||
),
|
),
|
||||||
"issue_number?": type("number").describe(
|
"issue_number?": type("number").describe(
|
||||||
"optional issue number; when provided with Plan mode, used to look up an existing plan comment for this issue (edit vs create)"
|
"optional issue number; when provided with Plan mode, used to look up an existing plan comment for this issue (edit vs create)"
|
||||||
@@ -32,18 +31,6 @@ An existing plan comment was found for this issue. Update that comment with the
|
|||||||
- produce a structured plan with clear milestones
|
- produce a structured plan with clear milestones
|
||||||
3. Call \`${t("report_progress")}\` with the full revised plan text and \`{ target_plan_comment: true }\` so it updates the existing plan comment (not the progress comment).
|
3. Call \`${t("report_progress")}\` with the full revised plan text and \`{ target_plan_comment: true }\` so it updates the existing plan comment (not the progress comment).
|
||||||
4. Then post a short note to the progress comment (e.g. "Plan has been updated in the comment above.") via \`${t("report_progress")}\` so it is not left as "Leaping...".`,
|
4. Then post a short note to the progress comment (e.g. "Plan has been updated in the comment above.") via \`${t("report_progress")}\` so it is not left as "Leaping...".`,
|
||||||
|
|
||||||
SummaryUpdate: `### Checklist (updating existing summary)
|
|
||||||
|
|
||||||
An existing summary comment was found for this PR. Update it rather than creating a new one.
|
|
||||||
|
|
||||||
1. Use \`previousSummaryBody\` from this response as the current summary to revise.
|
|
||||||
2. Checkout the PR via \`${t("checkout_pr")}\` — this returns PR metadata and a \`diffPath\`.
|
|
||||||
3. Read the diff using the TOC to selectively read relevant sections. Produce an updated summary reflecting the current state of the PR, using the existing summary (\`previousSummaryBody\`) as a starting point. If EVENT INSTRUCTIONS specify a custom format, follow that instead of the default format below.
|
|
||||||
4. Call \`${t("edit_issue_comment")}\` with \`commentId: existingSummaryCommentId\` (from this response) and the updated summary body.
|
|
||||||
5. Call \`${t("report_progress")}\` with a brief note (e.g., "Updated PR summary.").
|
|
||||||
|
|
||||||
${PR_SUMMARY_FORMAT}`,
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -78,10 +65,7 @@ function buildOrchestratorGuidance(
|
|||||||
// matches the API response for /repo/[owner]/[repo]/issue/[issueNumber]/plan-comment
|
// matches the API response for /repo/[owner]/[repo]/issue/[issueNumber]/plan-comment
|
||||||
export type PlanCommentResponsePayload = { error: string } | { commentId: number; body: string };
|
export type PlanCommentResponsePayload = { error: string } | { commentId: number; body: string };
|
||||||
|
|
||||||
// matches the API response for /repo/[owner]/[repo]/pr/[prNumber]/summary-comment
|
// IMPORTANT: this route authenticates via GitHub installation token (getEnrichedRepo),
|
||||||
export type SummaryCommentResponsePayload = { error: string } | { commentId: number; body: string };
|
|
||||||
|
|
||||||
// IMPORTANT: these routes authenticate via GitHub installation token (getEnrichedRepo),
|
|
||||||
// NOT the Pullfrog API JWT (ctx.apiToken). use ctx.githubInstallationToken here.
|
// NOT the Pullfrog API JWT (ctx.apiToken). use ctx.githubInstallationToken here.
|
||||||
// see wiki/api-auth.md for the two auth patterns.
|
// see wiki/api-auth.md for the two auth patterns.
|
||||||
async function fetchExistingPlanComment(
|
async function fetchExistingPlanComment(
|
||||||
@@ -103,33 +87,30 @@ async function fetchExistingPlanComment(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function fetchExistingSummaryComment(
|
const SUMMARY_MODES = new Set(["Review", "IncrementalReview", "Task"]);
|
||||||
ctx: ToolContext,
|
|
||||||
prNumber: number
|
/** modes that gain the PR summary edit step when toolState.summaryFilePath is set.
|
||||||
): Promise<Extract<SummaryCommentResponsePayload, { commentId: number }> | null> {
|
*
|
||||||
if (!ctx.githubInstallationToken) {
|
* NOTE: this snapshot is an internal artifact consumed by future agent runs. it is
|
||||||
log.warning("fetchExistingSummaryComment: no token, skipping");
|
* deliberately NOT shaped by user-supplied summary instructions — those would warp
|
||||||
return null;
|
* the durable agent context. user-facing summarization (e.g. the review body's
|
||||||
}
|
* "Reviewed changes" section) is governed by review-mode prompts and review
|
||||||
const path = `/api/repo/${ctx.repo.owner}/${ctx.repo.name}/pr/${prNumber}/summary-comment`;
|
* instructions, separately from this snapshot. */
|
||||||
try {
|
function buildSummaryAddendum(t: (name: string) => string, ctx: ToolContext): string {
|
||||||
const response = await apiFetch({
|
const filePath = ctx.toolState.summaryFilePath;
|
||||||
path,
|
if (!filePath) return "";
|
||||||
method: "GET",
|
return `### PR summary snapshot — required step
|
||||||
headers: { authorization: `Bearer ${ctx.githubInstallationToken}` },
|
|
||||||
signal: AbortSignal.timeout(10_000),
|
A rolling PR summary lives at \`${filePath}\`. It is your durable cross-run agent context — a functional summary of what this PR does, the subsystems and files it touches, the material behavior of its changes, and any risks or open questions worth carrying forward. It is NOT a chronological log of past review runs; commit-level history can already be reconstructed from \`${t("list_pull_request_reviews")}\`.
|
||||||
});
|
|
||||||
const data = (await response.json()) as SummaryCommentResponsePayload;
|
How to use it:
|
||||||
if (response.ok && "commentId" in data) {
|
|
||||||
return data;
|
- read \`${filePath}\` at the START of the run, alongside the diff. it represents what previous agent runs already understood about this PR — absorb it before picking lenses or crafting subagent dispatch prompts. if it's a fresh seed (file is one or two lines), this is a first review and you'll be filling it in from the diff.
|
||||||
}
|
- let the snapshot inform triage and dispatch. when it already tracks a risk, your lens prompts to subagents are stronger when they reference that context (e.g. "the JSDoc explicitly scopes to code points — do not flag grapheme-cluster issues" if the snapshot already documents that contract). when something the snapshot tracks is now resolved by new commits, note that. when new commits introduce something the snapshot doesn't yet describe, that's exactly where your fan-out should focus.
|
||||||
const errMsg = "error" in data ? data.error : "(no error body)";
|
- update the file in place to reflect the PR's CURRENT state. revise stale claims, drop resolved risks, add new behavior or risks. accuracy over breadth — every claim must be grounded in the diff. write for the next agent run, not for a human.
|
||||||
log.warning(`fetchExistingSummaryComment: ${response.status} ${path} — ${errMsg}`);
|
- structure however serves THIS PR. there is no required section template. a refactor might organize by renamed export and call-site impact; a feature by capability; a billing change by money path. a compact note of which commit ranges have been reviewed should always be present so future runs scope correctly, but the rest is your call. when the structure works across runs, keep it stable so range-diffs are clean; when the PR's character changes (e.g. scope expands), reshape.
|
||||||
return null;
|
|
||||||
} catch (error) {
|
Do NOT call \`${t("create_issue_comment")}\` for the summary — the server reads this file at end-of-run and persists it. The file edit is mandatory regardless of whether a review is submitted; the snapshot feeds the next run.`;
|
||||||
log.warning("fetchExistingSummaryComment failed:", error);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function SelectModeTool(ctx: ToolContext) {
|
export function SelectModeTool(ctx: ToolContext) {
|
||||||
@@ -180,22 +161,19 @@ export function SelectModeTool(ctx: ToolContext) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (selectedMode.name === "Summarize") {
|
const summaryAddendum = SUMMARY_MODES.has(selectedMode.name)
|
||||||
const prNumber = ctx.payload.event.issue_number;
|
? buildSummaryAddendum(t, ctx)
|
||||||
if (prNumber !== undefined) {
|
: "";
|
||||||
const existing = await fetchExistingSummaryComment(ctx, prNumber);
|
|
||||||
if (existing !== null) {
|
|
||||||
ctx.toolState.existingSummaryCommentId = existing.commentId;
|
|
||||||
return {
|
|
||||||
...buildOrchestratorGuidance(ctx, selectedMode, overrides.SummaryUpdate),
|
|
||||||
existingSummaryCommentId: existing.commentId,
|
|
||||||
previousSummaryBody: existing.body,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return buildOrchestratorGuidance(ctx, selectedMode);
|
const base = buildOrchestratorGuidance(ctx, selectedMode);
|
||||||
|
if (summaryAddendum.length > 0) {
|
||||||
|
return {
|
||||||
|
...base,
|
||||||
|
orchestratorGuidance: `${base.orchestratorGuidance}\n\n${summaryAddendum}`,
|
||||||
|
summaryFilePath: ctx.toolState.summaryFilePath,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return base;
|
||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
+32
-6
@@ -39,7 +39,6 @@ import { GetIssueCommentsTool } from "./issueComments.ts";
|
|||||||
import { GetIssueEventsTool } from "./issueEvents.ts";
|
import { GetIssueEventsTool } from "./issueEvents.ts";
|
||||||
import { IssueInfoTool } from "./issueInfo.ts";
|
import { IssueInfoTool } from "./issueInfo.ts";
|
||||||
import { AddLabelsTool } from "./labels.ts";
|
import { AddLabelsTool } from "./labels.ts";
|
||||||
import { UpdateLearningsTool } from "./learnings.ts";
|
|
||||||
import { SetOutputTool } from "./output.ts";
|
import { SetOutputTool } from "./output.ts";
|
||||||
import { CreatePullRequestTool, UpdatePullRequestBodyTool } from "./pr.ts";
|
import { CreatePullRequestTool, UpdatePullRequestBodyTool } from "./pr.ts";
|
||||||
import { PullRequestInfoTool } from "./prInfo.ts";
|
import { PullRequestInfoTool } from "./prInfo.ts";
|
||||||
@@ -128,8 +127,36 @@ export interface ToolState {
|
|||||||
// set by select_mode when Plan + issue_number and plan-comment API returns existing plan (for report_progress target_plan_comment)
|
// set by select_mode when Plan + issue_number and plan-comment API returns existing plan (for report_progress target_plan_comment)
|
||||||
existingPlanCommentId?: number;
|
existingPlanCommentId?: number;
|
||||||
previousPlanBody?: string;
|
previousPlanBody?: string;
|
||||||
// set by select_mode when Summarize mode and summary-comment API returns existing summary
|
// absolute path to the PR summary markdown file the agent edits in place.
|
||||||
existingSummaryCommentId?: number;
|
// seeded by main.ts before the agent starts when payload.generateSummary is set;
|
||||||
|
// read back at end-of-run to persist to DB.
|
||||||
|
summaryFilePath?: string;
|
||||||
|
// exact bytes of the seeded snapshot file at run start. compared against
|
||||||
|
// the file content at end-of-run to detect "agent never touched it" — in
|
||||||
|
// that case persistSummary skips the DB write (saving the seed verbatim
|
||||||
|
// would either re-write what the DB already has, on incremental runs, or
|
||||||
|
// serialize the placeholder scaffold, on first runs).
|
||||||
|
summarySeed?: string;
|
||||||
|
// set to true after persistSummary completes once. prevents the error-path
|
||||||
|
// call (which exists so a successful agent edit before a crash still gets
|
||||||
|
// persisted) from redundantly re-running the DB PATCH on the
|
||||||
|
// success-then-late-throw path.
|
||||||
|
summaryPersistAttempted?: boolean;
|
||||||
|
// absolute path to the rolling repo-level learnings markdown file the
|
||||||
|
// agent reads at startup and may edit at end-of-run. seeded by main.ts
|
||||||
|
// for every run from `Repo.learnings` (empty file when no learnings
|
||||||
|
// exist yet); read back at end-of-run to persist any edits.
|
||||||
|
learningsFilePath?: string;
|
||||||
|
// exact bytes of the seeded learnings file at run start. compared
|
||||||
|
// against the file content at end-of-run to detect "agent never touched
|
||||||
|
// it" — in that case persistLearnings skips the DB PATCH (saving the
|
||||||
|
// identical content would be a no-op write that wastes a LearningsRevision
|
||||||
|
// row and the API round-trip).
|
||||||
|
learningsSeed?: string;
|
||||||
|
// mirror of `summaryPersistAttempted` for the learnings tmpfile — guards
|
||||||
|
// the error-path / exit-signal callers from a redundant second PATCH
|
||||||
|
// after the success path already persisted.
|
||||||
|
learningsPersistAttempted?: boolean;
|
||||||
output?: string;
|
output?: string;
|
||||||
usageEntries: AgentUsage[];
|
usageEntries: AgentUsage[];
|
||||||
model?: string | undefined;
|
model?: string | undefined;
|
||||||
@@ -176,8 +203,8 @@ export interface ToolContext {
|
|||||||
tmpdir: string;
|
tmpdir: string;
|
||||||
// repo-level OSS flag + account-level billing plan. together they decide
|
// repo-level OSS flag + account-level billing plan. together they decide
|
||||||
// whether pullfrog is paying for marginal infra — see isInfraCovered in
|
// whether pullfrog is paying for marginal infra — see isInfraCovered in
|
||||||
// utils/runContext.ts. plan gating for things like update_learnings is
|
// utils/runContext.ts. plan gating for endpoints like the learnings PATCH
|
||||||
// enforced server-side via 402, so we pass plan along mostly for future
|
// is enforced server-side via 402, so we pass plan along mostly for future
|
||||||
// use / observability. see wiki/pricing.md.
|
// use / observability. see wiki/pricing.md.
|
||||||
oss: boolean;
|
oss: boolean;
|
||||||
plan: AccountPlan;
|
plan: AccountPlan;
|
||||||
@@ -275,7 +302,6 @@ function buildOrchestratorTools(ctx: ToolContext, outputSchema?: JsonSchema): To
|
|||||||
DeleteBranchTool(ctx),
|
DeleteBranchTool(ctx),
|
||||||
CreatePullRequestTool(ctx),
|
CreatePullRequestTool(ctx),
|
||||||
UpdatePullRequestBodyTool(ctx),
|
UpdatePullRequestBodyTool(ctx),
|
||||||
UpdateLearningsTool(ctx),
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import * as path from "node:path";
|
|||||||
import { type } from "arktype";
|
import { type } from "arktype";
|
||||||
import { fileTypeFromBuffer } from "file-type";
|
import { fileTypeFromBuffer } from "file-type";
|
||||||
import { apiFetch } from "../utils/apiFetch.ts";
|
import { apiFetch } from "../utils/apiFetch.ts";
|
||||||
|
import { log } from "../utils/cli.ts";
|
||||||
import type { ToolContext } from "./server.ts";
|
import type { ToolContext } from "./server.ts";
|
||||||
import { execute, tool } from "./shared.ts";
|
import { execute, tool } from "./shared.ts";
|
||||||
|
|
||||||
@@ -65,6 +66,8 @@ export function UploadFileTool(ctx: ToolContext) {
|
|||||||
throw new Error(`failed to upload file: ${uploadResponse.statusText}`);
|
throw new Error(`failed to upload file: ${uploadResponse.statusText}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
log.info(`» uploaded file ${publicUrl}`);
|
||||||
|
|
||||||
return { success: true, publicUrl, filename, contentLength, contentType };
|
return { success: true, publicUrl, filename, contentLength, contentType };
|
||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -10,6 +10,12 @@ export interface Mode {
|
|||||||
prompt?: string | undefined;
|
prompt?: string | undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Default user-facing summary format embedded in Review mode review bodies.
|
||||||
|
// Deliberately scoped to Review (initial PR review). IncrementalReview keeps
|
||||||
|
// its own terser bullet-list "Reviewed changes" shape since re-review bodies
|
||||||
|
// are deltas, not introductions. Distinct from the agent-internal snapshot
|
||||||
|
// (action/utils/prSummary.ts) which has its own stable scaffold and is never
|
||||||
|
// shaped by user instructions — see selectMode.ts for the firewall.
|
||||||
export const PR_SUMMARY_FORMAT = `### Default format
|
export const PR_SUMMARY_FORMAT = `### Default format
|
||||||
|
|
||||||
Follow this structure exactly:
|
Follow this structure exactly:
|
||||||
@@ -59,10 +65,6 @@ Rules:
|
|||||||
- Focus on *intent*, not *what* — the diff already shows what changed
|
- Focus on *intent*, not *what* — the diff already shows what changed
|
||||||
- Get the file count and commit count from the checkout_pr metadata, not by counting manually`;
|
- Get the file count and commit count from the checkout_pr metadata, not by counting manually`;
|
||||||
|
|
||||||
function learningsStep(t: (toolName: string) => string, n: number): string {
|
|
||||||
return `${n}. **learnings** (only if high confidence): if you discovered something about repo setup, test commands, conventions, or patterns that you are confident is correct and would reliably help future runs, call \`${t("update_learnings")}\` to persist it. skip this step if you are unsure or the finding is speculative/one-off. format as a flat bullet list (\`- \` per line, one fact per bullet). merge with existing learnings from the prompt — pass the FULL merged list. deduplicate, and drop bullets that are clearly wrong or no longer relevant to the current codebase.`;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function computeModes(agentId: AgentId): Mode[] {
|
export function computeModes(agentId: AgentId): Mode[] {
|
||||||
const t = (toolName: string) => formatMcpToolRef(agentId, toolName);
|
const t = (toolName: string) => formatMcpToolRef(agentId, toolName);
|
||||||
return [
|
return [
|
||||||
@@ -112,15 +114,13 @@ export function computeModes(agentId: AgentId): Mode[] {
|
|||||||
- Do NOT defect-hunt the diff yourself in parallel with the subagent. Your role is dispatch + evaluation; doing the review yourself reintroduces the implementation bias the subagent is meant to mitigate.
|
- Do NOT defect-hunt the diff yourself in parallel with the subagent. Your role is dispatch + evaluation; doing the review yourself reintroduces the implementation bias the subagent is meant to mitigate.
|
||||||
- For diffs that rely on third-party API contracts, SDK semantics, framework directives, or DB engine specifics, instruct the subagent to verify load-bearing claims via web search and quote source URLs rather than trust training data — this is the single most common review-quality failure mode.
|
- For diffs that rely on third-party API contracts, SDK semantics, framework directives, or DB engine specifics, instruct the subagent to verify load-bearing claims via web search and quote source URLs rather than trust training data — this is the single most common review-quality failure mode.
|
||||||
|
|
||||||
Review the findings, address valid points, and discard nitpicks or false positives. The reviewer is fallible — it biases toward *recommending additions* (defensive checks for impossible cases, extra logging, new abstractions used once, comments restating code, tests asserting tautologies, "just-in-case" guards). For each finding, ask: would applying it leave the code more sound, correct, AND elegant? Two-out-of-three is not enough — a fix that improves correctness while degrading elegance still degrades the codebase. Reject bloat-shaped findings without applying them, and after applying the rest re-read your diff and be discerning about what *you just changed*: if any fix turned out to be bloat in context, revert it. The goal is code that is sound and correct *while remaining elegant*; the smallest diff that fixes the real defect almost always wins. Then verify only intended changes are present, no debug artifacts or commented-out code remain, no unrelated files were modified. Commit locally via shell (\`git add . && git commit -m "..."\`).
|
Review the findings, address valid points, and discard nitpicks or false positives. The reviewer is fallible — it biases toward *recommending additions* (defensive checks for impossible cases, extra logging, new abstractions used once, comments restating code, tests asserting tautologies, "just-in-case" guards). For each finding, ask: would applying it leave the code more sound, correct, AND elegant? Two-out-of-three is usually a signal to look harder for a fix that gets all three before settling for one that trades elegance for correctness. Reject bloat-shaped findings without applying them, and after applying the rest re-read your diff and be discerning about what *you just changed*: if any fix turned out to be bloat in context, revert it. The goal is code that is sound and correct *while remaining elegant*; the smallest diff that fixes the real defect almost always wins. Then verify only intended changes are present, no debug artifacts or commented-out code remain, no unrelated files were modified. Commit locally via shell (\`git add . && git commit -m "..."\`).
|
||||||
|
|
||||||
5. **finalize**:
|
5. **finalize**:
|
||||||
- confirm a clean working tree, then push via \`${t("push_branch")}\` (see *SYSTEM* Git rules if this fails — prepush errors are usually the repo's tests/lint, not infra timeouts)
|
- confirm a clean working tree, then push via \`${t("push_branch")}\` (see *SYSTEM* Git rules if this fails — prepush errors are usually the repo's tests/lint, not infra timeouts)
|
||||||
- create a PR via \`${t("create_pull_request")}\`
|
- create a PR via \`${t("create_pull_request")}\`
|
||||||
- call \`${t("report_progress")}\` with the PR link or the exact error if push/PR failed
|
- call \`${t("report_progress")}\` with the PR link or the exact error if push/PR failed
|
||||||
|
|
||||||
${learningsStep(t, 6)}
|
|
||||||
|
|
||||||
### Notes
|
### Notes
|
||||||
|
|
||||||
For simple, well-defined tasks, skip the plan phase and go straight to build.`,
|
For simple, well-defined tasks, skip the plan phase and go straight to build.`,
|
||||||
@@ -137,7 +137,7 @@ For simple, well-defined tasks, skip the plan phase and go straight to build.`,
|
|||||||
|
|
||||||
3. For each comment:
|
3. For each comment:
|
||||||
- understand the feedback
|
- understand the feedback
|
||||||
- evaluate whether applying it would leave the code more **sound, correct, AND elegant**. reviewers are fallible and bias toward *recommending additions* (defensive checks for impossible cases, extra abstractions, comments restating obvious code, tests asserting tautologies, "just-in-case" guards). if a request would add bloat — ceremony without commensurate correctness benefit — push back in your reply rather than mechanically applying it. two-out-of-three is not enough; improving correctness while degrading elegance still degrades the code.
|
- evaluate whether applying it would leave the code more **sound, correct, AND elegant**. reviewers are fallible and bias toward *recommending additions* (defensive checks for impossible cases, extra abstractions, comments restating obvious code, tests asserting tautologies, "just-in-case" guards). if a request would add bloat — ceremony without commensurate correctness benefit — push back in your reply rather than mechanically applying it. two-out-of-three is usually a signal to look harder for a fix that gets all three before settling.
|
||||||
- if the request stands, make the code change using your native tools; otherwise reply explaining why
|
- if the request stands, make the code change using your native tools; otherwise reply explaining why
|
||||||
- record what was done (or why nothing was done)
|
- record what was done (or why nothing was done)
|
||||||
|
|
||||||
@@ -149,9 +149,7 @@ For simple, well-defined tasks, skip the plan phase and go straight to build.`,
|
|||||||
- confirm a clean working tree, then push via \`${t("push_branch")}\` (same push/prepush guidance as Build mode in *SYSTEM*)
|
- confirm a clean working tree, then push via \`${t("push_branch")}\` (same push/prepush guidance as Build mode in *SYSTEM*)
|
||||||
- reply to each comment using \`${t("reply_to_review_comment")}\`
|
- reply to each comment using \`${t("reply_to_review_comment")}\`
|
||||||
- resolve addressed threads via \`${t("resolve_review_thread")}\`
|
- resolve addressed threads via \`${t("resolve_review_thread")}\`
|
||||||
- call \`${t("report_progress")}\` with a brief summary (or the exact push error if push failed)
|
- call \`${t("report_progress")}\` with a brief summary (or the exact push error if push failed)`,
|
||||||
|
|
||||||
${learningsStep(t, 6)}`,
|
|
||||||
},
|
},
|
||||||
// Review and IncrementalReview use the multi-lens orchestrator pattern
|
// Review and IncrementalReview use the multi-lens orchestrator pattern
|
||||||
// (canonical source: .claude/commands/anneal.md). The orchestrator does
|
// (canonical source: .claude/commands/anneal.md). The orchestrator does
|
||||||
@@ -175,7 +173,7 @@ ${learningsStep(t, 6)}`,
|
|||||||
|
|
||||||
2. **triage**: orient yourself on the PR — identify *what kind of thing this is* (domain it touches, seams it crosses, external contracts it depends on, user-facing surfaces it changes). orientation only — defer specific defect-hunting to the subagents; pre-reviewing biases the lenses you pick. use \`${t("get_pull_request")}\` and other read-only GitHub tools for additional context if needed.
|
2. **triage**: orient yourself on the PR — identify *what kind of thing this is* (domain it touches, seams it crosses, external contracts it depends on, user-facing surfaces it changes). orientation only — defer specific defect-hunting to the subagents; pre-reviewing biases the lenses you pick. use \`${t("get_pull_request")}\` and other read-only GitHub tools for additional context if needed.
|
||||||
|
|
||||||
if the PR is **genuinely trivial**, skip steps 3–4 entirely and submit \`Reviewed — no issues found.\` per step 5. there's no value in dispatching even one lens for a typo.
|
if the PR is **genuinely trivial**, skip steps 3–4 entirely and submit a \`No new issues found.\` review per step 5. there's no value in dispatching even one lens for a typo.
|
||||||
|
|
||||||
"Genuinely trivial" (skip):
|
"Genuinely trivial" (skip):
|
||||||
- single-word doc typo, whitespace/format-only, comment-only across any number of files
|
- single-word doc typo, whitespace/format-only, comment-only across any number of files
|
||||||
@@ -243,26 +241,28 @@ ${learningsStep(t, 6)}`,
|
|||||||
|
|
||||||
note: the first create_pull_request_review submission may error with a one-time diff-coverage nudge listing unread TOC regions. retry the same call to proceed — optionally after reading the listed ranges. the pre-flight will not block again this session.
|
note: the first create_pull_request_review submission may error with a one-time diff-coverage nudge listing unread TOC regions. retry the same call to proceed — optionally after reading the listed ranges. the pre-flight will not block again this session.
|
||||||
|
|
||||||
|
The review body is structured as: \`[optional alert blockquote]\` → \`[PR summary using the default format below]\`. Inline comments are passed via the \`comments\` parameter, not in the body.
|
||||||
|
|
||||||
- **critical issues** (blocks merge — bugs, security, data loss):
|
- **critical issues** (blocks merge — bugs, security, data loss):
|
||||||
\`approved: false\`. Body begins with a GitHub alert blockquote, e.g.:
|
\`approved: false\`. Body opens with \`> [!CAUTION]\\n> This PR introduces ...\`, followed by the PR summary. Include all inline comments via \`comments\`.
|
||||||
\`> [!CAUTION]\\n> This PR introduces a race condition in ...\`
|
|
||||||
Follow with a brief summary if needed. Include all inline comments.
|
|
||||||
- **recommended changes** (non-critical):
|
- **recommended changes** (non-critical):
|
||||||
\`approved: false\`. Body begins with a GitHub alert blockquote, e.g.:
|
\`approved: false\`. Body opens with \`> [!IMPORTANT]\\n> Consider ...\`, followed by the PR summary. Include all inline comments via \`comments\`.
|
||||||
\`> [!IMPORTANT]\\n> Consider adding input validation for ...\`
|
|
||||||
Follow with a brief summary if needed. Include all inline comments.
|
|
||||||
- **no actionable issues**:
|
- **no actionable issues**:
|
||||||
\`approved: true\`, body: "Reviewed — no issues found."`,
|
\`approved: true\`. Body opens with \`No new issues found.\` followed by the PR summary.
|
||||||
|
|
||||||
|
${PR_SUMMARY_FORMAT}`,
|
||||||
},
|
},
|
||||||
// IncrementalReview shares Review's multi-lens orchestrator pattern but
|
// IncrementalReview shares Review's multi-lens orchestrator pattern but
|
||||||
// scopes the target to the incremental diff and adds prior-review-feedback
|
// scopes the target to the incremental diff. The "issues must be NEW
|
||||||
// tracking. The "issues must be NEW since the last Pullfrog review" filter
|
// since the last Pullfrog review" filter lives at aggregation time
|
||||||
// lives at aggregation time (step 5), NOT in the subagent prompt — pushing
|
// (step 5), NOT in the subagent prompt — pushing the filter into
|
||||||
// the filter into subagents matches the canonical anneal anti-pattern of
|
// subagents matches the canonical anneal anti-pattern of "list known
|
||||||
// "list known pre-existing failures — don't flag these" and suppresses
|
// pre-existing failures — don't flag these" and suppresses signal on
|
||||||
// signal on regressions the new commits amplified. The body-format rules
|
// regressions the new commits amplified. The review body is just
|
||||||
// (Reviewed changes / Prior review feedback) are unchanged from the prior
|
// "Reviewed changes" — a separate "Prior review feedback" checklist
|
||||||
// version. Same severity-table omission as Review.
|
// would duplicate the rolling PR summary snapshot's record of what
|
||||||
|
// earlier runs already addressed and add noise to the user-facing
|
||||||
|
// body. Same severity-table omission as Review.
|
||||||
{
|
{
|
||||||
name: "IncrementalReview",
|
name: "IncrementalReview",
|
||||||
description:
|
description:
|
||||||
@@ -273,7 +273,7 @@ ${learningsStep(t, 6)}`,
|
|||||||
|
|
||||||
2. **incremental scope**: if \`incrementalDiffPath\` is present, read it to see what changed since the last review. this is a range-diff that isolates the net changes, filtering out base branch noise. if not present, fall back to reviewing the full PR diff and determine what changed since Pullfrog's most recent review.
|
2. **incremental scope**: if \`incrementalDiffPath\` is present, read it to see what changed since the last review. this is a range-diff that isolates the net changes, filtering out base branch noise. if not present, fall back to reviewing the full PR diff and determine what changed since Pullfrog's most recent review.
|
||||||
|
|
||||||
3. **prior feedback**: fetch previous reviews via \`${t("list_pull_request_reviews")}\`. for the most recent Pullfrog review, call \`${t("get_review_comments")}\` with the review ID to retrieve specific prior line-level feedback. you'll need this in step 6 to track which prior comments were addressed.
|
3. **prior feedback**: fetch previous reviews via \`${t("list_pull_request_reviews")}\`. for the most recent Pullfrog review, call \`${t("get_review_comments")}\` with the review ID to retrieve specific prior line-level feedback. you'll use this to filter your aggregation in step 5 — anything already flagged in a prior review and not changed by the new commits should not be re-raised. you do NOT need to render this in the review body; the rolling PR summary snapshot is the durable record of what's been addressed.
|
||||||
|
|
||||||
4. **triage & fan out**: orient on the *incremental* changes — domain, seams, external contracts, user-facing surfaces.
|
4. **triage & fan out**: orient on the *incremental* changes — domain, seams, external contracts, user-facing surfaces.
|
||||||
|
|
||||||
@@ -302,20 +302,14 @@ ${learningsStep(t, 6)}`,
|
|||||||
|
|
||||||
5. **aggregate, draft, self-critique**: merge findings; de-dup overlaps; trace each finding yourself. drop praise, style preferences, speculative/unverified claims, findings about pre-existing code unrelated to the new commits, anything not actionable, and anything that re-states prior review feedback (heuristic: if the finding's root cause lives in lines the *new commits* added or modified, it's in scope; otherwise drop). also drop **bloat-shaped findings** — proposed fixes that would add defensive checks for cases that can't happen, abstractions used once, comments restating obvious code, tests asserting tautologies, or "just-in-case" guards. subagents are fallible and bias toward recommending changes; the bar for an actionable inline comment is sound + correct + elegant. recommending a change that improves only one of the three (or degrades elegance to nominally improve correctness) makes the codebase worse, not better. To compute "lines the new commits added or modified": if \`incrementalDiffPath\` from step 1 is present, use it directly. Otherwise, take the prior Pullfrog review's \`commit_id\` (returned alongside each entry from \`${t("list_pull_request_reviews")}\` in step 3) and run \`git diff <prior-review-sha>..HEAD\` to isolate the lines added since that review. draft inline comments with NEW line numbers from the full PR diff — every comment must be actionable, 2-3 sentences max.
|
5. **aggregate, draft, self-critique**: merge findings; de-dup overlaps; trace each finding yourself. drop praise, style preferences, speculative/unverified claims, findings about pre-existing code unrelated to the new commits, anything not actionable, and anything that re-states prior review feedback (heuristic: if the finding's root cause lives in lines the *new commits* added or modified, it's in scope; otherwise drop). also drop **bloat-shaped findings** — proposed fixes that would add defensive checks for cases that can't happen, abstractions used once, comments restating obvious code, tests asserting tautologies, or "just-in-case" guards. subagents are fallible and bias toward recommending changes; the bar for an actionable inline comment is sound + correct + elegant. recommending a change that improves only one of the three (or degrades elegance to nominally improve correctness) makes the codebase worse, not better. To compute "lines the new commits added or modified": if \`incrementalDiffPath\` from step 1 is present, use it directly. Otherwise, take the prior Pullfrog review's \`commit_id\` (returned alongside each entry from \`${t("list_pull_request_reviews")}\` in step 3) and run \`git diff <prior-review-sha>..HEAD\` to isolate the lines added since that review. draft inline comments with NEW line numbers from the full PR diff — every comment must be actionable, 2-3 sentences max.
|
||||||
|
|
||||||
then check: which prior review comments were addressed by the new commits? track the addressed ones for step 6b.
|
6. **build the review body** — a single "Reviewed changes" section: summarize at the logical-change level, not per-file. each bullet starts with a past-tense verb (e.g. \`- Extracted shared CLI runtime into a single module\`, \`- Renamed package to pullfrog\`). avoid file paths unless they add clarity. if the changes can be described in one sentence, use one sentence — no bullets needed. do NOT include a separate "Prior review feedback" checklist; that's tracked in the rolling PR summary snapshot for the next agent run, and surfacing it in the user-facing body is noise (changes that addressed prior feedback are already covered by the Reviewed-changes bullets). in some cases you may receive a complete diff for the whole pull request instead of an incremental one — when this happens, you will need to determine what changes have happened since Pullfrog's most recent review.
|
||||||
|
|
||||||
6. **build the review body** — two distinct sections:
|
7. Submit — Do NOT call \`report_progress\` or \`create_issue_comment\` — the review is the final record and the progress comment will be cleaned up automatically. Follow these rules:
|
||||||
a. **Reviewed changes**: summarize at the logical-change level, not per-file. each bullet starts with a past-tense verb (e.g. \`- Extracted shared CLI runtime into a single module\`, \`- Renamed package to pullfrog\`). avoid file paths unless they add clarity. if the changes can be described in one sentence, use one sentence — no bullets needed.
|
|
||||||
b. **Prior review feedback** (only if any were addressed): list only the prior review comments that WERE addressed by the new commits (\`- [x] safeParse instead of parse — addressed\`). omit unaddressed comments. omit this entire section if nothing was addressed. a change can appear in both sections.
|
|
||||||
- no headings, no tables, no prose paragraphs in either section — just bullets
|
|
||||||
- in some cases you may receive a complete diff for the whole pull request instead of an incremental one. when this happens, you will need to determine what changes have happened since Pullfrog's most recent review.
|
|
||||||
|
|
||||||
7. Submit — Do NOT call \`report_progress\` or \`create_issue_comment\` — the review is the final record and the progress comment will be cleaned up automatically. the review body always includes the reviewed changes from step 6a. append \`Prior review feedback:\\n\` with the checklist from step 6b only if any prior comments were addressed. Follow these rules:
|
|
||||||
- note: the first create_pull_request_review submission may error with a one-time diff-coverage nudge listing unread TOC regions. retry the same call to proceed — optionally after reading the listed ranges. the pre-flight will not block again this session.
|
- note: the first create_pull_request_review submission may error with a one-time diff-coverage nudge listing unread TOC regions. retry the same call to proceed — optionally after reading the listed ranges. the pre-flight will not block again this session.
|
||||||
- IF NO NEW ISSUES, NON-SUBSTANTIVE CHANGES ONLY (trivial formatting, import reordering, comment tweaks): do NOT submit a review. Do NOT call \`report_progress\`. Exit — the progress comment will be cleaned up automatically.
|
- IF NO NEW ISSUES, NON-SUBSTANTIVE CHANGES ONLY (trivial formatting, import reordering, comment tweaks): do NOT submit a review. Do NOT call \`report_progress\`. Exit — the progress comment will be cleaned up automatically.
|
||||||
- ELSE IF NEW CRITICAL ISSUES (blocks merge): call \`${t("create_pull_request_review")}\` with \`approved: false\`, all comments, and the review body. body opens with a GitHub alert blockquote (e.g. \`> [!CAUTION]\\n> This PR introduces ...\`), then the reviewed changes summary and prior feedback (if any).
|
- ELSE IF NEW CRITICAL ISSUES (blocks merge): call \`${t("create_pull_request_review")}\` with \`approved: false\`, all comments, and the review body. body opens with a GitHub alert blockquote (e.g. \`> [!CAUTION]\\n> This PR introduces ...\`), then the Reviewed-changes summary.
|
||||||
- ELSE IF NEW RECOMMENDED CHANGES (non-critical): call \`${t("create_pull_request_review")}\` with \`approved: false\`, all comments, and the review body. body opens with \`> [!IMPORTANT]\\n> ...\` alert, then the reviewed changes summary and prior feedback (if any).
|
- ELSE IF NEW RECOMMENDED CHANGES (non-critical): call \`${t("create_pull_request_review")}\` with \`approved: false\`, all comments, and the review body. body opens with \`> [!IMPORTANT]\\n> ...\` alert, then the Reviewed-changes summary.
|
||||||
- ELSE IF NO NEW ISSUES, SUBSTANTIVE CHANGES (new functionality, behavior changes, or fixes to prior review feedback): call \`${t("create_pull_request_review")}\` to create a PR review. If all previous reviews have been properly addressed and no new issues were discovered, you can set \`approved: true\`. body opens with \`No new issues. Reviewed the following changes:\\n\`, then the reviewed changes summary and prior feedback (if any).`,
|
- ELSE IF NO NEW ISSUES, SUBSTANTIVE CHANGES (new functionality, behavior changes, or fixes to prior review feedback): call \`${t("create_pull_request_review")}\` to create a PR review. If all previous reviews have been properly addressed and no new issues were discovered, you can set \`approved: true\`. body opens with \`No new issues. Reviewed the following changes:\\n\`, then the Reviewed-changes summary.`,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Plan",
|
name: "Plan",
|
||||||
@@ -329,9 +323,7 @@ ${learningsStep(t, 6)}`,
|
|||||||
|
|
||||||
2. Produce a structured, actionable plan with clear milestones.
|
2. Produce a structured, actionable plan with clear milestones.
|
||||||
|
|
||||||
3. Call \`${t("report_progress")}\` with the plan.
|
3. Call \`${t("report_progress")}\` with the plan.`,
|
||||||
|
|
||||||
${learningsStep(t, 4)}`,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Fix",
|
name: "Fix",
|
||||||
@@ -354,9 +346,7 @@ ${learningsStep(t, 4)}`,
|
|||||||
|
|
||||||
5. Finalize:
|
5. Finalize:
|
||||||
- confirm a clean working tree, then push via \`${t("push_branch")}\` (same push/prepush guidance as Build mode in *SYSTEM*)
|
- confirm a clean working tree, then push via \`${t("push_branch")}\` (same push/prepush guidance as Build mode in *SYSTEM*)
|
||||||
- call \`${t("report_progress")}\` with the diagnosis and fix summary (or the exact push error if push failed)
|
- call \`${t("report_progress")}\` with the diagnosis and fix summary (or the exact push error if push failed)`,
|
||||||
|
|
||||||
${learningsStep(t, 6)}`,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "ResolveConflicts",
|
name: "ResolveConflicts",
|
||||||
@@ -401,22 +391,7 @@ ${learningsStep(t, 6)}`,
|
|||||||
3. Finalize:
|
3. Finalize:
|
||||||
- if code changes were made, push to a pull request (new or existing) using \`${t("push_branch")}\` and \`${t("create_pull_request")}\` as needed. \`git status\` must be clean before you finish (see *SYSTEM* Git rules if push fails).
|
- if code changes were made, push to a pull request (new or existing) using \`${t("push_branch")}\` and \`${t("create_pull_request")}\` as needed. \`git status\` must be clean before you finish (see *SYSTEM* Git rules if push fails).
|
||||||
- call \`${t("report_progress")}\` once with results — include exact tool errors if push or PR creation failed
|
- call \`${t("report_progress")}\` once with results — include exact tool errors if push or PR creation failed
|
||||||
- if the task involved labeling, commenting, or other GitHub operations, perform those directly
|
- if the task involved labeling, commenting, or other GitHub operations, perform those directly`,
|
||||||
|
|
||||||
${learningsStep(t, 4)}`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "Summarize",
|
|
||||||
description:
|
|
||||||
"Summarize a PR with a structured comment that is updated in place on subsequent pushes",
|
|
||||||
prompt: `### Checklist
|
|
||||||
|
|
||||||
1. Checkout the PR via \`${t("checkout_pr")}\` — this returns PR metadata and a \`diffPath\`.
|
|
||||||
2. Read the diff using the TOC to selectively read relevant sections (not the entire file). Produce a structured summary. If EVENT INSTRUCTIONS specify a custom format, follow that instead of the default format below.
|
|
||||||
3. Call \`${t("create_issue_comment")}\` with \`type: "Summary"\` and the summary body.
|
|
||||||
4. Call \`${t("report_progress")}\` with a brief note (e.g., "Posted PR summary.").
|
|
||||||
|
|
||||||
${PR_SUMMARY_FORMAT}`,
|
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "pullfrog",
|
"name": "pullfrog",
|
||||||
"version": "0.0.204",
|
"version": "0.1.2",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"bin": {
|
"bin": {
|
||||||
"pullfrog": "dist/cli.mjs",
|
"pullfrog": "dist/cli.mjs",
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ import { log } from "./utils/cli.ts";
|
|||||||
import { runInDocker } from "./utils/docker.ts";
|
import { runInDocker } from "./utils/docker.ts";
|
||||||
import { ensureGitHubToken } from "./utils/github.ts";
|
import { ensureGitHubToken } from "./utils/github.ts";
|
||||||
import { isInsideDocker } from "./utils/globals.ts";
|
import { isInsideDocker } from "./utils/globals.ts";
|
||||||
import { runPostCleanup } from "./utils/postCleanup.ts";
|
|
||||||
import { setupTestRepo } from "./utils/setup.ts";
|
import { setupTestRepo } from "./utils/setup.ts";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -78,13 +77,7 @@ export async function run(inputsOrPrompt: Inputs | string): Promise<AgentResult>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// wrap main() so post cleanup runs even on failure (mirrors action.yml post-if: "failure() || cancelled()")
|
const result: AgentResult = await main();
|
||||||
let result: AgentResult;
|
|
||||||
try {
|
|
||||||
result = await main();
|
|
||||||
} finally {
|
|
||||||
await runPostCleanup();
|
|
||||||
}
|
|
||||||
|
|
||||||
process.chdir(originalCwd);
|
process.chdir(originalCwd);
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
#!/usr/bin/env node
|
|
||||||
|
|
||||||
import { runPullfrogCli } from "./runCli.ts";
|
|
||||||
|
|
||||||
runPullfrogCli({
|
|
||||||
cliArgs: ["gha", "--post"],
|
|
||||||
swallowErrors: true,
|
|
||||||
});
|
|
||||||
@@ -7,7 +7,6 @@ const scriptDir = dirname(fileURLToPath(import.meta.url));
|
|||||||
|
|
||||||
const entryPoints = [
|
const entryPoints = [
|
||||||
resolve(scriptDir, "../entry.ts"),
|
resolve(scriptDir, "../entry.ts"),
|
||||||
resolve(scriptDir, "../post.ts"),
|
|
||||||
resolve(scriptDir, "../get-installation-token/entry.ts"),
|
resolve(scriptDir, "../get-installation-token/entry.ts"),
|
||||||
resolve(scriptDir, "../get-installation-token/post.ts"),
|
resolve(scriptDir, "../get-installation-token/post.ts"),
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -1,38 +0,0 @@
|
|||||||
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
|
|
||||||
|
|
||||||
exports[`latest model per provider snapshot > matches snapshot 1`] = `
|
|
||||||
{
|
|
||||||
"anthropic": {
|
|
||||||
"modelId": "claude-opus-4-7",
|
|
||||||
"releaseDate": "2026-04-16",
|
|
||||||
},
|
|
||||||
"deepseek": {
|
|
||||||
"modelId": "deepseek-v4-pro",
|
|
||||||
"releaseDate": "2026-04-24",
|
|
||||||
},
|
|
||||||
"google": {
|
|
||||||
"modelId": "gemma-4-31b-it",
|
|
||||||
"releaseDate": "2026-04-02",
|
|
||||||
},
|
|
||||||
"moonshotai": {
|
|
||||||
"modelId": "kimi-k2.6",
|
|
||||||
"releaseDate": "2026-04-21",
|
|
||||||
},
|
|
||||||
"openai": {
|
|
||||||
"modelId": "gpt-5.5-pro",
|
|
||||||
"releaseDate": "2026-04-23",
|
|
||||||
},
|
|
||||||
"opencode": {
|
|
||||||
"modelId": "gpt-5.5-pro",
|
|
||||||
"releaseDate": "2026-04-24",
|
|
||||||
},
|
|
||||||
"openrouter": {
|
|
||||||
"modelId": "x-ai/grok-4.3",
|
|
||||||
"releaseDate": "2026-05-01",
|
|
||||||
},
|
|
||||||
"xai": {
|
|
||||||
"modelId": "grok-4.3",
|
|
||||||
"releaseDate": "2026-05-01",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
@@ -18,6 +18,7 @@
|
|||||||
* node action/test/list-aliases.ts
|
* node action/test/list-aliases.ts
|
||||||
* MATRIX_FILTER=gemini node action/test/list-aliases.ts
|
* MATRIX_FILTER=gemini node action/test/list-aliases.ts
|
||||||
* INCLUDE_ALL_PASSTHROUGHS=1 node action/test/list-aliases.ts
|
* INCLUDE_ALL_PASSTHROUGHS=1 node action/test/list-aliases.ts
|
||||||
|
* INCLUDE_EXPENSIVE=1 node action/test/list-aliases.ts
|
||||||
*/
|
*/
|
||||||
import { modelAliases } from "../models.ts";
|
import { modelAliases } from "../models.ts";
|
||||||
|
|
||||||
@@ -29,6 +30,10 @@ function agentForSlug(slug: string): "claude" | "opencode" {
|
|||||||
// translation) is alive without re-testing every underlying model.
|
// translation) is alive without re-testing every underlying model.
|
||||||
const ROUTING_CANARIES = new Set(["openrouter/claude-sonnet", "opencode/claude-sonnet"]);
|
const ROUTING_CANARIES = new Set(["openrouter/claude-sonnet", "opencode/claude-sonnet"]);
|
||||||
|
|
||||||
|
// pruned by default; opt back in with INCLUDE_EXPENSIVE=1 or MATRIX_FILTER.
|
||||||
|
// gpt-5.5-pro burns ~$2.40/run on this fixture — too expensive per-push.
|
||||||
|
const EXPENSIVE_ALIASES = new Set(["openai/gpt-pro"]);
|
||||||
|
|
||||||
function isPrunablePassthrough(alias: (typeof modelAliases)[number]): boolean {
|
function isPrunablePassthrough(alias: (typeof modelAliases)[number]): boolean {
|
||||||
if (ROUTING_CANARIES.has(alias.slug)) return false;
|
if (ROUTING_CANARIES.has(alias.slug)) return false;
|
||||||
if (alias.provider === "openrouter") return true;
|
if (alias.provider === "openrouter") return true;
|
||||||
@@ -40,10 +45,12 @@ function isPrunablePassthrough(alias: (typeof modelAliases)[number]): boolean {
|
|||||||
|
|
||||||
const filter = process.env.MATRIX_FILTER?.trim() ?? "";
|
const filter = process.env.MATRIX_FILTER?.trim() ?? "";
|
||||||
const includeAllPassthroughs = process.env.INCLUDE_ALL_PASSTHROUGHS === "1";
|
const includeAllPassthroughs = process.env.INCLUDE_ALL_PASSTHROUGHS === "1";
|
||||||
|
const includeExpensive = process.env.INCLUDE_EXPENSIVE === "1" || filter !== "";
|
||||||
|
|
||||||
const matrix = modelAliases
|
const matrix = modelAliases
|
||||||
.filter((alias) => (filter ? alias.slug.toLowerCase().includes(filter.toLowerCase()) : true))
|
.filter((alias) => (filter ? alias.slug.toLowerCase().includes(filter.toLowerCase()) : true))
|
||||||
.filter((alias) => includeAllPassthroughs || !isPrunablePassthrough(alias))
|
.filter((alias) => includeAllPassthroughs || !isPrunablePassthrough(alias))
|
||||||
|
.filter((alias) => includeExpensive || !EXPENSIVE_ALIASES.has(alias.slug))
|
||||||
.map((alias) => ({
|
.map((alias) => ({
|
||||||
slug: alias.slug,
|
slug: alias.slug,
|
||||||
agent: agentForSlug(alias.slug),
|
agent: agentForSlug(alias.slug),
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { describe, expect, it } from "vitest";
|
import { describe, expect, it } from "vitest";
|
||||||
import { type ModelProvider, modelAliases, providers } from "../models.ts";
|
import { modelAliases } from "../models.ts";
|
||||||
|
|
||||||
// ── catalog drift tests — main-only ─────────────────────────────────────────────
|
// ── catalog drift tests — main-only ─────────────────────────────────────────────
|
||||||
//
|
//
|
||||||
@@ -8,6 +8,12 @@ import { type ModelProvider, modelAliases, providers } from "../models.ts";
|
|||||||
// catalog drift (new model ships, old model deprecated, etc.) causes failures
|
// catalog drift (new model ships, old model deprecated, etc.) causes failures
|
||||||
// that are unrelated to any code change in the PR — so these run only on main.
|
// that are unrelated to any code change in the PR — so these run only on main.
|
||||||
//
|
//
|
||||||
|
// the registry is kept in sync with upstreams by the `models-bump` cron
|
||||||
|
// (`.github/workflows/models-bump.yml`), which scans models.dev every 12h and
|
||||||
|
// opens a PR bumping `resolve` / `openRouterResolve` for any alias whose
|
||||||
|
// upstream has shipped a newer GA version. these tests are the integrity gate
|
||||||
|
// for that PR — they catch typos, removed models, and openrouter mismatches.
|
||||||
|
//
|
||||||
// run locally with `pnpm test:catalog`.
|
// run locally with `pnpm test:catalog`.
|
||||||
// in CI, gated to push events on main.
|
// in CI, gated to push events on main.
|
||||||
|
|
||||||
@@ -106,40 +112,3 @@ describe("openRouterResolve OpenRouter API validity", async () => {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("latest model per provider snapshot", async () => {
|
|
||||||
const data = await api;
|
|
||||||
const providerKeys = Object.keys(providers) as ModelProvider[];
|
|
||||||
|
|
||||||
const latestByProvider: Record<string, { modelId: string; releaseDate: string }> = {};
|
|
||||||
|
|
||||||
for (const key of providerKeys) {
|
|
||||||
const providerData = data[key];
|
|
||||||
if (!providerData) continue;
|
|
||||||
|
|
||||||
let latest: { modelId: string; releaseDate: string } | undefined;
|
|
||||||
for (const [modelId, model] of Object.entries(providerData.models)) {
|
|
||||||
// skip non-GA models so beta/nightly churn doesn't break the snapshot
|
|
||||||
if (model.status) continue;
|
|
||||||
const rd = model.release_date;
|
|
||||||
if (!rd) continue;
|
|
||||||
// tiebreak by modelId for stable ordering when release dates match
|
|
||||||
if (
|
|
||||||
!latest ||
|
|
||||||
rd > latest.releaseDate ||
|
|
||||||
(rd === latest.releaseDate && modelId > latest.modelId)
|
|
||||||
) {
|
|
||||||
latest = { modelId, releaseDate: rd };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (latest) {
|
|
||||||
latestByProvider[key] = latest;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// when this fails, a provider shipped a new model. check whether we need
|
|
||||||
// to add or update an alias in models.ts before updating the snapshot.
|
|
||||||
it("matches snapshot", () => {
|
|
||||||
expect(latestByProvider).toMatchSnapshot();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|||||||
@@ -25,3 +25,18 @@ export function getApiUrl(): string {
|
|||||||
log.debug(`resolved API_URL: ${raw}`);
|
log.debug(`resolved API_URL: ${raw}`);
|
||||||
return raw;
|
return raw;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* true when the action is configured to talk to a localhost API server (i.e.
|
||||||
|
* `pnpm dev` running on the developer's box). signals we can use dev-only
|
||||||
|
* affordances like the `x-dev-repo` proxy-token bypass — the corresponding
|
||||||
|
* server-side dev gates (`NODE_ENV === "development"`) ensure these paths
|
||||||
|
* never activate against prod regardless of what the action does.
|
||||||
|
*/
|
||||||
|
export function isLocalApiUrl(): boolean {
|
||||||
|
try {
|
||||||
|
return isLocalUrl(new URL(getApiUrl()));
|
||||||
|
} catch {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { resolveDisplayAlias } from "../models.ts";
|
import { modelAliases, resolveDisplayAlias } from "../models.ts";
|
||||||
|
|
||||||
export const PULLFROG_DIVIDER = "<!-- PULLFROG_DIVIDER_DO_NOT_REMOVE_PLZ -->";
|
export const PULLFROG_DIVIDER = "<!-- PULLFROG_DIVIDER_DO_NOT_REMOVE_PLZ -->";
|
||||||
|
|
||||||
@@ -28,7 +28,13 @@ export interface BuildPullfrogFooterParams {
|
|||||||
function formatModelLabel(slug: string): string {
|
function formatModelLabel(slug: string): string {
|
||||||
// walk the fallback chain so a deprecated stored slug shows the model the
|
// walk the fallback chain so a deprecated stored slug shows the model the
|
||||||
// run actually executed against (e.g. "GPT", not "GPT Codex").
|
// run actually executed against (e.g. "GPT", not "GPT Codex").
|
||||||
const alias = resolveDisplayAlias(slug);
|
const alias =
|
||||||
|
resolveDisplayAlias(slug) ??
|
||||||
|
// reverse-lookup: when the caller passes an effective model (proxy or
|
||||||
|
// resolved target like "openrouter/anthropic/claude-opus-4.7") instead of
|
||||||
|
// a stored alias slug, find the alias whose resolve target matches so we
|
||||||
|
// still render a friendly display name.
|
||||||
|
modelAliases.find((a) => a.resolve === slug || a.openRouterResolve === slug);
|
||||||
if (!alias) return `\`${slug}\``;
|
if (!alias) return `\`${slug}\``;
|
||||||
return alias.isFree ? `\`${alias.displayName}\` (free)` : `\`${alias.displayName}\``;
|
return alias.isFree ? `\`${alias.displayName}\` (free)` : `\`${alias.displayName}\``;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -98,6 +98,24 @@ describe("diff coverage line checker", () => {
|
|||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("carries forward coveragePreflightRan from a previous state across checkout refreshes", () => {
|
||||||
|
const previous = createDiffCoverageState({ diffPath, totalLines: 30, toc });
|
||||||
|
previous.coveragePreflightRan = true;
|
||||||
|
previous.coveredRanges = [{ startLine: 5, endLine: 10 }];
|
||||||
|
|
||||||
|
const next = createDiffCoverageState({ diffPath, totalLines: 50, toc, previous });
|
||||||
|
|
||||||
|
expect(next.coveragePreflightRan).toBe(true);
|
||||||
|
// coveredRanges are tied to the previous diff content and must not leak forward
|
||||||
|
expect(next.coveredRanges).toEqual([]);
|
||||||
|
expect(next.totalLines).toBe(50);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("defaults coveragePreflightRan to false when no previous state is provided", () => {
|
||||||
|
const state = createDiffCoverageState({ diffPath, totalLines: 30, toc });
|
||||||
|
expect(state.coveragePreflightRan).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
it("computes per-file unread ranges from tracked reads", () => {
|
it("computes per-file unread ranges from tracked reads", () => {
|
||||||
const state = createDiffCoverageState({
|
const state = createDiffCoverageState({
|
||||||
diffPath,
|
diffPath,
|
||||||
|
|||||||
@@ -78,13 +78,17 @@ export function createDiffCoverageState(params: {
|
|||||||
diffPath: string;
|
diffPath: string;
|
||||||
totalLines: number;
|
totalLines: number;
|
||||||
toc: string;
|
toc: string;
|
||||||
|
previous?: DiffCoverageState | undefined;
|
||||||
}): DiffCoverageState {
|
}): DiffCoverageState {
|
||||||
return {
|
return {
|
||||||
diffPath: params.diffPath,
|
diffPath: params.diffPath,
|
||||||
totalLines: params.totalLines,
|
totalLines: params.totalLines,
|
||||||
tocEntries: parseDiffTocEntries({ toc: params.toc }),
|
tocEntries: parseDiffTocEntries({ toc: params.toc }),
|
||||||
coveredRanges: [],
|
coveredRanges: [],
|
||||||
coveragePreflightRan: false,
|
// carry forward across checkout_pr refreshes so the nudge stays "once per
|
||||||
|
// review session". coveredRanges are intentionally not carried because
|
||||||
|
// line numbers are tied to the previous diff's content.
|
||||||
|
coveragePreflightRan: params.previous?.coveragePreflightRan ?? false,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+17
-8
@@ -12,7 +12,10 @@ interface InstructionsContext {
|
|||||||
modes: Mode[];
|
modes: Mode[];
|
||||||
agentId: AgentId;
|
agentId: AgentId;
|
||||||
outputSchema?: Record<string, unknown> | undefined;
|
outputSchema?: Record<string, unknown> | undefined;
|
||||||
learnings: string | null;
|
/** absolute path to the seeded learnings tmpfile, or null when the file
|
||||||
|
* couldn't be seeded for some reason. main.ts always seeds, so in
|
||||||
|
* practice this is always set; the null case keeps the type honest. */
|
||||||
|
learningsFilePath: string | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface PromptContext extends InstructionsContext {
|
interface PromptContext extends InstructionsContext {
|
||||||
@@ -289,7 +292,7 @@ When embedding images (e.g. uploaded screenshots) in comments or PR bodies, alwa
|
|||||||
|
|
||||||
**\`report_progress\`**: call this exactly once at the end of every run with a brief final summary (1-3 sentences) unless the mode guidance instructs otherwise. Never call it for intermediate status updates (e.g., "Checking for changes...", "Starting review...") — the task list handles live progress automatically. Calling \`report_progress\` replaces the task list with your summary and preserves the current task list in a collapsible section. Keep the summary concise — do not repeat what the task list already shows. Focus on the outcome (what was accomplished, links to artifacts) rather than listing individual steps. If something failed, include the tool's error text even when that makes the summary longer.
|
**\`report_progress\`**: call this exactly once at the end of every run with a brief final summary (1-3 sentences) unless the mode guidance instructs otherwise. Never call it for intermediate status updates (e.g., "Checking for changes...", "Starting review...") — the task list handles live progress automatically. Calling \`report_progress\` replaces the task list with your summary and preserves the current task list in a collapsible section. Keep the summary concise — do not repeat what the task list already shows. Focus on the outcome (what was accomplished, links to artifacts) rather than listing individual steps. If something failed, include the tool's error text even when that makes the summary longer.
|
||||||
|
|
||||||
Never use \`create_issue_comment\` for task progress — that creates duplicate comments and leaves the progress comment stuck in its initial state. \`create_issue_comment\` is only for standalone comments unrelated to your current task (e.g., Plan comments, PR Summary comments).
|
Never use \`create_issue_comment\` for task progress — that creates duplicate comments and leaves the progress comment stuck in its initial state. \`create_issue_comment\` is only for standalone comments unrelated to your current task (e.g., Plan comments).
|
||||||
|
|
||||||
### If you get stuck
|
### If you get stuck
|
||||||
|
|
||||||
@@ -350,11 +353,17 @@ function assembleFullPrompt(ctx: {
|
|||||||
procedure: string;
|
procedure: string;
|
||||||
eventContext: string;
|
eventContext: string;
|
||||||
system: string;
|
system: string;
|
||||||
learnings: string | null;
|
learningsFilePath: string | null;
|
||||||
runtime: string;
|
runtime: string;
|
||||||
}): string {
|
}): string {
|
||||||
const learningsSection = ctx.learnings
|
// the LEARNINGS section is intentionally tiny — just the file path and a
|
||||||
? `************* LEARNINGS *************\n\n${ctx.learnings}`
|
// one-line "read it" instruction. embedding the contents would re-inflate
|
||||||
|
// the prompt every run (the previous design's failure mode) and clutter
|
||||||
|
// CI logs. the agent reads the file with its native file tool; the
|
||||||
|
// post-run reflection turn (action/agents/postRun.ts) is where editing
|
||||||
|
// is encouraged, with the prune-stale framing.
|
||||||
|
const learningsSection = ctx.learningsFilePath
|
||||||
|
? `************* LEARNINGS *************\n\nRepo-level learnings accumulated by previous agent runs live at \`${ctx.learningsFilePath}\`. Read this file early and let the entries inform your approach (test commands, conventions, gotchas, etc.). The file may be empty if no learnings have been collected yet.`
|
||||||
: "";
|
: "";
|
||||||
|
|
||||||
const runtimeSection = `************* RUNTIME *************\n\n${ctx.runtime}`;
|
const runtimeSection = `************* RUNTIME *************\n\n${ctx.runtime}`;
|
||||||
@@ -389,8 +398,8 @@ export function resolveInstructions(ctx: InstructionsContext): ResolvedInstructi
|
|||||||
if (eventContext)
|
if (eventContext)
|
||||||
tocEntries.push({ label: "EVENT CONTEXT", description: "related PR/issue data" });
|
tocEntries.push({ label: "EVENT CONTEXT", description: "related PR/issue data" });
|
||||||
tocEntries.push({ label: "SYSTEM", description: "persona, security, tools, workflow rules" });
|
tocEntries.push({ label: "SYSTEM", description: "persona, security, tools, workflow rules" });
|
||||||
if (pctx.learnings)
|
if (pctx.learningsFilePath)
|
||||||
tocEntries.push({ label: "LEARNINGS", description: "repo-specific knowledge" });
|
tocEntries.push({ label: "LEARNINGS", description: "repo-specific knowledge file path" });
|
||||||
tocEntries.push({ label: "RUNTIME", description: "environment metadata" });
|
tocEntries.push({ label: "RUNTIME", description: "environment metadata" });
|
||||||
|
|
||||||
const toc = buildToc(tocEntries);
|
const toc = buildToc(tocEntries);
|
||||||
@@ -401,7 +410,7 @@ export function resolveInstructions(ctx: InstructionsContext): ResolvedInstructi
|
|||||||
procedure,
|
procedure,
|
||||||
eventContext,
|
eventContext,
|
||||||
system,
|
system,
|
||||||
learnings: pctx.learnings,
|
learningsFilePath: pctx.learningsFilePath,
|
||||||
runtime: pctx.runtime,
|
runtime: pctx.runtime,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
import { stripExistingFooter } from "./buildPullfrogFooter.ts";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The prefix text for the initial "leaping into action" comment.
|
||||||
|
* Used to detect whether a progress comment is still in its initial state
|
||||||
|
* and hasn't been updated with real progress or error messages.
|
||||||
|
*
|
||||||
|
* Lives in `utils/` (not `mcp/`) so it can be re-exported via `pullfrog/internal`
|
||||||
|
* without dragging the MCP server's transitive imports into the Next.js app's
|
||||||
|
* type-check graph.
|
||||||
|
*/
|
||||||
|
export const LEAPING_INTO_ACTION_PREFIX = "Leaping into action";
|
||||||
|
|
||||||
|
export function isLeapingIntoActionCommentBody(body: string): boolean {
|
||||||
|
const content = stripExistingFooter(body).trimStart();
|
||||||
|
const firstLine = content.split(/\r?\n/, 1)[0]?.trimEnd() ?? "";
|
||||||
|
return new RegExp(`(^|\\s)${LEAPING_INTO_ACTION_PREFIX}(\\.\\.\\.)?$`).test(firstLine);
|
||||||
|
}
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
import { mkdtemp, rm, writeFile } from "node:fs/promises";
|
||||||
|
import { tmpdir } from "node:os";
|
||||||
|
import { join } from "node:path";
|
||||||
|
import { afterEach, beforeEach, describe, expect, it } from "vitest";
|
||||||
|
import {
|
||||||
|
LEARNINGS_FILE_NAME,
|
||||||
|
learningsFilePath,
|
||||||
|
readLearningsFile,
|
||||||
|
seedLearningsFile,
|
||||||
|
} from "./learnings.ts";
|
||||||
|
|
||||||
|
describe("learnings tmpfile round-trip", () => {
|
||||||
|
let dir: string;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
dir = await mkdtemp(join(tmpdir(), "pullfrog-learnings-test-"));
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(async () => {
|
||||||
|
await rm(dir, { recursive: true, force: true });
|
||||||
|
});
|
||||||
|
|
||||||
|
it("seeds with existing learnings and reads them back verbatim", async () => {
|
||||||
|
const current = "- run tests with `pnpm -r test`\n- default branch is `main`";
|
||||||
|
const path = await seedLearningsFile({ tmpdir: dir, current });
|
||||||
|
expect(path).toBe(learningsFilePath(dir));
|
||||||
|
expect(path.endsWith(LEARNINGS_FILE_NAME)).toBe(true);
|
||||||
|
const read = await readLearningsFile(path);
|
||||||
|
expect(read).toBe(current);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("seeds an empty file when the repo has no learnings yet", async () => {
|
||||||
|
// empty seed (vs scaffold-with-comment) keeps the byte-trim equality
|
||||||
|
// gate clean: an untouched first run reads back as "" and persistLearnings
|
||||||
|
// skips the API round-trip rather than writing a placeholder string into
|
||||||
|
// Repo.learnings.
|
||||||
|
const path = await seedLearningsFile({ tmpdir: dir, current: null });
|
||||||
|
const read = await readLearningsFile(path);
|
||||||
|
expect(read).toBe("");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns null when the file is missing (treated as no-change by persist)", async () => {
|
||||||
|
const path = learningsFilePath(dir);
|
||||||
|
const read = await readLearningsFile(path);
|
||||||
|
expect(read).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("trims whitespace so trailing newlines never trigger a spurious PATCH", async () => {
|
||||||
|
// editors commonly add a trailing newline on save. without trimming, a
|
||||||
|
// round-trip "read seed → save unchanged" would fail byte-equality and
|
||||||
|
// burn a LearningsRevision row on every run.
|
||||||
|
const current = "- one fact";
|
||||||
|
const path = await seedLearningsFile({ tmpdir: dir, current });
|
||||||
|
await writeFile(path, `${current}\n\n `, "utf8");
|
||||||
|
const read = await readLearningsFile(path);
|
||||||
|
expect(read).toBe(current);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("truncates content over the 10k server-side cap", async () => {
|
||||||
|
// server enforces MAX_LEARNINGS_LENGTH = 10_000. truncating client-side
|
||||||
|
// avoids a 400 round-trip and keeps the bytes the agent will see in the
|
||||||
|
// next run aligned with what the server actually stored.
|
||||||
|
const oversized = "x".repeat(11_000);
|
||||||
|
const path = await seedLearningsFile({ tmpdir: dir, current: null });
|
||||||
|
await writeFile(path, oversized, "utf8");
|
||||||
|
const read = await readLearningsFile(path);
|
||||||
|
expect(read).toBeTruthy();
|
||||||
|
expect(read?.length).toBe(10_000);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
import { mkdir, readFile, writeFile } from "node:fs/promises";
|
||||||
|
import { dirname, join } from "node:path";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Repo-level learnings — operational facts about a repo (setup steps, test
|
||||||
|
* commands, conventions, gotchas) that accumulate across agent runs and feed
|
||||||
|
* back into future runs as durable context. Modeled on the PR-summary tmpfile
|
||||||
|
* pattern (see action/utils/prSummary.ts):
|
||||||
|
*
|
||||||
|
* 1. server seeds `pullfrog-learnings.md` from `Repo.learnings` (or empty
|
||||||
|
* when the repo has none yet)
|
||||||
|
* 2. the agent reads the file at startup as part of its context, and may
|
||||||
|
* edit it in place at end-of-run when prompted by the reflection turn
|
||||||
|
* 3. main.ts reads the file back at end-of-run and PATCHes
|
||||||
|
* `/api/repo/[owner]/[repo]/learnings` if it changed (byte-trim equality
|
||||||
|
* against the seed determines change detection)
|
||||||
|
*
|
||||||
|
* Edit-in-place avoids stuffing the entire learnings list into both the
|
||||||
|
* prompt context and an `update_learnings` MCP tool call (which previously
|
||||||
|
* required passing the FULL merged list as a string parameter — an
|
||||||
|
* output-token tax that grew linearly with the learnings size).
|
||||||
|
*/
|
||||||
|
|
||||||
|
export const LEARNINGS_FILE_NAME = "pullfrog-learnings.md";
|
||||||
|
|
||||||
|
/** server-side cap mirrors `MAX_LEARNINGS_LENGTH` in
|
||||||
|
* `app/api/repo/[owner]/[repo]/learnings/route.ts`. truncating client-side
|
||||||
|
* keeps the PATCH from being rejected with a 400. */
|
||||||
|
const MAX_LEARNINGS_LENGTH = 10_000;
|
||||||
|
|
||||||
|
export function learningsFilePath(tmpdir: string): string {
|
||||||
|
return join(tmpdir, LEARNINGS_FILE_NAME);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** seed the learnings file with the repo's current learnings, or an empty
|
||||||
|
* file when the repo has none yet. returns the absolute path. */
|
||||||
|
export async function seedLearningsFile(params: {
|
||||||
|
tmpdir: string;
|
||||||
|
current: string | null;
|
||||||
|
}): Promise<string> {
|
||||||
|
const path = learningsFilePath(params.tmpdir);
|
||||||
|
await mkdir(dirname(path), { recursive: true });
|
||||||
|
// empty file when no learnings exist yet — the agent reads it, sees
|
||||||
|
// nothing, and the LEARNINGS prompt section explains what the file is for.
|
||||||
|
// a header comment would risk being persisted as part of the first real
|
||||||
|
// edit, polluting the DB row with placeholder text.
|
||||||
|
await writeFile(path, params.current ?? "", "utf8");
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** read the agent-edited learnings file. returns null when the file is
|
||||||
|
* missing or unreadable (treated as "no change"). caps content at the
|
||||||
|
* server's max length to avoid a 400 round-trip. */
|
||||||
|
export async function readLearningsFile(path: string): Promise<string | null> {
|
||||||
|
let raw: string;
|
||||||
|
try {
|
||||||
|
raw = await readFile(path, "utf8");
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
const trimmed = raw.trim();
|
||||||
|
if (trimmed.length > MAX_LEARNINGS_LENGTH) return trimmed.slice(0, MAX_LEARNINGS_LENGTH);
|
||||||
|
return trimmed;
|
||||||
|
}
|
||||||
@@ -14,7 +14,7 @@ export type WorkflowRunArtifactPatchKey =
|
|||||||
| "issueNodeId"
|
| "issueNodeId"
|
||||||
| "reviewNodeId"
|
| "reviewNodeId"
|
||||||
| "planCommentNodeId"
|
| "planCommentNodeId"
|
||||||
| "summaryCommentNodeId";
|
| "summarySnapshot";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Usage fields — aggregated across all agent calls and PATCHed once at
|
* Usage fields — aggregated across all agent calls and PATCHed once at
|
||||||
@@ -37,7 +37,7 @@ const STRING_KEYS: WorkflowRunArtifactPatchKey[] = [
|
|||||||
"issueNodeId",
|
"issueNodeId",
|
||||||
"reviewNodeId",
|
"reviewNodeId",
|
||||||
"planCommentNodeId",
|
"planCommentNodeId",
|
||||||
"summaryCommentNodeId",
|
"summarySnapshot",
|
||||||
];
|
];
|
||||||
|
|
||||||
const NUMBER_KEYS: WorkflowRunUsagePatchKey[] = [
|
const NUMBER_KEYS: WorkflowRunUsagePatchKey[] = [
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ export const JsonPayload = type({
|
|||||||
id: "string",
|
id: "string",
|
||||||
type: "'issue' | 'review'",
|
type: "'issue' | 'review'",
|
||||||
}).or("undefined"),
|
}).or("undefined"),
|
||||||
|
"generateSummary?": "boolean | undefined",
|
||||||
});
|
});
|
||||||
|
|
||||||
// permission levels that indicate collaborator status (have push access)
|
// permission levels that indicate collaborator status (have push access)
|
||||||
@@ -160,6 +161,7 @@ export function resolvePayload(
|
|||||||
timeout: inputs.timeout ?? jsonPayload?.timeout,
|
timeout: inputs.timeout ?? jsonPayload?.timeout,
|
||||||
cwd: resolveCwd(inputs.cwd),
|
cwd: resolveCwd(inputs.cwd),
|
||||||
progressComment: jsonPayload?.progressComment,
|
progressComment: jsonPayload?.progressComment,
|
||||||
|
generateSummary: jsonPayload?.generateSummary,
|
||||||
|
|
||||||
// permissions: inputs > repoSettings > fallbacks
|
// permissions: inputs > repoSettings > fallbacks
|
||||||
push: inputs.push ?? repoSettings.push ?? "restricted",
|
push: inputs.push ?? repoSettings.push ?? "restricted",
|
||||||
|
|||||||
@@ -1,246 +0,0 @@
|
|||||||
import { isLeapingIntoActionCommentBody } from "../mcp/comment.ts";
|
|
||||||
import { getApiUrl } from "./apiUrl.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 {
|
|
||||||
getProgressComment,
|
|
||||||
type ProgressComment,
|
|
||||||
parseProgressComment,
|
|
||||||
updateProgressComment,
|
|
||||||
} from "./progressComment.ts";
|
|
||||||
import { getJobToken } from "./token.ts";
|
|
||||||
|
|
||||||
type JsonPromptInput = Extract<ResolvedPromptInput, object>; // not string
|
|
||||||
|
|
||||||
interface PostCleanupContext {
|
|
||||||
repoContext: ReturnType<typeof parseRepoContext>;
|
|
||||||
octokit: ReturnType<typeof createOctokit>;
|
|
||||||
runId: number | undefined;
|
|
||||||
promptInput: JsonPromptInput | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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;
|
|
||||||
|
|
||||||
function buildErrorCommentBody(ctx: PostCleanupContext, isCancellation: boolean): string {
|
|
||||||
let errorMessage = isCancellation
|
|
||||||
? `This run was cancelled 🛑\n\nThe workflow was cancelled before completion.`
|
|
||||||
: `This run croaked 😵\n\nThe workflow encountered an error before any progress could be reported.`;
|
|
||||||
|
|
||||||
if (ctx.runId) {
|
|
||||||
errorMessage += " Please check the link below for details.";
|
|
||||||
}
|
|
||||||
|
|
||||||
const customParts: string[] = [];
|
|
||||||
if (!isCancellation && ctx.runId) {
|
|
||||||
const apiUrl = getApiUrl();
|
|
||||||
customParts.push(
|
|
||||||
`[Rerun failed job ➔](${apiUrl}/trigger/${ctx.repoContext.owner}/${ctx.repoContext.name}/${ctx.runId}?action=rerun)`
|
|
||||||
);
|
|
||||||
}
|
|
||||||
const footer = buildPullfrogFooter({
|
|
||||||
triggeredBy: true,
|
|
||||||
workflowRun: ctx.runId
|
|
||||||
? {
|
|
||||||
owner: ctx.repoContext.owner,
|
|
||||||
repo: ctx.repoContext.name,
|
|
||||||
runId: ctx.runId,
|
|
||||||
}
|
|
||||||
: undefined,
|
|
||||||
customParts,
|
|
||||||
});
|
|
||||||
return `${errorMessage}${footer}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function validateStuckProgressComment(
|
|
||||||
ctx: PostCleanupContext
|
|
||||||
): Promise<ProgressComment | null> {
|
|
||||||
const promptComment = ctx.promptInput?.progressComment;
|
|
||||||
if (!promptComment) {
|
|
||||||
log.info("[post] no progressComment in prompt input, skipping cleanup");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const comment = parseProgressComment(promptComment);
|
|
||||||
if (!comment) {
|
|
||||||
log.info(`[post] progressComment.id is not a positive integer: ${promptComment.id}`);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
log.info(`[post] validating progressComment from prompt input: ${comment.id} (${comment.type})`);
|
|
||||||
|
|
||||||
try {
|
|
||||||
const fetched = await getProgressComment(
|
|
||||||
{ octokit: ctx.octokit, owner: ctx.repoContext.owner, repo: ctx.repoContext.name },
|
|
||||||
comment
|
|
||||||
);
|
|
||||||
|
|
||||||
const body = fetched.body ?? "";
|
|
||||||
|
|
||||||
if (isLeapingIntoActionCommentBody(body)) {
|
|
||||||
log.info(`[post] comment ${comment.id} is stuck on "Leaping into action"`);
|
|
||||||
return comment;
|
|
||||||
}
|
|
||||||
|
|
||||||
// detect stranded todo checklists left by the tracker when the process was killed
|
|
||||||
// before the agent could call report_progress with a final summary
|
|
||||||
if (/^- \[[ x]\] |^- \*\*→\*\* |^- ~~/.test(body)) {
|
|
||||||
log.info(`[post] comment ${comment.id} is stuck on a todo checklist`);
|
|
||||||
return comment;
|
|
||||||
}
|
|
||||||
|
|
||||||
log.info(`[post] comment ${comment.id} 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 ${comment.id}: ${errorMessage}`);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function getIsCancelled(ctx: PostCleanupContext): Promise<boolean> {
|
|
||||||
if (!ctx.runId) return false; // can't check without a run ID — assume failure
|
|
||||||
try {
|
|
||||||
const jobsResult = await ctx.octokit.rest.actions.listJobsForWorkflowRun({
|
|
||||||
owner: ctx.repoContext.owner,
|
|
||||||
repo: ctx.repoContext.name,
|
|
||||||
run_id: ctx.runId,
|
|
||||||
});
|
|
||||||
|
|
||||||
// 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 runId = process.env.GITHUB_RUN_ID
|
|
||||||
? Number.parseInt(process.env.GITHUB_RUN_ID, 10)
|
|
||||||
: undefined;
|
|
||||||
|
|
||||||
// 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 ctx: PostCleanupContext = { repoContext, octokit, runId, promptInput };
|
|
||||||
|
|
||||||
const stuck = await validateStuckProgressComment(ctx);
|
|
||||||
|
|
||||||
if (!stuck) return log.info("» [post] no stuck progress comment to update, skipping cleanup");
|
|
||||||
|
|
||||||
log.info(
|
|
||||||
`» [post] validated stuck comment: ${stuck.id} (${stuck.type}), updating with error message`
|
|
||||||
);
|
|
||||||
|
|
||||||
try {
|
|
||||||
const body = buildErrorCommentBody(
|
|
||||||
ctx,
|
|
||||||
SHOULD_CHECK_REASON ? await getIsCancelled(ctx) : false
|
|
||||||
);
|
|
||||||
|
|
||||||
await writeAndVerify(ctx, stuck, body);
|
|
||||||
} catch (error) {
|
|
||||||
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
||||||
log.info(`[post] failed to update comment: ${errorMessage}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// post-cleanup runs in a separate process from the cancelled action, so any in-flight
|
|
||||||
// HTTP write the action's todoTracker had on the wire when SIGTERM landed can still get
|
|
||||||
// processed by GitHub *after* our update — clobbering the cancellation message back to
|
|
||||||
// the stale task list. (action-side mitigation: SIGTERM handler cancels the tracker; here
|
|
||||||
// we close the remaining race by reading back our write and re-issuing if it lost.)
|
|
||||||
const VERIFY_DELAY_MS = 3000;
|
|
||||||
const MAX_WRITE_ATTEMPTS = 3;
|
|
||||||
|
|
||||||
async function writeAndVerify(
|
|
||||||
ctx: PostCleanupContext,
|
|
||||||
comment: ProgressComment,
|
|
||||||
body: string
|
|
||||||
): Promise<void> {
|
|
||||||
const apiCtx = {
|
|
||||||
octokit: ctx.octokit,
|
|
||||||
owner: ctx.repoContext.owner,
|
|
||||||
repo: ctx.repoContext.name,
|
|
||||||
};
|
|
||||||
for (let attempt = 1; attempt <= MAX_WRITE_ATTEMPTS; attempt++) {
|
|
||||||
await updateProgressComment(apiCtx, comment, body);
|
|
||||||
await new Promise((resolve) => setTimeout(resolve, VERIFY_DELAY_MS));
|
|
||||||
|
|
||||||
let fetched: Awaited<ReturnType<typeof getProgressComment>>;
|
|
||||||
try {
|
|
||||||
fetched = await getProgressComment(apiCtx, comment);
|
|
||||||
} catch (error) {
|
|
||||||
// verify GET failed (5xx, secondary rate limit, network blip). the PUT itself
|
|
||||||
// returned 200, so we trust it landed; another write-and-verify pass would just
|
|
||||||
// amplify writes against a flaky GitHub. log and exit — if a stale tracker write
|
|
||||||
// does clobber us, the comment will be wrong but the agent's commit + replies
|
|
||||||
// already conveyed the substance of the run.
|
|
||||||
log.warning(
|
|
||||||
`[post] verify GET failed after attempt ${attempt} — trusting our PUT landed: ${
|
|
||||||
error instanceof Error ? error.message : String(error)
|
|
||||||
}`
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fetched.body === body) {
|
|
||||||
log.info(
|
|
||||||
`» [post] successfully updated progress comment (attempt ${attempt}/${MAX_WRITE_ATTEMPTS})`
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
log.info(
|
|
||||||
`[post] body was overwritten after our write (attempt ${attempt}/${MAX_WRITE_ATTEMPTS}), retrying`
|
|
||||||
);
|
|
||||||
}
|
|
||||||
log.warning(
|
|
||||||
`[post] gave up after ${MAX_WRITE_ATTEMPTS} attempts — comment may be stale (in-flight writes from the cancelled run kept clobbering us)`
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,78 @@
|
|||||||
|
import { mkdir, readFile, writeFile } from "node:fs/promises";
|
||||||
|
import { dirname, join } from "node:path";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The PR-level summary snapshot is a markdown file the agent edits in place
|
||||||
|
* during a Review / IncrementalReview run. The server seeds the file with
|
||||||
|
* either the previous run's snapshot (incremental) or a stub scaffold (first
|
||||||
|
* run), lets the agent edit it with its native file-editing tools, then
|
||||||
|
* reads it back at end-of-run and persists it to `WorkflowRun.summarySnapshot`.
|
||||||
|
*
|
||||||
|
* The snapshot is an internal artifact — it is consumed by future agent runs
|
||||||
|
* as durable cross-run context, not surfaced to humans. User-visible summary
|
||||||
|
* content lives in the Review / IncrementalReview review bodies, governed by
|
||||||
|
* `action/modes.ts`.
|
||||||
|
*
|
||||||
|
* Edit-in-place avoids the output-token tax of a tool call that regurgitates
|
||||||
|
* the full snapshot, and gives incremental runs a clean surface that
|
||||||
|
* range-diffs cleanly across runs because the section headings are stable.
|
||||||
|
*/
|
||||||
|
|
||||||
|
export const SUMMARY_FILE_NAME = "pullfrog-summary.md";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* minimal seed for first-run PRs. just a header + a one-line note about
|
||||||
|
* what this file is for. structure is intentionally NOT prescribed —
|
||||||
|
* different PRs warrant different organization, and the agent should pick
|
||||||
|
* a shape that fits this PR. the agent's prompt (see selectMode.ts
|
||||||
|
* `buildSummaryAddendum`) carries the actual instructions for what to
|
||||||
|
* capture and how.
|
||||||
|
*
|
||||||
|
* keeping the seed short also makes the unchanged-from-seed gate more
|
||||||
|
* sensitive — any meaningful edit moves the file off the seed, so
|
||||||
|
* `persistSummary` can reliably skip the DB write when the agent didn't
|
||||||
|
* touch the file.
|
||||||
|
*/
|
||||||
|
export const SUMMARY_SCAFFOLD = `# PR summary
|
||||||
|
|
||||||
|
<!-- durable cross-run context. edit in place; the next agent run reads this
|
||||||
|
before reviewing new commits. structure however serves the PR best. -->
|
||||||
|
`;
|
||||||
|
|
||||||
|
const MIN_SNAPSHOT_LENGTH = 60;
|
||||||
|
/** PG TEXT can hold ~1GB but a sane cap protects the DB / API payloads. */
|
||||||
|
const MAX_SNAPSHOT_LENGTH = 32_768;
|
||||||
|
|
||||||
|
export function summaryFilePath(tmpdir: string): string {
|
||||||
|
return join(tmpdir, SUMMARY_FILE_NAME);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** seed the summary file with previous snapshot (incremental) or scaffold (first run). */
|
||||||
|
export async function seedSummaryFile(params: {
|
||||||
|
tmpdir: string;
|
||||||
|
previousSnapshot: string | null;
|
||||||
|
}): Promise<string> {
|
||||||
|
const path = summaryFilePath(params.tmpdir);
|
||||||
|
await mkdir(dirname(path), { recursive: true });
|
||||||
|
const seed =
|
||||||
|
params.previousSnapshot && params.previousSnapshot.trim().length >= MIN_SNAPSHOT_LENGTH
|
||||||
|
? params.previousSnapshot
|
||||||
|
: SUMMARY_SCAFFOLD;
|
||||||
|
await writeFile(path, seed, "utf8");
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** read + validate the summary file written by the agent.
|
||||||
|
* returns null when the file is missing or fails sanity checks. */
|
||||||
|
export async function readSummaryFile(path: string): Promise<string | null> {
|
||||||
|
let raw: string;
|
||||||
|
try {
|
||||||
|
raw = await readFile(path, "utf8");
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
const trimmed = raw.trim();
|
||||||
|
if (trimmed.length < MIN_SNAPSHOT_LENGTH) return null;
|
||||||
|
if (trimmed.length > MAX_SNAPSHOT_LENGTH) return trimmed.slice(0, MAX_SNAPSHOT_LENGTH);
|
||||||
|
return trimmed;
|
||||||
|
}
|
||||||
@@ -0,0 +1,164 @@
|
|||||||
|
import { detectProviderError, isRouterKeylimitExhaustedError } from "./providerErrors.ts";
|
||||||
|
|
||||||
|
describe("detectProviderError", () => {
|
||||||
|
describe("false positives previously seen in production", () => {
|
||||||
|
it("returns null for commit SHAs containing 429", () => {
|
||||||
|
expect(detectProviderError("hash=7a46d89f505b36df49b4f54429daffa1a9459b11")).toBeNull();
|
||||||
|
expect(detectProviderError("commit f609cc89e84596ab125d60dac568bfb2ef398396 429")).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("classifies 401 + x-ratelimit-* headers as auth, not rate-limited", () => {
|
||||||
|
// OpenRouter 401 responses bundle `x-ratelimit-*` rate-limit headers
|
||||||
|
// alongside the auth error. the auth patterns must win — pre-fix this
|
||||||
|
// got tagged as `rate limited` because of the loose `\brate[_ ]limit`
|
||||||
|
// match against header names like `ratelimit-limit-requests`. note: in
|
||||||
|
// OpenRouter's actual format the header name is `ratelimit` (one word),
|
||||||
|
// but the dumped JSON sometimes contains `rate-limit` separators too.
|
||||||
|
const stderr = JSON.stringify({
|
||||||
|
error: { name: "APIError", statusCode: 401, message: "Invalid authentication credentials" },
|
||||||
|
headers: {
|
||||||
|
"x-ratelimit-limit-requests": 50,
|
||||||
|
"x-ratelimit-remaining-requests": 49,
|
||||||
|
"x-ratelimit-reset-tokens": "2025-01-01T00:00:00Z",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
expect(detectProviderError(stderr)).toBe("auth error (401)");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns null for INTERNAL_SERVER_ERROR substring", () => {
|
||||||
|
expect(detectProviderError("HTTP/1.1 500 INTERNAL_SERVER_ERROR")).toBeNull();
|
||||||
|
expect(detectProviderError("expected: not INTERNAL_SERVER_ERROR")).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns null for INTERNALS substring", () => {
|
||||||
|
expect(detectProviderError("debugging INTERNALS of the parser")).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("auth errors", () => {
|
||||||
|
it("detects 401 / 403 status codes as auth errors", () => {
|
||||||
|
expect(detectProviderError('{"statusCode": 401}')).toBe("auth error (401)");
|
||||||
|
expect(detectProviderError('{"statusCode": 403}')).toBe("auth error (403)");
|
||||||
|
expect(detectProviderError("status_code: 401")).toBe("auth error (401)");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("detects OpenRouter 'User not found' (disabled/invalid key)", () => {
|
||||||
|
// bare `"code":401` lacks a status-key prefix so the 401 status pattern
|
||||||
|
// intentionally doesn't fire; the User-not-found pattern catches it.
|
||||||
|
expect(detectProviderError('{"error":{"message":"User not found","code":401}}')).toBe(
|
||||||
|
"auth error (invalid/disabled key)"
|
||||||
|
);
|
||||||
|
expect(detectProviderError("APIError: User not found.")).toBe(
|
||||||
|
"auth error (invalid/disabled key)"
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("detects 'Invalid authentication' phrasing", () => {
|
||||||
|
expect(detectProviderError("Invalid authentication credentials")).toBe(
|
||||||
|
"auth error (invalid credentials)"
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("detects 'No auth credentials found' phrasing", () => {
|
||||||
|
expect(detectProviderError("AI_APICallError: No auth credentials found")).toBe(
|
||||||
|
"auth error (missing credentials)"
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("real provider errors", () => {
|
||||||
|
it("detects 429 only when adjacent to a status key", () => {
|
||||||
|
expect(detectProviderError('{"statusCode": 429}')).toBe("rate limited (429)");
|
||||||
|
expect(detectProviderError('{"status_code": 429, "message": "..."}')).toBe(
|
||||||
|
"rate limited (429)"
|
||||||
|
);
|
||||||
|
expect(detectProviderError("http_status: 429")).toBe("rate limited (429)");
|
||||||
|
expect(detectProviderError("status=429")).toBe("rate limited (429)");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("detects rate_limit_error and rate_limit_exceeded", () => {
|
||||||
|
expect(detectProviderError('{"type":"rate_limit_error"}')).toBe("rate limited");
|
||||||
|
expect(detectProviderError("rate_limit_exceeded")).toBe("rate limited");
|
||||||
|
expect(detectProviderError("plain rate limit reached")).toBe("rate limited");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("detects rate-limit phrasing with trailing inflection", () => {
|
||||||
|
expect(detectProviderError("Error: rate limited by provider")).toBe("rate limited");
|
||||||
|
expect(detectProviderError("rate limits exceeded for this key")).toBe("rate limited");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("detects RESOURCE_EXHAUSTED", () => {
|
||||||
|
expect(detectProviderError('"status": "RESOURCE_EXHAUSTED"')).toBe("quota exhausted");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("detects gRPC INTERNAL status as a whole word", () => {
|
||||||
|
expect(detectProviderError('"status": "INTERNAL"')).toBe("provider internal error");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("detects UNAVAILABLE as a whole word", () => {
|
||||||
|
expect(detectProviderError('"status": "UNAVAILABLE"')).toBe("provider unavailable");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("detects 500 / 503 only when adjacent to a status key", () => {
|
||||||
|
expect(detectProviderError('"statusCode": 500')).toBe("provider 500 error");
|
||||||
|
expect(detectProviderError('"statusCode": 503')).toBe("provider unavailable (503)");
|
||||||
|
expect(detectProviderError("v1.503.0 release notes")).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("detects quota and zero-quota responses", () => {
|
||||||
|
expect(detectProviderError('"message": "quota exceeded"')).toBe("quota error");
|
||||||
|
expect(detectProviderError('{"code":"insufficient_quota"}')).toBe("quota error");
|
||||||
|
expect(detectProviderError('"error":"quota_exceeded"')).toBe("quota error");
|
||||||
|
expect(detectProviderError('{"reason":"quotaExceeded"}')).toBe("quota error");
|
||||||
|
expect(detectProviderError('{"limit": 0, "remaining": 0}')).toBe("zero quota");
|
||||||
|
expect(detectProviderError('"time_limit": 0')).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("isRouterKeylimitExhaustedError", () => {
|
||||||
|
it("matches the canonical OpenRouter mid-run error", () => {
|
||||||
|
expect(
|
||||||
|
isRouterKeylimitExhaustedError(
|
||||||
|
"APIError: This request requires more credits, or fewer max_tokens. " +
|
||||||
|
"You requested up to 32000 tokens, but can only afford 22800. " +
|
||||||
|
"To increase, visit https://openrouter.ai/settings/keys and create a key with a higher total limit"
|
||||||
|
)
|
||||||
|
).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("matches the 'requires more credits' phrasing on its own", () => {
|
||||||
|
expect(
|
||||||
|
isRouterKeylimitExhaustedError("This request requires more credits, or fewer max_tokens.")
|
||||||
|
).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("matches the 'requested up to ... can only afford' phrasing on its own", () => {
|
||||||
|
expect(
|
||||||
|
isRouterKeylimitExhaustedError("You requested up to 8000 tokens but can only afford 1234")
|
||||||
|
).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("does not match generic out-of-credit text", () => {
|
||||||
|
expect(isRouterKeylimitExhaustedError("Your account has insufficient credits")).toBe(false);
|
||||||
|
expect(isRouterKeylimitExhaustedError("rate_limit_exceeded")).toBe(false);
|
||||||
|
expect(isRouterKeylimitExhaustedError('{"limit": 0}')).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("does not match unrelated mentions of max_tokens", () => {
|
||||||
|
expect(isRouterKeylimitExhaustedError("max_tokens parameter must be a positive integer")).toBe(
|
||||||
|
false
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("matches across newlines (defends against upstream wrapping/reformatting)", () => {
|
||||||
|
expect(
|
||||||
|
isRouterKeylimitExhaustedError(
|
||||||
|
"APIError: This request requires more credits, or\nfewer max_tokens. You requested up to 32000 tokens"
|
||||||
|
)
|
||||||
|
).toBe(true);
|
||||||
|
expect(
|
||||||
|
isRouterKeylimitExhaustedError("You requested up to 32000 tokens,\nbut can only afford 22800")
|
||||||
|
).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
+68
-11
@@ -1,18 +1,75 @@
|
|||||||
const PROVIDER_ERROR_PATTERNS = [
|
type ProviderErrorPattern = { regex: RegExp; label: string };
|
||||||
{ pattern: "429", label: "rate limited (429)" },
|
|
||||||
{ pattern: "RESOURCE_EXHAUSTED", label: "quota exhausted" },
|
// status codes are only treated as provider errors when they are adjacent to
|
||||||
{ pattern: "quota", label: "quota error" },
|
// a recognised status key. this rejects commit SHAs that happen to contain
|
||||||
{ pattern: "status: 500", label: "provider 500 error" },
|
// "429", version strings, file hashes, etc.
|
||||||
{ pattern: "INTERNAL", label: "provider internal error" },
|
const statusKey = `\\b(?:status[_ ]?code|http[_ ]?status|status)["']?\\s*[:=]\\s*["']?`;
|
||||||
{ pattern: "status: 503", label: "provider unavailable (503)" },
|
|
||||||
{ pattern: "UNAVAILABLE", label: "provider unavailable" },
|
const PROVIDER_ERROR_PATTERNS: ProviderErrorPattern[] = [
|
||||||
{ pattern: "rate limit", label: "rate limited" },
|
// auth patterns must come BEFORE rate-limit patterns. OpenRouter 401 error
|
||||||
{ pattern: "limit: 0", label: "zero quota" },
|
// payloads carry `x-ratelimit-*` response headers in the dump, and the
|
||||||
|
// free-form rate-limit regex below would otherwise win on word-boundary
|
||||||
|
// matches inside header names. canonical 401 messages: OpenRouter returns
|
||||||
|
// `{"error":{"message":"User not found","code":401}}` for disabled or
|
||||||
|
// invalid keys (https://openai.luzhipeng.com/docs/api/reference/errors-and-debugging).
|
||||||
|
{ regex: new RegExp(`${statusKey}401\\b`, "i"), label: "auth error (401)" },
|
||||||
|
{ regex: new RegExp(`${statusKey}403\\b`, "i"), label: "auth error (403)" },
|
||||||
|
{ regex: /\bUser not found\b/i, label: "auth error (invalid/disabled key)" },
|
||||||
|
{ regex: /\bInvalid authentication\b/i, label: "auth error (invalid credentials)" },
|
||||||
|
{ regex: /\bNo auth credentials found\b/i, label: "auth error (missing credentials)" },
|
||||||
|
{ regex: new RegExp(`${statusKey}429\\b`, "i"), label: "rate limited (429)" },
|
||||||
|
{ regex: new RegExp(`${statusKey}500\\b`, "i"), label: "provider 500 error" },
|
||||||
|
{ regex: new RegExp(`${statusKey}503\\b`, "i"), label: "provider unavailable (503)" },
|
||||||
|
// matches `rate limit`, `rate limited`, `rate limits exceeded`,
|
||||||
|
// `rate_limit_error`, `rate_limit_exceeded`. the leading `\b` + `[_ ]`
|
||||||
|
// separator rejects `x-ratelimit-*` / `anthropic-ratelimit-*` response
|
||||||
|
// headers (no separator between "rate" and "limit") which routinely
|
||||||
|
// appear in dumped 401 / 4xx error JSON.
|
||||||
|
{ regex: /\brate[_ ]limit/i, label: "rate limited" },
|
||||||
|
{ regex: /\bRESOURCE_EXHAUSTED\b/, label: "quota exhausted" },
|
||||||
|
// Google gRPC `INTERNAL` status. word-boundary anchors reject
|
||||||
|
// `INTERNAL_SERVER_ERROR` (HTTP 500 message that may appear in unrelated
|
||||||
|
// log lines) and identifiers like `INTERNALS`.
|
||||||
|
{ regex: /\bINTERNAL\b/, label: "provider internal error" },
|
||||||
|
{ regex: /\bUNAVAILABLE\b/, label: "provider unavailable" },
|
||||||
|
// matches `quota`, `insufficient_quota`, `quota_exceeded`, `quotaExceeded`.
|
||||||
|
// word-character lookarounds would reject `_quota` / `quotaX`; `quota` is
|
||||||
|
// specific enough that a plain substring match is safe.
|
||||||
|
{ regex: /quota/i, label: "quota error" },
|
||||||
|
// explicit zero-quota response, e.g. `{"limit": 0}`. the `\b` anchor
|
||||||
|
// around `limit` rejects keys like `time_limit` or `field_limit`.
|
||||||
|
{ regex: /["']?\blimit\b["']?\s*:\s*0\b/, label: "zero quota" },
|
||||||
];
|
];
|
||||||
|
|
||||||
export function detectProviderError(text: string): string | null {
|
export function detectProviderError(text: string): string | null {
|
||||||
for (const entry of PROVIDER_ERROR_PATTERNS) {
|
for (const entry of PROVIDER_ERROR_PATTERNS) {
|
||||||
if (text.includes(entry.pattern)) return entry.label;
|
if (entry.regex.test(text)) return entry.label;
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* OpenRouter's response when the per-run key's remaining budget can't cover
|
||||||
|
* the agent's `max_tokens` reservation. Distinct from a generic provider error
|
||||||
|
* because it's a Pullfrog billing concern, not an upstream outage — the user's
|
||||||
|
* Router wallet ran out (or the key budget was undersized at mint time and the
|
||||||
|
* agent ran out of headroom partway through).
|
||||||
|
*
|
||||||
|
* Match must be specific to this exact OpenRouter error class. Generic "credits"
|
||||||
|
* or "limit" text shows up in unrelated errors and would mis-classify them.
|
||||||
|
*
|
||||||
|
* Sample:
|
||||||
|
* `APIError: This request requires more credits, or fewer max_tokens.
|
||||||
|
* You requested up to 32000 tokens, but can only afford 22800.`
|
||||||
|
*/
|
||||||
|
// `/s` (dotAll) lets `.*?` cross newlines so we still detect the error if any
|
||||||
|
// upstream layer reformats the message onto multiple lines. Without it, a
|
||||||
|
// single inserted `\n` would silently bypass the BillingError reclassification
|
||||||
|
// and the user would see the generic `❌ Pullfrog failed` dump instead of the
|
||||||
|
// actionable top-up CTA.
|
||||||
|
const ROUTER_KEYLIMIT_EXHAUSTED_PATTERN =
|
||||||
|
/requires more credits.*?fewer max_tokens|requested up to \d+ tokens.*?can only afford/is;
|
||||||
|
|
||||||
|
export function isRouterKeylimitExhaustedError(text: string): boolean {
|
||||||
|
return ROUTER_KEYLIMIT_EXHAUSTED_PATTERN.test(text);
|
||||||
|
}
|
||||||
|
|||||||
+14
-3
@@ -4,6 +4,12 @@ import { log } from "./cli.ts";
|
|||||||
export type RetryOptions = {
|
export type RetryOptions = {
|
||||||
maxAttempts?: number;
|
maxAttempts?: number;
|
||||||
delayMs?: number;
|
delayMs?: number;
|
||||||
|
/**
|
||||||
|
* explicit delay schedule — one entry per retry (length N ⇒ N+1 attempts).
|
||||||
|
* when set, overrides `maxAttempts` and `delayMs`. e.g. `[1_000, 3_000]`
|
||||||
|
* means up to 3 attempts, sleeping 1s before retry 2 and 3s before retry 3.
|
||||||
|
*/
|
||||||
|
delaysMs?: readonly number[];
|
||||||
shouldRetry?: (error: unknown) => boolean;
|
shouldRetry?: (error: unknown) => boolean;
|
||||||
label?: string;
|
label?: string;
|
||||||
};
|
};
|
||||||
@@ -20,10 +26,15 @@ const defaultShouldRetry = (error: unknown): boolean => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export async function retry<T>(fn: () => Promise<T>, options: RetryOptions = {}): Promise<T> {
|
export async function retry<T>(fn: () => Promise<T>, options: RetryOptions = {}): Promise<T> {
|
||||||
const maxAttempts = options.maxAttempts ?? 3;
|
|
||||||
const delayMs = options.delayMs ?? 1000;
|
|
||||||
const shouldRetry = options.shouldRetry ?? defaultShouldRetry;
|
const shouldRetry = options.shouldRetry ?? defaultShouldRetry;
|
||||||
const label = options.label ?? "operation";
|
const label = options.label ?? "operation";
|
||||||
|
const delays = options.delaysMs
|
||||||
|
? Array.from(options.delaysMs)
|
||||||
|
: Array.from(
|
||||||
|
{ length: (options.maxAttempts ?? 3) - 1 },
|
||||||
|
(_, i) => (options.delayMs ?? 1000) * (i + 1)
|
||||||
|
);
|
||||||
|
const maxAttempts = delays.length + 1;
|
||||||
|
|
||||||
let lastError: unknown;
|
let lastError: unknown;
|
||||||
|
|
||||||
@@ -37,7 +48,7 @@ export async function retry<T>(fn: () => Promise<T>, options: RetryOptions = {})
|
|||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
|
|
||||||
const delay = delayMs * attempt;
|
const delay = delays[attempt - 1]!;
|
||||||
log.info(`» ${label} failed (attempt ${attempt}/${maxAttempts}), retrying in ${delay}ms...`);
|
log.info(`» ${label} failed (attempt ${attempt}/${maxAttempts}), retrying in ${delay}ms...`);
|
||||||
await sleep(delay);
|
await sleep(delay);
|
||||||
}
|
}
|
||||||
|
|||||||
+12
-1
@@ -88,8 +88,19 @@ async function dispatchFollowUpReReview(ctx: ToolContext, reviewedSha: string):
|
|||||||
await ctx.octokit.rest.actions.createWorkflowDispatch({
|
await ctx.octokit.rest.actions.createWorkflowDispatch({
|
||||||
owner: ctx.repo.owner,
|
owner: ctx.repo.owner,
|
||||||
repo: ctx.repo.name,
|
repo: ctx.repo.name,
|
||||||
workflow_id: "pullfrog.yml",
|
workflow_id: getCurrentWorkflowFilename(),
|
||||||
ref: pr.data.base.repo.default_branch,
|
ref: pr.data.base.repo.default_branch,
|
||||||
inputs: { prompt: JSON.stringify(payload) },
|
inputs: { prompt: JSON.stringify(payload) },
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* derive the running workflow's filename from `GITHUB_WORKFLOW_REF`, which has the form
|
||||||
|
* `<owner>/<repo>/.github/workflows/<filename>@<ref>` (e.g. `.../pullfrog.yaml@refs/heads/main`).
|
||||||
|
* falls back to `pullfrog.yml` if the env var is missing or malformed (shouldn't happen in CI).
|
||||||
|
*/
|
||||||
|
function getCurrentWorkflowFilename(): string {
|
||||||
|
const ref = process.env.GITHUB_WORKFLOW_REF ?? "";
|
||||||
|
const match = ref.match(/\/([^/]+)@/);
|
||||||
|
return match?.[1] ?? "pullfrog.yml";
|
||||||
|
}
|
||||||
|
|||||||
+8
-8
@@ -19,14 +19,14 @@ export async function handleAgentResult(ctx: HandleAgentResultParams): Promise<M
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// Review and IncrementalReview modes intentionally never set wasUpdated:
|
// IncrementalReview's non-substantive path exits cleanly without
|
||||||
// the prompt forbids report_progress (the review IS the durable record),
|
// submitting any review, so no MCP write tool flips wasUpdated and the
|
||||||
// and IncrementalReview's non-substantive path produces no review at
|
// strict completion check below would otherwise fail the run. The
|
||||||
// all by design. wasUpdated staying false is also load-bearing for the
|
// isReviewMode skip is load-bearing for that path: the agent's exit
|
||||||
// stranded-comment cleanup in main.ts which deletes the "Leaping into
|
// code is the completion signal, not a progress-comment write.
|
||||||
// action" orphan via `(!wasUpdated || trackerWasLastWriter)`. Skip the
|
// (Review mode that submits a real review now flips wasUpdated via
|
||||||
// strict completion check for these modes — the agent's exit code is
|
// create_pull_request_review, so the skip is redundant for the
|
||||||
// the completion signal, not a progress-comment write.
|
// substantive-review path but kept for symmetry with IncrementalReview.)
|
||||||
// See plans/review_progress_comment_cleanup_b0120f6c.plan.md.
|
// See plans/review_progress_comment_cleanup_b0120f6c.plan.md.
|
||||||
const mode = ctx.toolState.selectedMode;
|
const mode = ctx.toolState.selectedMode;
|
||||||
const isReviewMode = mode === "Review" || mode === "IncrementalReview";
|
const isReviewMode = mode === "Review" || mode === "IncrementalReview";
|
||||||
|
|||||||
+2
-2
@@ -68,7 +68,7 @@ export function installBundledSkills(params: { home: string }): void {
|
|||||||
writeFileSync(join(skillDir, "SKILL.md"), content);
|
writeFileSync(join(skillDir, "SKILL.md"), content);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
log.info(`installed bundled skills: ${BUNDLED_SKILL_NAMES.join(", ")}`);
|
log.success(`installed bundled skills: ${BUNDLED_SKILL_NAMES.join(", ")}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -108,7 +108,7 @@ export function addSkill(params: {
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
if (result.status === 0) {
|
if (result.status === 0) {
|
||||||
log.info(`installed ${params.skill} skill (${params.agent})`);
|
log.success(`installed ${params.skill} skill (${params.agent})`);
|
||||||
} else {
|
} else {
|
||||||
const stderr = (result.stderr?.toString() || "").trim();
|
const stderr = (result.stderr?.toString() || "").trim();
|
||||||
const errorMsg = result.error ? result.error.message : stderr;
|
const errorMsg = result.error ? result.error.message : stderr;
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { performance } from "node:perf_hooks";
|
||||||
import { describe, expect, it } from "vitest";
|
import { describe, expect, it } from "vitest";
|
||||||
import { spawn } from "./subprocess.ts";
|
import { spawn } from "./subprocess.ts";
|
||||||
|
|
||||||
@@ -48,6 +49,36 @@ describe("spawn error path", () => {
|
|||||||
expect(afterHandles).toBeLessThanOrEqual(beforeHandles);
|
expect(afterHandles).toBeLessThanOrEqual(beforeHandles);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("killGroup: true propagates SIGKILL to grandchildren so close fires promptly", async () => {
|
||||||
|
// regression: node_modules/opencode-ai/bin/opencode is a Node shim that
|
||||||
|
// spawnSyncs the native binary with stdio:"inherit". without killGroup,
|
||||||
|
// child.kill("SIGKILL") hit only the shim — the native binary was
|
||||||
|
// reparented to PID 1, kept holding our stdout pipe via the inherited
|
||||||
|
// fds, and `child.on("close")` never fired (because pipes stayed open).
|
||||||
|
// a 5-min outer safety-net timer eventually rejected the agent promise,
|
||||||
|
// but the grandchild kept running until the GitHub Actions job-level
|
||||||
|
// timeout. this test replicates the shape with bash + a backgrounded
|
||||||
|
// sleep grandchild: with killGroup, close fires promptly after SIGKILL;
|
||||||
|
// without it, the parent would wait for sleep to exit (30s).
|
||||||
|
//
|
||||||
|
// the activity-check interval is fixed at 5s so the earliest the kill
|
||||||
|
// can fire is ~5s after start. budget 15s end-to-end.
|
||||||
|
const before = performance.now();
|
||||||
|
const result = await spawn({
|
||||||
|
cmd: "bash",
|
||||||
|
args: ["-c", "sleep 30 & wait"],
|
||||||
|
env: { PATH: process.env.PATH ?? "", HOME: process.env.HOME ?? "" },
|
||||||
|
activityTimeout: 1000,
|
||||||
|
killGroup: true,
|
||||||
|
}).catch((err) => err);
|
||||||
|
const elapsed = performance.now() - before;
|
||||||
|
|
||||||
|
expect(result).toBeInstanceOf(Error);
|
||||||
|
// 10s ceiling: 5s activity-check tick + signal delivery. a regression
|
||||||
|
// here (no killGroup) would hang for the full 30s sleep.
|
||||||
|
expect(elapsed).toBeLessThan(10_000);
|
||||||
|
}, 20_000);
|
||||||
|
|
||||||
it("reports signal-killed subprocesses as failures, not success", async () => {
|
it("reports signal-killed subprocesses as failures, not success", async () => {
|
||||||
// regression: before the fix, `child.on("close", (exitCode) => ...)`
|
// regression: before the fix, `child.on("close", (exitCode) => ...)`
|
||||||
// discarded the signal parameter and `exitCode || 0` coerced the
|
// discarded the signal parameter and `exitCode || 0` coerced the
|
||||||
|
|||||||
+34
-5
@@ -106,6 +106,15 @@ export interface SpawnOptions {
|
|||||||
stdio?: ("pipe" | "ignore" | "inherit")[];
|
stdio?: ("pipe" | "ignore" | "inherit")[];
|
||||||
onStdout?: (chunk: string) => void;
|
onStdout?: (chunk: string) => void;
|
||||||
onStderr?: (chunk: string) => void;
|
onStderr?: (chunk: string) => void;
|
||||||
|
// when true, spawn the child detached (its own process group) and route all
|
||||||
|
// kill paths (timeout, activity timeout, ctrl-c) through `process.kill(-pid, ...)`
|
||||||
|
// so signals reach grandchildren too. critical for binaries that fork through
|
||||||
|
// a shim (e.g. node_modules/opencode-ai/bin/opencode is a Node shim that
|
||||||
|
// spawnSync's the native binary; without killGroup, SIGKILL only hits the
|
||||||
|
// shim and the native binary is reparented to PID 1, holds our stdout pipe
|
||||||
|
// open, keeps emitting NDJSON, and `child.on("close")` never fires —
|
||||||
|
// producing zombie runs that hang until the GitHub Actions job timeout).
|
||||||
|
killGroup?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface SpawnResult {
|
export interface SpawnResult {
|
||||||
@@ -127,6 +136,8 @@ export async function spawn(options: SpawnOptions): Promise<SpawnResult> {
|
|||||||
let stdoutBuffer = "";
|
let stdoutBuffer = "";
|
||||||
let stderrBuffer = "";
|
let stderrBuffer = "";
|
||||||
|
|
||||||
|
const killGroup = options.killGroup ?? false;
|
||||||
|
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
// security: caller must provide complete env object, not merged with process.env
|
// security: caller must provide complete env object, not merged with process.env
|
||||||
const child = nodeSpawn(options.cmd, options.args, {
|
const child = nodeSpawn(options.cmd, options.args, {
|
||||||
@@ -136,10 +147,28 @@ export async function spawn(options: SpawnOptions): Promise<SpawnResult> {
|
|||||||
},
|
},
|
||||||
stdio: options.stdio || ["pipe", "pipe", "pipe"],
|
stdio: options.stdio || ["pipe", "pipe", "pipe"],
|
||||||
cwd: options.cwd || process.cwd(),
|
cwd: options.cwd || process.cwd(),
|
||||||
|
detached: killGroup,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// sends `signal` to the entire process group when killGroup is set, so
|
||||||
|
// grandchildren (e.g. the native opencode binary spawned by the
|
||||||
|
// opencode-ai Node shim) die with the parent. falls back to a direct
|
||||||
|
// child kill if the process-group send fails (common when the child
|
||||||
|
// already exited or was never made a process group leader).
|
||||||
|
const killSelf = (signal: NodeJS.Signals): void => {
|
||||||
|
if (killGroup && child.pid) {
|
||||||
|
try {
|
||||||
|
process.kill(-child.pid, signal);
|
||||||
|
return;
|
||||||
|
} catch {
|
||||||
|
// fall through to direct kill
|
||||||
|
}
|
||||||
|
}
|
||||||
|
child.kill(signal);
|
||||||
|
};
|
||||||
|
|
||||||
// track child for cleanup on Ctrl+C
|
// track child for cleanup on Ctrl+C
|
||||||
trackChild({ child });
|
trackChild({ child, killGroup });
|
||||||
|
|
||||||
let timeoutId: NodeJS.Timeout | undefined;
|
let timeoutId: NodeJS.Timeout | undefined;
|
||||||
let sigkillEscalatorId: NodeJS.Timeout | undefined;
|
let sigkillEscalatorId: NodeJS.Timeout | undefined;
|
||||||
@@ -157,7 +186,7 @@ export async function spawn(options: SpawnOptions): Promise<SpawnResult> {
|
|||||||
if (options.timeout) {
|
if (options.timeout) {
|
||||||
timeoutId = setTimeout(() => {
|
timeoutId = setTimeout(() => {
|
||||||
isTimedOut = true;
|
isTimedOut = true;
|
||||||
child.kill("SIGTERM");
|
killSelf("SIGTERM");
|
||||||
|
|
||||||
// track the escalator so a graceful SIGTERM response (close fires
|
// track the escalator so a graceful SIGTERM response (close fires
|
||||||
// before the 5s elapses) can clear it. without capture, this timer
|
// before the 5s elapses) can clear it. without capture, this timer
|
||||||
@@ -165,7 +194,7 @@ export async function spawn(options: SpawnOptions): Promise<SpawnResult> {
|
|||||||
// past a timed-out subprocess's clean exit.
|
// past a timed-out subprocess's clean exit.
|
||||||
sigkillEscalatorId = setTimeout(() => {
|
sigkillEscalatorId = setTimeout(() => {
|
||||||
if (!child.killed) {
|
if (!child.killed) {
|
||||||
child.kill("SIGKILL");
|
killSelf("SIGKILL");
|
||||||
}
|
}
|
||||||
}, 5000);
|
}, 5000);
|
||||||
}, options.timeout);
|
}, options.timeout);
|
||||||
@@ -186,9 +215,9 @@ export async function spawn(options: SpawnOptions): Promise<SpawnResult> {
|
|||||||
killedAtIdleMs = idleMs;
|
killedAtIdleMs = idleMs;
|
||||||
const idleSec = Math.round(idleMs / 1000);
|
const idleSec = Math.round(idleMs / 1000);
|
||||||
log.info(
|
log.info(
|
||||||
`no output for ${idleSec}s from pid=${child.pid} (${options.cmd}), killing process`
|
`no output for ${idleSec}s from pid=${child.pid} (${options.cmd}), killing process${killGroup ? " group" : ""}`
|
||||||
);
|
);
|
||||||
child.kill("SIGKILL");
|
killSelf("SIGKILL");
|
||||||
clearInterval(activityCheckIntervalId);
|
clearInterval(activityCheckIntervalId);
|
||||||
try {
|
try {
|
||||||
options.onActivityTimeout?.();
|
options.onActivityTimeout?.();
|
||||||
|
|||||||
Reference in New Issue
Block a user