Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Count displayed daily AIC component jobs and invalidate stale scans
Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
  • Loading branch information
Copilot and pelikhan authored Oct 6, 2026
commit a4551e0b03e2e66f77964b878bb6304c26d53b54
4 changes: 2 additions & 2 deletions actions/setup/js/daily_aic_cache_helpers.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function readScanCache(content, repository, workflowId, now = Date.now()) {
}
if (
entry?.version !== 2 ||
entry.coverage_version !== 1 ||
entry.coverage_version !== 2 ||
entry.repository !== repository ||
entry.workflow_id !== workflowId ||
!Number.isSafeInteger(entry.run_id) ||
Expand Down Expand Up @@ -72,7 +72,7 @@ function scanCacheEntry(run, aic, repository, workflowId, now = Date.now(), sour
}
return {
version: 2,
coverage_version: 1,
coverage_version: 2,
repository,
workflow_id: workflowId,
run_id: run.id,
Expand Down
7 changes: 4 additions & 3 deletions actions/setup/js/daily_aic_component_coverage.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,17 @@ async function loadBillableJobs({ github, budget }, owner, repo, run) {
const jobs = response.data.jobs;
if (!Array.isArray(jobs)) throw new Error("Incomplete daily AIC job metadata");
for (const job of jobs) {
if (!Object.hasOwn(COMPONENT_FILES, job.name)) continue;
const name = typeof job.name === "string" ? job.name.toLowerCase() : "";
if (!Object.hasOwn(COMPONENT_FILES, name)) continue;

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already addressed in 8d273c1: the generated Evaluations name maps to evals, with regression coverage for the generated name. The job-ID preference was added in the same commit, and the changes are preserved after merging main in cbe472d.

if (!Number.isSafeInteger(job.run_attempt) || job.run_attempt < 1 || job.run_attempt > run.run_attempt || job.status !== "completed" || !job.conclusion) {
throw new Error("Incomplete daily AIC component attempt metadata");
}
const prior = components.get(job.name);
const prior = components.get(name);
if (prior && job.run_attempt === prior.run_attempt && job.id !== prior.id) {
throw new Error("Ambiguous daily AIC component jobs");
}
if (!prior || (prior.conclusion === "skipped" && job.conclusion !== "skipped") || (job.conclusion !== "skipped" && job.run_attempt > prior.run_attempt) || (prior.conclusion === "skipped" && job.run_attempt > prior.run_attempt)) {
components.set(job.name, job);
components.set(name, job);
}
}
if (jobs.length < 100) {
Expand Down
12 changes: 12 additions & 0 deletions actions/setup/js/daily_aic_component_coverage.test.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,18 @@ it("accepts a completed run with no jobs as zero usage", async () => {
expect(global.core.info).toHaveBeenCalledWith(expect.stringContaining('"aic":0,"reason":"no_billable_jobs"'));
});

it("counts usage for compiler-generated job display names", async () => {
const f = evaluate({ "agent_usage.jsonl": '{"aic":18.02604}', "detection_usage.jsonl": '{"aic":30.08748}' }, [job("Agent"), job("Detection")]);
await expect(f.result).resolves.toBeCloseTo(48.11352);
expect(global.core.info).toHaveBeenCalledWith(expect.stringContaining('"component":"agent"'));
expect(global.core.info).toHaveBeenCalledWith(expect.stringContaining('"component":"detection"'));
});

it("requires accounting for executed jobs with generated display names", async () => {
const f = evaluate({}, [job("Agent")]);
await expect(f.result).rejects.toThrow("Missing accounting for executed agent component");
});

it("accepts a completed run with all billable jobs skipped as zero usage", async () => {
const f = evaluate({}, [job("agent", { conclusion: "skipped" }), job("detection", { conclusion: "skipped" })]);
await expect(f.result).resolves.toBe(0);
Expand Down
13 changes: 13 additions & 0 deletions actions/setup/js/daily_aic_scan.test.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,19 @@ describe("complete daily AIC scan observations", () => {
expect(f.getRunAIC).toHaveBeenCalledOnce();
});

it("reinspects recorded zero usage cached with the old component coverage", async () => {
const entry = scanCacheEntry(run(1), 0, repository, 7, now);
entry.coverage_version = 1;
writeEntries([entry]);
const f = fixture([run(1)]);
f.getRunAIC.mockResolvedValue(48.11352);
const result = await scanDailyAIC(f);
expect(result.cacheHits).toBe(0);
expect(result.countedRuns[0]).toMatchObject({ aic: 48.11352, source: "recorded" });
expect(f.getRunAIC).toHaveBeenCalledOnce();
expect(readScanCache(fs.readFileSync(cachePath, "utf8"), repository, 7, now).get(1)?.aic).toBe(48.11352);
});

it("accepts corrected estimates without replacing recorded accounting for the same attempt", () => {
const recorded = scanCacheEntry(run(1), 4, repository, 7, now - 2000, "recorded");
const estimated = scanCacheEntry(run(1), 1000, repository, 7, now - 1000, "estimated");
Expand Down
Loading