Skip to content

fix: make agent cost accounting updates transactional #405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sahu-virendra-1908 wants to merge 2 commits into
base: main
Choose a base branch
from
+91 −74
Open

fix: make agent cost accounting updates transactional #405

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9ff1a8
fix: make agent cost accounting updates transactional
sahu-virendra-1908 May 28, 2026
e2398a7
fix: make agent cost accounting updates transactional
sahu-virendra-1908 May 28, 2026
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
165 changes: 91 additions & 74 deletions server/src/core/heartbeat.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,11 +384,11 @@ function resolveNextSessionState(input: {

const displayId = truncateDisplayId(
explicitDisplayId ??
(codec.getDisplayId ? codec.getDisplayId(deserialized) : null) ??
readNonEmptyString(deserialized?.sessionId) ??
(shouldUsePrevious ? previousDisplayId : null) ??
explicitSessionId ??
(shouldUsePrevious ? previousLegacySessionId : null),
(codec.getDisplayId ? codec.getDisplayId(deserialized) : null) ??
readNonEmptyString(deserialized?.sessionId) ??
(shouldUsePrevious ? previousDisplayId : null) ??
explicitSessionId ??
(shouldUsePrevious ? previousLegacySessionId : null),
);

const legacySessionId =
Expand Down Expand Up @@ -470,8 +470,8 @@ export function heartbeatService(db: Db) {
);
return truncateDisplayId(
existingTaskSession?.sessionDisplayId ??
(codec.getDisplayId ? codec.getDisplayId(parsedParams) : null) ??
readNonEmptyString(parsedParams?.sessionId),
(codec.getDisplayId ? codec.getDisplayId(parsedParams) : null) ??
readNonEmptyString(parsedParams?.sessionId),
);
}

Expand All @@ -489,26 +489,26 @@ export function heartbeatService(db: Db) {
const contextProjectId = readNonEmptyString(context.projectId);
const issueProjectId = issueId
? await db
.select({ projectId: issues.projectId })
.from(issues)
.where(and(eq(issues.id, issueId), eq(issues.projectId, agent.projectId)))
.then((rows) => rows[0]?.projectId ?? null)
.select({ projectId: issues.projectId })
.from(issues)
.where(and(eq(issues.id, issueId), eq(issues.projectId, agent.projectId)))
.then((rows) => rows[0]?.projectId ?? null)
: null;
const resolvedProjectId = issueProjectId ?? contextProjectId;
const useProjectWorkspace = opts?.useProjectWorkspace !== false;
const workspaceProjectId = useProjectWorkspace ? resolvedProjectId : null;

const projectWorkspaceRows = workspaceProjectId
? await db
.select()
.from(projectWorkspaces)
.where(
and(
eq(projectWorkspaces.projectId, agent.projectId),
eq(projectWorkspaces.projectId, workspaceProjectId),
),
)
.orderBy(asc(projectWorkspaces.createdAt), asc(projectWorkspaces.id))
.select()
.from(projectWorkspaces)
.where(
and(
eq(projectWorkspaces.projectId, agent.projectId),
eq(projectWorkspaces.projectId, workspaceProjectId),
),
)
.orderBy(asc(projectWorkspaces.createdAt), asc(projectWorkspaces.id))
: [];

const workspaceHints = projectWorkspaceRows.map((workspace) => ({
Expand Down Expand Up @@ -962,46 +962,63 @@ export function heartbeatService(db: Db) {
const additionalCostCents = Math.max(0, Math.round((result.costUsd ?? 0) * 100));
const hasTokenUsage = inputTokens > 0 || outputTokens > 0 || cachedInputTokens > 0;

await db
.update(agentRuntimeState)
.set({
adapterType: agent.adapterType,
sessionId: session.legacySessionId,
lastRunId: run.id,
lastRunStatus: run.status,
lastError: result.errorMessage ?? null,
totalInputTokens: sql`${agentRuntimeState.totalInputTokens} + ${inputTokens}`,
totalOutputTokens: sql`${agentRuntimeState.totalOutputTokens} + ${outputTokens}`,
totalCachedInputTokens: sql`${agentRuntimeState.totalCachedInputTokens} + ${cachedInputTokens}`,
totalCostCents: sql`${agentRuntimeState.totalCostCents} + ${additionalCostCents}`,
updatedAt: new Date(),
})
.where(eq(agentRuntimeState.agentId, agent.id));

if (additionalCostCents > 0 || hasTokenUsage) {
await db.insert(costEvents).values({
projectId: agent.projectId,
agentId: agent.id,
provider: result.provider ?? "unknown",
model: result.model ?? "unknown",
inputTokens,
outputTokens,
costCents: additionalCostCents,
occurredAt: new Date(),
});
}
const now = new Date();

if (additionalCostCents > 0) {
await db
.update(agents)
await db.transaction(async (tx) => {
await tx
.update(agentRuntimeState)
.set({
spentMonthlyCents: sql`${agents.spentMonthlyCents} + ${additionalCostCents}`,
updatedAt: new Date(),
adapterType: agent.adapterType,
sessionId: session.legacySessionId,
lastRunId: run.id,
lastRunStatus: run.status,
lastError: result.errorMessage ?? null,

totalInputTokens: sql`${agentRuntimeState.totalInputTokens} + ${inputTokens}`,

totalOutputTokens: sql`${agentRuntimeState.totalOutputTokens} + ${outputTokens}`,

totalCachedInputTokens: sql`${agentRuntimeState.totalCachedInputTokens} + ${cachedInputTokens}`,

totalCostCents: sql`${agentRuntimeState.totalCostCents} + ${additionalCostCents}`,

updatedAt: now,
})
.where(eq(agents.id, agent.id));
}
.where(eq(agentRuntimeState.agentId, agent.id));

if (additionalCostCents > 0 || hasTokenUsage) {
await tx.insert(costEvents).values({
projectId: agent.projectId,
agentId: agent.id,

provider: result.provider ?? "unknown",
model: result.model ?? "unknown",

inputTokens,
outputTokens,

costCents: additionalCostCents,

occurredAt: now,
});
}

if (additionalCostCents > 0) {
await tx
.update(agents)
.set({
spentMonthlyCents: sql`${agents.spentMonthlyCents} + ${additionalCostCents}`,

updatedAt: now,
})
.where(eq(agents.id, agent.id));
}
});

}


async function startNextQueuedRunForAgent(agentId: string) {
return withAgentStartLock(agentId, async () => {
const agent = await getAgent(agentId);
Expand Down Expand Up @@ -1164,19 +1181,19 @@ export function heartbeatService(db: Db) {

const issueAssigneeConfig = issueId
? await db
.select({
assigneeAgentId: issues.assigneeAgentId,
assigneeAdapterOverrides: issues.assigneeAdapterOverrides,
})
.from(issues)
.where(and(eq(issues.id, issueId), eq(issues.projectId, agent.projectId)))
.then((rows) => rows[0] ?? null)
.select({
assigneeAgentId: issues.assigneeAgentId,
assigneeAdapterOverrides: issues.assigneeAdapterOverrides,
})
.from(issues)
.where(and(eq(issues.id, issueId), eq(issues.projectId, agent.projectId)))
.then((rows) => rows[0] ?? null)
: null;
const issueAssigneeOverrides =
issueAssigneeConfig && issueAssigneeConfig.assigneeAgentId === agent.id
? parseIssueAssigneeAdapterOverrides(
issueAssigneeConfig.assigneeAdapterOverrides,
)
issueAssigneeConfig.assigneeAdapterOverrides,
)
: null;
const taskSession = taskKey
? await getTaskSession(agent.projectId, agent.id, agent.adapterType, taskKey)
Expand Down Expand Up @@ -1204,10 +1221,10 @@ export function heartbeatService(db: Db) {
...(runtimeSessionResolution.warning ? [runtimeSessionResolution.warning] : []),
...(resetTaskSession && sessionResetReason
? [
taskKey
? `Skipping saved session resume for task "${taskKey}" because ${sessionResetReason}.`
: `Skipping saved session resume because ${sessionResetReason}.`,
]
taskKey
? `Skipping saved session resume for task "${taskKey}" because ${sessionResetReason}.`
: `Skipping saved session resume because ${sessionResetReason}.`,
]
: []),
];
const workspaceContextValue = {
Expand All @@ -1228,9 +1245,9 @@ export function heartbeatService(db: Db) {
const runtimeSessionFallback = taskKey || resetTaskSession ? null : runtime.sessionId;
const previousSessionDisplayId = truncateDisplayId(
taskSessionForRun?.sessionDisplayId ??
(sessionCodec.getDisplayId ? sessionCodec.getDisplayId(runtimeSessionParams) : null) ??
readNonEmptyString(runtimeSessionParams?.sessionId) ??
runtimeSessionFallback,
(sessionCodec.getDisplayId ? sessionCodec.getDisplayId(runtimeSessionParams) : null) ??
readNonEmptyString(runtimeSessionParams?.sessionId) ??
runtimeSessionFallback,
);
const runtimeForAdapter = {
sessionId: readNonEmptyString(runtimeSessionParams?.sessionId) ?? runtimeSessionFallback,
Expand Down Expand Up @@ -1418,10 +1435,10 @@ export function heartbeatService(db: Db) {
const usageJson =
adapterResult.usage || adapterResult.costUsd != null
? ({
...(adapterResult.usage ?? {}),
...(adapterResult.costUsd != null ? { costUsd: adapterResult.costUsd } : {}),
...(adapterResult.billingType ? { billingType: adapterResult.billingType } : {}),
} as Record<string, unknown>)
...(adapterResult.usage ?? {}),
...(adapterResult.costUsd != null ? { costUsd: adapterResult.costUsd } : {}),
...(adapterResult.billingType ? { billingType: adapterResult.billingType } : {}),
} as Record<string, unknown>)
: null;

await setRunStatus(run.id, status, {
Expand Down