🐛 fix: fix Codex resumed usage reporting for heterogeneous agents (#15751)

🐛 fix(heterogeneous-agent): normalize codex resumed usage
This commit is contained in:
Arvin Xu
2026-06-13 13:34:41 +08:00
committed by GitHub
parent f6db1361ee
commit fa76928f62
11 changed files with 423 additions and 48 deletions
@@ -23,7 +23,7 @@ import type {
HeteroExecImageRef,
} from '@lobechat/heterogeneous-agents/protocol';
import { buildHeteroExecStdinPayload } from '@lobechat/heterogeneous-agents/protocol';
import type { AgentStreamEvent } from '@lobechat/heterogeneous-agents/spawn';
import type { AgentStreamEvent, UsageData } from '@lobechat/heterogeneous-agents/spawn';
import {
AgentStreamPipeline,
buildAgentInput,
@@ -911,6 +911,7 @@ export default class HeterogeneousAgentCtr extends ControllerModule {
let spawnPlan;
let traceSession;
let cwd: string;
let initialCumulativeUsage: UsageData | undefined;
let spawnEnv: NodeJS.ProcessEnv;
try {
const driver = getHeterogeneousAgentDriver(session.agentType);
@@ -945,6 +946,12 @@ export default class HeterogeneousAgentCtr extends ControllerModule {
session.model = initialModel.model;
session.modelSource = initialModel.source;
}
if (session.agentSessionId) {
initialCumulativeUsage = (
await readCodexSessionModel(session.agentSessionId, { env: spawnEnv })
)?.cumulativeUsage;
}
}
traceSession = await this.createCliTraceSession({
@@ -1001,6 +1008,7 @@ export default class HeterogeneousAgentCtr extends ControllerModule {
reject,
resolve,
session,
initialCumulativeUsage,
spawnEnv,
traceSession,
useStdin,
@@ -1070,6 +1078,7 @@ export default class HeterogeneousAgentCtr extends ControllerModule {
private handleSpawnedAgentProcess({
cwd,
initialCumulativeUsage,
intervention,
params,
proc,
@@ -1088,6 +1097,7 @@ export default class HeterogeneousAgentCtr extends ControllerModule {
reject: (reason?: unknown) => void;
resolve: () => void;
session: AgentSession;
initialCumulativeUsage?: UsageData | undefined;
spawnEnv: NodeJS.ProcessEnv;
spawnPlan: HeterogeneousAgentBuildPlan;
traceSession: CliTraceSession | undefined;
@@ -1128,6 +1138,7 @@ export default class HeterogeneousAgentCtr extends ControllerModule {
const pipeline = new AgentStreamPipeline({
agentType: session.agentType,
cwd,
initialCumulativeUsage,
initialModel: session.model,
operationId: params.operationId,
});