From 1af4f10179b338345a11979fae7f76f9ab9b8dac Mon Sep 17 00:00:00 2001
From: shanzez <78763240+shanzez@users.noreply.github.com>
Date: Thu, 2 Jul 2026 23:40:21 -0400
Subject: [PATCH 1/2] fix: desktop client should trust server's MODEL_VERSION
 (#10871)

The desktop preload script explicitly overrides serverConfig.MODEL_VERSION
with the value baked into the desktop binary at build time. This causes
the "New version is available" dialog to fire for self-hosted users
whenever desktop CI builds from a different commit than the server image
(i.e., when v* and s* tags diverge in version.txt).

Use the server's authoritative MODEL_VERSION instead, falling back to
the bundled value when the server does not report one.

Signed-off-by: Shannon Kerr <shannon@exaviz.com>
Co-authored-by: Artyom Savchenko <armisav@gmail.com>
---
 desktop/src/ui/preload.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/desktop/src/ui/preload.ts b/desktop/src/ui/preload.ts
index 2367e56af9..862b9f1a73 100644
--- a/desktop/src/ui/preload.ts
+++ b/desktop/src/ui/preload.ts
@@ -110,7 +110,7 @@ const expose: IPCMainExposed = {
               UPLOAD_URL: (serverConfig.UPLOAD_URL as string).includes('://')
                 ? serverConfig.UPLOAD_URL
                 : concatLink(mainConfig.FRONT_URL, serverConfig.UPLOAD_URL),
-              MODEL_VERSION: mainConfig.MODEL_VERSION,
+              MODEL_VERSION: serverConfig.MODEL_VERSION ?? mainConfig.MODEL_VERSION,
               VERSION: mainConfig.VERSION
             }
 

From 5bda0e790ab6a17a82aa19f3fc8d9d43008007a6 Mon Sep 17 00:00:00 2001
From: Artyom Savchenko <armisav@gmail.com>
Date: Fri, 3 Jul 2026 12:18:03 +0700
Subject: [PATCH 2/2] Fix publish npm (#10950)

Signed-off-by: Artyom Savchenko <armisav@gmail.com>
---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 753708009e..2daf62ac0c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -973,12 +973,12 @@ jobs:
       - name: Publish to npm
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-          NPM_CONFIG_USERCONFIG: ${{ github.workspace }}/common/config/rush/.npmrc-publish
         run: |
           if [ -z "$NPM_TOKEN" ]; then
             echo "::error::NPM_TOKEN secret is not set. Add it in repository Settings > Secrets and variables > Actions."
             exit 1
           fi
+          echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc
           REF="${{ github.event.inputs.ref || github.ref }}"
           VERSION="${REF#refs/tags/v}"
           VERSION="${VERSION#v}"