@tduncan / Cortana / commits / 9aeb97f

Merge upstream/main and resolve Ollama server + chat screen conflicts.

Keep feature-based chat_screen.dart, drop upstream chat_screen_content.dart, and merge fetchRunningModels with onDevice guard plus explicit Ollama loadModel no-op. Co-authored-by: Cursor <cursoragent@cursor.com>

onlypuppy7 committed Jul 1, 2026 at 21:30 UTC 9aeb97f589c60eae3a43a7d02ba8d0ab8a61c964

No changes.