mirror of
https://github.com/openai/codex.git
synced 2026-11-20 22:40:37 +00:00
Accept user input when starting idle turns (#36947)
## What changed - Generalize `CodexThread::try_start_turn_if_idle` to accept exported `TurnInput` values, preserving user content and client IDs in the first model request. - Allow non-empty user input to start an idle turn in Plan mode while retaining the Plan-mode rejection for automatic response items and empty user input. - Process idle user input through the normal user-turn path so connector selections are cleared, prompt telemetry is recorded, and referenced skill instructions are included. ## Testing - Cover idle user input in Default and Plan modes, response-item mailbox merging, empty-input rejection, and skill instruction injection. GitOrigin-RevId: 116667d160d4464b525d9e4c7e8cc05d23a94008
This commit is contained in:
@@ -4,6 +4,7 @@ use crate::elicitation::ElicitationRegistration;
|
||||
use crate::session::SessionIo;
|
||||
use crate::session::SessionSettingsUpdate;
|
||||
use crate::session::SteerInputError;
|
||||
use crate::session::TurnInput;
|
||||
use crate::session::session::Session;
|
||||
use crate::user_message_admission::UserMessageAdmission;
|
||||
use codex_exec_server::SelectedCapabilityRootsStatus;
|
||||
@@ -93,8 +94,8 @@ pub enum TryStartTurnIfIdleRejectionReason {
|
||||
/// User/client-triggered mailbox work is already queued and must take
|
||||
/// priority over extension-initiated idle work.
|
||||
PendingTriggerTurn,
|
||||
/// The thread is in Plan mode, where automatic idle work must not start a
|
||||
/// new model turn.
|
||||
/// The thread is in Plan mode, where idle work without user input must not
|
||||
/// start a new model turn.
|
||||
PlanMode,
|
||||
/// Another turn or task is active, or the idle reservation was lost before
|
||||
/// the automatic turn could start.
|
||||
@@ -106,11 +107,11 @@ pub enum TryStartTurnIfIdleRejectionReason {
|
||||
#[derive(Debug)]
|
||||
pub struct TryStartTurnIfIdleError {
|
||||
reason: TryStartTurnIfIdleRejectionReason,
|
||||
input: Vec<ResponseItem>,
|
||||
input: Vec<TurnInput>,
|
||||
}
|
||||
|
||||
impl TryStartTurnIfIdleError {
|
||||
pub(crate) fn new(reason: TryStartTurnIfIdleRejectionReason, input: Vec<ResponseItem>) -> Self {
|
||||
pub(crate) fn new(reason: TryStartTurnIfIdleRejectionReason, input: Vec<TurnInput>) -> Self {
|
||||
Self { reason, input }
|
||||
}
|
||||
|
||||
@@ -119,9 +120,9 @@ impl TryStartTurnIfIdleError {
|
||||
self.reason
|
||||
}
|
||||
|
||||
/// Consumes the rejection and returns the original model-visible input
|
||||
/// Consumes the rejection and returns the original turn input
|
||||
/// unchanged, so callers can retry, drop, or log it explicitly.
|
||||
pub fn into_input(self) -> Vec<ResponseItem> {
|
||||
pub fn into_input(self) -> Vec<TurnInput> {
|
||||
self.input
|
||||
}
|
||||
}
|
||||
@@ -371,22 +372,22 @@ impl CodexThread {
|
||||
self.session.inject_if_running(items).await
|
||||
}
|
||||
|
||||
/// Starts an automatic regular turn with model-visible items only when idle
|
||||
/// work is allowed for this thread.
|
||||
/// Starts an automatic regular turn with response items or user input only
|
||||
/// when idle work is allowed for this thread.
|
||||
///
|
||||
/// This is the required entry point for extensions that want to launch
|
||||
/// model-visible work from `ThreadLifecycleContributor::on_thread_idle`.
|
||||
/// The call succeeds only if no user/client-triggered turn is queued, no
|
||||
/// task is currently active, and the thread is not in Plan mode. Active
|
||||
/// Review tasks are rejected by the active-task check because Review turns
|
||||
/// are not steerable.
|
||||
/// The call succeeds only if no user/client-triggered turn is queued and no
|
||||
/// task is currently active. Work without user input is also rejected in
|
||||
/// Plan mode. Active Review tasks are rejected by the active-task check
|
||||
/// because Review turns are not steerable.
|
||||
///
|
||||
/// On rejection, the returned error includes a stable reason and carries
|
||||
/// the original `items` unchanged so the caller can decide whether to drop
|
||||
/// them, retry later, or log why no automatic turn was started.
|
||||
pub async fn try_start_turn_if_idle(
|
||||
&self,
|
||||
items: Vec<ResponseItem>,
|
||||
items: Vec<TurnInput>,
|
||||
) -> Result<(), TryStartTurnIfIdleError> {
|
||||
self.session.try_start_turn_if_idle(items).await
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user