-
Merge main into studio-mmproj-fit
frostbyte_neo 发布于
2026-08-20 11:30:19 +00:00 Three conflicts, all small. The llama_cpp.py one is two independent additions at
the same spot, the projector pin state and the Metal context refusal; both are
kept. The mmproj-fallback test file is likewise both sides' tests, main's
loadFallbackNotice coverage alongside the wording assertion here.image-input-support.ts takes main's line. The missing .ts on that runtime import
is what made the frontend suite red, and #9192 has since fixed it upstream, so
the commit carrying it here is redundant and only the explanatory comment
differed. Dropped rather than re-added as diff noise.The cpu_offload reword is still only on this branch, so the test that pins it
stays.下载附件