fmt: cargo fmt sweep across drifted files

No behavior change — purely whitespace/line-break cleanup that had
accumulated since the last format run.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Cameron Cordes
2026-05-07 16:42:41 -04:00
parent 2a273a3ed9
commit b42acbb3f3
6 changed files with 39 additions and 39 deletions

View File

@@ -1209,7 +1209,10 @@ pub(crate) fn apply_system_prompt_override(
messages: &mut Vec<ChatMessage>,
override_prompt: Option<&str>,
) -> Option<SystemPromptStash> {
let prompt = override_prompt.map(str::trim).filter(|s| !s.is_empty())?.to_string();
let prompt = override_prompt
.map(str::trim)
.filter(|s| !s.is_empty())?
.to_string();
if let Some(first) = messages.first_mut()
&& first.role == "system"
{
@@ -1505,10 +1508,7 @@ mod tests {
#[test]
fn apply_override_no_op_when_none() {
let mut msgs = vec![
ChatMessage::system("sys"),
ChatMessage::user("hi"),
];
let mut msgs = vec![ChatMessage::system("sys"), ChatMessage::user("hi")];
let stash = apply_system_prompt_override(&mut msgs, None);
assert!(stash.is_none());
assert_eq!(msgs[0].content, "sys");
@@ -1524,13 +1524,12 @@ mod tests {
#[test]
fn restore_override_replaces_back() {
let mut msgs = vec![
ChatMessage::system("new"),
ChatMessage::user("hi"),
];
let mut msgs = vec![ChatMessage::system("new"), ChatMessage::user("hi")];
restore_system_prompt_override(
&mut msgs,
Some(SystemPromptStash::Replaced { original: "original".to_string() }),
Some(SystemPromptStash::Replaced {
original: "original".to_string(),
}),
);
assert_eq!(msgs[0].content, "original");
assert_eq!(msgs.len(), 2);
@@ -1538,10 +1537,7 @@ mod tests {
#[test]
fn restore_override_pops_synthetic() {
let mut msgs = vec![
ChatMessage::system("new"),
ChatMessage::user("hi"),
];
let mut msgs = vec![ChatMessage::system("new"), ChatMessage::user("hi")];
restore_system_prompt_override(&mut msgs, Some(SystemPromptStash::Prepended));
assert_eq!(msgs.len(), 1);
assert_eq!(msgs[0].role, "user");

View File

@@ -1773,8 +1773,7 @@ Return ONLY the summary, nothing else."#,
let has_date = args.get("date").is_some()
|| args.get("start_ts").is_some()
|| args.get("end_ts").is_some();
let has_contact = args.get("contact").is_some()
|| args.get("contact_id").is_some();
let has_contact = args.get("contact").is_some() || args.get("contact_id").is_some();
if has_date || has_contact {
return "Error: search_messages needs a 'query' (keywords/phrase). \
To fetch messages around a date or from a contact without keywords, \
@@ -1815,7 +1814,13 @@ Return ONLY the summary, nothing else."#,
log::info!(
"tool_search_messages: query='{}', mode={}, contact_id={:?}, range=[{:?}, {:?}], user_limit={}, fetch_limit={}",
query, mode, contact_id, start_ts, end_ts, user_limit, fetch_limit
query,
mode,
contact_id,
start_ts,
end_ts,
user_limit,
fetch_limit
);
let hits = match self
@@ -1857,7 +1862,11 @@ Return ONLY the summary, nothing else."#,
"Found {} messages (mode: {}{}):\n\n",
filtered.len(),
mode,
if has_date_filter { ", date-filtered" } else { "" }
if has_date_filter {
", date-filtered"
} else {
""
}
));
for h in filtered {
let date = chrono::DateTime::from_timestamp(h.date, 0)
@@ -3006,7 +3015,7 @@ Return ONLY the summary, nothing else."#,
Some(s) if !s.trim().is_empty() => s.trim().to_string(),
_ => String::from(
"You are reconstructing a memory from a photo. Use the gathered \
context to write a thoughtful summary; you decide voice, length, and shape."
context to write a thoughtful summary; you decide voice, length, and shape.",
),
};