mirror of
https://github.com/openai/codex.git
synced 2026-11-16 22:00:36 +00:00
protocol rename
This commit is contained in:
@@ -2020,7 +2020,7 @@ impl App {
|
||||
final_output_json_schema,
|
||||
collaboration_mode,
|
||||
personality,
|
||||
user_message_type,
|
||||
submission_type,
|
||||
} => {
|
||||
if let Some(turn_id) = self.active_turn_id_for_thread(thread_id).await {
|
||||
match app_server
|
||||
@@ -2054,7 +2054,7 @@ impl App {
|
||||
*service_tier,
|
||||
collaboration_mode.clone(),
|
||||
*personality,
|
||||
*user_message_type,
|
||||
*submission_type,
|
||||
final_output_json_schema.clone(),
|
||||
)
|
||||
.await?;
|
||||
|
||||
@@ -17,7 +17,7 @@ use codex_protocol::protocol::Op;
|
||||
use codex_protocol::protocol::ReviewDecision;
|
||||
use codex_protocol::protocol::ReviewRequest;
|
||||
use codex_protocol::protocol::SandboxPolicy;
|
||||
use codex_protocol::protocol::UserMessageType;
|
||||
use codex_protocol::protocol::SubmissionType;
|
||||
use codex_protocol::request_permissions::RequestPermissionsResponse;
|
||||
use codex_protocol::request_user_input::RequestUserInputResponse;
|
||||
use codex_protocol::user_input::UserInput;
|
||||
@@ -52,7 +52,7 @@ pub(crate) enum AppCommandView<'a> {
|
||||
final_output_json_schema: &'a Option<Value>,
|
||||
collaboration_mode: &'a Option<CollaborationMode>,
|
||||
personality: &'a Option<Personality>,
|
||||
user_message_type: &'a Option<UserMessageType>,
|
||||
submission_type: &'a Option<SubmissionType>,
|
||||
},
|
||||
OverrideTurnContext {
|
||||
cwd: &'a Option<PathBuf>,
|
||||
@@ -157,7 +157,7 @@ impl AppCommand {
|
||||
final_output_json_schema: Option<Value>,
|
||||
collaboration_mode: Option<CollaborationMode>,
|
||||
personality: Option<Personality>,
|
||||
user_message_type: Option<UserMessageType>,
|
||||
submission_type: Option<SubmissionType>,
|
||||
) -> Self {
|
||||
Self(Op::UserTurn {
|
||||
items,
|
||||
@@ -172,7 +172,7 @@ impl AppCommand {
|
||||
final_output_json_schema,
|
||||
collaboration_mode,
|
||||
personality,
|
||||
user_message_type,
|
||||
submission_type,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -318,7 +318,7 @@ impl AppCommand {
|
||||
final_output_json_schema,
|
||||
collaboration_mode,
|
||||
personality,
|
||||
user_message_type,
|
||||
submission_type,
|
||||
} => AppCommandView::UserTurn {
|
||||
items,
|
||||
cwd,
|
||||
@@ -332,7 +332,7 @@ impl AppCommand {
|
||||
final_output_json_schema,
|
||||
collaboration_mode,
|
||||
personality,
|
||||
user_message_type,
|
||||
submission_type,
|
||||
},
|
||||
Op::OverrideTurnContext {
|
||||
cwd,
|
||||
|
||||
@@ -75,7 +75,7 @@ use codex_protocol::protocol::ReviewRequest;
|
||||
use codex_protocol::protocol::ReviewTarget as CoreReviewTarget;
|
||||
use codex_protocol::protocol::SandboxPolicy;
|
||||
use codex_protocol::protocol::SessionNetworkProxyRuntime;
|
||||
use codex_protocol::protocol::UserMessageType;
|
||||
use codex_protocol::protocol::SubmissionType;
|
||||
use color_eyre::eyre::ContextCompat;
|
||||
use color_eyre::eyre::Result;
|
||||
use color_eyre::eyre::WrapErr;
|
||||
@@ -390,7 +390,7 @@ impl AppServerSession {
|
||||
service_tier: Option<Option<codex_protocol::config_types::ServiceTier>>,
|
||||
collaboration_mode: Option<codex_protocol::config_types::CollaborationMode>,
|
||||
personality: Option<codex_protocol::config_types::Personality>,
|
||||
user_message_type: Option<UserMessageType>,
|
||||
submission_type: Option<SubmissionType>,
|
||||
output_schema: Option<serde_json::Value>,
|
||||
) -> Result<TurnStartResponse> {
|
||||
let request_id = self.next_request_id();
|
||||
@@ -409,7 +409,7 @@ impl AppServerSession {
|
||||
effort,
|
||||
summary,
|
||||
personality,
|
||||
user_message_type,
|
||||
submission_type,
|
||||
output_schema,
|
||||
collaboration_mode,
|
||||
},
|
||||
|
||||
@@ -2706,10 +2706,7 @@ impl ChatWidget {
|
||||
.map(|pending| pending.user_message)
|
||||
.collect();
|
||||
if !pending_steers.is_empty() {
|
||||
self.submit_user_message_with_type(
|
||||
merge_user_messages(pending_steers),
|
||||
Some(UserMessageType::PromptSteering),
|
||||
);
|
||||
self.submit_user_message_with_type(merge_user_messages(pending_steers), None);
|
||||
} else if let Some(combined) = self.drain_pending_messages_for_restore() {
|
||||
self.restore_user_message_to_composer(combined);
|
||||
}
|
||||
@@ -5219,7 +5216,7 @@ impl ChatWidget {
|
||||
fn submit_user_message_with_type(
|
||||
&mut self,
|
||||
user_message: UserMessage,
|
||||
user_message_type: Option<UserMessageType>,
|
||||
submission_type: Option<SubmissionType>,
|
||||
) {
|
||||
if !self.is_session_configured() {
|
||||
tracing::warn!("cannot submit user message before session is configured; queueing");
|
||||
@@ -5436,7 +5433,7 @@ impl ChatWidget {
|
||||
/*final_output_json_schema*/ None,
|
||||
collaboration_mode,
|
||||
personality,
|
||||
user_message_type,
|
||||
submission_type,
|
||||
);
|
||||
|
||||
if !self.submit_op(op) {
|
||||
@@ -6896,13 +6893,13 @@ impl ChatWidget {
|
||||
if self.bottom_pane.is_task_running() {
|
||||
return;
|
||||
}
|
||||
let user_message_type = if self.rejected_steers_queue.is_empty() {
|
||||
UserMessageType::PromptQueued
|
||||
let submission_type = if self.rejected_steers_queue.is_empty() {
|
||||
Some(SubmissionType::PromptQueued)
|
||||
} else {
|
||||
UserMessageType::PromptSteering
|
||||
None
|
||||
};
|
||||
if let Some(user_message) = self.pop_next_queued_user_message() {
|
||||
self.submit_user_message_with_type(user_message, Some(user_message_type));
|
||||
self.submit_user_message_with_type(user_message, submission_type);
|
||||
}
|
||||
// Update the list to reflect the remaining queued messages (if any).
|
||||
self.refresh_pending_input_preview();
|
||||
|
||||
Reference in New Issue
Block a user