Merge branch 'issue-376-upgrade-repo' into main

# Conflicts:
#	code-rs/core/src/environment_context.rs

Author: zemaj

COMMIT_MESSAGE_ISSUE_5965.txt

@@ -0,0 +1,5 @@
+feat(core): include current date in environment context (#5965)
+
+- add optional `current_date` field to `EnvironmentContext` so turn context carries ISO dates
+- serialize `<current_date>` tags and extend comparisons/tests to tolerate deterministic values
+- cover default date formatting with new unit tests

PR_BODY_ISSUE_5965.md

@@ -0,0 +1,12 @@
+## Summary
+- inject the current local date into `EnvironmentContext` so every turn shares an ISO8601 `<current_date>` tag with the model
+- extend the serializer/equality helpers to account for the new field while keeping comparisons deterministic in tests
+- add lightweight unit coverage to lock the XML output and default date format
+
+## Testing
+- ./build-fast.sh
+
+## Acceptance Criteria
+- environment context payloads now surface a `<current_date>` element in YYYY-MM-DD form
+- existing comparisons that ignore shell differences remain stable once the date is normalized
+- unit tests document the new field and its formatting so regressions are caught automatically

code-rs/core/src/environment_context.rs

@@ -1,3 +1,4 @@
+use chrono::Local;
 use os_info::Type as OsType;
 use os_info::Version;
 use serde::Deserialize;
@@ -40,6 +41,7 @@ pub(crate) struct EnvironmentContext {
     pub operating_system: Option<OperatingSystemInfo>,
     pub common_tools: Option<Vec<String>>,
     pub shell: Option<Shell>,
+    pub current_date: Option<String>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
@@ -152,6 +154,7 @@ impl EnvironmentContext {
             operating_system: detect_operating_system_info(),
             common_tools: detect_common_tools(),
             shell,
+            current_date: Some(Local::now().format("%Y-%m-%d").to_string()),
         }
     }
 
@@ -168,6 +171,7 @@ impl EnvironmentContext {
             writable_roots,
             operating_system,
             common_tools,
+            current_date,
             // should compare all fields except shell
             shell: _,
         } = other;
@@ -179,6 +183,7 @@ impl EnvironmentContext {
             && self.writable_roots == *writable_roots
             && self.operating_system == *operating_system
             && self.common_tools == *common_tools
+            && self.current_date == *current_date
     }
 }
 
@@ -256,6 +261,9 @@ impl EnvironmentContext {
                 lines.push("  </common_tools>".to_string());
             }
         }
+        if let Some(current_date) = self.current_date {
+            lines.push(format!("  <current_date>{current_date}</current_date>"));
+        }
         if let Some(shell) = self.shell
             && let Some(shell_name) = shell.name()
         {
@@ -852,6 +860,7 @@ mod tests {
         );
         context.operating_system = None;
         context.common_tools = None;
+        context.current_date = Some("2025-01-02".to_string());
 
         let expected = r#"<environment_context>
   <cwd>/repo</cwd>
@@ -862,6 +871,7 @@ mod tests {
     <root>/repo</root>
     <root>/tmp</root>
   </writable_roots>
+  <current_date>2025-01-02</current_date>
 </environment_context>"#;
 
         assert_eq!(context.serialize_to_xml(), expected);
@@ -877,11 +887,13 @@ mod tests {
         );
         context.operating_system = None;
         context.common_tools = None;
+        context.current_date = Some("2025-01-02".to_string());
 
         let expected = r#"<environment_context>
   <approval_policy>never</approval_policy>
   <sandbox_mode>read-only</sandbox_mode>
   <network_access>restricted</network_access>
+  <current_date>2025-01-02</current_date>
 </environment_context>"#;
 
         assert_eq!(context.serialize_to_xml(), expected);
@@ -897,11 +909,13 @@ mod tests {
         );
         context.operating_system = None;
         context.common_tools = None;
+        context.current_date = Some("2025-01-02".to_string());
 
         let expected = r#"<environment_context>
   <approval_policy>on-failure</approval_policy>
   <sandbox_mode>danger-full-access</sandbox_mode>
   <network_access>enabled</network_access>
+  <current_date>2025-01-02</current_date>
 </environment_context>"#;
 
         assert_eq!(context.serialize_to_xml(), expected);
@@ -921,6 +935,7 @@ mod tests {
             architecture: Some("aarch64".to_string()),
         });
         context.common_tools = Some(vec!["rg".to_string(), "git".to_string()]);
+        context.current_date = Some("2025-01-02".to_string());
 
         let xml = context.serialize_to_xml();
         assert!(xml.contains("<operating_system>"));
@@ -930,6 +945,7 @@ mod tests {
         assert!(xml.contains("<common_tools>"));
         assert!(xml.contains("<tool>rg</tool>"));
         assert!(xml.contains("<tool>git</tool>"));
+        assert!(xml.contains("<current_date>2025-01-02</current_date>"));
     }
 
     fn message_text(item: &ResponseItem) -> &str {
@@ -1026,6 +1042,12 @@ mod tests {
             Some(workspace_write_policy(vec!["/repo"], true)),
             None,
         );
+        // ensure current_date doesn't influence this comparison
+        let fixed_date = Some("2025-01-02".to_string());
+        let mut context1 = context1;
+        context1.current_date = fixed_date.clone();
+        let mut context2 = context2;
+        context2.current_date = fixed_date;
         assert!(!context1.equals_except_shell(&context2));
     }
 
@@ -1043,6 +1065,10 @@ mod tests {
             Some(SandboxPolicy::new_workspace_write_policy()),
             None,
         );
+        let mut context1 = context1;
+        context1.current_date = Some("2025-01-02".to_string());
+        let mut context2 = context2;
+        context2.current_date = Some("2025-01-02".to_string());
 
         assert!(!context1.equals_except_shell(&context2));
     }
@@ -1061,6 +1087,10 @@ mod tests {
             Some(workspace_write_policy(vec!["/repo", "/tmp"], true)),
             None,
         );
+        let mut context1 = context1;
+        context1.current_date = Some("2025-01-02".to_string());
+        let mut context2 = context2;
+        context2.current_date = Some("2025-01-02".to_string());
 
         assert!(!context1.equals_except_shell(&context2));
     }
@@ -1110,6 +1140,10 @@ mod tests {
                 zshrc_path: "/home/user/.zshrc".into(),
             })),
         );
+        let mut context1 = context1;
+        context1.current_date = Some("2025-01-02".to_string());
+        let mut context2 = context2;
+        context2.current_date = Some("2025-01-02".to_string());
 
         assert!(context1.equals_except_shell(&context2));
     }
@@ -1193,4 +1227,24 @@ mod tests {
         let second = tracker.observe(snapshot);
         assert!(second.is_none(), "unchanged snapshot should not emit");
     }
+
+    #[test]
+    fn serialize_environment_context_includes_current_date() {
+        let mut context = EnvironmentContext::new(None, None, None, None);
+        context.current_date = Some("2025-01-02".to_string());
+
+        let xml = context.serialize_to_xml();
+        assert!(xml.contains("<current_date>2025-01-02</current_date>"));
+    }
+
+    #[test]
+    fn current_date_format_is_iso8601() {
+        let context = EnvironmentContext::new(None, None, None, None);
+        let date = context
+            .current_date
+            .expect("current_date should be populated");
+        assert_eq!(date.len(), 10);
+        assert_eq!(date.chars().nth(4), Some('-'));
+        assert_eq!(date.chars().nth(7), Some('-'));
+    }
 }