fix(ci): harmonize LLVM toolchain, rename plugin packages to AMD64/ARM64 and auto-deploy independent models

Author: justnullname

.github/workflows/build-release.yml

@@ -29,8 +29,7 @@ jobs:
           submodules: recursive
           fetch-depth: 0
 
-      - name: Install Toolchain
-        run: choco install llvm -y
+      # Note: Visual Studio on GitHub Actions runner already includes matched LLVM/Clang-cl/lld-link
 
       - name: Setup Ninja
         uses: seanmiddleditch/gha-setup-ninja@master
@@ -65,7 +64,7 @@ jobs:
       - name: Prepare Portable Version
         shell: pwsh
         run: |
-          $archUpper = if ("${{ matrix.platform }}" -eq "x64") { "X64" } else { "ARM64" }
+          $archUpper = if ("${{ matrix.platform }}" -eq "x64") { "AMD64" } else { "ARM64" }
           
           # Path for CMake build artifact (Ninja puts it in root)
           $exePath = "${{ github.workspace }}/out/build/${{ matrix.preset }}/QuickView.exe"
@@ -87,13 +86,12 @@ jobs:
           $zipName = "QuickView_${tag}_${archUpper}.zip"
           Compress-Archive -Path $exePath -DestinationPath "Release/dist/$zipName" -Force
 
-          # Package standalone QVX plugin artifact (sr_ncnn_vulkan + models + manifest)
+          # Package standalone QVX plugin artifact (sr_ncnn_vulkan + models)
           $pluginDir = "${{ github.workspace }}/out/build/${{ matrix.preset }}/plugins/sr/sr_ncnn_vulkan"
           if (Test-Path "$pluginDir/sr_ncnn_vulkan.qvx") {
               $pluginZip = "Release/dist/sr_ncnn_vulkan_${archUpper}.zip"
               Compress-Archive -Path "$pluginDir/*" -DestinationPath $pluginZip -Force
               if ("${{ matrix.platform }}" -eq "x64") {
-                  Copy-Item -Path $pluginZip -Destination "Release/dist/sr_ncnn_vulkan.zip" -Force
                   Copy-Item -Path "${{ github.workspace }}/plugins/plugins_manifest.json" -Destination "Release/dist/plugins_manifest.json" -Force
               }
           }
@@ -102,7 +100,7 @@ jobs:
         shell: pwsh
         run: |
           $arch = "${{ matrix.platform }}".ToLower()
-          $archUpper = if ("${{ matrix.platform }}" -eq "x64") { "X64" } else { "ARM64" }
+          $archUpper = if ("${{ matrix.platform }}" -eq "x64") { "AMD64" } else { "ARM64" }
           $tag = "${{ env.DETECTED_TAG }}"
           $version = $tag.TrimStart('v')
           

.github/workflows/publish_version.yml

@@ -23,26 +23,43 @@ jobs:
           VERSION=${TAG_NAME#v}
           DATE=$(date +'%Y-%m-%d')
           
-          mkdir -p public
+          mkdir -p public/models
+          mkdir -p public/plugins
           if [ -f "plugins/plugins_manifest.json" ]; then
             cp plugins/plugins_manifest.json public/
+            cp plugins/plugins_manifest.json public/plugins/
+          fi
+          
+          # Package independent SR models to public/models/*.zip for CDN download
+          if [ -d "plugins/sr/sr_ncnn_vulkan/models" ]; then
+            echo "Packaging independent SR models for GitHub Pages CDN..."
+            for param_file in plugins/sr/sr_ncnn_vulkan/models/*.param; do
+              if [ -f "$param_file" ]; then
+                base_name=$(basename "$param_file" .param)
+                bin_file="plugins/sr/sr_ncnn_vulkan/models/${base_name}.bin"
+                if [ -f "$bin_file" ]; then
+                  zip -j -9 "public/models/${base_name}.zip" "$param_file" "$bin_file"
+                  echo "Created public/models/${base_name}.zip"
+                fi
+              fi
+            done
           fi
           
           # 1. Get all assets in JSON
           ASSETS=$(gh release view "$TAG_NAME" --json assets -q '.assets')
           
-          # 2. Identify ARM64 portable asset (.zip only, exclude installer .exe)
-          URL_ARM64=$(echo "$ASSETS" | jq -r 'map(select(.name | ascii_downcase | (contains("arm64") and test("\\.zip$")))) | .[0].url // ""')
-          NAME_ARM64=$(echo "$ASSETS" | jq -r 'map(select(.name | ascii_downcase | (contains("arm64") and test("\\.zip$")))) | .[0].name // ""')
+          # 2. Identify ARM64 portable asset (QuickView .zip only, exclude installer .exe and plugins)
+          URL_ARM64=$(echo "$ASSETS" | jq -r 'map(select(.name | ascii_downcase | (contains("quickview") and contains("arm64") and test("\\.zip$")))) | .[0].url // ""')
+          NAME_ARM64=$(echo "$ASSETS" | jq -r 'map(select(.name | ascii_downcase | (contains("quickview") and contains("arm64") and test("\\.zip$")))) | .[0].name // ""')
           
-          # 3. Identify X64 portable asset (.zip only, exclude installer .exe)
-          URL_X64=$(echo "$ASSETS" | jq -r 'map(select(.name | ascii_downcase | ((contains("x64") or contains("amd64")) and test("\\.zip$")))) | .[0].url // ""')
-          NAME_X64=$(echo "$ASSETS" | jq -r 'map(select(.name | ascii_downcase | ((contains("x64") or contains("amd64")) and test("\\.zip$")))) | .[0].name // ""')
+          # 3. Identify X64/AMD64 portable asset (QuickView .zip only, exclude installer .exe and plugins)
+          URL_X64=$(echo "$ASSETS" | jq -r 'map(select(.name | ascii_downcase | (contains("quickview") and (contains("x64") or contains("amd64")) and test("\\.zip$")))) | .[0].url // ""')
+          NAME_X64=$(echo "$ASSETS" | jq -r 'map(select(.name | ascii_downcase | (contains("quickview") and (contains("x64") or contains("amd64")) and test("\\.zip$")))) | .[0].name // ""')
           
-          # Fallback: if no explicit x64 .zip found, take the first .zip that isn't ARM64
+          # Fallback: if no explicit x64 .zip found, take the first QuickView .zip that isn't ARM64
           if [ -z "$URL_X64" ]; then
-             URL_X64=$(echo "$ASSETS" | jq -r 'map(select((.name | ascii_downcase | contains("arm64") | not) and (.name | ascii_downcase | test("\\.zip$")))) | .[0].url // ""')
-             NAME_X64=$(echo "$ASSETS" | jq -r 'map(select((.name | ascii_downcase | contains("arm64") | not) and (.name | ascii_downcase | test("\\.zip$")))) | .[0].name // ""')
+             URL_X64=$(echo "$ASSETS" | jq -r 'map(select((.name | ascii_downcase | (contains("quickview") and (contains("arm64") | not) and test("\\.zip$"))))) | .[0].url // ""')
+             NAME_X64=$(echo "$ASSETS" | jq -r 'map(select((.name | ascii_downcase | (contains("quickview") and (contains("arm64") | not) and test("\\.zip$"))))) | .[0].name // ""')
           fi
           
           SHA_X64=""
@@ -60,6 +77,15 @@ jobs:
              SHA_ARM64=$(sha256sum arm64_pkg | awk '{print $1}')
           fi
           
+          # Sync plugin zip packages from Release to public/plugins/
+          for p_arch in "AMD64" "ARM64"; do
+            P_NAME=$(echo "$ASSETS" | jq -r --arg a "$p_arch" 'map(select(.name | ascii_downcase | (contains("sr_ncnn_vulkan") and contains($a | ascii_downcase) and test("\\.zip$")))) | .[0].name // ""')
+            if [ -n "$P_NAME" ] && [ "$P_NAME" != "null" ]; then
+              echo "Syncing plugin package $P_NAME to public/plugins/..."
+              gh release download "$TAG_NAME" -p "$P_NAME" -O "public/plugins/${P_NAME}" || true
+            fi
+          done
+          
           # Fallback URL for legacy clients (pointing to X64)
           URL=$URL_X64
           

QuickView/Plugin/PluginHost.cpp

@@ -99,6 +99,14 @@ std::vector<RemotePluginItem> PluginHost::GetCachedRemoteManifest() const {
     }
 
     // Default built-in manifest fallback to ensure offline / initial launch availability
+#if defined(_M_ARM64) || defined(__aarch64__)
+    const char* defaultPkgUrl = "https://justnullname.github.io/QuickView/plugins/sr_ncnn_vulkan_ARM64.zip";
+    const char* defaultPkgFile = "sr_ncnn_vulkan_ARM64.zip";
+#else
+    const char* defaultPkgUrl = "https://justnullname.github.io/QuickView/plugins/sr_ncnn_vulkan_AMD64.zip";
+    const char* defaultPkgFile = "sr_ncnn_vulkan_AMD64.zip";
+#endif
+
     std::vector<RemotePluginItem> defaultList;
     defaultList.push_back({
         "com.quickview.sr.ncnn_vulkan",
@@ -107,8 +115,8 @@ std::vector<RemotePluginItem> PluginHost::GetCachedRemoteManifest() const {
         "QuickView Core Team",
         "SuperResolution",
         "High-Performance In-Process Vulkan Compute Neural Super-Resolution Engine (0-Copy, 0 Disk I/O).",
-        "https://justnullname.github.io/QuickView/plugins/sr_ncnn_vulkan.zip",
-        "sr_ncnn_vulkan.zip",
+        defaultPkgUrl,
+        defaultPkgFile,
         2600000,
         "0.1.0",
         ""
@@ -1261,20 +1269,13 @@ bool PluginHost::DownloadPlugin(const std::wstring& pluginName, const std::strin
 
     if (ok) {
         std::lock_guard<std::recursive_mutex> lock(m_srMutex);
-        if (isZip) {
-            std::wstring baseName = pluginName;
-            if (baseName.ends_with(L".zip")) baseName = baseName.substr(0, baseName.size() - 4);
-            std::wstring isolatedRel = L"plugins\\sr\\" + baseName + L"\\" + baseName + L".qvx";
-            std::wstring legacyRel = L"plugins\\" + baseName + L".qvx";
-            wchar_t combined[MAX_PATH];
-            PathCombineW(combined, exePath, isolatedRel.c_str());
-            if (GetFileAttributesW(combined) != INVALID_FILE_ATTRIBUTES) {
-                m_srPluginPath = isolatedRel;
-            } else {
-                m_srPluginPath = legacyRel;
-            }
+        m_srPluginPath.clear();
+        std::wstring relForIni;
+        std::wstring effective = ResolveEffectiveSrPluginPath(&relForIni);
+        if (!effective.empty()) {
+            m_srPluginPath = relForIni;
         } else {
-            m_srPluginPath = L"plugins\\" + pluginName;
+            m_srPluginPath = L"plugins\\sr\\sr_ncnn_vulkan\\sr_ncnn_vulkan.qvx";
         }
         UnloadSrPlugin();
         EnsureSrModuleLoaded();
@@ -1511,10 +1512,25 @@ void PluginHost::FetchRemoteManifestAsync(ManifestCallback callback, void* userD
                                     if (v && yyjson_get_str(v)) r.interfaceName = yyjson_get_str(v);
                                     v = yyjson_obj_get(item, "description");
                                     if (v && yyjson_get_str(v)) r.description = yyjson_get_str(v);
-                                    v = yyjson_obj_get(item, "download_url");
+                                    // Architecture-aware URL and file name selection
+#if defined(_M_ARM64) || defined(__aarch64__)
+                                    v = yyjson_obj_get(item, "download_url_arm64");
+                                    if (!v || !yyjson_get_str(v)) v = yyjson_obj_get(item, "download_url");
                                     if (v && yyjson_get_str(v)) r.downloadUrl = yyjson_get_str(v);
-                                    v = yyjson_obj_get(item, "file_name");
+
+                                    v = yyjson_obj_get(item, "file_name_arm64");
+                                    if (!v || !yyjson_get_str(v)) v = yyjson_obj_get(item, "file_name");
                                     if (v && yyjson_get_str(v)) r.fileName = yyjson_get_str(v);
+#else
+                                    v = yyjson_obj_get(item, "download_url_amd64");
+                                    if (!v || !yyjson_get_str(v)) v = yyjson_obj_get(item, "download_url_x64");
+                                    if (!v || !yyjson_get_str(v)) v = yyjson_obj_get(item, "download_url");
+                                    if (v && yyjson_get_str(v)) r.downloadUrl = yyjson_get_str(v);
+
+                                    v = yyjson_obj_get(item, "file_name_amd64");
+                                    if (!v || !yyjson_get_str(v)) v = yyjson_obj_get(item, "file_name");
+                                    if (v && yyjson_get_str(v)) r.fileName = yyjson_get_str(v);
+#endif
                                     v = yyjson_obj_get(item, "file_size");
                                     if (v) r.fileSize = yyjson_get_uint(v);
                                     v = yyjson_obj_get(item, "min_app_version");

QuickView/QuickView.rc

@@ -12,8 +12,8 @@
 
 // Version Information - This sets the display name in Windows
  VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,46,0,0
- PRODUCTVERSION 6,46,0,0
+ FILEVERSION 6,46,0,1
+ PRODUCTVERSION 6,46,0,1
 FILEFLAGSMASK 0x3fL
 FILEFLAGS 0x0L
 FILEOS 0x40004L
@@ -26,12 +26,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "QuickView"
             VALUE "FileDescription", "QuickView"
-            VALUE "FileVersion", "6.46.0.0"
+            VALUE "FileVersion", "6.46.0.1"
             VALUE "InternalName", "QuickView.exe"
             VALUE "LegalCopyright", "Copyright (C) 2026"
             VALUE "OriginalFilename", "QuickView.exe"
             VALUE "ProductName", "QuickView"
-            VALUE "ProductVersion", "6.46.0.0"
+            VALUE "ProductVersion", "6.46.0.1"
         END
     END
     BLOCK "VarFileInfo"

cmake/lld-link-wrapper.bat

@@ -72,15 +72,15 @@ echo [QuickViewLinker] LIB After = "!LIB!" >&2
 :: 3. Locate lld-link.exe dynamically
 set "LLVM_LINKER_EXE="
 
-:: Priority 1: Standalone LLVM in standard locations
-if exist "C:\Program Files\LLVM\bin\lld-link.exe" set "LLVM_LINKER_EXE=C:\Program Files\LLVM\bin\lld-link.exe"
-if not defined LLVM_LINKER_EXE if exist "D:\Program Files\LLVM\bin\lld-link.exe" set "LLVM_LINKER_EXE=D:\Program Files\LLVM\bin\lld-link.exe"
-if not defined LLVM_LINKER_EXE if exist "C:\Program Files (x86)\LLVM\bin\lld-link.exe" set "LLVM_LINKER_EXE=C:\Program Files (x86)\LLVM\bin\lld-link.exe"
-
-:: Priority 2: Visual Studio internal LLVM tools
+:: Priority 1: Visual Studio internal LLVM tools (guarantees bitcode version match with clang-cl)
 if not defined LLVM_LINKER_EXE if exist "!VS_PATH!\VC\Tools\Llvm\x64\bin\lld-link.exe" set "LLVM_LINKER_EXE=!VS_PATH!\VC\Tools\Llvm\x64\bin\lld-link.exe"
 if not defined LLVM_LINKER_EXE if exist "!VS_PATH!\VC\Tools\Llvm\bin\lld-link.exe" set "LLVM_LINKER_EXE=!VS_PATH!\VC\Tools\Llvm\bin\lld-link.exe"
 
+:: Priority 2: Standalone LLVM in standard locations
+if not defined LLVM_LINKER_EXE if exist "C:\Program Files\LLVM\bin\lld-link.exe" set "LLVM_LINKER_EXE=C:\Program Files\LLVM\bin\lld-link.exe"
+if not defined LLVM_LINKER_EXE if exist "D:\Program Files\LLVM\bin\lld-link.exe" set "LLVM_LINKER_EXE=D:\Program Files\LLVM\bin\lld-link.exe"
+if not defined LLVM_LINKER_EXE if exist "C:\Program Files (x86)\LLVM\bin\lld-link.exe" set "LLVM_LINKER_EXE=C:\Program Files (x86)\LLVM\bin\lld-link.exe"
+
 :: Priority 3: System PATH
 if not defined LLVM_LINKER_EXE (
     for /f "tokens=*" %%i in ('where lld-link.exe 2^>nul') do (

plugins/plugins_manifest.json

@@ -1,6 +1,6 @@
 {
   "schema_version": "2.0",
-  "updated_at": "2026-08-24",
+  "updated_at": "2026-08-25",
   "plugins": [
     {
       "id": "com.quickview.sr.ncnn_vulkan",
@@ -9,8 +9,11 @@
       "author": "QuickView Core Team",
       "interface": "super_resolution",
       "description": "High-Performance In-Process Vulkan Compute Neural Super-Resolution Engine.",
-      "download_url": "https://justnullname.github.io/QuickView/plugins/sr_ncnn_vulkan.zip",
-      "file_name": "sr_ncnn_vulkan.zip",
+      "download_url": "https://justnullname.github.io/QuickView/plugins/sr_ncnn_vulkan_AMD64.zip",
+      "download_url_amd64": "https://justnullname.github.io/QuickView/plugins/sr_ncnn_vulkan_AMD64.zip",
+      "download_url_arm64": "https://justnullname.github.io/QuickView/plugins/sr_ncnn_vulkan_ARM64.zip",
+      "file_name": "sr_ncnn_vulkan_AMD64.zip",
+      "file_name_arm64": "sr_ncnn_vulkan_ARM64.zip",
       "file_size": 2600000,
       "min_app_version": "0.1.0"
     }