From b19cf08d86ed67ea74c17bfb312e37a8070e7a1c Mon Sep 17 00:00:00 2001
From: canvrno-oai <kbond@openai.com>
Date: Thu, 16 Apr 2026 10:56:04 -0700
Subject: [PATCH] fixes

---
 codex-rs/app-server/src/message_processor.rs | 1 -
 codex-rs/tui/src/app.rs                      | 9 ++++++++-
 codex-rs/tui/src/chatwidget/plugins.rs       | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/codex-rs/app-server/src/message_processor.rs b/codex-rs/app-server/src/message_processor.rs
index 5a443c6820..cd59784f15 100644
--- a/codex-rs/app-server/src/message_processor.rs
+++ b/codex-rs/app-server/src/message_processor.rs
@@ -746,7 +746,6 @@ impl MessageProcessor {
             self.outgoing.send_error(connection_request_id, error).await;
             return;
         }
-        let connection_id = connection_request_id.connection_id;
         if self.config.features.enabled(Feature::GeneralAnalytics)
             && let ClientRequest::TurnStart { request_id, .. }
             | ClientRequest::TurnSteer { request_id, .. } = &codex_request
diff --git a/codex-rs/tui/src/app.rs b/codex-rs/tui/src/app.rs
index 988ba55d05..dc5f0502c3 100644
--- a/codex-rs/tui/src/app.rs
+++ b/codex-rs/tui/src/app.rs
@@ -5342,7 +5342,12 @@ impl App {
                 let should_apply_result = if let Some(queued_enabled) = queued_enabled
                     && (result.is_err() || queued_enabled != enabled)
                 {
-                    self.spawn_plugin_enabled_write(app_server, cwd, plugin_id, queued_enabled);
+                    self.spawn_plugin_enabled_write(
+                        app_server,
+                        cwd.clone(),
+                        plugin_id.clone(),
+                        queued_enabled,
+                    );
                     false
                 } else {
                     true
@@ -9897,6 +9902,7 @@ guardian_approval = true
             primary_session_configured: None,
             pending_primary_events: VecDeque::new(),
             pending_app_server_requests: PendingAppServerRequests::default(),
+            pending_plugin_enabled_writes: HashMap::new(),
         }
     }
 
@@ -9954,6 +9960,7 @@ guardian_approval = true
                 primary_session_configured: None,
                 pending_primary_events: VecDeque::new(),
                 pending_app_server_requests: PendingAppServerRequests::default(),
+                pending_plugin_enabled_writes: HashMap::new(),
             },
             rx,
             op_rx,
diff --git a/codex-rs/tui/src/chatwidget/plugins.rs b/codex-rs/tui/src/chatwidget/plugins.rs
index 148b5e2639..a34d02abd8 100644
--- a/codex-rs/tui/src/chatwidget/plugins.rs
+++ b/codex-rs/tui/src/chatwidget/plugins.rs
@@ -262,6 +262,7 @@ impl ChatWidget {
         let view = CustomPromptView::new(
             "Add marketplace".to_string(),
             "owner/repo, git URL, or local marketplace path".to_string(),
+            String::new(),
             Some("Examples: owner/repo, git URL, ./marketplace".to_string()),
             Box::new(move |source: String| {
                 let source = source.trim().to_string();