Refactor rollout budget checks and turn completion state (#61583)

## What changed

- Centralize generation admission checks before request contributors run for HTTP and non-warmup WebSocket requests.
- Route pending input and inline compaction through dedicated budget checks, and centralize post-compaction budget handling.
- Preserve whether any checkpoint was installed when remote compaction combines a background candidate with foreground compaction.
- Track accepted final answers separately from trailing commentary and encapsulate the response state shared by stop and after-agent hooks.

## Testing

Update the plan-mode contributor test to verify that contributed commentary is tracked separately from final answers, and adapt stream-event assertions to the phase-aware assistant text representation.

GitOrigin-RevId: 43b663e92bfd24ec7e5a0778b711938f16a7fea4
This commit is contained in:
tongzhou wang
2026-11-15 00:03:59 +00:00
committed by copyberry
parent ce82e38b16
commit eaa25e1f43
11 changed files with 246 additions and 110 deletions
+12 -6
View File
@@ -1342,6 +1342,14 @@ impl ModelClient {
Ok(request)
}
fn check_generation_start(&self, metadata: &CodexResponsesMetadata) -> Result<()> {
if let Some(policy) = &self.budget_policy {
let _ = metadata;
policy.check_start()?;
}
Ok(())
}
fn prepare_response_items_for_request(&self, input: &mut [ResponseItem]) {
for item in input {
// A provider can echo a bare reserved prefix or return an opaque ID.
@@ -2109,6 +2117,7 @@ impl ResponsesHttpExecutor<'_> {
{
continue;
}
self.client.check_generation_start(responses_metadata)?;
let interceptors = crate::model_request::prepare(
&self.client.request_contributors,
&thread_id,
@@ -2130,9 +2139,6 @@ impl ResponsesHttpExecutor<'_> {
client_setup.api_auth,
)
.with_telemetry(Some(request_telemetry), Some(sse_telemetry));
if let Some(policy) = &self.client.budget_policy {
policy.check_start()?;
}
let stream_result = client
.stream_request_with_observer(request, options, |wire| {
inference_trace_attempt.record_started(
@@ -2441,6 +2447,9 @@ impl ModelClientSession {
client_setup.auth.as_ref(),
&responses_headers,
);
if !warmup {
self.client.check_generation_start(responses_metadata)?;
}
let interceptors = crate::model_request::prepare(
&self.client.request_contributors,
&thread_id,
@@ -2487,9 +2496,6 @@ impl ModelClientSession {
),
],
);
if !warmup && let Some(policy) = &self.client.budget_policy {
policy.check_start()?;
}
let stream_result = websocket_connection
.stream_request_with_observer(
ws_request,