clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 14:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

codex: fix rebase fallout on green base

Browse Source
This commit is contained in:
Yaroslav Volovich
2026-02-26 11:24:44 +00:00
parent 70de95b7dc
commit 42b85a431f
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
codex-rs/app-server/src/bespoke_event_handling.rs
View File

@@ -58,9 +58,6 @@ use codex_app_server_protocol::ReasoningSummaryTextDeltaNotification;
use codex_app_server_protocol::ReasoningTextDeltaNotification;
use codex_app_server_protocol::ServerNotification;
use codex_app_server_protocol::ServerRequestPayload;
use codex_app_server_protocol::SkillApprovalDecision as V2SkillApprovalDecision;
use codex_app_server_protocol::SkillRequestApprovalParams;
use codex_app_server_protocol::SkillRequestApprovalResponse;
use codex_app_server_protocol::SkillsUpdatedNotification;
use codex_app_server_protocol::TerminalInteractionNotification;
use codex_app_server_protocol::ThreadItem;
@@ -2564,7 +2561,11 @@ mod tests {
async fn test_handle_skills_updated_emits_notification_for_v2() -> Result<()> {
let (tx, mut rx) = mpsc::channel(CHANNEL_CAPACITY);
let outgoing = Arc::new(OutgoingMessageSender::new(tx));
let outgoing = ThreadScopedOutgoingMessageSender::new(outgoing, vec![ConnectionId(1)]);
let outgoing = ThreadScopedOutgoingMessageSender::new(
outgoing,
vec![ConnectionId(1)],
ThreadId::new(),
);
handle_skills_updated(ApiVersion::V2, &outgoing).await;

8
codex-rs/app-server/src/codex_message_processor.rs
View File

@@ -5539,6 +5539,7 @@ impl CodexMessageProcessor {
match response {
Ok(downloaded) => {
let connection_id = request_id.connection_id;
self.thread_manager.skills_manager().clear_cache();
self.outgoing
.send_response(
@@ -5549,8 +5550,7 @@ impl CodexMessageProcessor {
},
)
.await;
Self::send_skills_updated_notification(&self.outgoing, request_id.connection_id)
.await;
Self::send_skills_updated_notification(&self.outgoing, connection_id).await;
}
Err(err) => {
self.send_internal_error(
@@ -5576,6 +5576,7 @@ impl CodexMessageProcessor {
match result {
Ok(()) => {
let connection_id = request_id.connection_id;
self.thread_manager.skills_manager().clear_cache();
self.outgoing
.send_response(
@@ -5585,8 +5586,7 @@ impl CodexMessageProcessor {
},
)
.await;
Self::send_skills_updated_notification(&self.outgoing, request_id.connection_id)
.await;
Self::send_skills_updated_notification(&self.outgoing, connection_id).await;
}
Err(err) => {
let error = JSONRPCErrorError {