Skip to content

feat(routines): add timezone-aware runs and result navigation #748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Harry19081 merged 1 commit into from
Aug 9, 2026
Merged

feat(routines): add timezone-aware runs and result navigation #748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src-tauri/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

87 changes: 15 additions & 72 deletions src-tauri/crates/agent-core/src/core/coordination/routine_scheduler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use chrono::{DateTime, Utc};
use tracing::{info, warn};

use project_management::projects::io;
use project_management::projects::routine_schedule::{due_times, next_occurrence};
use project_management::projects::types::{
RoutineCatchUpPolicy, RoutineDefinition, RoutineTrigger,
};
Expand Down Expand Up @@ -66,8 +67,7 @@ async fn tick(app: &tauri::AppHandle, now: DateTime<Utc>) -> Result<(), String>
}

/// Evaluate the portable `pm_routines` schedule activations (design
/// §10.4). Cron is evaluated in UTC for now — the declared timezone is
/// carried in the spec and honored once tz-aware evaluation lands.
/// §10.4). Cron is evaluated in the timezone declared by the portable spec.
/// Catch-up: both portable policies (`none`, `fire_once`) reduce to
/// "fire the latest missed tick once", matching the legacy collapse.
async fn portable_tick(now: DateTime<Utc>) -> Result<(), String> {
Expand All @@ -84,6 +84,7 @@ async fn portable_tick(now: DateTime<Utc>) -> Result<(), String> {
.unwrap_or_else(|| now - chrono::Duration::seconds(POLL_INTERVAL_SECS as i64));
let trigger = RoutineTrigger::Cron {
cron: candidate.cron.clone(),
timezone: candidate.timezone.clone(),
};
let due = match due_times(&trigger, &window_start, &now) {
Ok(due) => due,
Expand Down Expand Up @@ -136,6 +137,7 @@ async fn portable_tick(now: DateTime<Utc>) -> Result<(), String> {
let next = next_occurrence(
&RoutineTrigger::Cron {
cron: candidate.cron.clone(),
timezone: candidate.timezone.clone(),
},
&now,
)
Expand Down Expand Up @@ -243,48 +245,6 @@ fn watermark(routine: &RoutineDefinition, now: DateTime<Utc>) -> DateTime<Utc> {
.unwrap_or_else(|| now - chrono::Duration::seconds(POLL_INTERVAL_SECS as i64))
}

/// All trigger times in `(window_start, now]`.
fn due_times(
trigger: &RoutineTrigger,
window_start: &DateTime<Utc>,
now: &DateTime<Utc>,
) -> Result<Vec<DateTime<Utc>>, String> {
match trigger {
RoutineTrigger::OneTime { at } => {
let at_time = parse_trigger_time(at)?;
if at_time > *window_start && at_time <= *now {
Ok(vec![at_time])
} else if at_time <= *window_start {
// Missed while the app was closed — still due exactly once;
// catch-up policy decides whether it actually runs.
Ok(vec![at_time])
} else {
Ok(Vec::new())
}
}
RoutineTrigger::Cron { cron } => {
let parsed = croner::Cron::new(cron)
.parse()
.map_err(|err| format!("invalid cron expression '{cron}': {err}"))?;
let mut due = Vec::new();
let mut cursor = *window_start;
// Bounded to avoid unbounded loops on pathological expressions
// after long downtime.
const MAX_DUE: usize = 1000;
while due.len() < MAX_DUE {
match parsed.find_next_occurrence(&cursor, false) {
Ok(next) if next <= *now => {
due.push(next);
cursor = next;
}
_ => break,
}
}
Ok(due)
}
}
}

/// Reduce the due list according to the catch-up policy. The latest due time
/// always fires; earlier (missed) ones are policy-dependent.
fn apply_catch_up_policy(
Expand Down Expand Up @@ -315,34 +275,6 @@ fn apply_catch_up_policy(
}
}

fn next_occurrence(
trigger: &RoutineTrigger,
now: &DateTime<Utc>,
) -> Result<Option<DateTime<Utc>>, String> {
match trigger {
RoutineTrigger::OneTime { at } => {
let at_time = parse_trigger_time(at)?;
Ok((at_time > *now).then_some(at_time))
}
RoutineTrigger::Cron { cron } => {
let parsed = croner::Cron::new(cron)
.parse()
.map_err(|err| format!("invalid cron expression '{cron}': {err}"))?;
Ok(parsed.find_next_occurrence(now, false).ok())
}
}
}

fn parse_trigger_time(raw: &str) -> Result<DateTime<Utc>, String> {
if let Ok(parsed) = DateTime::parse_from_rfc3339(raw) {
return Ok(parsed.with_timezone(&Utc));
}
if let Ok(parsed) = chrono::NaiveDateTime::parse_from_str(raw, "%Y-%m-%dT%H:%M:%S") {
return Ok(parsed.and_utc());
}
Err(format!("invalid one-time trigger timestamp: {raw}"))
}

#[cfg(test)]
mod tests {
use super::*;
Expand All @@ -360,6 +292,7 @@ mod tests {
fn cron_no_tick_in_window_returns_empty() {
let trigger = RoutineTrigger::Cron {
cron: "0 9 * * *".to_string(),
timezone: "UTC".to_string(),
};
let window_start = at(2026, 6, 10, 10, 0);
let now = at(2026, 6, 10, 10, 5);
Expand All @@ -370,6 +303,7 @@ mod tests {
fn cron_single_tick_in_window() {
let trigger = RoutineTrigger::Cron {
cron: "0 9 * * *".to_string(),
timezone: "UTC".to_string(),
};
let window_start = at(2026, 6, 10, 8, 0);
let now = at(2026, 6, 10, 10, 0);
Expand All @@ -381,6 +315,7 @@ mod tests {
fn cron_multiple_missed_ticks_accumulate() {
let trigger = RoutineTrigger::Cron {
cron: "0 9 * * *".to_string(),
timezone: "UTC".to_string(),
};
// Three days of downtime → three missed 09:00 ticks.
let window_start = at(2026, 6, 7, 12, 0);
Expand All @@ -400,6 +335,7 @@ mod tests {
fn cron_invalid_expression_is_error() {
let trigger = RoutineTrigger::Cron {
cron: "not a cron".to_string(),
timezone: "UTC".to_string(),
};
let now = Utc::now();
assert!(due_times(&trigger, &now, &now).is_err());
Expand Down Expand Up @@ -492,6 +428,7 @@ mod tests {
fn next_occurrence_cron() {
let trigger = RoutineTrigger::Cron {
cron: "0 9 * * *".to_string(),
timezone: "UTC".to_string(),
};
let now = at(2026, 6, 10, 10, 0);
let next = next_occurrence(&trigger, &now).unwrap().unwrap();
Expand Down Expand Up @@ -529,6 +466,7 @@ mod tests {
enabled: true,
trigger: RoutineTrigger::Cron {
cron: "* * * * *".into(),
timezone: "UTC".into(),
},
run_template: project_management::projects::types::RoutineRunTemplate {
prompt: String::new(),
Expand All @@ -548,6 +486,11 @@ mod tests {
output_policy: Default::default(),
last_evaluated_at: None,
next_fire_at: None,
last_fire_at: None,
last_fire_status: None,
last_fire_error: None,
last_fire_session_id: None,
last_fire_work_item_id: None,
created_at: String::new(),
updated_at: String::new(),
};
Expand Down
12 changes: 10 additions & 2 deletions src-tauri/crates/agent-core/src/core/coordination/work_item_scheduler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,10 @@ pub fn migrate_cron_schedules() -> Result<usize, String> {
name: format!("Recurring: {}", fm.title),
description: format!("Migrated from work item {} recurring schedule", fm.short_id),
enabled: true,
trigger: RoutineTrigger::Cron { cron },
trigger: RoutineTrigger::Cron {
cron,
timezone: "UTC".to_string(),
},
run_template: RoutineRunTemplate {
prompt: fm.title.clone(),
target: RoutineRunTarget::AgentDefinition {
Expand All @@ -321,6 +324,11 @@ pub fn migrate_cron_schedules() -> Result<usize, String> {
},
last_evaluated_at: None,
next_fire_at: None,
last_fire_at: None,
last_fire_status: None,
last_fire_error: None,
last_fire_session_id: None,
last_fire_work_item_id: None,
created_at: String::new(),
updated_at: String::new(),
};
Expand Down Expand Up @@ -511,7 +519,7 @@ mod tests {
labels: vec![],
milestone: None,
parent: None,
stage: None,
stage: None,
start_date: start_date.map(|s| s.to_string()),
target_date: None,
created_by: None,
Expand Down
2 changes: 2 additions & 0 deletions src-tauri/crates/project-management/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
serde_yaml = "0.9"
chrono = { workspace = true }
chrono-tz = "0.10.4"
croner = "2"
tokio = { workspace = true }
tokio-util = { workspace = true }
tracing = "0.1.37"
Expand Down
Loading
Loading