Scheduler cleanup (#5571)

Co-authored-by: Douwe Osinga <douwe@squareup.com>

crates/goose-cli/src/commands/schedule.rs

@@ -1,21 +1,10 @@
 use anyhow::{bail, Context, Result};
-use base64::engine::{general_purpose::STANDARD as BASE64_STANDARD, Engine};
 use goose::scheduler::{
-    get_default_scheduled_recipes_dir, get_default_scheduler_storage_path, ScheduledJob,
+    get_default_scheduled_recipes_dir, get_default_scheduler_storage_path, ScheduledJob, Scheduler,
     SchedulerError,
 };
-use goose::scheduler_factory::SchedulerFactory;
 use std::path::Path;
 
-// Base64 decoding function - might be needed if recipe_source_arg can be base64
-// For now, handle_schedule_add will assume it's a path.
-async fn _decode_base64_recipe(source: &str) -> Result<String> {
-    let bytes = BASE64_STANDARD
-        .decode(source.as_bytes())
-        .with_context(|| "Recipe source is not a valid path and not valid Base64.")?;
-    String::from_utf8(bytes).with_context(|| "Decoded Base64 recipe source is not valid UTF-8.")
-}
-
 fn validate_cron_expression(cron: &str) -> Result<()> {
     // Basic validation and helpful suggestions
     if cron.trim().is_empty() {
@@ -84,7 +73,6 @@ pub async fn handle_schedule_add(
         schedule_id, cron, recipe_source_arg
     );
 
-    // Validate cron expression and provide helpful feedback
     validate_cron_expression(&cron)?;
 
     // The Scheduler's add_scheduled_job will handle copying the recipe from recipe_source_arg
@@ -102,7 +90,7 @@ pub async fn handle_schedule_add(
 
     let scheduler_storage_path =
         get_default_scheduler_storage_path().context("Failed to get scheduler storage path")?;
-    let scheduler = SchedulerFactory::create(scheduler_storage_path)
+    let scheduler = Scheduler::new(scheduler_storage_path)
         .await
         .context("Failed to initialize scheduler")?;
 
@@ -148,11 +136,11 @@ pub async fn handle_schedule_add(
 pub async fn handle_schedule_list() -> Result<()> {
     let scheduler_storage_path =
         get_default_scheduler_storage_path().context("Failed to get scheduler storage path")?;
-    let scheduler = SchedulerFactory::create(scheduler_storage_path)
+    let scheduler = Scheduler::new(scheduler_storage_path)
         .await
         .context("Failed to initialize scheduler")?;
 
-    let jobs = scheduler.list_scheduled_jobs().await?;
+    let jobs = scheduler.list_scheduled_jobs().await;
     if jobs.is_empty() {
         println!("No scheduled jobs found.");
     } else {
@@ -183,7 +171,7 @@ pub async fn handle_schedule_list() -> Result<()> {
 pub async fn handle_schedule_remove(schedule_id: String) -> Result<()> {
     let scheduler_storage_path =
         get_default_scheduler_storage_path().context("Failed to get scheduler storage path")?;
-    let scheduler = SchedulerFactory::create(scheduler_storage_path)
+    let scheduler = Scheduler::new(scheduler_storage_path)
         .await
         .context("Failed to initialize scheduler")?;
 
@@ -210,7 +198,7 @@ pub async fn handle_schedule_remove(schedule_id: String) -> Result<()> {
 pub async fn handle_schedule_sessions(schedule_id: String, limit: Option<usize>) -> Result<()> {
     let scheduler_storage_path =
         get_default_scheduler_storage_path().context("Failed to get scheduler storage path")?;
-    let scheduler = SchedulerFactory::create(scheduler_storage_path)
+    let scheduler = Scheduler::new(scheduler_storage_path)
         .await
         .context("Failed to initialize scheduler")?;
 
@@ -246,7 +234,7 @@ pub async fn handle_schedule_sessions(schedule_id: String, limit: Option<usize>)
 pub async fn handle_schedule_run_now(schedule_id: String) -> Result<()> {
     let scheduler_storage_path =
         get_default_scheduler_storage_path().context("Failed to get scheduler storage path")?;
-    let scheduler = SchedulerFactory::create(scheduler_storage_path)
+    let scheduler = Scheduler::new(scheduler_storage_path)
         .await
         .context("Failed to initialize scheduler")?;