Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	.github/workflows/ui-publish.yml
#	CODEOWNERS
#	docs/ops.md
#	ggml/CMakeLists.txt
#	ggml/src/CMakeLists.txt
#	ggml/src/ggml-hexagon/htp/CMakeLists.txt
#	ggml/src/ggml-hexagon/htp/argsort-ops.c
#	scripts/sync-ggml.last
#	tools/mtmd/tests/test-deepseek-ocr.py
This commit is contained in:
Concedo
2026-07-11 11:36:59 +08:00
32 changed files with 1234 additions and 650 deletions
+11 -1
View File
@@ -153,9 +153,19 @@ bool cli_context::init() {
if (use_external_server) {
spinner.reset();
if (!list_and_ask_models()) {
try {
if (!list_and_ask_models()) {
return false;
}
} catch (const json::parse_error & e) {
ui::show_error(e.what());
ui::show_message("This might be caused by an incorrect server-base endpoint URL");
return false;
} catch (const std::exception & e) {
ui::show_error(e.what());
return false;
}
// restore the spinner for the next step
spinner.emplace("Waiting for server...");
}