root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(FN-2251): merge fusion/fn-2251

Browse Source
This commit is contained in:
gsxdsm
2026-04-22 09:31:47 -07:00
parent 435fb60c98
commit 16f692ab2a
3 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/engine/src/agent-heartbeat.test.ts
View File

@@ -4367,7 +4367,10 @@ describe("HeartbeatTriggerScheduler", () => {
expect(callback).not.toHaveBeenCalled();
});
it("skips timer tick when agent is over budget", async () => {
it("dispatches timer callback even when agent is over budget (budget enforcement in executeHeartbeat)", async () => {
// Budget checks have been moved from the scheduler to executeHeartbeat().
// The scheduler dispatches the callback so that executeHeartbeat() can create
// explicit run records with budget_exhausted/budget_threshold_exceeded reasons.
(store.getBudgetStatus as ReturnType<typeof vi.fn>).mockResolvedValue(
createBudgetStatus({ isOverBudget: true, isOverThreshold: true, usagePercent: 100 })
);
@@ -4375,10 +4378,19 @@ describe("HeartbeatTriggerScheduler", () => {
scheduler.registerAgent("agent-001", { heartbeatIntervalMs: 5000 });
await vi.advanceTimersByTimeAsync(5000);
expect(callback).not.toHaveBeenCalled();
// Callback IS called so executeHeartbeat() can create a run record
expect(callback).toHaveBeenCalledOnce();
expect(callback).toHaveBeenCalledWith("agent-001", "timer", {
wakeReason: "timer",
triggerDetail: "scheduled",
intervalMs: 5000,
});
});
it("skips timer tick when agent is over threshold", async () => {
it("dispatches timer callback even when agent is over threshold (budget enforcement in executeHeartbeat)", async () => {
// Budget checks have been moved from the scheduler to executeHeartbeat().
// The scheduler dispatches the callback so that executeHeartbeat() can create
// explicit run records with budget_exhausted/budget_threshold_exceeded reasons.
(store.getBudgetStatus as ReturnType<typeof vi.fn>).mockResolvedValue(
createBudgetStatus({
budgetLimit: 1000,
@@ -4392,7 +4404,13 @@ describe("HeartbeatTriggerScheduler", () => {
scheduler.registerAgent("agent-001", { heartbeatIntervalMs: 5000 });
await vi.advanceTimersByTimeAsync(5000);
expect(callback).not.toHaveBeenCalled();
// Callback IS called so executeHeartbeat() can create a run record
expect(callback).toHaveBeenCalledOnce();
expect(callback).toHaveBeenCalledWith("agent-001", "timer", {
wakeReason: "timer",
triggerDetail: "scheduled",
intervalMs: 5000,
});
});
it("fires timer tick normally when below threshold", async () => {

18
packages/engine/src/agent-heartbeat.ts
View File

@@ -2003,20 +2003,10 @@ export class HeartbeatTriggerScheduler {
return;
}
// Budget governance: skip timer triggers for over-budget agents
try {
const budgetStatus = await this.store.getBudgetStatus(agentId);
if (budgetStatus.isOverBudget) {
heartbeatLog.log(`Agent ${agentId} budget exhausted — timer tick skipped`);
return;
}
if (budgetStatus.isOverThreshold) {
heartbeatLog.log(`Agent ${agentId} over budget threshold (${budgetStatus.usagePercent}%) — timer tick skipped`);
return;
}
} catch (budgetErr) {
heartbeatLog.warn(`Timer tick budget check failed for ${agentId}: ${budgetErr instanceof Error ? budgetErr.message : String(budgetErr)} — proceeding without budget check`);
}
// Budget enforcement is handled in HeartbeatMonitor.executeHeartbeat() for timer sources.
// The scheduler dispatches the callback regardless of budget status so that executeHeartbeat()
// can create explicit run records with budget_exhausted/budget_threshold_exceeded reasons.
// This makes timer budget skips observable rather than silent drops.
await this.callback(agentId, "timer", {
wakeReason: "timer",