refactor: tighten legacy patch guards and centralize dmg defaults

Author: zouyonghe

.github/workflows/build-desktop-tauri.yml

@@ -283,12 +283,6 @@ jobs:
           # Only retry on known transient DMG detach failures.
           retry_pattern='hdiutil: detach:.*(timeout|not detached)|DiskArbitration expired'
           cleanup_script="scripts/ci/cleanup-dmg.sh"
-          export ASTRBOT_DESKTOP_MACOS_DETACH_ATTEMPTS="${ASTRBOT_DESKTOP_MACOS_DETACH_ATTEMPTS:-3}"
-          export ASTRBOT_DESKTOP_MACOS_DETACH_SLEEP_SECONDS="${ASTRBOT_DESKTOP_MACOS_DETACH_SLEEP_SECONDS:-2}"
-          export ASTRBOT_DESKTOP_MACOS_RW_DMG_IMAGE_PREFIX="${ASTRBOT_DESKTOP_MACOS_RW_DMG_IMAGE_PREFIX:-/src-tauri/target/}"
-          export ASTRBOT_DESKTOP_MACOS_RW_DMG_IMAGE_SUFFIX_REGEX="${ASTRBOT_DESKTOP_MACOS_RW_DMG_IMAGE_SUFFIX_REGEX:-/bundle/macos/rw\\..*\\.dmg$}"
-          export ASTRBOT_DESKTOP_MACOS_RW_DMG_MOUNT_REGEX="${ASTRBOT_DESKTOP_MACOS_RW_DMG_MOUNT_REGEX:-^/Volumes/(dmg\\.|rw\\.|dmg-|rw-).*}"
-          export ASTRBOT_DESKTOP_MACOS_ALLOW_GLOBAL_HELPER_KILL="${ASTRBOT_DESKTOP_MACOS_ALLOW_GLOBAL_HELPER_KILL:-0}"
           log_file=""
           if [ ! -f "${cleanup_script}" ]; then
             echo "Missing DMG cleanup script: ${cleanup_script}" >&2
@@ -304,7 +298,7 @@ jobs:
           trap cleanup_log_file EXIT
 
           cleanup_stale_dmg_state() {
-            bash "${cleanup_script}" || true
+            bash "${cleanup_script}"
           }
 
           while [ "${attempt}" -le "${max_attempts}" ]; do

scripts/ci/cleanup-dmg.sh

@@ -61,13 +61,17 @@ if [ -n "${ASTRBOT_DESKTOP_MACOS_WORKSPACE_ROOT:-}" ]; then
 elif [ -n "${GITHUB_WORKSPACE:-}" ]; then
   workspace_root="${GITHUB_WORKSPACE}"
 else
-  fail_or_skip_workspace_root \
-    "ASTRBOT_DESKTOP_MACOS_WORKSPACE_ROOT is required outside GitHub Actions" || exit 1
+  if ! fail_or_skip_workspace_root \
+    "ASTRBOT_DESKTOP_MACOS_WORKSPACE_ROOT is required outside GitHub Actions"; then
+    exit 1
+  fi
   exit 0
 fi
 workspace_root="${workspace_root%/}"
 if [ -z "${workspace_root}" ] || [ ! -d "${workspace_root}" ]; then
-  fail_or_skip_workspace_root "workspace root is invalid (${workspace_root})" || exit 1
+  if ! fail_or_skip_workspace_root "workspace root is invalid (${workspace_root})"; then
+    exit 1
+  fi
   exit 0
 fi
 
@@ -278,5 +282,9 @@ cleanup_stale_dmg_state() {
   fi
 }
 
-cleanup_stale_dmg_state || true
+if ! cleanup_stale_dmg_state; then
+  if [ "${strict_workspace_root}" = "1" ]; then
+    exit 1
+  fi
+fi
 exit 0

scripts/prepare-resources.mjs

@@ -210,7 +210,8 @@ const patchMonacoCssNestingWarnings = async (dashboardDir) => {
 };
 
 const patchLegacyDesktopBridgeArtifacts = async (dashboardDir) => {
-  const patchFile = async (filePath, transform, patchLabel) => {
+  const patchFile = async (filePath, transform, patchLabel, options = {}) => {
+    const { warnOnNoChange = false } = options;
     if (!existsSync(filePath)) {
       return;
     }
@@ -221,48 +222,55 @@ const patchLegacyDesktopBridgeArtifacts = async (dashboardDir) => {
       console.log(
         `[prepare-resources] Patched ${patchLabel} in ${path.relative(projectRoot, filePath)}`,
       );
+    } else if (warnOnNoChange) {
+      console.warn(
+        `[prepare-resources] WARN: No changes applied for ${patchLabel} in ${path.relative(projectRoot, filePath)}`,
+      );
     }
   };
 
   await patchFile(
     path.join(dashboardDir, 'src', 'App.vue'),
     (source) =>
       source.replace(
-        /if\s*\(!desktopBridge\?\.\w+\s*\|\|\s*!desktopBridge\.onTrayRestartBackend\)\s*\{/,
+        /if\s*\(\s*!desktopBridge\?\.isElectron\s*\|\|\s*!desktopBridge\.onTrayRestartBackend\s*\)\s*\{/,
         'if (!desktopBridge?.onTrayRestartBackend) {',
       ),
     'tray restart desktop guard',
+    { warnOnNoChange: true },
   );
 
   await patchFile(
     path.join(dashboardDir, 'src', 'types', 'electron-bridge.d.ts'),
     (source) => {
       let patched = source;
-      patched = patched.replace(/^\s+is\w+:\s*boolean;\n/m, '      isDesktop: boolean;\n');
+      patched = patched.replace(/^\s+isElectron:\s*boolean;\n/m, '      isDesktop: boolean;\n');
       patched = patched.replace(
-        /^\s+is\w+Runtime:\s*\(\)\s*=>\s*Promise<boolean>;\n/m,
+        /^\s+isElectronRuntime:\s*\(\)\s*=>\s*Promise<boolean>;\n/m,
         '      isDesktopRuntime: () => Promise<boolean>;\n',
       );
       return patched;
     },
     'desktop bridge type definitions',
+    { warnOnNoChange: true },
   );
 
   await patchFile(
     path.join(dashboardDir, 'src', 'layouts', 'full', 'vertical-header', 'VerticalHeader.vue'),
     (source) => {
-      let patched = source.replaceAll(/\bis\w+App\b/g, 'isDesktopReleaseMode');
+      let patched = source.replaceAll(/\bisElectronApp\b/g, 'isDesktopReleaseMode');
       patched = patched.replace(
-        /typeof window !== 'undefined'\s*&&\s*!!window\.astrbotDesktop\?\.\w+/,
+        /typeof window !== 'undefined'\s*&&\s*!!window\.astrbotDesktop\?\.isElectron/,
         'false',
       );
       patched = patched.replace(
-        /isDesktopReleaseMode\.value\s*=\s*!!window\.astrbotDesktop\?\.\w+\s*\|\|\s*\n\s*!!\(await window\.astrbotDesktop\?\.\w+\?\.\(\)\);/,
+        /isDesktopReleaseMode\.value\s*=\s*!!window\.astrbotDesktop\?\.isElectron\s*\|\|\s*\n\s*!!\(await window\.astrbotDesktop\?\.isElectronRuntime\?\.\(\)\);/,
         'isDesktopReleaseMode.value = false;',
       );
       return patched;
     },
     'desktop update mode guards',
+    { warnOnNoChange: true },
   );
 
   await patchFile(
@@ -272,7 +280,7 @@ const patchLegacyDesktopBridgeArtifacts = async (dashboardDir) => {
         return source;
       }
       return source.replace(
-        /if\s*\(desktopBridge\?\.\w+\)\s*\{/,
+        /if\s*\(\s*desktopBridge\?\.isElectron\s*\)\s*\{/,
         `const hasDesktopRestartCapability =
     !!desktopBridge &&
     typeof desktopBridge.restartBackend === 'function' &&
@@ -291,6 +299,7 @@ const patchLegacyDesktopBridgeArtifacts = async (dashboardDir) => {
       );
     },
     'desktop restart capability guard',
+    { warnOnNoChange: true },
   );
 };