Merge branch 'worktree-agent-a184a6929a356b613'

# Conflicts:
#	src/engine.rs

src/api.rs

@@ -123,23 +123,36 @@ async fn ask(engine: &EngineHandle, query: EngineQuery) -> Result<EngineResponse
     response.await.map_err(|_| StatusCode::SERVICE_UNAVAILABLE)
 }
 
+/// `GET /api/logs` — also accepts a `filter` query param (ticket 007): a
+/// FilterBar query string, parsed and evaluated inside the engine. A
+/// malformed filter string comes back as `EngineResponse::Error` and is
+/// surfaced here as `400 Bad Request` with `{ "error": "..." }`, matching
+/// ticket 004's `declare_param`/`declare_metric` error-mapping pattern.
 async fn get_logs(
     State(state): State<ApiState>,
     Query(params): Query<LogsParams>,
 ) -> impl IntoResponse {
     match ask(&state.engine, EngineQuery::Logs(params)).await {
         Ok(EngineResponse::Logs(entries)) => Json(entries).into_response(),
+        Ok(EngineResponse::Error(err)) => {
+            (StatusCode::BAD_REQUEST, Json(ErrorDto { error: err })).into_response()
+        }
         Ok(_) => StatusCode::INTERNAL_SERVER_ERROR.into_response(),
         Err(status) => status.into_response(),
     }
 }
 
+/// `GET /api/timeline` — same `filter` query param and error mapping as
+/// `get_logs` above.
 async fn get_timeline(
     State(state): State<ApiState>,
     Query(params): Query<TimelineParams>,
 ) -> impl IntoResponse {
     match ask(&state.engine, EngineQuery::Timeline(params)).await {
         Ok(EngineResponse::Timeline(buckets)) => Json(buckets).into_response(),
+        Ok(EngineResponse::Error(err)) => {
+            (StatusCode::BAD_REQUEST, Json(ErrorDto { error: err })).into_response()
+        }
         Ok(_) => StatusCode::INTERNAL_SERVER_ERROR.into_response(),
         Err(status) => status.into_response(),
     }