Merge d159d4b0dd into 4168f43e3e

fix(deps): update all non-major dependencies
2026-01-02 14:40:01 -06:00 · 2025-07-09 15:03:20 +00:00 · 2025-07-09 15:03:17 +00:00
1019 changed files with 26622 additions and 83529 deletions
--- a/.claude/settings.json
+++ b/.claude/settings.json
@@ -1,3 +0,0 @@
-{
-  "permissions": {}
-}
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -0,0 +1,18 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(rg:*)",
+      "Bash(find:*)",
+      "Bash(pnpm codegen:*)",
+      "Bash(pnpm dev:*)",
+      "Bash(pnpm build:*)",
+      "Bash(pnpm test:*)",
+      "Bash(grep:*)",
+      "Bash(pnpm type-check:*)",
+      "Bash(pnpm lint:*)",
+      "Bash(pnpm --filter ./api lint)",
+      "Bash(mv:*)"
+    ]
+  },
+  "enableAllProjectMcpServers": false
+}
--- a/.cursor/rules/api-rules.mdc
+++ b/.cursor/rules/api-rules.mdc
@@ -10,5 +10,4 @@ alwaysApply: false
 * Test suite is VITEST, do not use jest
 pnpm --filter ./api test
 * Prefer to not mock simple dependencies
-* For error testing, use `.rejects.toThrow()` without arguments - don't test exact error message strings unless the message format is specifically what you're testing

--- a/.cursor/rules/web-testing-rules.mdc
+++ b/.cursor/rules/web-testing-rules.mdc
@@ -4,10 +4,6 @@ globs: **/*.test.ts,**/__test__/components/**/*.ts,**/__test__/store/**/*.ts,**/
 alwaysApply: false
 ---

-## General Testing Best Practices
- **Error Testing:** Use `.rejects.toThrow()` without arguments to test that functions throw errors. Don't test exact error message strings unless the message format is specifically what you're testing
- **Focus on Behavior:** Test what the code does, not implementation details like exact error message wording
-
 ## Vue Component Testing Best Practices
 - This is a Nuxt.js app but we are testing with vitest outside of the Nuxt environment
 - Nuxt is currently set to auto import so some vue files may need compute or ref imported
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -0,0 +1,20 @@
+# Default owners for everything in the repo
+* @elibosley @pujitm @mdatelle @zackspear
+
+# API specific files
+/api/ @elibosley @pujitm @mdatelle
+
+# Web frontend files
+/web/ @elibosley @mdatelle @zackspear
+
+# Plugin related files
+/plugin/ @elibosley
+
+# Unraid UI specific files
+/unraid-ui/ @mdatelle @zackspear @pujitm
+
+# GitHub workflows and configuration
+/.github/ @elibosley
+
+# Documentation
+*.md @elibosley @pujitm @mdatelle @zackspear
--- a/.github/workflows/build-plugin.yml
+++ b/.github/workflows/build-plugin.yml
@@ -36,8 +36,6 @@ on:
        required: true
      CF_ENDPOINT:
        required: true
-      UNRAID_BOT_GITHUB_ADMIN_TOKEN:
-        required: false
 jobs:
  build-plugin:
    name: Build and Deploy Plugin
@@ -47,20 +45,25 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0

+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: ".nvmrc"
+
      - uses: pnpm/action-setup@v4
        name: Install pnpm
        with:
          run_install: false

-      - name: Install Node
-        uses: actions/setup-node@v5
-        with:
-          node-version-file: ".nvmrc"
-          cache: 'pnpm'
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT

      - name: Get API Version
        id: vars
@@ -71,25 +74,33 @@ jobs:
          API_VERSION=$([[ -n "$IS_TAGGED" ]] && echo "$PACKAGE_LOCK_VERSION" || echo "${PACKAGE_LOCK_VERSION}+${GIT_SHA}")
          echo "API_VERSION=${API_VERSION}" >> $GITHUB_OUTPUT

+      - uses: actions/cache@v4
+        name: Setup pnpm cache
+        with:
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
      - name: Install dependencies
        run: |
          cd ${{ github.workspace }}
          pnpm install --frozen-lockfile --filter @unraid/connect-plugin

      - name: Download Unraid UI Components
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
        with:
          name: unraid-wc-ui
          path: ${{ github.workspace }}/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/unraid-components/uui
          merge-multiple: true
      - name: Download Unraid Web Components
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
        with:
          pattern: unraid-wc-rich
-          path: ${{ github.workspace }}/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/unraid-components/standalone
+          path: ${{ github.workspace }}/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/unraid-components/nuxt
          merge-multiple: true
      - name: Download Unraid API
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
        with:
          name: unraid-api
          path: ${{ github.workspace }}/plugin/api/
@@ -140,8 +151,8 @@ jobs:
        uses: the-actions-org/workflow-dispatch@v4.0.0
        with:
          workflow: release-production.yml
-          inputs: '{ "version": "v${{ steps.vars.outputs.API_VERSION }}" }'
-          token: ${{ secrets.UNRAID_BOT_GITHUB_ADMIN_TOKEN }}
+          inputs: '{ "version": "${{ steps.vars.outputs.API_VERSION }}" }'
+          token: ${{ secrets.WORKFLOW_TRIGGER_PAT }}

      - name: Upload to Cloudflare
        if: inputs.RELEASE_CREATED == 'false'
@@ -170,40 +181,3 @@ jobs:
            ```
            ${{ inputs.BASE_URL }}/tag/${{ inputs.TAG }}/dynamix.unraid.net.plg
            ```
-
-      - name: Clean up old preview builds
-        if: inputs.RELEASE_CREATED == 'false' && github.event_name == 'push'
-        continue-on-error: true
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.CF_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_SECRET_ACCESS_KEY }}
-          AWS_DEFAULT_REGION: auto
-        run: |
-          echo "🧹 Cleaning up old preview builds (keeping last 7 days)..."
-          
-          # Calculate cutoff date (7 days ago)
-          CUTOFF_DATE=$(date -d "7 days ago" +"%Y.%m.%d")
-          echo "Deleting builds older than: ${CUTOFF_DATE}"
-          
-          # List and delete old timestamped .txz files
-          OLD_FILES=$(aws s3 ls "s3://${{ secrets.CF_BUCKET_PREVIEW }}/unraid-api/" \
-            --endpoint-url ${{ secrets.CF_ENDPOINT }} --recursive | \
-            grep -E "dynamix\.unraid\.net-[0-9]{4}\.[0-9]{2}\.[0-9]{2}\.[0-9]{4}\.txz" | \
-            awk '{print $4}' || true)
-          
-          DELETED_COUNT=0
-          if [ -n "$OLD_FILES" ]; then
-            while IFS= read -r file; do
-              if [[ $file =~ ([0-9]{4}\.[0-9]{2}\.[0-9]{2})\.[0-9]{4}\.txz ]]; then
-                FILE_DATE="${BASH_REMATCH[1]}"
-                if [[ "$FILE_DATE" < "$CUTOFF_DATE" ]]; then
-                  echo "Deleting old build: $(basename "$file")"
-                  aws s3 rm "s3://${{ secrets.CF_BUCKET_PREVIEW }}/${file}" \
-                    --endpoint-url ${{ secrets.CF_ENDPOINT }} || true
-                  ((DELETED_COUNT++))
-                fi
-              fi
-            done <<< "$OLD_FILES"
-          fi
-          
-          echo "✅ Deleted ${DELETED_COUNT} old builds"
--- a/.github/workflows/claude-code-review.yml
+++ b/.github/workflows/claude-code-review.yml
@@ -1,103 +0,0 @@
-name: Claude Code Review
-
-on:
-  pull_request:
-    types: [opened, synchronize]
-    # Skip reviews for non-code changes
-    paths-ignore:
-      - "**/*.md"
-      - "**/package-lock.json"
-      - "**/pnpm-lock.yaml"
-      - "**/.gitignore"
-      - "**/LICENSE"
-      - "**/*.config.js"
-      - "**/*.config.ts"
-      - "**/tsconfig.json"
-      - "**/.github/workflows/*.yml"
-      - "**/docs/**"
-
-jobs:
-  claude-review:
-    # Skip review for bot PRs and WIP/skip-review PRs
-    # Only run if changes are significant (>10 lines)
-    if: |
-      (github.event.pull_request.additions > 10 || github.event.pull_request.deletions > 10) &&
-      !contains(github.event.pull_request.title, '[skip-review]') &&
-      !contains(github.event.pull_request.title, '[WIP]') &&
-      !endsWith(github.event.pull_request.user.login, '[bot]') &&
-      github.event.pull_request.user.login != 'dependabot' &&
-      github.event.pull_request.user.login != 'renovate'
-    
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: read
-      issues: read
-      id-token: write
-    
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v5
-        with:
-          fetch-depth: 1
-
-      - name: Run Claude Code Review
-        id: claude-review
-        uses: anthropics/claude-code-action@beta
-        with:
-          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
-
-          # Optional: Specify model (defaults to Claude Sonnet 4, uncomment for Claude Opus 4)
-          # model: "claude-opus-4-20250514"
-          
-          # Direct prompt for automated review (no @claude mention needed)
-          direct_prompt: |
-            IMPORTANT: Review ONLY the DIFF/CHANGESET - the actual lines that were added or modified in this PR.
-            DO NOT review the entire file context, only analyze the specific changes being made.
-            
-            Look for HIGH-PRIORITY issues in the CHANGED LINES ONLY:
-            
-            1. CRITICAL BUGS: Logic errors, null pointer issues, infinite loops, race conditions
-            2. SECURITY: SQL injection, XSS, authentication bypass, exposed secrets, unsafe operations
-            3. BREAKING CHANGES: API contract violations, removed exports, changed function signatures
-            4. DATA LOSS RISKS: Destructive operations without safeguards, missing data validation
-            
-            DO NOT comment on:
-            - Code that wasn't changed in this PR
-            - Style, formatting, or documentation
-            - Test coverage (unless tests are broken by the changes)
-            - Minor optimizations or best practices
-            - Existing code issues that weren't introduced by this PR
-            
-            If you find no critical issues in the DIFF, respond with: "✅ No critical issues found in changes"
-            
-            Keep response under 10 lines. Reference specific line numbers from the diff when reporting issues.
-
-          # Optional: Use sticky comments to make Claude reuse the same comment on subsequent pushes to the same PR
-          use_sticky_comment: true
-          
-          # Context-aware review based on PR characteristics
-          # Uncomment to enable different review strategies based on context
-          # direct_prompt: |
-          #   ${{ 
-          #   (github.event.pull_request.additions > 500) && 
-          #   'Large PR detected. Focus only on architectural issues and breaking changes. Skip minor issues.' ||
-          #   contains(github.event.pull_request.title, 'fix') && 
-          #   'Bug fix PR: Verify the fix addresses the root cause and check for regression risks.' ||
-          #   contains(github.event.pull_request.title, 'deps') && 
-          #   'Dependency update: Check for breaking changes and security advisories only.' ||
-          #   contains(github.event.pull_request.title, 'refactor') && 
-          #   'Refactor PR: Verify no behavior changes and check for performance regressions.' ||
-          #   contains(github.event.pull_request.title, 'feat') && 
-          #   'New feature: Check for security issues, edge cases, and integration problems only.' ||
-          #   'Standard review: Check for critical bugs, security issues, and breaking changes only.'
-          #   }}
-          
-          # Optional: Add specific tools for running tests or linting
-          # allowed_tools: "Bash(npm run test),Bash(npm run lint),Bash(npm run typecheck)"
-          
-          # Optional: Skip review for certain conditions
-          # if: |
-          #   !contains(github.event.pull_request.title, '[skip-review]') &&
-          #   !contains(github.event.pull_request.title, '[WIP]')
-
--- a/.github/workflows/claude.yml
+++ b/.github/workflows/claude.yml
@@ -1,64 +0,0 @@
-name: Claude Code
-
-on:
-  issue_comment:
-    types: [created]
-  pull_request_review_comment:
-    types: [created]
-  issues:
-    types: [opened, assigned]
-  pull_request_review:
-    types: [submitted]
-
-jobs:
-  claude:
-    if: |
-      (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
-      (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
-      (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
-      (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: read
-      issues: read
-      id-token: write
-      actions: read # Required for Claude to read CI results on PRs
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v5
-        with:
-          fetch-depth: 1
-
-      - name: Run Claude Code
-        id: claude
-        uses: anthropics/claude-code-action@beta
-        with:
-          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
-
-          # This is an optional setting that allows Claude to read CI results on PRs
-          additional_permissions: |
-            actions: read
-          
-          # Optional: Specify model (defaults to Claude Sonnet 4, uncomment for Claude Opus 4)
-          # model: "claude-opus-4-20250514"
-          
-          # Optional: Customize the trigger phrase (default: @claude)
-          # trigger_phrase: "/claude"
-          
-          # Optional: Trigger when specific user is assigned to an issue
-          # assignee_trigger: "claude-bot"
-          
-          # Optional: Allow Claude to run specific commands
-          # allowed_tools: "Bash(npm install),Bash(npm run build),Bash(npm run test:*),Bash(npm run lint:*)"
-          
-          # Optional: Add custom instructions for Claude to customize its behavior for your project
-          # custom_instructions: |
-          #   Follow our coding standards
-          #   Ensure all new code has tests
-          #   Use TypeScript for new files
-          
-          # Optional: Custom environment variables for Claude
-          # claude_env: |
-          #   NODE_ENV: test
-
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -24,7 +24,7 @@ jobs:

    steps:
    - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v4

    - name: Initialize CodeQL
      uses: github/codeql-action/init@v3
--- a/.github/workflows/create-docusaurus-pr.yml
+++ b/.github/workflows/create-docusaurus-pr.yml
@@ -20,49 +20,26 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout source repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
        with:
          path: source-repo

      - name: Checkout docs repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
        with:
          repository: unraid/docs
          path: docs-repo
          token: ${{ secrets.DOCS_PAT_UNRAID_BOT }}

-      - name: Copy and process docs
+      - name: Copy updated docs
        run: |
          if [ ! -d "source-repo/api/docs" ]; then
            echo "Source directory does not exist!"
            exit 1
          fi
-          
-          # Remove old API docs but preserve other folders
          rm -rf docs-repo/docs/API/
          mkdir -p docs-repo/docs/API
-          
-          # Copy all markdown files and maintain directory structure
          cp -r source-repo/api/docs/public/. docs-repo/docs/API/
-          
-          # Copy images to Docusaurus static directory
-          mkdir -p docs-repo/static/img/api
-          
-          # Copy images from public/images if they exist
-          if [ -d "source-repo/api/docs/public/images" ]; then
-            cp -r source-repo/api/docs/public/images/. docs-repo/static/img/api/
-          fi
-          
-          # Also copy any images from the parent docs/images directory
-          if [ -d "source-repo/api/docs/images" ]; then
-            cp -r source-repo/api/docs/images/. docs-repo/static/img/api/
-          fi
-          
-          # Update image paths in markdown files
-          # Replace relative image paths with absolute paths pointing to /img/api/
-          find docs-repo/docs/API -name "*.md" -type f -exec sed -i 's|!\[\([^]]*\)\](\./images/\([^)]*\))|![\1](/img/api/\2)|g' {} \;
-          find docs-repo/docs/API -name "*.md" -type f -exec sed -i 's|!\[\([^]]*\)\](images/\([^)]*\))|![\1](/img/api/\2)|g' {} \;
-          find docs-repo/docs/API -name "*.md" -type f -exec sed -i 's|!\[\([^]]*\)\](../images/\([^)]*\))|![\1](/img/api/\2)|g' {} \;
      - name: Create Pull Request
        uses: peter-evans/create-pull-request@v7
        with:
@@ -76,7 +53,7 @@ jobs:
            Changes were automatically generated from api/docs/* directory.

            @coderabbitai ignore
-          reviewers: ljm42, elibosley
+          reviewers: ljm42, elibosley, pujitm, mdatelle
          branch: update-api-docs
          base: main
          delete-branch: true
--- a/.github/workflows/deploy-storybook.yml
+++ b/.github/workflows/deploy-storybook.yml
@@ -20,21 +20,20 @@ jobs:
    name: Deploy Storybook
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'

      - uses: pnpm/action-setup@v4
        name: Install pnpm
        with:
          run_install: false

-      - name: Setup Node.js
-        uses: actions/setup-node@v5
-        with:
-          node-version-file: ".nvmrc"
-          cache: 'pnpm'
-
      - name: Cache APT Packages
-        uses: awalsh128/cache-apt-pkgs-action@v1.5.3
+        uses: awalsh128/cache-apt-pkgs-action@v1.5.1
        with:
          packages: bash procps python3 libvirt-dev jq zstd git build-essential libvirt-daemon-system
          version: 1.0
@@ -66,7 +65,7 @@ jobs:

      - name: Comment PR with deployment URL
        if: github.event_name == 'pull_request'
-        uses: actions/github-script@v8
+        uses: actions/github-script@v7
        with:
          script: |
            github.rest.issues.createComment({
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,15 +6,29 @@ on:
    branches:
      - main

-permissions:
-  contents: write
-  pull-requests: write
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  cancel-in-progress: true

 jobs:
+  release-please:
+    name: Release Please
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        # Only run release-please on pushes to main
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+
+      - id: release
+        uses: googleapis/release-please-action@v4
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+    outputs:
+      releases_created: ${{ steps.release.outputs.releases_created || 'false' }}
+      tag_name: ${{ steps.release.outputs.tag_name || '' }}
  test-api:
    name: Test API
    defaults:
@@ -23,26 +37,37 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
+
+      - name: Install Node
+        uses: actions/setup-node@v4
        with:
-          fetch-depth: 0
+          node-version-file: ".nvmrc"
+
+      - name: Cache APT Packages
+        uses: awalsh128/cache-apt-pkgs-action@v1.5.1
+        with:
+          packages: bash procps python3 libvirt-dev jq zstd git build-essential libvirt-daemon-system
+          version: 1.0

      - name: Install pnpm
        uses: pnpm/action-setup@v4
        with:
          run_install: false

-      - name: Install Node
-        uses: actions/setup-node@v5
-        with:
-          node-version-file: ".nvmrc"
-          cache: 'pnpm'
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT

-      - name: Cache APT Packages
-        uses: awalsh128/cache-apt-pkgs-action@v1.5.3
+      - uses: actions/cache@v4
+        name: Setup pnpm cache
        with:
-          packages: bash procps python3 libvirt-dev jq zstd git build-essential libvirt-daemon-system php-cli
-          version: 1.0
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-

      - name: PNPM Install
        run: pnpm install --frozen-lockfile
@@ -92,68 +117,42 @@ jobs:
          # Verify libvirt is running using sudo to bypass group membership delays
          sudo virsh list --all || true

-      - name: Build UI Package First
-        run: |
-          echo "🔧 Building UI package for web tests dependency..."
-          cd ../unraid-ui && pnpm run build
+      - uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest

      - name: Run Tests Concurrently
        run: |
          set -e

-          # Run all tests in parallel with labeled output and coverage generation
+          # Run all tests in parallel with labeled output
          echo "🚀 Starting API coverage tests..."
          pnpm run coverage > api-test.log 2>&1 &
          API_PID=$!

          echo "🚀 Starting Connect plugin tests..."
-          (cd ../packages/unraid-api-plugin-connect && pnpm test --coverage 2>/dev/null || pnpm test) > connect-test.log 2>&1 &
+          (cd ../packages/unraid-api-plugin-connect && pnpm test) > connect-test.log 2>&1 &
          CONNECT_PID=$!

          echo "🚀 Starting Shared package tests..."
-          (cd ../packages/unraid-shared && pnpm test --coverage 2>/dev/null || pnpm test) > shared-test.log 2>&1 &
+          (cd ../packages/unraid-shared && pnpm test) > shared-test.log 2>&1 &
          SHARED_PID=$!

-          echo "🚀 Starting Web package coverage tests..."
-          (cd ../web && (pnpm test --coverage || pnpm test)) > web-test.log 2>&1 &
-          WEB_PID=$!
-
-          echo "🚀 Starting UI package coverage tests..."
-          (cd ../unraid-ui && pnpm test --coverage 2>/dev/null || pnpm test) > ui-test.log 2>&1 &
-          UI_PID=$!
-
-          echo "🚀 Starting Plugin tests..."
-          (cd ../plugin && pnpm test) > plugin-test.log 2>&1 &
-          PLUGIN_PID=$!
-
          # Wait for all processes and capture exit codes
          wait $API_PID && echo "✅ API tests completed" || { echo "❌ API tests failed"; API_EXIT=1; }
          wait $CONNECT_PID && echo "✅ Connect tests completed" || { echo "❌ Connect tests failed"; CONNECT_EXIT=1; }
          wait $SHARED_PID && echo "✅ Shared tests completed" || { echo "❌ Shared tests failed"; SHARED_EXIT=1; }
-          wait $WEB_PID && echo "✅ Web tests completed" || { echo "❌ Web tests failed"; WEB_EXIT=1; }
-          wait $UI_PID && echo "✅ UI tests completed" || { echo "❌ UI tests failed"; UI_EXIT=1; }
-          wait $PLUGIN_PID && echo "✅ Plugin tests completed" || { echo "❌ Plugin tests failed"; PLUGIN_EXIT=1; }

          # Display all outputs
          echo "📋 API Test Results:" && cat api-test.log
          echo "📋 Connect Plugin Test Results:" && cat connect-test.log  
          echo "📋 Shared Package Test Results:" && cat shared-test.log
-          echo "📋 Web Package Test Results:" && cat web-test.log
-          echo "📋 UI Package Test Results:" && cat ui-test.log
-          echo "📋 Plugin Test Results:" && cat plugin-test.log

          # Exit with error if any test failed
-          if [[ ${API_EXIT:-0} -eq 1 || ${CONNECT_EXIT:-0} -eq 1 || ${SHARED_EXIT:-0} -eq 1 || ${WEB_EXIT:-0} -eq 1 || ${UI_EXIT:-0} -eq 1 || ${PLUGIN_EXIT:-0} -eq 1 ]]; then
+          if [[ ${API_EXIT:-0} -eq 1 || ${CONNECT_EXIT:-0} -eq 1 || ${SHARED_EXIT:-0} -eq 1 ]]; then
            exit 1
          fi

-      - name: Upload all coverage reports to Codecov
-        uses: codecov/codecov-action@v5
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: ./coverage/coverage-final.json,../web/coverage/coverage-final.json,../unraid-ui/coverage/coverage-final.json,../packages/unraid-api-plugin-connect/coverage/coverage-final.json,../packages/unraid-shared/coverage/coverage-final.json
-          fail_ci_if_error: false
-
  build-api:
    name: Build API
    runs-on: ubuntu-latest
@@ -164,21 +163,34 @@ jobs:
        working-directory: api
    steps:
      - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
+
+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: ".nvmrc"

      - uses: pnpm/action-setup@v4
        name: Install pnpm
        with:
          run_install: false

-      - name: Install Node
-        uses: actions/setup-node@v5
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+
+      - uses: actions/cache@v4
+        name: Setup pnpm cache
        with:
-          node-version-file: ".nvmrc"
-          cache: 'pnpm'
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-

      - name: Cache APT Packages
-        uses: awalsh128/cache-apt-pkgs-action@v1.5.3
+        uses: awalsh128/cache-apt-pkgs-action@v1.5.1
        with:
          packages: bash procps python3 libvirt-dev jq zstd git build-essential
          version: 1.0
@@ -206,7 +218,7 @@ jobs:
        id: buildnumber
        uses: onyxmueller/build-tag-number@v1
        with:
-          token: ${{secrets.UNRAID_BOT_GITHUB_ADMIN_TOKEN}}
+          token: ${{secrets.github_token}}
          prefix: ${{steps.vars.outputs.PACKAGE_LOCK_VERSION}}

      - name: Build
@@ -228,21 +240,34 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
+
+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: ".nvmrc"

      - uses: pnpm/action-setup@v4
        name: Install pnpm
        with:
          run_install: false

-      - name: Install Node
-        uses: actions/setup-node@v5
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+
+      - uses: actions/cache@v4
+        name: Setup pnpm cache
        with:
-          node-version-file: ".nvmrc"
-          cache: 'pnpm'
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-

      - name: Cache APT Packages
-        uses: awalsh128/cache-apt-pkgs-action@v1.5.3
+        uses: awalsh128/cache-apt-pkgs-action@v1.5.1
        with:
          packages: bash procps python3 libvirt-dev jq zstd git build-essential
          version: 1.0
@@ -273,7 +298,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4

      - name: Create env file
        run: |
@@ -282,17 +307,31 @@ jobs:
          echo VITE_CONNECT=${{ secrets.VITE_CONNECT }} >> .env
          echo VITE_UNRAID_NET=${{ secrets.VITE_UNRAID_NET }} >> .env
          echo VITE_CALLBACK_KEY=${{ secrets.VITE_CALLBACK_KEY }} >> .env
+          cat .env
+
+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: ".nvmrc"

      - uses: pnpm/action-setup@v4
        name: Install pnpm
        with:
          run_install: false

-      - name: Install Node
-        uses: actions/setup-node@v5
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+
+      - uses: actions/cache@v4
+        name: Setup pnpm cache
        with:
-          node-version-file: ".nvmrc"
-          cache: 'pnpm'
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-

      - name: PNPM Install
        run: |
@@ -320,34 +359,12 @@ jobs:
        uses: actions/upload-artifact@v4
        with:
          name: unraid-wc-rich
-          path: web/dist
-
-  release-please:
-    name: Release Please
-    runs-on: ubuntu-latest
-    # Only run on pushes to main AND after tests pass
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-    needs:
-      - test-api
-      - build-api
-      - build-web
-      - build-unraid-ui-webcomponents
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - id: release
-        uses: googleapis/release-please-action@v4
-    outputs:
-      releases_created: ${{ steps.release.outputs.releases_created || 'false' }}
-      tag_name: ${{ steps.release.outputs.tag_name || '' }}
+          path: web/.nuxt/nuxt-custom-elements/dist/unraid-components

  build-plugin-staging-pr:
    name: Build and Deploy Plugin
    needs:
+      - release-please
      - build-api
      - build-web
      - build-unraid-ui-webcomponents
@@ -371,6 +388,9 @@ jobs:
    needs:
      - release-please
      - build-api
+      - build-web
+      - build-unraid-ui-webcomponents
+      - test-api
    uses: ./.github/workflows/build-plugin.yml
    with:
      RELEASE_CREATED: true
@@ -384,4 +404,3 @@ jobs:
      CF_SECRET_ACCESS_KEY: ${{ secrets.CF_SECRET_ACCESS_KEY }}
      CF_BUCKET_PREVIEW: ${{ secrets.CF_BUCKET_PREVIEW }}
      CF_ENDPOINT: ${{ secrets.CF_ENDPOINT }}
-      UNRAID_BOT_GITHUB_ADMIN_TOKEN: ${{ secrets.UNRAID_BOT_GITHUB_ADMIN_TOKEN }}
--- a/.github/workflows/push-staging-pr-on-close.yml
+++ b/.github/workflows/push-staging-pr-on-close.yml
@@ -1,9 +1,4 @@
-name: Replace PR Plugin with Staging Redirect on Merge
-
-# This workflow runs when a PR is merged and replaces the PR-specific plugin 
-# with a redirect version that points to the main staging URL.
-# This ensures users who installed the PR version will automatically 
-# update to the staging version on their next update check.
+name: Push Staging Plugin on PR Close

 on:
  pull_request:
@@ -22,13 +17,18 @@ on:
        default: true

 jobs:
-  push-staging-redirect:
+  push-staging:
    if: (github.event_name == 'pull_request' && github.event.pull_request.merged == true) || (github.event_name == 'workflow_dispatch' && inputs.pr_merged == true)
    runs-on: ubuntu-latest
    permissions:
      contents: read
      actions: read
    steps:
+      - name: Set Timezone
+        uses: szenius/set-timezone@v2.0
+        with:
+          timezoneLinux: "America/Los_Angeles"
+
      - name: Set PR number
        id: pr_number
        run: |
@@ -45,12 +45,11 @@ jobs:
          name: unraid-plugin-.*
          path: connect-files
          pr: ${{ steps.pr_number.outputs.pr_number }}
-          workflow: main.yml
          workflow_conclusion: success
+          workflow_search: true
          search_artifacts: true
-          if_no_artifact_found: fail

-      - name: Update Downloaded Plugin to Redirect to Staging
+      - name: Update Downloaded Staging Plugin to New Date
        run: |
          # Find the .plg file in the downloaded artifact
          plgfile=$(find connect-files -name "*.plg" -type f | head -1)
@@ -61,82 +60,23 @@ jobs:
          fi

          echo "Found plugin file: $plgfile"
-          
-          # Get current version and bump it with current timestamp
-          current_version=$(grep '<!ENTITY version' "${plgfile}" | sed -E 's/.*"(.*)".*/\1/')
-          echo "Current version: ${current_version}"
-          
-          # Create new version with current timestamp (ensures it's newer)
-          new_version=$(date +"%Y.%m.%d.%H%M")
-          echo "New redirect version: ${new_version}"
-          
-          # Update version to trigger update
-          sed -i -E "s#(<!ENTITY version \").*(\">)#\1${new_version}\2#g" "${plgfile}" || exit 1
+          version=$(date +"%Y.%m.%d.%H%M")
+          sed -i -E "s#(<!ENTITY version \").*(\">)#\1${version}\2#g" "${plgfile}" || exit 1
                
-          # Change the plugin url to point to staging - users will switch to staging on next update
+          # Change the plugin url to point to staging
          url="https://preview.dl.unraid.net/unraid-api/dynamix.unraid.net.plg"
          sed -i -E "s#(<!ENTITY plugin_url \").*?(\">)#\1${url}\2#g" "${plgfile}" || exit 1
-          
-          echo "Modified plugin to redirect to: ${url}"
-          echo "Version bumped from ${current_version} to ${new_version}"
-          
+          cat "${plgfile}"
          mkdir -p pr-release
          mv "${plgfile}" pr-release/dynamix.unraid.net.plg

-      - name: Clean up old PR artifacts from Cloudflare
+      - name: Upload to Cloudflare
+        uses: jakejarvis/s3-sync-action@v0.5.1
        env:
+          AWS_S3_ENDPOINT: ${{ secrets.CF_ENDPOINT }}
+          AWS_S3_BUCKET: ${{ secrets.CF_BUCKET_PREVIEW }}
          AWS_ACCESS_KEY_ID: ${{ secrets.CF_ACCESS_KEY_ID }}
          AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_SECRET_ACCESS_KEY }}
-          AWS_DEFAULT_REGION: auto
-        run: |
-          # Delete all existing files in the PR directory first (txz, plg, etc.)
-          aws s3 rm s3://${{ secrets.CF_BUCKET_PREVIEW }}/unraid-api/tag/PR${{ steps.pr_number.outputs.pr_number }}/ \
-            --recursive \
-            --endpoint-url ${{ secrets.CF_ENDPOINT }}
-          
-          echo "✅ Cleaned up old PR artifacts"
-
-      - name: Upload PR Redirect Plugin to Cloudflare
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.CF_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_SECRET_ACCESS_KEY }}
-          AWS_DEFAULT_REGION: auto
-        run: |
-          # Upload only the redirect plugin file
-          aws s3 cp pr-release/dynamix.unraid.net.plg \
-            s3://${{ secrets.CF_BUCKET_PREVIEW }}/unraid-api/tag/PR${{ steps.pr_number.outputs.pr_number }}/dynamix.unraid.net.plg \
-            --endpoint-url ${{ secrets.CF_ENDPOINT }} \
-            --content-encoding none \
-            --acl public-read
-          
-          echo "✅ Uploaded redirect plugin"
-
-      - name: Output redirect information
-        run: |
-          echo "✅ PR plugin replaced with staging redirect version"
-          echo "PR URL remains: https://preview.dl.unraid.net/unraid-api/tag/PR${{ steps.pr_number.outputs.pr_number }}/dynamix.unraid.net.plg"
-          echo "Redirects users to staging: https://preview.dl.unraid.net/unraid-api/dynamix.unraid.net.plg"
-          echo "Users updating from this PR version will automatically switch to staging"
-
-      - name: Comment on PR about staging redirect
-        if: github.event_name == 'pull_request'
-        uses: thollander/actions-comment-pull-request@v3
-        with:
-          comment-tag: pr-closed-staging
-          mode: recreate
-          message: |
-            ## 🔄 PR Merged - Plugin Redirected to Staging
-            
-            This PR has been merged and the preview plugin has been updated to redirect to the staging version.
-            
-            **For users testing this PR:**
-            - Your plugin will automatically update to the staging version on the next update check
-            - The staging version includes all merged changes from this PR
-            - No manual intervention required
-            
-            **Staging URL:**
-            ```
-            https://preview.dl.unraid.net/unraid-api/dynamix.unraid.net.plg
-            ```
-            
-            Thank you for testing! 🚀
+          AWS_REGION: "auto"
+          SOURCE_DIR: pr-release
+          DEST_DIR: unraid-api/tag/PR${{ steps.pr_number.outputs.pr_number }}
--- a/.github/workflows/release-production.yml
+++ b/.github/workflows/release-production.yml
@@ -28,21 +28,16 @@ jobs:
        with:
          latest: true
          prerelease: false
-      - uses: pnpm/action-setup@v4
-        name: Install pnpm
+      - uses: actions/setup-node@v4
        with:
-          run_install: false
-      - uses: actions/setup-node@v5
-        with:
-          node-version-file: ".nvmrc"
-          cache: 'pnpm'
+          node-version: '22.17.0'
      - run: |
          cat << 'EOF' > release-notes.txt
          ${{ steps.release-info.outputs.body }}
          EOF
      - run: npm install html-escaper@2 xml2js
      - name: Update Plugin Changelog
-        uses: actions/github-script@v8
+        uses: actions/github-script@v7
        with:
          script: |
            const fs = require('fs');
@@ -129,16 +124,3 @@ jobs:
            --no-guess-mime-type \
            --content-encoding none \
            --acl public-read
-
-      - name: Actions for Discord
-        uses: Ilshidur/action-discord@0.4.0
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.PUBLIC_DISCORD_RELEASE_ENDPOINT }}
-        with:
-          args: |
-            🚀 **Unraid API Release ${{ inputs.version }}**
-            
-            View Release: https://github.com/${{ github.repository }}/releases/tag/${{ inputs.version }}
-            
-            **Changelog:**
-            ${{ steps.release-info.outputs.body }}
--- a/.github/workflows/test-libvirt.yml
+++ b/.github/workflows/test-libvirt.yml
@@ -0,0 +1,71 @@
+name: Test Libvirt
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "libvirt/**"
+  pull_request:
+    paths:
+      - "libvirt/**"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        working-directory: ./libvirt
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.13.5"
+
+      - name: Cache APT Packages
+        uses: awalsh128/cache-apt-pkgs-action@v1.5.1
+        with:
+          packages: libvirt-dev
+          version: 1.0
+
+      - name: Set Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: ".nvmrc"
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10
+          run_install: false
+
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+
+      - uses: actions/cache@v4
+        name: Setup pnpm cache
+        with:
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('libvirt/package.json') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: pnpm install
+        run: pnpm install --frozen-lockfile
+
+      - name: Build
+        run: pnpm run build
+
+      - name: test
+        run: pnpm run test
--- a/.gitignore
+++ b/.gitignore
@@ -29,10 +29,6 @@ unraid-ui/node_modules/
 # TypeScript v1 declaration files
 typings/

-# Auto-generated type declarations for Nuxt UI
-auto-imports.d.ts
-components.d.ts
-
 # Optional npm cache directory
 .npm

@@ -80,9 +76,6 @@ typescript
 # Github actions
 RELEASE_NOTES.md

-# Test backups
-api/dev/configs/api.json.backup
-
 # Docker Deploy Folder
 deploy/*
 !deploy/.gitkeep
@@ -116,10 +109,3 @@ plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/dat

 # Config file that changes between versions
 api/dev/Unraid.net/myservers.cfg
-
-# Claude local settings
-.claude/settings.local.json
-
-# local Mise settings
-.mise.toml
-
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-22.18.0
+22.17.0
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1 +1 @@
-{".":"4.22.2"}
+{".":"4.9.2"}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -0,0 +1,14 @@
+{
+  "files.associations": {
+    "*.page": "php"
+  },
+  "editor.codeActionsOnSave": {
+    "source.fixAll": "never",
+    "source.fixAll.eslint": "explicit"
+  },
+  "i18n-ally.localesPaths": ["locales"],
+  "i18n-ally.keystyle": "flat",
+  "eslint.experimental.useFlatConfig": true,
+  "typescript.preferences.importModuleSpecifier": "non-relative",
+  "javascript.preferences.importModuleSpecifier": "non-relative"
+}
--- a/.vscode/sftp-template.json
+++ b/.vscode/sftp-template.json
@@ -0,0 +1,22 @@
+{
+    "_comment": "rename this file to .vscode/sftp.json and replace name/host/privateKeyPath for your system",
+    "name": "Tower",
+    "host": "Tower.local",
+    "protocol": "sftp",
+    "port": 22,
+    "username": "root",
+    "privateKeyPath": "C:/Users/username/.ssh/tower",
+    "remotePath": "/",
+    "context": "plugin/source/dynamix.unraid.net/",
+    "uploadOnSave": true,
+    "useTempFile": false,
+    "openSsh": false,
+    "ignore": [
+      "// comment: ignore dot files/dirs in root of repo",
+      ".github",
+      ".vscode",
+      ".git",
+      ".DS_Store"
+    ]
+  }
+  
--- a/@tailwind-shared/base-utilities.css
+++ b/@tailwind-shared/base-utilities.css
@@ -1,96 +0,0 @@
-@custom-variant dark (&:where(.dark, .dark *));
-
-/* Utility defaults for web components (when we were using shadow DOM) */
-:host {
-    --tw-divide-y-reverse: 0;
-    --tw-border-style: solid;
-    --tw-font-weight: initial;
-    --tw-tracking: initial;
-    --tw-translate-x: 0;
-    --tw-translate-y: 0;
-    --tw-translate-z: 0;
-    --tw-rotate-x: rotateX(0);
-    --tw-rotate-y: rotateY(0);
-    --tw-rotate-z: rotateZ(0);
-    --tw-skew-x: skewX(0);
-    --tw-skew-y: skewY(0);
-    --tw-space-x-reverse: 0;
-    --tw-gradient-position: initial;
-    --tw-gradient-from: #0000;
-    --tw-gradient-via: #0000;
-    --tw-gradient-to: #0000;
-    --tw-gradient-stops: initial;
-    --tw-gradient-via-stops: initial;
-    --tw-gradient-from-position: 0%;
-    --tw-gradient-via-position: 50%;
-    --tw-gradient-to-position: 100%;
-    --tw-shadow: 0 0 #0000;
-    --tw-shadow-color: initial;
-    --tw-inset-shadow: 0 0 #0000;
-    --tw-inset-shadow-color: initial;
-    --tw-ring-color: initial;
-    --tw-ring-shadow: 0 0 #0000;
-    --tw-inset-ring-color: initial;
-    --tw-inset-ring-shadow: 0 0 #0000;
-    --tw-ring-inset: initial;
-    --tw-ring-offset-width: 0px;
-    --tw-ring-offset-color: #fff;
-    --tw-ring-offset-shadow: 0 0 #0000;
-    --tw-blur: initial;
-    --tw-brightness: initial;
-    --tw-contrast: initial;
-    --tw-grayscale: initial;
-    --tw-hue-rotate: initial;
-    --tw-invert: initial;
-    --tw-opacity: initial;
-    --tw-saturate: initial;
-    --tw-sepia: initial;
-    --tw-drop-shadow: initial;
-    --tw-duration: initial;
-    --tw-ease: initial;
-}
-
-/* Global border color - this is what's causing the issue! */
-/* Commenting out since it affects all elements globally
-*,
-::after,
-::before,
-::backdrop,
-::file-selector-button {
-  border-color: hsl(var(--border));
-}
-*/
-
-body {
-    --color-alpha: #1c1b1b;
-    --color-beta: #f2f2f2;
-    --color-gamma: #999999;
-    --color-gamma-opaque: rgba(153, 153, 153, 0.5);
-    --color-customgradient-start: rgba(242, 242, 242, 0);
-    --color-customgradient-end: rgba(242, 242, 242, 0.85);
-    --shadow-beta: 0 25px 50px -12px rgba(242, 242, 242, 0.15);
-    --ring-offset-shadow: 0 0 var(--color-beta);
-    --ring-shadow: 0 0 var(--color-beta);
-  }
-
-button:not(:disabled),
-[role='button']:not(:disabled) {
-  cursor: pointer;
-}
-
-/* Font size overrides for SSO button component */
-unraid-sso-button {
-  --text-xs: 0.75rem;
-  --text-sm: 0.875rem;
-  --text-base: 1rem;
-  --text-lg: 1.125rem;
-  --text-xl: 1.25rem;
-  --text-2xl: 1.5rem;
-  --text-3xl: 1.875rem;
-  --text-4xl: 2.25rem;
-  --text-5xl: 3rem;
-  --text-6xl: 3.75rem;
-  --text-7xl: 4.5rem;
-  --text-8xl: 6rem;
-  --text-9xl: 8rem;
-}
--- a/@tailwind-shared/css-variables.css
+++ b/@tailwind-shared/css-variables.css
@@ -1,144 +0,0 @@
-/* Hybrid theme system: Native CSS + Theme Store fallback */
-
-/* Light mode defaults */
-:root {
-    /* Nuxt UI Color System - Primary (Orange for Unraid) */
-    --ui-color-primary-50: #fff7ed;
-    --ui-color-primary-100: #ffedd5;
-    --ui-color-primary-200: #fed7aa;
-    --ui-color-primary-300: #fdba74;
-    --ui-color-primary-400: #fb923c;
-    --ui-color-primary-500: #ff8c2f;
-    --ui-color-primary-600: #ea580c;
-    --ui-color-primary-700: #c2410c;
-    --ui-color-primary-800: #9a3412;
-    --ui-color-primary-900: #7c2d12;
-    --ui-color-primary-950: #431407;
-
-    /* Nuxt UI Color System - Neutral (True Gray) */
-    --ui-color-neutral-50: #fafafa;
-    --ui-color-neutral-100: #f5f5f5;
-    --ui-color-neutral-200: #e5e5e5;
-    --ui-color-neutral-300: #d4d4d4;
-    --ui-color-neutral-400: #a3a3a3;
-    --ui-color-neutral-500: #737373;
-    --ui-color-neutral-600: #525252;
-    --ui-color-neutral-700: #404040;
-    --ui-color-neutral-800: #262626;
-    --ui-color-neutral-900: #171717;
-    --ui-color-neutral-950: #0a0a0a;
-
-    /* Nuxt UI Default color shades */
-    --ui-primary: var(--ui-color-primary-500);
-    --ui-secondary: var(--ui-color-neutral-500);
-    
-    /* Nuxt UI Design Tokens - Text */
-    --ui-text-dimmed: var(--ui-color-neutral-400);
-    --ui-text-muted: var(--ui-color-neutral-500);
-    --ui-text-toned: var(--ui-color-neutral-600);
-    --ui-text: var(--ui-color-neutral-700);
-    --ui-text-highlighted: var(--ui-color-neutral-900);
-    --ui-text-inverted: white;
-
-    /* Nuxt UI Design Tokens - Background */
-    --ui-bg: white;
-    --ui-bg-muted: var(--ui-color-neutral-50);
-    --ui-bg-elevated: var(--ui-color-neutral-100);
-    --ui-bg-accented: var(--ui-color-neutral-200);
-    --ui-bg-inverted: var(--ui-color-neutral-900);
-
-    /* Nuxt UI Design Tokens - Border */
-    --ui-border: var(--ui-color-neutral-200);
-    --ui-border-muted: var(--ui-color-neutral-200);
-    --ui-border-accented: var(--ui-color-neutral-300);
-    --ui-border-inverted: var(--ui-color-neutral-900);
-
-    /* Nuxt UI Radius */
-    --ui-radius: 0.5rem;
-    
-    --background: 0 0% 100%;
-    --foreground: 0 0% 3.9%;
-    --muted: 0 0% 96.1%;
-    --muted-foreground: 0 0% 45.1%;
-    --popover: 0 0% 100%;
-    --popover-foreground: 0 0% 3.9%;
-    --card: 0 0% 100%;
-    --card-foreground: 0 0% 3.9%;
-    --border: 0 0% 89.8%;
-    --input: 0 0% 89.8%;
-    --primary: 24 100% 50%; /* Orange #ff8c2f in HSL */
-    --primary-foreground: 0 0% 98%;
-    --secondary: 0 0% 96.1%;
-    --secondary-foreground: 0 0% 9%;
-    --accent: 0 0% 96.1%;
-    --accent-foreground: 0 0% 9%;
-    --destructive: 0 84.2% 60.2%;
-    --destructive-foreground: 0 0% 98%;
-    --ring: 24 100% 50%; /* Orange ring to match primary */
-    --chart-1: 12 76% 61%;
-    --chart-2: 173 58% 39%;
-    --chart-3: 197 37% 24%;
-    --chart-4: 43 74% 66%;
-    --chart-5: 27 87% 67%;
-  }
-
-  /* Dark mode */
-  .dark {
-    /* Nuxt UI Default color shades - Dark mode */
-    --ui-primary: var(--ui-color-primary-400);
-    --ui-secondary: var(--ui-color-neutral-400);
-    
-    /* Nuxt UI Design Tokens - Text (Dark) */
-    --ui-text-dimmed: var(--ui-color-neutral-500);
-    --ui-text-muted: var(--ui-color-neutral-400);
-    --ui-text-toned: var(--ui-color-neutral-300);
-    --ui-text: var(--ui-color-neutral-200);
-    --ui-text-highlighted: white;
-    --ui-text-inverted: var(--ui-color-neutral-900);
-
-    /* Nuxt UI Design Tokens - Background (Dark) */
-    --ui-bg: var(--ui-color-neutral-900);
-    --ui-bg-muted: var(--ui-color-neutral-800);
-    --ui-bg-elevated: var(--ui-color-neutral-800);
-    --ui-bg-accented: var(--ui-color-neutral-700);
-    --ui-bg-inverted: white;
-
-    /* Nuxt UI Design Tokens - Border (Dark) */
-    --ui-border: var(--ui-color-neutral-800);
-    --ui-border-muted: var(--ui-color-neutral-700);
-    --ui-border-accented: var(--ui-color-neutral-700);
-    --ui-border-inverted: white;
-    
-    --background: 0 0% 3.9%;
-    --foreground: 0 0% 98%;
-    --muted: 0 0% 14.9%;
-    --muted-foreground: 0 0% 63.9%;
-    --popover: 0 0% 3.9%;
-    --popover-foreground: 0 0% 98%;
-    --card: 0 0% 3.9%;
-    --card-foreground: 0 0% 98%;
-    --border: 0 0% 14.9%;
-    --input: 0 0% 14.9%;
-    --primary: 24 100% 50%; /* Orange #ff8c2f in HSL */
-    --primary-foreground: 0 0% 98%;
-    --secondary: 0 0% 14.9%;
-    --secondary-foreground: 0 0% 98%;
-    --accent: 0 0% 14.9%;
-    --accent-foreground: 0 0% 98%;
-    --destructive: 0 62.8% 30.6%;
-    --destructive-foreground: 0 0% 98%;
-    --ring: 24 100% 50%; /* Orange ring to match primary */
-    --chart-1: 220 70% 50%;
-    --chart-2: 160 60% 45%;
-    --chart-3: 30 80% 55%;
-    --chart-4: 280 65% 60%;
-    --chart-5: 340 75% 55%;
-  }
-
-  /* Alternative class-based dark mode support for specific Unraid themes */
-  .dark[data-theme='black'],
-  .dark[data-theme='gray'] {
-    --background: 0 0% 3.9%;
-    --foreground: 0 0% 98%;
-    --border: 0 0% 14.9%;
-  }
--- a/@tailwind-shared/index.css
+++ b/@tailwind-shared/index.css
@@ -1,5 +0,0 @@
-/* Tailwind Shared Styles - Single entry point for all shared CSS */
-@import './css-variables.css';
-@import './unraid-theme.css';
-@import './theme-variants.css';
-@import './base-utilities.css';
--- a/@tailwind-shared/theme-variants.css
+++ b/@tailwind-shared/theme-variants.css
@@ -1,97 +0,0 @@
-/**
- * Tailwind v4 Theme Variants
- * Defines theme-specific CSS variables that can be switched via classes
- * These are applied dynamically based on the theme selected in GraphQL
- */
-
-/* Default/White Theme */
-:root,
-.theme-white {
-  --header-text-primary: #ffffff;
-  --header-text-secondary: #999999;
-  --header-background-color: #1c1b1b;
-  --header-gradient-start: rgba(28, 27, 27, 0);
-  --header-gradient-end: rgba(28, 27, 27, 0.7);
-  --ui-border-muted: hsl(240 5% 20%);
-  --color-border: #383735;
-  --color-alpha: #ff8c2f;
-  --color-beta: #1c1b1b;
-  --color-gamma: #ffffff;
-  --color-gamma-opaque: rgba(255, 255, 255, 0.3);
-}
-
-/* Black Theme */
-.theme-black,
-.theme-black.dark {
-  --header-text-primary: #1c1b1b;
-  --header-text-secondary: #999999;
-  --header-background-color: #f2f2f2;
-  --header-gradient-start: rgba(242, 242, 242, 0);
-  --header-gradient-end: rgba(242, 242, 242, 0.7);
-  --ui-border-muted: hsl(240 5.9% 90%);
-  --color-border: #e0e0e0;
-  --color-alpha: #ff8c2f;
-  --color-beta: #f2f2f2;
-  --color-gamma: #1c1b1b;
-  --color-gamma-opaque: rgba(28, 27, 27, 0.3);
-}
-
-/* Gray Theme */
-.theme-gray {
-  --header-text-primary: #ffffff;
-  --header-text-secondary: #999999;
-  --header-background-color: #1c1b1b;
-  --header-gradient-start: rgba(28, 27, 27, 0);
-  --header-gradient-end: rgba(28, 27, 27, 0.7);
-  --ui-border-muted: hsl(240 5% 25%);
-  --color-border: #383735;
-  --color-alpha: #ff8c2f;
-  --color-beta: #383735;
-  --color-gamma: #ffffff;
-  --color-gamma-opaque: rgba(255, 255, 255, 0.3);
-}
-
-/* Azure Theme */
-.theme-azure {
-  --header-text-primary: #1c1b1b;
-  --header-text-secondary: #999999;
-  --header-background-color: #f2f2f2;
-  --header-gradient-start: rgba(242, 242, 242, 0);
-  --header-gradient-end: rgba(242, 242, 242, 0.7);
-  --ui-border-muted: hsl(210 40% 80%);
-  --color-border: #5a8bb8;
-  --color-alpha: #ff8c2f;
-  --color-beta: #e7f2f8;
-  --color-gamma: #336699;
-  --color-gamma-opaque: rgba(51, 102, 153, 0.3);
-}
-
-/* Dark Mode Overrides */
-.dark {
-  --ui-border-muted: hsl(240 5% 20%);
-  --color-border: #383735;
-}
-
-/* 
- * Dynamic color variables for user overrides from GraphQL
- * These are set via JavaScript and override the theme defaults
- * Using :root with class for higher specificity to override theme classes
- */
-:root.has-custom-header-text {
-  --header-text-primary: var(--custom-header-text-primary);
-  --color-header-text-primary: var(--custom-header-text-primary);
-}
-
-:root.has-custom-header-meta {
-  --header-text-secondary: var(--custom-header-text-secondary);
-  --color-header-text-secondary: var(--custom-header-text-secondary);
-}
-
-:root.has-custom-header-bg {
-  --header-background-color: var(--custom-header-background-color);
-  --color-header-background: var(--custom-header-background-color);
-  --header-gradient-start: var(--custom-header-gradient-start);
-  --header-gradient-end: var(--custom-header-gradient-end);
-  --color-header-gradient-start: var(--custom-header-gradient-start);
-  --color-header-gradient-end: var(--custom-header-gradient-end);
-}
--- a/@tailwind-shared/unraid-theme.css
+++ b/@tailwind-shared/unraid-theme.css
@@ -1,280 +0,0 @@
-@theme static {
-  /* Breakpoints */
-  --breakpoint-xs: 30rem;
-  --breakpoint-2xl: 100rem;
-  --breakpoint-3xl: 120rem;
-  /* Container settings */
-  --container-center: true;
-  --container-padding: 2rem;
-  --container-screen-2xl: 1400px;
-
-  /* Font families */
-  --font-sans:
-    clear-sans, ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
-    'Segoe UI Symbol', 'Noto Color Emoji';
-
-  /* Grid template columns */
-  --grid-template-columns-settings: 35% 1fr;
-
-  /* Border color default */
-  --default-border-color: var(--color-border);
-  --ui-border-muted: hsl(var(--border));
-  --ui-radius: 0.5rem;
-  --ui-primary: var(--color-primary-500);
-  --ui-primary-hover: var(--color-primary-600);
-  --ui-primary-active: var(--color-primary-700);
-
-  /* Color palette */
-  --color-inherit: inherit;
-  --color-transparent: transparent;
-  --color-black: #1c1b1b;
-  --color-grey-darkest: #222;
-  --color-grey-darker: #606f7b;
-  --color-grey-dark: #383735;
-  --color-grey-mid: #999999;
-  --color-grey: #e0e0e0;
-  --color-grey-light: #dae1e7;
-  --color-grey-lighter: #f1f5f8;
-  --color-grey-lightest: #f2f2f2;
-  --color-white: #ffffff;
-
-  /* Unraid colors */
-  --color-yellow-accent: #e9bf41;
-  --color-orange-dark: #f15a2c;
-  --color-orange: #ff8c2f;
-
-  /* Unraid red palette */
-  --color-unraid-red: #e22828;
-  --color-unraid-red-50: #fef2f2;
-  --color-unraid-red-100: #ffe1e1;
-  --color-unraid-red-200: #ffc9c9;
-  --color-unraid-red-300: #fea3a3;
-  --color-unraid-red-400: #fc6d6d;
-  --color-unraid-red-500: #f43f3f;
-  --color-unraid-red-600: #e22828;
-  --color-unraid-red-700: #bd1818;
-  --color-unraid-red-800: #9c1818;
-  --color-unraid-red-900: #821a1a;
-  --color-unraid-red-950: #470808;
-
-  /* Unraid green palette */
-  --color-unraid-green: #63a659;
-  --color-unraid-green-50: #f5f9f4;
-  --color-unraid-green-100: #e7f3e5;
-  --color-unraid-green-200: #d0e6cc;
-  --color-unraid-green-300: #aad1a4;
-  --color-unraid-green-400: #7db474;
-  --color-unraid-green-500: #63a659;
-  --color-unraid-green-600: #457b3e;
-  --color-unraid-green-700: #396134;
-  --color-unraid-green-800: #314e2d;
-  --color-unraid-green-900: #284126;
-  --color-unraid-green-950: #122211;
-
-  /* Primary colors (orange) */
-  --color-primary-50: #fff7ed;
-  --color-primary-100: #ffedd5;
-  --color-primary-200: #fed7aa;
-  --color-primary-300: #fdba74;
-  --color-primary-400: #fb923c;
-  --color-primary-500: #ff6600;
-  --color-primary-600: #ea580c;
-  --color-primary-700: #c2410c;
-  --color-primary-800: #9a3412;
-  --color-primary-900: #7c2d12;
-  --color-primary-950: #431407;
-
-  /* Header colors - defaults will be overridden by theme */
-  --color-header-text-primary: var(--header-text-primary, #1c1c1c);
-  --color-header-text-secondary: var(--header-text-secondary, #999999);
-  --color-header-background: var(--header-background-color, #f2f2f2);
-
-  /* Legacy colors - defaults (overridden by theme-variants.css) */
-  --color-alpha: #ff8c2f;
-  --color-beta: #f2f2f2;
-  --color-gamma: #999999;
-  --color-gamma-opaque: rgba(153, 153, 153, 0.5);
-  --color-customgradient-start: rgba(242, 242, 242, 0);
-  --color-customgradient-end: rgba(242, 242, 242, 0.85);
-
-  /* Gradients - defaults (overridden by theme-variants.css) */
-  --color-header-gradient-start: rgba(242, 242, 242, 0);
-  --color-header-gradient-end: rgba(242, 242, 242, 0.85);
-  --color-banner-gradient: none;
-
-  /* Font sizes */
-  --font-10px: 10px;
-  --font-12px: 12px;
-  --font-14px: 14px;
-  --font-16px: 16px;
-  --font-18px: 18px;
-  --font-20px: 20px;
-  --font-24px: 24px;
-  --font-30px: 30px;
-
-  /* Spacing */
-  --spacing-4_5: 1.125rem;
-  --spacing--8px: -8px;
-  --spacing-2px: 2px;
-  --spacing-4px: 4px;
-  --spacing-6px: 6px;
-  --spacing-8px: 8px;
-  --spacing-10px: 10px;
-  --spacing-12px: 12px;
-  --spacing-14px: 14px;
-  --spacing-16px: 16px;
-  --spacing-20px: 20px;
-  --spacing-24px: 24px;
-  --spacing-28px: 28px;
-  --spacing-32px: 32px;
-  --spacing-36px: 36px;
-  --spacing-40px: 40px;
-  --spacing-64px: 64px;
-  --spacing-80px: 80px;
-  --spacing-90px: 90px;
-  --spacing-150px: 150px;
-  --spacing-160px: 160px;
-  --spacing-200px: 200px;
-  --spacing-260px: 260px;
-  --spacing-300px: 300px;
-  --spacing-310px: 310px;
-  --spacing-350px: 350px;
-  --spacing-448px: 448px;
-  --spacing-512px: 512px;
-  --spacing-640px: 640px;
-  --spacing-800px: 800px;
-
-  /* Width and Height values */
-  --width-36px: 36px;
-  --height-36px: 36px;
-
-  /* Min/Max widths */
-  --min-width-86px: 86px;
-  --min-width-160px: 160px;
-  --min-width-260px: 260px;
-  --min-width-300px: 300px;
-  --min-width-310px: 310px;
-  --min-width-350px: 350px;
-  --min-width-800px: 800px;
-
-  --max-width-86px: 86px;
-  --max-width-160px: 160px;
-  --max-width-260px: 260px;
-  --max-width-300px: 300px;
-  --max-width-310px: 310px;
-  --max-width-350px: 350px;
-  --max-width-640px: 640px;
-  --max-width-800px: 800px;
-  --max-width-1024px: 1024px;
-
-  /* Container sizes adjusted for 10px base font size (1.6x scale) */
-  --container-xs: 32rem;
-  --container-sm: 38.4rem;
-  --container-md: 44.8rem;
-  --container-lg: 51.2rem;
-  --container-xl: 57.6rem;
-  --container-2xl: 67.2rem;
-  --container-3xl: 76.8rem;
-  --container-4xl: 89.6rem;
-  --container-5xl: 102.4rem;
-  --container-6xl: 115.2rem;
-  --container-7xl: 128rem;
-  
-  /* Extended width scale for max-w-* utilities */
-  --width-5xl: 102.4rem;
-  --width-6xl: 115.2rem;
-  --width-7xl: 128rem;
-  --width-8xl: 140.8rem;
-  --width-9xl: 153.6rem;
-  --width-10xl: 166.4rem;
-
-  /* Animations */
-  --animate-mark-2: mark-2 1.5s ease infinite;
-  --animate-mark-3: mark-3 1.5s ease infinite;
-  --animate-mark-6: mark-6 1.5s ease infinite;
-  --animate-mark-7: mark-7 1.5s ease infinite;
-
-  /* Radius */
-  --radius: 0.5rem;
-
-  /* Text Resizing */
-  --text-xs: 1.2rem; /* 12px at 10px base */
-  --text-sm: 1.4rem; /* 14px at 10px base */
-  --text-base: 1.6rem; /* 16px at 10px base */
-  --text-lg: 1.8rem; /* 18px at 10px base */
-  --text-xl: 2rem; /* 20px at 10px base */
-  --text-2xl: 2.4rem; /* 24px at 10px base */
-  --text-3xl: 3rem; /* 30px at 10px base */
-  --text-4xl: 3.6rem; /* 36px at 10px base */
-  --text-5xl: 4.8rem; /* 48px at 10px base */
-  --text-6xl: 6rem; /* 60px at 10px base */
-  --text-7xl: 7.2rem; /* 72px at 10px base */
-  --text-8xl: 9.6rem; /* 96px at 10px base */
-  --text-9xl: 12.8rem; /* 128px at 10px base */
-  --spacing: 0.4rem; /* 4px at 10px base */
-}
-
-/* Keyframes */
-@keyframes mark-2 {
-  50% {
-    transform: translateY(-40px);
-  }
-  to {
-    transform: translateY(0);
-  }
-}
-
-@keyframes mark-3 {
-  50% {
-    transform: translateY(-62px);
-  }
-  to {
-    transform: translateY(0);
-  }
-}
-
-@keyframes mark-6 {
-  50% {
-    transform: translateY(40px);
-  }
-  to {
-    transform: translateY(0);
-  }
-}
-
-@keyframes mark-7 {
-  50% {
-    transform: translateY(62px);
-  }
-  to {
-    transform: translateY(0);
-  }
-}
-
-/* Theme colors that reference CSS variables */
-@theme inline {
-  --color-background: hsl(var(--background));
-  --color-foreground: hsl(var(--foreground));
-  --color-muted: hsl(var(--muted));
-  --color-muted-foreground: hsl(var(--muted-foreground));
-  --color-popover: hsl(var(--popover));
-  --color-popover-foreground: hsl(var(--popover-foreground));
-  --color-card: hsl(var(--card));
-  --color-card-foreground: hsl(var(--card-foreground));
-  --color-border: hsl(var(--border));
-  --color-input: hsl(var(--input));
-  --color-primary: hsl(var(--primary));
-  --color-primary-foreground: hsl(var(--primary-foreground));
-  --color-secondary: hsl(var(--secondary));
-  --color-secondary-foreground: hsl(var(--secondary-foreground));
-  --color-accent: hsl(var(--accent));
-  --color-accent-foreground: hsl(var(--accent-foreground));
-  --color-destructive: hsl(var(--destructive));
-  --color-destructive-foreground: hsl(var(--destructive-foreground));
-  --color-ring: hsl(var(--ring));
-  --color-chart-1: hsl(var(--chart-1, 12 76% 61%));
-  --color-chart-2: hsl(var(--chart-2, 173 58% 39%));
-  --color-chart-3: hsl(var(--chart-3, 197 37% 24%));
-  --color-chart-4: hsl(var(--chart-4, 43 74% 66%));
-  --color-chart-5: hsl(var(--chart-5, 27 87% 67%));
-}
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -7,7 +7,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 This is the Unraid API monorepo containing multiple packages that provide API functionality for Unraid servers. It uses pnpm workspaces with the following structure:

 - `/api` - Core NestJS API server with GraphQL
- `/web` - Vue 3 frontend application
+- `/web` - Nuxt.js frontend application
 - `/unraid-ui` - Vue 3 component library
 - `/plugin` - Unraid plugin package (.plg)
 - `/packages` - Shared packages and API plugins
@@ -46,16 +46,6 @@ cd api && pnpm codegen    # Generate GraphQL types
 pnpm unraid:deploy <SERVER_IP>  # Deploy all to Unraid server
 ```

-### Developer Tools
-
-```bash
-unraid-api developer                       # Interactive prompt for tools
-unraid-api developer --sandbox true        # Enable GraphQL sandbox
-unraid-api developer --sandbox false       # Disable GraphQL sandbox
-unraid-api developer --enable-modal        # Enable modal testing tool
-unraid-api developer --disable-modal       # Disable modal testing tool
-```
-
 ## Architecture Notes

 ### API Structure (NestJS)
@@ -120,14 +110,10 @@ Enables GraphQL playground at `http://tower.local/graphql`

 ### Testing Guidelines

-#### General Testing Best Practices
-
- **Error Testing:** Use `.rejects.toThrow()` without arguments to test that functions throw errors. Don't test exact error message strings unless the message format is specifically what you're testing
- **Focus on Behavior:** Test what the code does, not implementation details like exact error message wording
- **Avoid Brittleness:** Don't write tests that break when minor changes are made to error messages, log formats, or other non-essential details
- **Use Mocks Correctly**: Mocks should be used as nouns, not verbs.
-
 #### Vue Component Testing
+
+- This is a Nuxt.js app but we are testing with vitest outside of the Nuxt environment
+- Nuxt is currently set to auto import so some vue files may need compute or ref imported
 - Use pnpm when running terminal commands and stay within the web directory
 - Tests are located under `web/__test__`, run with `pnpm test`
 - Use `mount` from Vue Test Utils for component testing
@@ -149,12 +135,3 @@ Enables GraphQL playground at `http://tower.local/graphql`
 - Place all mock declarations at the top level
 - Use factory functions for module mocks to avoid hoisting issues
 - Clear mocks between tests to ensure isolation
-
-## Development Memories
-
- We are using tailwind v4 we do not need a tailwind config anymore 
- always search the internet for tailwind v4 documentation when making tailwind related style changes
- never run or restart the API server or web server. I will handle the lifecycle, simply wait and ask me to do this for you
- Never use the `any` type. Always prefer proper typing
- Avoid using casting whenever possible, prefer proper typing from the start
- **IMPORTANT:** cache-manager v7 expects TTL values in **milliseconds**, not seconds. Always use milliseconds when setting cache TTL (e.g., 600000 for 10 minutes, not 600)
--- a/api/.depcheckrc
+++ b/api/.depcheckrc
@@ -1,10 +0,0 @@
-{
-  "parsers": {
-    "**/*.ts": [
-      "@depcheck/parser-typescript",
-      {
-        "project": "tsconfig.json"
-      }
-    ]
-  }
-}
--- a/api/.env.development
+++ b/api/.env.development
@@ -15,10 +15,6 @@ PATHS_ACTIVATION_BASE=./dev/activation
 PATHS_PASSWD=./dev/passwd
 PATHS_RCLONE_SOCKET=./dev/rclone-socket
 PATHS_LOG_BASE=./dev/log # Where we store logs
-PATHS_LOGS_FILE=./dev/log/graphql-api.log
-PATHS_CONNECT_STATUS_FILE_PATH=./dev/connectStatus.json # Connect plugin status file
-PATHS_OIDC_JSON=./dev/configs/oidc.local.json
-PATHS_LOCAL_SESSION_FILE=./dev/local-session
 ENVIRONMENT="development"
 NODE_ENV="development"
 PORT="3001"
@@ -31,4 +27,3 @@ BYPASS_CORS_CHECKS=true
 CHOKIDAR_USEPOLLING=true
 LOG_TRANSPORT=console
 LOG_LEVEL=trace
-ENABLE_NEXT_DOCKER_RELEASE=true
--- a/api/.env.test
+++ b/api/.env.test
@@ -13,7 +13,5 @@ PATHS_PARITY_CHECKS=./dev/states/parity-checks.log
 PATHS_CONFIG_MODULES=./dev/configs
 PATHS_ACTIVATION_BASE=./dev/activation
 PATHS_PASSWD=./dev/passwd
-PATHS_LOGS_FILE=./dev/log/graphql-api.log
-PATHS_LOCAL_SESSION_FILE=./dev/local-session
 PORT=5000
 NODE_ENV="test"
--- a/api/.eslintrc.ts
+++ b/api/.eslintrc.ts
@@ -4,59 +4,54 @@ import noRelativeImportPaths from 'eslint-plugin-no-relative-import-paths';
 import prettier from 'eslint-plugin-prettier';
 import tseslint from 'typescript-eslint';

-export default tseslint.config(
-    eslint.configs.recommended,
-    ...tseslint.configs.recommended,
-    {
-        ignores: ['src/graphql/generated/client/**/*', 'src/**/**/dummy-process.js'],
+export default tseslint.config(eslint.configs.recommended, ...tseslint.configs.recommended, {
+    plugins: {
+        'no-relative-import-paths': noRelativeImportPaths,
+        prettier: prettier,
+        import: importPlugin,
    },
-    {
-        plugins: {
-            'no-relative-import-paths': noRelativeImportPaths,
-            prettier: prettier,
-            import: importPlugin,
-        },
-        rules: {
-            '@typescript-eslint/no-redundant-type-constituents': 'off',
-            '@typescript-eslint/no-unsafe-call': 'off',
-            '@typescript-eslint/naming-convention': 'off',
-            '@typescript-eslint/no-unsafe-assignment': 'off',
-            '@typescript-eslint/no-unsafe-return': 'off',
-            '@typescript-eslint/ban-types': 'off',
-            '@typescript-eslint/no-explicit-any': 'off',
-            '@typescript-eslint/no-empty-object-type': 'off',
-            'no-use-before-define': ['off'],
-            'no-multiple-empty-lines': ['error', { max: 1, maxBOF: 0, maxEOF: 1 }],
-            '@typescript-eslint/no-unused-vars': 'off',
-            '@typescript-eslint/no-unused-expressions': 'off',
-            'import/no-unresolved': 'off',
-            'import/no-absolute-path': 'off',
-            'import/prefer-default-export': 'off',
-            'no-relative-import-paths/no-relative-import-paths': [
-                'error',
-                { allowSameFolder: false, rootDir: 'src', prefix: '@app' },
-            ],
-            'prettier/prettier': 'error',
-            'import/extensions': [
-                'error',
-                'ignorePackages',
-                {
-                    js: 'always',
-                    ts: 'always',
-                },
-            ],
-            'no-restricted-globals': [
-                'error',
-                {
-                    name: '__dirname',
-                    message: 'Use import.meta.url instead of __dirname in ESM',
-                },
-                {
-                    name: '__filename',
-                    message: 'Use import.meta.url instead of __filename in ESM',
-                },
-            ],
-            'eol-last': ['error', 'always'],
-        },
-    }
-);
+    rules: {
+        '@typescript-eslint/no-redundant-type-constituents': 'off',
+        '@typescript-eslint/no-unsafe-call': 'off',
+        '@typescript-eslint/naming-convention': 'off',
+        '@typescript-eslint/no-unsafe-assignment': 'off',
+        '@typescript-eslint/no-unsafe-return': 'off',
+        '@typescript-eslint/ban-types': 'off',
+        '@typescript-eslint/no-explicit-any': 'off',
+        '@typescript-eslint/no-empty-object-type': 'off',
+        'no-use-before-define': ['off'],
+        'no-multiple-empty-lines': ['error', { max: 1, maxBOF: 0, maxEOF: 1 }],
+        '@typescript-eslint/no-unused-vars': 'off',
+        '@typescript-eslint/no-unused-expressions': 'off',
+        'import/no-unresolved': 'off',
+        'import/no-absolute-path': 'off',
+        'import/prefer-default-export': 'off',
+        'no-relative-import-paths/no-relative-import-paths': [
+            'error',
+            { allowSameFolder: false, rootDir: 'src', prefix: '@app' },
+        ],
+        'prettier/prettier': 'error',
+        'import/extensions': [
+            'error',
+            'ignorePackages',
+            {
+                js: 'always',
+                ts: 'always',
+            },
+        ],
+        'no-restricted-globals': [
+            'error',
+            {
+                name: '__dirname',
+                message: 'Use import.meta.url instead of __dirname in ESM',
+            },
+            {
+                name: '__filename',
+                message: 'Use import.meta.url instead of __filename in ESM',
+            },
+        ],
+        'eol-last': ['error', 'always'],
+    },
+
+    ignores: ['src/graphql/generated/client/**/*'],
+});
--- a/api/.gitignore
+++ b/api/.gitignore
@@ -82,17 +82,3 @@ deploy/*
 .idea

 !**/*.login.*
-
-# local api configs - don't need project-wide tracking
-dev/connectStatus.json
-dev/configs/*
-# local status - doesn't need to be tracked
-dev/connectStatus.json
-# mock local session file
-dev/local-session
-
-# local OIDC config for testing - contains secrets
-dev/configs/oidc.local.json
-
-# local api keys
-dev/keys/*
--- a/api/.vscode/settings.json
+++ b/api/.vscode/settings.json
@@ -0,0 +1,9 @@
+{
+    "eslint.lintTask.options": "--flag unstable_ts_config",
+    "eslint.options": {
+        "flags": ["unstable_ts_config"],
+        "overrideConfigFile": ".eslintrc.ts"
+    },
+    "typescript.preferences.importModuleSpecifier": "non-relative",
+    "javascript.preferences.importModuleSpecifier": "non-relative"
+}
--- a/api/CHANGELOG.md
+++ b/api/CHANGELOG.md
@@ -1,328 +1,5 @@
 # Changelog

-## [4.22.2](https://github.com/unraid/api/compare/v4.22.1...v4.22.2) (2025-09-15)
-
-
-### Bug Fixes
-
-* **deps:** pin dependency conventional-changelog-conventionalcommits to 9.1.0 ([#1697](https://github.com/unraid/api/issues/1697)) ([9a86c61](https://github.com/unraid/api/commit/9a86c615da2e975f568922fa012cc29b3f9cde0e))
-* **deps:** update dependency filenamify to v7 ([#1703](https://github.com/unraid/api/issues/1703)) ([b80988a](https://github.com/unraid/api/commit/b80988aaabebc4b8dbf2bf31f0764bf2f28e1575))
-* **deps:** update graphqlcodegenerator monorepo (major) ([#1689](https://github.com/unraid/api/issues/1689)) ([ba4a43a](https://github.com/unraid/api/commit/ba4a43aec863fc30c47dd17370d74daed7f84703))
-* false positive on verify_install script being external shell ([#1704](https://github.com/unraid/api/issues/1704)) ([31a255c](https://github.com/unraid/api/commit/31a255c9281b29df983d0f5d0475cd5a69790a48))
-* improve vue mount speed by 10x ([c855caa](https://github.com/unraid/api/commit/c855caa9b2d4d63bead1a992f5c583e00b9ba843))
-
-## [4.22.1](https://github.com/unraid/api/compare/v4.22.0...v4.22.1) (2025-09-12)
-
-
-### Bug Fixes
-
-* set input color in SSO field rather than inside of the main.css ([01d353f](https://github.com/unraid/api/commit/01d353fa08a3df688b37a495a204605138f7f71d))
-
-## [4.22.0](https://github.com/unraid/api/compare/v4.21.0...v4.22.0) (2025-09-12)
-
-
-### Features
-
-* improved update ui ([#1691](https://github.com/unraid/api/issues/1691)) ([a59b363](https://github.com/unraid/api/commit/a59b363ebc1e660f854c55d50fc02c823c2fd0cc))
-
-
-### Bug Fixes
-
-* **deps:** update dependency camelcase-keys to v10 ([#1687](https://github.com/unraid/api/issues/1687)) ([95faeaa](https://github.com/unraid/api/commit/95faeaa2f39bf7bd16502698d7530aaa590b286d))
-* **deps:** update dependency p-retry to v7 ([#1608](https://github.com/unraid/api/issues/1608)) ([c782cf0](https://github.com/unraid/api/commit/c782cf0e8710c6690050376feefda3edb30dd549))
-* **deps:** update dependency uuid to v13 ([#1688](https://github.com/unraid/api/issues/1688)) ([2fef10c](https://github.com/unraid/api/commit/2fef10c94aae910e95d9f5bcacf7289e2cca6ed9))
-* **deps:** update dependency vue-sonner to v2 ([#1475](https://github.com/unraid/api/issues/1475)) ([f95ca9c](https://github.com/unraid/api/commit/f95ca9c9cb69725dcf3bb4bcbd0b558a2074e311))
-* display settings fix for languages on less than 7.2-beta.2.3 ([#1696](https://github.com/unraid/api/issues/1696)) ([03dae7c](https://github.com/unraid/api/commit/03dae7ce66b3409593eeee90cd5b56e2a920ca44))
-* hide reset help option when sso is being checked ([#1695](https://github.com/unraid/api/issues/1695)) ([222ced7](https://github.com/unraid/api/commit/222ced7518d40c207198a3b8548f0e024bc865b0))
-* progressFrame white on black ([0990b89](https://github.com/unraid/api/commit/0990b898bd02c231153157c20d5142e5fd4513cd))
-
-## [4.21.0](https://github.com/unraid/api/compare/v4.20.4...v4.21.0) (2025-09-10)
-
-
-### Features
-
-* add zsh shell detection to install script ([#1539](https://github.com/unraid/api/issues/1539)) ([50ea2a3](https://github.com/unraid/api/commit/50ea2a3ffb82b30152fb85e0fb9b0d178d596efe))
-* **api:** determine if docker container has update ([#1582](https://github.com/unraid/api/issues/1582)) ([e57d81e](https://github.com/unraid/api/commit/e57d81e0735772758bb85e0b3c89dce15c56635e))
-
-
-### Bug Fixes
-
-* white on white login text ([ae4d3ec](https://github.com/unraid/api/commit/ae4d3ecbc417454ae3c6e02018f8e4c49bbfc902))
-
-## [4.20.4](https://github.com/unraid/api/compare/v4.20.3...v4.20.4) (2025-09-09)
-
-
-### Bug Fixes
-
-* staging PR plugin fixes + UI issues on 7.2 beta ([b79b44e](https://github.com/unraid/api/commit/b79b44e95c65a124313814ab55b0d0a745a799c7))
-
-## [4.20.3](https://github.com/unraid/api/compare/v4.20.2...v4.20.3) (2025-09-09)
-
-
-### Bug Fixes
-
-* header background color issues fixed on 7.2 - thanks Nick! ([73c1100](https://github.com/unraid/api/commit/73c1100d0ba396fe4342f8ce7561017ab821e68b))
-
-## [4.20.2](https://github.com/unraid/api/compare/v4.20.1...v4.20.2) (2025-09-09)
-
-
-### Bug Fixes
-
-* trigger deployment ([a27453f](https://github.com/unraid/api/commit/a27453fda81e4eeb07f257e60516bebbbc27cf7a))
-
-## [4.20.1](https://github.com/unraid/api/compare/v4.20.0...v4.20.1) (2025-09-09)
-
-
-### Bug Fixes
-
-* adjust header styles to fix flashing and width issues - thanks ZarZ ([4759b3d](https://github.com/unraid/api/commit/4759b3d0b3fb6bc71636f75f807cd6f4f62305d1))
-
-## [4.20.0](https://github.com/unraid/api/compare/v4.19.1...v4.20.0) (2025-09-08)
-
-
-### Features
-
-* **disks:** add isSpinning field to Disk type ([#1527](https://github.com/unraid/api/issues/1527)) ([193be3d](https://github.com/unraid/api/commit/193be3df3672514be9904e3d4fbdff776470afc0))
-
-
-### Bug Fixes
-
-* better component loading to prevent per-page strange behavior ([095c222](https://github.com/unraid/api/commit/095c2221c94f144f8ad410a69362b15803765531))
-* **deps:** pin dependencies ([#1669](https://github.com/unraid/api/issues/1669)) ([413db4b](https://github.com/unraid/api/commit/413db4bd30a06aa69d3ca86e793782854f822589))
-* **plugin:** add fallback for unraid-api stop in deprecation cleanup ([#1668](https://github.com/unraid/api/issues/1668)) ([797bf50](https://github.com/unraid/api/commit/797bf50ec702ebc8244ff71a8ef1a80ea5cd2169))
-* prepend 'v' to API version in workflow dispatch inputs ([f0cffbd](https://github.com/unraid/api/commit/f0cffbdc7ac36e7037ab60fe9dddbb2cab4a5e10))
-* progress frame background color fix ([#1672](https://github.com/unraid/api/issues/1672)) ([785f1f5](https://github.com/unraid/api/commit/785f1f5eb1a1cc8b41f6eb502e4092d149cfbd80))
-* properly override header values ([#1673](https://github.com/unraid/api/issues/1673)) ([aecf70f](https://github.com/unraid/api/commit/aecf70ffad60c83074347d3d6ec23f73acbd1aee))
-
-## [4.19.1](https://github.com/unraid/api/compare/v4.19.0...v4.19.1) (2025-09-05)
-
-
-### Bug Fixes
-
-* custom path detection to fix setup issues ([#1664](https://github.com/unraid/api/issues/1664)) ([2ecdb99](https://github.com/unraid/api/commit/2ecdb99052f39d89af21bbe7ad3f80b83bb1eaa9))
-
-## [4.19.0](https://github.com/unraid/api/compare/v4.18.2...v4.19.0) (2025-09-04)
-
-
-### Features
-
-* mount vue apps, not web components ([#1639](https://github.com/unraid/api/issues/1639)) ([88087d5](https://github.com/unraid/api/commit/88087d5201992298cdafa791d5d1b5bb23dcd72b))
-
-
-### Bug Fixes
-
-* api version json response ([#1653](https://github.com/unraid/api/issues/1653)) ([292bc0f](https://github.com/unraid/api/commit/292bc0fc810a0d0f0cce6813b0631ff25099cc05))
-* enhance DOM validation and cleanup in vue-mount-app ([6cf7c88](https://github.com/unraid/api/commit/6cf7c88242f2f4fe9f83871560039767b5b90273))
-* enhance getKeyFile function to handle missing key file gracefully ([#1659](https://github.com/unraid/api/issues/1659)) ([728b38a](https://github.com/unraid/api/commit/728b38ac11faeacd39ce9d0157024ad140e29b36))
-* info alert docker icon ([#1661](https://github.com/unraid/api/issues/1661)) ([239cdd6](https://github.com/unraid/api/commit/239cdd6133690699348e61f68e485d2b54fdcbdb))
-* oidc cache busting issues fixed ([#1656](https://github.com/unraid/api/issues/1656)) ([e204eb8](https://github.com/unraid/api/commit/e204eb80a00ab9242e3dca4ccfc3e1b55a7694b7))
-* **plugin:** restore cleanup behavior for unsupported unraid versions ([#1658](https://github.com/unraid/api/issues/1658)) ([534a077](https://github.com/unraid/api/commit/534a07788b76de49e9ba14059a9aed0bf16e02ca))
-* UnraidToaster component and update dialog close button ([#1657](https://github.com/unraid/api/issues/1657)) ([44774d0](https://github.com/unraid/api/commit/44774d0acdd25aa33cb60a5d0b4f80777f4068e5))
-* vue mounting logic with tests ([#1651](https://github.com/unraid/api/issues/1651)) ([33774aa](https://github.com/unraid/api/commit/33774aa596124a031a7452b62ca4c43743a09951))
-
-## [4.18.2](https://github.com/unraid/api/compare/v4.18.1...v4.18.2) (2025-09-03)
-
-
-### Bug Fixes
-
-* add missing CPU guest metrics to CPU responses ([#1644](https://github.com/unraid/api/issues/1644)) ([99dbad5](https://github.com/unraid/api/commit/99dbad57d55a256f5f3f850f9a47a6eaa6348065))
-* **plugin:** raise minimum unraid os version to 6.12.15 ([#1649](https://github.com/unraid/api/issues/1649)) ([bc15bd3](https://github.com/unraid/api/commit/bc15bd3d7008acb416ac3c6fb1f4724c685ec7e7))
-* update GitHub Actions token for workflow trigger ([4d8588b](https://github.com/unraid/api/commit/4d8588b17331afa45ba8caf84fcec8c0ea03591f))
-* update OIDC URL validation and add tests ([#1646](https://github.com/unraid/api/issues/1646)) ([c7c3bb5](https://github.com/unraid/api/commit/c7c3bb57ea482633a7acff064b39fbc8d4e07213))
-* use shared bg & border color for styled toasts ([#1647](https://github.com/unraid/api/issues/1647)) ([7c3aee8](https://github.com/unraid/api/commit/7c3aee8f3f9ba82ae8c8ed3840c20ab47f3cb00f))
-
-## [4.18.1](https://github.com/unraid/api/compare/v4.18.0...v4.18.1) (2025-09-03)
-
-
-### Bug Fixes
-
-* OIDC and API Key management issues ([#1642](https://github.com/unraid/api/issues/1642)) ([0fe2c2c](https://github.com/unraid/api/commit/0fe2c2c1c85dcc547e4b1217a3b5636d7dd6d4b4))
-* rm redundant emission to `$HOME/.pm2/logs` ([#1640](https://github.com/unraid/api/issues/1640)) ([a8e4119](https://github.com/unraid/api/commit/a8e4119270868a1dabccd405853a7340f8dcd8a5))
-
-## [4.18.0](https://github.com/unraid/api/compare/v4.17.0...v4.18.0) (2025-09-02)
-
-
-### Features
-
-* **api:** enhance OIDC redirect URI handling in service and tests ([#1618](https://github.com/unraid/api/issues/1618)) ([4e945f5](https://github.com/unraid/api/commit/4e945f5f56ce059eb275a9576caf3194a5df8a90))
-
-
-### Bug Fixes
-
-* api key creation cli ([#1637](https://github.com/unraid/api/issues/1637)) ([c147a6b](https://github.com/unraid/api/commit/c147a6b5075969e77798210c4a5cfd1fa5b96ae3))
-* **cli:** support `--log-level` for `start` and `restart` cmds ([#1623](https://github.com/unraid/api/issues/1623)) ([a1ee915](https://github.com/unraid/api/commit/a1ee915ca52e5a063eccf8facbada911a63f37f6))
-* confusing server -&gt; status query ([#1635](https://github.com/unraid/api/issues/1635)) ([9d42b36](https://github.com/unraid/api/commit/9d42b36f74274cad72490da5152fdb98fdc5b89b))
-* use unraid css variables in sonner ([#1634](https://github.com/unraid/api/issues/1634)) ([26a95af](https://github.com/unraid/api/commit/26a95af9539d05a837112d62dc6b7dd46761c83f))
-
-## [4.17.0](https://github.com/unraid/api/compare/v4.16.0...v4.17.0) (2025-08-27)
-
-
-### Features
-
-* add tailwind class sort plugin ([#1562](https://github.com/unraid/api/issues/1562)) ([ab11e7f](https://github.com/unraid/api/commit/ab11e7ff7ff74da1f1cd5e49938459d00bfc846b))
-
-
-### Bug Fixes
-
-* cleanup obsoleted legacy api keys on api startup (cli / connect) ([#1630](https://github.com/unraid/api/issues/1630)) ([6469d00](https://github.com/unraid/api/commit/6469d002b7b18e49c77ee650a4255974ab43e790))
-
-## [4.16.0](https://github.com/unraid/api/compare/v4.15.1...v4.16.0) (2025-08-27)
-
-
-### Features
-
-* add `parityCheckStatus` field to `array` query ([#1611](https://github.com/unraid/api/issues/1611)) ([c508366](https://github.com/unraid/api/commit/c508366702b9fa20d9ed05559fe73da282116aa6))
-* generated UI API key management + OAuth-like API Key Flows ([#1609](https://github.com/unraid/api/issues/1609)) ([674323f](https://github.com/unraid/api/commit/674323fd87bbcc55932e6b28f6433a2de79b7ab0))
-
-
-### Bug Fixes
-
-* **connect:** clear `wanport` upon disabling remote access ([#1624](https://github.com/unraid/api/issues/1624)) ([9df6a3f](https://github.com/unraid/api/commit/9df6a3f5ebb0319aa7e3fe3be6159d39ec6f587f))
-* **connect:** valid LAN FQDN while remote access is enabled ([#1625](https://github.com/unraid/api/issues/1625)) ([aa58888](https://github.com/unraid/api/commit/aa588883cc2e2fe4aa4aea1d035236c888638f5b))
-* correctly parse periods in share names from ini file ([#1629](https://github.com/unraid/api/issues/1629)) ([7d67a40](https://github.com/unraid/api/commit/7d67a404333a38d6e1ba5c3febf02be8b1b71901))
-* **rc.unraid-api:** remove profile sourcing ([#1622](https://github.com/unraid/api/issues/1622)) ([6947b5d](https://github.com/unraid/api/commit/6947b5d4aff70319116eb65cf4c639444f3749e9))
-* remove unused api key calls ([#1628](https://github.com/unraid/api/issues/1628)) ([9cd0d6a](https://github.com/unraid/api/commit/9cd0d6ac658475efa25683ef6e3f2e1d68f7e903))
-* retry VMs init for up to 2 min ([#1612](https://github.com/unraid/api/issues/1612)) ([b2e7801](https://github.com/unraid/api/commit/b2e78012384e6b3f2630341281fc811026be23b9))
-
-## [4.15.1](https://github.com/unraid/api/compare/v4.15.0...v4.15.1) (2025-08-20)
-
-
-### Bug Fixes
-
-* minor duplicate click handler and version resolver nullability issue ([ac198d5](https://github.com/unraid/api/commit/ac198d5d1a3073fdeb053c2ff8f704b0dba0d047))
-
-## [4.15.0](https://github.com/unraid/api/compare/v4.14.0...v4.15.0) (2025-08-20)
-
-
-### Features
-
-* **api:** restructure versioning information in GraphQL schema ([#1600](https://github.com/unraid/api/issues/1600)) ([d0c6602](https://github.com/unraid/api/commit/d0c66020e1d1d5b6fcbc4ee8979bba4b3d34c7ad))
-
-## [4.14.0](https://github.com/unraid/api/compare/v4.13.1...v4.14.0) (2025-08-19)
-
-
-### Features
-
-* **api:** add cpu utilization query and subscription ([#1590](https://github.com/unraid/api/issues/1590)) ([2b4c2a2](https://github.com/unraid/api/commit/2b4c2a264bb2769f88c3000d16447889cae57e98))
-* enhance OIDC claim evaluation with array handling ([#1596](https://github.com/unraid/api/issues/1596)) ([b7798b8](https://github.com/unraid/api/commit/b7798b82f44aae9a428261270fd9dbde35ff7751))
-
-
-### Bug Fixes
-
-* remove unraid-api sso users & always apply sso modification on &lt; 7.2 ([#1595](https://github.com/unraid/api/issues/1595)) ([4262830](https://github.com/unraid/api/commit/426283011afd41e3af7e48cfbb2a2d351c014bd1))
-* update Docusaurus PR workflow to process and copy API docs ([3a10871](https://github.com/unraid/api/commit/3a10871918fe392a1974b69d16a135546166e058))
-* update OIDC provider setup documentation for navigation clarity ([1a01696](https://github.com/unraid/api/commit/1a01696dc7b947abf5f2f097de1b231d5593c2ff))
-* update OIDC provider setup documentation for redirect URI and screenshots ([1bc5251](https://github.com/unraid/api/commit/1bc52513109436b3ce8237c3796af765e208f9fc))
-
-## [4.13.1](https://github.com/unraid/api/compare/v4.13.0...v4.13.1) (2025-08-15)
-
-
-### Bug Fixes
-
-* insecure routes not working for SSO ([#1587](https://github.com/unraid/api/issues/1587)) ([a4ff3c4](https://github.com/unraid/api/commit/a4ff3c40926915f6989ed4af679b30cf295ea15d))
-
-## [4.13.0](https://github.com/unraid/api/compare/v4.12.0...v4.13.0) (2025-08-15)
-
-
-### Features
-
-* `createDockerFolder` & `setDockerFolderChildren` mutations ([#1558](https://github.com/unraid/api/issues/1558)) ([557b03f](https://github.com/unraid/api/commit/557b03f8829d3f179b5e26162fa250121cb33420))
-* `deleteDockerEntries` mutation ([#1564](https://github.com/unraid/api/issues/1564)) ([78997a0](https://github.com/unraid/api/commit/78997a02c6d96ec0ed75352dfc9849524147428c))
-* add `moveDockerEntriesToFolder` mutation ([#1569](https://github.com/unraid/api/issues/1569)) ([20c2d5b](https://github.com/unraid/api/commit/20c2d5b4457ad50d1e287fb3141aa98e8e7de665))
-* add docker -&gt; organizer query ([#1555](https://github.com/unraid/api/issues/1555)) ([dfe352d](https://github.com/unraid/api/commit/dfe352dfa1bd6aa059cab56357ba6bff5e8ed7cb))
-* connect settings page updated for responsive webgui ([#1585](https://github.com/unraid/api/issues/1585)) ([96c120f](https://github.com/unraid/api/commit/96c120f9b24d3c91df5e9401917c8994eef36c46))
-* implement OIDC provider management in GraphQL API ([#1563](https://github.com/unraid/api/issues/1563)) ([979a267](https://github.com/unraid/api/commit/979a267bc5e128a8b789f0123e23c61860ebb11b))
-
-
-### Bug Fixes
-
-* change config file loading error log to debug ([#1565](https://github.com/unraid/api/issues/1565)) ([3534d6f](https://github.com/unraid/api/commit/3534d6fdd7c59e65615167cfe306deebad9ca4d3))
-* **connect:** remove unraid-api folder before creating symlink ([#1556](https://github.com/unraid/api/issues/1556)) ([514a0ef](https://github.com/unraid/api/commit/514a0ef560a90595f774b6c0db60f1d2b4cd853c))
-* **deps:** pin dependencies ([#1586](https://github.com/unraid/api/issues/1586)) ([5721785](https://github.com/unraid/api/commit/57217852a337ead4c8c8e7596d1b7d590b64a26f))
-* **deps:** update all non-major dependencies ([#1543](https://github.com/unraid/api/issues/1543)) ([18b5209](https://github.com/unraid/api/commit/18b52090874c0ba86878d0f7e31bf0dc42734d75))
-* **deps:** update all non-major dependencies ([#1579](https://github.com/unraid/api/issues/1579)) ([ad6aa3b](https://github.com/unraid/api/commit/ad6aa3b6743aeeb42eff34d1c89ad874dfd0af09))
-* refactor API client to support Unix socket connections ([#1575](https://github.com/unraid/api/issues/1575)) ([a2c5d24](https://github.com/unraid/api/commit/a2c5d2495ffc02efa1ec5c63f0a1c5d23c9ed7ff))
-* **theme:** API key white text on white background ([#1584](https://github.com/unraid/api/issues/1584)) ([b321687](https://github.com/unraid/api/commit/b3216874faae208cdfc3edec719629fce428b6a3))
-
-## [4.12.0](https://github.com/unraid/api/compare/v4.11.0...v4.12.0) (2025-07-30)
-
-
-### Features
-
-* add ups monitoring to graphql api ([#1526](https://github.com/unraid/api/issues/1526)) ([6ea94f0](https://github.com/unraid/api/commit/6ea94f061d5b2e6c6fbfa6949006960501e3f4e7))
-
-
-### Bug Fixes
-
-* enhance plugin management with interactive removal prompts ([#1549](https://github.com/unraid/api/issues/1549)) ([23ef760](https://github.com/unraid/api/commit/23ef760d763c525a38108048200fa73fc8531aed))
-* remove connect api plugin upon removal of Connect Unraid plugin ([#1548](https://github.com/unraid/api/issues/1548)) ([782d5eb](https://github.com/unraid/api/commit/782d5ebadc67854298f3b2355255983024d2a225))
-* SSO not being detected ([#1546](https://github.com/unraid/api/issues/1546)) ([6b3b951](https://github.com/unraid/api/commit/6b3b951d8288cd31d096252be544537dc2bfce50))
-
-## [4.11.0](https://github.com/unraid/api/compare/v4.10.0...v4.11.0) (2025-07-28)
-
-
-### Features
-
-* tailwind v4 ([#1522](https://github.com/unraid/api/issues/1522)) ([2c62e0a](https://github.com/unraid/api/commit/2c62e0ad09c56d2293b76d07833dfb142c898937))
-* **web:** install and configure nuxt ui ([#1524](https://github.com/unraid/api/issues/1524)) ([407585c](https://github.com/unraid/api/commit/407585cd40c409175d8e7b861f8d61d8cabc11c9))
-
-
-### Bug Fixes
-
-* add missing breakpoints ([#1535](https://github.com/unraid/api/issues/1535)) ([f5352e3](https://github.com/unraid/api/commit/f5352e3a26a2766e85d19ffb5f74960c536b91b3))
-* border color incorrect in tailwind ([#1544](https://github.com/unraid/api/issues/1544)) ([f14b74a](https://github.com/unraid/api/commit/f14b74af91783b08640c0949c51ba7f18508f06f))
-* **connect:** omit extraneous fields during connect config validation ([#1538](https://github.com/unraid/api/issues/1538)) ([45bd736](https://github.com/unraid/api/commit/45bd73698b2bd534a8aff2c6ac73403de6c58561))
-* **deps:** pin dependencies ([#1528](https://github.com/unraid/api/issues/1528)) ([a74d935](https://github.com/unraid/api/commit/a74d935b566dd7af1a21824c9b7ab562232f9d8b))
-* **deps:** pin dependency @nuxt/ui to 3.2.0 ([#1532](https://github.com/unraid/api/issues/1532)) ([8279531](https://github.com/unraid/api/commit/8279531f2b86a78e81a77e6c037a0fb752e98062))
-* **deps:** update all non-major dependencies ([#1510](https://github.com/unraid/api/issues/1510)) ([1a8da6d](https://github.com/unraid/api/commit/1a8da6d92b96d3afa2a8b42446b36f1ee98b64a0))
-* **deps:** update all non-major dependencies ([#1520](https://github.com/unraid/api/issues/1520)) ([e2fa648](https://github.com/unraid/api/commit/e2fa648d1cf5a6cbe3e55c3f52c203d26bb4d526))
-* inject Tailwind CSS into client entry point ([#1537](https://github.com/unraid/api/issues/1537)) ([86b6c4f](https://github.com/unraid/api/commit/86b6c4f85b7b30bb4a13d57450a76bf4c28a3fff))
-* make settings grid responsive ([#1463](https://github.com/unraid/api/issues/1463)) ([9dfdb8d](https://github.com/unraid/api/commit/9dfdb8dce781fa662d6434ee432e4521f905ffa5))
-* **notifications:** gracefully handle & mask invalid notifications ([#1529](https://github.com/unraid/api/issues/1529)) ([05056e7](https://github.com/unraid/api/commit/05056e7ca1702eb7bf6c507950460b6b15bf7916))
-* truncate log files when they take up more than 5mb of space ([#1530](https://github.com/unraid/api/issues/1530)) ([0a18b38](https://github.com/unraid/api/commit/0a18b38008dd86a125cde7f684636d5dbb36f082))
-* use async for primary file read/writes ([#1531](https://github.com/unraid/api/issues/1531)) ([23b2b88](https://github.com/unraid/api/commit/23b2b8846158a27d1c9808bce0cc1506779c4dc3))
-
-## [4.10.0](https://github.com/unraid/api/compare/v4.9.5...v4.10.0) (2025-07-15)
-
-
-### Features
-
-* trial extension allowed within 5 days of expiration ([#1490](https://github.com/unraid/api/issues/1490)) ([f34a33b](https://github.com/unraid/api/commit/f34a33bc9f1a7e135d453d9d31888789bfc3f878))
-
-
-### Bug Fixes
-
-* delay `nginx:reload` file mod effect by 10 seconds ([#1512](https://github.com/unraid/api/issues/1512)) ([af33e99](https://github.com/unraid/api/commit/af33e999a0480a77e3e6b2aa833b17b38b835656))
-* **deps:** update all non-major dependencies ([#1489](https://github.com/unraid/api/issues/1489)) ([53b05eb](https://github.com/unraid/api/commit/53b05ebe5e2050cb0916fcd65e8d41370aee0624))
-* ensure no crash if emhttp state configs are missing ([#1514](https://github.com/unraid/api/issues/1514)) ([1a7d35d](https://github.com/unraid/api/commit/1a7d35d3f6972fd8aff58c17b2b0fb79725e660e))
-* **my.servers:** improve DNS resolution robustness for backup server ([#1518](https://github.com/unraid/api/issues/1518)) ([eecd9b1](https://github.com/unraid/api/commit/eecd9b1017a63651d1dc782feaa224111cdee8b6))
-* over-eager cloud query from web components ([#1506](https://github.com/unraid/api/issues/1506)) ([074370c](https://github.com/unraid/api/commit/074370c42cdecc4dbc58193ff518aa25735c56b3))
-* replace myservers.cfg reads in UpdateFlashBackup.php ([#1517](https://github.com/unraid/api/issues/1517)) ([441e180](https://github.com/unraid/api/commit/441e1805c108a6c1cd35ee093246b975a03f8474))
-* rm short-circuit in `rc.unraid-api` if plugin config dir is absent ([#1515](https://github.com/unraid/api/issues/1515)) ([29dcb7d](https://github.com/unraid/api/commit/29dcb7d0f088937cefc5158055f48680e86e5c36))
-
-## [4.9.5](https://github.com/unraid/api/compare/v4.9.4...v4.9.5) (2025-07-10)
-
-
-### Bug Fixes
-
-* **connect:** rm eager restart on `ERROR_RETYING` connection status ([#1502](https://github.com/unraid/api/issues/1502)) ([dd759d9](https://github.com/unraid/api/commit/dd759d9f0f841b296f8083bc67c6cd3f7a69aa5b))
-
-## [4.9.4](https://github.com/unraid/api/compare/v4.9.3...v4.9.4) (2025-07-09)
-
-
-### Bug Fixes
-
-* backport `<unraid-modals>` upon plg install when necessary ([#1499](https://github.com/unraid/api/issues/1499)) ([33e0b1a](https://github.com/unraid/api/commit/33e0b1ab24bedb6a2c7b376ea73dbe65bc3044be))
-* DefaultPageLayout patch rollback omits legacy header logo ([#1497](https://github.com/unraid/api/issues/1497)) ([ea20d1e](https://github.com/unraid/api/commit/ea20d1e2116fcafa154090fee78b42ec5d9ba584))
-* event emitter setup for writing status ([#1496](https://github.com/unraid/api/issues/1496)) ([ca4e2db](https://github.com/unraid/api/commit/ca4e2db1f29126a1fa3784af563832edda64b0ca))
-
-## [4.9.3](https://github.com/unraid/api/compare/v4.9.2...v4.9.3) (2025-07-09)
-
-
-### Bug Fixes
-
-* duplicated header logo after api stops ([#1493](https://github.com/unraid/api/issues/1493)) ([4168f43](https://github.com/unraid/api/commit/4168f43e3ecd51479bec3aae585abbe6dcd3e416))
-
 ## [4.9.2](https://github.com/unraid/api/compare/v4.9.1...v4.9.2) (2025-07-09)


--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -1,7 +1,7 @@
 ###########################################################
 # Development/Build Image
 ###########################################################
-FROM node:22.18.0-bookworm-slim AS development
+FROM node:22.17.0-bookworm-slim AS development

 # Install build tools and dependencies
 RUN apt-get update -y && apt-get install -y \
--- a/api/codegen.ts
+++ b/api/codegen.ts
@@ -27,13 +27,19 @@ const config: CodegenConfig = {
        },
    },
    generates: {
-        // Generate Types for CLI Internal GraphQL Queries
-        'src/unraid-api/cli/generated/': {
-            documents: ['src/unraid-api/cli/queries/**/*.ts', 'src/unraid-api/cli/mutations/**/*.ts'],
-            schema: './generated-schema.graphql',
+        // Generate Types for Mothership GraphQL Client
+        'src/graphql/generated/client/': {
+            documents: './src/graphql/mothership/*.ts',
+            schema: {
+                [process.env.MOTHERSHIP_GRAPHQL_LINK as string]: {
+                    headers: {
+                        origin: 'https://forums.unraid.net',
+                    },
+                },
+            },
            preset: 'client',
            presetConfig: {
-                gqlTagName: 'gql',
+                gqlTagName: 'graphql',
            },
            config: {
                useTypeImports: true,
@@ -41,6 +47,21 @@ const config: CodegenConfig = {
            },
            plugins: [{ add: { content: '/* eslint-disable */' } }],
        },
+        'src/graphql/generated/client/validators.ts': {
+            schema: {
+                [process.env.MOTHERSHIP_GRAPHQL_LINK as string]: {
+                    headers: {
+                        origin: 'https://forums.unraid.net',
+                    },
+                },
+            },
+            plugins: ['typescript-validation-schema', { add: { content: '/* eslint-disable */' } }],
+            config: {
+                importFrom: '@app/graphql/generated/client/graphql.js',
+                strictScalars: false,
+                schema: 'zod',
+            },
+        },
    },
 };

--- a/api/dev/configs/README.md
+++ b/api/dev/configs/README.md
@@ -1,34 +0,0 @@
-# Development Configuration Files
-
-This directory contains configuration files for local development.
-
-## OIDC Configuration
-
-### oidc.json
-The default OIDC configuration file. This file is committed to git and should only contain non-sensitive test configurations.
-
-### Using a Local Configuration (gitignored)
-For local testing with real OAuth providers:
-
-1. Create an `oidc.local.json` file based on `oidc.json`
-2. Set the environment variable: `PATHS_OIDC_JSON=./dev/configs/oidc.local.json`
-3. The API will load your local configuration instead of the default
-
-Example:
-```bash
-PATHS_OIDC_JSON=./dev/configs/oidc.local.json pnpm dev
-```
-
-### Setting up OAuth Apps
-
-#### Google
-1. Go to [Google Cloud Console](https://console.cloud.google.com/)
-2. Create a new project or select existing
-3. Enable Google+ API
-4. Create OAuth 2.0 credentials
-5. Add authorized redirect URI: `http://localhost:3000/graphql/api/auth/oidc/callback`
-
-#### GitHub
-1. Go to GitHub Settings > Developer settings > OAuth Apps
-2. Create a new OAuth App
-3. Set Authorization callback URL: `http://localhost:3000/graphql/api/auth/oidc/callback`
--- a/api/dev/configs/api.json
+++ b/api/dev/configs/api.json
@@ -1,9 +1,10 @@
 {
-  "version": "4.22.1",
-  "extraOrigins": [],
+  "version": "4.8.0",
+  "extraOrigins": [
+    "https://google.com",
+    "https://test.com"
+  ],
  "sandbox": true,
  "ssoSubIds": [],
-  "plugins": [
-    "unraid-api-plugin-connect"
-  ]
+  "plugins": ["unraid-api-plugin-connect"]
 }
--- a/api/dev/configs/connect.json
+++ b/api/dev/configs/connect.json
@@ -1,12 +1,16 @@
 {
-  "wanaccess": true,
-  "wanport": 8443,
+  "wanaccess": false,
+  "wanport": 0,
  "upnpEnabled": false,
  "apikey": "",
-  "localApiKey": "_______________________LOCAL_API_KEY_HERE_________________________",
-  "email": "test@example.com",
-  "username": "zspearmint",
-  "avatar": "https://via.placeholder.com/200",
-  "regWizTime": "1611175408732_0951-1653-3509-FBA155FA23C0",
-  "dynamicRemoteAccessType": "STATIC"
+  "localApiKey": "",
+  "email": "",
+  "username": "",
+  "avatar": "",
+  "regWizTime": "",
+  "accesstoken": "",
+  "idtoken": "",
+  "refreshtoken": "",
+  "dynamicRemoteAccessType": "DISABLED",
+  "ssoSubIds": []
 }
--- a/api/dev/configs/oidc.json
+++ b/api/dev/configs/oidc.json
@@ -1,22 +0,0 @@
-{
-  "providers": [
-    {
-      "id": "unraid.net",
-      "name": "Unraid.net",
-      "clientId": "CONNECT_SERVER_SSO",
-      "issuer": "https://account.unraid.net",
-      "authorizationEndpoint": "https://account.unraid.net/sso/",
-      "tokenEndpoint": "https://account.unraid.net/api/oauth2/token",
-      "scopes": [
-        "openid",
-        "profile",
-        "email"
-      ],
-      "authorizedSubIds": [
-        "297294e2-b31c-4bcc-a441-88aee0ad609f"
-      ],
-      "buttonText": "Login With Unraid.net"
-    }
-  ],
-  "defaultAllowedOrigins": []
-}
--- a/api/dev/keys/b5b4aa3d-8e40-4c92-bc40-d50182071886.json
+++ b/api/dev/keys/b5b4aa3d-8e40-4c92-bc40-d50182071886.json
@@ -0,0 +1,11 @@
+{
+  "createdAt": "2025-01-27T16:22:56.501Z",
+  "description": "API key for Connect user",
+  "id": "b5b4aa3d-8e40-4c92-bc40-d50182071886",
+  "key": "_______________________LOCAL_API_KEY_HERE_________________________",
+  "name": "Connect",
+  "permissions": [],
+  "roles": [
+    "CONNECT"
+  ]
+}
--- a/api/dev/log/.gitkeep
+++ b/api/dev/log/.gitkeep
@@ -1 +0,0 @@
-# custom log directory for tests & development
--- a/api/dev/states/shares.ini
+++ b/api/dev/states/shares.ini
@@ -65,38 +65,4 @@ color="yellow-on"
 size="0"
 free="9091184"
 used="32831348"
-luksStatus="0"
-["system.with.periods"]
-name="system.with.periods"
-nameOrig="system.with.periods"
-comment="system data with periods"
-allocator="highwater"
-splitLevel="1"
-floor="0"
-include=""
-exclude=""
-useCache="prefer"
-cachePool="cache"
-cow="auto"
-color="yellow-on"
-size="0"
-free="9091184"
-used="32831348"
-luksStatus="0"
-["system.with.🚀"]
-name="system.with.🚀"
-nameOrig="system.with.🚀"
-comment="system data with 🚀"
-allocator="highwater"
-splitLevel="1"
-floor="0"
-include=""
-exclude=""
-useCache="prefer"
-cachePool="cache"
-cow="auto"
-color="yellow-on"
-size="0"
-free="9091184"
-used="32831348"
 luksStatus="0"
--- a/api/docs/developer/feature-flags.md
+++ b/api/docs/developer/feature-flags.md
@@ -1,247 +0,0 @@
-# Feature Flags
-
-Feature flags allow you to conditionally enable or disable functionality in the Unraid API. This is useful for gradually rolling out new features, A/B testing, or keeping experimental code behind flags during development.
-
-## Setting Up Feature Flags
-
-### 1. Define the Feature Flag
-
-Feature flags are defined as environment variables and collected in `src/consts.ts`:
-
-```typescript
-// src/environment.ts
-export const ENABLE_MY_NEW_FEATURE = process.env.ENABLE_MY_NEW_FEATURE === 'true';
-
-// src/consts.ts
-export const FeatureFlags = Object.freeze({
-    ENABLE_NEXT_DOCKER_RELEASE,
-    ENABLE_MY_NEW_FEATURE, // Add your new flag here
-});
-```
-
-### 2. Set the Environment Variable
-
-Set the environment variable when running the API:
-
-```bash
-ENABLE_MY_NEW_FEATURE=true unraid-api start
-```
-
-Or add it to your `.env` file:
-
-```env
-ENABLE_MY_NEW_FEATURE=true
-```
-
-## Using Feature Flags in GraphQL
-
-### Method 1: @UseFeatureFlag Decorator (Schema-Level)
-
-The `@UseFeatureFlag` decorator conditionally includes or excludes GraphQL fields, queries, and mutations from the schema based on feature flags. When a feature flag is disabled, the field won't appear in the GraphQL schema at all.
-
-```typescript
-import { UseFeatureFlag } from '@app/unraid-api/decorators/use-feature-flag.decorator.js';
-import { Query, Mutation, ResolveField } from '@nestjs/graphql';
-
-@Resolver()
-export class MyResolver {
-    
-    // Conditionally include a query
-    @UseFeatureFlag('ENABLE_MY_NEW_FEATURE')
-    @Query(() => String)
-    async experimentalQuery() {
-        return 'This query only exists when ENABLE_MY_NEW_FEATURE is true';
-    }
-    
-    // Conditionally include a mutation
-    @UseFeatureFlag('ENABLE_MY_NEW_FEATURE')
-    @Mutation(() => Boolean)
-    async experimentalMutation() {
-        return true;
-    }
-    
-    // Conditionally include a field resolver
-    @UseFeatureFlag('ENABLE_MY_NEW_FEATURE')
-    @ResolveField(() => String)
-    async experimentalField() {
-        return 'This field only exists when the flag is enabled';
-    }
-}
-```
-
-**Benefits:**
- Clean schema - disabled features don't appear in GraphQL introspection
- No runtime overhead for disabled features
- Clear feature boundaries
-
-**Use when:**
- You want to completely hide features from the GraphQL schema
- The feature is experimental or in beta
- You're doing a gradual rollout
-
-### Method 2: checkFeatureFlag Function (Runtime)
-
-The `checkFeatureFlag` function provides runtime feature flag checking within resolver methods. It throws a `ForbiddenException` if the feature is disabled.
-
-```typescript
-import { checkFeatureFlag } from '@app/unraid-api/utils/feature-flag.helper.js';
-import { FeatureFlags } from '@app/consts.js';
-import { Query, ResolveField } from '@nestjs/graphql';
-
-@Resolver()
-export class MyResolver {
-    
-    @Query(() => String)
-    async myQuery(
-        @Args('useNewAlgorithm', { nullable: true }) useNewAlgorithm?: boolean
-    ) {
-        // Conditionally use new logic based on feature flag
-        if (useNewAlgorithm) {
-            checkFeatureFlag(FeatureFlags, 'ENABLE_MY_NEW_FEATURE');
-            return this.newAlgorithm();
-        }
-        
-        return this.oldAlgorithm();
-    }
-    
-    @ResolveField(() => String)
-    async dataField() {
-        // Check flag at the start of the method
-        checkFeatureFlag(FeatureFlags, 'ENABLE_MY_NEW_FEATURE');
-        
-        // Feature-specific logic here
-        return this.computeExperimentalData();
-    }
-}
-```
-
-**Benefits:**
- More granular control within methods
- Can conditionally execute parts of a method
- Useful for A/B testing scenarios
- Good for gradual migration strategies
-
-**Use when:**
- You need conditional logic within a method
- The field should exist but behavior changes based on the flag
- You're migrating from old to new implementation gradually
-
-## Feature Flag Patterns
-
-### Pattern 1: Complete Feature Toggle
-
-Hide an entire feature behind a flag:
-
-```typescript
-@UseFeatureFlag('ENABLE_DOCKER_TEMPLATES')
-@Resolver(() => DockerTemplate)
-export class DockerTemplateResolver {
-    // All resolvers in this class are toggled by the flag
-}
-```
-
-### Pattern 2: Gradual Migration
-
-Migrate from old to new implementation:
-
-```typescript
-@Query(() => [Container])
-async getContainers(@Args('version') version?: string) {
-    if (version === 'v2') {
-        checkFeatureFlag(FeatureFlags, 'ENABLE_CONTAINERS_V2');
-        return this.getContainersV2();
-    }
-    
-    return this.getContainersV1();
-}
-```
-
-### Pattern 3: Beta Features
-
-Mark features as beta:
-
-```typescript
-@UseFeatureFlag('ENABLE_BETA_FEATURES')
-@ResolveField(() => BetaMetrics, { 
-    description: 'BETA: Advanced metrics (requires ENABLE_BETA_FEATURES flag)' 
-})
-async betaMetrics() {
-    return this.computeBetaMetrics();
-}
-```
-
-### Pattern 4: Performance Optimizations
-
-Toggle expensive operations:
-
-```typescript
-@ResolveField(() => Statistics)
-async statistics() {
-    const basicStats = await this.getBasicStats();
-    
-    try {
-        checkFeatureFlag(FeatureFlags, 'ENABLE_ADVANCED_ANALYTICS');
-        const advancedStats = await this.getAdvancedStats();
-        return { ...basicStats, ...advancedStats };
-    } catch {
-        // Feature disabled, return only basic stats
-        return basicStats;
-    }
-}
-```
-
-## Testing with Feature Flags
-
-When writing tests for feature-flagged code, create a mock to control feature flag values:
-
-```typescript
-import { vi } from 'vitest';
-
-// Mock the entire consts module
-vi.mock('@app/consts.js', async () => {
-    const actual = await vi.importActual('@app/consts.js');
-    return {
-        ...actual,
-        FeatureFlags: {
-            ENABLE_MY_NEW_FEATURE: true, // Set your test value
-            ENABLE_NEXT_DOCKER_RELEASE: false,
-        }
-    };
-});
-
-describe('MyResolver', () => {
-    it('should execute new logic when feature is enabled', async () => {
-        // Test new behavior with mocked flag
-    });
-});
-```
-
-## Best Practices
-
-1. **Naming Convention**: Use `ENABLE_` prefix for boolean feature flags
-2. **Environment Variables**: Always use uppercase with underscores
-3. **Documentation**: Document what each feature flag controls
-4. **Cleanup**: Remove feature flags once features are stable and fully rolled out
-5. **Default State**: New features should default to `false` (disabled)
-6. **Granularity**: Keep feature flags focused on a single feature or capability
-7. **Testing**: Always test both enabled and disabled states
-
-## Common Use Cases
-
- **Experimental Features**: Hide unstable features in production
- **Gradual Rollouts**: Enable features for specific environments first
- **A/B Testing**: Toggle between different implementations
- **Performance**: Disable expensive operations when not needed
- **Breaking Changes**: Provide migration path with both old and new behavior
- **Debug Features**: Enable additional logging or debugging tools
-
-## Checking Active Feature Flags
-
-To see which feature flags are currently active:
-
-```typescript
-// Log all feature flags on startup
-console.log('Active Feature Flags:', FeatureFlags);
-```
-
-Or check via GraphQL introspection to see which fields are available based on current flags.
--- a/api/docs/public/api-key-app-developer-authorization-flow.md
+++ b/api/docs/public/api-key-app-developer-authorization-flow.md
@@ -1,100 +0,0 @@
-# API Key Authorization Flow
-
-This document describes the self-service API key creation flow for third-party applications.
-
-## Overview
-
-Applications can request API access to an Unraid server by redirecting users to a special authorization page where users can review requested permissions and create an API key with one click.
-
-## Flow
-
-1. **Application initiates request**: The app redirects the user to:
-
-    ```
-    https://[unraid-server]/ApiKeyAuthorize?name=MyApp&scopes=docker:read,vm:*&redirect_uri=https://myapp.com/callback&state=abc123
-    ```
-
-2. **User authentication**: If not already logged in, the user is redirected to login first (standard Unraid auth)
-
-3. **Consent screen**: User sees:
-    - Application name and description
-    - Requested permissions (with checkboxes to approve/deny specific scopes)
-    - API key name field (pre-filled)
-    - Authorize & Cancel buttons
-
-4. **API key creation**: Upon authorization:
-    - API key is created with approved scopes
-    - Key is displayed to the user
-    - If `redirect_uri` is provided, user is redirected back with the key
-
-5. **Callback**: App receives the API key:
-    ```
-    https://myapp.com/callback?api_key=xxx&state=abc123
-    ```
-
-## Query Parameters
-
- `name` (required): Name of the requesting application
- `description` (optional): Description of the application
- `scopes` (required): Comma-separated list of requested scopes
- `redirect_uri` (optional): URL to redirect after authorization
- `state` (optional): Opaque value for maintaining state
-
-## Scope Format
-
-Scopes follow the pattern: `resource:action`
-
-### Examples:
-
- `docker:read` - Read access to Docker
- `vm:*` - Full access to VMs
- `system:update` - Update access to system
- `role:viewer` - Viewer role access
- `role:admin` - Admin role access
-
-### Available Resources:
-
- `docker`, `vm`, `system`, `share`, `user`, `network`, `disk`, etc.
-
-### Available Actions:
-
- `create`, `read`, `update`, `delete` or `*` for all
-
-## Security Considerations
-
-1. **HTTPS required**: Redirect URIs must use HTTPS (except localhost for development)
-2. **User consent**: Users explicitly approve each permission
-3. **Session-based**: Uses existing Unraid authentication session
-4. **One-time display**: API keys are shown once and must be saved securely
-
-## Example Integration
-
-```javascript
-// JavaScript example
-const unraidServer = 'tower.local';
-const appName = 'My Docker Manager';
-const scopes = 'docker:*,system:read';
-const redirectUri = 'https://myapp.com/unraid/callback';
-const state = generateRandomState();
-
-// Store state for verification
-sessionStorage.setItem('oauth_state', state);
-
-// Redirect user to authorization page
-window.location.href =
-    `https://${unraidServer}/ApiKeyAuthorize?` +
-    `name=${encodeURIComponent(appName)}&` +
-    `scopes=${encodeURIComponent(scopes)}&` +
-    `redirect_uri=${encodeURIComponent(redirectUri)}&` +
-    `state=${encodeURIComponent(state)}`;
-
-// Handle callback
-const urlParams = new URLSearchParams(window.location.search);
-const apiKey = urlParams.get('api_key');
-const returnedState = urlParams.get('state');
-
-if (returnedState === sessionStorage.getItem('oauth_state')) {
-    // Save API key securely
-    saveApiKey(apiKey);
-}
-```
--- a/api/docs/public/cli.md
+++ b/api/docs/public/cli.md
@@ -1,17 +1,5 @@
---
-title: CLI Reference
-description: Complete reference for all Unraid API CLI commands
-sidebar_position: 4
---
-
 # CLI Commands

-:::info[Command Structure]
-All commands follow the pattern: `unraid-api <command> [options]`
-:::
-
-## 🚀 Service Management
-
 ### Start

 ```bash
@@ -21,14 +9,7 @@ unraid-api start [--log-level <level>]
 Starts the Unraid API service.

 Options:
-
- `--log-level`: Set logging level (trace|debug|info|warn|error|fatal)
-
-Alternative: You can also set the log level using the `LOG_LEVEL` environment variable:
-
-```bash
-LOG_LEVEL=trace unraid-api start
-```
+- `--log-level`: Set logging level (trace|debug|info|warn|error)

 ### Stop

@@ -43,21 +24,11 @@ Stops the Unraid API service.
 ### Restart

 ```bash
-unraid-api restart [--log-level <level>]
+unraid-api restart
 ```

 Restarts the Unraid API service.

-Options:
-
- `--log-level`: Set logging level (trace|debug|info|warn|error|fatal)
-
-Alternative: You can also set the log level using the `LOG_LEVEL` environment variable:
-
-```bash
-LOG_LEVEL=trace unraid-api restart
-```
-
 ### Logs

 ```bash
@@ -68,7 +39,7 @@ View the API logs.

 - `-l, --lines`: Optional. Number of lines to tail (default: 100)

-## ⚙️ Configuration Commands
+## Configuration Commands

 ### Config

@@ -90,36 +61,21 @@ Switch between production and staging environments.

 ### Developer Mode

-:::tip Web GUI Management
-You can also manage developer options through the web interface at **Settings** → **Management Access** → **Developer Options**
-:::
-
 ```bash
-unraid-api developer                       # Interactive prompt for tools
-unraid-api developer --sandbox true        # Enable GraphQL sandbox
-unraid-api developer --sandbox false       # Disable GraphQL sandbox
-unraid-api developer --enable-modal        # Enable modal testing tool
-unraid-api developer --disable-modal       # Disable modal testing tool
+unraid-api developer
 ```

-Configure developer features for the API:
-
- **GraphQL Sandbox**: Enable/disable Apollo GraphQL sandbox at `/graphql`
- **Modal Testing Tool**: Enable/disable UI modal testing in the Unraid menu
+Configure developer features for the API (e.g., GraphQL sandbox).

 ## API Key Management

-:::tip Web GUI Management
-You can also manage API keys through the web interface at **Settings** → **Management Access** → **API Keys**
-:::
-
 ### API Key Commands

 ```bash
 unraid-api apikey [options]
 ```

-Create and manage API keys via CLI.
+Create and manage API keys.

 Options:

@@ -131,10 +87,6 @@ Options:

 ## SSO (Single Sign-On) Management

-:::info OIDC Configuration
-For OIDC/SSO provider configuration, see the web interface at **Settings** → **Management Access** → **API** → **OIDC** or refer to the [OIDC Provider Setup](./oidc-provider-setup.md) guide.
-:::
-
 ### SSO Base Command

 ```bash
--- a/api/docs/public/how-to-use-the-api.md
+++ b/api/docs/public/how-to-use-the-api.md
@@ -1,75 +1,33 @@
---
-title: Using the Unraid API
-description: Learn how to interact with your Unraid server through the GraphQL API
-sidebar_position: 2
---
-
 # Using the Unraid API

-:::tip[Quick Start]
-The Unraid API provides a powerful GraphQL interface for managing your server. This guide covers authentication, common queries, and best practices.
-:::
-
 The Unraid API provides a GraphQL interface that allows you to interact with your Unraid server. This guide will help you get started with exploring and using the API.

-## 🎮 Enabling the GraphQL Sandbox
+## Enabling the GraphQL Sandbox

-### Web GUI Method (Recommended)
+1. First, enable developer mode using the CLI:

-:::info[Preferred Method]
-Using the Web GUI is the easiest way to enable the GraphQL sandbox.
-:::
+    ```bash
+    unraid-api developer
+    ```
+
+2. Follow the prompts to enable the sandbox. This will allow you to access the Apollo Sandbox interface.

-1. Navigate to **Settings** → **Management Access** → **Developer Options**
-2. Enable the **GraphQL Sandbox** toggle
 3. Access the GraphQL playground by navigating to:

    ```txt
    http://YOUR_SERVER_IP/graphql
    ```

-### CLI Method
+## Authentication

-Alternatively, you can enable developer mode using the CLI:
+Most queries and mutations require authentication. You can authenticate using either:

-```bash
-unraid-api developer --sandbox true
-```
+1. API Keys
+2. Cookies (default method when signed into the WebGUI)

-Or use the interactive mode:
+### Creating an API Key

-```bash
-unraid-api developer
-```
-
-## 🔑 Authentication
-
-:::warning[Required for Most Operations]
-Most queries and mutations require authentication. Always include appropriate credentials in your requests.
-:::
-
-You can authenticate using:
-
-1. **API Keys** - For programmatic access
-2. **Cookies** - Automatic when signed into the WebGUI
-3. **SSO/OIDC** - When configured with external providers
-
-### Managing API Keys
-
-<tabs>
-<tabItem value="gui" label="Web GUI (Recommended)" default>
-
-Navigate to **Settings** → **Management Access** → **API Keys** in your Unraid web interface to:
-
- View existing API keys
- Create new API keys
- Manage permissions and roles
- Revoke or regenerate keys
-
-</tabItem>
-<tabItem value="cli" label="CLI Method">
-
-You can also use the CLI to create an API key:
+Use the CLI to create an API key:

 ```bash
 unraid-api apikey --create
@@ -82,11 +40,6 @@ Follow the prompts to set:
 - Roles
 - Permissions

-</tabItem>
-</tabs>
-
-### Using API Keys
-
 The generated API key should be included in your GraphQL requests as a header:

 ```json
@@ -95,7 +48,7 @@ The generated API key should be included in your GraphQL requests as a header:
 }
 ```

-## 📊 Available Schemas
+## Available Schemas

 The API provides access to various aspects of your Unraid server:

@@ -124,9 +77,9 @@ The API provides access to various aspects of your Unraid server:
 - Handle SSO configuration
 - Manage allowed origins

-### 💻 Example Queries
+### Example Queries

-#### Check System Status
+1. Check System Status:

 ```graphql
 query {
@@ -147,7 +100,7 @@ query {
 }
 ```

-#### Monitor Array Status
+2. Monitor Array Status:

 ```graphql
 query {
@@ -170,7 +123,7 @@ query {
 }
 ```

-#### List Docker Containers
+3. List Docker Containers:

 ```graphql
 query {
@@ -184,7 +137,7 @@ query {
 }
 ```

-## 🏗️ Schema Types
+## Schema Types

 The API includes several core types:

@@ -211,23 +164,19 @@ Available roles:
 - `connect`: Remote access features
 - `guest`: Limited read access

-## ✨ Best Practices
+## Best Practices

-:::tip[Pro Tips]
 1. Use the Apollo Sandbox to explore the schema and test queries
 2. Start with small queries and gradually add fields as needed
 3. Monitor your query complexity to maintain performance
 4. Use appropriate roles and permissions for your API keys
 5. Keep your API keys secure and rotate them periodically
-:::

-## ⏱️ Rate Limiting
+## Rate Limiting

-:::caution[Rate Limits]
 The API implements rate limiting to prevent abuse. Ensure your applications handle rate limit responses appropriately.
-:::

-## 🚨 Error Handling
+## Error Handling

 The API returns standard GraphQL errors in the following format:

@@ -243,13 +192,11 @@ The API returns standard GraphQL errors in the following format:
 }
 ```

-## 📚 Additional Resources
+## Additional Resources

-:::info[Learn More]
 - Use the Apollo Sandbox's schema explorer to browse all available types and fields
 - Check the documentation tab in Apollo Sandbox for detailed field descriptions
 - Monitor the API's health using `unraid-api status`
 - Generate reports using `unraid-api report` for troubleshooting

-For more information about specific commands and configuration options, refer to the [CLI documentation](/cli) or run `unraid-api --help`.
-:::
+For more information about specific commands and configuration options, refer to the CLI documentation or run `unraid-api --help`.
--- a/api/docs/public/images/advanced-rules.png
+++ b/api/docs/public/images/advanced-rules.png
--- a/api/docs/public/images/button-customization.png
+++ b/api/docs/public/images/button-customization.png
--- a/api/docs/public/images/configured-provider.png
+++ b/api/docs/public/images/configured-provider.png
--- a/api/docs/public/images/default-unraid-provider.png
+++ b/api/docs/public/images/default-unraid-provider.png
--- a/api/docs/public/images/sso-with-options.png
+++ b/api/docs/public/images/sso-with-options.png
--- a/api/docs/public/index.md
+++ b/api/docs/public/index.md
@@ -1,94 +1,37 @@
---
-title: Welcome to Unraid API
-description: The official GraphQL API for Unraid Server management and automation
-sidebar_position: 1
---
-
-# Welcome to Unraid API
-
-:::tip[What's New]
-Starting with Unraid OS v7.2, the API comes built into the operating system - no plugin installation required!
-:::
+# Unraid API

 The Unraid API provides a GraphQL interface for programmatic interaction with your Unraid server. It enables automation, monitoring, and integration capabilities.

-## 📦 Availability
+## Current Availability

-### ✨ Native Integration (Unraid OS v7.2+)
+The API is available through the Unraid Connect Plugin:

-Starting with Unraid OS v7.2, the API is integrated directly into the operating system:
-
- No plugin installation required
- Automatically available on system startup
- Deep system integration
- Access through **Settings** → **Management Access** → **API**
-
-### 🔌 Plugin Installation (Pre-7.2 and Advanced Users)
-
-For Unraid versions prior to v7.2 or to access newer API features:
-
-1. Install the Unraid Connect Plugin from Community Apps
+1. Install Unraid Connect Plugin from Apps
 2. [Configure the plugin](./how-to-use-the-api.md#enabling-the-graphql-sandbox)
-3. Access API functionality through the [GraphQL Sandbox](./how-to-use-the-api.md)
+3. Access API functionality through the [GraphQL Sandbox](./how-to-use-the-api.md#accessing-the-graphql-sandbox)

-:::info Important Notes
- The Unraid Connect plugin provides the API for pre-7.2 versions
- You do NOT need to sign in to Unraid Connect to use the API locally
- Installing the plugin on 7.2+ gives you access to newer API features before they're included in OS releases
-:::
+## Future Availability

-## 📚 Documentation Sections
+The API will be integrated directly into the Unraid operating system in an upcoming OS release. This integration will:

-<cards>
-<card title="CLI Commands" icon="terminal" href="./cli">
-  Complete reference for all CLI commands
-</card>
-<card title="Using the API" icon="code" href="./how-to-use-the-api">
-  Learn how to interact with the GraphQL API
-</card>
-<card title="OIDC Setup" icon="shield" href="./oidc-provider-setup">
-  Configure SSO authentication providers
-</card>
-<card title="Upcoming Features" icon="rocket" href="./upcoming-features">
-  See what's coming next
-</card>
-</cards>
+- Make the API a core part of the Unraid system
+- Remove the need for separate plugin installation
+- Enable deeper system integration capabilities

+## Documentation Sections

-## 🌟 Key Features
+- [CLI Commands](./cli.md) - Reference for all available command-line interface commands
+- [Using the Unraid API](./how-to-use-the-api.md) - Comprehensive guide on using the GraphQL API
+- [Upcoming Features](./upcoming-features.md) - Roadmap of planned features and improvements
+
+## Key Features

-:::info[Core Capabilities]
 The API provides:

- **GraphQL Interface**: Modern, flexible API with strong typing
- **Authentication**: Multiple methods including API keys, session cookies, and SSO/OIDC
- **Comprehensive Coverage**: Access to system information, array management, and Docker operations
- **Developer Tools**: Built-in GraphQL sandbox configurable via web interface or CLI
- **Role-Based Access**: Granular permission control
- **Web Management**: Manage API keys and settings through the web interface
-:::
+- GraphQL Interface: Modern, flexible API with strong typing
+- Authentication: Secure access via API keys or session cookies
+- Comprehensive Coverage: Access to system information, array management, and Docker operations
+- Developer Tools: Built-in GraphQL sandbox for testing
+- Role-Based Access: Granular permission control

-## 🚀 Get Started
-
-<tabs>
-<tabItem value="v72" label="Unraid OS v7.2+" default>
-
-1. The API is already installed and running
-2. Access settings at **Settings** → **Management Access** → **API**
-3. Enable the GraphQL Sandbox for development
-4. Create your first API key
-5. Start making GraphQL queries!
-
-</tabItem>
-<tabItem value="older" label="Pre-7.2 Versions">
-
-1. Install the Unraid Connect plugin from Community Apps
-2. No Unraid Connect login required for local API access
-3. Configure the plugin settings
-4. Enable the GraphQL Sandbox
-5. Start exploring the API!
-
-</tabItem>
-</tabs>
-
-For detailed usage instructions, see the [CLI Commands](./cli) reference.
+For detailed usage instructions, see [CLI Commands](./cli.md).
--- a/api/docs/public/oidc-provider-setup.md
+++ b/api/docs/public/oidc-provider-setup.md
@@ -1,420 +0,0 @@
---
-title: OIDC Provider Setup
-description: Configure OIDC (OpenID Connect) providers for SSO authentication in Unraid API
-sidebar_position: 3
---
-
-# OIDC Provider Setup
-
-:::info[What is OIDC?]
-OpenID Connect (OIDC) is an authentication protocol that allows users to sign in using their existing accounts from providers like Google, Microsoft, or your corporate identity provider. It enables Single Sign-On (SSO) for seamless and secure authentication.
-:::
-
-This guide walks you through configuring OIDC (OpenID Connect) providers for SSO authentication in the Unraid API using the web interface.
-
-## 🚀 Quick Start
-
-<details open>
-<summary><strong>Getting to OIDC Settings</strong></summary>
-
-1. Navigate to your Unraid server's web interface
-2. Go to **Settings** → **Management Access** → **API** → **OIDC**
-3. You'll see tabs for different providers - click the **+** button to add a new provider
-
-</details>
-
-### OIDC Providers Interface Overview
-
-![Login Page with SSO Options](./images/sso-with-options.png)
-*Login page showing traditional login form with SSO options - "Login With Unraid.net" and "Sign in with Google" buttons*
-
-The interface includes:
-
- **Provider tabs**: Each configured provider (Unraid.net, Google, etc.) appears as a tab
- **Add Provider button**: Click the **+** button to add new providers
- **Authorization Mode dropdown**: Toggle between "simple" and "advanced" modes
- **Simple Authorization section**: Configure allowed email domains and specific addresses
- **Add Item buttons**: Click to add multiple authorization rules
-
-## Understanding Authorization Modes
-
-The interface provides two authorization modes:
-
-### Simple Mode (Recommended)
-
-Simple mode is the easiest way to configure authorization. You can:
-
- Allow specific email domains (e.g., @company.com)
- Allow specific email addresses
- Configure who can access your Unraid server with minimal setup
-
-**When to use Simple Mode:**
-
- You want to allow all users from your company domain
- You have a small list of specific users
- You're new to OIDC configuration
-
-<details>
-<summary><strong>Advanced Mode</strong></summary>
-
-Advanced mode provides granular control using claim-based rules. You can:
-
- Create complex authorization rules based on JWT claims
- Use operators like equals, contains, endsWith, startsWith
- Combine multiple conditions with OR/AND logic
- Choose whether ANY rule must pass (OR mode) or ALL rules must pass (AND mode)
-
-**When to use Advanced Mode:**
-
- You need to check group memberships
- You want to verify multiple claims (e.g., email domain AND verified status)
- You have complex authorization requirements
- You need fine-grained control over how rules are evaluated
-
-</details>
-
-## Authorization Rules
-
-![Authorization Rules Configuration](./images/advanced-rules.png)
-*Advanced authorization rules showing JWT claim configuration with email endsWith operator for domain-based access control*
-
-### Simple Mode Examples
-
-#### Allow Company Domain
-
-In Simple Authorization:
-
- **Allowed Email Domains**: Enter `company.com`
- This allows anyone with @company.com email
-
-#### Allow Specific Users
-
- **Specific Email Addresses**: Add individual emails
- Click **Add Item** to add multiple addresses
-
-<details>
-<summary><strong>Advanced Mode Examples</strong></summary>
-
-#### Authorization Rule Mode
-
-When using multiple rules, you can choose how they're evaluated:
-
- **OR Mode** (default): User is authorized if ANY rule passes
- **AND Mode**: User is authorized only if ALL rules pass
-
-#### Email Domain with Verification (AND Mode)
-
-To require both email domain AND verification:
-
-1. Set **Authorization Rule Mode** to `AND`
-2. Add two rules:
-   - Rule 1:
-     - **Claim**: `email`
-     - **Operator**: `endsWith`
-     - **Value**: `@company.com`
-   - Rule 2:
-     - **Claim**: `email_verified`
-     - **Operator**: `equals`
-     - **Value**: `true`
-
-This ensures users must have both a company email AND a verified email address.
-
-#### Group-Based Access (OR Mode)
-
-To allow access to multiple groups:
-
-1. Set **Authorization Rule Mode** to `OR` (default)
-2. Add rules for each group:
-   - **Claim**: `groups`
-   - **Operator**: `contains`
-   - **Value**: `admins`
-   
-   Or add another rule:
-   - **Claim**: `groups`
-   - **Operator**: `contains`
-   - **Value**: `developers`
-
-Users in either `admins` OR `developers` group will be authorized.
-
-#### Multiple Domains
-
- **Claim**: `email`
- **Operator**: `endsWith`
- **Values**: Add multiple domains (e.g., `company.com`, `subsidiary.com`)
-
-#### Complex Authorization (AND Mode)
-
-For strict security requiring multiple conditions:
-
-1. Set **Authorization Rule Mode** to `AND`
-2. Add multiple rules that ALL must pass:
-   - Email must be from company domain
-   - Email must be verified
-   - User must be in specific group
-   - Account must have 2FA enabled (if claim available)
-
-</details>
-
-<details>
-<summary><strong>Configuration Interface Details</strong></summary>
-
-### Provider Tabs
-
- Each configured provider appears as a tab at the top
- Click a tab to switch between provider configurations
- The **+** button on the right adds a new provider
-
-### Authorization Mode Dropdown
-
- **simple**: Best for email-based authorization (recommended for most users)
- **advanced**: For complex claim-based rules using JWT claims
-
-### Simple Authorization Fields
-
-When "simple" mode is selected, you'll see:
-
- **Allowed Email Domains**: Enter domains without @ (e.g., `company.com`)
-    - Helper text: "Users with emails ending in these domains can login"
- **Specific Email Addresses**: Add individual email addresses
-    - Helper text: "Only these exact email addresses can login"
- **Add Item** buttons to add multiple entries
-
-### Advanced Authorization Fields
-
-When "advanced" mode is selected, you'll see:
-
- **Authorization Rule Mode**: Choose `OR` (any rule passes) or `AND` (all rules must pass)
- **Authorization Rules**: Add multiple claim-based rules
- **For each rule**:
-    - **Claim**: The JWT claim to check
-    - **Operator**: How to compare (equals, contains, endsWith, startsWith)
-    - **Value**: What to match against
-
-### Additional Interface Elements
-
- **Enable Developer Sandbox**: Toggle to enable GraphQL sandbox at `/graphql`
- The interface uses a dark theme for better visibility
- Field validation indicators help ensure correct configuration
-
-</details>
-
-### Required Redirect URI
-
-:::caution[Important Configuration]
-All providers must be configured with this exact redirect URI format:
-:::
-
-```bash
-http://YOUR_UNRAID_IP/graphql/api/auth/oidc/callback
-```
-
-:::tip
-Replace `YOUR_UNRAID_IP` with your actual server IP address (e.g., `192.168.1.100` or `tower.local`).
-:::
-
-### Issuer URL Format
-
-The **Issuer URL** field accepts both formats, but **base URL is strongly recommended** for security:
-
- **Base URL** (recommended): `https://accounts.google.com`
- **Full discovery URL**: `https://accounts.google.com/.well-known/openid-configuration`
-
-**⚠️ Security Note**: Always use the base URL format when possible. The system automatically appends `/.well-known/openid-configuration` for OIDC discovery. Using the full discovery URL directly disables important issuer validation checks and is not recommended by the OpenID Connect specification.
-
-**Examples of correct base URLs:**
- Google: `https://accounts.google.com`
- Microsoft/Azure: `https://login.microsoftonline.com/YOUR_TENANT_ID/v2.0`
- Keycloak: `https://keycloak.example.com/realms/YOUR_REALM`
- Authelia: `https://auth.yourdomain.com`
-
-## ✅ Testing Your Configuration
-
-![Login Page with SSO Buttons](./images/sso-with-options.png)
-*Unraid login page displaying both traditional username/password authentication and SSO options with customized provider buttons*
-
-1. Save your provider configuration
-2. Log out (if logged in)
-3. Navigate to the login page
-4. Your configured provider button should appear
-5. Click to test the login flow
-
-## 🔧 Troubleshooting
-
-### Common Issues
-
-#### "Provider not found" error
-
- Ensure the Issuer URL is correct
- Check that the provider supports OIDC discovery (/.well-known/openid-configuration)
-
-#### "Authorization failed"
-
- In Simple Mode: Check email domains are entered correctly (without @)
- In Advanced Mode: 
-  - Verify claim names match exactly what your provider sends
-  - Check if Authorization Rule Mode is set correctly (OR vs AND)
-  - Ensure all required claims are present in the token
- Enable debug logging to see actual claims and rule evaluation
-
-#### "Invalid redirect URI"
-
- Ensure the redirect URI in your provider matches exactly
- Include the correct port if using a non-standard configuration
- Verify the redirect URI protocol matches your server's configuration (HTTP or HTTPS)
-
-#### Cannot see login button
-
- Check that at least one authorization rule is configured
- Verify the provider is enabled/saved
-
-### Debug Mode
-
-To troubleshoot issues:
-
-1. Enable debug logging:
-
-```bash
-LOG_LEVEL=debug unraid-api start --debug
-```
-
-2. Check logs for:
-
- Received claims from provider
- Authorization rule evaluation
- Token validation errors
-
-## 🔐 Security Best Practices
-
-1. **Use Simple Mode for authorization** - Prevents overly accepting configurations and reduces misconfiguration risks
-2. **Be specific with authorization** - Don't use overly broad rules
-3. **Rotate secrets regularly** - Update client secrets periodically
-4. **Test thoroughly** - Verify only intended users can access
-
-## 💡 Need Help?
-
- Check provider's OIDC documentation
- Review Unraid API logs for detailed error messages
- Ensure your provider supports standard OIDC discovery
- Verify network connectivity between Unraid and provider
-
-## 🏢 Provider-Specific Setup
-
-### Unraid.net Provider
-
-The Unraid.net provider is built-in and pre-configured. You only need to configure authorization rules in the interface.
-
-**Configuration:**
-
- **Issuer URL**: Pre-configured (built-in provider)
- **Client ID/Secret**: Pre-configured (built-in provider)
- **Redirect URI**: `http://YOUR_UNRAID_IP/graphql/api/auth/oidc/callback`
-
-:::tip[Redirect URI Protocol]
-**Match the protocol to your server setup:** Use `http://` if accessing your Unraid server without SSL/TLS (typical for local network access). Use `https://` if you've configured SSL/TLS on your server. Some OIDC providers (like Google) require HTTPS and won't accept HTTP redirect URIs.
-:::
-
-Configure authorization rules using Simple Mode (allowed email domains/addresses) or Advanced Mode for complex requirements.
-
-### Google
-
-<details>
-<summary><strong>📋 Setup Steps</strong></summary>
-
-Set up OAuth 2.0 credentials in [Google Cloud Console](https://console.cloud.google.com/):
-
-1. Go to **APIs & Services** → **Credentials**
-2. Click **Create Credentials** → **OAuth client ID**
-3. Choose **Web application** as the application type
-4. Add your redirect URI to **Authorized redirect URIs**
-5. Configure the OAuth consent screen if prompted
-
-</details>
-
-**Configuration:**
-
- **Issuer URL**: `https://accounts.google.com`
- **Client ID/Secret**: From your OAuth 2.0 client credentials
- **Required Scopes**: `openid`, `profile`, `email`
- **Redirect URI**: `http://YOUR_UNRAID_IP/graphql/api/auth/oidc/callback`
-
-:::warning[Google Domain Requirements]
-**Google requires valid domain names for OAuth redirect URIs.** Local IP addresses and `.local` domains are not accepted. To use Google OAuth with your Unraid server, you'll need:
-
- **Option 1: Reverse Proxy** - Set up a reverse proxy (like NGINX Proxy Manager or Traefik) with a valid domain name pointing to your Unraid API
- **Option 2: Tailscale** - Use Tailscale to get a valid `*.ts.net` domain that Google will accept
- **Option 3: Dynamic DNS** - Use a DDNS service to get a public domain name for your server
-
-Remember to update your redirect URI in both Google Cloud Console and your Unraid OIDC configuration to use the valid domain.
-:::
-
-For Google Workspace domains, use Advanced Mode with the `hd` claim to restrict access to your organization's domain.
-
-### Authelia
-
-Configure OIDC client in your Authelia `configuration.yml` with client ID `unraid-api` and generate a hashed secret using the Authelia hash-password command.
-
-**Configuration:**
-
- **Issuer URL**: `https://auth.yourdomain.com`
- **Client ID**: `unraid-api` (or as configured in Authelia)
- **Client Secret**: Your unhashed secret
- **Required Scopes**: `openid`, `profile`, `email`, `groups`
- **Redirect URI**: `http://YOUR_UNRAID_IP/graphql/api/auth/oidc/callback`
-
-Use Advanced Mode with `groups` claim for group-based authorization.
-
-### Microsoft/Azure AD
-
-Register a new app in [Azure Portal](https://portal.azure.com/) under Azure Active Directory → App registrations. Note the Application ID, create a client secret, and note your tenant ID.
-
-**Configuration:**
-
- **Issuer URL**: `https://login.microsoftonline.com/YOUR_TENANT_ID/v2.0`
- **Client ID**: Your Application (client) ID
- **Client Secret**: Generated client secret
- **Required Scopes**: `openid`, `profile`, `email`
- **Redirect URI**: `http://YOUR_UNRAID_IP/graphql/api/auth/oidc/callback`
-
-Authorization rules can be configured in the interface using email domains or advanced claims.
-
-### Keycloak
-
-Create a new confidential client in Keycloak Admin Console with `openid-connect` protocol and copy the client secret from the Credentials tab.
-
-**Configuration:**
-
- **Issuer URL**: `https://keycloak.example.com/realms/YOUR_REALM`
- **Client ID**: `unraid-api` (or as configured in Keycloak)
- **Client Secret**: From Keycloak Credentials tab
- **Required Scopes**: `openid`, `profile`, `email`
- **Redirect URI**: `http://YOUR_UNRAID_IP/graphql/api/auth/oidc/callback`
-
-For role-based authorization, use Advanced Mode with `realm_access.roles` or `resource_access` claims.
-
-### Authentik
-
-Create a new OAuth2/OpenID Provider in Authentik, then create an Application and link it to the provider.
-
-**Configuration:**
-
- **Issuer URL**: `https://authentik.example.com/application/o/<application_slug>/`
- **Client ID**: From Authentik provider configuration
- **Client Secret**: From Authentik provider configuration
- **Required Scopes**: `openid`, `profile`, `email`
- **Redirect URI**: `http://YOUR_UNRAID_IP/graphql/api/auth/oidc/callback`
-
-Authorization rules can be configured in the interface.
-
-### Okta
-
-Create a new OIDC Web Application in Okta Admin Console and assign appropriate users or groups.
-
-**Configuration:**
-
- **Issuer URL**: `https://YOUR_DOMAIN.okta.com`
- **Client ID**: From Okta application configuration
- **Client Secret**: From Okta application configuration
- **Required Scopes**: `openid`, `profile`, `email`
- **Redirect URI**: `http://YOUR_UNRAID_IP/graphql/api/auth/oidc/callback`
-
-Authorization rules can be configured in the interface using email domains or advanced claims.
--- a/api/docs/public/programmatic-api-key-management.md
+++ b/api/docs/public/programmatic-api-key-management.md
@@ -1,252 +0,0 @@
---
-title: Programmatic API Key Management
-description: Create, use, and delete API keys programmatically for automated workflows
-sidebar_position: 4
---
-
-# Programmatic API Key Management
-
-This guide explains how to create, use, and delete API keys programmatically using the Unraid API CLI, enabling automated workflows and scripts.
-
-## Overview
-
-The `unraid-api apikey` command supports both interactive and non-interactive modes, making it suitable for:
-
- Automated deployment scripts
- CI/CD pipelines
- Temporary access provisioning
- Infrastructure as code workflows
-
-:::tip[Quick Start]
-Jump to the [Complete Workflow Example](#complete-workflow-example) to see everything in action.
-:::
-
-## Creating API Keys Programmatically
-
-### Basic Creation with JSON Output
-
-Use the `--json` flag to get machine-readable output:
-
-```bash
-unraid-api apikey --create --name "workflow key" --roles ADMIN --json
-```
-
-**Output:**
-
-```json
-{
-    "key": "your-generated-api-key-here",
-    "name": "workflow key",
-    "id": "generated-uuid"
-}
-```
-
-### Advanced Creation with Permissions
-
-```bash
-unraid-api apikey --create \
-  --name "limited access key" \
-  --permissions "DOCKER:READ_ANY,ARRAY:READ_ANY" \
-  --description "Read-only access for monitoring" \
-  --json
-```
-
-### Handling Existing Keys
-
-If a key with the same name exists, use `--overwrite`:
-
-```bash
-unraid-api apikey --create --name "existing key" --roles ADMIN --overwrite --json
-```
-
-:::warning[Key Replacement]
-The `--overwrite` flag will permanently replace the existing key. The old key will be immediately invalidated.
-:::
-
-## Deleting API Keys Programmatically
-
-### Non-Interactive Deletion
-
-Delete a key by name without prompts:
-
-```bash
-unraid-api apikey --delete --name "workflow key"
-```
-
-**Output:**
-
-```
-Successfully deleted 1 API key
-```
-
-### JSON Output for Deletion
-
-Use `--json` flag for machine-readable delete confirmation:
-
-```bash
-unraid-api apikey --delete --name "workflow key" --json
-```
-
-**Success Output:**
-
-```json
-{
-    "deleted": 1,
-    "keys": [
-        {
-            "id": "generated-uuid",
-            "name": "workflow key"
-        }
-    ]
-}
-```
-
-**Error Output:**
-
-```json
-{
-    "deleted": 0,
-    "error": "No API key found with name: nonexistent key"
-}
-```
-
-### Error Handling
-
-When the specified key doesn't exist:
-
-```bash
-unraid-api apikey --delete --name "nonexistent key"
-# Output: No API keys found to delete
-```
-
-**JSON Error Output:**
-
-```json
-{
-    "deleted": 0,
-    "message": "No API keys found to delete"
-}
-```
-
-## Complete Workflow Example
-
-Here's a complete example for temporary access provisioning:
-
-```bash
-#!/bin/bash
-set -e
-
-# 1. Create temporary API key
-echo "Creating temporary API key..."
-KEY_DATA=$(unraid-api apikey --create \
-  --name "temp deployment key" \
-  --roles ADMIN \
-  --description "Temporary key for deployment $(date)" \
-  --json)
-
-# 2. Extract the API key
-API_KEY=$(echo "$KEY_DATA" | jq -r '.key')
-echo "API key created successfully"
-
-# 3. Use the key for operations
-echo "Configuring services..."
-curl -H "Authorization: Bearer $API_KEY" \
-  -H "Content-Type: application/json" \
-  -d '{"provider": "azure", "clientId": "your-client-id"}' \
-  http://localhost:3001/graphql
-
-# 4. Clean up (always runs, even on error)
-trap 'echo "Cleaning up..."; unraid-api apikey --delete --name "temp deployment key"' EXIT
-
-echo "Deployment completed successfully"
-```
-
-## Command Reference
-
-### Create Command Options
-
-| Flag                    | Description             | Example                           |
-| ----------------------- | ----------------------- | --------------------------------- |
-| `--name <name>`         | Key name (required)     | `--name "my key"`                 |
-| `--roles <roles>`       | Comma-separated roles   | `--roles ADMIN,VIEWER`            |
-| `--permissions <perms>` | Resource:action pairs   | `--permissions "DOCKER:READ_ANY"` |
-| `--description <desc>`  | Key description         | `--description "CI/CD key"`       |
-| `--overwrite`           | Replace existing key    | `--overwrite`                     |
-| `--json`                | Machine-readable output | `--json`                          |
-
-### Available Roles
-
- `ADMIN` - Full system access
- `CONNECT` - Unraid Connect features
- `VIEWER` - Read-only access
- `GUEST` - Limited access
-
-### Available Resources and Actions
-
-**Resources:** `ACTIVATION_CODE`, `API_KEY`, `ARRAY`, `CLOUD`, `CONFIG`, `CONNECT`, `CONNECT__REMOTE_ACCESS`, `CUSTOMIZATIONS`, `DASHBOARD`, `DISK`, `DISPLAY`, `DOCKER`, `FLASH`, `INFO`, `LOGS`, `ME`, `NETWORK`, `NOTIFICATIONS`, `ONLINE`, `OS`, `OWNER`, `PERMISSION`, `REGISTRATION`, `SERVERS`, `SERVICES`, `SHARE`, `VARS`, `VMS`, `WELCOME`
-
-**Actions:** `CREATE_ANY`, `CREATE_OWN`, `READ_ANY`, `READ_OWN`, `UPDATE_ANY`, `UPDATE_OWN`, `DELETE_ANY`, `DELETE_OWN`
-
-### Delete Command Options
-
-| Flag            | Description              | Example           |
-| --------------- | ------------------------ | ----------------- |
-| `--delete`      | Enable delete mode       | `--delete`        |
-| `--name <name>` | Key to delete (optional) | `--name "my key"` |
-
-**Note:** If `--name` is omitted, the command runs interactively.
-
-## Best Practices
-
-:::info[Security Best Practices]
-**Minimal Permissions**
-
- Use specific permissions instead of ADMIN role when possible
- Example: `--permissions "DOCKER:READ_ANY"` instead of `--roles ADMIN`
-
-**Key Lifecycle Management**
-
- Always clean up temporary keys after use
- Store API keys securely (environment variables, secrets management)
- Use descriptive names and descriptions for audit trails
-  :::
-
-### Error Handling
-
- Check exit codes (`$?`) after each command
- Use `set -e` in bash scripts to fail fast
- Implement proper cleanup with `trap`
-
-### Key Naming
-
- Use descriptive names that include purpose and date
- Names must contain only letters, numbers, and spaces
- Unicode letters are supported
-
-## Troubleshooting
-
-### Common Issues
-
-:::note[Common Error Messages]
-
-**"API key name must contain only letters, numbers, and spaces"**
-
- **Solution:** Remove special characters like hyphens, underscores, or symbols
-
-**"API key with name 'x' already exists"**
-
- **Solution:** Use `--overwrite` flag or choose a different name
-
-**"Please add at least one role or permission to the key"**
-
- **Solution:** Specify either `--roles` or `--permissions` (or both)
-
-:::
-
-### Debug Mode
-
-For troubleshooting, run with debug logging:
-
-```bash
-LOG_LEVEL=debug unraid-api apikey --create --name "debug key" --roles ADMIN
-```
--- a/api/docs/public/upcoming-features.md
+++ b/api/docs/public/upcoming-features.md
@@ -1,172 +1,71 @@
---
-title: Roadmap & Features
-description: Current status and upcoming features for the Unraid API
-sidebar_position: 10
---
+# Upcoming Features

-# Roadmap & Features
-
-:::info Development Status
-This roadmap outlines completed and planned features for the Unraid API. Features and timelines may change based on development priorities and community feedback.
-:::
-
-## Feature Status Legend
-
-| Status | Description |
-|--------|-------------|
-| ✅ **Done** | Feature is complete and available |
-| 🚧 **In Progress** | Currently under active development |
-| 📅 **Planned** | Scheduled for future development |
-| 💡 **Under Consideration** | Being evaluated for future inclusion |
+Note: This roadmap outlines planned features and improvements for the Unraid API. Features and timelines may change based on development priorities and community feedback.

 ## Core Infrastructure

-### Completed Features ✅
-
-| Feature | Available Since |
-|---------|-----------------|
-| **API Development Environment Improvements** | v4.0.0 |
-| **Include API in Unraid OS** | Unraid v7.2-beta.1 |
-| **Separate API from Connect Plugin** | Unraid v7.2-beta.1 |
-
-### Upcoming Features 📅
-
-| Feature | Target Timeline |
-|---------|-----------------|
-| **Make API Open Source** | Q1 2025 |
-| **Developer Tools for Plugins** | Q2 2025 |
+| Feature | Status | Tag |
+|---------|--------|-----|
+| API Development Environment Improvements | Done | v4.0.0 |
+| Include API in Unraid OS | Planned (Q1 2025) | - |
+| Make API Open Source | Planned (Q1 2025) | - |
+| Separate API from Connect Plugin | Planned (Q2 2025) | - |
+| Developer Tools for Plugins | Planned (Q2 2025) | - |

 ## Security & Authentication

-### Completed Features ✅
-
-| Feature | Available Since |
-|---------|-----------------|
-| **Permissions System Rewrite** | v4.0.0 |
-| **OIDC/SSO Support** | Unraid v7.2-beta.1 |
-
-### In Development 🚧
-
- **User Interface Component Library** - Enhanced security components for the UI
+| Feature | Status | Tag |
+|---------|--------|-----|
+| Permissions System Rewrite | Done | v4.0.0 |
+| User Interface Component Library | In Progress | - |

 ## User Interface Improvements

-### Planned Features 📅
-
-| Feature | Target Timeline | Description |
-|---------|-----------------|-------------|
-| **New Settings Pages** | Q2 2025 | Modernized settings interface with improved UX |
-| **Custom Theme Creator** | Q2-Q3 2025 | Allow users to create and share custom themes |
-| **New Connect Settings Interface** | Q1 2025 | Redesigned Unraid Connect configuration |
+| Feature | Status | Tag |
+|---------|--------|-----|
+| New Settings Pages | Planned (Q2 2025) | - |
+| Custom Theme Creator | Planned (Q2-Q3 2025) | - |
+| New Connect Settings Interface | Planned (Q1 2025) | - |

 ## Array Management

-### Completed Features ✅
-
-| Feature | Available Since |
-|---------|-----------------|
-| **Array Status Monitoring** | v4.0.0 |
-
-### Planned Features 📅
-
-| Feature | Target Timeline | Description |
-|---------|-----------------|-------------|
-| **Storage Pool Creation Interface** | Q2 2025 | Simplified pool creation workflow |
-| **Storage Pool Status Interface** | Q2 2025 | Real-time pool health monitoring |
+| Feature | Status | Tag |
+|---------|--------|-----|
+| Array Status Monitoring | Done | v4.0.0 |
+| Storage Pool Creation Interface | Planned (Q2 2025) | - |
+| Storage Pool Status Interface | Planned (Q2 2025) | - |

 ## Docker Integration

-### Completed Features ✅
-
-| Feature | Available Since |
-|---------|-----------------|
-| **Docker Container Status Monitoring** | v4.0.0 |
-
-### Planned Features 📅
-
-| Feature | Target Timeline | Description |
-|---------|-----------------|-------------|
-| **New Docker Status Interface Design** | Q3 2025 | Modern container management UI |
-| **New Docker Status Interface** | Q3 2025 | Implementation of new design |
-| **Docker Container Setup Interface** | Q3 2025 | Streamlined container deployment |
-| **Docker Compose Support** | TBD | Native docker-compose.yml support |
+| Feature | Status | Tag |
+|---------|--------|-----|
+| Docker Container Status Monitoring | Done | v4.0.0 |
+| New Docker Status Interface Design | Planned (Q3 2025) | - |
+| New Docker Status Interface | Planned (Q3 2025) | - |
+| Docker Container Setup Interface | Planned (Q3 2025) | - |
+| Docker Compose Support | Planned | - |

 ## Share Management

-### Completed Features ✅
-
-| Feature | Available Since |
-|---------|-----------------|
-| **Array/Cache Share Status Monitoring** | v4.0.0 |
-
-### Under Consideration 💡
-
- **Storage Share Creation & Settings** - Enhanced share configuration options
- **Storage Share Management Interface** - Unified share management dashboard
+| Feature | Status | Tag |
+|---------|--------|-----|
+| Array/Cache Share Status Monitoring | Done | v4.0.0 |
+| Storage Share Creation & Settings | Planned | - |
+| Storage Share Management Interface | Planned | - |

 ## Plugin System

-### Planned Features 📅
-
-| Feature | Target Timeline | Description |
-|---------|-----------------|-------------|
-| **New Plugins Interface** | Q3 2025 | Redesigned plugin management UI |
-| **Plugin Management Interface** | TBD | Advanced plugin configuration |
-| **Plugin Development Tools** | TBD | SDK and tooling for developers |
+| Feature | Status | Tag |
+|---------|--------|-----|
+| New Plugins Interface | Planned (Q3 2025) | - |
+| Plugin Management Interface | Planned | - |
+| Plugin Development Tools | Planned | - |

 ## Notifications

-### Completed Features ✅
+| Feature | Status | Tag |
+|---------|--------|-----|
+| Notifications System | Done | v4.0.0 |
+| Notifications Interface | Done | v4.0.0 |

-| Feature | Available Since |
-|---------|-----------------|
-| **Notifications System** | v4.0.0 |
-| **Notifications Interface** | v4.0.0 |
-
---
-
-## Recent Releases
-
-:::info Full Release History
-For a complete list of all releases, changelogs, and download links, visit the [Unraid API GitHub Releases](https://github.com/unraid/api/releases) page.
-:::
-
-### Unraid v7.2-beta.1 Highlights
-
- 🎉 **API included in Unraid OS** - Native integration
- 🔐 **OIDC/SSO Support** - Enterprise authentication
- 📦 **Standalone API** - Separated from Connect plugin
-
-### v4.0.0 Highlights
-
- 🛡️ **Permissions System Rewrite** - Enhanced security
- 📊 **Comprehensive Monitoring** - Array, Docker, and Share status
- 🔔 **Notifications System** - Real-time alerts and notifications
- 🛠️ **Developer Environment** - Improved development tools
-
-## Community Feedback
-
-:::tip Have a Feature Request?
-We value community input! Please submit feature requests and feedback through:
-
- [Unraid Forums](https://forums.unraid.net)
- [GitHub Issues](https://github.com/unraid/api/issues) - API is open source!
-
-:::
-
-## Version Support
-
-| Unraid Version | API Version | Support Status |
-|----------------|-------------|----------------|
-| Unraid v7.2-beta.1+ | Latest | ✅ Active |
-| 7.0 - 7.1.x | v4.x via Plugin | ⚠️ Limited |
-| 6.12.x | v4.x via Plugin | ⚠️ Limited |
-| < 6.12 | Not Supported | ❌ EOL |
-
-:::warning Legacy Support
-Versions prior to Unraid 7.2 require the API to be installed through the Unraid Connect plugin. Some features may not be available on older versions.
-:::
-
-:::tip Pre-release Versions
-You can always install the Unraid Connect plugin to access pre-release versions of the API and get early access to new features before they're included in Unraid OS releases.
-:::
+Features marked as "Done" are available in current releases. The tag column shows the version where a feature was first introduced.
--- a/api/ecosystem.config.json
+++ b/api/ecosystem.config.json
@@ -13,9 +13,7 @@
            "watch": false,
            "interpreter": "/usr/local/bin/node",
            "ignore_watch": ["node_modules", "src", ".env.*", "myservers.cfg"],
-            "out_file": "/var/log/graphql-api.log",
-            "error_file": "/var/log/graphql-api.log",
-            "merge_logs": true,
+            "log_file": "/var/log/graphql-api.log",
            "kill_timeout": 10000
        }
    ]
--- a/api/generated-schema.graphql
+++ b/api/generated-schema.graphql
--- a/api/package.json
+++ b/api/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@unraid/api",
-    "version": "4.22.2",
+    "version": "4.9.2",
    "main": "src/cli/index.ts",
    "type": "module",
    "corepack": {
@@ -10,14 +10,14 @@
    "author": "Lime Technology, Inc. <unraid.net>",
    "license": "GPL-2.0-or-later",
    "engines": {
-        "pnpm": "10.15.0"
+        "pnpm": "10.13.1"
    },
    "scripts": {
        "// Development": "",
        "start": "node dist/main.js",
-        "dev": "clear && vite",
+        "dev": "vite",
        "dev:debug": "NODE_OPTIONS='--inspect-brk=9229 --enable-source-maps' vite",
-        "command": "COMMAND_TESTER=true pnpm run build > /dev/null 2>&1 && NODE_ENV=development ./dist/cli.js",
+        "command": "pnpm run build && clear && ./dist/cli.js",
        "command:raw": "./dist/cli.js",
        "// Build and Deploy": "",
        "build": "vite build --mode=production",
@@ -28,8 +28,9 @@
        "preunraid:deploy": "pnpm build",
        "unraid:deploy": "./scripts/deploy-dev.sh",
        "// GraphQL Codegen": "",
-        "codegen": "graphql-codegen --config codegen.ts",
-        "codegen:watch": "graphql-codegen --config codegen.ts --watch",
+        "codegen": "MOTHERSHIP_GRAPHQL_LINK='https://staging.mothership.unraid.net/ws' graphql-codegen --config codegen.ts -r dotenv/config './.env.staging'",
+        "codegen:watch": "DOTENV_CONFIG_PATH='./.env.staging' graphql-codegen --config codegen.ts --watch -r dotenv/config",
+        "codegen:local": "NODE_TLS_REJECT_UNAUTHORIZED=0  MOTHERSHIP_GRAPHQL_LINK='https://mothership.localhost/ws' graphql-codegen --config codegen.ts --watch",
        "// Code Quality": "",
        "lint": "eslint --config .eslintrc.ts src/",
        "lint:fix": "eslint --fix --config .eslintrc.ts src/",
@@ -51,26 +52,26 @@
        "unraid-api": "dist/cli.js"
    },
    "dependencies": {
-        "@apollo/client": "3.14.0",
+        "@apollo/client": "3.13.8",
        "@apollo/server": "4.12.2",
        "@as-integrations/fastify": "2.1.1",
        "@fastify/cookie": "11.0.2",
        "@fastify/helmet": "13.0.1",
-        "@graphql-codegen/client-preset": "5.0.0",
+        "@graphql-codegen/client-preset": "4.8.3",
        "@graphql-tools/load-files": "7.0.1",
-        "@graphql-tools/merge": "9.1.1",
-        "@graphql-tools/schema": "10.0.25",
-        "@graphql-tools/utils": "10.9.1",
+        "@graphql-tools/merge": "9.0.24",
+        "@graphql-tools/schema": "10.0.23",
+        "@graphql-tools/utils": "10.8.6",
        "@jsonforms/core": "3.6.0",
        "@nestjs/apollo": "13.1.0",
        "@nestjs/cache-manager": "3.0.1",
-        "@nestjs/common": "11.1.6",
+        "@nestjs/common": "11.1.3",
        "@nestjs/config": "4.0.2",
-        "@nestjs/core": "11.1.6",
+        "@nestjs/core": "11.1.3",
        "@nestjs/event-emitter": "3.0.1",
        "@nestjs/graphql": "13.1.0",
        "@nestjs/passport": "11.0.5",
-        "@nestjs/platform-fastify": "11.1.6",
+        "@nestjs/platform-fastify": "11.1.3",
        "@nestjs/schedule": "6.0.0",
        "@nestjs/throttler": "6.4.0",
        "@reduxjs/toolkit": "2.8.2",
@@ -79,12 +80,11 @@
        "@unraid/libvirt": "2.1.0",
        "@unraid/shared": "workspace:*",
        "accesscontrol": "2.2.1",
-        "atomically": "2.0.3",
        "bycontract": "2.0.11",
        "bytes": "3.1.2",
-        "cache-manager": "7.2.0",
+        "cache-manager": "7.0.1",
        "cacheable-lookup": "7.0.0",
-        "camelcase-keys": "10.0.0",
+        "camelcase-keys": "9.1.3",
        "casbin": "5.38.0",
        "change-case": "5.4.4",
        "chokidar": "4.0.3",
@@ -94,17 +94,16 @@
        "command-exists": "1.2.9",
        "convert": "5.12.0",
        "cookie": "1.0.2",
-        "cron": "4.3.0",
+        "cron": "4.3.1",
        "cross-fetch": "4.1.0",
        "diff": "8.0.2",
        "dockerode": "4.0.7",
-        "dotenv": "17.2.1",
-        "escape-html": "1.0.3",
+        "dotenv": "17.1.0",
        "execa": "9.6.0",
        "exit-hook": "4.0.0",
-        "fastify": "5.5.0",
-        "filenamify": "7.0.0",
-        "fs-extra": "11.3.1",
+        "fastify": "5.4.0",
+        "filenamify": "6.0.0",
+        "fs-extra": "11.3.0",
        "glob": "11.0.3",
        "global-agent": "3.0.0",
        "got": "14.4.7",
@@ -113,35 +112,34 @@
        "graphql-scalars": "1.24.2",
        "graphql-subscriptions": "3.0.0",
        "graphql-tag": "2.12.6",
-        "graphql-ws": "6.0.6",
+        "graphql-ws": "6.0.5",
        "ini": "5.0.0",
        "ip": "2.0.1",
-        "jose": "6.0.13",
+        "jose": "6.0.11",
        "json-bigint-patch": "0.0.8",
        "lodash-es": "4.17.21",
        "multi-ini": "2.3.2",
        "mustache": "4.2.0",
        "nest-authz": "2.17.0",
-        "nest-commander": "3.19.0",
+        "nest-commander": "3.17.0",
        "nestjs-pino": "4.4.0",
        "node-cache": "5.1.2",
        "node-window-polyfill": "1.0.4",
-        "openid-client": "6.6.4",
-        "p-retry": "7.0.0",
+        "p-retry": "6.2.1",
        "passport-custom": "1.1.1",
        "passport-http-header-strategy": "1.1.0",
        "path-type": "6.0.0",
-        "pino": "9.9.0",
+        "pino": "9.7.0",
        "pino-http": "10.5.0",
-        "pino-pretty": "13.1.1",
+        "pino-pretty": "13.0.0",
        "pm2": "6.0.8",
        "reflect-metadata": "^0.1.14",
+        "request": "2.88.2",
        "rxjs": "7.8.2",
        "semver": "7.7.2",
        "strftime": "0.10.3",
-        "systeminformation": "5.27.8",
-        "undici": "7.15.0",
-        "uuid": "13.0.0",
+        "systeminformation": "5.27.7",
+        "uuid": "11.1.0",
        "ws": "8.18.3",
        "zen-observable-ts": "1.1.0",
        "zod": "3.25.76"
@@ -155,27 +153,27 @@
        }
    },
    "devDependencies": {
-        "@eslint/js": "9.34.0",
-        "@graphql-codegen/add": "6.0.0",
-        "@graphql-codegen/cli": "6.0.0",
-        "@graphql-codegen/fragment-matcher": "6.0.0",
+        "@eslint/js": "9.30.1",
+        "@graphql-codegen/add": "5.0.3",
+        "@graphql-codegen/cli": "5.0.7",
+        "@graphql-codegen/fragment-matcher": "5.1.0",
        "@graphql-codegen/import-types-preset": "3.0.1",
-        "@graphql-codegen/typed-document-node": "6.0.0",
-        "@graphql-codegen/typescript": "5.0.0",
-        "@graphql-codegen/typescript-operations": "5.0.0",
-        "@graphql-codegen/typescript-resolvers": "5.0.0",
+        "@graphql-codegen/typed-document-node": "5.1.2",
+        "@graphql-codegen/typescript": "4.1.6",
+        "@graphql-codegen/typescript-operations": "4.6.1",
+        "@graphql-codegen/typescript-resolvers": "4.5.1",
        "@graphql-typed-document-node/core": "3.2.0",
-        "@ianvs/prettier-plugin-sort-imports": "4.6.3",
-        "@nestjs/testing": "11.1.6",
+        "@ianvs/prettier-plugin-sort-imports": "4.4.2",
+        "@nestjs/testing": "11.1.3",
        "@originjs/vite-plugin-commonjs": "1.0.3",
        "@rollup/plugin-node-resolve": "16.0.1",
-        "@swc/core": "1.13.5",
+        "@swc/core": "1.12.11",
        "@types/async-exit-hook": "2.0.2",
        "@types/bytes": "3.1.5",
        "@types/cli-table": "0.3.4",
        "@types/command-exists": "1.2.3",
        "@types/cors": "2.8.19",
-        "@types/dockerode": "3.3.43",
+        "@types/dockerode": "3.3.42",
        "@types/graphql-fields": "1.3.9",
        "@types/graphql-type-uuid": "0.2.6",
        "@types/ini": "4.1.1",
@@ -183,41 +181,43 @@
        "@types/lodash": "4.17.20",
        "@types/lodash-es": "4.17.12",
        "@types/mustache": "4.2.6",
-        "@types/node": "22.18.0",
+        "@types/node": "22.16.2",
        "@types/pify": "6.1.0",
        "@types/semver": "7.7.0",
        "@types/sendmail": "1.4.7",
        "@types/stoppable": "1.1.3",
        "@types/strftime": "0.9.8",
-        "@types/supertest": "6.0.3",
        "@types/uuid": "10.0.0",
        "@types/ws": "8.18.1",
-        "@types/wtfnode": "0.10.0",
+        "@types/wtfnode": "0.7.3",
        "@vitest/coverage-v8": "3.2.4",
        "@vitest/ui": "3.2.4",
-        "eslint": "9.34.0",
+        "cz-conventional-changelog": "3.3.0",
+        "eslint": "9.30.1",
        "eslint-plugin-import": "2.32.0",
+        "eslint-plugin-n": "17.21.0",
        "eslint-plugin-no-relative-import-paths": "1.6.1",
-        "eslint-plugin-prettier": "5.5.4",
-        "jiti": "2.5.1",
+        "eslint-plugin-prettier": "5.5.1",
+        "graphql-codegen-typescript-validation-schema": "0.17.1",
+        "jiti": "2.4.2",
        "nodemon": "3.1.10",
        "prettier": "3.6.2",
-        "rollup-plugin-node-externals": "8.1.0",
-        "supertest": "7.1.4",
-        "tsx": "4.20.5",
-        "type-fest": "5.0.0",
-        "typescript": "5.9.2",
-        "typescript-eslint": "8.41.0",
-        "unplugin-swc": "1.5.7",
-        "vite": "7.1.3",
+        "rollup-plugin-node-externals": "8.0.1",
+        "commit-and-tag-version": "9.6.0",
+        "tsx": "4.20.3",
+        "type-fest": "4.41.0",
+        "typescript": "5.8.3",
+        "typescript-eslint": "8.36.0",
+        "unplugin-swc": "1.5.5",
+        "vite": "7.0.3",
        "vite-plugin-node": "7.0.0",
        "vite-tsconfig-paths": "5.1.4",
        "vitest": "3.2.4",
-        "zx": "8.8.1"
+        "zx": "8.6.2"
    },
    "overrides": {
        "eslint": {
-            "jiti": "2.5.1"
+            "jiti": "2.4.2"
        },
        "@as-integrations/fastify": {
            "fastify": "$fastify"
@@ -228,5 +228,5 @@
        }
    },
    "private": true,
-    "packageManager": "pnpm@10.15.0"
+    "packageManager": "pnpm@10.13.1"
 }
--- a/api/src/test/common/allowed-origins.test.ts
+++ b/api/src/test/common/allowed-origins.test.ts
@@ -0,0 +1,45 @@
+import { getAllowedOrigins } from '@app/common/allowed-origins.js';
+import { store } from '@app/store/index.js';
+import { loadConfigFile } from '@app/store/modules/config.js';
+import { loadStateFiles } from '@app/store/modules/emhttp.js';
+
+import 'reflect-metadata';
+
+import { expect, test } from 'vitest';
+
+test('Returns allowed origins', async () => {
+    // Load state files into store
+    await store.dispatch(loadStateFiles()).unwrap();
+    await store.dispatch(loadConfigFile()).unwrap();
+
+    // Get allowed origins
+    const allowedOrigins = getAllowedOrigins();
+
+    // Test that the result is an array
+    expect(Array.isArray(allowedOrigins)).toBe(true);
+
+    // Test that it contains the expected socket paths
+    expect(allowedOrigins).toContain('/var/run/unraid-notifications.sock');
+    expect(allowedOrigins).toContain('/var/run/unraid-php.sock');
+    expect(allowedOrigins).toContain('/var/run/unraid-cli.sock');
+
+    // Test that it contains the expected local URLs
+    expect(allowedOrigins).toContain('http://localhost:8080');
+    expect(allowedOrigins).toContain('https://localhost:4443');
+
+    // Test that it contains the expected connect URLs
+    expect(allowedOrigins).toContain('https://connect.myunraid.net');
+    expect(allowedOrigins).toContain('https://connect-staging.myunraid.net');
+    expect(allowedOrigins).toContain('https://dev-my.myunraid.net:4000');
+
+    // Test that it contains the extra origins from config
+    expect(allowedOrigins).toContain('https://google.com');
+    expect(allowedOrigins).toContain('https://test.com');
+
+    // Test that it contains some of the remote URLs
+    expect(allowedOrigins).toContain('https://tower.local:4443');
+    expect(allowedOrigins).toContain('https://192.168.1.150:4443');
+
+    // Test that there are no duplicates
+    expect(allowedOrigins.length).toBe(new Set(allowedOrigins).size);
+});
--- a/api/src/test/config/api-config.test.ts
+++ b/api/src/test/config/api-config.test.ts
@@ -0,0 +1,137 @@
+import { ConfigService } from '@nestjs/config';
+
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { ApiConfigPersistence } from '@app/unraid-api/config/api-config.module.js';
+import { ConfigPersistenceHelper } from '@app/unraid-api/config/persistence.helper.js';
+
+describe('ApiConfigPersistence', () => {
+    let service: ApiConfigPersistence;
+    let configService: ConfigService;
+    let persistenceHelper: ConfigPersistenceHelper;
+
+    beforeEach(() => {
+        configService = {
+            get: vi.fn(),
+            set: vi.fn(),
+        } as any;
+
+        persistenceHelper = {} as ConfigPersistenceHelper;
+        service = new ApiConfigPersistence(configService, persistenceHelper);
+    });
+
+    describe('convertLegacyConfig', () => {
+        it('should migrate sandbox from string "yes" to boolean true', () => {
+            const legacyConfig = {
+                local: { sandbox: 'yes' },
+                api: { extraOrigins: '' },
+                remote: { ssoSubIds: '' },
+            };
+
+            const result = service.convertLegacyConfig(legacyConfig);
+
+            expect(result.sandbox).toBe(true);
+        });
+
+        it('should migrate sandbox from string "no" to boolean false', () => {
+            const legacyConfig = {
+                local: { sandbox: 'no' },
+                api: { extraOrigins: '' },
+                remote: { ssoSubIds: '' },
+            };
+
+            const result = service.convertLegacyConfig(legacyConfig);
+
+            expect(result.sandbox).toBe(false);
+        });
+
+        it('should migrate extraOrigins from comma-separated string to array', () => {
+            const legacyConfig = {
+                local: { sandbox: 'no' },
+                api: { extraOrigins: 'https://example.com,https://test.com' },
+                remote: { ssoSubIds: '' },
+            };
+
+            const result = service.convertLegacyConfig(legacyConfig);
+
+            expect(result.extraOrigins).toEqual(['https://example.com', 'https://test.com']);
+        });
+
+        it('should filter out non-HTTP origins from extraOrigins', () => {
+            const legacyConfig = {
+                local: { sandbox: 'no' },
+                api: {
+                    extraOrigins: 'https://example.com,invalid-origin,http://test.com,ftp://bad.com',
+                },
+                remote: { ssoSubIds: '' },
+            };
+
+            const result = service.convertLegacyConfig(legacyConfig);
+
+            expect(result.extraOrigins).toEqual(['https://example.com', 'http://test.com']);
+        });
+
+        it('should handle empty extraOrigins string', () => {
+            const legacyConfig = {
+                local: { sandbox: 'no' },
+                api: { extraOrigins: '' },
+                remote: { ssoSubIds: '' },
+            };
+
+            const result = service.convertLegacyConfig(legacyConfig);
+
+            expect(result.extraOrigins).toEqual([]);
+        });
+
+        it('should migrate ssoSubIds from comma-separated string to array', () => {
+            const legacyConfig = {
+                local: { sandbox: 'no' },
+                api: { extraOrigins: '' },
+                remote: { ssoSubIds: 'user1,user2,user3' },
+            };
+
+            const result = service.convertLegacyConfig(legacyConfig);
+
+            expect(result.ssoSubIds).toEqual(['user1', 'user2', 'user3']);
+        });
+
+        it('should handle empty ssoSubIds string', () => {
+            const legacyConfig = {
+                local: { sandbox: 'no' },
+                api: { extraOrigins: '' },
+                remote: { ssoSubIds: '' },
+            };
+
+            const result = service.convertLegacyConfig(legacyConfig);
+
+            expect(result.ssoSubIds).toEqual([]);
+        });
+
+        it('should handle undefined config sections', () => {
+            const legacyConfig = {};
+
+            const result = service.convertLegacyConfig(legacyConfig);
+
+            expect(result.sandbox).toBe(false);
+            expect(result.extraOrigins).toEqual([]);
+            expect(result.ssoSubIds).toEqual([]);
+        });
+
+        it('should handle complete migration with all fields', () => {
+            const legacyConfig = {
+                local: { sandbox: 'yes' },
+                api: { extraOrigins: 'https://app1.example.com,https://app2.example.com' },
+                remote: { ssoSubIds: 'sub1,sub2,sub3' },
+            };
+
+            const result = service.convertLegacyConfig(legacyConfig);
+
+            expect(result.sandbox).toBe(true);
+            expect(result.extraOrigins).toEqual([
+                'https://app1.example.com',
+                'https://app2.example.com',
+            ]);
+            expect(result.ssoSubIds).toEqual(['sub1', 'sub2', 'sub3']);
+        });
+    });
+});
--- a/api/src/test/core/utils/files/config-file-normalizer.test.ts
+++ b/api/src/test/core/utils/files/config-file-normalizer.test.ts
@@ -0,0 +1,158 @@
+import 'reflect-metadata';
+
+import { cloneDeep } from 'lodash-es';
+import { expect, test } from 'vitest';
+
+import { getWriteableConfig } from '@app/core/utils/files/config-file-normalizer.js';
+import { initialState } from '@app/store/modules/config.js';
+
+test('it creates a FLASH config with NO OPTIONAL values', () => {
+    const basicConfig = initialState;
+    const config = getWriteableConfig(basicConfig, 'flash');
+    expect(config).toMatchInlineSnapshot(`
+      {
+        "api": {
+          "extraOrigins": "",
+          "version": "",
+        },
+        "local": {
+          "sandbox": "no",
+        },
+        "remote": {
+          "accesstoken": "",
+          "apikey": "",
+          "avatar": "",
+          "dynamicRemoteAccessType": "DISABLED",
+          "email": "",
+          "idtoken": "",
+          "localApiKey": "",
+          "refreshtoken": "",
+          "regWizTime": "",
+          "ssoSubIds": "",
+          "upnpEnabled": "",
+          "username": "",
+          "wanaccess": "",
+          "wanport": "",
+        },
+      }
+    `);
+});
+
+test('it creates a MEMORY config with NO OPTIONAL values', () => {
+    const basicConfig = initialState;
+    const config = getWriteableConfig(basicConfig, 'memory');
+    expect(config).toMatchInlineSnapshot(`
+      {
+        "api": {
+          "extraOrigins": "",
+          "version": "",
+        },
+        "connectionStatus": {
+          "minigraph": "PRE_INIT",
+          "upnpStatus": "",
+        },
+        "local": {
+          "sandbox": "no",
+        },
+        "remote": {
+          "accesstoken": "",
+          "allowedOrigins": "/var/run/unraid-notifications.sock, /var/run/unraid-php.sock, /var/run/unraid-cli.sock, https://connect.myunraid.net, https://connect-staging.myunraid.net, https://dev-my.myunraid.net:4000",
+          "apikey": "",
+          "avatar": "",
+          "dynamicRemoteAccessType": "DISABLED",
+          "email": "",
+          "idtoken": "",
+          "localApiKey": "",
+          "refreshtoken": "",
+          "regWizTime": "",
+          "ssoSubIds": "",
+          "upnpEnabled": "",
+          "username": "",
+          "wanaccess": "",
+          "wanport": "",
+        },
+      }
+    `);
+});
+
+test('it creates a FLASH config with OPTIONAL values', () => {
+    const basicConfig = cloneDeep(initialState);
+    // 2fa & t2fa should be ignored
+    basicConfig.remote['2Fa'] = 'yes';
+    basicConfig.local['2Fa'] = 'yes';
+
+    basicConfig.api.extraOrigins = 'myextra.origins';
+    basicConfig.remote.upnpEnabled = 'yes';
+    basicConfig.connectionStatus.upnpStatus = 'Turned On';
+    const config = getWriteableConfig(basicConfig, 'flash');
+    expect(config).toMatchInlineSnapshot(`
+      {
+        "api": {
+          "extraOrigins": "myextra.origins",
+          "version": "",
+        },
+        "local": {
+          "sandbox": "no",
+        },
+        "remote": {
+          "accesstoken": "",
+          "apikey": "",
+          "avatar": "",
+          "dynamicRemoteAccessType": "DISABLED",
+          "email": "",
+          "idtoken": "",
+          "localApiKey": "",
+          "refreshtoken": "",
+          "regWizTime": "",
+          "ssoSubIds": "",
+          "upnpEnabled": "yes",
+          "username": "",
+          "wanaccess": "",
+          "wanport": "",
+        },
+      }
+    `);
+});
+
+test('it creates a MEMORY config with OPTIONAL values', () => {
+    const basicConfig = cloneDeep(initialState);
+    // 2fa & t2fa should be ignored
+    basicConfig.remote['2Fa'] = 'yes';
+    basicConfig.local['2Fa'] = 'yes';
+    basicConfig.api.extraOrigins = 'myextra.origins';
+    basicConfig.remote.upnpEnabled = 'yes';
+    basicConfig.connectionStatus.upnpStatus = 'Turned On';
+    const config = getWriteableConfig(basicConfig, 'memory');
+    expect(config).toMatchInlineSnapshot(`
+      {
+        "api": {
+          "extraOrigins": "myextra.origins",
+          "version": "",
+        },
+        "connectionStatus": {
+          "minigraph": "PRE_INIT",
+          "upnpStatus": "Turned On",
+        },
+        "local": {
+          "sandbox": "no",
+        },
+        "remote": {
+          "accesstoken": "",
+          "allowedOrigins": "/var/run/unraid-notifications.sock, /var/run/unraid-php.sock, /var/run/unraid-cli.sock, https://connect.myunraid.net, https://connect-staging.myunraid.net, https://dev-my.myunraid.net:4000",
+          "apikey": "",
+          "avatar": "",
+          "dynamicRemoteAccessType": "DISABLED",
+          "email": "",
+          "idtoken": "",
+          "localApiKey": "",
+          "refreshtoken": "",
+          "regWizTime": "",
+          "ssoSubIds": "",
+          "upnpEnabled": "yes",
+          "username": "",
+          "wanaccess": "",
+          "wanport": "",
+        },
+      }
+    `);
+});
--- a/api/src/test/core/utils/misc/get-key-file.test.ts
+++ b/api/src/test/core/utils/misc/get-key-file.test.ts
@@ -1,12 +1,11 @@
-import { expect, test, vi } from 'vitest';
+import { expect, test } from 'vitest';

 import { store } from '@app/store/index.js';
 import { FileLoadStatus, StateFileKey } from '@app/store/types.js';

+import '@app/core/utils/misc/get-key-file.js';
 import '@app/store/modules/emhttp.js';

-vi.mock('fs/promises');
-
 test('Before loading key returns null', async () => {
    const { getKeyFile } = await import('@app/core/utils/misc/get-key-file.js');
    const { status } = store.getState().registration;
@@ -49,70 +48,21 @@ test('Returns empty key if key location is empty', async () => {
    await expect(getKeyFile()).resolves.toBe('');
 });

-test('Returns empty string when key file does not exist (ENOENT)', async () => {
-    const { readFile } = await import('fs/promises');
-
-    // Mock readFile to throw ENOENT error
-    const readFileMock = vi.mocked(readFile);
-    readFileMock.mockRejectedValueOnce(
-        Object.assign(new Error('ENOENT: no such file or directory'), { code: 'ENOENT' })
-    );
-
-    // Clear the module cache and re-import to get fresh module with mock
-    vi.resetModules();
-    const { getKeyFile } = await import('@app/core/utils/misc/get-key-file.js');
-    const { updateEmhttpState } = await import('@app/store/modules/emhttp.js');
-    const { store: freshStore } = await import('@app/store/index.js');
-
-    // Set key file location to a non-existent file
-    freshStore.dispatch(
-        updateEmhttpState({
-            field: StateFileKey.var,
-            state: {
-                regFile: '/boot/config/Pro.key',
-            },
-        })
-    );
-
-    // Should return empty string when file doesn't exist
-    await expect(getKeyFile()).resolves.toBe('');
-
-    // Clear mock
-    readFileMock.mockReset();
-    vi.resetModules();
-});
-
-test('Returns decoded key file if key location exists', async () => {
-    const { readFile } = await import('fs/promises');
-
-    // Mock a valid key file content
-    const mockKeyContent =
-        'hVs1tLjvC9FiiQsIwIQ7G1KszAcexf0IneThhnmf22SB0dGs5WzRkqMiSMmt2DtR5HOXFUD32YyxuzGeUXmky3zKpSu6xhZNKVg5atGM1OfvkzHBMldI3SeBLuUFSgejLbpNUMdTrbk64JJdbzle4O8wiQgkIpAMIGxeYLwLBD4zHBcfyzq40QnxG--HcX6j25eE0xqa2zWj-j0b0rCAXahJV2a3ySCbPzr1MvfPRTVb0rr7KJ-25R592hYrz4H7Sc1B3p0lr6QUxHE6o7bcYrWKDRtIVoZ8SMPpd1_0gzYIcl5GsDFzFumTXUh8NEnl0Q8hwW1YE-tRc6Y_rrvd7w==';
-    const binaryContent = Buffer.from(mockKeyContent, 'base64').toString('binary');
-
-    const readFileMock = vi.mocked(readFile);
-    readFileMock.mockResolvedValue(binaryContent);
-
-    // Clear the module cache and re-import to get fresh module with mock
-    vi.resetModules();
-    const { getKeyFile } = await import('@app/core/utils/misc/get-key-file.js');
-    const { loadStateFiles } = await import('@app/store/modules/emhttp.js');
-    const { loadRegistrationKey } = await import('@app/store/modules/registration.js');
-    const { store: freshStore } = await import('@app/store/index.js');
-
-    // Load state files into store
-    await freshStore.dispatch(loadStateFiles());
-    await freshStore.dispatch(loadRegistrationKey());
-    // Check if store has state files loaded
-    const { status } = freshStore.getState().registration;
-    expect(status).toBe(FileLoadStatus.LOADED);
-
-    const result = await getKeyFile();
-    expect(result).toBe(
-        'hVs1tLjvC9FiiQsIwIQ7G1KszAcexf0IneThhnmf22SB0dGs5WzRkqMiSMmt2DtR5HOXFUD32YyxuzGeUXmky3zKpSu6xhZNKVg5atGM1OfvkzHBMldI3SeBLuUFSgejLbpNUMdTrbk64JJdbzle4O8wiQgkIpAMIGxeYLwLBD4zHBcfyzq40QnxG--HcX6j25eE0xqa2zWj-j0b0rCAXahJV2a3ySCbPzr1MvfPRTVb0rr7KJ-25R592hYrz4H7Sc1B3p0lr6QUxHE6o7bcYrWKDRtIVoZ8SMPpd1_0gzYIcl5GsDFzFumTXUh8NEnl0Q8hwW1YE-tRc6Y_rrvd7w'
-    );
-
-    // Clear mock
-    readFileMock.mockReset();
-    vi.resetModules();
-}, 10000);
+test(
+    'Returns decoded key file if key location exists',
+    async () => {
+        const { getKeyFile } = await import('@app/core/utils/misc/get-key-file.js');
+        const { loadStateFiles } = await import('@app/store/modules/emhttp.js');
+        const { loadRegistrationKey } = await import('@app/store/modules/registration.js');
+        // Load state files into store
+        await store.dispatch(loadStateFiles());
+        await store.dispatch(loadRegistrationKey());
+        // Check if store has state files loaded
+        const { status } = store.getState().registration;
+        expect(status).toBe(FileLoadStatus.LOADED);
+        await expect(getKeyFile()).resolves.toMatchInlineSnapshot(
+            '"hVs1tLjvC9FiiQsIwIQ7G1KszAcexf0IneThhnmf22SB0dGs5WzRkqMiSMmt2DtR5HOXFUD32YyxuzGeUXmky3zKpSu6xhZNKVg5atGM1OfvkzHBMldI3SeBLuUFSgejLbpNUMdTrbk64JJdbzle4O8wiQgkIpAMIGxeYLwLBD4zHBcfyzq40QnxG--HcX6j25eE0xqa2zWj-j0b0rCAXahJV2a3ySCbPzr1MvfPRTVb0rr7KJ-25R592hYrz4H7Sc1B3p0lr6QUxHE6o7bcYrWKDRtIVoZ8SMPpd1_0gzYIcl5GsDFzFumTXUh8NEnl0Q8hwW1YE-tRc6Y_rrvd7w"'
+        );
+    },
+    { timeout: 10000 }
+);
--- a/api/src/test/core/utils/pm2/dummy-process.js
+++ b/api/src/test/core/utils/pm2/dummy-process.js
@@ -1,5 +0,0 @@
-/* eslint-disable no-undef */
-// Dummy process for PM2 testing
-setInterval(() => {
-    // Keep process alive
-}, 1000);
--- a/api/src/test/core/utils/pm2/unraid-api-running.integration.test.ts
+++ b/api/src/test/core/utils/pm2/unraid-api-running.integration.test.ts
@@ -1,222 +0,0 @@
-import { existsSync } from 'node:fs';
-import { homedir } from 'node:os';
-import { join } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-import { execa } from 'execa';
-import pm2 from 'pm2';
-import { afterAll, afterEach, beforeAll, describe, expect, it } from 'vitest';
-
-import { isUnraidApiRunning } from '@app/core/utils/pm2/unraid-api-running.js';
-
-const __dirname = fileURLToPath(new URL('.', import.meta.url));
-const PROJECT_ROOT = join(__dirname, '../../../../..');
-const DUMMY_PROCESS_PATH = join(__dirname, 'dummy-process.js');
-const CLI_PATH = join(PROJECT_ROOT, 'dist/cli.js');
-const TEST_PROCESS_NAME = 'test-unraid-api';
-
-// Shared PM2 connection state
-let pm2Connected = false;
-
-// Helper to ensure PM2 connection is established
-async function ensurePM2Connection() {
-    if (pm2Connected) return;
-
-    return new Promise<void>((resolve, reject) => {
-        pm2.connect((err) => {
-            if (err) {
-                reject(err);
-                return;
-            }
-            pm2Connected = true;
-            resolve();
-        });
-    });
-}
-
-// Helper to delete specific test processes (lightweight, reuses connection)
-async function deleteTestProcesses() {
-    if (!pm2Connected) {
-        // No connection, nothing to clean up
-        return;
-    }
-
-    const deletePromise = new Promise<void>((resolve) => {
-        // Delete specific processes we might have created
-        const processNames = ['unraid-api', TEST_PROCESS_NAME];
-        let deletedCount = 0;
-
-        const deleteNext = () => {
-            if (deletedCount >= processNames.length) {
-                resolve();
-                return;
-            }
-
-            const processName = processNames[deletedCount];
-            pm2.delete(processName, () => {
-                // Ignore errors, process might not exist
-                deletedCount++;
-                deleteNext();
-            });
-        };
-
-        deleteNext();
-    });
-
-    const timeoutPromise = new Promise<void>((resolve) => {
-        setTimeout(() => resolve(), 3000); // 3 second timeout
-    });
-
-    return Promise.race([deletePromise, timeoutPromise]);
-}
-
-// Helper to ensure PM2 is completely clean (heavy cleanup with daemon kill)
-async function cleanupAllPM2Processes() {
-    // First delete test processes if we have a connection
-    if (pm2Connected) {
-        await deleteTestProcesses();
-    }
-
-    return new Promise<void>((resolve) => {
-        // Always connect fresh for daemon kill (in case we weren't connected)
-        pm2.connect((err) => {
-            if (err) {
-                // If we can't connect, assume PM2 is not running
-                pm2Connected = false;
-                resolve();
-                return;
-            }
-
-            // Kill the daemon to ensure fresh state
-            pm2.killDaemon(() => {
-                pm2.disconnect();
-                pm2Connected = false;
-                // Small delay to let PM2 fully shutdown
-                setTimeout(resolve, 500);
-            });
-        });
-    });
-}
-
-describe.skipIf(!!process.env.CI)('PM2 integration tests', () => {
-    beforeAll(async () => {
-        // Set PM2_HOME to use home directory for testing (not /var/log)
-        process.env.PM2_HOME = join(homedir(), '.pm2');
-
-        // Build the CLI if it doesn't exist (only for CLI tests)
-        if (!existsSync(CLI_PATH)) {
-            console.log('Building CLI for integration tests...');
-            try {
-                await execa('pnpm', ['build'], {
-                    cwd: PROJECT_ROOT,
-                    stdio: 'inherit',
-                    timeout: 120000, // 2 minute timeout for build
-                });
-            } catch (error) {
-                console.error('Failed to build CLI:', error);
-                throw new Error(
-                    'Cannot run CLI integration tests without built CLI. Run `pnpm build` first.'
-                );
-            }
-        }
-
-        // Only do a full cleanup once at the beginning
-        await cleanupAllPM2Processes();
-    }, 150000); // 2.5 minute timeout for setup
-
-    afterAll(async () => {
-        // Only do a full cleanup once at the end
-        await cleanupAllPM2Processes();
-    });
-
-    afterEach(async () => {
-        // Lightweight cleanup after each test - just delete our test processes
-        await deleteTestProcesses();
-    }, 5000); // 5 second timeout for cleanup
-
-    describe('isUnraidApiRunning function', () => {
-        it('should return false when PM2 is not running the unraid-api process', async () => {
-            const result = await isUnraidApiRunning();
-            expect(result).toBe(false);
-        });
-
-        it('should return true when PM2 has unraid-api process running', async () => {
-            // Ensure PM2 connection
-            await ensurePM2Connection();
-
-            // Start a dummy process with the name 'unraid-api'
-            await new Promise<void>((resolve, reject) => {
-                pm2.start(
-                    {
-                        script: DUMMY_PROCESS_PATH,
-                        name: 'unraid-api',
-                    },
-                    (startErr) => {
-                        if (startErr) return reject(startErr);
-                        resolve();
-                    }
-                );
-            });
-
-            // Give PM2 time to start the process
-            await new Promise((resolve) => setTimeout(resolve, 2000));
-
-            const result = await isUnraidApiRunning();
-            expect(result).toBe(true);
-        }, 30000);
-
-        it('should return false when unraid-api process is stopped', async () => {
-            // Ensure PM2 connection
-            await ensurePM2Connection();
-
-            // Start and then stop the process
-            await new Promise<void>((resolve, reject) => {
-                pm2.start(
-                    {
-                        script: DUMMY_PROCESS_PATH,
-                        name: 'unraid-api',
-                    },
-                    (startErr) => {
-                        if (startErr) return reject(startErr);
-
-                        // Stop the process after starting
-                        setTimeout(() => {
-                            pm2.stop('unraid-api', (stopErr) => {
-                                if (stopErr) return reject(stopErr);
-                                resolve();
-                            });
-                        }, 1000);
-                    }
-                );
-            });
-
-            await new Promise((resolve) => setTimeout(resolve, 1000));
-
-            const result = await isUnraidApiRunning();
-            expect(result).toBe(false);
-        }, 30000);
-
-        it('should handle PM2 connection errors gracefully', async () => {
-            // Disconnect PM2 first to ensure we're testing fresh connection
-            await new Promise<void>((resolve) => {
-                pm2.disconnect();
-                pm2Connected = false;
-                setTimeout(resolve, 100);
-            });
-
-            // Set an invalid PM2_HOME to force connection failure
-            const originalPM2Home = process.env.PM2_HOME;
-            process.env.PM2_HOME = '/invalid/path/that/does/not/exist';
-
-            const result = await isUnraidApiRunning();
-            expect(result).toBe(false);
-
-            // Restore original PM2_HOME
-            if (originalPM2Home) {
-                process.env.PM2_HOME = originalPM2Home;
-            } else {
-                delete process.env.PM2_HOME;
-            }
-        }, 15000); // 15 second timeout to allow for the Promise.race timeout
-    });
-});
--- a/api/src/test/core/utils/shares/get-shares.test.ts
+++ b/api/src/test/core/utils/shares/get-shares.test.ts
@@ -95,48 +95,6 @@ test('Returns both disk and user shares', async () => {
            "type": "user",
            "used": 33619300,
          },
-          {
-            "allocator": "highwater",
-            "cachePool": "cache",
-            "color": "yellow-on",
-            "comment": "system data with periods",
-            "cow": "auto",
-            "exclude": [],
-            "floor": "0",
-            "free": 9309372,
-            "id": "system.with.periods",
-            "include": [],
-            "luksStatus": "0",
-            "name": "system.with.periods",
-            "nameOrig": "system.with.periods",
-            "nfs": {},
-            "size": 0,
-            "smb": {},
-            "splitLevel": "1",
-            "type": "user",
-            "used": 33619300,
-          },
-          {
-            "allocator": "highwater",
-            "cachePool": "cache",
-            "color": "yellow-on",
-            "comment": "system data with 🚀",
-            "cow": "auto",
-            "exclude": [],
-            "floor": "0",
-            "free": 9309372,
-            "id": "system.with.🚀",
-            "include": [],
-            "luksStatus": "0",
-            "name": "system.with.🚀",
-            "nameOrig": "system.with.🚀",
-            "nfs": {},
-            "size": 0,
-            "smb": {},
-            "splitLevel": "1",
-            "type": "user",
-            "used": 33619300,
-          },
        ],
      }
    `);
@@ -253,48 +211,6 @@ test('Returns shares by type', async () => {
          "type": "user",
          "used": 33619300,
        },
-        {
-          "allocator": "highwater",
-          "cachePool": "cache",
-          "color": "yellow-on",
-          "comment": "system data with periods",
-          "cow": "auto",
-          "exclude": [],
-          "floor": "0",
-          "free": 9309372,
-          "id": "system.with.periods",
-          "include": [],
-          "luksStatus": "0",
-          "name": "system.with.periods",
-          "nameOrig": "system.with.periods",
-          "nfs": {},
-          "size": 0,
-          "smb": {},
-          "splitLevel": "1",
-          "type": "user",
-          "used": 33619300,
-        },
-        {
-          "allocator": "highwater",
-          "cachePool": "cache",
-          "color": "yellow-on",
-          "comment": "system data with 🚀",
-          "cow": "auto",
-          "exclude": [],
-          "floor": "0",
-          "free": 9309372,
-          "id": "system.with.🚀",
-          "include": [],
-          "luksStatus": "0",
-          "name": "system.with.🚀",
-          "nameOrig": "system.with.🚀",
-          "nfs": {},
-          "size": 0,
-          "smb": {},
-          "splitLevel": "1",
-          "type": "user",
-          "used": 33619300,
-        },
      ]
    `);
    expect(getShares('disk')).toMatchInlineSnapshot('null');
--- a/api/src/test/graphql/resolvers/rclone-api.service.test.ts
+++ b/api/src/test/graphql/resolvers/rclone-api.service.test.ts
@@ -12,22 +12,7 @@ import {
    UpdateRCloneRemoteDto,
 } from '@app/unraid-api/graph/resolvers/rclone/rclone.model.js';

-vi.mock('got', () => {
-    const mockPost = vi.fn();
-    const gotMock = {
-        post: mockPost,
-    };
-    return {
-        default: gotMock,
-        HTTPError: class HTTPError extends Error {
-            response?: any;
-            constructor(response?: any) {
-                super('HTTP Error');
-                this.response = response;
-            }
-        },
-    };
-});
+vi.mock('got');
 vi.mock('execa');
 vi.mock('p-retry');
 vi.mock('node:fs', () => ({
@@ -49,15 +34,6 @@ vi.mock('@app/store/index.js', () => ({
        }),
    },
 }));
-vi.mock('@app/environment.js', () => ({
-    ENVIRONMENT: 'development',
-    environment: {
-        IS_MAIN_PROCESS: true,
-    },
-}));
-vi.mock('@app/core/utils/files/file-exists.js', () => ({
-    fileExists: vi.fn().mockResolvedValue(true),
-}));

 // Mock NestJS Logger to suppress logs during tests
 vi.mock('@nestjs/common', async (importOriginal) => {
@@ -75,7 +51,7 @@ vi.mock('@nestjs/common', async (importOriginal) => {

 describe('RCloneApiService', () => {
    let service: RCloneApiService;
-    let mockGotPost: any;
+    let mockGot: any;
    let mockExeca: any;
    let mockPRetry: any;
    let mockExistsSync: any;
@@ -83,26 +59,17 @@ describe('RCloneApiService', () => {
    beforeEach(async () => {
        vi.clearAllMocks();

-        const got = await import('got');
+        const { default: got } = await import('got');
        const { execa } = await import('execa');
        const pRetry = await import('p-retry');
        const { existsSync } = await import('node:fs');
-        const { fileExists } = await import('@app/core/utils/files/file-exists.js');

-        mockGotPost = vi.mocked(got.default.post);
+        mockGot = vi.mocked(got);
        mockExeca = vi.mocked(execa);
        mockPRetry = vi.mocked(pRetry.default);
        mockExistsSync = vi.mocked(existsSync);

-        // Mock successful RClone API response for socket check
-        mockGotPost.mockResolvedValue({ body: { pid: 12345 } });
-
-        // Mock RClone binary exists check
-        vi.mocked(fileExists).mockResolvedValue(true);
-
-        // Mock socket exists
-        mockExistsSync.mockReturnValue(true);
-
+        mockGot.post = vi.fn().mockResolvedValue({ body: {} });
        mockExeca.mockReturnValue({
            on: vi.fn(),
            kill: vi.fn(),
@@ -110,12 +77,10 @@ describe('RCloneApiService', () => {
            pid: 12345,
        } as any);
        mockPRetry.mockResolvedValue(undefined);
+        mockExistsSync.mockReturnValue(false);

        service = new RCloneApiService();
-        await service.onApplicationBootstrap();
-
-        // Reset the mock after initialization to prepare for test-specific responses
-        mockGotPost.mockClear();
+        await service.onModuleInit();
    });

    describe('getProviders', () => {
@@ -124,28 +89,25 @@ describe('RCloneApiService', () => {
                { name: 'aws', prefix: 's3', description: 'Amazon S3' },
                { name: 'google', prefix: 'drive', description: 'Google Drive' },
            ];
-            mockGotPost.mockResolvedValue({
+            mockGot.post.mockResolvedValue({
                body: { providers: mockProviders },
            });

            const result = await service.getProviders();

            expect(result).toEqual(mockProviders);
-            expect(mockGotPost).toHaveBeenCalledWith(
-                expect.stringMatching(/\/config\/providers$/),
+            expect(mockGot.post).toHaveBeenCalledWith(
+                'http://unix:/tmp/rclone.sock:/config/providers',
                expect.objectContaining({
                    json: {},
                    responseType: 'json',
                    enableUnixSockets: true,
-                    headers: expect.objectContaining({
-                        Authorization: expect.stringMatching(/^Basic /),
-                    }),
                })
            );
        });

        it('should return empty array when no providers', async () => {
-            mockGotPost.mockResolvedValue({ body: {} });
+            mockGot.post.mockResolvedValue({ body: {} });

            const result = await service.getProviders();

@@ -156,28 +118,23 @@ describe('RCloneApiService', () => {
    describe('listRemotes', () => {
        it('should return list of remotes', async () => {
            const mockRemotes = ['backup-s3', 'drive-storage'];
-            mockGotPost.mockResolvedValue({
+            mockGot.post.mockResolvedValue({
                body: { remotes: mockRemotes },
            });

            const result = await service.listRemotes();

            expect(result).toEqual(mockRemotes);
-            expect(mockGotPost).toHaveBeenCalledWith(
-                expect.stringMatching(/\/config\/listremotes$/),
+            expect(mockGot.post).toHaveBeenCalledWith(
+                'http://unix:/tmp/rclone.sock:/config/listremotes',
                expect.objectContaining({
                    json: {},
-                    responseType: 'json',
-                    enableUnixSockets: true,
-                    headers: expect.objectContaining({
-                        Authorization: expect.stringMatching(/^Basic /),
-                    }),
                })
            );
        });

        it('should return empty array when no remotes', async () => {
-            mockGotPost.mockResolvedValue({ body: {} });
+            mockGot.post.mockResolvedValue({ body: {} });

            const result = await service.listRemotes();

@@ -189,20 +146,15 @@ describe('RCloneApiService', () => {
        it('should return remote details', async () => {
            const input: GetRCloneRemoteDetailsDto = { name: 'test-remote' };
            const mockConfig = { type: 's3', provider: 'AWS' };
-            mockGotPost.mockResolvedValue({ body: mockConfig });
+            mockGot.post.mockResolvedValue({ body: mockConfig });

            const result = await service.getRemoteDetails(input);

            expect(result).toEqual(mockConfig);
-            expect(mockGotPost).toHaveBeenCalledWith(
-                expect.stringMatching(/\/config\/get$/),
+            expect(mockGot.post).toHaveBeenCalledWith(
+                'http://unix:/tmp/rclone.sock:/config/get',
                expect.objectContaining({
                    json: { name: 'test-remote' },
-                    responseType: 'json',
-                    enableUnixSockets: true,
-                    headers: expect.objectContaining({
-                        Authorization: expect.stringMatching(/^Basic /),
-                    }),
                })
            );
        });
@@ -212,7 +164,7 @@ describe('RCloneApiService', () => {
        it('should return remote configuration', async () => {
            const input: GetRCloneRemoteConfigDto = { name: 'test-remote' };
            const mockConfig = { type: 's3', access_key_id: 'AKIA...' };
-            mockGotPost.mockResolvedValue({ body: mockConfig });
+            mockGot.post.mockResolvedValue({ body: mockConfig });

            const result = await service.getRemoteConfig(input);

@@ -228,24 +180,19 @@ describe('RCloneApiService', () => {
                parameters: { access_key_id: 'AKIA...', secret_access_key: 'secret' },
            };
            const mockResponse = { success: true };
-            mockGotPost.mockResolvedValue({ body: mockResponse });
+            mockGot.post.mockResolvedValue({ body: mockResponse });

            const result = await service.createRemote(input);

            expect(result).toEqual(mockResponse);
-            expect(mockGotPost).toHaveBeenCalledWith(
-                expect.stringMatching(/\/config\/create$/),
+            expect(mockGot.post).toHaveBeenCalledWith(
+                'http://unix:/tmp/rclone.sock:/config/create',
                expect.objectContaining({
                    json: {
                        name: 'new-remote',
                        type: 's3',
                        parameters: { access_key_id: 'AKIA...', secret_access_key: 'secret' },
                    },
-                    responseType: 'json',
-                    enableUnixSockets: true,
-                    headers: expect.objectContaining({
-                        Authorization: expect.stringMatching(/^Basic /),
-                    }),
                })
            );
        });
@@ -258,23 +205,18 @@ describe('RCloneApiService', () => {
                parameters: { access_key_id: 'NEW_AKIA...' },
            };
            const mockResponse = { success: true };
-            mockGotPost.mockResolvedValue({ body: mockResponse });
+            mockGot.post.mockResolvedValue({ body: mockResponse });

            const result = await service.updateRemote(input);

            expect(result).toEqual(mockResponse);
-            expect(mockGotPost).toHaveBeenCalledWith(
-                expect.stringMatching(/\/config\/update$/),
+            expect(mockGot.post).toHaveBeenCalledWith(
+                'http://unix:/tmp/rclone.sock:/config/update',
                expect.objectContaining({
                    json: {
                        name: 'existing-remote',
                        access_key_id: 'NEW_AKIA...',
                    },
-                    responseType: 'json',
-                    enableUnixSockets: true,
-                    headers: expect.objectContaining({
-                        Authorization: expect.stringMatching(/^Basic /),
-                    }),
                })
            );
        });
@@ -284,20 +226,15 @@ describe('RCloneApiService', () => {
        it('should delete a remote', async () => {
            const input: DeleteRCloneRemoteDto = { name: 'remote-to-delete' };
            const mockResponse = { success: true };
-            mockGotPost.mockResolvedValue({ body: mockResponse });
+            mockGot.post.mockResolvedValue({ body: mockResponse });

            const result = await service.deleteRemote(input);

            expect(result).toEqual(mockResponse);
-            expect(mockGotPost).toHaveBeenCalledWith(
-                expect.stringMatching(/\/config\/delete$/),
+            expect(mockGot.post).toHaveBeenCalledWith(
+                'http://unix:/tmp/rclone.sock:/config/delete',
                expect.objectContaining({
                    json: { name: 'remote-to-delete' },
-                    responseType: 'json',
-                    enableUnixSockets: true,
-                    headers: expect.objectContaining({
-                        Authorization: expect.stringMatching(/^Basic /),
-                    }),
                })
            );
        });
@@ -311,24 +248,19 @@ describe('RCloneApiService', () => {
                options: { delete_on: 'dst' },
            };
            const mockResponse = { jobid: 'job-123' };
-            mockGotPost.mockResolvedValue({ body: mockResponse });
+            mockGot.post.mockResolvedValue({ body: mockResponse });

            const result = await service.startBackup(input);

            expect(result).toEqual(mockResponse);
-            expect(mockGotPost).toHaveBeenCalledWith(
-                expect.stringMatching(/\/sync\/copy$/),
+            expect(mockGot.post).toHaveBeenCalledWith(
+                'http://unix:/tmp/rclone.sock:/sync/copy',
                expect.objectContaining({
                    json: {
                        srcFs: '/source/path',
                        dstFs: 'remote:backup/path',
                        delete_on: 'dst',
                    },
-                    responseType: 'json',
-                    enableUnixSockets: true,
-                    headers: expect.objectContaining({
-                        Authorization: expect.stringMatching(/^Basic /),
-                    }),
                })
            );
        });
@@ -338,20 +270,15 @@ describe('RCloneApiService', () => {
        it('should return job status', async () => {
            const input: GetRCloneJobStatusDto = { jobId: 'job-123' };
            const mockStatus = { status: 'running', progress: 0.5 };
-            mockGotPost.mockResolvedValue({ body: mockStatus });
+            mockGot.post.mockResolvedValue({ body: mockStatus });

            const result = await service.getJobStatus(input);

            expect(result).toEqual(mockStatus);
-            expect(mockGotPost).toHaveBeenCalledWith(
-                expect.stringMatching(/\/job\/status$/),
+            expect(mockGot.post).toHaveBeenCalledWith(
+                'http://unix:/tmp/rclone.sock:/job/status',
                expect.objectContaining({
                    json: { jobid: 'job-123' },
-                    responseType: 'json',
-                    enableUnixSockets: true,
-                    headers: expect.objectContaining({
-                        Authorization: expect.stringMatching(/^Basic /),
-                    }),
                })
            );
        });
@@ -363,20 +290,15 @@ describe('RCloneApiService', () => {
                { id: 'job-1', status: 'running' },
                { id: 'job-2', status: 'finished' },
            ];
-            mockGotPost.mockResolvedValue({ body: mockJobs });
+            mockGot.post.mockResolvedValue({ body: mockJobs });

            const result = await service.listRunningJobs();

            expect(result).toEqual(mockJobs);
-            expect(mockGotPost).toHaveBeenCalledWith(
-                expect.stringMatching(/\/job\/list$/),
+            expect(mockGot.post).toHaveBeenCalledWith(
+                'http://unix:/tmp/rclone.sock:/job/list',
                expect.objectContaining({
                    json: {},
-                    responseType: 'json',
-                    enableUnixSockets: true,
-                    headers: expect.objectContaining({
-                        Authorization: expect.stringMatching(/^Basic /),
-                    }),
                })
            );
        });
@@ -393,7 +315,7 @@ describe('RCloneApiService', () => {
                },
            };
            Object.setPrototypeOf(httpError, HTTPError.prototype);
-            mockGotPost.mockRejectedValue(httpError);
+            mockGot.post.mockRejectedValue(httpError);

            await expect(service.getProviders()).rejects.toThrow(
                'Rclone API Error (config/providers, HTTP 500): Rclone Error: Internal server error'
@@ -410,7 +332,7 @@ describe('RCloneApiService', () => {
                },
            };
            Object.setPrototypeOf(httpError, HTTPError.prototype);
-            mockGotPost.mockRejectedValue(httpError);
+            mockGot.post.mockRejectedValue(httpError);

            await expect(service.getProviders()).rejects.toThrow(
                'Rclone API Error (config/providers, HTTP 404): Failed to process error response body. Raw body:'
@@ -427,7 +349,7 @@ describe('RCloneApiService', () => {
                },
            };
            Object.setPrototypeOf(httpError, HTTPError.prototype);
-            mockGotPost.mockRejectedValue(httpError);
+            mockGot.post.mockRejectedValue(httpError);

            await expect(service.getProviders()).rejects.toThrow(
                'Rclone API Error (config/providers, HTTP 400): Failed to process error response body. Raw body: invalid json'
@@ -436,108 +358,17 @@ describe('RCloneApiService', () => {

        it('should handle non-HTTP errors', async () => {
            const networkError = new Error('Network connection failed');
-            mockGotPost.mockRejectedValue(networkError);
+            mockGot.post.mockRejectedValue(networkError);

            await expect(service.getProviders()).rejects.toThrow('Network connection failed');
        });

        it('should handle unknown errors', async () => {
-            mockGotPost.mockRejectedValue('unknown error');
+            mockGot.post.mockRejectedValue('unknown error');

            await expect(service.getProviders()).rejects.toThrow(
                'Unknown error calling RClone API (config/providers) with params {}: unknown error'
            );
        });
    });
-
-    describe('checkRcloneBinaryExists', () => {
-        beforeEach(() => {
-            // Create a new service instance without initializing for these tests
-            service = new RCloneApiService();
-        });
-
-        it('should return true when rclone version is 1.70.0', async () => {
-            mockExeca.mockResolvedValueOnce({
-                stdout: 'rclone v1.70.0\n- os/version: darwin 14.0 (64 bit)\n- os/kernel: 23.0.0 (arm64)',
-                stderr: '',
-            } as any);
-
-            const result = await (service as any).checkRcloneBinaryExists();
-
-            expect(result).toBe(true);
-        });
-
-        it('should return true when rclone version is newer than 1.70.0', async () => {
-            mockExeca.mockResolvedValueOnce({
-                stdout: 'rclone v1.75.2\n- os/version: darwin 14.0 (64 bit)\n- os/kernel: 23.0.0 (arm64)',
-                stderr: '',
-            } as any);
-
-            const result = await (service as any).checkRcloneBinaryExists();
-
-            expect(result).toBe(true);
-        });
-
-        it('should return false when rclone version is older than 1.70.0', async () => {
-            mockExeca.mockResolvedValueOnce({
-                stdout: 'rclone v1.69.0\n- os/version: darwin 14.0 (64 bit)\n- os/kernel: 23.0.0 (arm64)',
-                stderr: '',
-            } as any);
-
-            const result = await (service as any).checkRcloneBinaryExists();
-
-            expect(result).toBe(false);
-        });
-
-        it('should return false when rclone version is much older', async () => {
-            mockExeca.mockResolvedValueOnce({
-                stdout: 'rclone v1.50.0\n- os/version: darwin 14.0 (64 bit)\n- os/kernel: 23.0.0 (arm64)',
-                stderr: '',
-            } as any);
-
-            const result = await (service as any).checkRcloneBinaryExists();
-
-            expect(result).toBe(false);
-        });
-
-        it('should return false when version cannot be parsed', async () => {
-            mockExeca.mockResolvedValueOnce({
-                stdout: 'rclone unknown version format',
-                stderr: '',
-            } as any);
-
-            const result = await (service as any).checkRcloneBinaryExists();
-
-            expect(result).toBe(false);
-        });
-
-        it('should return false when rclone binary is not found', async () => {
-            const error = new Error('Command not found') as any;
-            error.code = 'ENOENT';
-            mockExeca.mockRejectedValueOnce(error);
-
-            const result = await (service as any).checkRcloneBinaryExists();
-
-            expect(result).toBe(false);
-        });
-
-        it('should return false and log error for other exceptions', async () => {
-            mockExeca.mockRejectedValueOnce(new Error('Some other error'));
-
-            const result = await (service as any).checkRcloneBinaryExists();
-
-            expect(result).toBe(false);
-        });
-
-        it('should handle beta/rc versions correctly', async () => {
-            mockExeca.mockResolvedValueOnce({
-                stdout: 'rclone v1.70.0-beta.1\n- os/version: darwin 14.0 (64 bit)\n- os/kernel: 23.0.0 (arm64)',
-                stderr: '',
-            } as any);
-
-            const result = await (service as any).checkRcloneBinaryExists();
-
-            expect(result).toBe(true);
-        });
-    });
 });
--- a/api/src/test/setup.ts
+++ b/api/src/test/setup.ts
@@ -3,7 +3,6 @@ import '@app/__test__/setup/env-setup.js';
 import '@app/__test__/setup/keyserver-mock.js';
 import '@app/__test__/setup/config-setup.js';
 import '@app/__test__/setup/store-reset.js';
-import '@app/__test__/setup/api-json-backup.js';

 // This file is automatically loaded by Vitest before running tests
 // It imports all the setup files that need to be run before tests
--- a/api/src/test/setup/api-json-backup.ts
+++ b/api/src/test/setup/api-json-backup.ts
@@ -1,36 +0,0 @@
-import { existsSync, readFileSync, writeFileSync } from 'fs';
-import { join, resolve } from 'path';
-
-import { afterAll, beforeAll } from 'vitest';
-
-// Get the project root directory
-const projectRoot = resolve(process.cwd());
-const apiJsonPath = join(projectRoot, 'dev/configs/api.json');
-const apiJsonBackupPath = join(projectRoot, 'dev/configs/api.json.backup');
-
-let originalContent: string | null = null;
-
-/**
- * Backs up api.json before tests run and restores it after tests complete.
- * This prevents tests from permanently modifying the development configuration.
- */
-export function setupApiJsonBackup() {
-    beforeAll(() => {
-        // Save the original content if the file exists
-        if (existsSync(apiJsonPath)) {
-            originalContent = readFileSync(apiJsonPath, 'utf-8');
-            // Create a backup file as well for safety
-            writeFileSync(apiJsonBackupPath, originalContent, 'utf-8');
-        }
-    });
-
-    afterAll(() => {
-        // Restore the original content if we saved it
-        if (originalContent !== null) {
-            writeFileSync(apiJsonPath, originalContent, 'utf-8');
-        }
-    });
-}
-
-// Auto-run for all tests that import this module
-setupApiJsonBackup();
--- a/api/src/test/store/modules/snapshots/paths.test.ts.snap
+++ b/api/src/test/store/modules/snapshots/paths.test.ts.snap
@@ -17,6 +17,7 @@ exports[`Returns paths 1`] = `
  "myservers-base",
  "myservers-config",
  "myservers-config-states",
+  "myservers-env",
  "myservers-keepalive",
  "keyfile-base",
  "machine-id",
--- a/api/src/test/store/modules/config.test.ts
+++ b/api/src/test/store/modules/config.test.ts
@@ -0,0 +1,303 @@
+import { beforeEach, describe, expect, test, vi } from 'vitest';
+
+import { pubsub, PUBSUB_CHANNEL } from '@app/core/pubsub.js';
+import { store } from '@app/store/index.js';
+import { MyServersConfigMemory } from '@app/types/my-servers-config.js';
+
+describe.skip('config tests', () => {
+    // Mock dependencies
+    vi.mock('@app/core/pubsub.js', () => {
+        const mockPublish = vi.fn();
+        return {
+            pubsub: {
+                publish: mockPublish,
+            },
+            PUBSUB_CHANNEL: {
+                OWNER: 'OWNER',
+                SERVERS: 'SERVERS',
+            },
+            __esModule: true,
+            default: {
+                pubsub: {
+                    publish: mockPublish,
+                },
+                PUBSUB_CHANNEL: {
+                    OWNER: 'OWNER',
+                    SERVERS: 'SERVERS',
+                },
+            },
+        };
+    });
+
+    // Get the mock function for pubsub.publish
+    const mockPublish = vi.mocked(pubsub.publish);
+
+    // Clear mock before each test
+    beforeEach(() => {
+        mockPublish.mockClear();
+    });
+
+    vi.mock('@app/mothership/graphql-client.js', () => ({
+        GraphQLClient: {
+            clearInstance: vi.fn(),
+        },
+    }));
+
+    vi.mock('@app/mothership/jobs/ping-timeout-jobs.js', () => ({
+        stopPingTimeoutJobs: vi.fn(),
+    }));
+
+    const createConfigMatcher = (specificValues: Partial<MyServersConfigMemory> = {}) => {
+        const defaultMatcher = {
+            api: expect.objectContaining({
+                extraOrigins: expect.any(String),
+                version: expect.any(String),
+            }),
+            connectionStatus: expect.objectContaining({
+                minigraph: expect.any(String),
+                upnpStatus: expect.any(String),
+            }),
+            local: expect.objectContaining({
+                sandbox: expect.any(String),
+            }),
+            nodeEnv: expect.any(String),
+            remote: expect.objectContaining({
+                accesstoken: expect.any(String),
+                allowedOrigins: expect.any(String),
+                apikey: expect.any(String),
+                avatar: expect.any(String),
+                dynamicRemoteAccessType: expect.any(String),
+                email: expect.any(String),
+                idtoken: expect.any(String),
+                localApiKey: expect.any(String),
+                refreshtoken: expect.any(String),
+                regWizTime: expect.any(String),
+                ssoSubIds: expect.any(String),
+                upnpEnabled: expect.any(String),
+                username: expect.any(String),
+                wanaccess: expect.any(String),
+                wanport: expect.any(String),
+            }),
+            status: expect.any(String),
+        };
+
+        return expect.objectContaining({
+            ...defaultMatcher,
+            ...specificValues,
+        });
+    };
+
+    // test('Before init returns default values for all fields', async () => {
+    //     const state = store.getState().config;
+    //     expect(state).toMatchSnapshot();
+    // }, 10_000);
+
+    test('After init returns values from cfg file for all fields', async () => {
+        const { loadConfigFile } = await import('@app/store/modules/config.js');
+
+        // Load cfg into store
+        await store.dispatch(loadConfigFile());
+
+        // Check if store has cfg contents loaded
+        const state = store.getState().config;
+        expect(state).toMatchObject(createConfigMatcher());
+    });
+
+    test('updateUserConfig merges in changes to current state', async () => {
+        const { loadConfigFile, updateUserConfig } = await import('@app/store/modules/config.js');
+
+        // Load cfg into store
+        await store.dispatch(loadConfigFile());
+
+        // Update store
+        store.dispatch(
+            updateUserConfig({
+                remote: { avatar: 'https://via.placeholder.com/200' },
+            })
+        );
+
+        const state = store.getState().config;
+        expect(state).toMatchObject(
+            createConfigMatcher({
+                remote: expect.objectContaining({
+                    avatar: 'https://via.placeholder.com/200',
+                }),
+            })
+        );
+    });
+
+    test('loginUser updates state and publishes to pubsub', async () => {
+        const { loginUser } = await import('@app/store/modules/config.js');
+        const userInfo = {
+            email: 'test@example.com',
+            avatar: 'https://via.placeholder.com/200',
+            username: 'testuser',
+            apikey: 'test-api-key',
+            localApiKey: 'test-local-api-key',
+        };
+
+        await store.dispatch(loginUser(userInfo));
+
+        expect(pubsub.publish).toHaveBeenCalledWith(PUBSUB_CHANNEL.OWNER, {
+            owner: {
+                username: userInfo.username,
+                url: '',
+                avatar: userInfo.avatar,
+            },
+        });
+
+        const state = store.getState().config;
+        expect(state).toMatchObject(
+            createConfigMatcher({
+                remote: expect.objectContaining(userInfo),
+            })
+        );
+    });
+
+    test('logoutUser clears state and publishes to pubsub', async () => {
+        const { logoutUser } = await import('@app/store/modules/config.js');
+
+        await store.dispatch(logoutUser({ reason: 'test logout' }));
+
+        expect(pubsub.publish).toHaveBeenCalledWith(PUBSUB_CHANNEL.SERVERS, { servers: [] });
+        expect(pubsub.publish).toHaveBeenCalledWith(PUBSUB_CHANNEL.OWNER, {
+            owner: {
+                username: 'root',
+                url: '',
+                avatar: '',
+            },
+        });
+        // expect(stopPingTimeoutJobs).toHaveBeenCalled();
+        // expect(GraphQLClient.clearInstance).toHaveBeenCalled();
+    });
+
+    test('updateAccessTokens updates token fields', async () => {
+        const { updateAccessTokens } = await import('@app/store/modules/config.js');
+        const tokens = {
+            accesstoken: 'new-access-token',
+            refreshtoken: 'new-refresh-token',
+            idtoken: 'new-id-token',
+        };
+
+        store.dispatch(updateAccessTokens(tokens));
+
+        const state = store.getState().config;
+        expect(state).toMatchObject(
+            createConfigMatcher({
+                remote: expect.objectContaining(tokens),
+            })
+        );
+    });
+
+    test('updateAllowedOrigins updates extraOrigins', async () => {
+        const { updateAllowedOrigins } = await import('@app/store/modules/config.js');
+        const origins = ['https://test1.com', 'https://test2.com'];
+
+        store.dispatch(updateAllowedOrigins(origins));
+
+        const state = store.getState().config;
+        expect(state.api.extraOrigins).toBe(origins.join(', '));
+    });
+
+    test('setUpnpState updates upnp settings', async () => {
+        const { setUpnpState } = await import('@app/store/modules/config.js');
+
+        store.dispatch(setUpnpState({ enabled: 'yes', status: 'active' }));
+
+        const state = store.getState().config;
+        expect(state.remote.upnpEnabled).toBe('yes');
+        expect(state.connectionStatus.upnpStatus).toBe('active');
+    });
+
+    test('setWanPortToValue updates wanport', async () => {
+        const { setWanPortToValue } = await import('@app/store/modules/config.js');
+
+        store.dispatch(setWanPortToValue(8443));
+
+        const state = store.getState().config;
+        expect(state.remote.wanport).toBe('8443');
+    });
+
+    test('setWanAccess updates wanaccess', async () => {
+        const { setWanAccess } = await import('@app/store/modules/config.js');
+
+        store.dispatch(setWanAccess('yes'));
+
+        const state = store.getState().config;
+        expect(state.remote.wanaccess).toBe('yes');
+    });
+
+    // test('addSsoUser adds user to ssoSubIds', async () => {
+    //     const { addSsoUser } = await import('@app/store/modules/config.js');
+
+    //     store.dispatch(addSsoUser('user1'));
+    //     store.dispatch(addSsoUser('user2'));
+
+    //     const state = store.getState().config;
+    //     expect(state.remote.ssoSubIds).toBe('user1,user2');
+    // });
+
+    // test('removeSsoUser removes user from ssoSubIds', async () => {
+    //     const { addSsoUser, removeSsoUser } = await import('@app/store/modules/config.js');
+
+    //     store.dispatch(addSsoUser('user1'));
+    //     store.dispatch(addSsoUser('user2'));
+    //     store.dispatch(removeSsoUser('user1'));
+
+    //     const state = store.getState().config;
+    //     expect(state.remote.ssoSubIds).toBe('user2');
+    // });
+
+    // test('removeSsoUser with null clears all ssoSubIds', async () => {
+    //     const { addSsoUser, removeSsoUser } = await import('@app/store/modules/config.js');
+
+    //     store.dispatch(addSsoUser('user1'));
+    //     store.dispatch(addSsoUser('user2'));
+    //     store.dispatch(removeSsoUser(null));
+
+    //     const state = store.getState().config;
+    //     expect(state.remote.ssoSubIds).toBe('');
+    // });
+
+    test('setLocalApiKey updates localApiKey', async () => {
+        const { setLocalApiKey } = await import('@app/store/modules/config.js');
+
+        store.dispatch(setLocalApiKey('new-local-api-key'));
+
+        const state = store.getState().config;
+        expect(state.remote.localApiKey).toBe('new-local-api-key');
+    });
+
+    test('setLocalApiKey with null clears localApiKey', async () => {
+        const { setLocalApiKey } = await import('@app/store/modules/config.js');
+
+        store.dispatch(setLocalApiKey(null));
+
+        const state = store.getState().config;
+        expect(state.remote.localApiKey).toBe('');
+    });
+
+    // test('setGraphqlConnectionStatus updates minigraph status', async () => {
+    //     store.dispatch(setGraphqlConnectionStatus({ status: MinigraphStatus.CONNECTED, error: null }));
+
+    //     const state = store.getState().config;
+    //     expect(state.connectionStatus.minigraph).toBe(MinigraphStatus.CONNECTED);
+    // });
+
+    // test('setupRemoteAccessThunk.fulfilled updates remote access settings', async () => {
+    //     const remoteAccessSettings = {
+    //         accessType: WAN_ACCESS_TYPE.DYNAMIC,
+    //         forwardType: WAN_FORWARD_TYPE.UPNP,
+    //     };
+
+    //     await store.dispatch(setupRemoteAccessThunk(remoteAccessSettings));
+
+    //     const state = store.getState().config;
+    //     expect(state.remote).toMatchObject({
+    //         wanaccess: 'no',
+    //         dynamicRemoteAccessType: 'UPNP',
+    //         wanport: '',
+    //         upnpEnabled: 'yes',
+    //     });
+    // });
+});
--- a/api/src/test/store/modules/emhttp.test.ts
+++ b/api/src/test/store/modules/emhttp.test.ts
@@ -1,6 +1,5 @@
-import { beforeEach, describe, expect, test, vi } from 'vitest';
+import { expect, test } from 'vitest';

-import { parseConfig } from '@app/core/utils/misc/parse-config.js';
 import { store } from '@app/store/index.js';
 import { FileLoadStatus } from '@app/store/types.js';

@@ -25,7 +24,7 @@ test('Before init returns default values for all fields', async () => {
 	`);
 });

-test('After init returns values from cfg file for all fields', { timeout: 30000 }, async () => {
+test('After init returns values from cfg file for all fields', async () => {
    const { loadStateFiles } = await import('@app/store/modules/emhttp.js');

    // Load state files into store
@@ -211,7 +210,6 @@ test('After init returns values from cfg file for all fields', { timeout: 30000
          "fsUsed": null,
          "id": "ST18000NM000J-2TV103_ZR585CPY",
          "idx": 0,
-          "isSpinning": true,
          "name": "parity",
          "numErrors": 0,
          "numReads": 0,
@@ -236,7 +234,6 @@ test('After init returns values from cfg file for all fields', { timeout: 30000
          "fsUsed": 4116003021,
          "id": "ST18000NM000J-2TV103_ZR5B1W9X",
          "idx": 1,
-          "isSpinning": true,
          "name": "disk1",
          "numErrors": 0,
          "numReads": 0,
@@ -261,7 +258,6 @@ test('After init returns values from cfg file for all fields', { timeout: 30000
          "fsUsed": 11904860828,
          "id": "WDC_WD120EDAZ-11F3RA0_5PJRD45C",
          "idx": 2,
-          "isSpinning": true,
          "name": "disk2",
          "numErrors": 0,
          "numReads": 0,
@@ -286,7 +282,6 @@ test('After init returns values from cfg file for all fields', { timeout: 30000
          "fsUsed": 6478056481,
          "id": "WDC_WD120EMAZ-11BLFA0_5PH8BTYD",
          "idx": 3,
-          "isSpinning": true,
          "name": "disk3",
          "numErrors": 0,
          "numReads": 0,
@@ -311,7 +306,6 @@ test('After init returns values from cfg file for all fields', { timeout: 30000
          "fsUsed": 137273827,
          "id": "Samsung_SSD_850_EVO_250GB_S2R5NX0H643734Z",
          "idx": 30,
-          "isSpinning": true,
          "name": "cache",
          "numErrors": 0,
          "numReads": 0,
@@ -336,7 +330,6 @@ test('After init returns values from cfg file for all fields', { timeout: 30000
          "fsUsed": null,
          "id": "KINGSTON_SA2000M8250G_50026B7282669D9E",
          "idx": 31,
-          "isSpinning": true,
          "name": "cache2",
          "numErrors": 0,
          "numReads": 0,
@@ -361,7 +354,6 @@ test('After init returns values from cfg file for all fields', { timeout: 30000
          "fsUsed": 851325,
          "id": "Cruzer",
          "idx": 32,
-          "isSpinning": true,
          "name": "flash",
          "numErrors": 0,
          "numReads": 0,
@@ -454,44 +446,6 @@ test('After init returns values from cfg file for all fields', { timeout: 30000
          "splitLevel": "1",
          "used": 33619300,
        },
-        {
-          "allocator": "highwater",
-          "cache": false,
-          "cachePool": "cache",
-          "color": "yellow-on",
-          "comment": "system data with periods",
-          "cow": "auto",
-          "exclude": [],
-          "floor": "0",
-          "free": 9309372,
-          "id": "system.with.periods",
-          "include": [],
-          "luksStatus": "0",
-          "name": "system.with.periods",
-          "nameOrig": "system.with.periods",
-          "size": 0,
-          "splitLevel": "1",
-          "used": 33619300,
-        },
-        {
-          "allocator": "highwater",
-          "cache": false,
-          "cachePool": "cache",
-          "color": "yellow-on",
-          "comment": "system data with 🚀",
-          "cow": "auto",
-          "exclude": [],
-          "floor": "0",
-          "free": 9309372,
-          "id": "system.with.🚀",
-          "include": [],
-          "luksStatus": "0",
-          "name": "system.with.🚀",
-          "nameOrig": "system.with.🚀",
-          "size": 0,
-          "splitLevel": "1",
-          "used": 33619300,
-        },
      ]
    `);
    expect(nfsShares).toMatchInlineSnapshot(`
@@ -1156,209 +1110,3 @@ test('After init returns values from cfg file for all fields', { timeout: 30000
      }
    `);
 });
-
-describe('Share parsing with periods in names', () => {
-    beforeEach(() => {
-        vi.clearAllMocks();
-    });
-
-    test('parseConfig handles periods in INI section names', () => {
-        const mockIniContent = `
-["share.with.periods"]
-name=share.with.periods
-useCache=yes
-include=
-exclude=
-
-[normal_share]
-name=normal_share
-useCache=no
-include=
-exclude=
-`;
-
-        const result = parseConfig<any>({
-            file: mockIniContent,
-            type: 'ini',
-        });
-
-        // The result should now have properly flattened keys
-
-        expect(result).toHaveProperty('shareWithPeriods');
-        expect(result).toHaveProperty('normalShare');
-        expect(result.shareWithPeriods.name).toBe('share.with.periods');
-        expect(result.normalShare.name).toBe('normal_share');
-    });
-
-    test('shares parser handles periods in share names correctly', async () => {
-        const { parse } = await import('@app/store/state-parsers/shares.js');
-
-        // The parser expects an object where values are share configs
-        const mockSharesState = {
-            shareWithPeriods: {
-                name: 'share.with.periods',
-                free: '1000000',
-                used: '500000',
-                size: '1500000',
-                include: '',
-                exclude: '',
-                useCache: 'yes',
-            },
-            normalShare: {
-                name: 'normal_share',
-                free: '2000000',
-                used: '750000',
-                size: '2750000',
-                include: '',
-                exclude: '',
-                useCache: 'no',
-            },
-        } as any;
-
-        const result = parse(mockSharesState);
-
-        expect(result).toHaveLength(2);
-        const periodShare = result.find((s) => s.name === 'share.with.periods');
-        const normalShare = result.find((s) => s.name === 'normal_share');
-
-        expect(periodShare).toBeDefined();
-        expect(periodShare?.id).toBe('share.with.periods');
-        expect(periodShare?.name).toBe('share.with.periods');
-        expect(periodShare?.cache).toBe(true);
-
-        expect(normalShare).toBeDefined();
-        expect(normalShare?.id).toBe('normal_share');
-        expect(normalShare?.name).toBe('normal_share');
-        expect(normalShare?.cache).toBe(false);
-    });
-
-    test('SMB parser handles periods in share names', async () => {
-        const { parse } = await import('@app/store/state-parsers/smb.js');
-
-        const mockSmbState = {
-            'share.with.periods': {
-                export: 'e',
-                security: 'public',
-                writeList: '',
-                readList: '',
-                volsizelimit: '0',
-            },
-            normal_share: {
-                export: 'e',
-                security: 'private',
-                writeList: 'user1,user2',
-                readList: '',
-                volsizelimit: '1000',
-            },
-        } as any;
-
-        const result = parse(mockSmbState);
-
-        expect(result).toHaveLength(2);
-        const periodShare = result.find((s) => s.name === 'share.with.periods');
-        const normalShare = result.find((s) => s.name === 'normal_share');
-
-        expect(periodShare).toBeDefined();
-        expect(periodShare?.name).toBe('share.with.periods');
-        expect(periodShare?.enabled).toBe(true);
-
-        expect(normalShare).toBeDefined();
-        expect(normalShare?.name).toBe('normal_share');
-        expect(normalShare?.writeList).toEqual(['user1', 'user2']);
-    });
-
-    test('NFS parser handles periods in share names', async () => {
-        const { parse } = await import('@app/store/state-parsers/nfs.js');
-
-        const mockNfsState = {
-            'share.with.periods': {
-                export: 'e',
-                security: 'public',
-                writeList: '',
-                readList: 'user1',
-                hostList: '',
-            },
-            normal_share: {
-                export: 'd',
-                security: 'private',
-                writeList: 'user2',
-                readList: '',
-                hostList: '192.168.1.0/24',
-            },
-        } as any;
-
-        const result = parse(mockNfsState);
-
-        expect(result).toHaveLength(2);
-        const periodShare = result.find((s) => s.name === 'share.with.periods');
-        const normalShare = result.find((s) => s.name === 'normal_share');
-
-        expect(periodShare).toBeDefined();
-        expect(periodShare?.name).toBe('share.with.periods');
-        expect(periodShare?.enabled).toBe(true);
-        expect(periodShare?.readList).toEqual(['user1']);
-
-        expect(normalShare).toBeDefined();
-        expect(normalShare?.name).toBe('normal_share');
-        expect(normalShare?.enabled).toBe(false);
-    });
-});
-
-describe('Share lookup with periods in names', () => {
-    test('getShares finds user shares with periods in names', async () => {
-        // Mock the store state
-        const mockStore = await import('@app/store/index.js');
-        const mockEmhttpState = {
-            shares: [
-                {
-                    id: 'share.with.periods',
-                    name: 'share.with.periods',
-                    cache: true,
-                    free: 1000000,
-                    used: 500000,
-                    size: 1500000,
-                    include: [],
-                    exclude: [],
-                },
-                {
-                    id: 'normal_share',
-                    name: 'normal_share',
-                    cache: false,
-                    free: 2000000,
-                    used: 750000,
-                    size: 2750000,
-                    include: [],
-                    exclude: [],
-                },
-            ],
-            smbShares: [
-                { name: 'share.with.periods', enabled: true, security: 'public' },
-                { name: 'normal_share', enabled: true, security: 'private' },
-            ],
-            nfsShares: [
-                { name: 'share.with.periods', enabled: false },
-                { name: 'normal_share', enabled: true },
-            ],
-            disks: [],
-        };
-
-        const gettersSpy = vi.spyOn(mockStore, 'getters', 'get').mockReturnValue({
-            emhttp: () => mockEmhttpState,
-        } as any);
-
-        const { getShares } = await import('@app/core/utils/shares/get-shares.js');
-
-        const periodShare = getShares('user', { name: 'share.with.periods' });
-        const normalShare = getShares('user', { name: 'normal_share' });
-
-        expect(periodShare).not.toBeNull();
-        expect(periodShare?.name).toBe('share.with.periods');
-        expect(periodShare?.type).toBe('user');
-
-        expect(normalShare).not.toBeNull();
-        expect(normalShare?.name).toBe('normal_share');
-        expect(normalShare?.type).toBe('user');
-
-        gettersSpy.mockRestore();
-    });
-});
--- a/api/src/test/store/modules/paths.test.ts
+++ b/api/src/test/store/modules/paths.test.ts
@@ -24,6 +24,7 @@ test('Returns paths', async () => {
        'myservers-base': '/boot/config/plugins/dynamix.my.servers/',
        'myservers-config': expect.stringContaining('api/dev/Unraid.net/myservers.cfg'),
        'myservers-config-states': expect.stringContaining('api/dev/states/myservers.cfg'),
+        'myservers-env': '/boot/config/plugins/dynamix.my.servers/env',
        'myservers-keepalive': './dev/Unraid.net/fb_keepalive',
        'keyfile-base': expect.stringContaining('api/dev/Unraid.net'),
        'machine-id': expect.stringContaining('api/dev/data/machine-id'),
--- a/api/src/test/store/state-parsers/shares.test.ts
+++ b/api/src/test/store/state-parsers/shares.test.ts
@@ -92,44 +92,6 @@ test('Returns parsed state file', async () => {
          "splitLevel": "1",
          "used": 33619300,
        },
-        {
-          "allocator": "highwater",
-          "cache": false,
-          "cachePool": "cache",
-          "color": "yellow-on",
-          "comment": "system data with periods",
-          "cow": "auto",
-          "exclude": [],
-          "floor": "0",
-          "free": 9309372,
-          "id": "system.with.periods",
-          "include": [],
-          "luksStatus": "0",
-          "name": "system.with.periods",
-          "nameOrig": "system.with.periods",
-          "size": 0,
-          "splitLevel": "1",
-          "used": 33619300,
-        },
-        {
-          "allocator": "highwater",
-          "cache": false,
-          "cachePool": "cache",
-          "color": "yellow-on",
-          "comment": "system data with 🚀",
-          "cow": "auto",
-          "exclude": [],
-          "floor": "0",
-          "free": 9309372,
-          "id": "system.with.🚀",
-          "include": [],
-          "luksStatus": "0",
-          "name": "system.with.🚀",
-          "nameOrig": "system.with.🚀",
-          "size": 0,
-          "splitLevel": "1",
-          "used": 33619300,
-        },
      ]
    `);
 });
--- a/api/src/test/store/state-parsers/slots.test.ts
+++ b/api/src/test/store/state-parsers/slots.test.ts
@@ -28,7 +28,6 @@ test('Returns parsed state file', async () => {
          "fsUsed": null,
          "id": "ST18000NM000J-2TV103_ZR585CPY",
          "idx": 0,
-          "isSpinning": true,
          "name": "parity",
          "numErrors": 0,
          "numReads": 0,
@@ -53,7 +52,6 @@ test('Returns parsed state file', async () => {
          "fsUsed": 4116003021,
          "id": "ST18000NM000J-2TV103_ZR5B1W9X",
          "idx": 1,
-          "isSpinning": true,
          "name": "disk1",
          "numErrors": 0,
          "numReads": 0,
@@ -78,7 +76,6 @@ test('Returns parsed state file', async () => {
          "fsUsed": 11904860828,
          "id": "WDC_WD120EDAZ-11F3RA0_5PJRD45C",
          "idx": 2,
-          "isSpinning": true,
          "name": "disk2",
          "numErrors": 0,
          "numReads": 0,
@@ -103,7 +100,6 @@ test('Returns parsed state file', async () => {
          "fsUsed": 6478056481,
          "id": "WDC_WD120EMAZ-11BLFA0_5PH8BTYD",
          "idx": 3,
-          "isSpinning": true,
          "name": "disk3",
          "numErrors": 0,
          "numReads": 0,
@@ -128,7 +124,6 @@ test('Returns parsed state file', async () => {
          "fsUsed": 137273827,
          "id": "Samsung_SSD_850_EVO_250GB_S2R5NX0H643734Z",
          "idx": 30,
-          "isSpinning": true,
          "name": "cache",
          "numErrors": 0,
          "numReads": 0,
@@ -153,7 +148,6 @@ test('Returns parsed state file', async () => {
          "fsUsed": null,
          "id": "KINGSTON_SA2000M8250G_50026B7282669D9E",
          "idx": 31,
-          "isSpinning": true,
          "name": "cache2",
          "numErrors": 0,
          "numReads": 0,
@@ -178,7 +172,6 @@ test('Returns parsed state file', async () => {
          "fsUsed": 851325,
          "id": "Cruzer",
          "idx": 32,
-          "isSpinning": true,
          "name": "flash",
          "numErrors": 0,
          "numReads": 0,
--- a/api/src/test/store/sync/registration-sync.test.ts
+++ b/api/src/test/store/sync/registration-sync.test.ts
@@ -0,0 +1,34 @@
+import { expect, test, vi } from 'vitest';
+
+import { store } from '@app/store/index.js';
+import { loadStateFiles } from '@app/store/modules/emhttp.js';
+import { loadRegistrationKey } from '@app/store/modules/registration.js';
+import { createRegistrationEvent } from '@app/store/sync/registration-sync.js';
+
+vi.mock('@app/core/pubsub', () => ({
+    pubsub: { publish: vi.fn() },
+}));
+
+test('Creates a registration event', async () => {
+    // Load state files into store
+
+    const config = await store.dispatch(loadStateFiles()).unwrap();
+    await store.dispatch(loadRegistrationKey());
+    expect(config.var.regFile).toBe('/app/dev/Unraid.net/Pro.key');
+
+    const state = store.getState();
+    const registrationEvent = createRegistrationEvent(state);
+    expect(registrationEvent).toMatchInlineSnapshot(`
+		{
+		  "registration": {
+		    "guid": "13FE-4200-C300-58C372A52B19",
+		    "keyFile": {
+		      "contents": "hVs1tLjvC9FiiQsIwIQ7G1KszAcexf0IneThhnmf22SB0dGs5WzRkqMiSMmt2DtR5HOXFUD32YyxuzGeUXmky3zKpSu6xhZNKVg5atGM1OfvkzHBMldI3SeBLuUFSgejLbpNUMdTrbk64JJdbzle4O8wiQgkIpAMIGxeYLwLBD4zHBcfyzq40QnxG--HcX6j25eE0xqa2zWj-j0b0rCAXahJV2a3ySCbPzr1MvfPRTVb0rr7KJ-25R592hYrz4H7Sc1B3p0lr6QUxHE6o7bcYrWKDRtIVoZ8SMPpd1_0gzYIcl5GsDFzFumTXUh8NEnl0Q8hwW1YE-tRc6Y_rrvd7w",
+		      "location": "/app/dev/Unraid.net/Pro.key",
+		    },
+		    "state": "PRO",
+		    "type": "PRO",
+		  },
+		}
+	`);
+});
--- a/api/src/test/upnp/helpers.test.ts
+++ b/api/src/test/upnp/helpers.test.ts
@@ -0,0 +1,20 @@
+import { type Mapping } from '@runonflux/nat-upnp';
+import { expect, test, vi } from 'vitest';
+
+import { getWanPortForUpnp } from '@app/upnp/helpers.js';
+
+test('it successfully gets a wan port given no exclusions', () => {
+    const port = getWanPortForUpnp(null, 36_000, 38_000);
+    expect(port).toBeGreaterThan(35_999);
+    expect(port).toBeLessThan(38_001);
+});
+
+test('it fails to get a wan port given exclusions', () => {
+    const port = getWanPortForUpnp([{ public: { port: 36_000 } }] as Mapping[], 36_000, 36_000);
+    expect(port).toBeNull();
+});
+
+test('it succeeds in getting a wan port given exclusions', () => {
+    const port = getWanPortForUpnp([{ public: { port: 36_000 } }] as Mapping[], 30_000, 36_000);
+    expect(port).not.toBeNull();
+});
--- a/api/src/cli.ts
+++ b/api/src/cli.ts
@@ -1,37 +1,29 @@
 import '@app/dotenv.js';

-import { Logger } from '@nestjs/common';
-
+import { execa } from 'execa';
 import { CommandFactory } from 'nest-commander';

-import { LOG_LEVEL, SUPPRESS_LOGS } from '@app/environment.js';
+import { internalLogger, logger } from '@app/core/log.js';
+import { LOG_LEVEL } from '@app/environment.js';
+import { CliModule } from '@app/unraid-api/cli/cli.module.js';
 import { LogService } from '@app/unraid-api/cli/log.service.js';

 const getUnraidApiLocation = async () => {
-    const { execa } = await import('execa');
    try {
        const shellToUse = await execa('which unraid-api');
        return shellToUse.stdout.trim();
    } catch (err) {
+        logger.debug('Could not find unraid-api in PATH, using default location');
+
        return '/usr/bin/unraid-api';
    }
 };

-const getLogger = () => {
-    if (LOG_LEVEL === 'TRACE' && !SUPPRESS_LOGS) {
-        return new LogService();
-    }
-    return false;
-};
-
-const logger = getLogger();
 try {
    await import('json-bigint-patch');
-    const { CliModule } = await import('@app/unraid-api/cli/cli.module.js');
-
    await CommandFactory.run(CliModule, {
        cliName: 'unraid-api',
-        logger: logger, // - enable this to see nest initialization issues
+        logger: LOG_LEVEL === 'TRACE' ? new LogService() : false, // - enable this to see nest initialization issues
        completion: {
            fig: false,
            cmd: 'completion-script',
@@ -40,8 +32,10 @@ try {
    });
    process.exit(0);
 } catch (error) {
-    if (logger) {
-        logger.error('ERROR:', error);
-    }
+    logger.error('ERROR:', error);
+    internalLogger.error({
+        message: 'Failed to start unraid-api',
+        error,
+    });
    process.exit(1);
 }
--- a/api/src/common/allowed-origins.ts
+++ b/api/src/common/allowed-origins.ts
@@ -0,0 +1,99 @@
+import { uniq } from 'lodash-es';
+
+import type { RootState } from '@app/store/index.js';
+import { logger } from '@app/core/log.js';
+import { GRAPHQL_INTROSPECTION } from '@app/environment.js';
+import { getServerIps, getUrlForField } from '@app/graphql/resolvers/subscription/network.js';
+import { getters, store } from '@app/store/index.js';
+import { FileLoadStatus } from '@app/store/types.js';
+
+const getAllowedSocks = (): string[] => [
+    // Notifier bridge
+    '/var/run/unraid-notifications.sock',
+
+    // Unraid PHP scripts
+    '/var/run/unraid-php.sock',
+
+    // CLI
+    '/var/run/unraid-cli.sock',
+];
+
+const getLocalAccessUrlsForServer = (state: RootState = store.getState()): string[] => {
+    const { emhttp } = state;
+
+    if (emhttp.status !== FileLoadStatus.LOADED) {
+        return [];
+    }
+
+    const { nginx } = emhttp;
+    try {
+        return [
+            getUrlForField({
+                url: 'localhost',
+                port: nginx.httpPort,
+            }).toString(),
+            getUrlForField({
+                url: 'localhost',
+                portSsl: nginx.httpsPort,
+            }).toString(),
+        ];
+    } catch (error: unknown) {
+        logger.debug('Caught error in getLocalAccessUrlsForServer: \n%o', error);
+        return [];
+    }
+};
+
+const getRemoteAccessUrlsForAllowedOrigins = (state: RootState = store.getState()): string[] => {
+    const { urls } = getServerIps(state);
+
+    if (urls) {
+        return urls.reduce<string[]>((acc, curr) => {
+            if ((curr.ipv4 && curr.ipv6) || curr.ipv4) {
+                acc.push(curr.ipv4.toString());
+            } else if (curr.ipv6) {
+                acc.push(curr.ipv6.toString());
+            }
+
+            return acc;
+        }, []);
+    }
+
+    return [];
+};
+
+export const getExtraOrigins = (): string[] => {
+    const { extraOrigins } = getters.config().api;
+    if (extraOrigins) {
+        return extraOrigins
+            .replaceAll(' ', '')
+            .split(',')
+            .filter((origin) => origin.startsWith('http://') || origin.startsWith('https://'));
+    }
+
+    return [];
+};
+
+const getConnectOrigins = (): string[] => {
+    const connectMain = 'https://connect.myunraid.net';
+    const connectStaging = 'https://connect-staging.myunraid.net';
+    const connectDev = 'https://dev-my.myunraid.net:4000';
+
+    return [connectMain, connectStaging, connectDev];
+};
+
+const getApolloSandbox = (): string[] => {
+    if (GRAPHQL_INTROSPECTION) {
+        return ['https://studio.apollographql.com'];
+    }
+    return [];
+};
+
+export const getAllowedOrigins = (state: RootState = store.getState()): string[] =>
+    uniq([
+        ...getAllowedSocks(),
+        ...getLocalAccessUrlsForServer(state),
+        ...getRemoteAccessUrlsForAllowedOrigins(state),
+        ...getExtraOrigins(),
+        ...getConnectOrigins(),
+        ...getApolloSandbox(),
+    ]).map((url) => (url.endsWith('/') ? url.slice(0, -1) : url));
--- a/api/src/consts.ts
+++ b/api/src/consts.ts
@@ -2,7 +2,7 @@ import { join } from 'path';

 import type { JSONWebKeySet } from 'jose';

-import { ENABLE_NEXT_DOCKER_RELEASE, PORT } from '@app/environment.js';
+import { PORT } from '@app/environment.js';

 export const getInternalApiAddress = (isHttp = true, nginxPort = 80) => {
    const envPort = PORT;
@@ -79,14 +79,3 @@ export const KEYSERVER_VALIDATION_ENDPOINT = 'https://keys.lime-technology.com/v

 /** Set the max retries for the GraphQL Client */
 export const MAX_RETRIES_FOR_LINEAR_BACKOFF = 100;
-
-/**
- * Feature flags are used to conditionally enable or disable functionality in the Unraid API.
- *
- * Keys are human readable feature flag names -- will be used to construct error messages.
- *
- * Values are boolean/truthy values.
- */
-export const FeatureFlags = Object.freeze({
-    ENABLE_NEXT_DOCKER_RELEASE,
-});
--- a/api/src/core/log.ts
+++ b/api/src/core/log.ts
@@ -1,7 +1,7 @@
-import pino from 'pino';
+import { pino } from 'pino';
 import pretty from 'pino-pretty';

-import { API_VERSION, LOG_LEVEL, LOG_TYPE, PATHS_LOGS_FILE, SUPPRESS_LOGS } from '@app/environment.js';
+import { API_VERSION, LOG_LEVEL, LOG_TYPE } from '@app/environment.js';

 export const levels = ['trace', 'debug', 'info', 'warn', 'error', 'fatal'] as const;

@@ -9,46 +9,18 @@ export type LogLevel = (typeof levels)[number];

 const level = levels[levels.indexOf(LOG_LEVEL.toLowerCase() as LogLevel)] ?? 'info';

-const nullDestination = pino.destination({
-    write() {
-        // Suppress all logs
-    },
-});
+export const logDestination = pino.destination();

-export const logDestination =
-    process.env.SUPPRESS_LOGS === 'true' ? nullDestination : pino.destination();
-const localFileDestination = pino.destination({
-    dest: PATHS_LOGS_FILE,
-    sync: true,
-});
-
-const stream = SUPPRESS_LOGS
-    ? nullDestination
-    : LOG_TYPE === 'pretty'
-      ? pretty({
-            singleLine: true,
-            hideObject: false,
-            colorize: true,
-            colorizeObjects: true,
-            levelFirst: false,
-            ignore: 'hostname,pid',
-            destination: logDestination,
-            translateTime: 'HH:mm:ss',
-            customPrettifiers: {
-                time: (timestamp: string | object) => `[${timestamp}`,
-                level: (logLevel: string | object, key: string, log: any, extras: any) => {
-                    // Use labelColorized which preserves the colors
-                    const { labelColorized } = extras;
-                    const context = log.context || log.logger || 'app';
-                    return `${labelColorized} ${context}]`;
-                },
-            },
-            messageFormat: (log: any, messageKey: string) => {
-                const msg = log[messageKey] || log.msg || '';
-                return msg;
-            },
-        })
-      : logDestination;
+const stream =
+    LOG_TYPE === 'pretty'
+        ? pretty({
+              singleLine: true,
+              hideObject: false,
+              colorize: true,
+              ignore: 'hostname,pid',
+              destination: logDestination,
+          })
+        : logDestination;

 export const logger = pino(
    {
@@ -98,7 +70,6 @@ export const keyServerLogger = logger.child({ logger: 'key-server' });
 export const remoteAccessLogger = logger.child({ logger: 'remote-access' });
 export const remoteQueryLogger = logger.child({ logger: 'remote-query' });
 export const apiLogger = logger.child({ logger: 'api' });
-export const pluginLogger = logger.child({ logger: 'plugin', stream: localFileDestination });

 export const loggers = [
    internalLogger,
--- a/api/src/core/modules/array/get-array-data.ts
+++ b/api/src/core/modules/array/get-array-data.ts
@@ -1,7 +1,6 @@
 import { GraphQLError } from 'graphql';
 import { sum } from 'lodash-es';

-import { getParityCheckStatus } from '@app/core/modules/array/parity-check-status.js';
 import { store } from '@app/store/index.js';
 import { FileLoadStatus } from '@app/store/types.js';
 import {
@@ -62,6 +61,5 @@ export const getArrayData = (getState = store.getState): UnraidArray => {
        parities,
        disks,
        caches,
-        parityCheckStatus: getParityCheckStatus(emhttp.var),
    };
 };
--- a/api/src/core/modules/array/parity-check-status.test.ts
+++ b/api/src/core/modules/array/parity-check-status.test.ts
--- a/api/src/core/modules/array/parity-check-status.ts
+++ b/api/src/core/modules/array/parity-check-status.ts
@@ -1,72 +0,0 @@
-import { toNumberAlways } from '@unraid/shared/util/data.js';
-
-import type { Var } from '@app/core/types/states/var.js';
-import type { ParityCheck } from '@app/unraid-api/graph/resolvers/array/parity.model.js';
-
-export enum ParityCheckStatus {
-    NEVER_RUN = 'never_run',
-    RUNNING = 'running',
-    PAUSED = 'paused',
-    COMPLETED = 'completed',
-    CANCELLED = 'cancelled',
-    FAILED = 'failed',
-}
-
-function calculateParitySpeed(deltaTime: number, deltaBlocks: number) {
-    if (deltaTime === 0 || deltaBlocks === 0) return 0;
-    const deltaBytes = deltaBlocks * 1024;
-    const speedMBps = deltaBytes / deltaTime / 1024 / 1024;
-    return Math.round(speedMBps);
-}
-
-type RelevantVarData = Pick<
-    Var,
-    | 'mdResyncPos'
-    | 'mdResyncDt'
-    | 'sbSyncExit'
-    | 'sbSynced'
-    | 'sbSynced2'
-    | 'mdResyncDb'
-    | 'mdResyncSize'
->;
-
-function getStatusFromVarData(varData: RelevantVarData): ParityCheckStatus {
-    const { mdResyncPos, mdResyncDt, sbSyncExit, sbSynced, sbSynced2 } = varData;
-    const mdResyncDtNumber = toNumberAlways(mdResyncDt, 0);
-    const sbSyncExitNumber = toNumberAlways(sbSyncExit, 0);
-
-    switch (true) {
-        case mdResyncPos > 0:
-            return mdResyncDtNumber > 0 ? ParityCheckStatus.RUNNING : ParityCheckStatus.PAUSED;
-        case sbSynced === 0:
-            return ParityCheckStatus.NEVER_RUN;
-        case sbSyncExitNumber === -4:
-            return ParityCheckStatus.CANCELLED;
-        case sbSyncExitNumber !== 0:
-            return ParityCheckStatus.FAILED;
-        case sbSynced2 > 0:
-            return ParityCheckStatus.COMPLETED;
-        default:
-            return ParityCheckStatus.NEVER_RUN;
-    }
-}
-
-export function getParityCheckStatus(varData: RelevantVarData): ParityCheck {
-    const { sbSynced, sbSynced2, mdResyncDt, mdResyncDb, mdResyncPos, mdResyncSize } = varData;
-    const deltaTime = toNumberAlways(mdResyncDt, 0);
-    const deltaBlocks = toNumberAlways(mdResyncDb, 0);
-
-    // seconds since epoch (unix timestamp)
-    const now = sbSynced2 > 0 ? sbSynced2 : Date.now() / 1000;
-    return {
-        status: getStatusFromVarData(varData),
-        speed: String(calculateParitySpeed(deltaTime, deltaBlocks)),
-        date: sbSynced > 0 ? new Date(sbSynced * 1000) : undefined,
-        duration: sbSynced > 0 ? Math.round(now - sbSynced) : undefined,
-        // percentage as integer, clamped to [0, 100]
-        progress:
-            mdResyncSize <= 0
-                ? 0
-                : Math.round(Math.min(100, Math.max(0, (mdResyncPos / mdResyncSize) * 100))),
-    };
-}
--- a/api/src/core/modules/services/nginx.ts
+++ b/api/src/core/modules/services/nginx.ts
@@ -8,7 +8,7 @@ export class NginxManager {
            await execa('/etc/rc.d/rc.nginx', ['reload']);
            return true;
        } catch (err: unknown) {
-            logger.warn('Failed to restart Nginx with error: %o', err as object);
+            logger.warn('Failed to restart Nginx with error: ', err);
            return false;
        }
    };
--- a/api/src/core/modules/services/update-dns.ts
+++ b/api/src/core/modules/services/update-dns.ts
@@ -8,7 +8,7 @@ export class UpdateDNSManager {
            await execa('/usr/bin/php', ['/usr/local/emhttp/plugins/dynamix/include/UpdateDNS.php']);
            return true;
        } catch (err: unknown) {
-            logger.warn('Failed to call Update DNS with error: %o', err as object);
+            logger.warn('Failed to call Update DNS with error: ', err);
            return false;
        }
    };
--- a/api/src/core/pubsub.ts
+++ b/api/src/core/pubsub.ts
@@ -13,11 +13,8 @@ export const pubsub = new PubSub({ eventEmitter });

 /**
 * Create a pubsub subscription.
- * @param channel The pubsub channel to subscribe to. Can be either a predefined GRAPHQL_PUBSUB_CHANNEL
- *                or a dynamic string for runtime-generated topics (e.g., log file paths like "LOG_FILE:/var/log/test.log")
+ * @param channel The pubsub channel to subscribe to.
 */
-export const createSubscription = <T = any>(
-    channel: GRAPHQL_PUBSUB_CHANNEL | string
-): AsyncIterableIterator<T> => {
-    return pubsub.asyncIterableIterator<T>(channel);
+export const createSubscription = (channel: GRAPHQL_PUBSUB_CHANNEL) => {
+    return pubsub.asyncIterableIterator(channel);
 };
--- a/api/src/core/types/states/var.ts
+++ b/api/src/core/types/states/var.ts
@@ -68,24 +68,11 @@ export type Var = {
    mdNumStripes: number;
    mdNumStripesDefault: number;
    mdNumStripesStatus: string;
-    /**
-     * Serves a dual purpose depending on context:
-     * - Total size of the operation (in sectors/blocks)
-     * - Running state indicator (0 = paused, >0 = running)
-     */
    mdResync: number;
    mdResyncAction: string;
    mdResyncCorr: string;
    mdResyncDb: string;
-    /** Average time interval (delta time) in seconds of current parity operations */
    mdResyncDt: string;
-    /**
-     * Current position in the parity operation (in sectors/blocks).
-     * When mdResyncPos > 0, a parity operation is active.
-     * When mdResyncPos = 0, no parity operation is running.
-     *
-     * Used to calculate progress percentage.
-     */
    mdResyncPos: number;
    mdResyncSize: number;
    mdState: ArrayState;
@@ -149,36 +136,9 @@ export type Var = {
    sbName: string;
    sbNumDisks: number;
    sbState: string;
-    /**
-     * Unix timestamp when parity operation started.
-     * When sbSynced = 0, indicates no parity check has ever been run.
-     *
-     * Used to calculate elapsed time during active operations.
-     */
    sbSynced: number;
    sbSynced2: number;
-    /**
-     * Unix timestamp when parity operation completed (successfully or with errors).
-     * Used to display completion time in status messages.
-     *
-     * When sbSynced2 = 0, indicates operation started but not yet finished
-     */
    sbSyncErrs: number;
-    /**
-     * Exit status code that indicates how the last parity operation completed, following standard Unix conventions.
-     *
-     * sbSyncExit = 0 - Successful Completion
-     * - Parity operation completed normally without errors
-     * - Used to calculate speed and display success message
-     *
-     * sbSyncExit = -4 - Aborted/Cancelled
-     * - Operation was manually cancelled by user
-     * - Displays as "aborted" in the UI
-     *
-     * sbSyncExit ≠ 0 (other values) - Failed/Incomplete
-     * - Operation failed due to errors or other issues
-     * - Displays the numeric error code
-     */
    sbSyncExit: string;
    sbUpdated: string;
    sbVersion: string;
--- a/api/src/core/utils/files/config-file-normalizer.ts
+++ b/api/src/core/utils/files/config-file-normalizer.ts
@@ -0,0 +1,40 @@
+import { isEqual, merge } from 'lodash-es';
+
+import { getAllowedOrigins } from '@app/common/allowed-origins.js';
+import { initialState } from '@app/store/modules/config.js';
+import {
+    MyServersConfig,
+    MyServersConfigMemory,
+    MyServersConfigMemorySchema,
+    MyServersConfigSchema,
+} from '@app/types/my-servers-config.js';
+
+// Define ConfigType and ConfigObject
+export type ConfigType = 'flash' | 'memory';
+
+/**
+ * Get a writeable configuration based on the mode ('flash' or 'memory').
+ */
+export const getWriteableConfig = <T extends ConfigType>(
+    config: T extends 'memory' ? MyServersConfigMemory : MyServersConfig,
+    mode: T
+): T extends 'memory' ? MyServersConfigMemory : MyServersConfig => {
+    const schema = mode === 'memory' ? MyServersConfigMemorySchema : MyServersConfigSchema;
+
+    const defaultConfig = schema.parse(initialState);
+    // Use a type assertion for the mergedConfig to include `connectionStatus` only if `mode === 'memory`
+    const mergedConfig = merge<
+        MyServersConfig,
+        T extends 'memory' ? MyServersConfigMemory : MyServersConfig
+    >(defaultConfig, config);
+
+    if (mode === 'memory') {
+        (mergedConfig as MyServersConfigMemory).remote.allowedOrigins = getAllowedOrigins().join(', ');
+        (mergedConfig as MyServersConfigMemory).connectionStatus = {
+            ...(defaultConfig as MyServersConfigMemory).connectionStatus,
+            ...(config as MyServersConfigMemory).connectionStatus,
+        };
+    }
+
+    return schema.parse(mergedConfig) as T extends 'memory' ? MyServersConfigMemory : MyServersConfig; // Narrowing ensures correct typing
+};
--- a/api/src/core/utils/misc/get-key-file.ts
+++ b/api/src/core/utils/misc/get-key-file.ts
@@ -16,22 +16,11 @@ export const getKeyFile = async function (appStore: RootState = store.getState()

    const keyFileName = basename(emhttp.var?.regFile);
    const registrationKeyFilePath = join(paths['keyfile-base'], keyFileName);
-
-    try {
-        const keyFile = await readFile(registrationKeyFilePath, 'binary');
-        return Buffer.from(keyFile, 'binary')
-            .toString('base64')
-            .trim()
-            .replace(/\+/g, '-')
-            .replace(/\//g, '_')
-            .replace(/=/g, '');
-    } catch (error) {
-        // Handle ENOENT error when Pro.key file doesn't exist
-        if (error instanceof Error && 'code' in error && error.code === 'ENOENT') {
-            // Return empty string when key file is missing (ENOKEYFILE state)
-            return '';
-        }
-        // Re-throw other errors
-        throw error;
-    }
+    const keyFile = await readFile(registrationKeyFilePath, 'binary');
+    return Buffer.from(keyFile, 'binary')
+        .toString('base64')
+        .trim()
+        .replace(/\+/g, '-')
+        .replace(/\//g, '_')
+        .replace(/=/g, '');
 };
--- a/api/src/core/utils/misc/load-state.ts
+++ b/api/src/core/utils/misc/load-state.ts
@@ -26,7 +26,7 @@ export const loadState = <T extends Record<string, unknown>>(filePath: string):
        logger.trace(
            'Failed loading state file "%s" with "%s"',
            filePath,
-            error instanceof Error ? error.message : String(error)
+            error instanceof Error ? error.message : error
        );
    }

--- a/api/src/core/utils/misc/parse-config.ts
+++ b/api/src/core/utils/misc/parse-config.ts
@@ -23,54 +23,6 @@ type OptionsWithLoadedFile = {
    type: ConfigType;
 };

-/**
- * Flattens nested objects that were incorrectly created by periods in INI section names.
- * For example: { system: { with: { periods: {...} } } } -> { "system.with.periods": {...} }
- */
-const flattenPeriodSections = (obj: Record<string, any>, prefix = ''): Record<string, any> => {
-    const result: Record<string, any> = {};
-    const isNestedObject = (value: unknown) =>
-        Boolean(value && typeof value === 'object' && !Array.isArray(value));
-    // prevent prototype pollution/injection
-    const isUnsafeKey = (k: string) => k === '__proto__' || k === 'prototype' || k === 'constructor';
-
-    for (const [key, value] of Object.entries(obj)) {
-        if (isUnsafeKey(key)) continue;
-        const fullKey = prefix ? `${prefix}.${key}` : key;
-
-        if (!isNestedObject(value)) {
-            result[fullKey] = value;
-            continue;
-        }
-
-        const section = {};
-        const nestedObjs = {};
-        let hasSectionProps = false;
-
-        for (const [propKey, propValue] of Object.entries(value)) {
-            if (isUnsafeKey(propKey)) continue;
-            if (isNestedObject(propValue)) {
-                nestedObjs[propKey] = propValue;
-            } else {
-                section[propKey] = propValue;
-                hasSectionProps = true;
-            }
-        }
-
-        // Process direct properties first to maintain order
-        if (hasSectionProps) {
-            result[fullKey] = section;
-        }
-
-        // Then process nested objects
-        if (Object.keys(nestedObjs).length > 0) {
-            Object.assign(result, flattenPeriodSections(nestedObjs, fullKey));
-        }
-    }
-
-    return result;
-};
-
 /**
 * Converts the following
 * ```
@@ -175,8 +127,6 @@ export const parseConfig = <T extends Record<string, any>>(
    let data: Record<string, any>;
    try {
        data = parseIni(fileContents);
-        // Fix nested objects created by periods in section names
-        data = flattenPeriodSections(data);
    } catch (error) {
        throw new AppError(
            `Failed to parse config file: ${error instanceof Error ? error.message : String(error)}`
--- a/api/src/core/utils/pm2/unraid-api-running.ts
+++ b/api/src/core/utils/pm2/unraid-api-running.ts
@@ -1,40 +1,25 @@
 export const isUnraidApiRunning = async (): Promise<boolean | undefined> => {
-    const { PM2_HOME } = await import('@app/environment.js');
-
-    // Set PM2_HOME if not already set
-    if (!process.env.PM2_HOME) {
-        process.env.PM2_HOME = PM2_HOME;
-    }
-
-    const pm2Module = await import('pm2');
-    const pm2 = pm2Module.default || pm2Module;
-
-    const pm2Promise = new Promise<boolean>((resolve) => {
-        pm2.connect(function (err) {
+    const { connect, describe, disconnect } = await import('pm2');
+    return new Promise((resolve, reject) => {
+        connect(function (err) {
            if (err) {
-                // Don't reject here, resolve with false since we can't connect to PM2
-                resolve(false);
-                return;
+                console.error(err);
+                reject('Could not connect to pm2');
            }

-            // Now try to describe unraid-api specifically
-            pm2.describe('unraid-api', function (err, processDescription) {
+            describe('unraid-api', function (err, processDescription) {
+                console.log(err);
                if (err || processDescription.length === 0) {
-                    // Service not found or error occurred
+                    console.log(false); // Service not found or error occurred
                    resolve(false);
                } else {
                    const isOnline = processDescription?.[0]?.pm2_env?.status === 'online';
+                    console.log(isOnline); // Output true if online, false otherwise
                    resolve(isOnline);
                }

-                pm2.disconnect();
+                disconnect();
            });
        });
    });
-
-    const timeoutPromise = new Promise<boolean>((resolve) => {
-        setTimeout(() => resolve(false), 10000); // 10 second timeout
-    });
-
-    return Promise.race([pm2Promise, timeoutPromise]);
 };
--- a/api/src/core/utils/validation/enum-validator.ts
+++ b/api/src/core/utils/validation/enum-validator.ts
@@ -1,17 +0,0 @@
-export function isValidEnumValue<T extends Record<string, string | number>>(
-    value: unknown,
-    enumObject: T
-): value is T[keyof T] {
-    if (value == null) {
-        return false;
-    }
-
-    return Object.values(enumObject).includes(value as T[keyof T]);
-}
-
-export function validateEnumValue<T extends Record<string, string | number>>(
-    value: unknown,
-    enumObject: T
-): T[keyof T] | undefined {
-    return isValidEnumValue(value, enumObject) ? (value as T[keyof T]) : undefined;
-}
--- a/api/src/core/utils/validation/is-gui-mode.ts
+++ b/api/src/core/utils/validation/is-gui-mode.ts
@@ -13,7 +13,7 @@ const isGuiMode = async (): Promise<boolean> => {
        // exitCode 0 means process was found, 1 means not found
        return exitCode === 0;
    } catch (error) {
-        internalLogger.error('Error checking GUI mode: %o', error as object);
+        internalLogger.error('Error checking GUI mode: %s', error);
        return false;
    }
 };
--- a/api/src/core/utils/validation/validation-processor.test.ts
+++ b/api/src/core/utils/validation/validation-processor.test.ts
@@ -1,437 +0,0 @@
-import { describe, expect, it } from 'vitest';
-
-import type { ValidationResult } from '@app/core/utils/validation/validation-processor.js';
-import {
-    createValidationProcessor,
-    ResultInterpreters,
-} from '@app/core/utils/validation/validation-processor.js';
-
-describe('ValidationProcessor', () => {
-    type TestInput = { value: number; text: string };
-
-    it('should process all validation steps when no errors occur', () => {
-        const steps = [
-            {
-                name: 'positiveValue',
-                validator: (input: TestInput) => input.value > 0,
-                isError: ResultInterpreters.booleanMeansSuccess,
-            },
-            {
-                name: 'nonEmptyText',
-                validator: (input: TestInput) => input.text.length > 0,
-                isError: ResultInterpreters.booleanMeansSuccess,
-            },
-        ] as const;
-
-        const processor = createValidationProcessor({
-            steps,
-        });
-
-        const result = processor({ value: 5, text: 'hello' }, { failFast: false });
-
-        expect(result.isValid).toBe(true);
-        expect(result.errors).toEqual({});
-    });
-
-    it('should collect all errors when failFast is disabled', () => {
-        const steps = [
-            {
-                name: 'positiveValue',
-                validator: (input: TestInput) => input.value > 0,
-                isError: ResultInterpreters.booleanMeansSuccess,
-            },
-            {
-                name: 'nonEmptyText',
-                validator: (input: TestInput) => input.text.length > 0,
-                isError: ResultInterpreters.booleanMeansSuccess,
-            },
-        ] as const;
-
-        const processor = createValidationProcessor({
-            steps,
-        });
-
-        const result = processor({ value: -1, text: '' }, { failFast: false });
-
-        expect(result.isValid).toBe(false);
-        expect(result.errors.positiveValue).toBe(false);
-        expect(result.errors.nonEmptyText).toBe(false);
-    });
-
-    it('should stop at first error when failFast is enabled', () => {
-        const steps = [
-            {
-                name: 'positiveValue',
-                validator: (input: TestInput) => input.value > 0,
-                isError: ResultInterpreters.booleanMeansSuccess,
-            },
-            {
-                name: 'nonEmptyText',
-                validator: (input: TestInput) => input.text.length > 0,
-                isError: ResultInterpreters.booleanMeansSuccess,
-            },
-        ] as const;
-
-        const processor = createValidationProcessor({
-            steps,
-        });
-
-        const result = processor({ value: -1, text: '' }, { failFast: true });
-
-        expect(result.isValid).toBe(false);
-        expect(result.errors.positiveValue).toBe(false);
-        expect(result.errors.nonEmptyText).toBeUndefined();
-    });
-
-    it('should always fail fast on steps marked with alwaysFailFast', () => {
-        const steps = [
-            {
-                name: 'criticalCheck',
-                validator: (input: TestInput) => input.value !== 0,
-                isError: ResultInterpreters.booleanMeansSuccess,
-                alwaysFailFast: true,
-            },
-            {
-                name: 'nonEmptyText',
-                validator: (input: TestInput) => input.text.length > 0,
-                isError: ResultInterpreters.booleanMeansSuccess,
-            },
-        ] as const;
-
-        const processor = createValidationProcessor({
-            steps,
-        });
-
-        const result = processor({ value: 0, text: '' }, { failFast: false });
-
-        expect(result.isValid).toBe(false);
-        expect(result.errors.criticalCheck).toBe(false);
-        expect(result.errors.nonEmptyText).toBeUndefined(); // Should not be executed
-    });
-
-    it('should work with different result interpreters', () => {
-        const steps = [
-            {
-                name: 'arrayResult',
-                validator: (input: TestInput) => [1, 2, 3],
-                isError: ResultInterpreters.errorList,
-            },
-            {
-                name: 'nullableResult',
-                validator: (input: TestInput) => (input.value > 0 ? null : 'error'),
-                isError: ResultInterpreters.nullableIsSuccess,
-            },
-        ] as const;
-
-        const processor = createValidationProcessor({
-            steps,
-        });
-
-        const result = processor({ value: -1, text: 'test' }, { failFast: false });
-
-        expect(result.isValid).toBe(false);
-        expect(result.errors.arrayResult).toEqual([1, 2, 3]);
-        expect(result.errors.nullableResult).toBe('error');
-    });
-
-    it('should handle 0-arity validators', () => {
-        const processor = createValidationProcessor({
-            steps: [
-                {
-                    name: 'zeroArityValidator',
-                    validator: () => true,
-                    isError: ResultInterpreters.booleanMeansSuccess,
-                },
-                {
-                    name: 'zeroArityValidator2',
-                    validator: () => false,
-                    isError: ResultInterpreters.booleanMeansFailure,
-                },
-            ] as const,
-        });
-
-        const result = processor(null);
-        expect(result.isValid).toBe(true);
-    });
-
-    it('should work with custom result interpreter', () => {
-        const steps = [
-            {
-                name: 'customCheck',
-                validator: (input: TestInput) => ({ isOk: input.value > 0, code: 'VALUE_CHECK' }),
-                isError: ResultInterpreters.custom((result: { isOk: boolean }) => !result.isOk),
-            },
-        ] as const;
-
-        const processor = createValidationProcessor({ steps });
-
-        const validResult = processor({ value: 5, text: 'test' });
-        expect(validResult.isValid).toBe(true);
-        expect(validResult.errors).toEqual({});
-
-        const invalidResult = processor({ value: -1, text: 'test' });
-        expect(invalidResult.isValid).toBe(false);
-        expect(invalidResult.errors.customCheck).toEqual({ isOk: false, code: 'VALUE_CHECK' });
-    });
-
-    it('should work with validationProcessor result interpreter', () => {
-        const innerProcessor = createValidationProcessor({
-            steps: [
-                {
-                    name: 'innerCheck',
-                    validator: (val: number) => val > 0,
-                    isError: ResultInterpreters.booleanMeansSuccess,
-                },
-            ] as const,
-        });
-
-        const outerProcessor = createValidationProcessor({
-            steps: [
-                {
-                    name: 'nestedValidation',
-                    validator: (input: TestInput) => innerProcessor(input.value),
-                    isError: ResultInterpreters.validationProcessor,
-                },
-            ] as const,
-        });
-
-        const validResult = outerProcessor({ value: 5, text: 'test' });
-        expect(validResult.isValid).toBe(true);
-
-        const invalidResult = outerProcessor({ value: -1, text: 'test' });
-        expect(invalidResult.isValid).toBe(false);
-        expect(invalidResult.errors.nestedValidation).toMatchObject({ isValid: false });
-    });
-
-    it('should handle empty steps array', () => {
-        const processor = createValidationProcessor<readonly []>({
-            steps: [],
-        });
-
-        const result = processor('any input' as never);
-        expect(result.isValid).toBe(true);
-        expect(result.errors).toEqual({});
-    });
-
-    it('should throw when validators throw errors', () => {
-        const steps = [
-            {
-                name: 'throwingValidator',
-                validator: (input: TestInput) => {
-                    if (input.value === 0) {
-                        throw new Error('Division by zero');
-                    }
-                    return true;
-                },
-                isError: ResultInterpreters.booleanMeansSuccess,
-            },
-        ] as const;
-
-        const processor = createValidationProcessor({ steps });
-
-        expect(() => processor({ value: 0, text: 'test' })).toThrow('Division by zero');
-    });
-
-    describe('complex validation scenarios', () => {
-        it('should handle multi-type validation results', () => {
-            type ComplexInput = {
-                email: string;
-                age: number;
-                tags: string[];
-            };
-
-            const steps = [
-                {
-                    name: 'emailFormat',
-                    validator: (input: ComplexInput) =>
-                        /\S+@\S+\.\S+/.test(input.email) ? null : 'Invalid email format',
-                    isError: ResultInterpreters.nullableIsSuccess,
-                },
-                {
-                    name: 'ageRange',
-                    validator: (input: ComplexInput) => input.age >= 18 && input.age <= 120,
-                    isError: ResultInterpreters.booleanMeansSuccess,
-                },
-                {
-                    name: 'tagValidation',
-                    validator: (input: ComplexInput) => {
-                        const invalidTags = input.tags.filter((tag) => tag.length < 2);
-                        return invalidTags;
-                    },
-                    isError: ResultInterpreters.errorList,
-                },
-            ] as const;
-
-            const processor = createValidationProcessor({ steps });
-
-            const validInput: ComplexInput = {
-                email: 'user@example.com',
-                age: 25,
-                tags: ['valid', 'tags', 'here'],
-            };
-            const validResult = processor(validInput);
-            expect(validResult.isValid).toBe(true);
-
-            const invalidInput: ComplexInput = {
-                email: 'invalid-email',
-                age: 150,
-                tags: ['ok', 'a', 'b', 'valid'],
-            };
-            const invalidResult = processor(invalidInput, { failFast: false });
-            expect(invalidResult.isValid).toBe(false);
-            expect(invalidResult.errors.emailFormat).toBe('Invalid email format');
-            expect(invalidResult.errors.ageRange).toBe(false);
-            expect(invalidResult.errors.tagValidation).toEqual(['a', 'b']);
-        });
-
-        it('should preserve type safety with heterogeneous result types', () => {
-            const steps = [
-                {
-                    name: 'stringResult',
-                    validator: () => 'error message',
-                    isError: (result: string) => result.length > 0,
-                },
-                {
-                    name: 'numberResult',
-                    validator: () => 42,
-                    isError: (result: number) => result !== 0,
-                },
-                {
-                    name: 'objectResult',
-                    validator: () => ({ code: 'ERR_001', severity: 'high' }),
-                    isError: (result: { code: string; severity: string }) => true,
-                },
-            ] as const;
-
-            const processor = createValidationProcessor({ steps });
-            const result = processor(null, { failFast: false });
-
-            expect(result.isValid).toBe(false);
-            expect(result.errors.stringResult).toBe('error message');
-            expect(result.errors.numberResult).toBe(42);
-            expect(result.errors.objectResult).toEqual({ code: 'ERR_001', severity: 'high' });
-        });
-    });
-
-    describe('edge cases', () => {
-        it('should handle undefined vs null in nullable interpreter', () => {
-            const steps = [
-                {
-                    name: 'nullCheck',
-                    validator: () => null,
-                    isError: ResultInterpreters.nullableIsSuccess,
-                },
-                {
-                    name: 'undefinedCheck',
-                    validator: () => undefined,
-                    isError: ResultInterpreters.nullableIsSuccess,
-                },
-                {
-                    name: 'zeroCheck',
-                    validator: () => 0,
-                    isError: ResultInterpreters.nullableIsSuccess,
-                },
-                {
-                    name: 'falseCheck',
-                    validator: () => false,
-                    isError: ResultInterpreters.nullableIsSuccess,
-                },
-            ] as const;
-
-            const processor = createValidationProcessor({ steps });
-            const result = processor(null, { failFast: false });
-
-            expect(result.isValid).toBe(false);
-            expect(result.errors.nullCheck).toBeUndefined();
-            expect(result.errors.undefinedCheck).toBeUndefined();
-            expect(result.errors.zeroCheck).toBe(0);
-            expect(result.errors.falseCheck).toBe(false);
-        });
-
-        it('should handle very long validation chains', () => {
-            // Test the real-world scenario of dynamically generated validation steps
-            // Note: This demonstrates a limitation of the current type system -
-            // dynamic step generation loses strict typing but still works at runtime
-            type StepInput = { value: number };
-
-            const steps = Array.from({ length: 50 }, (_, i) => ({
-                name: `step${i}`,
-                validator: (input: StepInput) => input.value > i,
-                isError: ResultInterpreters.booleanMeansSuccess,
-            }));
-
-            // For dynamic steps, we need to use a type assertion since TypeScript
-            // can't infer the literal string union from Array.from()
-            const processor = createValidationProcessor({
-                steps,
-            });
-
-            const result = processor({ value: 25 }, { failFast: false });
-            expect(result.isValid).toBe(false);
-
-            const errorCount = Object.keys(result.errors).length;
-            expect(errorCount).toBe(25);
-        });
-
-        it('should handle validation by sum typing their inputs', () => {
-            const processor = createValidationProcessor({
-                steps: [
-                    {
-                        name: 'step1',
-                        validator: ({ age }: { age: number }) => age > 18,
-                        isError: ResultInterpreters.booleanMeansSuccess,
-                    },
-                    {
-                        name: 'step2',
-                        validator: ({ name }: { name: string }) => name.length > 0,
-                        isError: ResultInterpreters.booleanMeansSuccess,
-                    },
-                ],
-            });
-
-            const result = processor({ age: 25, name: 'John' });
-            expect(result.isValid).toBe(true);
-
-            const result2 = processor({ age: 15, name: '' });
-            expect(result2.isValid).toBe(false);
-        });
-
-        it('should allow wider types as processor inputs', () => {
-            const sumProcessor = createValidationProcessor({
-                steps: [
-                    {
-                        name: 'step1',
-                        validator: ({ age }: { age: number }) => age > 18,
-                        isError: ResultInterpreters.booleanMeansSuccess,
-                    },
-                    {
-                        name: 'step2',
-                        validator: ({ name }: { name: string }) => name.length > 0,
-                        isError: ResultInterpreters.booleanMeansSuccess,
-                    },
-                ],
-            });
-            type Person = { age: number; name: string };
-            const groupProcessor = createValidationProcessor({
-                steps: [
-                    {
-                        name: 'step1',
-                        validator: ({ age }: Person) => age > 18,
-                        isError: ResultInterpreters.booleanMeansSuccess,
-                    },
-                    {
-                        name: 'step2',
-                        validator: ({ name }: Person) => name.length > 0,
-                        isError: ResultInterpreters.booleanMeansSuccess,
-                    },
-                ],
-            });
-
-            const result = sumProcessor({ age: 25, name: 'John', favoriteColor: 'red' });
-            expect(result.isValid).toBe(true);
-
-            const result2 = groupProcessor({ name: '', favoriteColor: 'red', age: 15 });
-            expect(result2.isValid).toBe(false);
-        });
-    });
-});
--- a/api/src/core/utils/validation/validation-processor.ts
+++ b/api/src/core/utils/validation/validation-processor.ts
@@ -1,230 +0,0 @@
-/**
- * @fileoverview Type-safe sequential validation processor
- *
- * This module provides a flexible validation system that allows you to chain multiple
- * validation steps together in a type-safe manner. It supports both fail-fast and
- * continue-on-error modes, with comprehensive error collection and reporting.
- *
- * Key features:
- * - Type-safe validation pipeline creation
- * - Sequential validation step execution
- * - Configurable fail-fast behavior (global or per-step)
- * - Comprehensive error collection with typed results
- * - Helper functions for common validation result interpretations
- *
- * @example
- * ```typescript
- * const validator = createValidationProcessor({
- *   steps: [
- *     {
- *       name: 'required',
- *       validator: (input: string) => input.length > 0,
- *       isError: ResultInterpreters.booleanMeansSuccess
- *     },
- *     {
- *       name: 'email',
- *       validator: (input: string) => /\S+@\S+\.\S+/.test(input),
- *       isError: ResultInterpreters.booleanMeansSuccess
- *     }
- *   ]
- * });
- *
- * const result = validator('user@example.com');
- * if (!result.isValid) {
- *   console.log('Validation errors:', result.errors);
- * }
- * ```
- */
-
-export type ValidationStepConfig<TInput, TResult, TName extends string = string> = {
-    name: TName;
-    validator: (input: TInput) => TResult;
-    isError: (result: TResult) => boolean;
-    alwaysFailFast?: boolean;
-};
-
-export interface ValidationPipelineConfig {
-    failFast?: boolean;
-}
-
-export type ValidationPipelineDefinition<
-    TInput,
-    TSteps extends readonly ValidationStepConfig<TInput, any, string>[],
-> = {
-    steps: TSteps;
-};
-
-export type ExtractStepResults<TSteps extends readonly ValidationStepConfig<any, any, string>[]> = {
-    [K in TSteps[number]['name']]: Extract<TSteps[number], { name: K }> extends ValidationStepConfig<
-        any,
-        infer R,
-        K
-    >
-        ? R
-        : never;
-};
-
-export type ValidationResult<TSteps extends readonly ValidationStepConfig<any, any, string>[]> = {
-    isValid: boolean;
-    errors: Partial<ExtractStepResults<TSteps>>;
-};
-
-// Util: convert a union to an intersection
-type UnionToIntersection<U> = (U extends any ? (arg: U) => void : never) extends (arg: infer I) => void
-    ? I
-    : never;
-
-// Extract the *intersection* of all input types required by the steps. This guarantees that
-// the resulting processor knows about every property that any individual step relies on.
-// We purposely compute an intersection (not a union) so that all required fields are present.
-type ExtractInputType<TSteps extends readonly ValidationStepConfig<any, any, string>[]> =
-    UnionToIntersection<
-        TSteps[number] extends ValidationStepConfig<infer TInput, any, string> ? TInput : never
-    >;
-
-/**
- * Creates a type-safe validation processor that executes a series of validation steps
- * sequentially and collects errors from failed validations.
- *
- * This function returns a validation processor that can be called with input data
- * and an optional configuration object. The processor will run each validation step
- * in order, collecting any errors that occur.
- *
- * @template TSteps - A readonly array of validation step configurations that defines
- *                   the validation pipeline. The type is constrained to ensure type safety
- *                   across all steps and their results.
- *
- * @param definition - The validation pipeline definition
- * @param definition.steps - An array of validation step configurations. Each step must have:
- *   - `name`: A unique string identifier for the step
- *   - `validator`: A function that takes input and returns a validation result
- *   - `isError`: A function that determines if the validation result represents an error
- *   - `alwaysFailFast`: Optional flag to always stop execution on this step's failure
- *
- * @returns A validation processor function that accepts:
- *   - `input`: The data to validate (type inferred from the first validation step)
- *   - `config`: Optional configuration object with:
- *     - `failFast`: If true, stops execution on first error (unless overridden by step config)
- *
- * @example Basic usage with string validation
- * ```typescript
- * const nameValidator = createValidationProcessor({
- *   steps: [
- *     {
- *       name: 'required',
- *       validator: (input: string) => input.trim().length > 0,
- *       isError: ResultInterpreters.booleanMeansSuccess
- *     },
- *     {
- *       name: 'minLength',
- *       validator: (input: string) => input.length >= 2,
- *       isError: ResultInterpreters.booleanMeansSuccess
- *     },
- *     {
- *       name: 'maxLength',
- *       validator: (input: string) => input.length <= 50,
- *       isError: ResultInterpreters.booleanMeansSuccess
- *     }
- *   ]
- * });
- *
- * const result = nameValidator('John');
- * // result.isValid: boolean
- * // result.errors: { required?: boolean, minLength?: boolean, maxLength?: boolean }
- * ```
- *
- * @example Complex validation with custom error types
- * ```typescript
- * type ValidationError = { message: string; code: string };
- *
- * const userValidator = createValidationProcessor({
- *   steps: [
- *     {
- *       name: 'email',
- *       validator: (user: { email: string }) =>
- *         /\S+@\S+\.\S+/.test(user.email)
- *           ? null
- *           : { message: 'Invalid email format', code: 'INVALID_EMAIL' },
- *       isError: (result): result is ValidationError => result !== null
- *     },
- *     {
- *       name: 'age',
- *       validator: (user: { age: number }) =>
- *         user.age >= 18
- *           ? null
- *           : { message: 'Must be 18 or older', code: 'UNDERAGE' },
- *       isError: (result): result is ValidationError => result !== null,
- *       alwaysFailFast: true // Stop immediately if age validation fails
- *     }
- *   ]
- * });
- * ```
- *
- * @example Using fail-fast mode
- * ```typescript
- * const result = validator(input, { failFast: true });
- * // Stops on first error, even if subsequent steps would also fail
- * ```
- *
- * @since 1.0.0
- */
-export function createValidationProcessor<
-    const TSteps extends readonly ValidationStepConfig<any, any, string>[],
->(definition: { steps: TSteps }) {
-    // Determine the base input type required by all steps (intersection).
-    type BaseInput = ExtractInputType<TSteps>;
-
-    // Helper: widen input type for object literals while keeping regular objects assignable.
-    type InputWithExtras = BaseInput extends object
-        ? BaseInput | (BaseInput & Record<string, unknown>)
-        : BaseInput;
-
-    return function processValidation(
-        input: InputWithExtras,
-        config: ValidationPipelineConfig = {}
-    ): ValidationResult<TSteps> {
-        const errors: Partial<ExtractStepResults<TSteps>> = {};
-        let hasErrors = false;
-
-        for (const step of definition.steps) {
-            const result = step.validator(input as BaseInput);
-            const isError = step.isError(result);
-
-            if (isError) {
-                hasErrors = true;
-                (errors as any)[step.name] = result;
-
-                // Always fail fast for steps marked as such, or when global failFast is enabled
-                if (step.alwaysFailFast || config.failFast) {
-                    break;
-                }
-            }
-        }
-
-        return {
-            isValid: !hasErrors,
-            errors,
-        };
-    };
-}
-
-/** Helper functions for common result interpretations */
-export const ResultInterpreters = {
-    /** For boolean results: true = success, false = error */
-    booleanMeansSuccess: (result: boolean): boolean => !result,
-
-    /** For boolean results: false = success, true = error */
-    booleanMeansFailure: (result: boolean): boolean => result,
-
-    /** For nullable results: null/undefined = success, anything else = error */
-    nullableIsSuccess: <T>(result: T | null | undefined): boolean => result != null,
-
-    /** For array results: empty = success, non-empty = error */
-    errorList: <T>(result: T[]): boolean => result.length > 0,
-
-    /** For custom predicate */
-    custom: <T>(predicate: (result: T) => boolean) => predicate,
-
-    /** Interpreting the result of a validation processor */
-    validationProcessor: (result: { isValid: boolean }) => !result.isValid,
-} as const;
--- a/api/src/customization/activation-code.dto.ts
+++ b/api/src/customization/activation-code.dto.ts
--- a/api/src/environment.ts
+++ b/api/src/environment.ts
@@ -2,6 +2,7 @@
 // Non-function exports from this module are loaded into the NestJS Config at runtime.

 import { readFileSync } from 'node:fs';
+import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { fileURLToPath } from 'node:url';

@@ -66,7 +67,6 @@ export const getPackageJsonDependencies = (): string[] | undefined => {

 export const API_VERSION = process.env.npm_package_version ?? getPackageJson().version;

-/** Controls how the app is built/run (i.e. in terms of optimization) */
 export const NODE_ENV =
    (process.env.NODE_ENV as 'development' | 'test' | 'staging' | 'production') ?? 'production';
 export const environment = {
@@ -76,7 +76,6 @@ export const CHOKIDAR_USEPOLLING = process.env.CHOKIDAR_USEPOLLING === 'true';
 export const IS_DOCKER = process.env.IS_DOCKER === 'true';
 export const DEBUG = process.env.DEBUG === 'true';
 export const INTROSPECTION = process.env.INTROSPECTION === 'true';
-/** Determines the app-level & business logic environment (i.e. what data & infrastructure is used) */
 export const ENVIRONMENT = process.env.ENVIRONMENT
    ? (process.env.ENVIRONMENT as 'production' | 'staging' | 'development')
    : 'production';
@@ -91,25 +90,16 @@ export const LOG_LEVEL = process.env.LOG_LEVEL
    : process.env.ENVIRONMENT === 'production'
      ? 'INFO'
      : 'DEBUG';
-export const SUPPRESS_LOGS = process.env.SUPPRESS_LOGS === 'true';
 export const MOTHERSHIP_GRAPHQL_LINK = process.env.MOTHERSHIP_GRAPHQL_LINK
    ? process.env.MOTHERSHIP_GRAPHQL_LINK
    : ENVIRONMENT === 'staging'
      ? 'https://staging.mothership.unraid.net/ws'
      : 'https://mothership.unraid.net/ws';

-export const PM2_HOME = process.env.PM2_HOME ?? '/var/log/.pm2';
+export const PM2_HOME = process.env.PM2_HOME ?? join(homedir(), '.pm2');
 export const PM2_PATH = join(import.meta.dirname, '../../', 'node_modules', 'pm2', 'bin', 'pm2');
 export const ECOSYSTEM_PATH = join(import.meta.dirname, '../../', 'ecosystem.config.json');
-export const PATHS_LOGS_DIR =
-    process.env.PATHS_LOGS_DIR ?? process.env.LOGS_DIR ?? '/var/log/unraid-api';
-export const PATHS_LOGS_FILE = process.env.PATHS_LOGS_FILE ?? '/var/log/graphql-api.log';
+export const LOGS_DIR = process.env.LOGS_DIR ?? '/var/log/unraid-api';

 export const PATHS_CONFIG_MODULES =
    process.env.PATHS_CONFIG_MODULES ?? '/boot/config/plugins/dynamix.my.servers/configs';
-
-export const PATHS_LOCAL_SESSION_FILE =
-    process.env.PATHS_LOCAL_SESSION_FILE ?? '/var/run/unraid-api/local-session';
-
-/** feature flag for the upcoming docker release */
-export const ENABLE_NEXT_DOCKER_RELEASE = process.env.ENABLE_NEXT_DOCKER_RELEASE === 'true';
--- a/api/src/graphql/client/api/get-api-client.ts
+++ b/api/src/graphql/client/api/get-api-client.ts
@@ -0,0 +1,77 @@
+import { ApolloClient, HttpLink, InMemoryCache, split } from '@apollo/client/core/index.js';
+import { onError } from '@apollo/client/link/error/index.js';
+import { GraphQLWsLink } from '@apollo/client/link/subscriptions/index.js';
+import { getMainDefinition } from '@apollo/client/utilities/index.js';
+import { fetch } from 'cross-fetch';
+import { createClient } from 'graphql-ws';
+import WebSocket from 'ws';
+
+import { getInternalApiAddress } from '@app/consts.js';
+import { graphqlLogger } from '@app/core/log.js';
+import { getters } from '@app/store/index.js';
+
+const getWebsocketWithHeaders = () => {
+    return class WebsocketWithOriginHeader extends WebSocket {
+        constructor(address, protocols) {
+            super(address, protocols, {
+                headers: {
+                    Origin: '/var/run/unraid-cli.sock',
+                    'Content-Type': 'application/json',
+                },
+            });
+        }
+    };
+};
+
+export const getApiApolloClient = ({ localApiKey }: { localApiKey: string }) => {
+    const nginxPort = getters?.emhttp()?.nginx?.httpPort ?? 80;
+    graphqlLogger.debug('Internal GraphQL URL: %s', getInternalApiAddress(true, nginxPort));
+    const httpLink = new HttpLink({
+        uri: getInternalApiAddress(true, nginxPort),
+        fetch,
+        headers: {
+            Origin: '/var/run/unraid-cli.sock',
+            'x-api-key': localApiKey,
+            'Content-Type': 'application/json',
+        },
+    });
+
+    // Create the subscription websocket link
+    const wsLink = new GraphQLWsLink(
+        createClient({
+            webSocketImpl: getWebsocketWithHeaders(),
+            url: getInternalApiAddress(false, nginxPort),
+            connectionParams: () => {
+                return { 'x-api-key': localApiKey };
+            },
+        })
+    );
+
+    const splitLink = split(
+        ({ query }) => {
+            const definition = getMainDefinition(query);
+            return definition.kind === 'OperationDefinition' && definition.operation === 'subscription';
+        },
+        wsLink,
+        httpLink
+    );
+
+    const errorLink = onError(({ networkError }) => {
+        if (networkError) {
+            graphqlLogger.warn('[GRAPHQL-CLIENT] NETWORK ERROR ENCOUNTERED %o', networkError);
+        }
+    });
+
+    return new ApolloClient({
+        defaultOptions: {
+            query: {
+                fetchPolicy: 'no-cache',
+            },
+            mutate: {
+                fetchPolicy: 'no-cache',
+            },
+        },
+        cache: new InMemoryCache(),
+        link: errorLink.concat(splitLink),
+    });
+};
--- a/api/src/graphql/client/api/queries.ts
+++ b/api/src/graphql/client/api/queries.ts
@@ -0,0 +1,35 @@
+export const GET_CLOUD_OBJECT = /* GraphQL */ `
+    query getCloud {
+        cloud {
+            error
+            apiKey {
+                valid
+                error
+            }
+            minigraphql {
+                status
+                timeout
+                error
+            }
+            cloud {
+                status
+                error
+                ip
+            }
+            allowedOrigins
+        }
+    }
+`;
+
+export const GET_SERVERS = /* GraphQL */ `
+    query getServers {
+        servers {
+            name
+            guid
+            status
+            owner {
+                username
+            }
+        }
+    }
+`;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
renovate[bot]	5fb34f3c91	Merge `d159d4b0dd` into `4168f43e3e`	2025-07-09 15:03:20 +00:00
renovate[bot]	d159d4b0dd	fix(deps): update all non-major dependencies	2025-07-09 15:03:17 +00:00
@@ -1 +1 @@
 .18.0
 .17.0
				`@@ -1 +0,0 @@`
				`# custom log directory for tests & development`