Re-add markdown streaming (#2029)
Wait for newlines, then render markdown on a line by line basis. Word wrap it for the current terminal size and then spit it out line by line into the UI. Also adds tests and fixes some UI regressions.
This commit is contained in:
easong-openai
GitHub
243
codex-rs/tui/src/session_log.rs
Normal file
243
codex-rs/tui/src/session_log.rs
Normal file
@@ -0,0 +1,243 @@
|
||||
use std::fs::File;
|
||||
use std::fs::OpenOptions;
|
||||
use std::io::Write;
|
||||
use std::path::PathBuf;
|
||||
use std::sync::Mutex;
|
||||
|
||||
use codex_core::config::Config;
|
||||
use codex_core::protocol::Op;
|
||||
use once_cell::sync::Lazy;
|
||||
use once_cell::sync::OnceCell;
|
||||
use serde::Serialize;
|
||||
use serde_json::json;
|
||||
|
||||
use crate::app_event::AppEvent;
|
||||
|
||||
static LOGGER: Lazy<SessionLogger> = Lazy::new(SessionLogger::new);
|
||||
|
||||
struct SessionLogger {
|
||||
file: OnceCell<Mutex<File>>,
|
||||
}
|
||||
|
||||
impl SessionLogger {
|
||||
fn new() -> Self {
|
||||
Self {
|
||||
file: OnceCell::new(),
|
||||
}
|
||||
}
|
||||
|
||||
fn open(&self, path: PathBuf) -> std::io::Result<()> {
|
||||
let mut opts = OpenOptions::new();
|
||||
opts.create(true).truncate(true).write(true);
|
||||
|
||||
#[cfg(unix)]
|
||||
{
|
||||
use std::os::unix::fs::OpenOptionsExt;
|
||||
opts.mode(0o600);
|
||||
}
|
||||
|
||||
let file = opts.open(path)?;
|
||||
// If already initialized, ignore and succeed.
|
||||
if self.file.get().is_some() {
|
||||
return Ok(());
|
||||
}
|
||||
let _ = self.file.set(Mutex::new(file));
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn write_json_line(&self, value: serde_json::Value) {
|
||||
let Some(mutex) = self.file.get() else {
|
||||
return;
|
||||
};
|
||||
let mut guard = match mutex.lock() {
|
||||
Ok(g) => g,
|
||||
Err(poisoned) => poisoned.into_inner(),
|
||||
};
|
||||
match serde_json::to_string(&value) {
|
||||
Ok(serialized) => {
|
||||
if let Err(e) = guard.write_all(serialized.as_bytes()) {
|
||||
tracing::warn!("session log write error: {}", e);
|
||||
return;
|
||||
}
|
||||
if let Err(e) = guard.write_all(b"\n") {
|
||||
tracing::warn!("session log write error: {}", e);
|
||||
return;
|
||||
}
|
||||
if let Err(e) = guard.flush() {
|
||||
tracing::warn!("session log flush error: {}", e);
|
||||
}
|
||||
}
|
||||
Err(e) => tracing::warn!("session log serialize error: {}", e),
|
||||
}
|
||||
}
|
||||
|
||||
fn is_enabled(&self) -> bool {
|
||||
self.file.get().is_some()
|
||||
}
|
||||
}
|
||||
|
||||
fn now_ts() -> String {
|
||||
// RFC3339 for readability; consumers can parse as needed.
|
||||
chrono::Utc::now().to_rfc3339_opts(chrono::SecondsFormat::Millis, true)
|
||||
}
|
||||
|
||||
pub(crate) fn maybe_init(config: &Config) {
|
||||
let enabled = std::env::var("CODEX_TUI_RECORD_SESSION")
|
||||
.map(|v| matches!(v.as_str(), "1" | "true" | "TRUE" | "yes" | "YES"))
|
||||
.unwrap_or(false);
|
||||
if !enabled {
|
||||
return;
|
||||
}
|
||||
|
||||
let path = if let Ok(path) = std::env::var("CODEX_TUI_SESSION_LOG_PATH") {
|
||||
PathBuf::from(path)
|
||||
} else {
|
||||
let mut p = match codex_core::config::log_dir(config) {
|
||||
Ok(dir) => dir,
|
||||
Err(_) => std::env::temp_dir(),
|
||||
};
|
||||
let filename = format!(
|
||||
"session-{}.jsonl",
|
||||
chrono::Utc::now().format("%Y%m%dT%H%M%SZ")
|
||||
);
|
||||
p.push(filename);
|
||||
p
|
||||
};
|
||||
|
||||
if let Err(e) = LOGGER.open(path.clone()) {
|
||||
tracing::error!("failed to open session log {:?}: {}", path, e);
|
||||
return;
|
||||
}
|
||||
|
||||
// Write a header record so we can attach context.
|
||||
let header = json!({
|
||||
"ts": now_ts(),
|
||||
"dir": "meta",
|
||||
"kind": "session_start",
|
||||
"cwd": config.cwd,
|
||||
"model": config.model,
|
||||
"model_provider_id": config.model_provider_id,
|
||||
"model_provider_name": config.model_provider.name,
|
||||
});
|
||||
LOGGER.write_json_line(header);
|
||||
}
|
||||
|
||||
pub(crate) fn log_inbound_app_event(event: &AppEvent) {
|
||||
// Log only if enabled
|
||||
if !LOGGER.is_enabled() {
|
||||
return;
|
||||
}
|
||||
|
||||
match event {
|
||||
AppEvent::CodexEvent(ev) => {
|
||||
write_record("to_tui", "codex_event", ev);
|
||||
}
|
||||
AppEvent::KeyEvent(k) => {
|
||||
let value = json!({
|
||||
"ts": now_ts(),
|
||||
"dir": "to_tui",
|
||||
"kind": "key_event",
|
||||
"event": format!("{:?}", k),
|
||||
});
|
||||
LOGGER.write_json_line(value);
|
||||
}
|
||||
AppEvent::Paste(s) => {
|
||||
let value = json!({
|
||||
"ts": now_ts(),
|
||||
"dir": "to_tui",
|
||||
"kind": "paste",
|
||||
"text": s,
|
||||
});
|
||||
LOGGER.write_json_line(value);
|
||||
}
|
||||
AppEvent::DispatchCommand(cmd) => {
|
||||
let value = json!({
|
||||
"ts": now_ts(),
|
||||
"dir": "to_tui",
|
||||
"kind": "slash_command",
|
||||
"command": format!("{:?}", cmd),
|
||||
});
|
||||
LOGGER.write_json_line(value);
|
||||
}
|
||||
// Internal UI events; still log for fidelity, but avoid heavy payloads.
|
||||
AppEvent::InsertHistory(lines) => {
|
||||
let value = json!({
|
||||
"ts": now_ts(),
|
||||
"dir": "to_tui",
|
||||
"kind": "insert_history",
|
||||
"lines": lines.len(),
|
||||
});
|
||||
LOGGER.write_json_line(value);
|
||||
}
|
||||
AppEvent::StartFileSearch(query) => {
|
||||
let value = json!({
|
||||
"ts": now_ts(),
|
||||
"dir": "to_tui",
|
||||
"kind": "file_search_start",
|
||||
"query": query,
|
||||
});
|
||||
LOGGER.write_json_line(value);
|
||||
}
|
||||
AppEvent::FileSearchResult { query, matches } => {
|
||||
let value = json!({
|
||||
"ts": now_ts(),
|
||||
"dir": "to_tui",
|
||||
"kind": "file_search_result",
|
||||
"query": query,
|
||||
"matches": matches.len(),
|
||||
});
|
||||
LOGGER.write_json_line(value);
|
||||
}
|
||||
AppEvent::LatestLog(line) => {
|
||||
let value = json!({
|
||||
"ts": now_ts(),
|
||||
"dir": "to_tui",
|
||||
"kind": "log_line",
|
||||
"line": line,
|
||||
});
|
||||
LOGGER.write_json_line(value);
|
||||
}
|
||||
// Noise or control flow – record variant only
|
||||
other => {
|
||||
let value = json!({
|
||||
"ts": now_ts(),
|
||||
"dir": "to_tui",
|
||||
"kind": "app_event",
|
||||
"variant": format!("{other:?}").split('(').next().unwrap_or("app_event"),
|
||||
});
|
||||
LOGGER.write_json_line(value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn log_outbound_op(op: &Op) {
|
||||
if !LOGGER.is_enabled() {
|
||||
return;
|
||||
}
|
||||
write_record("from_tui", "op", op);
|
||||
}
|
||||
|
||||
pub(crate) fn log_session_end() {
|
||||
if !LOGGER.is_enabled() {
|
||||
return;
|
||||
}
|
||||
let value = json!({
|
||||
"ts": now_ts(),
|
||||
"dir": "meta",
|
||||
"kind": "session_end",
|
||||
});
|
||||
LOGGER.write_json_line(value);
|
||||
}
|
||||
|
||||
fn write_record<T>(dir: &str, kind: &str, obj: &T)
|
||||
where
|
||||
T: Serialize,
|
||||
{
|
||||
let value = json!({
|
||||
"ts": now_ts(),
|
||||
"dir": dir,
|
||||
"kind": kind,
|
||||
"payload": obj,
|
||||
});
|
||||
LOGGER.write_json_line(value);
|
||||
}
|
||||
Reference in New Issue
Block a user