From 2680ee641645012e225b42e5480c26e50b918c8b Mon Sep 17 00:00:00 2001 From: "kh.ai" Date: Thu, 13 Nov 2025 15:23:39 -0800 Subject: [PATCH] Normalize mermaid header titles and reuse Codex client --- codex-rs/tui/src/mermaid.rs | 35 ++++++++++++++++++++++++++++- codex-rs/tui/src/security_review.rs | 4 ++-- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/codex-rs/tui/src/mermaid.rs b/codex-rs/tui/src/mermaid.rs index 7a937b805b..10ef385902 100644 --- a/codex-rs/tui/src/mermaid.rs +++ b/codex-rs/tui/src/mermaid.rs @@ -443,6 +443,10 @@ lazy_static! { static ref HEADER_RE: Regex = Regex::new(r"(?i)^\s*(flowchart|graph|sequenceDiagram|classDiagram|erDiagram|gantt)\b") .expect("valid regex"); + static ref HEADER_TITLE_SAME_LINE_RE: Regex = Regex::new( + r"(?im)^(?P\s*)(?Pflowchart|graph)\s+(?PTB|TD|LR|RL|BT)\s+title\s+(?P.+)$", + ) + .expect("valid regex"); } fn sanitize_node_id(value: &str) -> String { @@ -526,8 +530,24 @@ fn is_within_double_quotes(line: &str, start: usize, end: usize) -> bool { spans.iter().any(|(a, b)| start >= *a && end <= *b) } +fn normalize_header_titles(source: &str) -> String { + HEADER_TITLE_SAME_LINE_RE + .replace_all(source, |caps: &Captures| { + let indent = caps.name("indent").map(|m| m.as_str()).unwrap_or(""); + let keyword = caps + .name("keyword") + .map(|m| m.as_str()) + .unwrap_or("flowchart"); + let dir = caps.name("dir").map(|m| m.as_str()).unwrap_or("TD"); + let title = caps.name("title").map(|m| m.as_str()).unwrap_or(""); + format!("{indent}{keyword} {dir}\n{indent} title {title}") + }) + .into_owned() +} + fn lint_and_wrap(code: &str) -> String { - let mut linter = MermaidLinter::new(code); + let normalized = normalize_header_titles(code); + let mut linter = MermaidLinter::new(&normalized); let issues = linter.lint(); linter.apply_fixes(issues); let fixed = if linter.lines.is_empty() { @@ -784,6 +804,19 @@ sequenceDiagram assert!(fixed.contains("MessageWriter-->>APIServer: message record")); } + #[test] + fn header_title_on_same_line_is_split() { + let raw = "```mermaid\nflowchart TD title Component request flow - end-to-end platform\n Client[\"Tenant client / automation workflow\"] --> ChatService[\"packages/chat-service\"]\n```"; + let fixed = fix_mermaid_blocks(raw); + // Ensure we no longer have a single line with both the direction and title. + assert!(!fixed.contains("flowchart TD title")); + + // We expect a header line followed by a separate title directive line. + assert!( + fixed.contains("flowchart TD\n title Component request flow - end-to-end platform") + ); + } + #[test] fn round_trip_no_mermaid_returns_input() { let raw = "This markdown has no mermaid.\n\n```rust\nfn main() {}\n```\n"; diff --git a/codex-rs/tui/src/security_review.rs b/codex-rs/tui/src/security_review.rs index bc51f042b3..887243cff0 100644 --- a/codex-rs/tui/src/security_review.rs +++ b/codex-rs/tui/src/security_review.rs @@ -2424,7 +2424,7 @@ async fn triage_files_for_bug_analysis( for _ in 0..concurrency { if let Some(request) = remaining.next() { in_flight.push(triage_chunk( - client, + client, provider.clone(), auth.clone(), triage_model.to_string(), @@ -2456,7 +2456,7 @@ async fn triage_files_for_bug_analysis( } if let Some(next_request) = remaining.next() { in_flight.push(triage_chunk( - client, + client, provider.clone(), auth.clone(), triage_model.to_string(),