fix: session timestamps (#4913)

crates/goose/src/session/legacy.rs

@@ -1,7 +1,7 @@
 use crate::conversation::Conversation;
 use crate::session::Session;
 use anyhow::Result;
-use chrono::NaiveDateTime;
+use chrono::{DateTime, Local, NaiveDateTime, TimeZone, Utc};
 use std::fs;
 use std::io::{self, BufRead};
 use std::path::{Path, PathBuf};
@@ -65,9 +65,9 @@ pub fn load_session(session_name: &str, session_path: &Path) -> Result<Session>
         if let Some(obj) = metadata_json.as_object_mut() {
             obj.entry("id").or_insert(serde_json::json!(session_name));
             obj.entry("created_at")
-                .or_insert(serde_json::json!(format_timestamp(created_time)?));
+                .or_insert(serde_json::json!(DateTime::<Utc>::from(created_time)));
             obj.entry("updated_at")
-                .or_insert(serde_json::json!(format_timestamp(modified_time)?));
+                .or_insert(serde_json::json!(DateTime::<Utc>::from(modified_time)));
             obj.entry("extension_data").or_insert(serde_json::json!({}));
             obj.entry("message_count").or_insert(serde_json::json!(0));
 
@@ -97,17 +97,9 @@ pub fn load_session(session_name: &str, session_path: &Path) -> Result<Session>
     Ok(session)
 }
 
-fn format_timestamp(time: SystemTime) -> Result<String> {
-    let duration = time.duration_since(std::time::UNIX_EPOCH)?;
-    let timestamp = chrono::DateTime::from_timestamp(duration.as_secs() as i64, 0)
-        .unwrap_or_default()
-        .format("%Y-%m-%d %H:%M:%S")
-        .to_string();
-    Ok(timestamp)
-}
-
 fn parse_session_timestamp(session_name: &str) -> Option<SystemTime> {
     NaiveDateTime::parse_from_str(session_name, "%Y%m%d_%H%M%S")
         .ok()
-        .map(|dt| SystemTime::from(dt.and_utc()))
+        .and_then(|dt| Local.from_local_datetime(&dt).single())
+        .map(SystemTime::from)
 }

crates/goose/src/session/session_manager.rs

@@ -5,6 +5,7 @@ use crate::providers::base::{Provider, MSG_COUNT_FOR_SESSION_NAME_GENERATION};
 use crate::recipe::Recipe;
 use crate::session::extension_data::ExtensionData;
 use anyhow::Result;
+use chrono::{DateTime, Utc};
 use etcetera::{choose_app_strategy, AppStrategy};
 use rmcp::model::Role;
 use serde::{Deserialize, Serialize};
@@ -27,8 +28,8 @@ pub struct Session {
     #[schema(value_type = String)]
     pub working_dir: PathBuf,
     pub description: String,
-    pub created_at: String,
-    pub updated_at: String,
+    pub created_at: DateTime<Utc>,
+    pub updated_at: DateTime<Utc>,
     pub extension_data: ExtensionData,
     pub total_tokens: Option<i32>,
     pub input_tokens: Option<i32>,
@@ -279,8 +280,8 @@ impl Default for Session {
             id: String::new(),
             working_dir: std::env::current_dir().unwrap_or_else(|_| PathBuf::from(".")),
             description: String::new(),
-            created_at: String::new(),
-            updated_at: String::new(),
+            created_at: Default::default(),
+            updated_at: Default::default(),
             extension_data: ExtensionData::default(),
             total_tokens: None,
             input_tokens: None,
@@ -510,8 +511,8 @@ impl SessionStorage {
         .bind(&session.id)
         .bind(&session.description)
         .bind(session.working_dir.to_string_lossy().as_ref())
-        .bind(&session.created_at)
-        .bind(&session.updated_at)
+        .bind(session.created_at)
+        .bind(session.updated_at)
         .bind(serde_json::to_string(&session.extension_data)?)
         .bind(session.total_tokens)
         .bind(session.input_tokens)