Finalize fork fixes for v0.144.3

Author: kbdevs

codex-rs/Cargo.lock

@@ -134,7 +134,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.144.2"
+version = "0.144.3"
 # Track the edition for all workspace crates in one place. Individual
 # crates can still override this value, but keeping it here means new
 # crates created with `cargo new -w ...` automatically inherit the 2024

codex-rs/Cargo.toml

@@ -440,7 +440,7 @@ type HostSandboxArgs = UnsupportedSandboxArgs;
 #[derive(Debug, Parser)]
 struct UnsupportedSandboxArgs {
     /// Layer $CODEX_HOME/<name>.config.toml on top of the base user config.
-    #[arg(long = "profile", short = 'p')]
+    #[arg(long = "profile", alias = "profile-v2", short = 'p')]
     pub config_profile: Option<ProfileV2Name>,
 
     #[clap(skip)]
@@ -2927,6 +2927,16 @@ mod tests {
         );
     }
 
+    #[test]
+    fn profile_v2_alias_remains_accepted() {
+        assert_eq!(
+            profile_v2_for_args(&["codex", "--profile-v2", "work", "resume"])
+                .expect("legacy profile-v2 alias should parse")
+                .as_deref(),
+            Some("work")
+        );
+    }
+
     #[test]
     fn root_initial_goal_prompt_parses_as_interactive_option() {
         let cli = MultitoolCli::try_parse_from([

codex-rs/cli/src/main.rs

@@ -815,6 +815,8 @@ async fn reconstruct_history_rollback_counts_typed_inter_agent_metadata_turns()
             codex_protocol::protocol::TurnCompleteEvent {
                 turn_id: first_turn_id,
                 last_agent_message: None,
+                error: None,
+                started_at: None,
                 completed_at: None,
                 duration_ms: None,
                 time_to_first_token_ms: None,
@@ -838,6 +840,8 @@ async fn reconstruct_history_rollback_counts_typed_inter_agent_metadata_turns()
             codex_protocol::protocol::TurnCompleteEvent {
                 turn_id: assistant_turn_id,
                 last_agent_message: None,
+                error: None,
+                started_at: None,
                 completed_at: None,
                 duration_ms: None,
                 time_to_first_token_ms: None,
@@ -1140,6 +1144,8 @@ async fn reconstruct_history_rollback_after_compaction_drops_latest_user_turn_an
             codex_protocol::protocol::TurnCompleteEvent {
                 turn_id: first_turn_id,
                 last_agent_message: None,
+                error: None,
+                started_at: None,
                 completed_at: None,
                 duration_ms: None,
                 time_to_first_token_ms: None,
@@ -1174,6 +1180,8 @@ async fn reconstruct_history_rollback_after_compaction_drops_latest_user_turn_an
             codex_protocol::protocol::TurnCompleteEvent {
                 turn_id: second_turn_id,
                 last_agent_message: None,
+                error: None,
+                started_at: None,
                 completed_at: None,
                 duration_ms: None,
                 time_to_first_token_ms: None,
@@ -1200,6 +1208,8 @@ async fn reconstruct_history_rollback_after_compaction_drops_latest_user_turn_an
             codex_protocol::protocol::TurnCompleteEvent {
                 turn_id: compact_turn_id,
                 last_agent_message: None,
+                error: None,
+                started_at: None,
                 completed_at: None,
                 duration_ms: None,
                 time_to_first_token_ms: None,
@@ -1262,6 +1272,8 @@ async fn reconstruct_history_rollback_after_compaction_trims_compacted_history()
             codex_protocol::protocol::TurnCompleteEvent {
                 turn_id: compact_turn_id,
                 last_agent_message: None,
+                error: None,
+                started_at: None,
                 completed_at: None,
                 duration_ms: None,
                 time_to_first_token_ms: None,
@@ -1321,6 +1333,8 @@ async fn reconstruct_rollback_counts_raw_turns_before_trimming_compaction() {
             codex_protocol::protocol::TurnCompleteEvent {
                 turn_id: compact_turn_id,
                 last_agent_message: None,
+                error: None,
+                started_at: None,
                 completed_at: None,
                 duration_ms: None,
                 time_to_first_token_ms: None,
@@ -1341,6 +1355,8 @@ async fn reconstruct_rollback_counts_raw_turns_before_trimming_compaction() {
             codex_protocol::protocol::TurnCompleteEvent {
                 turn_id: raw_turn_id,
                 last_agent_message: None,
+                error: None,
+                started_at: None,
                 completed_at: None,
                 duration_ms: None,
                 time_to_first_token_ms: None,

codex-rs/core/src/session/rollout_reconstruction_tests.rs

@@ -235,7 +235,8 @@ async fn stalled_stream_retries_after_idle_timeout() {
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn connection_failure_pauses_retry_budget_until_provider_is_reachable() -> anyhow::Result<()> {
+async fn connection_failure_pauses_retry_budget_until_provider_is_reachable() -> anyhow::Result<()>
+{
     skip_if_no_network!(Ok(()));
 
     let bootstrap_server = responses::start_mock_server().await;

codex-rs/core/tests/suite/stream_no_completed.rs

@@ -112,10 +112,6 @@ impl App {
                 self.undo_last_turn();
                 tui.frame_requester().schedule_frame();
             }
-            AppEvent::ExportTranscript => {
-                self.export_transcript_to_markdown();
-                tui.frame_requester().schedule_frame();
-            }
             AppEvent::ImportTranscript { path } => {
                 self.import_transcript_from_markdown(tui, &path);
                 tui.frame_requester().schedule_frame();

codex-rs/tui/src/app/event_dispatch.rs

@@ -2,7 +2,9 @@ use super::*;
 use crate::history_cell::AgentMarkdownCell;
 use crate::history_cell::HistoryCell;
 use crate::history_cell::PlainHistoryCell;
+use crate::history_cell::ReasoningSummaryCell;
 use crate::history_cell::UserHistoryCell;
+use crate::history_cell::new_proposed_plan;
 use crate::history_cell::raw_lines_from_source;
 use std::path::Path;
 use std::path::PathBuf;
@@ -14,8 +16,10 @@ const SECTION_MARKER_SUFFIX: &str = "-->";
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 enum ImportSectionKind {
     User,
-    Codex,
-    Event,
+    Assistant,
+    Plan,
+    Reasoning,
+    Activity,
 }
 
 #[derive(Debug)]
@@ -115,16 +119,30 @@ fn imported_section_cell(section: ImportSection, cwd: &Path) -> Arc<dyn HistoryC
             local_image_paths: Vec::new(),
             remote_image_urls: Vec::new(),
         }),
-        ImportSectionKind::Codex => Arc::new(AgentMarkdownCell::new(section.body, cwd)),
-        ImportSectionKind::Event => {
+        ImportSectionKind::Assistant => Arc::new(
+            AgentMarkdownCell::new_with_inline_visualizations(section.body, cwd, None),
+        ),
+        ImportSectionKind::Plan => Arc::new(new_proposed_plan(section.body, cwd)),
+        ImportSectionKind::Reasoning => Arc::new(ReasoningSummaryCell::new(
+            "Reasoning".to_string(),
+            section.body,
+            cwd,
+            /*transcript_only*/ false,
+        )),
+        ImportSectionKind::Activity => {
             Arc::new(PlainHistoryCell::new(raw_lines_from_source(&section.body)))
         }
     }
 }
 
 fn parse_exported_transcript(markdown: &str) -> Result<Vec<ImportSection>, String> {
     let body = markdown.strip_prefix('\u{feff}').unwrap_or(markdown);
-    let Some(after_header) = body.strip_prefix(super::transcript_export::EXPORT_HEADER) else {
+    let Some(after_header) = [
+        "# Codex conversation",
+        super::transcript_export::EXPORT_HEADER,
+    ]
+    .iter()
+    .find_map(|header| body.strip_prefix(header)) else {
         return Err("file is not a Codex chat export".to_string());
     };
 
@@ -231,8 +249,10 @@ fn section_kind_from_heading(line: &str) -> Option<ImportSectionKind> {
 fn section_kind_from_name(name: &str) -> Option<ImportSectionKind> {
     match name {
         "User" => Some(ImportSectionKind::User),
-        "Codex" => Some(ImportSectionKind::Codex),
-        "Event" => Some(ImportSectionKind::Event),
+        "Assistant" | "Codex" => Some(ImportSectionKind::Assistant),
+        "Plan" => Some(ImportSectionKind::Plan),
+        "Reasoning" => Some(ImportSectionKind::Reasoning),
+        "Activity" | "Event" => Some(ImportSectionKind::Activity),
         _ => None,
     }
 }

codex-rs/tui/src/app/transcript_import.rs

@@ -23,7 +23,7 @@ fn parses_marked_export_without_splitting_markdown_headings() {
             .collect::<Vec<_>>(),
         vec![
             (ImportSectionKind::User, "hello"),
-            (ImportSectionKind::Codex, "## Assistant heading\n\nbody"),
+            (ImportSectionKind::Assistant, "## Assistant heading\n\nbody"),
         ]
     );
 }
@@ -41,7 +41,35 @@ fn parses_legacy_heading_export() {
             .collect::<Vec<_>>(),
         vec![
             (ImportSectionKind::User, "hello"),
-            (ImportSectionKind::Codex, "hey"),
+            (ImportSectionKind::Assistant, "hey"),
+        ]
+    );
+}
+
+#[test]
+fn parses_current_export_headings() {
+    let markdown = concat!(
+        "# Codex conversation\n\n",
+        "## User\n\nhello\n\n",
+        "## Assistant\n\nresponse\n\n",
+        "## Plan\n\nstep\n\n",
+        "## Reasoning\n\nthought\n\n",
+        "## Activity\n\n    file changed\n",
+    );
+
+    let sections = parse_exported_transcript(markdown).expect("valid export");
+
+    assert_eq!(
+        sections
+            .iter()
+            .map(|section| (section.kind, section.body.as_str()))
+            .collect::<Vec<_>>(),
+        vec![
+            (ImportSectionKind::User, "hello"),
+            (ImportSectionKind::Assistant, "response"),
+            (ImportSectionKind::Plan, "step"),
+            (ImportSectionKind::Reasoning, "thought"),
+            (ImportSectionKind::Activity, "    file changed"),
         ]
     );
 }

codex-rs/tui/src/app/transcript_import_tests.rs

@@ -219,7 +219,7 @@ impl App {
             return;
         };
         let Some(nth_user_message) = user_count(&self.transcript_cells).checked_sub(1) else {
-            self.app_event_tx.send(AppEvent::NewSession);
+            self.app_event_tx.send(AppEvent::NewSession { name: None });
             return;
         };
 

codex-rs/tui/src/app_backtrack.rs

@@ -329,9 +329,6 @@ pub(crate) enum AppEvent {
     /// Roll back the latest user turn, or start a new session when there is no turn to undo.
     UndoLastTurn,
 
-    /// Export the visible transcript to a markdown file in the current working directory.
-    ExportTranscript,
-
     /// Import a markdown transcript previously written by `/export`.
     ImportTranscript {
         path: String,