fix(host): keep metrics route lookup passive (round 3)

This commit is contained in:
Hypatia May
2026-07-28 13:57:26 +08:00
parent e785a594c0
commit 0dc0cc046b
4 files changed
+146 -24

No files matched your search

+15 -1
View File
@@ -405,6 +405,20 @@ export function createApiProxy(ctx: Context, defaults: ApiProxyDefaults): ApiPro
return target
}
/**
* Read the best capacity route without taking ownership of foreign routing.
* Web agents expose their live selection; other agents expose only a route
* that already crossed the durable request-header boundary.
*/
function metricsRouteFor(agent: Agent): Pick<AgentLlmTarget, 'provider' | 'model'> | undefined {
const installed = targets.get(agent)
if (installed !== undefined) return installed.current
const logged = agent.session.requestHeader()?.config
return logged === undefined
? undefined
: { provider: logged.provider, model: logged.model }
}
/** Pre-publication setup used by both fresh and resumed Web agents. */
function installTarget(agentCtx: Context): void {
const agent = agentCtx.agent
@@ -423,7 +437,7 @@ export function createApiProxy(ctx: Context, defaults: ApiProxyDefaults): ApiPro
let metricsDisposed = false
const metricsProjector = new SessionMetricsProjector(
ctx,
agent => targetFor(agent).current,
metricsRouteFor,
(agent) => { scheduleMetrics(agent.session) },
)
+28 -11
View File
@@ -21,12 +21,14 @@ interface UsageState {
}
interface CapacityState {
routeKey: string
routeKey: string | undefined
generation: number
status: 'pending' | 'ready'
contextWindow?: number
}
type CapacityTarget = Pick<AgentLlmTarget, 'provider' | 'model'>
interface TokenMeterLike {
measure(session: Session): { totalTokens: number }
}
@@ -75,6 +77,10 @@ function recordUsage(state: UsageState, turn: number, step: number, usage: Token
state.cacheWriteTokens += usage.cacheWriteTokens ?? 0
}
function routeKeyFor(target: CapacityTarget | undefined): string | undefined {
return target === undefined ? undefined : `${target.provider}\u0000${target.model}`
}
/**
* Projects durable cumulative usage and route-aware current context without
* awaiting model metadata on the session append path.
@@ -85,12 +91,12 @@ export class SessionMetricsProjector {
/**
* @param ctx - Host context providing optional token-meter and LLM services.
* @param targetFor - selected route owner for one attached Web agent.
* @param targetFor - side-effect-free selected or logged route lookup for one attached agent.
* @param onCapacityResolved - schedules a fresh live projection after exact-route metadata resolves.
*/
constructor(
private readonly ctx: Context,
private readonly targetFor: (agent: Agent) => Pick<AgentLlmTarget, 'provider' | 'model'>,
private readonly targetFor: (agent: Agent) => CapacityTarget | undefined,
private readonly onCapacityResolved: (agent: Agent) => void,
) {}
@@ -151,23 +157,23 @@ export class SessionMetricsProjector {
private capacityFor(agent: Agent): number | undefined {
const target = this.targetFor(agent)
const routeKey = `${target.provider}\u0000${target.model}`
const routeKey = routeKeyFor(target)
let state = this.capacities.get(agent)
if (state === undefined || state.routeKey !== routeKey) {
state = {
routeKey,
generation: (state?.generation ?? 0) + 1,
status: 'pending',
status: target === undefined ? 'ready' : 'pending',
}
this.capacities.set(agent, state)
this.resolveCapacity(agent, target, state)
if (target !== undefined) this.resolveCapacity(agent, target, state)
}
return state.status === 'ready' ? state.contextWindow : undefined
}
private resolveCapacity(
agent: Agent,
target: Pick<AgentLlmTarget, 'provider' | 'model'>,
target: CapacityTarget,
pending: CapacityState,
): void {
const llm = this.ctx.get('llm') as LlmLike | undefined
@@ -179,16 +185,27 @@ export class SessionMetricsProjector {
.then(() => llm.resolveModelInfo(target.provider, target.model))
.then(
(resolved) => {
if (this.capacities.get(agent)?.generation !== pending.generation) return
const current = this.targetFor(agent)
if (`${current.provider}\u0000${current.model}` !== pending.routeKey) return
if (this.capacityResolutionIsStale(agent, pending)) return
pending.status = 'ready'
if (resolved.context !== undefined) pending.contextWindow = resolved.context.contextWindow
this.onCapacityResolved(agent)
},
() => {
if (this.capacities.get(agent)?.generation === pending.generation) pending.status = 'ready'
if (!this.capacityResolutionIsStale(agent, pending)) pending.status = 'ready'
},
)
}
private capacityResolutionIsStale(agent: Agent, pending: CapacityState): boolean {
if (this.capacities.get(agent)?.generation !== pending.generation) return true
if (routeKeyFor(this.targetFor(agent)) === pending.routeKey) return false
// Unknown is the neutral generation; the next observed concrete route
// starts a fresh resolution even when it equals the route that disappeared.
this.capacities.set(agent, {
routeKey: undefined,
generation: pending.generation + 1,
status: 'ready',
})
return true
}
}