diff --git a/codex-rs/core/src/stream_events_utils.rs b/codex-rs/core/src/stream_events_utils.rs
index 197ff6b4b..930ce5afd 100644
--- a/codex-rs/core/src/stream_events_utils.rs
+++ b/codex-rs/core/src/stream_events_utils.rs
@@ -51,7 +51,12 @@ pub(crate) async fn handle_output_item_done(
         // The model emitted a tool call; log it, persist the item immediately, and queue the tool execution.
         Ok(Some(call)) => {
             let payload_preview = call.payload.log_payload().into_owned();
-            tracing::info!("ToolCall: {} {}", call.tool_name, payload_preview);
+            tracing::info!(
+                thread_id = %ctx.sess.conversation_id,
+                "ToolCall: {} {}",
+                call.tool_name,
+                payload_preview
+            );
 
             ctx.sess
                 .record_conversation_items(&ctx.turn_context, std::slice::from_ref(&item))
diff --git a/codex-rs/core/src/tasks/mod.rs b/codex-rs/core/src/tasks/mod.rs
index 1f1195236..a487041eb 100644
--- a/codex-rs/core/src/tasks/mod.rs
+++ b/codex-rs/core/src/tasks/mod.rs
@@ -14,7 +14,7 @@ use tokio::sync::Notify;
 use tokio_util::sync::CancellationToken;
 use tokio_util::task::AbortOnDropHandle;
 use tracing::Instrument;
-use tracing::info_span;
+use tracing::Span;
 use tracing::trace;
 use tracing::warn;
 
@@ -132,8 +132,7 @@ impl Session {
             let ctx = Arc::clone(&turn_context);
             let task_for_run = Arc::clone(&task);
             let task_cancellation_token = cancellation_token.child_token();
-            let thread_id = self.conversation_id;
-            let session_span = info_span!("session_task", thread_id = %thread_id);
+            let session_span = Span::current();
             tokio::spawn(
                 async move {
                     let ctx_for_finish = Arc::clone(&ctx);
diff --git a/codex-rs/state/src/bin/logs_client.rs b/codex-rs/state/src/bin/logs_client.rs
index c02a42325..4389c29bc 100644
--- a/codex-rs/state/src/bin/logs_client.rs
+++ b/codex-rs/state/src/bin/logs_client.rs
@@ -221,20 +221,16 @@ fn to_log_query(
 fn format_row(row: &LogRow) -> String {
     let timestamp = format_timestamp(row.ts, row.ts_nanos);
     let level = row.level.as_str();
-    let location = match (&row.file, row.line) {
-        (Some(file), Some(line)) => format!("{file}:{line}"),
-        (Some(file), None) => file.clone(),
-        _ => "-".to_string(),
-    };
+    let target = row.target.as_str();
     let message = row.message.as_deref().unwrap_or("");
     let level_colored = color_level(level);
     let timestamp_colored = timestamp.dimmed().to_string();
     let thread_id = row.thread_id.as_deref().unwrap_or("-");
-    let thread_id_colored = thread_id.yellow().to_string();
-    let location_colored = location.dimmed().to_string();
+    let thread_id_colored = thread_id.blue().dimmed().to_string();
+    let target_colored = target.dimmed().to_string();
     let message_colored = message.bold().to_string();
     format!(
-        "{timestamp_colored} {level_colored} [{thread_id_colored}] {location_colored} - {message_colored}"
+        "{timestamp_colored} {level_colored} [{thread_id_colored}] {target_colored} - {message_colored}"
     )
 }
 
diff --git a/codex-rs/state/src/model/log.rs b/codex-rs/state/src/model/log.rs
index d8a9ba352..5d774249d 100644
--- a/codex-rs/state/src/model/log.rs
+++ b/codex-rs/state/src/model/log.rs
@@ -20,6 +20,7 @@ pub struct LogRow {
     pub ts: i64,
     pub ts_nanos: i64,
     pub level: String,
+    pub target: String,
     pub message: Option<String>,
     pub thread_id: Option<String>,
     pub file: Option<String>,
diff --git a/codex-rs/state/src/runtime.rs b/codex-rs/state/src/runtime.rs
index b15e4338b..e0805e5b6 100644
--- a/codex-rs/state/src/runtime.rs
+++ b/codex-rs/state/src/runtime.rs
@@ -244,7 +244,7 @@ FROM threads
     /// Query logs with optional filters.
     pub async fn query_logs(&self, query: &LogQuery) -> anyhow::Result<Vec<LogRow>> {
         let mut builder = QueryBuilder::<Sqlite>::new(
-            "SELECT id, ts, ts_nanos, level, message, thread_id, file, line FROM logs WHERE 1 = 1",
+            "SELECT id, ts, ts_nanos, level, target, message, thread_id, file, line FROM logs WHERE 1 = 1",
         );
         push_log_filters(&mut builder, query);
         if query.descending {
diff --git a/codex-rs/tui/src/lib.rs b/codex-rs/tui/src/lib.rs
index c9e69b712..010f8c83e 100644
--- a/codex-rs/tui/src/lib.rs
+++ b/codex-rs/tui/src/lib.rs
@@ -306,7 +306,10 @@ pub async fn run_main(
         // grep for a specific module/target while troubleshooting.
         .with_target(true)
         .with_ansi(false)
-        .with_span_events(tracing_subscriber::fmt::format::FmtSpan::FULL)
+        .with_span_events(
+            tracing_subscriber::fmt::format::FmtSpan::NEW
+                | tracing_subscriber::fmt::format::FmtSpan::CLOSE,
+        )
         .with_filter(env_filter());
 
     let feedback = codex_feedback::CodexFeedback::new();