From ee0fc8226762e834536962e28635cd5c24bd5e56 Mon Sep 17 00:00:00 2001
From: winewill <324803222+winewill@users.noreply.github.com>
Date: Mon, 21 Sep 2026 14:45:35 +0800
Subject: [PATCH] fix(desktop): check the bundled runtime against the product
 version

Injecting a build version renamed the Electron shell but not the dsh
runtime packed into it, and afterPack required the two to be equal, so
every build carrying a build version failed after packaging finished.
The bundled runtime is the dsh package at the product version, which is
what the check now compares against; the app already reports the shell
version and the bundled runtime version separately to the update policy.

Rename the flag to --build-version. The repository already has
DOWNLOAD_TEST_RELEASE_ID for the opaque test feed directory, so calling
a version a release id invited a reader to confuse the two. Accept a
forwarded `--` as well, because `pnpm run <script> -- --build-version x`
passes the separator through as an argument and every following option
would otherwise parse as a second target.
---
 .../scripts/electron-builder-config.mjs       |  4 ++-
 apps/desktop/scripts/package-target.ts        | 26 ++++++++++---------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/apps/desktop/scripts/electron-builder-config.mjs b/apps/desktop/scripts/electron-builder-config.mjs
index 6ed1da2c14..327918073d 100644
--- a/apps/desktop/scripts/electron-builder-config.mjs
+++ b/apps/desktop/scripts/electron-builder-config.mjs
@@ -170,8 +170,10 @@ export function createElectronBuilderConfig(
         await writeMacOSAppUpdateConfig(resourcesDir, resolveMacOSAppUpdateFeed(context.packager.config.publish),
           context.packager.appInfo.updaterCacheDirName)
       }
+      // The bundled runtime is the dsh package at the product version; a build version extends that
+      // on the shell alone, which is why the app reports the two separately to the update policy.
       await verifyDesktopRuntime(buildPaths.dsh,
-        context.packager.appInfo.version, { platform: resolvedPlatform, arch: resolvedArch })
+        productVersion, { platform: resolvedPlatform, arch: resolvedArch })
       // Unsigned Windows builds skip electron-builder's afterSign hook.
       if (packagesWindows && unsigned) await verifyWindowsAsarUnpack(buildPaths.dsh, resourcesDir, windowsCode)
     },
diff --git a/apps/desktop/scripts/package-target.ts b/apps/desktop/scripts/package-target.ts
index fb54d7da79..a038ff1893 100644
--- a/apps/desktop/scripts/package-target.ts
+++ b/apps/desktop/scripts/package-target.ts
@@ -43,8 +43,8 @@ const DESKTOP_UPLOAD_CREDENTIAL_ENV_NAMES = new Set([
   'DOWNLOAD_PROD_COS_SECRET_KEY',
 ])
 
-/** `--release-id` value that numbers a build after the ones already taken. */
-const AUTOMATIC_RELEASE_ID = 'auto'
+/** `--build-version` value that numbers a build after the ones already taken. */
+const AUTOMATIC_BUILD_VERSION = 'auto'
 
 /** Fixed platform and architecture identifiers exposed by package scripts. */
 export type DesktopPackageTargetName = 'mac-arm64' | 'mac-x64' | 'win-x64'
@@ -198,7 +198,7 @@ interface DesktopPackageInvocation {
   readonly unsigned: boolean
   readonly check: boolean
   /** Build identifier to publish under, when this build does not publish the product version. */
-  readonly releaseId: string | undefined
+  readonly requestedBuildVersion: string | undefined
 }
 
 function hostTargetName(platform: NodeJS.Platform, arch: string): DesktopPackageTargetName {
@@ -220,23 +220,25 @@ export function parseDesktopPackageInvocation(
   hostArch: string = process.arch,
 ): DesktopPackageInvocation {
   const { values, positionals } = parseArgs({
-    args: [...argv],
+    // `pnpm run <script> -- --build-version x` forwards the separator itself, which would otherwise
+    // turn every following option into a positional and read as a second target.
+    args: argv[0] === '--' ? argv.slice(1) : [...argv],
     allowPositionals: true,
     options: {
       dir: { type: 'boolean', default: false },
       'prepare-only': { type: 'boolean', default: false },
       unsigned: { type: 'boolean', default: false },
       check: { type: 'boolean', default: false },
-      'release-id': { type: 'string' },
+      'build-version': { type: 'string' },
     },
   })
   if (positionals.length > 1) throw new Error('desktop package: expected at most one target')
   const name = positionals[0] ?? hostTargetName(hostPlatform, hostArch)
   if (values.unsigned && name !== 'win-x64') throw new Error('desktop package: --unsigned requires win-x64')
   if (values.unsigned && values['prepare-only']) throw new Error('desktop package: --unsigned cannot use --prepare-only')
-  const releaseId = values['release-id']?.trim()
-  if (values['release-id'] !== undefined && (releaseId === undefined || releaseId === '')) {
-    throw new Error('desktop package: --release-id requires a value')
+  const requestedBuildVersion = values['build-version']?.trim()
+  if (values['build-version'] !== undefined && (requestedBuildVersion === undefined || requestedBuildVersion === '')) {
+    throw new Error('desktop package: --build-version requires a value')
   }
   return {
     target: resolveDesktopPackageTarget(name, hostPlatform, hostArch),
@@ -244,7 +246,7 @@ export function parseDesktopPackageInvocation(
     prepareOnly: values['prepare-only'],
     unsigned: values.unsigned,
     check: values.check,
-    releaseId,
+    requestedBuildVersion,
   }
 }
 
@@ -310,11 +312,11 @@ async function main(): Promise<void> {
   const environment = loadDesktopPackageEnvironment(target.platform)
   const productVersion = packageVersion(join(APP_ROOT, 'package.json'), 'desktop package')
   // Resolving before any build step means a malformed version fails in seconds rather than after the packaging run.
-  const buildVersion = invocation.releaseId === undefined
+  const buildVersion = invocation.requestedBuildVersion === undefined
     ? resolveDesktopBuildVersion(environment, productVersion)
-    : invocation.releaseId === AUTOMATIC_RELEASE_ID
+    : invocation.requestedBuildVersion === AUTOMATIC_BUILD_VERSION
       ? await suggestDesktopBuildVersion({ productVersion, target: target.name, environment })
-      : validateDesktopBuildVersion(invocation.releaseId, productVersion)
+      : validateDesktopBuildVersion(invocation.requestedBuildVersion, productVersion)
   environment[DESKTOP_BUILD_VERSION_ENV] = buildVersion
   if (invocation.check) {
     validateDesktopPackageEnvironment(environment, target, invocation)