From f52f0e35a909de43bfeaad63c8d09d07843c3eed Mon Sep 17 00:00:00 2001
From: Tom Butcher <thomasbutcher15@gmail.com>
Date: Sun, 9 Aug 2026 15:25:43 +0100
Subject: [PATCH] Refactor app version handling in appupdate.js and rpc.js

- Updated `getRunningAppVersion` to retrieve the version from `package.json`, ensuring accurate version representation.
- Modified `getAppVersion` in `rpc.js` to utilize the refactored `getRunningAppVersion`, improving consistency in version reporting.
---
 src/desktop/appupdate.js | 8 +++-----
 src/desktop/rpc.js       | 8 ++++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/desktop/appupdate.js b/src/desktop/appupdate.js
index ccbe208..c37765d 100644
--- a/src/desktop/appupdate.js
+++ b/src/desktop/appupdate.js
@@ -10,6 +10,7 @@ import { launchWindowsInstaller } from './winappupdate.js'
 import { checkForDuplicateInstallations } from './check-duplicate-installations.js'
 import { scheduleAppRestart } from './updater-runner.js'
 import buildInfo from '../buildInfo.json'
+import { version as packageVersion } from '../../package.json'
 import { getAppSettings, setAppSettings } from './store.js'
 
 const SUPPORTED_TARGETS = {
@@ -232,11 +233,8 @@ const formatFullAppVersion = (version, buildNumber) => {
   return `v${normalizedVersion}-${buildSuffix}`
 }
 
-const getRunningAppVersion = () =>
-  formatFullAppVersion(
-    process.env.ELECTROBUN_VERSION,
-    buildInfo?.buildNumber
-  )
+export const getRunningAppVersion = () =>
+  formatFullAppVersion(packageVersion, buildInfo?.buildNumber)
 
 const getRunningAppState = (mainWindow, settings) => ({
   version: getRunningAppVersion(),
diff --git a/src/desktop/rpc.js b/src/desktop/rpc.js
index 91a1fdd..d495cd8 100644
--- a/src/desktop/rpc.js
+++ b/src/desktop/rpc.js
@@ -1,5 +1,9 @@
 import { BrowserView } from 'electrobun/bun'
-import { checkForCompletedUpdate, startAppUpdate } from './appupdate.js'
+import {
+  checkForCompletedUpdate,
+  getRunningAppVersion,
+  startAppUpdate
+} from './appupdate.js'
 import {
   checkForDuplicateInstallations,
   removeDuplicateInstallations
@@ -89,7 +93,7 @@ export function createAppRpc() {
         })
       return { ok: true }
     },
-    getAppVersion: async () => process.env.ELECTROBUN_VERSION || 'desktop',
+    getAppVersion: async () => getRunningAppVersion() || 'desktop',
     getAppEngine: async () => {
       const mainWindow = getMainWindow()
       const renderer = mainWindow?.renderer || 'native'