Skip to content

YC (S26) | Open Computer History | Continuously record your company computer work, map your workflows, help you find work worth automating, and power your agents' context

fix(pi): fall back when hosted catalog has no selectable models (#5711)

Louis Beaumont55a1c1f4fc00
diff --git a/crates/screenpipe-core/src/agents/pi.rs b/crates/screenpipe-core/src/agents/pi.rs
index 75d8e5ed9..322203722 100644
--- a/crates/screenpipe-core/src/agents/pi.rs
+++ b/crates/screenpipe-core/src/agents/pi.rs
@@ -241,7 +241,10 @@ async fn fetch_models_from_gateway(
let body: serde_json::Value = resp.json().await.ok()?;
let data = body.get("data")?.as_array()?;
- let models = gateway_models_to_pi_models(data);
+ let Some(models) = selectable_gateway_models(data) else {
+ warn!("gateway /v1/models returned no selectable models");
+ return None;
+ };
info!("fetched {} models from gateway", models.len());
Some(json!(models))
@@ -284,6 +287,14 @@ fn gateway_models_to_pi_models(data: &[serde_json::Value]) -> Vec<serde_json::Va
.collect()
}
+/// An HTTP-successful catalog can still be unusable after locked entries are
+/// removed. Treat that like an unavailable catalog so callers use the safe
+/// `auto` fallback instead of writing an empty Pi provider.
+fn selectable_gateway_models(data: &[serde_json::Value]) -> Option<Vec<serde_json::Value>> {
+ let models = gateway_models_to_pi_models(data);
+ (!models.is_empty()).then_some(models)
+}
+
/// Minimal fallback when the gateway is unreachable.
/// Only auto — if the gateway is down, nothing works anyway.
fn fallback_cloud_models() -> serde_json::Value {
@@ -4100,6 +4111,37 @@ mod tests {
fallback.pointer("/0/compat/sendSessionAffinityHeaders"),
Some(&json!(true))
);
+
+ assert!(selectable_gateway_models(&[json!({
+ "id": "gpt-5.6-terra",
+ "locked": true,
+ })])
+ .is_none());
+ }
+
+ #[tokio::test]
+ async fn all_locked_gateway_catalog_uses_auto_fallback() {
+ use wiremock::{
+ matchers::{method, path},
+ Mock, MockServer, ResponseTemplate,
+ };
+
+ let server = MockServer::start().await;
+ Mock::given(method("GET"))
+ .and(path("/models"))
+ .respond_with(ResponseTemplate::new(200).set_body_json(json!({
+ "data": [{
+ "id": "gpt-5.6-terra",
+ "name": "GPT-5.6 Terra",
+ "locked": true,
+ }]
+ })))
+ .mount(&server)
+ .await;
+
+ let models = screenpipe_cloud_models(&server.uri(), None).await;
+ assert_eq!(models.as_array().map(Vec::len), Some(1));
+ assert_eq!(models.pointer("/0/id"), Some(&json!("auto")));
}
#[test]