diff --git a/docs/administration/server-configuration.mdx b/docs/administration/server-configuration.mdx
index a88bacfe9..358cf6b86 100644
--- a/docs/administration/server-configuration.mdx
+++ b/docs/administration/server-configuration.mdx
@@ -58,6 +58,14 @@ strategy = "tailscale_funnel"
 [server.storage]
 root = "/var/lib/fabro"
 
+[server.slatedb]
+provider = "s3"
+disk_cache = true
+
+[server.slatedb.s3]
+bucket = "my-fabro-data"
+region = "us-east-1"
+
 [server.scheduler]
 max_concurrent_runs = 8
 
@@ -147,6 +155,33 @@ GitHub-specific auth policy.
 
 The GitHub OAuth client ID still lives under `[server.integrations.github].client_id`.
 
+### `[server.slatedb]` section
+
+Configure the embedded SlateDB key-value store used for run event storage.
+
+| Key | Description | Default |
+|---|---|---|
+| `provider` | Object store backend: `local` or `s3` | `"local"` |
+| `prefix` | Key prefix within the object store | `""` |
+| `flush_interval` | How often to flush the write-ahead log | `"1ms"` |
+| `disk_cache` | Enable a local disk cache for object store reads | `false` |
+
+When `disk_cache = true`, Fabro creates a cache directory at `<storage_root>/cache/slatedb` and
+configures SlateDB to cache object store bytes on local disk (16 GB max, 4 MB parts). This
+significantly reduces read latency and costs for S3-backed deployments. A warning is emitted if
+enabled with `provider = "local"` since the disk cache adds overhead when the object store is
+already local.
+
+```toml title="settings.toml"
+[server.slatedb]
+provider = "s3"
+disk_cache = true
+
+[server.slatedb.s3]
+bucket = "{{ env.SLATEDB_BUCKET }}"
+region = "us-east-1"
+```
+
 ### Run defaults
 
 The `[run.*]` sections in `settings.toml` act as defaults for every run.
diff --git a/lib/crates/fabro-cli/src/commands/store/dump.rs b/lib/crates/fabro-cli/src/commands/store/dump.rs
index 6bf71e3cc..67764a7d3 100644
--- a/lib/crates/fabro-cli/src/commands/store/dump.rs
+++ b/lib/crates/fabro-cli/src/commands/store/dump.rs
@@ -332,6 +332,7 @@ mod tests {
             Arc::clone(&object_store),
             "",
             Duration::from_millis(1),
+            None,
         ));
         let artifact_store = ArtifactStore::new(object_store, "artifacts");
         (store, artifact_store)
diff --git a/lib/crates/fabro-cli/src/commands/store/rebuild.rs b/lib/crates/fabro-cli/src/commands/store/rebuild.rs
index 43fcebcdb..91003770b 100644
--- a/lib/crates/fabro-cli/src/commands/store/rebuild.rs
+++ b/lib/crates/fabro-cli/src/commands/store/rebuild.rs
@@ -13,6 +13,7 @@ pub(crate) async fn rebuild_run_store(
         Arc::new(InMemory::new()),
         "",
         Duration::from_millis(1),
+        None,
     ));
     let run_store = store.create_run(run_id).await?;
     for event in events {
diff --git a/lib/crates/fabro-config/src/defaults.toml b/lib/crates/fabro-config/src/defaults.toml
index 6eb4c77af..c83e3a7f7 100644
--- a/lib/crates/fabro-config/src/defaults.toml
+++ b/lib/crates/fabro-config/src/defaults.toml
@@ -52,6 +52,7 @@ prefix = ""
 provider = "local"
 prefix = ""
 flush_interval = "1ms"
+disk_cache = false
 
 [features]
 session_sandboxes = false
diff --git a/lib/crates/fabro-config/src/merge.rs b/lib/crates/fabro-config/src/merge.rs
index c5411aaa1..a72aa2f60 100644
--- a/lib/crates/fabro-config/src/merge.rs
+++ b/lib/crates/fabro-config/src/merge.rs
@@ -467,6 +467,7 @@ fn combine_server_slatedb(
         flush_interval: higher.flush_interval.or(lower.flush_interval),
         local:          higher.local.or(lower.local),
         s3:             higher.s3.or(lower.s3),
+        disk_cache:     higher.disk_cache.or(lower.disk_cache),
     }
 }
 
diff --git a/lib/crates/fabro-config/src/resolve/server.rs b/lib/crates/fabro-config/src/resolve/server.rs
index f50cd658c..6d0be64dd 100644
--- a/lib/crates/fabro-config/src/resolve/server.rs
+++ b/lib/crates/fabro-config/src/resolve/server.rs
@@ -182,11 +182,23 @@ fn resolve_slatedb(
         .and_then(|slatedb| slatedb.provider)
         .expect("defaults.toml should provide server.slatedb.provider");
 
+    let disk_cache = layer
+        .and_then(|slatedb| slatedb.disk_cache)
+        .expect("defaults.toml should provide server.slatedb.disk_cache");
+
+    if disk_cache && provider == ObjectStoreProvider::Local {
+        tracing::warn!(
+            "disk_cache enabled with local provider; \
+             disk cache is designed for S3-backed deployments \
+             and adds overhead on local filesystems"
+        );
+    }
+
     ServerSlateDbSettings {
-        prefix:         layer
+        prefix: layer
             .and_then(|slatedb| slatedb.prefix.clone())
             .expect("defaults.toml should provide server.slatedb.prefix"),
-        store:          resolve_object_store(
+        store: resolve_object_store(
             provider,
             layer.and_then(|slatedb| slatedb.local.as_ref()),
             layer.and_then(|slatedb| slatedb.s3.as_ref()),
@@ -198,6 +210,7 @@ fn resolve_slatedb(
             .and_then(|slatedb| slatedb.flush_interval)
             .map(|duration| duration.as_std())
             .expect("defaults.toml should provide server.slatedb.flush_interval"),
+        disk_cache,
     }
 }
 
diff --git a/lib/crates/fabro-config/tests/resolve_server.rs b/lib/crates/fabro-config/tests/resolve_server.rs
index 45d96a7f1..0c53c062e 100644
--- a/lib/crates/fabro-config/tests/resolve_server.rs
+++ b/lib/crates/fabro-config/tests/resolve_server.rs
@@ -60,6 +60,8 @@ fn resolves_server_defaults_from_empty_settings() {
         }
         ObjectStoreSettings::S3 { .. } => panic!("expected local slatedb store by default"),
     }
+
+    assert!(!settings.slatedb.disk_cache);
 }
 
 #[test]
@@ -195,3 +197,19 @@ enabled = true
         GithubIntegrationStrategy::Token
     );
 }
+
+#[test]
+fn resolves_disk_cache_true_from_settings() {
+    let file = parse(
+        r"
+_version = 1
+
+[server.slatedb]
+disk_cache = true
+",
+    );
+
+    let settings = fabro_config::resolve_server_from_file(&file).expect("settings should resolve");
+
+    assert!(settings.slatedb.disk_cache);
+}
diff --git a/lib/crates/fabro-server/src/serve.rs b/lib/crates/fabro-server/src/serve.rs
index ffb90d604..45c3a1ec4 100644
--- a/lib/crates/fabro-server/src/serve.rs
+++ b/lib/crates/fabro-server/src/serve.rs
@@ -263,10 +263,15 @@ pub fn build_artifact_object_store(
 
 fn build_slatedb_store(
     settings: &ResolvedServerSettings,
-) -> anyhow::Result<(Arc<dyn ObjectStore>, String, Duration)> {
+) -> anyhow::Result<(Arc<dyn ObjectStore>, String, Duration, bool)> {
     let prefix = resolve_interp(&settings.slatedb.prefix)?;
     let object_store = build_object_store_from_settings(&settings.slatedb.store)?;
-    Ok((object_store, prefix, settings.slatedb.flush_interval))
+    Ok((
+        object_store,
+        prefix,
+        settings.slatedb.flush_interval,
+        settings.slatedb.disk_cache,
+    ))
 }
 
 /// Start the HTTP API server.
@@ -315,12 +320,18 @@ where
     };
     let web_enabled = router_web_enabled(&resolved_server_settings);
 
-    let (object_store, slatedb_prefix, flush_interval) =
+    let (object_store, slatedb_prefix, flush_interval, disk_cache) =
         build_slatedb_store(&resolved_server_settings)?;
+    let cache_path = if disk_cache {
+        Some(data_dir.join("cache").join("slatedb"))
+    } else {
+        None
+    };
     let store = Arc::new(fabro_store::Database::new(
         object_store,
         slatedb_prefix,
         flush_interval,
+        cache_path,
     ));
     let (artifact_object_store, artifact_prefix) =
         build_artifact_object_store(&resolved_server_settings)?;
@@ -892,12 +903,31 @@ root = "{}"
         ));
 
         let resolved = resolve_server_settings(&settings).expect("settings should resolve");
-        let (_object_store, prefix, flush_interval) =
+        let (_object_store, prefix, flush_interval, disk_cache) =
             build_slatedb_store(&resolved).expect("slatedb store should build");
 
         assert!(root.exists(), "configured SlateDB root should be created");
         assert_eq!(prefix, "");
         assert_eq!(flush_interval, Duration::from_millis(1));
+        assert!(!disk_cache);
+    }
+
+    #[test]
+    fn build_slatedb_store_returns_disk_cache_when_enabled() {
+        let settings = parse_settings(
+            r"
+_version = 1
+
+[server.slatedb]
+disk_cache = true
+",
+        );
+
+        let resolved = resolve_server_settings(&settings).expect("settings should resolve");
+        let (_object_store, _prefix, _flush_interval, disk_cache) =
+            build_slatedb_store(&resolved).expect("slatedb store should build");
+
+        assert!(disk_cache);
     }
 
     #[tokio::test]
diff --git a/lib/crates/fabro-server/src/server.rs b/lib/crates/fabro-server/src/server.rs
index 324ecd68f..907c1010d 100644
--- a/lib/crates/fabro-server/src/server.rs
+++ b/lib/crates/fabro-server/src/server.rs
@@ -2263,6 +2263,7 @@ fn test_store_bundle() -> (Arc<Database>, ArtifactStore) {
         Arc::clone(&object_store),
         "",
         Duration::from_millis(1),
+        None,
     ));
     let artifact_store = ArtifactStore::new(object_store, "artifacts");
     (store, artifact_store)
diff --git a/lib/crates/fabro-store/src/slate/mod.rs b/lib/crates/fabro-store/src/slate/mod.rs
index 20274fcbc..d6801631e 100644
--- a/lib/crates/fabro-store/src/slate/mod.rs
+++ b/lib/crates/fabro-store/src/slate/mod.rs
@@ -2,6 +2,7 @@ mod catalog;
 mod run_store;
 
 use std::collections::HashMap;
+use std::path::PathBuf;
 use std::sync::Arc;
 use std::time::Duration;
 
@@ -19,6 +20,7 @@ pub struct Database {
     object_store:   Arc<dyn ObjectStore>,
     base_prefix:    String,
     flush_interval: Duration,
+    cache_path:     Option<PathBuf>,
     db:             Arc<OnceCell<slatedb::Db>>,
     active_runs:    Arc<Mutex<HashMap<RunId, Arc<RunDatabaseInner>>>>,
 }
@@ -28,6 +30,7 @@ impl std::fmt::Debug for Database {
         f.debug_struct("Database")
             .field("base_prefix", &self.base_prefix)
             .field("flush_interval", &self.flush_interval)
+            .field("cache_path", &self.cache_path)
             .finish_non_exhaustive()
     }
 }
@@ -37,11 +40,13 @@ impl Database {
         object_store: Arc<dyn ObjectStore>,
         base_prefix: impl Into<String>,
         flush_interval: Duration,
+        cache_path: Option<PathBuf>,
     ) -> Self {
         Self {
             object_store,
             base_prefix: normalize_base_prefix(base_prefix.into()),
             flush_interval,
+            cache_path,
             db: Arc::new(OnceCell::new()),
             active_runs: Arc::new(Mutex::new(HashMap::new())),
         }
@@ -55,12 +60,16 @@ impl Database {
         let db = self
             .db
             .get_or_try_init(|| async {
+                let mut settings = Settings {
+                    flush_interval: Some(self.flush_interval),
+                    compression_codec: Some(CompressionCodec::Zstd),
+                    ..Settings::default()
+                };
+                if let Some(ref cache_path) = self.cache_path {
+                    settings.object_store_cache_options.root_folder = Some(cache_path.clone());
+                }
                 slatedb::Db::builder(self.shared_db_prefix(), self.object_store.clone())
-                    .with_settings(Settings {
-                        flush_interval: Some(self.flush_interval),
-                        compression_codec: Some(CompressionCodec::Zstd),
-                        ..Settings::default()
-                    })
+                    .with_settings(settings)
                     .build()
                     .await
             })
@@ -267,7 +276,12 @@ mod tests {
 
     fn make_store() -> (Arc<dyn ObjectStore>, Database) {
         let object_store: Arc<dyn ObjectStore> = Arc::new(InMemory::new());
-        let store = Database::new(object_store.clone(), "runs/", Duration::from_millis(1));
+        let store = Database::new(
+            object_store.clone(),
+            "runs/",
+            Duration::from_millis(1),
+            None,
+        );
         (object_store, store)
     }
 
@@ -563,7 +577,7 @@ mod tests {
         let run = store.create_run(&test_run_id("run-1")).await.unwrap();
         append_completed(&run, "run-1", dt("2026-03-27T12:00:00Z")).await;
 
-        let reopened = Database::new(object_store, "runs", Duration::from_millis(1));
+        let reopened = Database::new(object_store, "runs", Duration::from_millis(1), None);
         let summary = reopened.list_runs(&ListRunsQuery::default()).await.unwrap();
         assert_eq!(summary.len(), 1);
         assert_eq!(summary[0].run_id, test_run_id("run-1"));
diff --git a/lib/crates/fabro-store/src/slate/run_store.rs b/lib/crates/fabro-store/src/slate/run_store.rs
index d4df50d88..388e5a188 100644
--- a/lib/crates/fabro-store/src/slate/run_store.rs
+++ b/lib/crates/fabro-store/src/slate/run_store.rs
@@ -395,7 +395,7 @@ mod tests {
     #[tokio::test]
     async fn list_blobs_reads_global_cas_namespace() {
         let object_store = Arc::new(InMemory::new());
-        let store = Database::new(object_store, "", Duration::from_millis(1));
+        let store = Database::new(object_store, "", Duration::from_millis(1), None);
         let run_id = "01JT56VE4Z5NZ814GZN2JZD65A".parse().unwrap();
         let run = store.create_run(&run_id).await.unwrap();
         let first_blob = br#"{"a":1}"#;
diff --git a/lib/crates/fabro-types/src/settings/resolved.rs b/lib/crates/fabro-types/src/settings/resolved.rs
index bdcd99ed0..79a4825ff 100644
--- a/lib/crates/fabro-types/src/settings/resolved.rs
+++ b/lib/crates/fabro-types/src/settings/resolved.rs
@@ -143,6 +143,7 @@ mod tests {
                         root: InterpString::parse("/srv/slatedb"),
                     },
                     flush_interval: StdDuration::from_secs(30),
+                    disk_cache:     false,
                 },
                 ..ServerSettings::default()
             },
diff --git a/lib/crates/fabro-types/src/settings/server.rs b/lib/crates/fabro-types/src/settings/server.rs
index 683a04d06..42c80ae6e 100644
--- a/lib/crates/fabro-types/src/settings/server.rs
+++ b/lib/crates/fabro-types/src/settings/server.rs
@@ -146,6 +146,7 @@ pub struct ServerSlateDbSettings {
     pub store:          ObjectStoreSettings,
     #[serde(serialize_with = "serialize_std_duration")]
     pub flush_interval: StdDuration,
+    pub disk_cache:     bool,
 }
 
 impl Default for ServerSlateDbSettings {
@@ -154,6 +155,7 @@ impl Default for ServerSlateDbSettings {
             prefix:         InterpString::parse(""),
             store:          ObjectStoreSettings::default(),
             flush_interval: StdDuration::ZERO,
+            disk_cache:     false,
         }
     }
 }
@@ -373,6 +375,8 @@ pub struct ServerSlateDbLayer {
     pub local:          Option<ObjectStoreLocalLayer>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub s3:             Option<ObjectStoreS3Layer>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub disk_cache:     Option<bool>,
 }
 
 /// Closed enum of object-store providers. Unknown providers hard-fail
diff --git a/lib/crates/fabro-workflow/src/artifact.rs b/lib/crates/fabro-workflow/src/artifact.rs
index 6e7f851f1..3347c717e 100644
--- a/lib/crates/fabro-workflow/src/artifact.rs
+++ b/lib/crates/fabro-workflow/src/artifact.rs
@@ -372,7 +372,7 @@ mod tests {
 
     async fn make_run_store(label: &str) -> fabro_store::RunDatabase {
         let object_store = Arc::new(InMemory::new());
-        let store = Database::new(object_store, "runs/", Duration::from_millis(1));
+        let store = Database::new(object_store, "runs/", Duration::from_millis(1), None);
         store.create_run(&test_run_id(label)).await.unwrap()
     }
 
diff --git a/lib/crates/fabro-workflow/src/event.rs b/lib/crates/fabro-workflow/src/event.rs
index a46a09274..606211607 100644
--- a/lib/crates/fabro-workflow/src/event.rs
+++ b/lib/crates/fabro-workflow/src/event.rs
@@ -3077,6 +3077,7 @@ mod tests {
             std::sync::Arc::new(object_store::memory::InMemory::new()),
             "",
             std::time::Duration::from_millis(1),
+            None,
         );
         let run_store = store.create_run(&fixtures::RUN_7).await.unwrap();
         let stored = to_run_event(&fixtures::RUN_7, &Event::RunNotice {
diff --git a/lib/crates/fabro-workflow/src/git.rs b/lib/crates/fabro-workflow/src/git.rs
index 3d5d4ec48..60d4dc710 100644
--- a/lib/crates/fabro-workflow/src/git.rs
+++ b/lib/crates/fabro-workflow/src/git.rs
@@ -358,6 +358,7 @@ mod tests {
             Arc::new(InMemory::new()),
             "",
             Duration::from_millis(1),
+            None,
         ))
     }
 
diff --git a/lib/crates/fabro-workflow/src/handler/agent.rs b/lib/crates/fabro-workflow/src/handler/agent.rs
index 33fda1aef..75e5161bb 100644
--- a/lib/crates/fabro-workflow/src/handler/agent.rs
+++ b/lib/crates/fabro-workflow/src/handler/agent.rs
@@ -418,6 +418,7 @@ mod tests {
             Arc::new(InMemory::new()),
             "",
             Duration::from_millis(1),
+            None,
         ))
     }
 
diff --git a/lib/crates/fabro-workflow/src/handler/command.rs b/lib/crates/fabro-workflow/src/handler/command.rs
index 1b2175c34..c88e43b68 100644
--- a/lib/crates/fabro-workflow/src/handler/command.rs
+++ b/lib/crates/fabro-workflow/src/handler/command.rs
@@ -197,6 +197,7 @@ mod tests {
             Arc::new(InMemory::new()),
             "",
             Duration::from_millis(1),
+            None,
         ))
     }
 
diff --git a/lib/crates/fabro-workflow/src/handler/manager_loop.rs b/lib/crates/fabro-workflow/src/handler/manager_loop.rs
index adabfa9ae..87150a7f6 100644
--- a/lib/crates/fabro-workflow/src/handler/manager_loop.rs
+++ b/lib/crates/fabro-workflow/src/handler/manager_loop.rs
@@ -239,6 +239,7 @@ impl Handler for SubWorkflowHandler {
             object_store.clone(),
             "",
             Duration::from_millis(1),
+            None,
         ));
         let run_store = store
             .create_run(&child_run_options.run_id)
diff --git a/lib/crates/fabro-workflow/src/handler/mod.rs b/lib/crates/fabro-workflow/src/handler/mod.rs
index 2c4811ac9..8fff695a5 100644
--- a/lib/crates/fabro-workflow/src/handler/mod.rs
+++ b/lib/crates/fabro-workflow/src/handler/mod.rs
@@ -102,6 +102,7 @@ impl EngineServices {
             Arc::new(InMemory::new()),
             "",
             Duration::from_millis(1),
+            None,
         ));
         Self {
             registry:         Arc::new(HandlerRegistry::new(Box::new(start::StartHandler))),
diff --git a/lib/crates/fabro-workflow/src/handler/parallel.rs b/lib/crates/fabro-workflow/src/handler/parallel.rs
index ea29b250e..831ccf3af 100644
--- a/lib/crates/fabro-workflow/src/handler/parallel.rs
+++ b/lib/crates/fabro-workflow/src/handler/parallel.rs
@@ -654,6 +654,7 @@ mod tests {
             Arc::new(InMemory::new()),
             "",
             Duration::from_millis(1),
+            None,
         ))
     }
 
diff --git a/lib/crates/fabro-workflow/src/handler/prompt.rs b/lib/crates/fabro-workflow/src/handler/prompt.rs
index 9e165ef6b..d5f47b206 100644
--- a/lib/crates/fabro-workflow/src/handler/prompt.rs
+++ b/lib/crates/fabro-workflow/src/handler/prompt.rs
@@ -197,6 +197,7 @@ mod tests {
             Arc::new(InMemory::new()),
             "",
             Duration::from_millis(1),
+            None,
         ))
     }
 
diff --git a/lib/crates/fabro-workflow/src/operations/create.rs b/lib/crates/fabro-workflow/src/operations/create.rs
index 94870fe84..04fc9d96c 100644
--- a/lib/crates/fabro-workflow/src/operations/create.rs
+++ b/lib/crates/fabro-workflow/src/operations/create.rs
@@ -438,6 +438,7 @@ mod tests {
             Arc::new(InMemory::new()),
             "",
             Duration::from_millis(1),
+            None,
         ))
     }
 
@@ -965,7 +966,12 @@ mod tests {
         std::fs::create_dir_all(storage_dir.join("store")).unwrap();
         let object_store =
             Arc::new(LocalFileSystem::new_with_prefix(storage_dir.join("store")).unwrap());
-        let store = Arc::new(Database::new(object_store, "", Duration::from_millis(1)));
+        let store = Arc::new(Database::new(
+            object_store,
+            "",
+            Duration::from_millis(1),
+            None,
+        ));
         let created = create(store.as_ref(), CreateRunInput {
             workflow: WorkflowInput::DotSource {
                 source:   MINIMAL_DOT.to_string(),
@@ -1001,7 +1007,12 @@ mod tests {
         std::fs::create_dir_all(storage_dir.join("store")).unwrap();
         let object_store =
             Arc::new(LocalFileSystem::new_with_prefix(storage_dir.join("store")).unwrap());
-        let store = Arc::new(Database::new(object_store, "", Duration::from_millis(1)));
+        let store = Arc::new(Database::new(
+            object_store,
+            "",
+            Duration::from_millis(1),
+            None,
+        ));
         let created = create(store.as_ref(), CreateRunInput {
             workflow: WorkflowInput::DotSource {
                 source:   MINIMAL_DOT.to_string(),
diff --git a/lib/crates/fabro-workflow/src/operations/rebuild_meta.rs b/lib/crates/fabro-workflow/src/operations/rebuild_meta.rs
index d6c6c9ba2..923d5cd60 100644
--- a/lib/crates/fabro-workflow/src/operations/rebuild_meta.rs
+++ b/lib/crates/fabro-workflow/src/operations/rebuild_meta.rs
@@ -366,6 +366,7 @@ mod tests {
             Arc::new(InMemory::new()),
             "",
             Duration::from_millis(1),
+            None,
         ))
     }
 
diff --git a/lib/crates/fabro-workflow/src/operations/start.rs b/lib/crates/fabro-workflow/src/operations/start.rs
index 7965cd1a2..14abbf538 100644
--- a/lib/crates/fabro-workflow/src/operations/start.rs
+++ b/lib/crates/fabro-workflow/src/operations/start.rs
@@ -991,6 +991,7 @@ mod tests {
             Arc::new(InMemory::new()),
             "",
             Duration::from_millis(1),
+            None,
         ))
     }
 
diff --git a/lib/crates/fabro-workflow/src/pipeline/execute/tests.rs b/lib/crates/fabro-workflow/src/pipeline/execute/tests.rs
index 5712a1356..3320d8bc2 100644
--- a/lib/crates/fabro-workflow/src/pipeline/execute/tests.rs
+++ b/lib/crates/fabro-workflow/src/pipeline/execute/tests.rs
@@ -166,6 +166,7 @@ async fn test_run_store(run_id: &RunId) -> fabro_store::RunDatabase {
         Arc::new(InMemory::new()),
         "",
         Duration::from_millis(1),
+        None,
     ));
     store.create_run(run_id).await.unwrap()
 }
diff --git a/lib/crates/fabro-workflow/src/pipeline/finalize.rs b/lib/crates/fabro-workflow/src/pipeline/finalize.rs
index 0c1a7dde9..bd9ed3d34 100644
--- a/lib/crates/fabro-workflow/src/pipeline/finalize.rs
+++ b/lib/crates/fabro-workflow/src/pipeline/finalize.rs
@@ -338,6 +338,7 @@ mod tests {
             Arc::new(InMemory::new()),
             "",
             Duration::from_millis(1),
+            None,
         ))
     }
 
diff --git a/lib/crates/fabro-workflow/src/pipeline/initialize.rs b/lib/crates/fabro-workflow/src/pipeline/initialize.rs
index 255bd4bc4..dd4c13cca 100644
--- a/lib/crates/fabro-workflow/src/pipeline/initialize.rs
+++ b/lib/crates/fabro-workflow/src/pipeline/initialize.rs
@@ -782,6 +782,7 @@ mod tests {
             Arc::new(InMemory::new()),
             "",
             Duration::from_millis(1),
+            None,
         ))
     }
 
diff --git a/lib/crates/fabro-workflow/src/pipeline/persist.rs b/lib/crates/fabro-workflow/src/pipeline/persist.rs
index 4a0cc1b27..523abf0b0 100644
--- a/lib/crates/fabro-workflow/src/pipeline/persist.rs
+++ b/lib/crates/fabro-workflow/src/pipeline/persist.rs
@@ -71,6 +71,7 @@ mod tests {
             Arc::new(InMemory::new()),
             "",
             Duration::from_millis(1),
+            None,
         ))
     }
 
diff --git a/lib/crates/fabro-workflow/src/pipeline/pull_request.rs b/lib/crates/fabro-workflow/src/pipeline/pull_request.rs
index 4d46972c9..a44cf7b15 100644
--- a/lib/crates/fabro-workflow/src/pipeline/pull_request.rs
+++ b/lib/crates/fabro-workflow/src/pipeline/pull_request.rs
@@ -675,6 +675,7 @@ mod tests {
             Arc::new(InMemory::new()),
             "",
             Duration::from_millis(1),
+            None,
         ))
     }
 
diff --git a/lib/crates/fabro-workflow/src/pipeline/retro.rs b/lib/crates/fabro-workflow/src/pipeline/retro.rs
index 402c295c4..c61afe749 100644
--- a/lib/crates/fabro-workflow/src/pipeline/retro.rs
+++ b/lib/crates/fabro-workflow/src/pipeline/retro.rs
@@ -222,6 +222,7 @@ mod tests {
             Arc::new(InMemory::new()),
             "",
             Duration::from_millis(1),
+            None,
         ))
     }
 
diff --git a/lib/crates/fabro-workflow/src/run_lookup.rs b/lib/crates/fabro-workflow/src/run_lookup.rs
index 6a6c0c060..24036067a 100644
--- a/lib/crates/fabro-workflow/src/run_lookup.rs
+++ b/lib/crates/fabro-workflow/src/run_lookup.rs
@@ -405,6 +405,7 @@ mod tests {
             Arc::new(InMemory::new()),
             "",
             Duration::from_millis(1),
+            None,
         ))
     }
 
diff --git a/lib/crates/fabro-workflow/src/runtime_store.rs b/lib/crates/fabro-workflow/src/runtime_store.rs
index df8ba9c05..d2523be14 100644
--- a/lib/crates/fabro-workflow/src/runtime_store.rs
+++ b/lib/crates/fabro-workflow/src/runtime_store.rs
@@ -125,6 +125,7 @@ mod tests {
             Arc::new(InMemory::new()),
             "",
             Duration::from_millis(1),
+            None,
         ));
         store.create_run(&fixtures::RUN_1).await.unwrap()
     }
diff --git a/lib/crates/fabro-workflow/src/test_support.rs b/lib/crates/fabro-workflow/src/test_support.rs
index c65e42082..d2d51b0a0 100644
--- a/lib/crates/fabro-workflow/src/test_support.rs
+++ b/lib/crates/fabro-workflow/src/test_support.rs
@@ -65,6 +65,7 @@ async fn initialized(
         ),
         "",
         Duration::from_millis(1),
+        None,
     ));
     let inner_store = store
         .create_run(&run_options.run_id)
diff --git a/lib/crates/fabro-workflow/tests/it/daytona_integration.rs b/lib/crates/fabro-workflow/tests/it/daytona_integration.rs
index 7f3ee4a19..e8215dbc8 100644
--- a/lib/crates/fabro-workflow/tests/it/daytona_integration.rs
+++ b/lib/crates/fabro-workflow/tests/it/daytona_integration.rs
@@ -71,6 +71,7 @@ fn load_run_checkpoint(run_dir: &Path) -> Result<Checkpoint, Box<dyn std::error:
         object_store,
         "",
         std::time::Duration::from_millis(1),
+        None,
     ));
     let state = if tokio::runtime::Handle::try_current().is_ok() {
         std::thread::spawn(
diff --git a/lib/crates/fabro-workflow/tests/it/integration.rs b/lib/crates/fabro-workflow/tests/it/integration.rs
index 618684676..5a30a0a4c 100644
--- a/lib/crates/fabro-workflow/tests/it/integration.rs
+++ b/lib/crates/fabro-workflow/tests/it/integration.rs
@@ -102,7 +102,12 @@ fn load_run_checkpoint(run_dir: &Path) -> Result<Checkpoint, Box<dyn std::error:
         test_store_dir(&run_dir)
     };
     let object_store = Arc::new(LocalFileSystem::new_with_prefix(store_dir)?);
-    let store = Arc::new(Database::new(object_store, "", Duration::from_millis(1)));
+    let store = Arc::new(Database::new(
+        object_store,
+        "",
+        Duration::from_millis(1),
+        None,
+    ));
     let state = if tokio::runtime::Handle::try_current().is_ok() {
         std::thread::spawn(
             move || -> Result<_, Box<dyn std::error::Error + Send + Sync>> {