mirror of
https://github.com/openai/codex.git
synced 2026-11-10 21:00:47 +00:00
## Why Changing the incremental tools setting on resume should not move tool declarations and base instructions within an existing context window. ## What changed - Determine the current window's tool declaration mode from its history, and apply the incremental tools setting when building a new window after compaction or a context reset. - Use that mode consistently for sampling, remote compaction, startup prewarm, prompt debugging, and Guardian input budgeting. - Preserve tool declarations alongside their comparison baseline in full-history agent forks, including compacted histories; remove them together when rebuilding context. ## Testing Add request snapshots covering legacy resume, migration after remote compaction or a context reset, disabling incremental tools, and tool updates after restart. Extend agent fork and WebSocket startup prewarm tests to cover retained declarations and incremental tools. GitOrigin-RevId: 7c46849a1788027a8435082e4d1f7e7f48d2700c
112 lines
3.9 KiB
Rust
112 lines
3.9 KiB
Rust
use std::sync::Arc;
|
|
|
|
use super::SessionTask;
|
|
use super::SessionTaskResult;
|
|
use super::emit_compact_metric;
|
|
use crate::session::TurnInput;
|
|
use crate::session::session::Session;
|
|
use crate::session::turn_context::TurnContext;
|
|
use crate::state::TaskKind;
|
|
use codex_features::Feature;
|
|
use codex_model_provider::RemoteCompactionSupport;
|
|
use codex_protocol::error::CodexErrorDetails;
|
|
use codex_protocol::protocol::CodexErrorInfo;
|
|
use codex_protocol::user_input::UserInput;
|
|
use tokio_util::sync::CancellationToken;
|
|
|
|
#[derive(Clone, Copy, Default)]
|
|
pub(crate) struct CompactTask;
|
|
|
|
impl SessionTask for CompactTask {
|
|
fn kind(&self) -> TaskKind {
|
|
TaskKind::Compact
|
|
}
|
|
|
|
fn span_name(&self) -> &'static str {
|
|
"session_task.compact"
|
|
}
|
|
|
|
async fn run(
|
|
self: Arc<Self>,
|
|
session: Arc<Session>,
|
|
ctx: Arc<TurnContext>,
|
|
_input: Vec<TurnInput>,
|
|
cancellation_token: CancellationToken,
|
|
) -> SessionTaskResult {
|
|
let _profile_guard = ctx.turn_timing_state.begin_compaction();
|
|
let _compaction_span = tracing::trace_span!(
|
|
"codex.compaction",
|
|
codex.turn.phase = "compaction",
|
|
conversation.id = %session.thread_id,
|
|
turn.id = %ctx.sub_id,
|
|
);
|
|
// Preparation errors must reach the task runner, which reports them to the client.
|
|
session.emit_turn_started(&ctx, TaskKind::Compact).await;
|
|
let step_context = session
|
|
.capture_step_context(Arc::clone(&ctx), &cancellation_token)
|
|
.await?;
|
|
let world_state = Arc::new(
|
|
session
|
|
.build_world_state_for_step(&step_context, /*new_window*/ true)
|
|
.await?,
|
|
);
|
|
if ctx.config.features.enabled(Feature::TokenBudget) {
|
|
crate::compact_token_budget::run_manual_compact_task(
|
|
session,
|
|
step_context,
|
|
world_state,
|
|
)
|
|
.await?;
|
|
return Ok(None);
|
|
}
|
|
|
|
let result = match ctx.provider.capabilities().remote_compaction {
|
|
RemoteCompactionSupport::V2 => {
|
|
emit_compact_metric(
|
|
&session.services.session_telemetry,
|
|
"remote_v2",
|
|
/*manual*/ true,
|
|
);
|
|
crate::compact_remote_v2::run_remote_compact_task(
|
|
session.clone(),
|
|
step_context,
|
|
world_state,
|
|
)
|
|
.await
|
|
}
|
|
RemoteCompactionSupport::Unsupported => {
|
|
emit_compact_metric(
|
|
&session.services.session_telemetry,
|
|
"local",
|
|
/*manual*/ true,
|
|
);
|
|
let input = vec![UserInput::Text {
|
|
text: ctx
|
|
.config
|
|
.compact_prompt
|
|
.as_deref()
|
|
.unwrap_or(crate::compact::SUMMARIZATION_PROMPT)
|
|
.to_string(),
|
|
// Compaction prompt is synthesized; no UI element ranges to preserve.
|
|
text_elements: Vec::new(),
|
|
}];
|
|
crate::compact::run_compact_task(session.clone(), step_context, world_state, input)
|
|
.await
|
|
}
|
|
};
|
|
if let Err(err) = result {
|
|
if matches!(err.details(), CodexErrorDetails::TurnAborted) {
|
|
return Err(err);
|
|
}
|
|
let error = err.to_codex_protocol_error();
|
|
if matches!(error, CodexErrorInfo::UsageLimitExceeded) {
|
|
// Compaction already emitted the error; notify extensions without emitting it twice.
|
|
session
|
|
.emit_turn_error_lifecycle(ctx.as_ref(), error, err.details())
|
|
.await;
|
|
}
|
|
}
|
|
Ok(None)
|
|
}
|
|
}
|