fe2746198c
* fix: 6 unaddressed log-audit / run-audit findings - #836 + #818 (clerk middleware SyntaxError on action-runtime endpoints): narrow proxy.ts matcher to exclude /api/repo/<owner>/<repo>/run-context, /api/runtime/*, /api/proxy-token. these are server-to-server with their own auth and have no Clerk session to evaluate, so clerkMiddleware's decodeJwt throws turn into 500s on every request. - #837 (npx EBADDEVENGINES on customer's package.json): change runCli's bootstrap cwd from $GITHUB_WORKSPACE to os.tmpdir() so npm v11+ doesn't enforce devEngines.packageManager from the customer's tree before our bootstrap can install pullfrog. CLI process.chdir's to payload.cwd internally, so the runtime work still happens in $GITHUB_WORKSPACE. - #838 (createWorkflowDispatch silently dropped 39 user runs on a 5xx spike): add bounded retry (3 attempts, ~750ms total) on Octokit 5xx and network errors inside dispatchReservedRun. preserves the existing 422 "Unexpected inputs" path. retry budget stays well under GitHub's 10s webhook redelivery window. - #833 (bail() redirect("/signout") propagated NEXT_REDIRECT into webhook handlers, 40+ 500s/24h): drop the redirect side-effect; bail now just classifies bad-credentials as non-retryable and propagates. UI flows that wanted auto-signout on revoked tokens can detect it themselves; the side-effect was wrong for any non-page caller. - #835 (BYOK provider billing-exhausted fell through to raw error renderer, 37 review-mode runs/24h with no PR-side signal): - extend providerErrors patterns with Anthropic "credit balance is too low" + extract isProviderBillingExhausted / extractProviderId helpers - add a renderer branch in runErrorRenderer.ts that names the provider (parsed from providerID=) and links to its billing dashboard - route handleAgentResult's !result.success path through the renderer + reportErrorToComment with createIfMissing, so review-mode and silent triggers get an actionable PR comment regardless of mode - #834 (post-hook ERR_MODULE_NOT_FOUND already fixed on main, hardening): - add a vitest invariant that walks the entryPost.ts import graph and refuses any non-relative / non-node: specifier — catches the next `@actions/core` slip-up before publish - add an analyze-logs classifier so future entryPost crashes surface as failure:post-hook-module-not-found instead of hiding inside failure:unknown / failure:git-lock-file Co-authored-by: Cursor <cursoragent@cursor.com> * anneal: fix dead-code matcher, 404 url, silent-trigger gate, and grammar regression Round-1 anneal pass on the audit-fixes PR surfaced two critical issues + several majors that the original fixes shipped with: - proxy.ts matcher 1 (`(?!_next|[^?]*\.(...))`) still caught every /api/... route because matcher arrays are OR'd. The narrowing in matcher 2 was dead code → middleware still 500'd on /api/runtime/*, /api/proxy-token, /api/repo/.../run-context. Carve-out now lives in BOTH matchers. - opencode.ai/billing returns 404; canonical top-up surface is /zen. deepseek /usage is the consumption page, not the top-up flow (/top_up is correct). google /apikey is the keys list, not billing (/usage is the spend dashboard). All three URL strings updated. - handleAgentResult gated reportErrorToComment behind `if (!ctx.silent)`, contradicting the createIfMissing intent — silent IncrementalReview / pull_request_synchronize / auto-label still got zero PR signal on BYOK billing exhaustion, the exact failure mode #835 was meant to fix. Moved createIfMissing into finalizeSuccessRun's existing render-and- post block (single source of truth), reverted handleAgentResult to its prior shape. Side benefit: drops the double-PATCH that fired on every non-silent !success path with an existing progress comment. - Anthropic-direct error rendered "**Your your provider account is out of credit.**" because Anthropic SDK has no providerID= tag, so extractProviderId returned null and the headline composed "Your " + "your provider". Added detectProviderId Anthropic fallback (matches "Anthropic API" / "credit balance is too low") so the link is reachable AND made the headline conditional on whether a provider id was detected. - Reordered renderRunError classifier: BYOK billing-exhausted now runs BEFORE api-key auth detection. Providers commonly return 401 for billing exhaustion (DeepSeek, Gemini), and the OpenCode harness logs often include "API Error: 401" in the raw error body, which isApiKeyAuthError would otherwise match — surfacing "rotate your key" when the actual fix is "top up credits". - isTransientUpstreamError missed ENOTFOUND / ENETUNREACH / EHOSTUNREACH (undici DNS-class failures Octokit doesn't wrap with a status). Added to the prefix alternation. - Tightened "10s webhook redelivery budget" / "GitHub redelivers" wording in triggerWorkflow.ts and bail.ts JSDoc — GitHub's 10s is the response timeout (it doesn't auto-redeliver); upstream webhook proxy retries are what multiplied the failure. Co-authored-by: Cursor <cursoragent@cursor.com> * anneal r2: unbreak proxy.ts matcher 2, extend carve-out, mkdtemp bootstrap Round-2 anneal (security + cross-cutting lenses) on top of the round-1 audit-fixes commit caught a critical regression + several majors: - proxy.ts matcher 2 from r1 (`/(api|trpc)(?!...)(.*)`) does NOT compile. path-to-regexp rejects a top-level `(?!` after `)` as "Pattern cannot start with '?'", and Next.js's SourceSchema runs the same validator at build time and aborts via `process.exit(1)`. PR #840's Vercel + preview deployments have been failing since 978eca26 for exactly this reason. Fixed by nesting the lookahead inside an outer parameter group: `/(api|trpc)((?!...).*)`. Same shape matcher 1 already uses, which is why m1 always compiled. Verified `pnpm next build` succeeds end-to-end. - proxy.ts carve-out was incomplete relative to its own justification. The "no Clerk session, decodeJwt 500" failure mode applies to ALL server-to-server action-runtime endpoints — five more share the exact shape: /api/repo/.../learnings, /api/repo/.../pr/.../summary-comment, /api/repo/.../issue/.../plan-comment, /api/workflow-run/, and /api/github/installation-token. Extended both matchers. /api/upload/ signed-url stays in (dual auth: Clerk session OR bearer JWT — needs middleware for the user path). - proxy.ts carve-outs were unanchored: a future /api/proxy-token-info, /api/proxy-tokens, or /api/repo/X/Y/run-context-foo would silently bypass Clerk. Added `(?:$|/)` for path-prefix carve-outs (allow exact match or sub-path), `$` for routes with browser-callable siblings (e.g. `learnings/history` is browser-Clerk, `learnings$` is action- bearer-JWT). Verified 30/31 routes via path-to-regexp test harness. - runCli.ts cwd flipped from $GITHUB_WORKSPACE to os.tmpdir() in r1 (#837 fix for npm v11 devEngines.packageManager EBADDEVENGINES). But $TMPDIR is overridable from a prior $GITHUB_ENV step — a customer- authored or compromised prior step can plant /atk/node_modules/ pullfrog/ and `echo "TMPDIR=/atk" >> $GITHUB_ENV`, and our npx --yes pullfrog@<v> bootstrap resolves the local install first, executing attacker code with full action env (provider keys, OIDC, installation token, CODEX_AUTH_JSON). Switched to mkdtempSync(join (tmpdir(), "pullfrog-bootstrap-")) — fresh per-invocation 0700 dir, not pre-writable by anything earlier in the job. - runLifecycle.ts: writeRunErrorOutputs (catch-path) didn't pass createIfMissing: true, contradicting the symmetric intent of the r1 finalizeSuccessRun fix. Silent triggers (IncrementalReview / pull_request_synchronize / auto-label) that throw past the success path still got zero PR signal — exact failure mode #835 was meant to close. Now both paths pass createIfMissing: true. - runErrorRenderer.ts detectProviderId regex `/Anthropic API|credit balance is too low/i` could mis-tag a non-Anthropic billing-exhausted error that mentioned "Anthropic API" in passing (fallback-chain agent prompt text, OpenCode harness logs). Tightened to /credit balance is too low/i — Anthropic-specific phrasing, sufficient for the direct- Anthropic SDK case the fallback exists to handle. - runErrorRenderer.ts JSDoc: r1's classifier reorder put hang at #6 in code but the JSDoc still listed it at #2. Reordered the doc to match dispatch order, with explicit note that hang is a sub-source for the api-key check (which is why hangBody is precomputed early). - analyze-logs.ts: ERR_MODULE_NOT_FOUND.*entryPost regex needs `s` flag so it survives Node v23+ stack-trace reformatting onto multiple lines. One-char fix to defend the #834 classification bucket. Co-authored-by: Cursor <cursoragent@cursor.com> --------- Co-authored-by: Cursor <cursoragent@cursor.com>
97 lines
3.3 KiB
TypeScript
97 lines
3.3 KiB
TypeScript
import { readFileSync } from "node:fs";
|
|
import { dirname, resolve } from "node:path";
|
|
import { describe, expect, it } from "vitest";
|
|
|
|
// The GHA `post:` hook runs `node action/entryPost.ts` directly against the
|
|
// rsynced action checkout, which deliberately excludes `node_modules`. Any
|
|
// non-relative / non-`node:` import in entryPost.ts (or in its transitive
|
|
// imports) crashes the post-step with `ERR_MODULE_NOT_FOUND` AFTER the agent
|
|
// already exited 0, flipping the workflow to `failure`. see #834.
|
|
//
|
|
// This test parses the static-import graph rooted at entryPost.ts and refuses
|
|
// any specifier that isn't one of:
|
|
// - node:* (stdlib)
|
|
// - ./* or ../* (relative)
|
|
//
|
|
// Any other specifier (`@actions/core`, `pullfrog`, `zod`, etc.) means the
|
|
// post-hook will need a `node_modules` tree the rsync drops.
|
|
|
|
const ENTRY_FILE = resolve(import.meta.dirname, "entryPost.ts");
|
|
|
|
const IMPORT_RE = /^\s*(?:import|export)(?:\s+(?:type\s+)?[\s\S]*?)?\s+from\s+["']([^"']+)["']/gm;
|
|
const SIDE_EFFECT_RE = /^\s*import\s+["']([^"']+)["']/gm;
|
|
// `import.meta.glob` and friends are not used in entryPost.ts; the simple
|
|
// regex above is sufficient here. expand if a transitive dep starts using
|
|
// dynamic imports for stdlib-only logic.
|
|
|
|
function extractImports(filePath: string): string[] {
|
|
const source = readFileSync(filePath, "utf8");
|
|
const specs: string[] = [];
|
|
for (const re of [IMPORT_RE, SIDE_EFFECT_RE]) {
|
|
re.lastIndex = 0;
|
|
for (const m of source.matchAll(re)) specs.push(m[1]);
|
|
}
|
|
return specs;
|
|
}
|
|
|
|
function isAllowed(spec: string): boolean {
|
|
return spec.startsWith("node:") || spec.startsWith("./") || spec.startsWith("../");
|
|
}
|
|
|
|
type WalkResult = {
|
|
visited: Set<string>;
|
|
violations: { file: string; spec: string }[];
|
|
};
|
|
|
|
function walk(start: string): WalkResult {
|
|
const visited = new Set<string>();
|
|
const violations: WalkResult["violations"] = [];
|
|
const queue: string[] = [start];
|
|
|
|
while (queue.length > 0) {
|
|
const file = queue.shift()!;
|
|
if (visited.has(file)) continue;
|
|
visited.add(file);
|
|
|
|
for (const spec of extractImports(file)) {
|
|
if (!isAllowed(spec)) {
|
|
violations.push({ file, spec });
|
|
continue;
|
|
}
|
|
if (spec.startsWith("node:")) continue;
|
|
const resolved = resolve(dirname(file), spec);
|
|
const candidate = resolved.endsWith(".ts") ? resolved : `${resolved}.ts`;
|
|
try {
|
|
readFileSync(candidate, "utf8");
|
|
queue.push(candidate);
|
|
} catch {
|
|
// non-.ts (e.g. JSON `with { type: "json" }`) — already classified
|
|
// as relative-allowed above. nothing further to walk.
|
|
}
|
|
}
|
|
}
|
|
return { visited, violations };
|
|
}
|
|
|
|
describe("entryPost.ts stdlib-only invariant (#834)", () => {
|
|
it("only imports node: builtins and relative siblings (no node_modules deps)", () => {
|
|
const result = walk(ENTRY_FILE);
|
|
expect(result.violations, JSON.stringify(result.violations, null, 2)).toEqual([]);
|
|
});
|
|
|
|
it("walks the full transitive graph (entryPost + 3 utils)", () => {
|
|
const result = walk(ENTRY_FILE);
|
|
expect(result.visited.size).toBeGreaterThanOrEqual(4);
|
|
});
|
|
|
|
it("matches the modules entryPost actually imports today", () => {
|
|
const direct = extractImports(ENTRY_FILE).sort();
|
|
expect(direct).toEqual([
|
|
"./utils/codexRefreshDetect.ts",
|
|
"./utils/ghaCore.ts",
|
|
"./utils/postApiFetch.ts",
|
|
"node:fs",
|
|
]);
|
|
});
|
|
});
|