codex 0.136.0

Author: psumbera

README.md

@@ -61,7 +61,7 @@ build/install/codex/bin/codex --version
 - The wrapper uses the official Solaris Rust standalone installer target
   `x86_64-pc-solaris`.
 - The pinned Codex source is the upstream `openai/codex` release tag
-  `rust-v0.135.0`, built from its `codex-rs/` workspace.
+  `rust-v0.136.0`, built from its `codex-rs/` workspace.
 - Set `SOLARIS_CODEX_PROXY_SETUP=/path/to/proxy.sh` if your host needs an
   environment hook before downloads.
 - The codex build clears inherited Solaris `LD_*` hardening variables because

patches/codex/0003-tui-work-around-solaris-terminal-input-and-layout.patch

@@ -13,10 +13,10 @@ Why it is needed:
   poorly in terminals commonly used on Solaris systems
 
 diff --git a/codex-rs/tui/src/app/resize_reflow.rs b/codex-rs/tui/src/app/resize_reflow.rs
-index 6ef1721..8f6eeff 100644
+index 34e2569..10a3920 100644
 --- a/codex-rs/tui/src/app/resize_reflow.rs
 +++ b/codex-rs/tui/src/app/resize_reflow.rs
-@@ -106,7 +106,8 @@ impl App {
+@@ -110,7 +110,8 @@ impl App {
      }
 
      pub(super) fn terminal_resize_reflow_enabled(&self) -> bool {
@@ -27,7 +27,7 @@ index 6ef1721..8f6eeff 100644
 
      /// Start retaining initial resume replay rows before they are written to scrollback.
 diff --git a/codex-rs/tui/src/bottom_pane/chat_composer.rs b/codex-rs/tui/src/bottom_pane/chat_composer.rs
-index e62cab9..62fc961 100644
+index ec32848..37b7020 100644
 --- a/codex-rs/tui/src/bottom_pane/chat_composer.rs
 +++ b/codex-rs/tui/src/bottom_pane/chat_composer.rs
 @@ -206,6 +206,7 @@ use crate::render::RectExt;
@@ -38,7 +38,7 @@ index e62cab9..62fc961 100644
  use codex_protocol::ThreadId;
  use codex_protocol::user_input::ByteRange;
  use codex_protocol::user_input::MAX_USER_INPUT_TEXT_CHARS;
-@@ -4264,9 +4265,13 @@ impl ChatComposer {
+@@ -4390,9 +4391,13 @@ impl ChatComposer {
              let prompt = if self.draft.input_enabled {
                  if self.draft.is_bash_mode {
                      Span::from("!").light_red().bold()
@@ -115,7 +115,7 @@ index ffb2a28..9bb58ac 100644
          let style = if use_theme_colors {
              let accent = StatusLineAccent::for_item(item);
 diff --git a/codex-rs/tui/src/custom_terminal.rs b/codex-rs/tui/src/custom_terminal.rs
-index 995a035..0336b9d 100644
+index 995a035..eebc492 100644
 --- a/codex-rs/tui/src/custom_terminal.rs
 +++ b/codex-rs/tui/src/custom_terminal.rs
 @@ -195,6 +195,12 @@ where
@@ -156,7 +156,7 @@ index b1a3a52..fbd2174 100644
      command_display: Option<String>,
      stdin: String,
 diff --git a/codex-rs/tui/src/history_cell/messages.rs b/codex-rs/tui/src/history_cell/messages.rs
-index 19a6ec2..09b91e9 100644
+index ed899f3..3b7f496 100644
 --- a/codex-rs/tui/src/history_cell/messages.rs
 +++ b/codex-rs/tui/src/history_cell/messages.rs
 @@ -167,7 +167,7 @@ impl HistoryCell for UserHistoryCell {
@@ -180,13 +180,13 @@ index 19a6ec2..09b91e9 100644
  pub(crate) struct ReasoningSummaryCell {
      _header: String,
 diff --git a/codex-rs/tui/src/history_cell/mod.rs b/codex-rs/tui/src/history_cell/mod.rs
-index 12788a5..e833c1d 100644
+index 9cef3e4..7336453 100644
 --- a/codex-rs/tui/src/history_cell/mod.rs
 +++ b/codex-rs/tui/src/history_cell/mod.rs
-@@ -33,6 +33,7 @@ use crate::render::renderable::Renderable;
- use crate::session_state::ThreadSessionState;
- use crate::style::proposed_plan_style;
- use crate::style::user_message_style;
+@@ -37,6 +37,7 @@ use crate::terminal_hyperlinks::mark_buffer_hyperlinks;
+ use crate::terminal_hyperlinks::plain_hyperlink_lines;
+ use crate::terminal_hyperlinks::prefix_hyperlink_lines;
+ use crate::terminal_hyperlinks::visible_lines;
 +use crate::terminal_palette::use_ascii_ui;
  #[cfg(test)]
  use crate::test_support::PathBufExt;
@@ -248,10 +248,10 @@ index 23e8836..b65e0d5 100644
      out
  }
 diff --git a/codex-rs/tui/src/lib.rs b/codex-rs/tui/src/lib.rs
-index 34065b7..e66a71f 100644
+index 508977f..fe5cdfa 100644
 --- a/codex-rs/tui/src/lib.rs
 +++ b/codex-rs/tui/src/lib.rs
-@@ -1317,7 +1317,16 @@ async fn run_ratatui_app(
+@@ -1324,7 +1324,16 @@ async fn run_ratatui_app(
          prev_hook(info);
      }));
      let mut initialized_terminal = tui::init()?;
@@ -370,7 +370,7 @@ index 53c68d9..331b83d 100644
  mod imp {
      use super::DefaultColors;
 diff --git a/codex-rs/tui/src/tui.rs b/codex-rs/tui/src/tui.rs
-index ef2f1b0..6d6e40c 100644
+index b9055f5..0075a4c 100644
 --- a/codex-rs/tui/src/tui.rs
 +++ b/codex-rs/tui/src/tui.rs
 @@ -16,9 +16,13 @@ use std::time::Duration;
@@ -397,7 +397,7 @@ index ef2f1b0..6d6e40c 100644
  use tokio::sync::broadcast;
  use tokio_stream::Stream;
 
-@@ -171,18 +177,23 @@ mod tests {
+@@ -173,18 +179,23 @@ mod tests {
  pub fn set_modes() -> Result<()> {
      ensure_virtual_terminal_processing()?;
 
@@ -432,7 +432,7 @@ index ef2f1b0..6d6e40c 100644
      Ok(())
  }
 
-@@ -246,14 +257,20 @@ fn restore_common(
+@@ -248,14 +259,20 @@ fn restore_common(
  ) -> Result<()> {
      let mut first_error = ensure_virtual_terminal_processing().err();
 
@@ -453,7 +453,7 @@ index ef2f1b0..6d6e40c 100644
      let _ = execute!(stdout(), DisableFocusChange);
      if matches!(raw_mode_restore, RawModeRestore::Disable)
          && let Err(err) = disable_raw_mode()
-@@ -373,7 +390,7 @@ pub(crate) fn init() -> Result<InitializedTerminal> {
+@@ -375,7 +392,7 @@ pub(crate) fn init() -> Result<InitializedTerminal> {
      #[cfg(unix)]
      let backend = CrosstermBackend::new(stdout());
 
@@ -462,7 +462,7 @@ index ef2f1b0..6d6e40c 100644
      let startup_probe = {
          use crate::terminal_probe::StartupKeyboardEnhancementProbe;
 
-@@ -409,6 +426,13 @@ pub(crate) fn init() -> Result<InitializedTerminal> {
+@@ -411,6 +428,13 @@ pub(crate) fn init() -> Result<InitializedTerminal> {
          }
      };
 
@@ -476,7 +476,7 @@ index ef2f1b0..6d6e40c 100644
      #[cfg(unix)]
      crate::terminal_palette::set_default_colors_from_startup_probe(startup_probe.default_colors);
 
-@@ -514,6 +538,14 @@ struct PendingHistoryLines {
+@@ -516,6 +540,14 @@ struct PendingHistoryLines {
      wrap_policy: HistoryLineWrapPolicy,
  }
 
@@ -491,7 +491,7 @@ index ef2f1b0..6d6e40c 100644
  fn clear_for_viewport_change<B>(terminal: &mut CustomTerminal<B>, new_area: Rect) -> Result<()>
  where
      B: Backend + Write,
-@@ -557,14 +589,14 @@ impl Tui {
+@@ -559,14 +591,14 @@ impl Tui {
              notification_backend: Some(detect_backend(NotificationMethod::default())),
              notification_condition: NotificationCondition::default(),
              is_zellij,
@@ -508,7 +508,7 @@ index ef2f1b0..6d6e40c 100644
      }
 
      pub fn set_notification_settings(
-@@ -839,46 +871,49 @@ impl Tui {
+@@ -852,18 +884,21 @@ impl Tui {
 
          // Precompute any viewport updates that need a cursor-position query before entering
          // the synchronized update, to avoid racing with the event reader.
@@ -532,35 +532,7 @@ index ef2f1b0..6d6e40c 100644
                  terminal.set_viewport_area(new_area);
                  terminal.clear()?;
              }
-
-             let size = terminal.size()?;
-
-             let mut area = terminal.viewport_area;
-             area.height = height.min(size.height);
-             area.width = size.width;
-             // If the viewport has expanded, scroll everything else up to make room.
-             if area.bottom() > size.height {
-                 terminal
-                     .backend_mut()
-                     .scroll_region_up(0..area.top(), area.bottom() - size.height)?;
-                 area.y = size.height - area.height;
-             }
-             if area != terminal.viewport_area {
-                 // On startup, the old viewport can still be empty. Clear from the
-                 // new viewport top so stale shell cells do not show through spaces.
-                 clear_for_viewport_change(terminal, area)?;
-                 terminal.set_viewport_area(area);
-             }
- 
-             Self::flush_pending_history_lines(
-                 terminal,
-                 &mut self.pending_history_lines,
-                 self.is_zellij,
-             )?;
-
-             // Update the y position for suspending so Ctrl-Z can place the cursor correctly.
-             #[cfg(unix)]
-@@ -897,7 +932,13 @@ impl Tui {
+@@ -910,7 +945,13 @@ impl Tui {
              terminal.draw(|frame| {
                  draw_fn(frame);
              })
@@ -575,7 +547,7 @@ index ef2f1b0..6d6e40c 100644
      }
 
      pub fn draw_ambient_pet_image(
-@@ -1009,12 +1050,18 @@ impl Tui {
+@@ -1022,12 +1063,18 @@ impl Tui {
              }
 
              terminal.draw(|frame| {

patches/codex/0005-state-use-rollback-journal-on-solaris.patch

@@ -13,10 +13,10 @@ Why it is needed:
   `SQLITE_IOERR_SHMMAP` / SQLite extended error code 5386
 
 diff --git a/codex-rs/state/src/runtime.rs b/codex-rs/state/src/runtime.rs
-index ba41021..f42958a 100644
+index b08545d..015d224 100644
 --- a/codex-rs/state/src/runtime.rs
 +++ b/codex-rs/state/src/runtime.rs
-@@ -38,6 +38,8 @@ use codex_protocol::protocol::RolloutItem;
+@@ -37,6 +37,8 @@ use codex_protocol::protocol::RolloutItem;
  use log::LevelFilter;
  use serde_json::Value;
  use sqlx::ConnectOptions;
@@ -25,7 +25,7 @@ index ba41021..f42958a 100644
  use sqlx::QueryBuilder;
  use sqlx::Row;
  use sqlx::Sqlite;
-@@ -47,9 +49,13 @@ use sqlx::migrate::Migrator;
+@@ -46,9 +48,13 @@ use sqlx::migrate::Migrator;
  use sqlx::sqlite::SqliteAutoVacuum;
  use sqlx::sqlite::SqliteConnectOptions;
  use sqlx::sqlite::SqliteJournalMode;
@@ -39,7 +39,7 @@ index ba41021..f42958a 100644
  use std::path::Path;
  use std::path::PathBuf;
  use std::sync::Arc;
-@@ -303,11 +309,90 @@ impl StateRuntime {
+@@ -302,11 +308,90 @@ impl StateRuntime {
      }
  }
 
@@ -131,7 +131,7 @@ index ba41021..f42958a 100644
          .synchronous(SqliteSynchronous::Normal)
          .busy_timeout(Duration::from_secs(5))
          .log_statements(LevelFilter::Off)
-@@ -354,6 +439,9 @@ async fn open_sqlite(
+@@ -353,6 +438,9 @@ async fn open_sqlite(
      spec: RuntimeDbSpec,
      telemetry_override: Option<&dyn DbTelemetry>,
  ) -> anyhow::Result<SqlitePool> {

patches/codex/0008-http-client-honor-no-proxy-before-system-proxy.patch

@@ -13,16 +13,17 @@ This was offered to upstream via:
 https://github.com/openai/codex/issues/4242
 
 diff --git a/codex-rs/exec-server/src/client/reqwest_http_client.rs b/codex-rs/exec-server/src/client/reqwest_http_client.rs
+index 9e22fc0..1862197 100644
 --- a/codex-rs/exec-server/src/client/reqwest_http_client.rs
 +++ b/codex-rs/exec-server/src/client/reqwest_http_client.rs
-@@ -45,17 +45,23 @@ pub(crate) struct PendingReqwestHttpBodyStream {
+@@ -46,17 +46,23 @@ pub(crate) struct PendingReqwestHttpBodyStream {
  /// Validates `http/request` parameters and runs the actual `reqwest` call used
  /// by the exec-server route and the local [`HttpClient`] backend.
  pub(crate) struct ReqwestHttpRequestRunner {
 -    client: reqwest::Client,
 +    timeout_ms: Option<u64>,
  }
- 
+
  impl ReqwestHttpClient {
 -    fn build_client(timeout_ms: Option<u64>) -> Result<reqwest::Client, ExecServerError> {
 -        let builder = match timeout_ms {
@@ -42,29 +43,31 @@ diff --git a/codex-rs/exec-server/src/client/reqwest_http_client.rs b/codex-rs/e
          build_reqwest_client_with_custom_ca(builder)
              .map_err(|error| ExecServerError::HttpRequest(error.to_string()))
      }
-@@ -111,9 +117,7 @@ impl HttpClient for ReqwestHttpClient {
- 
+@@ -112,9 +118,7 @@ impl HttpClient for ReqwestHttpClient {
+
  impl ReqwestHttpRequestRunner {
      pub(crate) fn new(timeout_ms: Option<u64>) -> Result<Self, JSONRPCErrorError> {
 -        let client = ReqwestHttpClient::build_client(timeout_ms)
 -            .map_err(|error| internal_error(error.to_string()))?;
 -        Ok(Self { client })
 +        Ok(Self { timeout_ms })
      }
- 
+
      pub(crate) async fn run(
-@@ -137,5 +141,7 @@ impl ReqwestHttpRequestRunner {
+@@ -136,7 +140,9 @@ impl ReqwestHttpRequestRunner {
+         }
+
          let headers = Self::build_headers(params.headers)?;
--        let mut request = self.client.request(method, url).headers(headers);
+-        let mut request = self.client.request(method.clone(), url).headers(headers);
 +        let client = ReqwestHttpClient::build_client(self.timeout_ms, &url)
 +            .map_err(|error| internal_error(error.to_string()))?;
-+        let mut request = client.request(method, url).headers(headers);
++        let mut request = client.request(method.clone(), url).headers(headers);
          if let Some(body) = params.body {
              request = request.body(body.into_inner());
          }
-@@ -265,3 +271,98 @@ impl ReqwestHttpRequestRunner {
-             .collect()
+@@ -295,3 +301,98 @@ fn error_source_chain(error: &reqwest::Error) -> Option<String> {
      }
+     (!sources.is_empty()).then(|| sources.join(": "))
  }
 +
 +fn request_matches_no_proxy(url: &Url) -> bool {

versions.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-SOLARIS_CODEX_VERSION=0.135.0
+SOLARIS_CODEX_VERSION=0.136.0
 RUST_VERSION=1.95.0
 BINDGEN_CLI_VERSION=0.72.0
 RUST_TRIPLE=x86_64-pc-solaris