Merged in release/1.0.7 (pull request #5 )

Release/1.0.7
Update version to final release.
2025-10-30 18:11:21 +00:00 · 2025-10-22 12:18:53 -07:00 · 2025-10-21 11:30:56 -07:00 · 2025-10-21 10:46:12 -07:00 · 2025-10-21 10:03:40 -07:00 · 2025-10-20 21:29:48 -07:00
45 changed files with 4509 additions and 2866 deletions
--- a/.env.local
+++ b/.env.local
@@ -2,8 +2,8 @@ VITE_FIREBASE_CONFIG={"apiKey":"AIzaSyDPLT8GiDHDR1R4nI66Qi0BY1aYviDPioc","authDo
 VITE_GRAPHQL_ENDPOINT=https://db.dev.imex.online/v1/graphql
 VITE_FIREBASE_CONFIG_TEST={   "apiKey":"AIzaSyBw7_GTy7GtQyfkIRPVrWHEGKfcqeyXw0c",   "authDomain":"imex-test.firebaseapp.com",   "projectId":"imex-test",   "storageBucket":"imex-test.appspot.com",   "messagingSenderId":"991923618608",   "appId":"1:991923618608:web:633437569cdad78299bef5",   "measurementId":"G-TW0XLZEH18"}
 VITE_GRAPHQL_ENDPOINT_TEST=https://db.test.bodyshop.app/v1/graphql
-VITE_COMPANY=IMEX
+VITE_COMPANY=ROME
 VITE_FE_URL=https://imex.online
 VITE_FE_URL_TEST=https://test.imex.online
 VITE_API_URL="http://localhost:4000"
-VITE_API_TEST_URL="http://api.test.imex.online"
+VITE_API_TEST_URL="https://api.test.imex.online"
--- a/.gitignore
+++ b/.gitignore
@@ -14,5 +14,6 @@ out

 # Build Files
 macbuild.sh
+deploy.ps1
 # Sentry Config File
 .env.sentry-build-plugin
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -13,7 +13,8 @@
      "runtimeArgs": ["--sourcemap"],
      "env": {
        "REMOTE_DEBUGGING_PORT": "9222"
-      }
+      },
+      "experimentalNetworking": "off"
    },
    {
      "name": "Debug Renderer Process",
--- a/build/com.convenient-brands.bodyshop-desktop.keepalive.plist
+++ b/build/com.convenient-brands.bodyshop-desktop.keepalive.plist
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key>
+  <string>com.convenientbrands.bodyshop-desktop.keepalive</string>
+  <key>ProgramArguments</key>
+  <array>
+    <string>Shop Partner Keep Alive</string>
+    <string>imexmedia://keep-alive</string>
+  </array>
+  <key>RunAtLoad</key>
+  <true/>
+  <key>StartInterval</key>
+  <integer>${KEEP_ALIVE_INTERVAL_SECONDS}</integer>
+</dict>
+</plist>
--- a/deploy/set-artifact-name.js
+++ b/deploy/set-artifact-name.js
@@ -0,0 +1,53 @@
+#!/usr/bin/env node
+// Cross-platform script to set artifact naming based on version
+
+const fs = require('fs');
+const path = require('path');
+const { spawn } = require('child_process');
+
+// Read the package.json to get the version
+const packageJsonPath = path.join(__dirname, '..', 'package.json');
+const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+const version = packageJson.version;
+
+console.log(`Current version: ${version}`);
+
+// Determine the artifact suffix based on the version
+let artifactSuffix = '';
+
+if (version.includes('alpha')) {
+    artifactSuffix = `alpha-${version}-`;
+    console.log(`Detected alpha version, setting suffix to: ${artifactSuffix}`);
+} else if (version.includes('beta')) {
+    artifactSuffix = `beta-${version}-`;
+    console.log(`Detected beta version, setting suffix to: ${artifactSuffix}`);
+} else {
+    artifactSuffix = '';
+    console.log('Detected release version, no suffix will be added');
+}
+
+// Set the environment variable for the current process
+process.env.ARTIFACT_SUFFIX = artifactSuffix;
+
+console.log(`ARTIFACT_SUFFIX set to: '${artifactSuffix}'`);
+
+// If arguments are passed, execute the remaining command with the environment variable set
+if (process.argv.length > 2) {
+    const command = process.argv[2];
+    const args = process.argv.slice(3);
+    
+    console.log(`Executing: ${command} ${args.join(' ')}`);
+    
+    const child = spawn(command, args, {
+        stdio: 'inherit',
+        env: { ...process.env, ARTIFACT_SUFFIX: artifactSuffix },
+        shell: true
+    });
+    
+    child.on('close', (code) => {
+        process.exit(code);
+    });
+} else {
+    // Just setting the environment variable
+    console.log('Environment variable set. Use this script with additional arguments to run commands with the variable set.');
+}
--- a/deploy/set-artifact-name.ps1
+++ b/deploy/set-artifact-name.ps1
@@ -0,0 +1,38 @@
+# PowerShell script to set artifact naming based on version
+param(
+    [string]$ConfigType = "imex"
+)
+
+# Read the package.json to get the version
+$packageJsonPath = Join-Path $PSScriptRoot "..\package.json"
+$packageJson = Get-Content $packageJsonPath | ConvertFrom-Json
+$version = $packageJson.version
+
+Write-Host "Current version: $version"
+
+# Determine the artifact suffix based on the version
+$artifactSuffix = ""
+
+if ($version -match "alpha") {
+    $artifactSuffix = "alpha-${version}-"
+    Write-Host "Detected alpha version, setting suffix to: $artifactSuffix"
+}
+elseif ($version -match "beta") {
+    $artifactSuffix = "beta-${version}-"
+    Write-Host "Detected beta version, setting suffix to: $artifactSuffix"
+}
+else {
+    $artifactSuffix = ""
+    Write-Host "Detected release version, no suffix will be added"
+}
+
+# Set the environment variable
+$env:ARTIFACT_SUFFIX = $artifactSuffix
+
+# Export for the current session
+[Environment]::SetEnvironmentVariable("ARTIFACT_SUFFIX", $artifactSuffix, "Process")
+
+Write-Host "ARTIFACT_SUFFIX set to: '$env:ARTIFACT_SUFFIX'"
+
+# Return the suffix for use in other scripts
+return $artifactSuffix
--- a/deploy/set-artifact-name.sh
+++ b/deploy/set-artifact-name.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+# Bash script to set artifact naming based on version
+
+# Get the directory where this script is located
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# Read the package.json to get the version
+PACKAGE_JSON_PATH="$SCRIPT_DIR/../package.json"
+VERSION=$(node -p "require('$PACKAGE_JSON_PATH').version")
+
+echo "Current version: $VERSION"
+
+# Determine the artifact suffix based on the version
+ARTIFACT_SUFFIX=""
+
+if [[ $VERSION == *"alpha"* ]]; then
+    ARTIFACT_SUFFIX="alpha-${VERSION}-"
+    echo "Detected alpha version, setting suffix to: $ARTIFACT_SUFFIX"
+elif [[ $VERSION == *"beta"* ]]; then
+    ARTIFACT_SUFFIX="beta-${VERSION}-"
+    echo "Detected beta version, setting suffix to: $ARTIFACT_SUFFIX"
+else
+    ARTIFACT_SUFFIX=""
+    echo "Detected release version, no suffix will be added"
+fi
+
+# Export the environment variable
+export ARTIFACT_SUFFIX="$ARTIFACT_SUFFIX"
+
+echo "ARTIFACT_SUFFIX set to: '$ARTIFACT_SUFFIX'"
+
+# Also write to a temporary file for sourcing in other scripts
+echo "export ARTIFACT_SUFFIX='$ARTIFACT_SUFFIX'" > "$SCRIPT_DIR/.artifact-suffix.env"
--- a/deploy/test-artifact-naming-cross-platform.js
+++ b/deploy/test-artifact-naming-cross-platform.js
@@ -0,0 +1,64 @@
+#!/usr/bin/env node
+// Cross-platform test script to demonstrate artifact naming for different versions
+
+const fs = require('fs');
+const path = require('path');
+
+console.log('=== Artifact Naming Test (Cross-Platform) ===');
+console.log('');
+
+// Get current version
+const packageJsonPath = path.join(__dirname, '..', 'package.json');
+const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+const currentVersion = packageJson.version;
+
+console.log(`Current version: ${currentVersion}`);
+
+// Function to get artifact suffix
+function getArtifactSuffix(version) {
+    if (version.includes('alpha')) {
+        return `alpha-${version}-`;
+    } else if (version.includes('beta')) {
+        return `beta-${version}-`;
+    } else {
+        return '';
+    }
+}
+
+// Test scenarios
+const testVersions = [
+    '1.0.5',               // Release version
+    '1.0.5-alpha.2',       // Alpha version
+    '1.0.5-beta.1',        // Beta version
+    '2.0.0-alpha.1',       // Another alpha
+    '1.5.0-beta.3'         // Another beta
+];
+
+console.log('Test scenarios:');
+console.log('==================');
+
+testVersions.forEach(version => {
+    const suffix = getArtifactSuffix(version);
+    
+    // Different artifact names for different platforms
+    const windowsArtifact = `imex-partner-${suffix}x64.exe`;
+    const macArtifact = `imex-partner-${suffix}x64.dmg`;
+    const linuxArtifact = `imex-partner-${suffix}x64.AppImage`;
+    
+    console.log(`Version: ${version}`);
+    console.log(`  Suffix: '${suffix}'`);
+    console.log(`  Windows: ${windowsArtifact}`);
+    console.log(`  Mac: ${macArtifact}`);
+    console.log(`  Linux: ${linuxArtifact}`);
+    console.log('');
+});
+
+console.log('Current configuration will produce:');
+const currentSuffix = getArtifactSuffix(currentVersion);
+console.log(`  Windows: imex-partner-${currentSuffix}x64.exe`);
+console.log(`  Mac: imex-partner-${currentSuffix}x64.dmg`);
+console.log(`  Linux: imex-partner-${currentSuffix}x64.AppImage`);
+
+console.log('');
+console.log(`Platform detected: ${process.platform}`);
+console.log(`Architecture: ${process.arch}`);
--- a/deploy/test-artifact-naming.ps1
+++ b/deploy/test-artifact-naming.ps1
@@ -0,0 +1,48 @@
+# Test script to demonstrate artifact naming for different versions
+Write-Host "=== Artifact Naming Test ==="
+Write-Host ""
+
+# Test current version
+$packageJsonPath = ".\package.json"
+$packageJson = Get-Content $packageJsonPath | ConvertFrom-Json
+$currentVersion = $packageJson.version
+
+Write-Host "Current version: $currentVersion"
+
+# Function to get artifact suffix
+function Get-ArtifactSuffix($version) {
+    if ($version -match "alpha") {
+        return "alpha-${version}-"
+    } elseif ($version -match "beta") {
+        return "beta-${version}-"
+    } else {
+        return ""
+    }
+}
+
+# Test scenarios
+$testVersions = @(
+    "1.0.5",               # Release version
+    "1.0.5-alpha.2",       # Alpha version
+    "1.0.5-beta.1",        # Beta version
+    "2.0.0-alpha.1",       # Another alpha
+    "1.5.0-beta.3"         # Another beta
+)
+
+Write-Host "Test scenarios:"
+Write-Host "=================="
+
+foreach ($version in $testVersions) {
+    $suffix = Get-ArtifactSuffix $version
+    $artifactName = "imex-partner-${suffix}x64.exe"
+    
+    Write-Host "Version: $version"
+    Write-Host "  Suffix: '$suffix'"
+    Write-Host "  Result: $artifactName"
+    Write-Host ""
+}
+
+Write-Host "Current configuration will produce:"
+$currentSuffix = Get-ArtifactSuffix $currentVersion
+$currentArtifact = "imex-partner-${currentSuffix}x64.exe"
+Write-Host "  $currentArtifact"
--- a/deploy/test-artifact-naming.sh
+++ b/deploy/test-artifact-naming.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+# Test script to demonstrate artifact naming for different versions on Mac
+
+echo "=== Artifact Naming Test (Mac) ==="
+echo ""
+
+# Get current version
+PACKAGE_JSON_PATH="./package.json"
+CURRENT_VERSION=$(node -p "require('$PACKAGE_JSON_PATH').version")
+
+echo "Current version: $CURRENT_VERSION"
+
+# Function to get artifact suffix
+get_artifact_suffix() {
+    local version=$1
+    if [[ $version == *"alpha"* ]]; then
+        echo "alpha-${version}-"
+    elif [[ $version == *"beta"* ]]; then
+        echo "beta-${version}-"
+    else
+        echo ""
+    fi
+}
+
+# Test scenarios
+TEST_VERSIONS=(
+    "1.0.5"               # Release version
+    "1.0.5-alpha.2"       # Alpha version
+    "1.0.5-beta.1"        # Beta version
+    "2.0.0-alpha.1"       # Another alpha
+    "1.5.0-beta.3"        # Another beta
+)
+
+echo "Test scenarios:"
+echo "=================="
+
+for version in "${TEST_VERSIONS[@]}"; do
+    suffix=$(get_artifact_suffix "$version")
+    artifact_name="imex-partner-${suffix}x64.dmg"
+    
+    echo "Version: $version"
+    echo "  Suffix: '$suffix'"
+    echo "  Result: $artifact_name"
+    echo ""
+done
+
+echo "Current configuration will produce:"
+current_suffix=$(get_artifact_suffix "$CURRENT_VERSION")
+current_artifact="imex-partner-${current_suffix}x64.dmg"
+echo "  $current_artifact"
--- a/electron-builder.imex.yml
+++ b/electron-builder.imex.yml
@@ -22,8 +22,9 @@ win:
    endpoint: https://eus.codesigning.azure.net
    certificateProfileName: ImEXRPS
    codeSigningAccountName: ImEX
+    publisherName: ImEX Systems Inc.
 nsis:
-  artifactName: ${name}-${version}-setup.${ext}
+  artifactName: imex-partner-${env.ARTIFACT_SUFFIX}${arch}.${ext}
  shortcutName: ${productName}
  uninstallDisplayName: ${productName}
  createDesktopShortcut: always
@@ -49,19 +50,11 @@ mac:
      arch:
        - x64
 dmg:
-  artifactName: ${name}-${version}-${arch}.${ext}
-linux:
-  target:
-    - AppImage
-    - snap
-    - deb
-  maintainer: electronjs.org
-  category: Utility
-  desktop: scripts/imex-shop-partner.desktop
+  artifactName: imex-partner-${env.ARTIFACT_SUFFIX}${arch}.${ext}
 appImage:
-  artifactName: ${name}-${version}.${ext}
+  artifactName: imex-partner-${env.ARTIFACT_SUFFIX}${arch}.${ext}
 npmRebuild: false
 publish:
  provider: s3
  bucket: imex-partner
-  region: ca-central-1
+  region: ca-central-1
--- a/electron-builder.rome.yml
+++ b/electron-builder.rome.yml
@@ -17,13 +17,14 @@ asarUnpack:
  - resources/**
 win:
  executableName: ShopPartner
-  icon: resources/icon.png
+  icon: resources/ro-icon.png
  azureSignOptions:
    endpoint: https://eus.codesigning.azure.net
    certificateProfileName: ImEXRPS
    codeSigningAccountName: ImEX
+    publisherName: ImEX Systems Inc.
 nsis:
-  artifactName: ${name}-${version}-setup.${ext}
+  artifactName: rome-partner-${env.ARTIFACT_SUFFIX}${arch}.${ext}
  shortcutName: ${productName}
  uninstallDisplayName: ${productName}
  createDesktopShortcut: always
@@ -31,6 +32,7 @@ nsis:
 mac:
  entitlementsInherit: build/entitlements.mac.plist
  category: public.app-category.business
+  icon: resources/ro-icon.png
  extendInfo:
    - NSCameraUsageDescription: Application requests access to the device's camera.
    - NSMicrophoneUsageDescription: Application requests access to the device's microphone.
@@ -49,19 +51,11 @@ mac:
      arch:
        - x64
 dmg:
-  artifactName: ${name}-${version}-${arch}.${ext}
-linux:
-  target:
-    - AppImage
-    - snap
-    - deb
-  maintainer: electronjs.org
-  category: Utility
-  desktop: scripts/rome-shop-partner.desktop
+  artifactName: rome-partner-${env.ARTIFACT_SUFFIX}${arch}.${ext}
 appImage:
-  artifactName: ${name}-${version}.${ext}
+  artifactName: rome-partner-${env.ARTIFACT_SUFFIX}${arch}.${ext}
 npmRebuild: false
 publish:
  provider: s3
  bucket: rome-partner
-  region: us-east-2
+  region: us-east-2
--- a/electron.vite.config.ts
+++ b/electron.vite.config.ts
@@ -6,10 +6,18 @@ import react from "@vitejs/plugin-react";
 export default defineConfig({
  main: {
    plugins: [
-      externalizeDepsPlugin(),
+      externalizeDepsPlugin({
+        exclude: ["electron-store"],
+      }),
      sentryVitePlugin({
        org: "imex",
        project: "imex-partner",
+        sourcemaps: {
+          filesToDeleteAfterUpload: ["**.js.map"],
+        },
+        release: {
+          name: `bodyshop-desktop@${process.env.npm_package_version}`,
+        },
      }),
    ],
    build: {
@@ -32,6 +40,12 @@ export default defineConfig({
      sentryVitePlugin({
        org: "imex",
        project: "imex-partner",
+        sourcemaps: {
+          filesToDeleteAfterUpload: ["**.js.map"],
+        },
+        release: {
+          name: `bodyshop-desktop@${process.env.npm_package_version}`,
+        },
      }),
    ],
    build: {
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "bodyshop-desktop",
-  "version": "0.0.1-alpha.8",
+  "version": "1.0.7",
  "description": "Shop Management System Partner",
  "main": "./out/main/index.js",
  "author": "Convenient Brands, LLC",
@@ -13,78 +13,79 @@
    "typecheck": "npm run typecheck:node && npm run typecheck:web",
    "start": "electron-vite preview",
    "dev": "electron-vite dev",
-    "build:imex": "electron-vite build --mode imex && electron-builder --config electron-builder.imex.yml",
-    "build:rome": "electron-vite build --mode rome && electron-builder --config electron-builder.rome.yml",
-    "build:imex:publish": "electron-vite build --mode imex && electron-builder --config electron-builder.imex.yml --publish always",
-    "build:rome:publish": "electron-vite build --mode rome && electron-builder --config electron-builder.rome.yml --publish always",
-    "build:imex:linux": "electron-vite build --mode imex && electron-builder --config electron-builder.imex.yml --linux",
-    "build:rome:linux": "electron-vite build --mode rome && electron-builder --config electron-builder.rome.yml --linux",
+    "build:imex": "node deploy/set-artifact-name.js electron-vite build --mode imex && node deploy/set-artifact-name.js electron-builder --config electron-builder.imex.yml",
+    "build:rome": "node deploy/set-artifact-name.js electron-vite build --mode rome && node deploy/set-artifact-name.js electron-builder --config electron-builder.rome.yml",
+    "build:imex:publish": "node deploy/set-artifact-name.js electron-vite build --mode imex && node deploy/set-artifact-name.js electron-builder --config electron-builder.imex.yml --publish always",
+    "build:rome:publish": "node deploy/set-artifact-name.js electron-vite build --mode rome && node deploy/set-artifact-name.js electron-builder --config electron-builder.rome.yml --publish always",
+    "build:imex:linux": "node deploy/set-artifact-name.js electron-vite build --mode imex && node deploy/set-artifact-name.js electron-builder --config electron-builder.imex.yml --linux",
+    "build:rome:linux": "node deploy/set-artifact-name.js electron-vite build --mode rome && node deploy/set-artifact-name.js electron-builder --config electron-builder.rome.yml --linux",
    "postinstall": "electron-builder install-app-deps",
-    "build:unpack": "electron-vite build --mode imex && electron-builder --dir",
-    "build:win": "electron-vite build --mode imex && electron-builder --win",
-    "build:mac": "electron-vite build --mode imex && electron-builder --mac",
-    "build:linux": "electron-vite build --mode imex && electron-builder --linux"
+    "build:unpack": "node deploy/set-artifact-name.js electron-vite build --mode imex && node deploy/set-artifact-name.js electron-builder --dir",
+    "build:win": "node deploy/set-artifact-name.js electron-vite build --mode imex && node deploy/set-artifact-name.js electron-builder --win",
+    "build:mac": "node deploy/set-artifact-name.js electron-vite build --mode imex && node deploy/set-artifact-name.js electron-builder --mac",
+    "build:linux": "node deploy/set-artifact-name.js electron-vite build --mode imex && node deploy/set-artifact-name.js electron-builder --linux"
  },
  "dependencies": {
    "@apollo/client": "^3.13.6",
-    "@electron-toolkit/preload": "^3.0.1",
+    "@electron-toolkit/preload": "^3.0.2",
    "@electron-toolkit/utils": "^4.0.0",
-    "@sentry/electron": "^6.5.0",
-    "@sentry/vite-plugin": "^3.3.1",
-    "axios": "^1.9.0",
-    "dayjs": "^1.11.13",
-    "electron-log": "^5.3.3",
-    "electron-store": "^8.2.0",
+    "@sentry/electron": "^7.2.0",
+    "@sentry/vite-plugin": "^4.5.0",
+    "axios": "^1.12.2",
+    "dayjs": "^1.11.18",
+    "electron-log": "^5.4.3",
    "electron-updater": "^6.6.2",
    "winax": "^3.6.2"
  },
  "devDependencies": {
    "@ant-design/v5-patch-for-react-19": "^1.0.3",
    "@electron-toolkit/eslint-config-prettier": "^3.0.0",
-    "@electron-toolkit/eslint-config-ts": "^3.0.0",
-    "@electron-toolkit/tsconfig": "^1.0.1",
-    "@playwright/test": "^1.51.1",
-    "@reduxjs/toolkit": "^2.6.1",
-    "@types/cors": "^2.8.17",
-    "@types/express": "^5.0.1",
-    "@types/lodash": "^4.17.16",
-    "@types/node": "^22.14.0",
+    "@electron-toolkit/eslint-config-ts": "^3.1.0",
+    "@electron-toolkit/tsconfig": "^2.0.0",
+    "@playwright/test": "^1.56.1",
+    "@reduxjs/toolkit": "^2.9.1",
+    "@types/cors": "^2.8.19",
+    "@types/express": "^5.0.3",
+    "@types/lodash": "^4.17.20",
+    "@types/node": "^24.9.1",
    "@types/node-cron": "^3.0.11",
-    "@types/react": "^19.1.0",
-    "@types/react-dom": "^19.1.2",
+    "@types/react": "^19.2.2",
+    "@types/react-dom": "^19.2.2",
    "@types/xml2js": "^0.4.14",
-    "@vitejs/plugin-react": "^4.3.4",
-    "antd": "^5.24.6",
+    "@vitejs/plugin-react": "^5.0.4",
+    "antd": "^5.27.6",
+    "archiver": "^7.0.1",
    "chokidar": "^4.0.3",
    "cors": "^2.8.5",
+    "cross-env": "^10.1.0",
    "dbffile": "^1.12.0",
-    "electron": "^35.1.5",
-    "electron-builder": "^25.1.8",
-    "electron-store": "^8.2.0",
-    "electron-vite": "^3.1.0",
-    "eslint": "^9.24.0",
+    "electron": "^38.3.0",
+    "electron-builder": "^26.0.12",
+    "electron-store": "^11.0.2",
+    "electron-vite": "^4.0.1",
+    "eslint": "^9.38.0",
    "eslint-plugin-react": "^7.37.5",
-    "eslint-plugin-react-hooks": "^5.2.0",
-    "eslint-plugin-react-refresh": "^0.4.19",
+    "eslint-plugin-react-hooks": "^7.0.0",
+    "eslint-plugin-react-refresh": "^0.4.24",
    "express": "^5.1.0",
-    "firebase": "^11.6.0",
-    "graphql": "^16.10.0",
-    "graphql-request": "^7.1.2",
-    "i18next": "^24.2.3",
+    "firebase": "^12.4.0",
+    "graphql": "^16.11.0",
+    "graphql-request": "^7.3.1",
+    "i18next": "^25.6.0",
    "lodash": "^4.17.21",
-    "playwright": "^1.51.1",
-    "prettier": "^3.5.3",
-    "react": "^19.1.0",
-    "react-dom": "^19.1.0",
-    "react-error-boundary": "^5.0.0",
-    "react-i18next": "^15.4.1",
+    "node-cron": "^4.2.1",
+    "playwright": "^1.56.1",
+    "prettier": "^3.6.2",
+    "react": "^19.2.0",
+    "react-dom": "^19.2.0",
+    "react-error-boundary": "^6.0.0",
+    "react-i18next": "^16.1.4",
    "react-redux": "^9.2.0",
-    "react-router": "^7.5.0",
+    "react-router": "^7.9.4",
    "redux-logger": "^3.0.6",
-    "typescript": "^5.8.3",
-    "vite": "6.2.6",
+    "typescript": "^5.9.3",
+    "vite": "7.1.11",
    "xml2js": "^0.6.2",
-    "xmlbuilder2": "^3.1.1",
-    "node-cron": "^3.0.3"
+    "xmlbuilder2": "^4.0.0"
  }
 }
--- a/resources/ro-icon.png
+++ b/resources/ro-icon.png
--- a/src/main/decoder/decode-ad1.ts
+++ b/src/main/decoder/decode-ad1.ts
@@ -182,7 +182,9 @@ const DecodeAD1 = async (
  if (!rawAd1Data.ownr_ph1 || _.isEmpty(rawAd1Data.ownr_ph1)) {
    rawAd1Data.ownr_ph1 = rawAd1Data.ownr_ph2;
  }
-
+  if (rawAd1Data.clm_no === "") {
+    rawAd1Data.clm_no = undefined;
+  }
  let ownerRecord: OwnerRecordInterface;
  //Check if the owner information is there. If not, use the insured information as a fallback.
  if (
--- a/src/main/decoder/decoder.ts
+++ b/src/main/decoder/decoder.ts
@@ -43,6 +43,7 @@ import { DecodedTtl } from "./decode-ttl.interface";
 import DecodeVeh from "./decode-veh";
 import { DecodedVeh } from "./decode-veh.interface";
 import setAppProgressbar from "../util/setAppProgressBar";
+import UploadEmsToS3 from "./emsbackup";

 async function ImportJob(filepath: string): Promise<void> {
  const parsedFilePath = path.parse(filepath);
@@ -156,14 +157,16 @@ async function ImportJob(filepath: string): Promise<void> {
    console.log("Available Job record to upload;", newAvailableJob);

    setAppProgressbar(0.95);
-    const existingJobRecord: QueryJobByClmNoResult = await client.request(
-      QUERY_JOB_BY_CLM_NO_TYPED,
-      { clm_no: jobObject.clm_no },
-    );
+    if (jobObject.clm_no) {
+      const existingJobRecord: QueryJobByClmNoResult = await client.request(
+        QUERY_JOB_BY_CLM_NO_TYPED,
+        { clm_no: jobObject.clm_no },
+      );

-    if (existingJobRecord.jobs.length > 0) {
-      newAvailableJob.issupplement = true;
-      newAvailableJob.jobid = existingJobRecord.jobs[0].id;
+      if (existingJobRecord.jobs.length > 0) {
+        newAvailableJob.issupplement = true;
+        newAvailableJob.jobid = existingJobRecord.jobs[0].id;
+      }
    }

    const insertRecordResult: InsertAvailableJobResult = await client.request(
@@ -191,6 +194,14 @@ async function ImportJob(filepath: string): Promise<void> {
    uploadNotification.show();

    log.debug("Job inserted", insertRecordResult);
+
+    UploadEmsToS3({
+      extensionlessFilePath,
+      bodyshopid: newAvailableJob.bodyshopid,
+      ciecaid: jobObject.ciecaid ?? "",
+      clm_no: jobObject.clm_no ?? "",
+      ownr_ln: jobObject.ownr_ln ?? "",
+    });
  } catch (error) {
    log.error("Error encountered while decoding job. ", errorTypeCheck(error));
    const uploadNotificationFailure = new Notification({
--- a/src/main/decoder/emsbackup.ts
+++ b/src/main/decoder/emsbackup.ts
@@ -0,0 +1,104 @@
+import axios from "axios";
+import archiver from "archiver";
+import errorTypeCheck from "../../util/errorTypeCheck";
+import { UUID } from "crypto";
+import fs from "fs";
+import path from "path";
+import stream from "stream";
+import { getTokenFromRenderer } from "../graphql/graphql-client";
+import store from "../store/store";
+
+async function UploadEmsToS3({
+  extensionlessFilePath,
+  bodyshopid,
+  clm_no,
+  ciecaid,
+  ownr_ln,
+}: {
+  extensionlessFilePath: string;
+  bodyshopid: UUID;
+  clm_no: string;
+  ciecaid: string;
+  ownr_ln: string;
+}): Promise<boolean> {
+  // This function is a placeholder for the actual upload logic
+  try {
+    const directory = path.dirname(extensionlessFilePath);
+    const baseFilename = path.basename(extensionlessFilePath);
+
+    // Find all files in the directory that start with the base filename
+    const filesToZip = fs
+      .readdirSync(directory)
+      .filter((file) => file.startsWith(baseFilename))
+      .map((file) => path.join(directory, file));
+
+    if (filesToZip.length === 0) {
+      console.error("No files found to zip.");
+      return false;
+    }
+
+    // Create a zip archive in memory
+    const archive = archiver("zip", { zlib: { level: 9 } });
+    const zipBuffer = await new Promise<Buffer>((resolve, reject) => {
+      const buffers: Buffer[] = [];
+      const writableStream = new stream.Writable({
+        write(chunk, _encoding, callback) {
+          buffers.push(chunk);
+          callback();
+        },
+      });
+
+      writableStream.on("finish", () => resolve(Buffer.concat(buffers)));
+      writableStream.on("error", reject);
+
+      archive.pipe(writableStream);
+
+      // Append files to the archive
+      filesToZip.forEach((file) => {
+        archive.file(file, { name: path.basename(file) });
+      });
+
+      archive.finalize();
+    });
+
+    // Get the presigned URL from the server
+    const presignedUrlResponse = await axios.post(
+      `${
+        store.get("app.isTest")
+          ? import.meta.env.VITE_API_TEST_URL
+          : import.meta.env.VITE_API_URL
+      }/emsupload`,
+      {
+        bodyshopid,
+        ciecaid,
+        clm_no,
+        ownr_ln,
+      },
+      {
+        headers: {
+          Authorization: `Bearer ${await getTokenFromRenderer()}`,
+        },
+      },
+    );
+
+    const presignedUrl = presignedUrlResponse.data?.presignedUrl;
+    if (!presignedUrl) {
+      console.error("Failed to retrieve presigned URL.");
+      return false;
+    }
+
+    // Upload the zip file to S3 using the presigned URL
+    await axios.put(presignedUrl, zipBuffer, {
+      headers: {
+        "Content-Type": "application/zip",
+      },
+    });
+  } catch (error) {
+    console.error("Error uploading EMS to S3:", errorTypeCheck(error));
+    return false;
+  }
+
+  return true; // Return true if the upload is successful
+}
+
+export default UploadEmsToS3;
--- a/src/main/ems-parts-order/ems-parts-order-generate-lin.ts
+++ b/src/main/ems-parts-order/ems-parts-order-generate-lin.ts
@@ -19,6 +19,8 @@ const EmsPartsOrderGenerateLinFile = async (
      DB_REF: partsOrderLine.jobline?.db_ref,
      UNQ_SEQ: partsOrderLine.jobline?.unq_seq,
      WHO_PAYS: partsOrderLine.jobline?.who_pays,
+      PART_DESCJ: partsOrderLine.jobline?.part_descj,
+
      LINE_DESC: partsOrderLine.jobline?.line_desc,
      PART_TYPE:
        partsOrderLine.priceChange === true
--- a/src/main/ems-parts-order/ems-parts-order-generate-ttl.ts
+++ b/src/main/ems-parts-order/ems-parts-order-generate-ttl.ts
@@ -24,7 +24,7 @@ const EmsPartsOrderGenerateTtlFile = async (
      ttlFieldLineDescriptors,
    );

-    await dbf.appendRecords(records);
+    await dbf.appendRecords([records]);
    console.log(`${records.length} TTL file records added.`);
    return true;
  } catch (error) {
--- a/src/main/ems-parts-order/ems-parts-order-interfaces.ts
+++ b/src/main/ems-parts-order/ems-parts-order-interfaces.ts
@@ -79,6 +79,7 @@ export interface Jobline {
  bett_type: string | null;
  cert_part: boolean;
  est_seq: string | null;
+  part_descj: boolean;
 }

 // Parts Order Line export interface
--- a/src/main/graphql/graphql-client.ts
+++ b/src/main/graphql/graphql-client.ts
@@ -4,6 +4,7 @@ import { GraphQLClient, RequestMiddleware } from "graphql-request";
 import errorTypeCheck from "../../util/errorTypeCheck.js";
 import ipcTypes from "../../util/ipcTypes.json";
 import store from "../store/store.js";
+import getMainWindow from "../../util/getMainWindow.js";

 const requestMiddleware: RequestMiddleware = async (request) => {
  const token = await getTokenFromRenderer();
@@ -32,9 +33,9 @@ const client: GraphQLClient = new GraphQLClient(
 export async function getTokenFromRenderer(): Promise<string> {
  return new Promise((resolve) => {
    try {
-      const mainWindow = BrowserWindow.getAllWindows()[0]; //TODO: Filter to only main window once a proper key has been set.
+      const mainWindow = getMainWindow();
      //TODO: Verify that this will work if the app is minimized/closed.
-      mainWindow.webContents.send(ipcTypes.toRenderer.user.getToken);
+      mainWindow?.webContents.send(ipcTypes.toRenderer.user.getToken);
    } catch (error) {
      log.error(
        "Unable to send request to renderer process for token",
--- a/src/main/graphql/queries.ts
+++ b/src/main/graphql/queries.ts
@@ -2,6 +2,7 @@ import { UUID } from "crypto";
 import { parse, TypedQueryDocumentNode } from "graphql";
 import { gql } from "graphql-request";
 import { AvailableJobSchema } from "../decoder/decoder";
+
 // Define types for the query result and variables
 export interface ActiveBodyshopQueryResult {
  bodyshops: Array<{
@@ -11,9 +12,8 @@ export interface ActiveBodyshopQueryResult {
    convenient_company: string;
  }>;
 }
-// No variables needed for this query

-// Transform the string query into a TypedQueryDocumentNode
+// No variables needed for this query
 export const QUERY_ACTIVE_BODYSHOP_TYPED: TypedQueryDocumentNode<
  ActiveBodyshopQueryResult,
  Record<never, never>
@@ -34,9 +34,11 @@ export interface MasterdataQueryResult {
    key: string;
  }>;
 }
+
 interface MasterdataQueryVariables {
  key: string;
 }
+
 export const QUERY_MASTERDATA_TYPED: TypedQueryDocumentNode<
  MasterdataQueryResult,
  MasterdataQueryVariables
@@ -54,9 +56,11 @@ export interface VehicleQueryResult {
    id: UUID;
  }>;
 }
+
 interface VehicleQueryVariables {
  vin: string;
 }
+
 export const QUERY_VEHICLE_BY_VIN_TYPED: TypedQueryDocumentNode<
  VehicleQueryResult,
  VehicleQueryVariables
@@ -73,9 +77,11 @@ export interface QueryJobByClmNoResult {
    id: UUID;
  }>;
 }
+
 export interface QueryJobByClmNoVariables {
  clm_no: string;
 }
+
 export const QUERY_JOB_BY_CLM_NO_TYPED: TypedQueryDocumentNode<
  QueryJobByClmNoResult,
  QueryJobByClmNoVariables
@@ -92,9 +98,11 @@ export interface InsertAvailableJobResult {
    id: UUID;
  }>;
 }
+
 export interface InsertAvailableJobVariables {
  jobInput: Array<AvailableJobSchema>;
 }
+
 export const INSERT_AVAILABLE_JOB_TYPED: TypedQueryDocumentNode<
  InsertAvailableJobResult,
  InsertAvailableJobVariables
@@ -125,3 +133,140 @@ export const INSERT_AVAILABLE_JOB_TYPED: TypedQueryDocumentNode<
  InsertAvailableJobResult,
  InsertAvailableJobVariables
 >;
+
+// Add PpgData Query
+export interface PpgDataQueryResult {
+  bodyshops_by_pk: {
+    id: string;
+    shopname: string;
+    imexshopid: string;
+  } | null;
+  jobs: Array<{
+    id: string;
+    ro_number: string;
+    status: string;
+    ownr_fn: string;
+    ownr_ln: string;
+    ownr_co_nm: string;
+    v_vin: string;
+    v_model_yr: string;
+    v_make_desc: string;
+    v_model_desc: string;
+    v_color: string;
+    plate_no: string;
+    ins_co_nm: string;
+    est_ct_fn: string;
+    est_ct_ln: string;
+    rate_mapa: number;
+    rate_lab: number;
+    job_totals: {
+      rates?: {
+        mapa?: {
+          total?: {
+            amount?: number;
+          };
+        };
+      };
+      totals?: {
+        subtotal?: {
+          amount?: number;
+        };
+      };
+    };
+    vehicle: {
+      v_paint_codes: {
+        paint_cd1?: string;
+      };
+    };
+    labhrs: {
+      aggregate: {
+        sum: {
+          mod_lb_hrs: number;
+        };
+      };
+    };
+    larhrs: {
+      aggregate: {
+        sum: {
+          mod_lb_hrs: number;
+        };
+      };
+    };
+  }>;
+}
+
+export interface PpgDataQueryVariables {
+  today: string;
+  todayplus5: string;
+  shopid: string;
+}
+
+export const PPG_DATA_QUERY_TYPED: TypedQueryDocumentNode<
+  PpgDataQueryResult,
+  PpgDataQueryVariables
+> = parse(gql`
+  query PpgData(
+    $today: timestamptz!
+    $todayplus5: timestamptz!
+    $shopid: uuid!
+  ) {
+    bodyshops_by_pk(id: $shopid) {
+      id
+      shopname
+      imexshopid
+    }
+    jobs(
+      where: {
+        _or: [
+          {
+            _and: [
+              { scheduled_in: { _lte: $todayplus5 } }
+              { scheduled_in: { _gte: $today } }
+            ]
+          }
+          { inproduction: { _eq: true } }
+        ]
+      }
+    ) {
+      id
+      ro_number
+      status
+      ownr_fn
+      ownr_ln
+      ownr_co_nm
+      v_vin
+      v_model_yr
+      v_make_desc
+      v_model_desc
+      v_color
+      plate_no
+      ins_co_nm
+      est_ct_fn
+      est_ct_ln
+      rate_mapa
+      rate_lab
+      job_totals
+      vehicle {
+        v_paint_codes
+      }
+      labhrs: joblines_aggregate(
+        where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }
+      ) {
+        aggregate {
+          sum {
+            mod_lb_hrs
+          }
+        }
+      }
+      larhrs: joblines_aggregate(
+        where: { mod_lbr_ty: { _eq: "LAR" }, removed: { _eq: false } }
+      ) {
+        aggregate {
+          sum {
+            mod_lb_hrs
+          }
+        }
+      }
+    }
+  }
+`) as TypedQueryDocumentNode<PpgDataQueryResult, PpgDataQueryVariables>;
--- a/src/main/http-server/http-server.ts
+++ b/src/main/http-server/http-server.ts
@@ -31,6 +31,12 @@ export default class LocalServer {
      "https://localhost:3000",
      "https://test.imex.online",
      "https://imex.online",
+      "https://test.romeonline.io",
+      "https://romeonline.io",
+      "https://www.test.imex.online",
+      "https://www.imex.online",
+      "https://www.test.romeonline.io",
+      "https://www.romeonline.io",
    ];

    this.app.use(
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -13,7 +13,9 @@ import {
 import log from "electron-log/main";
 import { autoUpdater } from "electron-updater";
 import path, { join } from "path";
-import appIcon from "../../resources/icon.png?asset";
+import imexAppIcon from "../../resources/icon.png?asset";
+import romeAppIcon from "../../resources/ro-icon.png?asset";
+
 import {
  default as ErrorTypeCheck,
  default as errorTypeCheck,
@@ -33,12 +35,24 @@ import {
  isKeepAliveTaskInstalled,
  setupKeepAliveTask,
 } from "./setup-keep-alive-task";
+import ensureWindowOnScreen from "./util/ensureWindowOnScreen";
+import ongoingMemoryDump, { dumpMemoryStatsToFile } from "../util/memUsage";
+
+const appIconToUse =
+  import.meta.env.VITE_COMPANY === "IMEX" ? imexAppIcon : romeAppIcon;

 Sentry.init({
  dsn: "https://ba41d22656999a8c1fd63bcb7df98650@o492140.ingest.us.sentry.io/4509074139447296",
 });

 log.initialize();
+
+// Configure log format to include process ID
+log.transports.file.format =
+  "[{y}-{m}-{d} {h}:{i}:{s}.{ms}] [{level}] [PID:{processId}] {text}";
+log.transports.console.format =
+  "[{y}-{m}-{d} {h}:{i}:{s}.{ms}] [{level}] [PID:{processId}] {text}";
+log.transports.file.maxSize = 50 * 1024 * 1024; // 50 MB
 const isMac: boolean = process.platform === "darwin";
 const protocol: string = "imexmedia";
 let isAppQuitting = false; //Needed on Mac as an override to allow us to fully quit the app.
@@ -47,6 +61,14 @@ let isKeepAliveLaunch = false; // Track if launched via keep-alive
 const localServer = new LocalServer();
 const gotTheLock = app.requestSingleInstanceLock();

+if (!gotTheLock) {
+  log.warn(
+    "Another instance is already running and could not obtain mutex lock. Exiting this instance.",
+  );
+  isAppQuitting = true;
+  app.quit(); // Quit the app if another instance is already running
+}
+
 function createWindow(): void {
  // Create the browser window.
  const { width, height, x, y } = store.get("app.windowBounds") as {
@@ -56,16 +78,23 @@ function createWindow(): void {
    y: number | undefined;
  };

+  // Validate window position is on screen
+  const { validX, validY } = ensureWindowOnScreen(x, y, width, height);
+
  const mainWindow = new BrowserWindow({
    width,
    height,
-    x,
-    y,
+    x: validX,
+    y: validY,
    show: false, // Start hidden, show later if not keep-alive
    minWidth: 600,
    minHeight: 400,
    //autoHideMenuBar: true,
-    ...(process.platform === "linux" ? { icon: appIcon } : {}),
+    ...(process.platform === "linux"
+      ? {
+          icon: appIconToUse,
+        }
+      : {}),
    title: "Shop Partner",
    webPreferences: {
      preload: join(__dirname, "../preload/index.js"),
@@ -239,6 +268,27 @@ function createWindow(): void {
            {
              type: "separator",
            },
+            {
+              label: "Enable Memory Logging",
+              checked: store.get("settings.enableMemDebug") as boolean,
+              type: "checkbox",
+              click: (): void => {
+                const currentSetting = store.get(
+                  "settings.enableMemDebug",
+                ) as boolean;
+                store.set("settings.enableMemDebug", !currentSetting);
+                log.info("Enable Memory Logging set to", !currentSetting);
+              },
+            },
+            {
+              label: "Dump Memory Stats Now",
+              click: (): void => {
+                dumpMemoryStatsToFile();
+              },
+            },
+            {
+              type: "separator",
+            },
            // {
            //   label: "Decode Hardcoded Estimate",
            //   click: (): void => {
@@ -416,9 +466,6 @@ function createWindow(): void {
  }
 }

-if (!gotTheLock) {
-  app.quit(); // Quit the app if another instance is already running
-}
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.
@@ -426,6 +473,8 @@ app.whenReady().then(async () => {
  // Default open or close DevTools by F12 in development
  // and ignore CommandOrControl + R in production.
  // see https://github.com/alex8088/electron-toolkit/tree/master/packages/utils
+  log.debug("App is ready, initializing shortcuts and protocol handlers.");
+
  if (platform.isWindows) {
    app.setAppUserModelId("Shop Partner");
  }
@@ -457,38 +506,28 @@ app.whenReady().then(async () => {
    log.warn("Failed to register protocol handler.");
  }

-  // Add this event handler for second instance
-  app.on("second-instance", (_event: Electron.Event, argv: string[]) => {
-    const url = argv.find((arg) => arg.startsWith(`${protocol}://`));
-    if (url) {
-      if (url.startsWith(`${protocol}://keep-alive`)) {
-        log.info("Keep-alive protocol received, app is already running.");
-        // Do nothing if already running
-        return; // Skip openMainWindow to avoid focusing the window
-      } else {
-        openInExplorer(url);
-      }
-    } else {
-      openMainWindow(); // Focus window if no URL
-    }
-  });
-
  //Dynamically load ipcMain handlers once ready.
  try {
-    const module = await import("./ipc/ipcMainConfig");
+    const { initializeCronTasks } = await import("./ipc/ipcMainConfig");
    log.debug("Successfully loaded ipcMainConfig");

-    // Initialize cron tasks after loading ipcMainConfig
-    await module.initializeCronTasks();
-    log.info("Cron tasks initialized successfully");
+    try {
+      await initializeCronTasks();
+      log.info("Cron tasks initialized successfully");
+    } catch (error) {
+      log.warn("Non-fatal: Failed to initialize cron tasks", {
+        ...ErrorTypeCheck(error),
+      });
+    }
  } catch (error) {
-    log.error("Failed to load ipcMainConfig or initialize cron tasks", {
+    log.error("Fatal: Failed to load ipcMainConfig", {
      ...ErrorTypeCheck(error),
    });
+    throw error; // Adjust based on whether the app should continue
  }

  //Create Tray
-  const trayicon = nativeImage.createFromPath(appIcon);
+  const trayicon = nativeImage.createFromPath(appIconToUse);
  const tray = new Tray(trayicon.resize({ width: 16 }));
  const contextMenu = Menu.buildFromTemplate([
    {
@@ -513,7 +552,7 @@ app.whenReady().then(async () => {

  //Check for app updates.
  autoUpdater.logger = log;
-
+  autoUpdater.allowDowngrade = true;
  // if (import.meta.env.DEV) {
  //   // Useful for some dev/debugging tasks, but download can
  //   // not be validated because dev app is not signed
@@ -528,19 +567,19 @@ app.whenReady().then(async () => {

  autoUpdater.on("checking-for-update", () => {
    log.info("Checking for update...");
-    const mainWindow = BrowserWindow.getAllWindows()[0];
+    const mainWindow = getMainWindow();
    mainWindow?.webContents.send(ipcTypes.toRenderer.updates.checking);
  });
  autoUpdater.on("update-available", (info) => {
    log.info("Update available.", info);
-    const mainWindow = BrowserWindow.getAllWindows()[0];
+    const mainWindow = getMainWindow();
    mainWindow?.webContents.send(ipcTypes.toRenderer.updates.available, info);
  });
  autoUpdater.on("download-progress", (progress) => {
    log.info(`Download speed: ${progress.bytesPerSecond}`);
    log.info(`Downloaded ${progress.percent}%`);
    log.info(`Total downloaded ${progress.transferred}/${progress.total}`);
-    const mainWindow = BrowserWindow.getAllWindows()[0];
+    const mainWindow = getMainWindow();
    mainWindow?.webContents.send(
      ipcTypes.toRenderer.updates.downloading,
      progress,
@@ -548,7 +587,7 @@ app.whenReady().then(async () => {
  });
  autoUpdater.on("update-downloaded", (info) => {
    log.info("Update downloaded", info);
-    const mainWindow = BrowserWindow.getAllWindows()[0];
+    const mainWindow = getMainWindow();
    mainWindow?.webContents.send(ipcTypes.toRenderer.updates.downloaded, info);
  });

@@ -559,7 +598,8 @@ app.whenReady().then(async () => {
  }

  //The update itself will run when the bodyshop record is queried to know what release channel to use.
-  createWindow();
+  openMainWindow();
+  ongoingMemoryDump();

  app.on("activate", function () {
    openMainWindow();
@@ -568,20 +608,33 @@ app.whenReady().then(async () => {

 app.on("open-url", (event: Electron.Event, url: string) => {
  event.preventDefault();
-  //Don't do anything for now. We just want to open the app.
  if (url.startsWith(`${protocol}://keep-alive`)) {
    log.info("Keep-alive protocol received.");
-    if (BrowserWindow.getAllWindows().length === 0) {
-      isKeepAliveLaunch = true;
-      openMainWindow(); // Launch app if not running
-    }
-    // Do nothing if already running
-    return; // Skip openMainWindow to avoid focusing the window
+    // Do nothing, whether app is running or not
+    return;
  } else {
    openInExplorer(url);
  }
 });

+// Add this event handler for second instance
+app.on("second-instance", (_event: Electron.Event, argv: string[]) => {
+  const url = argv.find((arg) => arg.startsWith(`${protocol}://`));
+  if (url) {
+    if (url.startsWith(`${protocol}://keep-alive`)) {
+      log.info(
+        "Keep-alive protocol received, app is already running. Nothing to do.",
+      );
+      // Do nothing if already running
+      return;
+    } else {
+      log.info("Received Media URL: ", url);
+      openInExplorer(url);
+    }
+  }
+  // No action taken if no URL is provided
+});
+
 // Quit when all windows are closed, except on macOS. There, it's common
 // for applications and their menu bar to stay active until the user quits
 // explicitly with Cmd + Q.
@@ -591,8 +644,7 @@ app.on("window-all-closed", () => {
  }
 });

-app.on("before-quit", (props) => {
-  console.log(props);
+app.on("before-quit", () => {
  preQuitMethods();
 });

@@ -622,7 +674,7 @@ function preQuitMethods(): void {
 }

 function openMainWindow(): void {
-  const mainWindow = BrowserWindow.getAllWindows()[0];
+  const mainWindow = getMainWindow();
  if (mainWindow) {
    mainWindow.show();
  } else {
--- a/src/main/ipc/ipcMainHandler.settings.ts
+++ b/src/main/ipc/ipcMainHandler.settings.ts
@@ -12,7 +12,6 @@ import {
 } from "../watcher/watcher";
 import { PaintScaleConfig } from "../../util/types/paintScale";

-
 // Initialize paint scale input configs in store if not set
 if (!Store.get("settings.paintScaleInputConfigs")) {
  Store.set("settings.paintScaleInputConfigs", []);
@@ -35,8 +34,8 @@ const SettingsWatchedFilePathsAdd = async (): Promise<string[]> => {

  if (!result.canceled) {
    Store.set(
-        "settings.filepaths",
-        _.union(result.filePaths, Store.get("settings.filepaths")),
+      "settings.filepaths",
+      _.union(result.filePaths, Store.get("settings.filepaths")),
    );
    addWatcherPath(result.filePaths);
  }
@@ -45,12 +44,12 @@ const SettingsWatchedFilePathsAdd = async (): Promise<string[]> => {
 };

 const SettingsWatchedFilePathsRemove = async (
-    _event: IpcMainInvokeEvent,
-    path: string,
+  _event: IpcMainInvokeEvent,
+  path: string,
 ): Promise<string[]> => {
  Store.set(
-      "settings.filepaths",
-      _.without(Store.get("settings.filepaths"), path),
+    "settings.filepaths",
+    _.without(Store.get("settings.filepaths"), path),
  );
  removeWatcherPath(path);
  return Store.get("settings.filepaths");
@@ -65,16 +64,16 @@ const SettingsWatcherPollingGet = async (): Promise<{
  interval: number;
 }> => {
  const pollingEnabled: { enabled: boolean; interval: number } =
-      Store.get("settings.polling");
+    Store.get("settings.polling");
  return { enabled: pollingEnabled.enabled, interval: pollingEnabled.interval };
 };

 const SettingsWatcherPollingSet = async (
-    _event: IpcMainInvokeEvent,
-    pollingSettings: {
-      enabled: boolean;
-      interval: number;
-    },
+  _event: IpcMainInvokeEvent,
+  pollingSettings: {
+    enabled: boolean;
+    interval: number;
+  },
 ): Promise<{
  enabled: boolean;
  interval: number;
@@ -131,11 +130,13 @@ const SettingEmsOutFilePathSet = async (): Promise<string> => {
  return (Store.get("settings.emsOutFilePath") as string) || "";
 };

-const SettingsPaintScaleInputConfigsGet = async (
-    _event?: IpcMainInvokeEvent,
-): Promise<PaintScaleConfig[]> => {
+const SettingsPaintScaleInputConfigsGet = (
+  _event?: IpcMainInvokeEvent,
+): PaintScaleConfig[] => {
  try {
-    const configs = Store.get("settings.paintScaleInputConfigs") as PaintScaleConfig[];
+    const configs = Store.get(
+      "settings.paintScaleInputConfigs",
+    ) as PaintScaleConfig[];
    log.debug("Retrieved paint scale input configs:", configs);
    return configs || [];
  } catch (error) {
@@ -145,8 +146,8 @@ const SettingsPaintScaleInputConfigsGet = async (
 };

 const SettingsPaintScaleInputConfigsSet = async (
-    _event: IpcMainInvokeEvent,
-    configs: PaintScaleConfig[],
+  _event: IpcMainInvokeEvent,
+  configs: PaintScaleConfig[],
 ): Promise<boolean> => {
  try {
    Store.set("settings.paintScaleInputConfigs", configs);
@@ -159,7 +160,7 @@ const SettingsPaintScaleInputConfigsSet = async (
 };

 const SettingsPaintScaleInputPathSet = async (
-    _event: IpcMainInvokeEvent,
+  _event: IpcMainInvokeEvent,
 ): Promise<string | null> => {
  try {
    const mainWindow = getMainWindow();
@@ -183,11 +184,13 @@ const SettingsPaintScaleInputPathSet = async (
  }
 };

-const SettingsPaintScaleOutputConfigsGet = async (
-    _event?: IpcMainInvokeEvent,
-): Promise<PaintScaleConfig[]> => {
+const SettingsPaintScaleOutputConfigsGet = (
+  _event?: IpcMainInvokeEvent,
+): PaintScaleConfig[] => {
  try {
-    const configs = Store.get("settings.paintScaleOutputConfigs") as PaintScaleConfig[];
+    const configs = Store.get(
+      "settings.paintScaleOutputConfigs",
+    ) as PaintScaleConfig[];
    log.debug("Retrieved paint scale output configs:", configs);
    return configs || [];
  } catch (error) {
@@ -197,8 +200,8 @@ const SettingsPaintScaleOutputConfigsGet = async (
 };

 const SettingsPaintScaleOutputConfigsSet = async (
-    _event: IpcMainInvokeEvent,
-    configs: PaintScaleConfig[],
+  _event: IpcMainInvokeEvent,
+  configs: PaintScaleConfig[],
 ): Promise<boolean> => {
  try {
    Store.set("settings.paintScaleOutputConfigs", configs);
@@ -211,7 +214,7 @@ const SettingsPaintScaleOutputConfigsSet = async (
 };

 const SettingsPaintScaleOutputPathSet = async (
-    _event: IpcMainInvokeEvent,
+  _event: IpcMainInvokeEvent,
 ): Promise<string | null> => {
  try {
    const mainWindow = getMainWindow();
@@ -251,4 +254,4 @@ export {
  SettingsPaintScaleOutputConfigsGet,
  SettingsPaintScaleOutputConfigsSet,
  SettingsPaintScaleOutputPathSet,
-};
+};
--- a/src/main/ipc/ipcMainHandler.user.ts
+++ b/src/main/ipc/ipcMainHandler.user.ts
@@ -20,19 +20,26 @@ const ipcMainHandleAuthStateChanged = async (
  user: User | null,
 ): Promise<void> => {
  Store.set("user", user);
+  log.debug("Received authentication state change from Renderer.", user);
+  await setReleaseChannel();
+  checkForAppUpdatesContinuously();
+};
+
+async function setReleaseChannel() {
  try {
    //Need to query the currently active shop, and store the metadata as well.
    //Also need to query the OP Codes for decoding reference.
-    log.debug("Received authentication state change from Renderer.", user);
-    handleShopMetaDataFetch();
+    await handleShopMetaDataFetch();
    //Check for updates
-    const convCo = Store.get("app.bodyshop");
-    if (convCo === "alpha") {
+    const bodyshop = Store.get("app.bodyshop");
+    if (bodyshop?.convenient_company?.toLowerCase() === "alpha") {
      autoUpdater.channel = "alpha";
      log.debug("Setting update channel to ALPHA channel.");
-    } else if (convCo === "beta") {
+    } else if (bodyshop?.convenient_company?.toLowerCase() === "beta") {
      autoUpdater.channel = "beta";
      log.debug("Setting update channel to BETA channel.");
+    } else {
+      log.debug("Setting update channel to LATEST channel.");
    }
  } catch (error) {
    log.error(
@@ -44,8 +51,7 @@ const ipcMainHandleAuthStateChanged = async (
      "Error connecting to ImEX Online servers to get shop data. Please try again.",
    );
  }
-  checkForAppUpdatesContinuously();
-};
+}

 const handleShopMetaDataFetch = async (
  reloadWindow?: boolean,
@@ -89,7 +95,8 @@ const ipMainHandleResetPassword = async (): Promise<void> => {
 };

 export {
+  handleShopMetaDataFetch,
  ipcMainHandleAuthStateChanged,
  ipMainHandleResetPassword,
-  handleShopMetaDataFetch,
+  setReleaseChannel,
 };
--- a/src/main/ipc/paintScaleHandlers/PPG.ts
+++ b/src/main/ipc/paintScaleHandlers/PPG.ts
@@ -5,24 +5,43 @@ import axios from "axios";
 import { create } from "xmlbuilder2";
 import { parseStringPromise } from "xml2js";
 import store from "../../store/store";
-import client from "../../graphql/graphql-client";
+import client, { getTokenFromRenderer } from "../../graphql/graphql-client";
 import { PaintScaleConfig } from "../../../util/types/paintScale";
+import dayjs from "dayjs";
+import {
+  PPG_DATA_QUERY_TYPED,
+  PpgDataQueryResult,
+  PpgDataQueryVariables,
+} from "../../graphql/queries";

-// PPG Input Handler
 export async function ppgInputHandler(config: PaintScaleConfig): Promise<void> {
  try {
    log.info(
      `Polling input directory for PPG config ${config.id}: ${config.path}`,
    );

+    log.debug(
+      `Archive dir: ${path.join(config.path!, "archive")}, Error dir: ${path.join(config.path!, "error")}`,
+    );
+
    // Ensure archive and error directories exist
    const archiveDir = path.join(config.path!, "archive");
    const errorDir = path.join(config.path!, "error");
-    await fs.mkdir(archiveDir, { recursive: true });
-    await fs.mkdir(errorDir, { recursive: true });
+    try {
+      await fs.mkdir(archiveDir, { recursive: true });
+      await fs.mkdir(errorDir, { recursive: true });
+      log.debug(
+        `Archive and error directories ensured: ${archiveDir}, ${errorDir}`,
+      );
+    } catch (dirError) {
+      log.error(`Failed to create directories for ${config.path}:`, dirError);
+      throw dirError;
+    }

    // Check for files
    const files = await fs.readdir(config.path!);
+    log.debug(`Found ${files.length} files in ${config.path}:`, files);
+
    for (const file of files) {
      // Only process XML files
      if (!file.toLowerCase().endsWith(".xml")) {
@@ -30,8 +49,13 @@ export async function ppgInputHandler(config: PaintScaleConfig): Promise<void> {
      }

      const filePath = path.join(config.path!, file);
-      const stats = await fs.stat(filePath);
-      if (!stats.isFile()) {
+      try {
+        const stats = await fs.stat(filePath);
+        if (!stats.isFile()) {
+          continue;
+        }
+      } catch (statError) {
+        log.warn(`Failed to stat file ${filePath}:`, statError);
        continue;
      }

@@ -46,40 +70,61 @@ export async function ppgInputHandler(config: PaintScaleConfig): Promise<void> {
      }

      // Validate XML structure
-      let xmlContent : BlobPart;
-
+      let xmlContent: BlobPart;
      try {
        xmlContent = await fs.readFile(filePath, "utf8");
        await parseStringPromise(xmlContent);
+        log.debug(`Successfully validated XML for ${filePath}`);
      } catch (error) {
        log.error(`Invalid XML in ${filePath}:`, error);
-        const timestamp = Date.now().toString(); // similar to DateTime.Now.Ticks in C#
-        const errorPath = path.join(errorDir, `${timestamp}.xml`);
-        await fs.rename(filePath, errorPath);
-        log.debug(`Moved invalid file to error: ${errorPath}`);
+        const timestamp = dayjs().format("YYYYMMDD_HHmmss");
+        const originalFilename = path.basename(file, path.extname(file));
+        const errorPath = path.join(
+          errorDir,
+          `${originalFilename}-${timestamp}.xml`,
+        );
+        try {
+          await fs.rename(filePath, errorPath);
+          log.debug(`Moved invalid file to error: ${errorPath}`);
+        } catch (moveError) {
+          log.error(
+            `Failed to move invalid file to error directory ${errorPath}:`,
+            moveError,
+          );
+        }
        continue;
      }

      // Get authentication token
-      const token = (store.get("user") as any)?.stsTokenManager?.accessToken;
-      if (!token) {
-        log.error(`No authentication token for file: ${filePath}`);
+      let token: string | null;
+      try {
+        token = await getTokenFromRenderer();
+        if (!token) {
+          log.error(`No authentication token for file: ${filePath}`);
+          continue;
+        }
+        log.debug(
+          `Obtained authentication token for ${filePath}: ${token.slice(0, 10)}...`,
+        );
+      } catch (tokenError) {
+        log.error(
+          `Failed to obtain authentication token for ${filePath}:`,
+          tokenError,
+        );
        continue;
      }

      // Upload file to API
      const formData = new FormData();
      formData.append("file", new Blob([xmlContent]), path.basename(filePath));
-      formData.append(
-        "shopId",
-        (store.get("app.bodyshop") as any)?.shopname || "",
-      );
+      const shopId = (store.get("app.bodyshop") as any)?.shopname || "";
+      formData.append("shopId", shopId);
+      log.debug(`Shop ID: ${shopId}`);

      const baseURL = store.get("app.isTest")
        ? import.meta.env.VITE_API_TEST_URL
        : import.meta.env.VITE_API_URL;
      const finalUrl = `${baseURL}/mixdata/upload`;
-
      log.debug(`Uploading file to ${finalUrl}`);

      try {
@@ -88,23 +133,52 @@ export async function ppgInputHandler(config: PaintScaleConfig): Promise<void> {
            Authorization: `Bearer ${token}`,
            "Content-Type": "multipart/form-data",
          },
+          timeout: 10000, // 10-second timeout
+        });
+
+        log.info(`Upload response for ${filePath}:`, {
+          status: response.status,
+          statusText: response.statusText,
+          data: response.data,
        });

        if (response.status === 200) {
          log.info(`Successful upload of ${filePath}`);
          // Move file to archive
-          const timestamp = Date.now().toString(); // generate new timestamp
-          const archivePath = path.join(archiveDir, `${timestamp}.xml`);
-          await fs.rename(filePath, archivePath);
-          log.debug(`Moved file to archive: ${archivePath}`);
+          const timestamp = dayjs().format("YYYYMMDD_HHmmss");
+          const originalFilename = path.basename(file, path.extname(file));
+          const archivePath = path.join(
+            archiveDir,
+            `${originalFilename}-${timestamp}.xml`,
+          );
+          try {
+            await fs.access(archiveDir, fs.constants.W_OK); // Verify archiveDir is writable
+            await fs.rename(filePath, archivePath);
+            log.info(`Moved file to archive: ${archivePath}`);
+          } catch (moveError) {
+            log.error(
+              `Failed to move file to archive directory ${archivePath}:`,
+              moveError,
+            );
+          }
        } else {
          log.error(
            `Failed to upload ${filePath}: ${response.status} ${response.statusText}`,
-            response.data,
+            { responseData: response.data },
          );
        }
-      } catch (error) {
-        log.error(`Error uploading ${filePath}:`, error);
+      } catch (error: any) {
+        log.error(`Error uploading ${filePath}:`, {
+          message: error.message,
+          code: error.code,
+          response: error.response
+            ? {
+                status: error.response.status,
+                statusText: error.response.statusText,
+                data: error.response.data,
+              }
+            : null,
+        });
      }
    }
  } catch (error) {
@@ -121,70 +195,16 @@ export async function ppgOutputHandler(

    await fs.mkdir(config.path!, { recursive: true });

-    const query = `
-  query PpgData($today: timestamptz!, $todayplus5: timestamptz!, $shopid: uuid!) {
-    bodyshops_by_pk(id:$shopid) {
-      id
-      shopname
-      imexshopid
-    }
-    jobs(where: {
-      _or: [
-        {
-          _and: [
-            { scheduled_in: { _lte: $todayplus5 } },
-            { scheduled_in: { _gte: $today } }
-          ]
-        },
-        { inproduction: { _eq: true } }
-      ]
-    }) {
-      id
-      ro_number
-      status
-      ownr_fn
-      ownr_ln
-      ownr_co_nm
-      v_vin
-      v_model_yr
-      v_make_desc
-      v_model_desc
-      v_color
-      plate_no
-      ins_co_nm
-      est_ct_fn
-      est_ct_ln
-      rate_mapa
-      rate_lab
-      job_totals
-      vehicle {
-        v_paint_codes
-      }
-      labhrs: joblines_aggregate(where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }) {
-        aggregate {
-          sum {
-            mod_lb_hrs
-          }
-        }
-      }
-      larhrs: joblines_aggregate(where: { mod_lbr_ty: { _eq: "LAR" }, removed: { _eq: false } }) {
-        aggregate {
-          sum {
-            mod_lb_hrs
-          }
-        }
-      }
-    }
-  }
-`;
-
-    const variables = {
-      today: new Date().toISOString(),
-      todayplus5: new Date(Date.now() + 5 * 86400000).toISOString(),
+    const variables: PpgDataQueryVariables = {
+      today: dayjs().toISOString(),
+      todayplus5: dayjs().add(5, "day").toISOString(),
      shopid: (store.get("app.bodyshop") as any)?.id,
    };

-    const response = (await client.request(query, variables)) as any;
+    const response = await client.request<
+      PpgDataQueryResult,
+      PpgDataQueryVariables
+    >(PPG_DATA_QUERY_TYPED, variables);
    const jobs = response.jobs ?? [];

    const header = {
@@ -197,18 +217,10 @@ export async function ppgOutputHandler(
          },
          Transaction: {
            TransactionID: "",
-            TransactionDate: (() => {
-              const now = new Date();
-              const year = now.getFullYear();
-              const month = ("0" + (now.getMonth() + 1)).slice(-2);
-              const day = ("0" + now.getDate()).slice(-2);
-              const hours = ("0" + now.getHours()).slice(-2);
-              const minutes = ("0" + now.getMinutes()).slice(-2);
-              return `${year}-${month}-${day}:${hours}:${minutes}`;
-            })(),
+            TransactionDate: dayjs().format("YYYY-MM-DD:HH:mm"),
          },
          Product: {
-            Name: "ImEX Online",
+            Name: import.meta.env.VITE_COMPANY === "IMEX",
            Version: "",
          },
        },
@@ -220,7 +232,7 @@ export async function ppgOutputHandler(
            },
            RepairOrders: {
              ROCount: jobs.length.toString(),
-              RO: jobs.map((job: any) => ({
+              RO: jobs.map((job) => ({
                RONumber: job.ro_number || "",
                ROStatus: "Open",
                Customer: `${job.ownr_ln || ""}, ${job.ownr_fn || ""}`,
@@ -258,4 +270,3 @@ export async function ppgOutputHandler(
    log.error(`Error generating PPG output for config ${config.id}:`, error);
  }
 }
-
--- a/src/main/ppc/ppc-handler.ts
+++ b/src/main/ppc/ppc-handler.ts
@@ -14,7 +14,7 @@ const handlePartsPriceChangeRequest = async (
 ): Promise<void> => {
  //Route handler here only.

-  const { job } = req.body as { job: PpcJob };
+  const job = req.body as PpcJob;
  try {
    await generatePartsPriceChange(job);
    res.status(200).json({ success: true });
--- a/src/main/setup-keep-alive-agent.ts
+++ b/src/main/setup-keep-alive-agent.ts
@@ -19,7 +19,7 @@ export async function setupKeepAliveAgent(): Promise<void> {
  <string>com.convenientbrands.bodyshop-desktop.keepalive</string>
  <key>ProgramArguments</key>
  <array>
-    <string>open</string>
+    <string>Shop Partner Keep Alive</string>
    <string>imexmedia://keep-alive</string>
  </array>
  <key>RunAtLoad</key>
@@ -30,8 +30,8 @@ export async function setupKeepAliveAgent(): Promise<void> {
 </plist>`;

  const plistPath = join(
-      homedir(),
-      "Library/LaunchAgents/com.convenientbrands.bodyshop-desktop.keepalive.plist",
+    homedir(),
+    "/Library/LaunchAgents/com.convenientbrands.bodyshop-desktop.keepalive.plist",
  );

  try {
@@ -40,15 +40,17 @@ export async function setupKeepAliveAgent(): Promise<void> {
    log.info(`Launch agent created and loaded: ${stdout}`);
    if (stderr) log.warn(`Launch agent stderr: ${stderr}`);
  } catch (error) {
-    log.error(`Error setting up launch agent: ${error instanceof Error ? error.message : String(error)}`);
+    log.error(
+      `Error setting up launch agent: ${error instanceof Error ? error.message : String(error)}`,
+    );
    throw error; // Rethrow to allow caller to handle
  }
 }

 export async function isKeepAliveAgentInstalled(): Promise<boolean> {
  const plistPath = join(
-      homedir(),
-      "Library/LaunchAgents/com.convenientbrands.bodyshop-desktop.keepalive.plist",
+    homedir(),
+    "/Library/LaunchAgents/com.convenientbrands.bodyshop-desktop.keepalive.plist",
  );
  const maxRetries = 3;
  const retryDelay = 500; // 500ms delay between retries
@@ -56,10 +58,14 @@ export async function isKeepAliveAgentInstalled(): Promise<boolean> {
  for (let attempt = 1; attempt <= maxRetries; attempt++) {
    try {
      await fs.access(plistPath, fs.constants.F_OK);
-      const { stdout } = await execPromise(`launchctl list | grep com.convenientbrands.bodyshop-desktop.keepalive`);
+      const { stdout } = await execPromise(
+        `launchctl list | grep com.convenientbrands.bodyshop-desktop.keepalive`,
+      );
      return !!stdout; // Return true if plist exists and agent is loaded
    } catch (error) {
-      log.debug(`Launch agent not found (attempt ${attempt}/${maxRetries}): ${error instanceof Error ? error.message : String(error)}`);
+      log.debug(
+        `Launch agent not found (attempt ${attempt}/${maxRetries}): ${error instanceof Error ? error.message : String(error)}`,
+      );
      if (attempt === maxRetries) {
        return false; // Return false after all retries fail
      }
@@ -68,4 +74,4 @@ export async function isKeepAliveAgentInstalled(): Promise<boolean> {
    }
  }
  return false; // Fallback return
-}
+}
--- a/src/main/setup-keep-alive-task.ts
+++ b/src/main/setup-keep-alive-task.ts
@@ -6,9 +6,9 @@ const execPromise = promisify(exec);

 // Define the interval as a variable (in minutes)
 const KEEP_ALIVE_INTERVAL_MINUTES = 15;
+const taskName = "ShopPartnerKeepAlive";

 export async function setupKeepAliveTask(): Promise<void> {
-  const taskName = "ImEXShopPartnerKeepAlive";
  const protocolUrl = "imexmedia://keep-alive";
  // Use rundll32.exe to silently open the URL as a protocol
  const command = `rundll32.exe url.dll,OpenURL "${protocolUrl}"`;
@@ -30,7 +30,6 @@ export async function setupKeepAliveTask(): Promise<void> {
 }

 export async function isKeepAliveTaskInstalled(): Promise<boolean> {
-  const taskName = "ImEXShopPartnerKeepAlive";
  const maxRetries = 3;
  const retryDelay = 500; // 500ms delay between retries

--- a/src/main/store/store.ts
+++ b/src/main/store/store.ts
@@ -9,6 +9,7 @@ const store = new Store({
      emsOutFilePath: null,
      qbFilePath: "",
      runWatcherOnStartup: true,
+      enableMemDebug: false,
      polling: {
        enabled: false,
        interval: 30000,
--- a/src/main/util/checkForAppUpdates.ts
+++ b/src/main/util/checkForAppUpdates.ts
@@ -1,19 +1,23 @@
 import { autoUpdater } from "electron-updater";
+import { setReleaseChannel } from "../ipc/ipcMainHandler.user";

-function checkForAppUpdatesContinuously(): void {
-  checkForAppUpdates();
-  setInterval(
-    () => {
-      checkForAppUpdatesContinuously();
-    },
-    1000 * 60 * 30,
-  );
+let continuousUpdatesTriggered = false;
+
+async function checkForAppUpdatesContinuously(): Promise<void> {
+  if (!continuousUpdatesTriggered) {
+    continuousUpdatesTriggered = true;
+    checkForAppUpdates();
+    setInterval(
+      () => {
+        checkForAppUpdates();
+      },
+      1000 * 60 * 30,
+    );
+  }
 }
-function checkForAppUpdates(): void {
-  autoUpdater.checkForUpdatesAndNotify({
-    title: "Shop Partner Update",
-    body: "A new version of Shop Partner is available. Click to update.",
-  });
+async function checkForAppUpdates(): Promise<void> {
+  await setReleaseChannel();
+  autoUpdater.checkForUpdates();
 }

-export { checkForAppUpdatesContinuously, checkForAppUpdates };
+export { checkForAppUpdates, checkForAppUpdatesContinuously };
--- a/src/main/util/ems-interface/fielddescriptors/ttl-field-descriptors.ts
+++ b/src/main/util/ems-interface/fielddescriptors/ttl-field-descriptors.ts
@@ -56,7 +56,7 @@ export const ttlFieldLineDescriptors: FieldDescriptor[] = [
    decimalPlaces: 2,
  },
  {
-    name: "N_SUPP_ANT",
+    name: "N_SUPP_AMT",
    type: "N",
    size: 10,
    decimalPlaces: 2,
--- a/src/main/util/ensureWindowOnScreen.ts
+++ b/src/main/util/ensureWindowOnScreen.ts
@@ -0,0 +1,109 @@
+import { screen } from "electron";
+
+function ensureWindowOnScreen(
+  x: number | undefined,
+  y: number | undefined,
+  windowWidth: number,
+  windowHeight: number,
+): { validX: number | undefined; validY: number | undefined } {
+  // If no coordinates stored, let Electron position window automatically
+  if (x === undefined || y === undefined) {
+    return { validX: undefined, validY: undefined };
+  }
+
+  const displays = screen.getAllDisplays();
+
+  // Minimum visible pixels required on each edge to be considered "visible enough"
+  const MIN_VISIBLE = 50; // Ensure at least 50px from each edge is visible
+
+  // Try to find a display where the window would be almost fully visible
+  for (const display of displays) {
+    const { bounds } = display;
+
+    // Check if window is mostly within this display
+    if (
+      x + MIN_VISIBLE >= bounds.x &&
+      x + windowWidth - MIN_VISIBLE <= bounds.x + bounds.width &&
+      y + MIN_VISIBLE >= bounds.y &&
+      y + windowHeight - MIN_VISIBLE <= bounds.y + bounds.height
+    ) {
+      // Window is adequately visible on this display
+      return { validX: x, validY: y };
+    }
+  }
+
+  // If window isn't adequately visible on any display, try to adjust it to fit the closest display
+  const closestDisplay = findClosestDisplay(displays, x, y);
+  const { bounds } = closestDisplay;
+
+  // Adjust position to ensure window is fully on screen
+  let adjustedX = x;
+  let adjustedY = y;
+
+  // Adjust horizontal position if needed
+  if (x < bounds.x) {
+    adjustedX = bounds.x;
+  } else if (x + windowWidth > bounds.x + bounds.width) {
+    adjustedX = bounds.x + bounds.width - windowWidth;
+  }
+
+  // Adjust vertical position if needed
+  if (y < bounds.y) {
+    adjustedY = bounds.y;
+  } else if (y + windowHeight > bounds.y + bounds.height) {
+    adjustedY = bounds.y + bounds.height - windowHeight;
+  }
+
+  // If adjustments keep window on screen, use adjusted position
+  if (
+    adjustedX >= bounds.x &&
+    adjustedX + windowWidth <= bounds.x + bounds.width &&
+    adjustedY >= bounds.y &&
+    adjustedY + windowHeight <= bounds.y + bounds.height
+  ) {
+    return { validX: adjustedX, validY: adjustedY };
+  }
+
+  // If all else fails, center on primary display
+  const primaryDisplay = screen.getPrimaryDisplay();
+  const primaryBounds = primaryDisplay.bounds;
+
+  return {
+    validX: Math.floor(
+      primaryBounds.x + (primaryBounds.width - windowWidth) / 2,
+    ),
+    validY: Math.floor(
+      primaryBounds.y + (primaryBounds.height - windowHeight) / 2,
+    ),
+  };
+}
+
+// Helper function to find the closest display to a point
+function findClosestDisplay(
+  displays: Electron.Display[],
+  x: number,
+  y: number,
+): Electron.Display {
+  let closestDisplay = displays[0];
+  let shortestDistance = Number.MAX_VALUE;
+
+  for (const display of displays) {
+    const { bounds } = display;
+    // Calculate distance to center of display
+    const displayCenterX = bounds.x + bounds.width / 2;
+    const displayCenterY = bounds.y + bounds.height / 2;
+
+    const distance = Math.sqrt(
+      Math.pow(x - displayCenterX, 2) + Math.pow(y - displayCenterY, 2),
+    );
+
+    if (distance < shortestDistance) {
+      shortestDistance = distance;
+      closestDisplay = display;
+    }
+  }
+
+  return closestDisplay;
+}
+
+export default ensureWindowOnScreen;
--- a/src/main/watcher/watcher.ts
+++ b/src/main/watcher/watcher.ts
@@ -7,6 +7,7 @@ import errorTypeCheck from "../../util/errorTypeCheck";
 import ipcTypes from "../../util/ipcTypes.json";
 import ImportJob from "../decoder/decoder";
 import store from "../store/store";
+import getMainWindow from "../../util/getMainWindow";
 let watcher: FSWatcher | null;

 async function StartWatcher(): Promise<boolean> {
@@ -42,7 +43,10 @@ async function StartWatcher(): Promise<boolean> {
  watcher = chokidar.watch(filePaths, {
    ignored: (filepath, stats) => {
      const p = path.parse(filepath);
-      return !stats?.isFile() && p.ext !== "" && p.ext.toUpperCase() !== ".ENV"; //Only watch for .ENV files.
+      return (
+        (!stats?.isFile() && p.ext !== "" && p.ext.toUpperCase() !== ".ENV") ||
+        p.name?.toUpperCase() === ".DS_STORE"
+      ); //Only watch for .ENV files.
    },
    usePolling: pollingSettings.enabled || false,
    interval: pollingSettings.interval || 30000,
@@ -104,23 +108,23 @@ function addWatcherPath(path: string | string[]): void {

 function onWatcherReady(): void {
  if (watcher) {
-    const mainWindow = BrowserWindow.getAllWindows()[0]; //TODO: Filter to only main window once a proper key has been set.
+    const mainWindow = getMainWindow();
    new Notification({
      title: "Watcher Started",
      body: "Newly exported estimates will be automatically uploaded.",
    }).show();
    log.info("Confirmed watched paths:", watcher.getWatched());
-    mainWindow.webContents.send(ipcTypes.toRenderer.watcher.started);
+    mainWindow?.webContents.send(ipcTypes.toRenderer.watcher.started);
  }
 }

 async function StopWatcher(): Promise<boolean> {
-  const mainWindow = BrowserWindow.getAllWindows()[0]; //TODO: Filter to only main window once a proper key has been set.
+  const mainWindow = getMainWindow();

  if (watcher) {
    await watcher.close();
    log.info("Watcher stopped.");
-    mainWindow.webContents.send(ipcTypes.toRenderer.watcher.stopped);
+    mainWindow?.webContents.send(ipcTypes.toRenderer.watcher.stopped);

    new Notification({
      title: "Watcher Stopped",
--- a/src/renderer/src/components/Settings/PaintScale/usePaintScaleConfig.ts
+++ b/src/renderer/src/components/Settings/PaintScale/usePaintScaleConfig.ts
@@ -1,71 +1,98 @@
-import { useState, useEffect } from 'react';
-import ipcTypes from '../../../../../util/ipcTypes.json';
-import { PaintScaleConfig, PaintScaleType } from '../../../../../util/types/paintScale';
+import { useState, useEffect } from "react";
+import ipcTypes from "../../../../../util/ipcTypes.json";
+import {
+  PaintScaleConfig,
+  PaintScaleType,
+} from "../../../../../util/types/paintScale";
 import { message } from "antd";
-import {useTranslation} from "react-i18next";
+import { useTranslation } from "react-i18next";

-type ConfigType = 'input' | 'output';
+type ConfigType = "input" | "output";

 export const usePaintScaleConfig = (configType: ConfigType) => {
-  const [paintScaleConfigs, setPaintScaleConfigs] = useState<PaintScaleConfig[]>([]);
+  const [paintScaleConfigs, setPaintScaleConfigs] = useState<
+    PaintScaleConfig[]
+  >([]);
  const { t } = useTranslation();

  // Get the appropriate IPC methods based on config type
-  const getConfigsMethod = configType === 'input'
+  const getConfigsMethod =
+    configType === "input"
      ? ipcTypes.toMain.settings.paintScale.getInputConfigs
      : ipcTypes.toMain.settings.paintScale.getOutputConfigs;

-  const setConfigsMethod = configType === 'input'
+  const setConfigsMethod =
+    configType === "input"
      ? ipcTypes.toMain.settings.paintScale.setInputConfigs
      : ipcTypes.toMain.settings.paintScale.setOutputConfigs;

-  const setPathMethod = configType === 'input'
+  const setPathMethod =
+    configType === "input"
      ? ipcTypes.toMain.settings.paintScale.setInputPath
      : ipcTypes.toMain.settings.paintScale.setOutputPath;

  // Load paint scale configs on mount
  useEffect(() => {
    window.electron.ipcRenderer
-        .invoke(getConfigsMethod)
-        .then((configs: PaintScaleConfig[]) => {
-          // Ensure all configs have a pollingInterval and type (for backward compatibility)
-          const updatedConfigs = configs.map(config => ({
-            ...config,
-            pollingInterval: config.pollingInterval || 1440, // Default to 1440 seconds
-            type: config.type || PaintScaleType.PPG, // Default type if missing
-          }));
-          setPaintScaleConfigs(updatedConfigs || []);
-        })
-        .catch((error) => {
-          console.error(`Failed to load paint scale ${configType} configs:`, error);
-        });
+      .invoke(getConfigsMethod)
+      .then((configs: PaintScaleConfig[]) => {
+        // Ensure all configs have a pollingInterval and type (for backward compatibility)
+        const defaultPolling = configType === "input" ? 1440 : 60;
+        const updatedConfigs = configs.map((config) => ({
+          ...config,
+          pollingInterval: config.pollingInterval || defaultPolling, // Default to 1440 for input, 60 for output
+          type: config.type || PaintScaleType.PPG, // Default type if missing
+        }));
+        setPaintScaleConfigs(updatedConfigs || []);
+      })
+      .catch((error) => {
+        console.error(
+          `Failed to load paint scale ${configType} configs:`,
+          error,
+        );
+      });
  }, [getConfigsMethod]);

  // Save configs to store and notify main process of config changes
  const saveConfigs = (configs: PaintScaleConfig[]) => {
    window.electron.ipcRenderer
-        .invoke(setConfigsMethod, configs)
-        .then(() => {
-          // Notify main process to update cron job
-          if (configType === 'input') {
-            window.electron.ipcRenderer.send(ipcTypes.toMain.settings.paintScale.updateInputCron, configs);
-          } else if (configType === 'output') {
-            window.electron.ipcRenderer.send(ipcTypes.toMain.settings.paintScale.updateOutputCron, configs);
-          }
-        })
-        .catch((error) => {
-          console.error(`Failed to save paint scale ${configType} configs:`, error);
-        });
+      .invoke(setConfigsMethod, configs)
+      .then(() => {
+        // Notify main process to update cron job
+        if (configType === "input") {
+          window.electron.ipcRenderer.send(
+            ipcTypes.toMain.settings.paintScale.updateInputCron,
+            configs,
+          );
+        } else if (configType === "output") {
+          window.electron.ipcRenderer.send(
+            ipcTypes.toMain.settings.paintScale.updateOutputCron,
+            configs,
+          );
+        }
+      })
+      .catch((error) => {
+        console.error(
+          `Failed to save paint scale ${configType} configs:`,
+          error,
+        );
+      });
  };

  // New helper to check if a path is unique across input and output configs
  const checkPathUnique = async (newPath: string): Promise<boolean> => {
    try {
-      const inputConfigs: PaintScaleConfig[] = await window.electron.ipcRenderer.invoke(ipcTypes.toMain.settings.paintScale.getInputConfigs);
-      const outputConfigs: PaintScaleConfig[] = await window.electron.ipcRenderer.invoke(ipcTypes.toMain.settings.paintScale.getOutputConfigs);
+      const inputConfigs: PaintScaleConfig[] =
+        await window.electron.ipcRenderer.invoke(
+          ipcTypes.toMain.settings.paintScale.getInputConfigs,
+        );
+      const outputConfigs: PaintScaleConfig[] =
+        await window.electron.ipcRenderer.invoke(
+          ipcTypes.toMain.settings.paintScale.getOutputConfigs,
+        );
      const allConfigs = [...inputConfigs, ...outputConfigs];
      // Allow updating the current config even if its current value equals newPath.
-      return !allConfigs.some(config => config.path === newPath);
+      return !allConfigs.some((config) => config.path === newPath);
    } catch (error) {
      console.error("Failed to check unique path:", error);
      return false;
@@ -74,10 +101,11 @@ export const usePaintScaleConfig = (configType: ConfigType) => {

  // Handle adding a new paint scale config
  const handleAddConfig = (type: PaintScaleType) => {
+    const defaultPolling = configType === "input" ? 1440 : 60;
    const newConfig: PaintScaleConfig = {
      id: Date.now().toString(),
      type,
-      pollingInterval: 1440, // Default to 1440 seconds
+      pollingInterval: defaultPolling, // Default to 1440 for input, 60 for output
    };
    const updatedConfigs = [...paintScaleConfigs, newConfig];
    setPaintScaleConfigs(updatedConfigs);
@@ -86,7 +114,9 @@ export const usePaintScaleConfig = (configType: ConfigType) => {

  // Handle removing a config
  const handleRemoveConfig = (id: string) => {
-    const updatedConfigs = paintScaleConfigs.filter((config) => config.id !== id);
+    const updatedConfigs = paintScaleConfigs.filter(
+      (config) => config.id !== id,
+    );
    setPaintScaleConfigs(updatedConfigs);
    saveConfigs(updatedConfigs);
  };
@@ -94,7 +124,10 @@ export const usePaintScaleConfig = (configType: ConfigType) => {
  // Handle path selection (modified to check directory uniqueness)
  const handlePathChange = async (id: string) => {
    try {
-      const path: string | null = await window.electron.ipcRenderer.invoke(setPathMethod, id);
+      const path: string | null = await window.electron.ipcRenderer.invoke(
+        setPathMethod,
+        id,
+      );
      if (path) {
        const isUnique = await checkPathUnique(path);
        if (!isUnique) {
@@ -115,7 +148,7 @@ export const usePaintScaleConfig = (configType: ConfigType) => {
  // Handle polling interval change
  const handlePollingIntervalChange = (id: string, pollingInterval: number) => {
    const updatedConfigs = paintScaleConfigs.map((config) =>
-        config.id === id ? { ...config, pollingInterval } : config,
+      config.id === id ? { ...config, pollingInterval } : config,
    );
    setPaintScaleConfigs(updatedConfigs);
    saveConfigs(updatedConfigs);
--- a/src/renderer/src/components/Settings/Settings.PaintScaleInputPaths.tsx
+++ b/src/renderer/src/components/Settings/Settings.PaintScaleInputPaths.tsx
@@ -13,9 +13,10 @@ import {
  Space,
  Table,
  Tag,
+  theme,
  Tooltip,
 } from "antd";
-import { FC, useState } from "react";
+import { JSX, useState } from "react";
 import { useTranslation } from "react-i18next";
 import {
  PaintScaleConfig,
@@ -24,15 +25,17 @@ import {
 } from "../../../../util/types/paintScale";
 import { usePaintScaleConfig } from "./PaintScale/usePaintScaleConfig";

-const SettingsPaintScaleInputPaths: FC = () => {
+const SettingsPaintScaleInputPaths = (): JSX.Element => {
  const { t } = useTranslation();
+  const { token } = theme.useToken(); // Access theme tokens
+
  const {
    paintScaleConfigs,
    handleAddConfig,
    handleRemoveConfig,
    handlePathChange,
    handlePollingIntervalChange,
-  } = usePaintScaleConfig("input");
+  } = usePaintScaleConfig("output");

  const [isModalVisible, setIsModalVisible] = useState(false);
  const [selectedType, setSelectedType] = useState<PaintScaleType | null>(null);
@@ -87,7 +90,7 @@ const SettingsPaintScaleInputPaths: FC = () => {
              placeholder={t("settings.labels.paintScalePath")}
              disabled
              style={{
-                borderColor: isValid ? "#52c41a" : "#d9d9d9",
+                borderColor: isValid ? token.colorSuccess : token.colorError, // Use semantic tokens
              }}
              suffix={
                <Tooltip
@@ -98,9 +101,9 @@ const SettingsPaintScaleInputPaths: FC = () => {
                  }
                >
                  {isValid ? (
-                    <CheckCircleFilled style={{ color: "#52c41a" }} />
+                    <CheckCircleFilled style={{ color: token.colorSuccess }} />
                  ) : (
-                    <WarningFilled style={{ color: "#faad14" }} />
+                    <WarningFilled style={{ color: token.colorError }} />
                  )}
                </Tooltip>
              }
--- a/src/renderer/src/components/Settings/Settings.PaintScaleOutputPaths.tsx
+++ b/src/renderer/src/components/Settings/Settings.PaintScaleOutputPaths.tsx
@@ -4,8 +4,18 @@ import {
  FolderOpenFilled,
  WarningFilled,
 } from "@ant-design/icons";
-import { Button, Card, Input, Modal, Select, Space, Table, Tag } from "antd";
-import { FC, useState } from "react";
+import {
+  Button,
+  Card,
+  Input,
+  Modal,
+  Select,
+  Space,
+  Table,
+  Tag,
+  theme,
+} from "antd";
+import { JSX, useState } from "react";
 import { useTranslation } from "react-i18next";
 import {
  PaintScaleConfig,
@@ -14,7 +24,8 @@ import {
 } from "../../../../util/types/paintScale";
 import { usePaintScaleConfig } from "./PaintScale/usePaintScaleConfig";

-const SettingsPaintScaleOutputPaths: FC = () => {
+const SettingsPaintScaleOutputPaths = (): JSX.Element => {
+  const { token } = theme.useToken();
  const { t } = useTranslation();
  const {
    paintScaleConfigs,
@@ -22,7 +33,7 @@ const SettingsPaintScaleOutputPaths: FC = () => {
    handleRemoveConfig,
    handlePathChange,
    handlePollingIntervalChange,
-  } = usePaintScaleConfig("output");
+  } = usePaintScaleConfig("input");

  const [isModalVisible, setIsModalVisible] = useState(false);
  const [selectedType, setSelectedType] = useState<PaintScaleType | null>(null);
@@ -77,13 +88,13 @@ const SettingsPaintScaleOutputPaths: FC = () => {
              placeholder={t("settings.labels.paintScalePath")}
              disabled
              style={{
-                borderColor: isValid ? "#52c41a" : "#d9d9d9",
+                borderColor: isValid ? token.colorSuccess : token.colorError,
              }}
              suffix={
                isValid ? (
-                  <CheckCircleFilled style={{ color: "#52c41a" }} />
+                  <CheckCircleFilled style={{ color: token.colorSuccess }} />
                ) : (
-                  <WarningFilled style={{ color: "#faad14" }} />
+                  <WarningFilled style={{ color: token.colorError }} />
                )
              }
            />
--- a/src/util/getMainWindow.ts
+++ b/src/util/getMainWindow.ts
@@ -0,0 +1,5 @@
+import { BrowserWindow } from "electron";
+
+export default function getMainWindow(): BrowserWindow | null {
+  return BrowserWindow.getAllWindows()[0] || null;
+}
--- a/src/util/memUsage.ts
+++ b/src/util/memUsage.ts
@@ -0,0 +1,309 @@
+import { BrowserWindow } from "electron";
+import log from "electron-log/main";
+import fs from "fs";
+import os from "os";
+import path from "path";
+import Store from "../main/store/store";
+/**
+ * Human-readable memory/cpu/resource snapshot.
+ */
+export type MemoryUsageStats = {
+  timestamp: string;
+  label?: string;
+  uptimeSeconds: number;
+  pid: number;
+  memory: {
+    rss: number;
+    heapTotal: number;
+    heapUsed: number;
+    external: number;
+    arrayBuffers?: number;
+  };
+  memoryPretty: {
+    rss: string;
+    heapTotal: string;
+    heapUsed: string;
+    external: string;
+    arrayBuffers?: string;
+  };
+  os: {
+    totalMem: number;
+    freeMem: number;
+    freeMemPercent: number;
+  };
+  cpuUsage?: NodeJS.CpuUsage;
+  resourceUsage?: NodeJS.ResourceUsage;
+  heapSpaces?: Array<import("v8").HeapSpaceInfo>;
+  heapSnapshotFile?: string;
+  custom?: Record<string, unknown>;
+};
+// (merged into top import)
+
+/**
+ * Options for dumpMemoryStats.
+ */
+export type DumpOptions = {
+  /**
+   * Call global.gc() before sampling if available (requires node run with --expose-gc).
+   */
+  runGc?: boolean;
+  /**
+   * Optional label to include in the returned snapshot.
+   */
+  label?: string;
+  includeHeapSpaces?: boolean;
+  writeHeapSnapshot?: boolean;
+  heapSnapshotDir?: string;
+};
+
+/**
+ * Convert bytes to a compact human readable string.
+ */
+function formatBytes(bytes: number): string {
+  if (!isFinite(bytes)) return String(bytes);
+  const units = ["B", "KB", "MB", "GB", "TB"];
+  let i = 0;
+  let val = bytes;
+  while (val >= 1024 && i < units.length - 1) {
+    val /= 1024;
+    i++;
+  }
+  return `${val.toFixed(2)} ${units[i]}`;
+}
+
+/**
+ * Asynchronously produce a memory / cpu / os snapshot.
+ *
+ * Example:
+ * const stats = await dumpMemoryStats({ runGc: true, label: 'before-heavy-task' });
+ */
+export async function dumpMemoryStats(
+  options: DumpOptions = {},
+): Promise<MemoryUsageStats> {
+  const {
+    runGc = false,
+    label,
+    includeHeapSpaces = true,
+    writeHeapSnapshot = true,
+    heapSnapshotDir,
+  } = options;
+
+  // Allow GC if requested and available to get a cleaner snapshot
+  if (runGc && typeof (global as any).gc === "function") {
+    try {
+      (global as any).gc();
+    } catch {
+      // ignore GC errors
+    }
+  }
+
+  // Let the event loop settle a tick so GC can complete if run
+  await new Promise((resolve) => setImmediate(resolve));
+
+  const mem = process.memoryUsage();
+  const totalMem = os.totalmem();
+  const freeMem = os.freemem();
+
+  const stats: MemoryUsageStats = {
+    timestamp: new Date().toISOString(),
+    label,
+    uptimeSeconds: Math.floor(process.uptime()),
+    pid: process.pid,
+    memory: {
+      rss: mem.rss,
+      heapTotal: mem.heapTotal,
+      heapUsed: mem.heapUsed,
+      external: mem.external,
+      arrayBuffers: mem.arrayBuffers,
+    },
+    memoryPretty: {
+      rss: formatBytes(mem.rss),
+      heapTotal: formatBytes(mem.heapTotal),
+      heapUsed: formatBytes(mem.heapUsed),
+      external: formatBytes(mem.external),
+      arrayBuffers:
+        mem.arrayBuffers !== undefined
+          ? formatBytes(mem.arrayBuffers)
+          : undefined,
+    },
+    os: {
+      totalMem,
+      freeMem,
+      freeMemPercent: Math.round((freeMem / totalMem) * 10000) / 100,
+    },
+    cpuUsage: process.cpuUsage ? process.cpuUsage() : undefined,
+    resourceUsage:
+      typeof process.resourceUsage === "function"
+        ? process.resourceUsage()
+        : undefined,
+    custom: {
+      numBrowserWindows: BrowserWindow.getAllWindows().length,
+    },
+  };
+
+  if (includeHeapSpaces) {
+    try {
+      // eslint-disable-next-line @typescript-eslint/no-var-requires
+      const v8: typeof import("v8") = require("v8");
+      if (typeof v8.getHeapSpaceStatistics === "function") {
+        stats.heapSpaces = v8.getHeapSpaceStatistics();
+      }
+    } catch (err) {
+      log.warn("Failed to get heap space stats", err);
+    }
+  }
+
+  if (writeHeapSnapshot) {
+    try {
+      if (!runGc && typeof (global as any).gc === "function") {
+        try {
+          (global as any).gc();
+        } catch {
+          /* ignore */
+        }
+      }
+      // eslint-disable-next-line @typescript-eslint/no-var-requires
+      const v8: typeof import("v8") = require("v8");
+      if (typeof v8.writeHeapSnapshot === "function") {
+        const baseDir =
+          heapSnapshotDir || path.dirname(log.transports.file.getFile().path);
+
+        const dir = path.join(baseDir, "heap-snapshots");
+        fs.mkdirSync(dir, { recursive: true });
+        const fileName = `heap-${Date.now()}-${process.pid}.heapsnapshot`;
+        const filePath = path.join(dir, fileName);
+        const snapshotPath = v8.writeHeapSnapshot(filePath);
+        stats.heapSnapshotFile = snapshotPath;
+      } else {
+        log.warn("v8.writeHeapSnapshot not available");
+      }
+    } catch (err) {
+      log.warn("Failed to write heap snapshot", err);
+    }
+  }
+
+  return stats;
+}
+
+const memLogger = log.create({ logId: "mem-stat" });
+memLogger.transports.file.resolvePathFn = () => {
+  const filePath = path.join(
+    path.dirname(log.transports.file.getFile().path),
+    "memory-stats.log",
+  );
+  return filePath;
+};
+// Configure memory logger format to include process ID
+memLogger.transports.file.format =
+  "[{y}-{m}-{d} {h}:{i}:{s}.{ms}] [{level}] [PID:{processId}] {text}";
+memLogger.transports.console.format =
+  "[{y}-{m}-{d} {h}:{i}:{s}.{ms}] [{level}] [PID:{processId}] {text}";
+
+export async function dumpMemoryStatsToFile() {
+  try {
+    const stats = await dumpMemoryStats({ includeHeapSpaces: false });
+    memLogger.debug("[MemStat]:", stats);
+  } catch (error) {
+    log.warn("Unexpected error while writing memory stats log", error);
+  }
+}
+
+function ongoingMemoryDump() {
+  console.log(
+    `Memory logging set to ${Store.get("settings.enableMemDebug")}. Log file at ${memLogger.transports.file.getFile().path}`,
+  );
+
+  setInterval(
+    async () => {
+      // Also write each snapshot to a dedicated memory stats log file as JSON lines.
+      try {
+        const loggingEnabled = Store.get("settings.enableMemDebug");
+        log.debug(
+          "Checking if memory stats logging is enabled.",
+          loggingEnabled,
+        );
+        if (loggingEnabled) {
+          // Enforce heap snapshot folder size limit (< 1GB) before writing a new snapshot.
+          const MAX_DIR_BYTES = 5 * 1024 * 1024 * 1024; // 5GB
+          const TARGET_REDUCED_BYTES = Math.floor(MAX_DIR_BYTES * 0.9); // prune down to 90%
+          const baseDir = path.dirname(log.transports.file.getFile().path);
+          const heapDir = path.join(baseDir, "heap-snapshots");
+          try {
+            fs.mkdirSync(heapDir, { recursive: true });
+            const files = fs
+              .readdirSync(heapDir)
+              .filter((f) => f.endsWith(".heapsnapshot"));
+            let totalSize = 0;
+            const fileStats: Array<{
+              file: string;
+              size: number;
+              mtimeMs: number;
+            }> = [];
+            for (const file of files) {
+              try {
+                const stat = fs.statSync(path.join(heapDir, file));
+                if (stat.isFile()) {
+                  totalSize += stat.size;
+                  fileStats.push({
+                    file,
+                    size: stat.size,
+                    mtimeMs: stat.mtimeMs,
+                  });
+                }
+              } catch (e) {
+                log.warn("Failed to stat heap snapshot file", file, e);
+              }
+            }
+            if (totalSize > MAX_DIR_BYTES) {
+              // Sort oldest first and delete until below TARGET_REDUCED_BYTES.
+              fileStats.sort((a, b) => a.mtimeMs - b.mtimeMs);
+              let bytesAfter = totalSize;
+              for (const info of fileStats) {
+                if (bytesAfter <= TARGET_REDUCED_BYTES) break;
+                try {
+                  fs.unlinkSync(path.join(heapDir, info.file));
+                  bytesAfter -= info.size;
+                  log.warn(
+                    `Pruned heap snapshot '${info.file}' (${formatBytes(info.size)}) to reduce directory size. New size: ${formatBytes(bytesAfter)}.`,
+                  );
+                } catch (errDel) {
+                  log.warn(
+                    "Failed to delete heap snapshot file",
+                    info.file,
+                    errDel,
+                  );
+                }
+              }
+              if (bytesAfter > MAX_DIR_BYTES) {
+                // Still above hard cap; skip writing a new snapshot this cycle.
+                log.warn(
+                  `Heap snapshot directory still above hard cap (${formatBytes(bytesAfter)} > ${formatBytes(MAX_DIR_BYTES)}). Skipping new heap snapshot this cycle.`,
+                );
+                const stats = await dumpMemoryStats({
+                  includeHeapSpaces: false,
+                  writeHeapSnapshot: false,
+                });
+                memLogger.debug("[MemStat]:", stats);
+                return; // skip remainder; we already logged stats without snapshot.
+              }
+            }
+          } catch (dirErr) {
+            log.warn(
+              "Unexpected error while enforcing heap snapshot directory size limit",
+              dirErr,
+            );
+            // Continue; failure to enforce limit should not stop memory stats.
+          }
+          // Directory is within allowed bounds (or pruning succeeded); proceed normally.
+          const stats = await dumpMemoryStats({ includeHeapSpaces: false });
+          memLogger.debug("[MemStat]:", stats);
+        }
+      } catch (err) {
+        log.warn("Unexpected error while writing memory stats log", err);
+      }
+    },
+    15 * 60 * 1000,
+  ); // every 15 minutes
+}
+
+export default ongoingMemoryDump;
--- a/src/util/translations/en-US/renderer.json
+++ b/src/util/translations/en-US/renderer.json
@@ -29,26 +29,26 @@
 				"duplicatePath": "The selected directory is already used in another configuration."
 			},
 			"labels": {
+				"actions": "Actions",
+				"addPaintScalePath": "Add Paint Scale Path",
 				"emsOutFilePath": "EMS Out File Path (Parts Order,  etc.)",
+				"invalidPath": "Path not set or invalid",
+				"paintScalePath": "Paint Scale Path",
+				"paintScaleSettingsInput": "BSMS To Paint Scale",
+				"paintScaleSettingsOutput": "Paint Scale To BSMS",
+				"paintScaleType": "Paint Scale Type",
+				"pollingInterval": "Polling Interval (m)",
 				"pollinginterval": "Polling Interval (ms)",
 				"ppcfilepath": "Parts Price Change File Path",
+				"remove": "Remove",
+				"selectPaintScaleType": "Select Paint Scale Type",
 				"started": "Started",
 				"stopped": "Stopped",
+				"validPath": "Valid path",
 				"watchedpaths": "Watched Paths",
 				"watchermodepolling": "Polling",
 				"watchermoderealtime": "Real Time",
-				"watcherstatus": "Watcher Status",
-				"paintScaleSettingsInput": "BSMS To Paint Scale",
-				"paintScaleSettingsOutput": "Paint Scale To BSMS",
-				"paintScalePath": "Paint Scale Path",
-				"paintScaleType": "Paint Scale Type",
-				"addPaintScalePath": "Add Paint Scale Path",
-				"remove": "Remove",
-				"actions": "Actions",
-				"pollingInterval": "Polling Interval (m)",
-				"validPath": "Valid path",
-				"invalidPath": "Path not set or invalid",
-				"selectPaintScaleType": "Select Paint Scale Type"
+				"watcherstatus": "Watcher Status"
 			}
 		},
 		"title": {
@@ -57,6 +57,7 @@
 		},
 		"updates": {
 			"apply": "Apply Update",
+			"applying": "Applying update",
 			"available": "An update is available.",
 			"download": "Download Update",
 			"downloading": "An update is downloading."
--- a/tests/heapPrune.test.ts
+++ b/tests/heapPrune.test.ts
@@ -0,0 +1,62 @@
+import { test, expect } from "@playwright/test";
+import fs from "fs";
+import path from "path";
+
+// We import the module after setting up a temporary log path by monkey patching electron-log.
+// Since the project primarily uses Playwright for tests, we leverage its expect assertion library.
+
+// NOTE: This is a lightweight test that simulates the pruning logic indirectly by invoking the exported ongoingMemoryDump
+// function and creating artificial heap snapshot files exceeding the threshold.
+
+// Because ongoingMemoryDump sets an interval, we invoke its internal logic by importing the file and manually calling dumpMemoryStats.
+// For simplicity and to avoid altering production code for testability, we replicate the size enforcement logic here and assert behavior.
+
+function createDummySnapshots(dir: string, count: number, sizeBytes: number) {
+  fs.mkdirSync(dir, { recursive: true });
+  for (let i = 0; i < count; i++) {
+    const file = path.join(dir, `dummy-${i}.heapsnapshot`);
+    const fd = fs.openSync(file, "w");
+    // Write sizeBytes of zeros
+    const buf = Buffer.alloc(1024 * 1024, 0); // 1MB chunk
+    let written = 0;
+    while (written < sizeBytes) {
+      fs.writeSync(fd, buf, 0, Math.min(buf.length, sizeBytes - written));
+      written += Math.min(buf.length, sizeBytes - written);
+    }
+    fs.closeSync(fd);
+    // Stagger mtime for deterministic pruning ordering
+    const mtime = new Date(Date.now() - (count - i) * 1000);
+    fs.utimesSync(file, mtime, mtime);
+  }
+}
+
+test("heap snapshot directory pruning reduces size below simulated hard cap", async () => {
+  const baseDir = fs.mkdtempSync(path.join(process.cwd(), "heap-test-"));
+  const heapDir = path.join(baseDir, "heap-snapshots");
+  // Simulate oversize: 15 files of 5MB each = 75MB
+  createDummySnapshots(heapDir, 15, 5 * 1024 * 1024);
+  // Use smaller cap to keep test resource usage low.
+  const MAX_DIR_BYTES = 50 * 1024 * 1024; // 50MB simulated cap
+  const TARGET_REDUCED_BYTES = Math.floor(MAX_DIR_BYTES * 0.9);
+  const files = fs
+    .readdirSync(heapDir)
+    .filter((f) => f.endsWith(".heapsnapshot"));
+  let totalSize = 0;
+  const fileStats: Array<{ file: string; size: number; mtimeMs: number }> = [];
+  for (const file of files) {
+    const stat = fs.statSync(path.join(heapDir, file));
+    totalSize += stat.size;
+    fileStats.push({ file, size: stat.size, mtimeMs: stat.mtimeMs });
+  }
+  expect(totalSize).toBeGreaterThan(MAX_DIR_BYTES);
+  fileStats.sort((a, b) => a.mtimeMs - b.mtimeMs);
+  let bytesAfter = totalSize;
+  for (const info of fileStats) {
+    if (bytesAfter <= TARGET_REDUCED_BYTES) break;
+    fs.unlinkSync(path.join(heapDir, info.file));
+    bytesAfter -= info.size;
+  }
+  expect(bytesAfter).toBeLessThanOrEqual(TARGET_REDUCED_BYTES);
+  // Cleanup
+  fs.rmSync(baseDir, { recursive: true, force: true });
+});
--- a/translations.babel
+++ b/translations.babel
@@ -234,9 +234,53 @@
                                            </concept_node>
                                        </children>
                                    </folder_node>
+                                    <folder_node>
+                                        <name>errors</name>
+                                        <children>
+                                            <concept_node>
+                                                <name>duplicatePath</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                        </children>
+                                    </folder_node>
                                    <folder_node>
                                        <name>labels</name>
                                        <children>
+                                            <concept_node>
+                                                <name>actions</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>addPaintScalePath</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                            <concept_node>
                                                <name>emsOutFilePath</name>
                                                <definition_loaded>false</definition_loaded>
@@ -250,6 +294,84 @@
                                                    </translation>
                                                </translations>
                                            </concept_node>
+                                            <concept_node>
+                                                <name>invalidPath</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>paintScalePath</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>paintScaleSettingsInput</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>paintScaleSettingsOutput</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>paintScaleType</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>pollingInterval</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                            <concept_node>
                                                <name>pollinginterval</name>
                                                <definition_loaded>false</definition_loaded>
@@ -276,6 +398,32 @@
                                                    </translation>
                                                </translations>
                                            </concept_node>
+                                            <concept_node>
+                                                <name>remove</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>selectPaintScaleType</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                            <concept_node>
                                                <name>started</name>
                                                <definition_loaded>false</definition_loaded>
@@ -302,6 +450,19 @@
                                                    </translation>
                                                </translations>
                                            </concept_node>
+                                            <concept_node>
+                                                <name>validPath</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                            <concept_node>
                                                <name>watchedpaths</name>
                                                <definition_loaded>false</definition_loaded>
@@ -405,6 +566,19 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
+                                    <concept_node>
+                                        <name>applying</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                    <concept_node>
                                        <name>available</name>
                                        <definition_loaded>false</definition_loaded>
Author	SHA1	Message	Date
Patrick Fic	e766337e9c	Merged in release/1.0.7 (pull request #5 ) Release/1.0.7	2025-10-30 18:11:21 +00:00
Patrick Fic	07a4427a0b	Update version to final release.	2025-10-22 12:18:53 -07:00
Patrick FIc	680ae4ca08	FInalized package updates and resolve electron store.	2025-10-21 11:30:56 -07:00
Patrick FIc	e6e1785413	All package updates.	2025-10-21 10:46:12 -07:00
Patrick FIc	bf1e137c6c	Resolve possible update memory leak.,	2025-10-21 10:03:40 -07:00
Patrick FIc	6674f33be9	Minor refactor.	2025-10-20 21:29:48 -07:00
Patrick Fic	7742d6f89f	Increase heap log size to five GB.	2025-10-20 17:07:01 -07:00
Patrick Fic	6d830ae98b	Update browser window calls.	2025-10-20 14:52:37 -07:00
Patrick Fic	19bd41375e	Add extensive memory logging.	2025-10-20 14:25:46 -07:00
Patrick Fic	cf0d457d1c	Merge branch '1.0.6'	2025-09-17 12:03:07 -07:00
Patrick Fic	83ca7a251b	Final release for 1.0.6. Resolve issue with destructure on CCC PPC.	2025-09-17 12:02:57 -07:00
Patrick FIc	41caa76b28	Remove notification for update.	2025-09-10 14:59:24 -07:00
Allan Carr	45bc12a2f5	IO-3361 PPG Mix Data	2025-09-10 13:51:43 -07:00
Patrick FIc	093012c8f7	Merge branch 'main' of bitbucket.org:snaptsoft/bodyshop-desktop	2025-09-09 16:07:43 -07:00
Patrick FIc	bd9fa67087	Check release channel each time.	2025-09-09 16:07:26 -07:00
Patrick Fic	c5bdb62cb6	Merge branch '1.0.5'	2025-09-09 16:06:38 -07:00
Patrick Fic	e9dd8ff760	Finalize release.	2025-09-09 16:06:20 -07:00
Patrick FIc	1c839ee3f8	Update executable names for beta and alpha paths.	2025-09-09 15:47:31 -07:00
Patrick Fic	9fdd88526c	IO-3358 Resolve update channel & null claim number.	2025-09-08 10:30:53 -07:00
Patrick FIc	d5b40ef6f4	Merge branch '1.0.3'	2025-08-28 13:01:44 -07:00
Patrick FIc	59162e3028	Increase version to 1.0.4 to prevent conflicts.	2025-08-28 13:01:30 -07:00
Patrick FIc	f41728550c	Include prior 1.0.3 fix.	2025-08-28 13:01:03 -07:00
Patrick Fic	3b918d3fcb	Merge branch '1.0.3'	2025-08-28 12:55:02 -07:00
Patrick Fic	cf18acc661	IO-3350 Update cors in partner to accept www.	2025-08-28 12:51:09 -07:00
Patrick Fic	be079a2e48	Merged in release/1.0.2 (pull request #4 ) Release/1.0.2	2025-05-22 17:29:09 +00:00
Patrick Fic	9b90b780ef	Exclude .DS_STORE Files.	2025-05-22 10:28:03 -07:00
Patrick Fic	a19026e048	Add RO icons.	2025-05-22 09:44:27 -07:00
Patrick Fic	47608a8cde	Add Rome Icon, resolve translation, and set to Alpha release for testing.	2025-05-20 16:04:03 -07:00
Patrick Fic	a9fdf327b6	Updated package version for new release.	2025-05-20 15:42:36 -07:00
Patrick Fic	bd63af69e2	Merged in release/1.0.1 (pull request #3 ) release/1.0.1 Approved-by: Patrick Fic	2025-05-20 22:40:41 +00:00
Patrick Fic	6fa97a081f	Resolve CORS issues.	2025-05-20 15:40:15 -07:00
Patrick FIc	be0eafec7e	Update artifact names.	2025-05-16 10:39:42 -07:00
Patrick Fic	6e4c8b5558	Merged in feature/IO-3066-1-scaffolding (pull request #2 ) Major v1 release.	2025-05-16 17:17:38 +00:00
Patrick Fic	fb106ec87f	Major release v1.0.0	2025-05-16 10:02:26 -07:00
Patrick Fic	2a5c2b43e1	Make build artifacts consistent.	2025-05-16 10:01:58 -07:00
Patrick FIc	eab52bf8c1	Ensure window stays on screen after external monitor removed.	2025-05-15 15:19:15 -07:00
Patrick Fic	cd5ddc4fa1	Add EMS upload for archiving.	2025-05-15 14:29:30 -07:00
Patrick FIc	3f2501cd90	Part order testing fixes.	2025-05-12 14:59:02 -07:00
Patrick Fic	019e1b161b	Additional keepalive fixes.	2025-05-05 11:15:51 -07:00
Dave Richer	cdad47b82f	feature/IO-3066-1-scaffolding: Fix some missing PR Notes around PPG	2025-05-05 10:37:42 -04:00
Dave Richer	2953aa420e	Merged in feature/IO-3205-Paint-Scale-Integrations (pull request #1 ) [DO NOT MERGE] Feature/IO-3205 Paint Scale Integrations Approved-by: Patrick Fic	2025-05-02 17:45:38 +00:00