I voted carrots. Primarily because I think what you are witnessing is the evolution of a musical term.
By strict definition, "diatonic" is as you describe above. With that said, a much looser definition has taken hold in the vernacular among musicians. For instance, the following is taken from the Wiki page for "Diatonic and chromatic." -
Diatonic and chromatic - Wikipedia
"These terms may mean different things in different contexts. Very often,
diatonic refers to musical elements derived from the modes and transpositions of the "white note scale" C–D–E–F–G–A–B. In some usages it includes all forms of heptonic scale that are in common use in Western music (the major, and all forms of the minor)."
And also, under the heading
Modern Meanings (same Wiki page) . . .
"Exclusive" usage. Some writers consistently classify the other variants of the minor scale – the melodic minor (ascending form) and the harmonic minor – as
non-diatonic, since they are not transpositions of the white-note pitches of the piano. Among such theorists there is no agreed general term that encompasses the major and all forms of the minor scale.
"Inclusive" usage. Some writers consistently include the melodic and harmonic minor scales as diatonic also. For this group, every scale standardly used in common practice music and much similar later music is either
diatonic (the major, and
all forms of the minor) or
chromatic.
"Mixed" usage. Still other writers mix these two meanings of
diatonic (and conversely for
chromatic), and this can lead to confusions and misconceptions. Sometimes context makes the intended meaning clear.
My textbook used the following when addressing minor tonality (read the 2 paragraphs under the Minor Scale section)
And the textbook is . . .
I don't know what, or if, there is a solution other than the speaker and listener have to be on the same page, so to speak. The speaker should specify how they are using the term, and if they don't, then the listener should ask.