allowlist middleapi/orpc for OSS, ship skill scaffold + no-mock audit
- utils/ossRepos.ts: add middleapi/orpc (orpc.dev, 5.2k stars) to the oss allowlist so any future install mints via mintOssKey ($10 cap, pullfrog absorbs). - scripts/skill.ts + pnpm skill: scaffold .agents/skills/<name>/SKILL.md + .claude/skills/<name> symlink. patch + skill skills written using it. - AGENTS.md: hard-ban vi.* mocking apis; document pnpm skill workflow. - audit follow-through: drop pure-mock test files (action/utils/lifecycle, action/utils/timer, test/handleNoInstall) and trim action/mcp/review to the non-mock cases. - wiki/scripts.md: row for scripts/skill.ts.
This commit is contained in:
Colin McDonnell
committed by
pullfrog[bot]
pullfrog[bot]
parent
a0746dcc27
commit
dc4dff98da
+1
-310
@@ -1,10 +1,7 @@
|
||||
import { describe, expect, it, vi } from "vitest";
|
||||
import { describe, expect, it } from "vitest";
|
||||
import {
|
||||
buildCommentableMap,
|
||||
type CommentableLines,
|
||||
clearStrandedPendingReview,
|
||||
commentableLinesForFile,
|
||||
createReviewWithStrandedRecovery,
|
||||
type DroppedComment,
|
||||
duplicateReviewDecision,
|
||||
formatDroppedCommentsNote,
|
||||
@@ -13,7 +10,6 @@ import {
|
||||
reviewSkipDecision,
|
||||
validateInlineComments,
|
||||
} from "./review.ts";
|
||||
import type { ToolContext } from "./server.ts";
|
||||
|
||||
describe("commentableLinesForFile", () => {
|
||||
it("returns empty sets for missing patches (binary or no changes)", () => {
|
||||
@@ -163,95 +159,6 @@ describe("validateInlineComments", () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe("buildCommentableMap", () => {
|
||||
it("returns the cached snapshot when toolState matches PR and checkoutSha", async () => {
|
||||
// simulates checkout_pr having pre-populated the cache. the cache pins the
|
||||
// commentable lines to checkoutSha so review-time validation matches what
|
||||
// GitHub anchors to, even if the PR is updated mid-run.
|
||||
const cached = buildMap([["src/foo.ts", "@@ -1,1 +1,2 @@\n ctx\n+new"]]);
|
||||
const paginate = vi.fn();
|
||||
const ctx = {
|
||||
octokit: { paginate, rest: { pulls: { listFiles: {} } } },
|
||||
repo: { owner: "o", name: "r" },
|
||||
toolState: {
|
||||
commentableLinesByFile: cached,
|
||||
commentableLinesPullNumber: 42,
|
||||
commentableLinesCheckoutSha: "sha1",
|
||||
checkoutSha: "sha1",
|
||||
},
|
||||
} as unknown as ToolContext;
|
||||
|
||||
const result = await buildCommentableMap(ctx, 42);
|
||||
|
||||
expect(result).toBe(cached);
|
||||
expect(paginate).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("ignores the cached snapshot when it was built for a different PR", async () => {
|
||||
// without this guard, checkout_pr(B) followed by review(A) would validate
|
||||
// A's inline comments against B's diff — silently dropping valid anchors.
|
||||
const cached = buildMap([["src/foo.ts", "@@ -1,1 +1,2 @@\n ctx\n+new"]]);
|
||||
const freshFile = { filename: "src/bar.ts", patch: "@@ -1,1 +1,2 @@\n ctx\n+added" };
|
||||
const paginate = vi.fn().mockResolvedValue([freshFile]);
|
||||
const ctx = {
|
||||
octokit: { paginate, rest: { pulls: { listFiles: {} } } },
|
||||
repo: { owner: "o", name: "r" },
|
||||
toolState: {
|
||||
commentableLinesByFile: cached,
|
||||
commentableLinesPullNumber: 99,
|
||||
commentableLinesCheckoutSha: "sha1",
|
||||
checkoutSha: "sha1",
|
||||
},
|
||||
} as unknown as ToolContext;
|
||||
|
||||
const result = await buildCommentableMap(ctx, 42);
|
||||
|
||||
expect(paginate).toHaveBeenCalledTimes(1);
|
||||
expect(result).not.toBe(cached);
|
||||
expect(result.get("src/bar.ts")?.RIGHT.has(2)).toBe(true);
|
||||
});
|
||||
|
||||
it("ignores the cached snapshot when checkoutSha has moved since it was built", async () => {
|
||||
// simulates a second checkout_pr(42) that bumped checkoutSha but failed
|
||||
// before repopulating the cache (e.g., listFiles rate-limited). without
|
||||
// the sha guard, review would reuse the stale snapshot against the new
|
||||
// anchor and either drop valid comments or let invalid ones through.
|
||||
const cached = buildMap([["src/foo.ts", "@@ -1,1 +1,2 @@\n ctx\n+new"]]);
|
||||
const freshFile = { filename: "src/bar.ts", patch: "@@ -1,1 +1,2 @@\n ctx\n+added" };
|
||||
const paginate = vi.fn().mockResolvedValue([freshFile]);
|
||||
const ctx = {
|
||||
octokit: { paginate, rest: { pulls: { listFiles: {} } } },
|
||||
repo: { owner: "o", name: "r" },
|
||||
toolState: {
|
||||
commentableLinesByFile: cached,
|
||||
commentableLinesPullNumber: 42,
|
||||
commentableLinesCheckoutSha: "sha-old",
|
||||
checkoutSha: "sha-new",
|
||||
},
|
||||
} as unknown as ToolContext;
|
||||
|
||||
const result = await buildCommentableMap(ctx, 42);
|
||||
|
||||
expect(paginate).toHaveBeenCalledTimes(1);
|
||||
expect(result).not.toBe(cached);
|
||||
});
|
||||
|
||||
it("falls back to listFiles when no cache exists", async () => {
|
||||
const file = { filename: "src/bar.ts", patch: "@@ -1,1 +1,2 @@\n ctx\n+added" };
|
||||
const paginate = vi.fn().mockResolvedValue([file]);
|
||||
const ctx = {
|
||||
octokit: { paginate, rest: { pulls: { listFiles: {} } } },
|
||||
repo: { owner: "o", name: "r" },
|
||||
toolState: {},
|
||||
} as unknown as ToolContext;
|
||||
|
||||
const result = await buildCommentableMap(ctx, 42);
|
||||
|
||||
expect(paginate).toHaveBeenCalledTimes(1);
|
||||
expect(result.get("src/bar.ts")?.RIGHT.has(2)).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
describe("formatDroppedCommentsNote", () => {
|
||||
it("renders single-line dropped entries with `path:line`", () => {
|
||||
const dropped: DroppedComment[] = [
|
||||
@@ -321,222 +228,6 @@ describe("formatDroppedCommentsNote", () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe("clearStrandedPendingReview", () => {
|
||||
function pendingReviewError(status: number, message: string): Error {
|
||||
const err = new Error(message) as Error & { status: number };
|
||||
err.status = status;
|
||||
return err;
|
||||
}
|
||||
|
||||
const baseParams = { owner: "o", repo: "r", pull_number: 42 };
|
||||
|
||||
it("rethrows the original error when status is not 422", async () => {
|
||||
const err = pendingReviewError(500, "server exploded");
|
||||
const ctx = {
|
||||
octokit: {
|
||||
paginate: vi.fn(),
|
||||
rest: { pulls: { listReviews: {}, deletePendingReview: vi.fn() } },
|
||||
},
|
||||
} as unknown as ToolContext;
|
||||
await expect(clearStrandedPendingReview(ctx, { ...baseParams, originalErr: err })).rejects.toBe(
|
||||
err
|
||||
);
|
||||
expect(ctx.octokit.paginate).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("rethrows the original error when 422 does not mention pending review", async () => {
|
||||
// a 422 from an unrelated validation (e.g., invalid anchor) must not
|
||||
// trigger a destructive delete of the user's own draft.
|
||||
const err = pendingReviewError(422, "pull_request_review_thread is not part of the diff");
|
||||
const deletePendingReview = vi.fn();
|
||||
const ctx = {
|
||||
octokit: {
|
||||
paginate: vi.fn(),
|
||||
rest: { pulls: { listReviews: {}, deletePendingReview } },
|
||||
},
|
||||
} as unknown as ToolContext;
|
||||
await expect(clearStrandedPendingReview(ctx, { ...baseParams, originalErr: err })).rejects.toBe(
|
||||
err
|
||||
);
|
||||
expect(ctx.octokit.paginate).not.toHaveBeenCalled();
|
||||
expect(deletePendingReview).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("rethrows the original error when no PENDING review is found", async () => {
|
||||
// 422 claimed a pending exists but listReviews returns only SUBMITTED —
|
||||
// likely a transient GitHub inconsistency. retry won't help; surface the
|
||||
// original error so the caller sees why createReview failed.
|
||||
const err = pendingReviewError(422, "User already has a pending review for this pull request");
|
||||
const paginate = vi.fn().mockResolvedValue([{ id: 1, state: "COMMENTED" } as unknown as never]);
|
||||
const deletePendingReview = vi.fn();
|
||||
const ctx = {
|
||||
octokit: { paginate, rest: { pulls: { listReviews: {}, deletePendingReview } } },
|
||||
} as unknown as ToolContext;
|
||||
await expect(clearStrandedPendingReview(ctx, { ...baseParams, originalErr: err })).rejects.toBe(
|
||||
err
|
||||
);
|
||||
expect(paginate).toHaveBeenCalledTimes(1);
|
||||
expect(deletePendingReview).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("deletes the leftover PENDING review and resolves on success", async () => {
|
||||
const err = pendingReviewError(422, "User already has a pending review for this pull request");
|
||||
const paginate = vi.fn().mockResolvedValue([
|
||||
{ id: 100, state: "COMMENTED" },
|
||||
{ id: 101, state: "PENDING" },
|
||||
] as unknown as never);
|
||||
const deletePendingReview = vi.fn().mockResolvedValue({ status: 204 });
|
||||
const ctx = {
|
||||
octokit: { paginate, rest: { pulls: { listReviews: {}, deletePendingReview } } },
|
||||
} as unknown as ToolContext;
|
||||
await expect(
|
||||
clearStrandedPendingReview(ctx, { ...baseParams, originalErr: err })
|
||||
).resolves.toBeUndefined();
|
||||
expect(deletePendingReview).toHaveBeenCalledWith({
|
||||
owner: "o",
|
||||
repo: "r",
|
||||
pull_number: 42,
|
||||
review_id: 101,
|
||||
});
|
||||
});
|
||||
|
||||
it("swallows a 404 from deletePendingReview (raced with another cleanup)", async () => {
|
||||
const err = pendingReviewError(422, "User already has a pending review for this pull request");
|
||||
const paginate = vi.fn().mockResolvedValue([{ id: 101, state: "PENDING" }] as unknown as never);
|
||||
const deletePendingReview = vi.fn().mockRejectedValue(pendingReviewError(404, "not found"));
|
||||
const ctx = {
|
||||
octokit: { paginate, rest: { pulls: { listReviews: {}, deletePendingReview } } },
|
||||
} as unknown as ToolContext;
|
||||
await expect(
|
||||
clearStrandedPendingReview(ctx, { ...baseParams, originalErr: err })
|
||||
).resolves.toBeUndefined();
|
||||
});
|
||||
|
||||
it("swallows a 422 from deletePendingReview (draft submitted by a concurrent caller)", async () => {
|
||||
const err = pendingReviewError(422, "User already has a pending review for this pull request");
|
||||
const paginate = vi.fn().mockResolvedValue([{ id: 101, state: "PENDING" }] as unknown as never);
|
||||
const deletePendingReview = vi
|
||||
.fn()
|
||||
.mockRejectedValue(pendingReviewError(422, "review has already been submitted"));
|
||||
const ctx = {
|
||||
octokit: { paginate, rest: { pulls: { listReviews: {}, deletePendingReview } } },
|
||||
} as unknown as ToolContext;
|
||||
await expect(
|
||||
clearStrandedPendingReview(ctx, { ...baseParams, originalErr: err })
|
||||
).resolves.toBeUndefined();
|
||||
});
|
||||
|
||||
it("rethrows the ORIGINAL 422 when listReviews fails so the real blocker isn't masked", async () => {
|
||||
// if listReviews throws a transient 502 during cleanup, we must surface
|
||||
// the pending-review 422 — not the 502 — so the caller sees the actual
|
||||
// reason createReview failed and can retry the cleanup. masking the 422
|
||||
// with a 502 previously sent agents chasing phantom server errors.
|
||||
const err = pendingReviewError(422, "User already has a pending review for this pull request");
|
||||
const paginate = vi.fn().mockRejectedValue(pendingReviewError(502, "bad gateway"));
|
||||
const deletePendingReview = vi.fn();
|
||||
const ctx = {
|
||||
octokit: { paginate, rest: { pulls: { listReviews: {}, deletePendingReview } } },
|
||||
} as unknown as ToolContext;
|
||||
await expect(clearStrandedPendingReview(ctx, { ...baseParams, originalErr: err })).rejects.toBe(
|
||||
err
|
||||
);
|
||||
expect(deletePendingReview).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("rethrows non-404/422 errors from deletePendingReview so the real cause surfaces", async () => {
|
||||
const err = pendingReviewError(422, "User already has a pending review for this pull request");
|
||||
const paginate = vi.fn().mockResolvedValue([{ id: 101, state: "PENDING" }] as unknown as never);
|
||||
const cleanupErr = pendingReviewError(500, "internal server error");
|
||||
const deletePendingReview = vi.fn().mockRejectedValue(cleanupErr);
|
||||
const ctx = {
|
||||
octokit: { paginate, rest: { pulls: { listReviews: {}, deletePendingReview } } },
|
||||
} as unknown as ToolContext;
|
||||
await expect(clearStrandedPendingReview(ctx, { ...baseParams, originalErr: err })).rejects.toBe(
|
||||
cleanupErr
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe("createReviewWithStrandedRecovery", () => {
|
||||
function pendingReviewError(status: number, message: string): Error {
|
||||
const err = new Error(message) as Error & { status: number };
|
||||
err.status = status;
|
||||
return err;
|
||||
}
|
||||
|
||||
const params = {
|
||||
owner: "o",
|
||||
repo: "r",
|
||||
pull_number: 42,
|
||||
event: "COMMENT" as const,
|
||||
};
|
||||
|
||||
it("returns createReview result directly when no stranded draft exists", async () => {
|
||||
const response = { data: { id: 1, node_id: "n1" } };
|
||||
const createReview = vi.fn().mockResolvedValue(response);
|
||||
const ctx = {
|
||||
octokit: {
|
||||
paginate: vi.fn(),
|
||||
rest: { pulls: { createReview, listReviews: {}, deletePendingReview: vi.fn() } },
|
||||
},
|
||||
} as unknown as ToolContext;
|
||||
await expect(createReviewWithStrandedRecovery(ctx, params)).resolves.toBe(response);
|
||||
expect(createReview).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it("clears a stranded PENDING draft and retries on pending-review 422 — covers the no-body path", async () => {
|
||||
// regression: the no-body review path (approve-with-no-feedback,
|
||||
// comments-only) used to call createReview directly. a prior body-path run
|
||||
// that crashed between createReview(PENDING) and submitReview would leave
|
||||
// a stranded PENDING draft; every subsequent no-body review would 422
|
||||
// with "already has a pending review" until a body-path run happened to
|
||||
// clear it. this test exercises the recovery: first createReview 422s,
|
||||
// clearStranded deletes the leftover, and the retry succeeds.
|
||||
const stranded = pendingReviewError(
|
||||
422,
|
||||
"User already has a pending review for this pull request"
|
||||
);
|
||||
const response = { data: { id: 2, node_id: "n2" } };
|
||||
const createReview = vi.fn().mockRejectedValueOnce(stranded).mockResolvedValueOnce(response);
|
||||
const paginate = vi.fn().mockResolvedValue([{ id: 77, state: "PENDING" }] as unknown as never);
|
||||
const deletePendingReview = vi.fn().mockResolvedValue({ status: 204 });
|
||||
const ctx = {
|
||||
octokit: {
|
||||
paginate,
|
||||
rest: { pulls: { createReview, listReviews: {}, deletePendingReview } },
|
||||
},
|
||||
} as unknown as ToolContext;
|
||||
await expect(createReviewWithStrandedRecovery(ctx, params)).resolves.toBe(response);
|
||||
expect(createReview).toHaveBeenCalledTimes(2);
|
||||
expect(deletePendingReview).toHaveBeenCalledWith({
|
||||
owner: "o",
|
||||
repo: "r",
|
||||
pull_number: 42,
|
||||
review_id: 77,
|
||||
});
|
||||
});
|
||||
|
||||
it("rethrows non-pending 422s without retrying — avoids masking a real validation error", async () => {
|
||||
// if the 422 is unrelated to a stranded draft (e.g. body too long, bad
|
||||
// anchor), clearStrandedPendingReview rethrows and we must not retry
|
||||
// blindly — a retry would just hit the same validation and double the
|
||||
// GitHub API traffic for nothing.
|
||||
const err = pendingReviewError(422, "body is too long");
|
||||
const createReview = vi.fn().mockRejectedValue(err);
|
||||
const paginate = vi.fn();
|
||||
const deletePendingReview = vi.fn();
|
||||
const ctx = {
|
||||
octokit: {
|
||||
paginate,
|
||||
rest: { pulls: { createReview, listReviews: {}, deletePendingReview } },
|
||||
},
|
||||
} as unknown as ToolContext;
|
||||
await expect(createReviewWithStrandedRecovery(ctx, params)).rejects.toBe(err);
|
||||
expect(createReview).toHaveBeenCalledTimes(1);
|
||||
expect(deletePendingReview).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
describe("reviewSkipDecision", () => {
|
||||
// GitHub 422s `event: "COMMENT"` reviews with no body + no comments
|
||||
// ("{\"message\":\"Unprocessable Entity\",\"errors\":[\"\"]}"). verified
|
||||
|
||||
Reference in New Issue
Block a user