Merge 16dfdd7082 into ab11e7ff7f

chore(deps): pin dependency prettier-plugin-tailwindcss to 0.6.14
2026-01-02 22:50:02 -06:00 · 2025-08-27 20:27:40 +00:00 · 2025-08-27 20:27:37 +00:00
644 changed files with 15798 additions and 40575 deletions
--- a/.claude/settings.json
+++ b/.claude/settings.json
@@ -1,3 +1,123 @@
 {
-  "permissions": {}
+  "permissions": {
+    "allow": [
+      "# Development Commands",
+      "Bash(pnpm install)",
+      "Bash(pnpm dev)",
+      "Bash(pnpm build)",
+      "Bash(pnpm test)",
+      "Bash(pnpm test:*)",
+      "Bash(pnpm lint)",
+      "Bash(pnpm lint:fix)",
+      "Bash(pnpm type-check)",
+      "Bash(pnpm codegen)",
+      "Bash(pnpm storybook)",
+      "Bash(pnpm --filter * dev)",
+      "Bash(pnpm --filter * build)",
+      "Bash(pnpm --filter * test)",
+      "Bash(pnpm --filter * lint)",
+      "Bash(pnpm --filter * codegen)",
+      
+      "# Git Commands (read-only)",
+      "Bash(git status)",
+      "Bash(git diff)",
+      "Bash(git log)",
+      "Bash(git branch)",
+      "Bash(git remote -v)",
+      
+      "# Search Commands",
+      "Bash(rg *)",
+      
+      "# File System (read-only)",
+      "Bash(ls)",
+      "Bash(ls -la)",
+      "Bash(pwd)",
+      "Bash(find . -name)",
+      "Bash(find . -type)",
+      
+      "# Node/NPM Commands",
+      "Bash(node --version)",
+      "Bash(pnpm --version)",
+      "Bash(npx --version)",
+      
+      "# Environment Commands",
+      "Bash(echo $*)",
+      "Bash(which *)",
+      
+      "# Process Commands",
+      "Bash(ps aux | grep)",
+      "Bash(lsof -i)",
+      
+      "# Documentation Domains",
+      "WebFetch(domain:tailwindcss.com)",
+      "WebFetch(domain:github.com)",
+      "WebFetch(domain:reka-ui.com)",
+      "WebFetch(domain:nodejs.org)",
+      "WebFetch(domain:pnpm.io)",
+      "WebFetch(domain:vitejs.dev)",
+      "WebFetch(domain:nuxt.com)",
+      "WebFetch(domain:nestjs.com)",
+      
+      "# IDE Integration",
+      "mcp__ide__getDiagnostics",
+      
+      "# Browser MCP (for testing)",
+      "mcp__browsermcp__browser_navigate",
+      "mcp__browsermcp__browser_click",
+      "mcp__browsermcp__browser_screenshot"
+    ],
+    "deny": [
+      "# Dangerous Commands",
+      "Bash(rm -rf)",
+      "Bash(chmod 777)",
+      "Bash(curl)",
+      "Bash(wget)",
+      "Bash(ssh)",
+      "Bash(scp)",
+      "Bash(sudo)",
+      "Bash(su)",
+      "Bash(pkill)",
+      "Bash(kill)",
+      "Bash(killall)",
+      "Bash(python)",
+      "Bash(python3)",
+      "Bash(pip)",
+      "Bash(npm)",
+      "Bash(yarn)",
+      "Bash(apt)",
+      "Bash(brew)",
+      "Bash(systemctl)",
+      "Bash(service)",
+      "Bash(docker)",
+      "Bash(docker-compose)",
+      
+      "# File Modification (use Edit/Write tools instead)",
+      "Bash(sed)",
+      "Bash(awk)",
+      "Bash(perl)",
+      "Bash(echo > *)",
+      "Bash(echo >> *)",
+      "Bash(cat > *)",
+      "Bash(cat >> *)",
+      "Bash(tee)",
+      
+      "# Git Write Commands (require explicit user action)",
+      "Bash(git add)",
+      "Bash(git commit)",
+      "Bash(git push)",
+      "Bash(git pull)",
+      "Bash(git merge)",
+      "Bash(git rebase)",
+      "Bash(git checkout)",
+      "Bash(git reset)",
+      "Bash(git clean)",
+      
+      "# Package Management Write Commands",
+      "Bash(pnpm add)",
+      "Bash(pnpm remove)",
+      "Bash(pnpm update)",
+      "Bash(pnpm upgrade)"
+    ]
+  },
+  "enableAllProjectMcpServers": false
 }
--- 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
@@ -51,16 +49,21 @@ jobs:
        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,6 +74,14 @@ 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 }}
@@ -86,7 +97,7 @@ jobs:
        uses: actions/download-artifact@v5
        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
@@ -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.yml
+++ b/.github/workflows/claude.yml
@@ -0,0 +1,64 @@
+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/create-docusaurus-pr.yml
+++ b/.github/workflows/create-docusaurus-pr.yml
@@ -0,0 +1,82 @@
+name: Update API Documentation
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'api/docs/**'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+# Add permissions for GITHUB_TOKEN
+permissions:
+  contents: write
+  pull-requests: write
+jobs:
+  create-docs-pr:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source repository
+        uses: actions/checkout@v5
+        with:
+          path: source-repo
+
+      - name: Checkout docs repository
+        uses: actions/checkout@v5
+        with:
+          repository: unraid/docs
+          path: docs-repo
+          token: ${{ secrets.DOCS_PAT_UNRAID_BOT }}
+
+      - name: Copy and process 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:
+          token: ${{ secrets.DOCS_PAT_UNRAID_BOT }}
+          path: docs-repo
+          commit-message: 'docs: update API documentation'
+          title: 'Update API Documentation'
+          body: |
+            This PR updates the API documentation based on changes from the main repository.
+            
+            Changes were automatically generated from api/docs/* directory.
+
+            @coderabbitai ignore
+          reviewers: ljm42, elibosley
+          branch: update-api-docs
+          base: main
+          delete-branch: true
--- a/.github/workflows/deploy-storybook.yml
+++ b/.github/workflows/deploy-storybook.yml
@@ -22,17 +22,16 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v5

+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22.18.0'
+
      - 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
        with:
@@ -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@v5
+        # 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:
@@ -24,25 +38,36 @@ jobs:
    steps:
      - name: Checkout repo
        uses: actions/checkout@v5
+
+      - 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.3
+        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
@@ -166,16 +165,29 @@ jobs:
      - name: Checkout repo
        uses: actions/checkout@v5

+      - 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
@@ -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
@@ -230,16 +242,29 @@ jobs:
      - name: Checkout repo
        uses: actions/checkout@v5

+      - 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
@@ -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: |
@@ -310,6 +349,9 @@ jobs:
      - name: Type Check
        run: pnpm run type-check

+      - name: Test
+        run: pnpm run test:ci
+
      - name: Build
        run: pnpm run build

@@ -317,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
@@ -368,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
@@ -381,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,16 +28,16 @@ jobs:
        with:
          latest: true
          prerelease: false
-      - uses: actions/setup-node@v5
+      - uses: actions/setup-node@v4
        with:
-          node-version: 22.19.0
+          node-version: '22.18.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');
@@ -124,22 +124,3 @@ jobs:
            --no-guess-mime-type \
            --content-encoding none \
            --acl public-read
-
-      - name: Discord Webhook Notification
-        uses: tsickert/discord-webhook@v7.0.0
-        with:
-          webhook-url: ${{ secrets.PUBLIC_DISCORD_RELEASE_ENDPOINT }}
-          username: "Unraid API Bot"
-          avatar-url: "https://craftassets.unraid.net/uploads/logos/un-mark-gradient.png"
-          embed-title: "🚀 Unraid API ${{ inputs.version }} Released!"
-          embed-url: "https://github.com/${{ github.repository }}/releases/tag/${{ inputs.version }}"
-          embed-description: |
-            A new version of Unraid API has been released!
-
-            **Version:** `${{ inputs.version }}`
-            **Release Page:** [View on GitHub](https://github.com/${{ github.repository }}/releases/tag/${{ inputs.version }})
-
-            **📋 Changelog:**
-            ${{ steps.release-info.outputs.body }}
-          embed-color: 16734296
-          embed-footer-text: "Unraid API • Automated Release"
--- 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@v5
+        with:
+          submodules: recursive
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.13.7"
+
+      - name: Cache APT Packages
+        uses: awalsh128/cache-apt-pkgs-action@v1.5.3
+        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.15.0
+          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

@@ -122,4 +118,3 @@ api/dev/Unraid.net/myservers.cfg

 # local Mise settings
 .mise.toml
-
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1 +1 @@
-{".":"4.25.1"}
+{".":"4.16.0"}
--- a/@tailwind-shared/base-utilities.css
+++ b/@tailwind-shared/base-utilities.css
@@ -1,8 +1,7 @@
@custom-variant dark (&:where(.dark, .dark *));

-/* Utility defaults for web components (when we were using shadow DOM) */
-:host,
-.unapi {
+@layer utilities {
+  :host {
    --tw-divide-y-reverse: 0;
    --tw-border-style: solid;
    --tw-font-weight: initial;
@@ -49,20 +48,21 @@
    --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));
-}
-*/
+@layer base {
+  *,
+  ::after,
+  ::before,
+  ::backdrop,
+  ::file-selector-button {
+    border-color: hsl(var(--border));
+  }

-.unapi {
+
+
+  body {
    --color-alpha: #1c1b1b;
    --color-beta: #f2f2f2;
    --color-gamma: #999999;
@@ -74,25 +74,8 @@
    --ring-shadow: 0 0 var(--color-beta);
  }

-.unapi button:not(:disabled),
-.unapi [role='button']:not(:disabled) {
-  cursor: pointer;
-}
-
-/* Font size overrides for SSO button component */
-.unapi unraid-sso-button,
-unraid-sso-button.unapi {
-  --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;
-}
+  button:not(:disabled),
+  [role='button']:not(:disabled) {
+    cursor: pointer;
+  }
+}
--- a/@tailwind-shared/css-variables.css
+++ b/@tailwind-shared/css-variables.css
@@ -1,61 +1,7 @@
 /* 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;
-    
+@layer base {
+  /* Light mode defaults */
+  :root {
    --background: 0 0% 100%;
    --foreground: 0 0% 3.9%;
    --muted: 0 0% 96.1%;
@@ -66,7 +12,7 @@
    --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: 0 0% 9%;
    --primary-foreground: 0 0% 98%;
    --secondary: 0 0% 96.1%;
    --secondary-foreground: 0 0% 9%;
@@ -74,7 +20,7 @@
    --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 */
+    --ring: 0 0% 3.9%;
    --chart-1: 12 76% 61%;
    --chart-2: 173 58% 39%;
    --chart-3: 197 37% 24%;
@@ -84,31 +30,6 @@

  /* 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%;
@@ -119,15 +40,15 @@
    --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%;
+    --primary: 0 0% 98%;
+    --primary-foreground: 0 0% 9%;
    --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 */
+    --ring: 0 0% 83.1%;
    --chart-1: 220 70% 50%;
    --chart-2: 160 60% 45%;
    --chart-3: 30 80% 55%;
@@ -141,4 +62,69 @@
    --background: 0 0% 3.9%;
    --foreground: 0 0% 98%;
    --border: 0 0% 14.9%;
-  }
+  }
+
+  /* For web components: inherit CSS variables from the host */
+  :host {
+    --background: inherit;
+    --foreground: inherit;
+    --muted: inherit;
+    --muted-foreground: inherit;
+    --popover: inherit;
+    --popover-foreground: inherit;
+    --card: inherit;
+    --card-foreground: inherit;
+    --border: inherit;
+    --input: inherit;
+    --primary: inherit;
+    --primary-foreground: inherit;
+    --secondary: inherit;
+    --secondary-foreground: inherit;
+    --accent: inherit;
+    --accent-foreground: inherit;
+    --destructive: inherit;
+    --destructive-foreground: inherit;
+    --ring: inherit;
+    --chart-1: inherit;
+    --chart-2: inherit;
+    --chart-3: inherit;
+    --chart-4: inherit;
+    --chart-5: inherit;
+  }
+
+  /* Class-based dark mode support for web components using :host-context */
+  :host-context(.dark) {
+    --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: 0 0% 98%;
+    --primary-foreground: 0 0% 9%;
+    --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: 0 0% 83.1%;
+    --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 */
+  :host-context(.dark[data-theme='black']),
+  :host-context(.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 +1,5 @@
 /* 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';
+@import './sonner.css';
--- a/@tailwind-shared/sonner.css
+++ b/@tailwind-shared/sonner.css
@@ -0,0 +1,665 @@
+/**------------------------------------------------------------------------------------------------
+ *                                           SONNER.CSS
+ *   This is a copy of Sonner's `style.css` as of commit a5b77c2df08d5c05aa923170176168102855533d
+ *   
+ *   This was necessary because I couldn't find a simple way to include Sonner's styles in vite's
+ *   css build output. They wouldn't show up even though the toaster was included, and vue-sonner
+ *   currently doesn't export its stylesheet (it appears to be inlined, but styles weren't applied
+ *   to the unraid-toaster component for some reason).
+ *------------------------------------------------------------------------------------------------**/
+:where(html[dir='ltr']),
+:where([data-sonner-toaster][dir='ltr']) {
+  --toast-icon-margin-start: -3px;
+  --toast-icon-margin-end: 4px;
+  --toast-svg-margin-start: -1px;
+  --toast-svg-margin-end: 0px;
+  --toast-button-margin-start: auto;
+  --toast-button-margin-end: 0;
+  --toast-close-button-start: 0;
+  --toast-close-button-end: unset;
+  --toast-close-button-transform: translate(-35%, -35%);
+}
+
+:where(html[dir='rtl']),
+:where([data-sonner-toaster][dir='rtl']) {
+  --toast-icon-margin-start: 4px;
+  --toast-icon-margin-end: -3px;
+  --toast-svg-margin-start: 0px;
+  --toast-svg-margin-end: -1px;
+  --toast-button-margin-start: 0;
+  --toast-button-margin-end: auto;
+  --toast-close-button-start: unset;
+  --toast-close-button-end: 0;
+  --toast-close-button-transform: translate(35%, -35%);
+}
+
+:where([data-sonner-toaster]) {
+  position: fixed;
+  width: var(--width);
+  font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica Neue, Arial,
+    Noto Sans, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji;
+  --gray1: hsl(0, 0%, 99%);
+  --gray2: hsl(0, 0%, 97.3%);
+  --gray3: hsl(0, 0%, 95.1%);
+  --gray4: hsl(0, 0%, 93%);
+  --gray5: hsl(0, 0%, 90.9%);
+  --gray6: hsl(0, 0%, 88.7%);
+  --gray7: hsl(0, 0%, 85.8%);
+  --gray8: hsl(0, 0%, 78%);
+  --gray9: hsl(0, 0%, 56.1%);
+  --gray10: hsl(0, 0%, 52.3%);
+  --gray11: hsl(0, 0%, 43.5%);
+  --gray12: hsl(0, 0%, 9%);
+  --border-radius: 8px;
+  box-sizing: border-box;
+  padding: 0;
+  margin: 0;
+  list-style: none;
+  outline: none;
+  z-index: 999999999;
+  transition: transform 400ms ease;
+}
+
+:where([data-sonner-toaster][data-lifted='true']) {
+  transform: translateY(-10px);
+}
+
+@media (hover: none) and (pointer: coarse) {
+  :where([data-sonner-toaster][data-lifted='true']) {
+    transform: none;
+  }
+}
+
+:where([data-sonner-toaster][data-x-position='right']) {
+  right: max(var(--offset), env(safe-area-inset-right));
+}
+
+:where([data-sonner-toaster][data-x-position='left']) {
+  left: max(var(--offset), env(safe-area-inset-left));
+}
+
+:where([data-sonner-toaster][data-x-position='center']) {
+  left: 50%;
+  transform: translateX(-50%);
+}
+
+:where([data-sonner-toaster][data-y-position='top']) {
+  top: max(var(--offset), env(safe-area-inset-top));
+}
+
+:where([data-sonner-toaster][data-y-position='bottom']) {
+  bottom: max(var(--offset), env(safe-area-inset-bottom));
+}
+
+:where([data-sonner-toast]) {
+  --y: translateY(100%);
+  --lift-amount: calc(var(--lift) * var(--gap));
+  z-index: var(--z-index);
+  position: absolute;
+  opacity: 0;
+  transform: var(--y);
+  filter: blur(0);
+  /* https://stackoverflow.com/questions/48124372/pointermove-event-not-working-with-touch-why-not */
+  touch-action: none;
+  transition: transform 400ms, opacity 400ms, height 400ms, box-shadow 200ms;
+  box-sizing: border-box;
+  outline: none;
+  overflow-wrap: anywhere;
+}
+
+:where([data-sonner-toast][data-styled='true']) {
+  padding: 16px;
+  background: var(--normal-bg);
+  border: 1px solid var(--normal-border);
+  color: var(--normal-text);
+  border-radius: var(--border-radius);
+  box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.1);
+  width: var(--width);
+  font-size: 13px;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+
+:where([data-sonner-toast]:focus-visible) {
+  box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.1), 0 0 0 2px rgba(0, 0, 0, 0.2);
+}
+
+:where([data-sonner-toast][data-y-position='top']) {
+  top: 0;
+  --y: translateY(-100%);
+  --lift: 1;
+  --lift-amount: calc(1 * var(--gap));
+}
+
+:where([data-sonner-toast][data-y-position='bottom']) {
+  bottom: 0;
+  --y: translateY(100%);
+  --lift: -1;
+  --lift-amount: calc(var(--lift) * var(--gap));
+}
+
+:where([data-sonner-toast]) :where([data-description]) {
+  font-weight: 400;
+  line-height: 1.4;
+  color: inherit;
+}
+
+:where([data-sonner-toast]) :where([data-title]) {
+  font-weight: 500;
+  line-height: 1.5;
+  color: inherit;
+}
+
+:where([data-sonner-toast]) :where([data-icon]) {
+  display: flex;
+  height: 16px;
+  width: 16px;
+  position: relative;
+  justify-content: flex-start;
+  align-items: center;
+  flex-shrink: 0;
+  margin-left: var(--toast-icon-margin-start);
+  margin-right: var(--toast-icon-margin-end);
+}
+
+:where([data-sonner-toast][data-promise='true']) :where([data-icon]) > svg {
+  opacity: 0;
+  transform: scale(0.8);
+  transform-origin: center;
+  animation: sonner-fade-in 300ms ease forwards;
+}
+
+:where([data-sonner-toast]) :where([data-icon]) > * {
+  flex-shrink: 0;
+}
+
+:where([data-sonner-toast]) :where([data-icon]) svg {
+  margin-left: var(--toast-svg-margin-start);
+  margin-right: var(--toast-svg-margin-end);
+}
+
+:where([data-sonner-toast]) :where([data-content]) {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+}
+
+[data-sonner-toast][data-styled='true'] [data-button] {
+  border-radius: 4px;
+  padding-left: 8px;
+  padding-right: 8px;
+  height: 24px;
+  font-size: 12px;
+  color: var(--normal-bg);
+  background: var(--normal-text);
+  margin-left: var(--toast-button-margin-start);
+  margin-right: var(--toast-button-margin-end);
+  border: none;
+  cursor: pointer;
+  outline: none;
+  display: flex;
+  align-items: center;
+  flex-shrink: 0;
+  transition: opacity 400ms, box-shadow 200ms;
+}
+
+:where([data-sonner-toast]) :where([data-button]):focus-visible {
+  box-shadow: 0 0 0 2px rgba(0, 0, 0, 0.4);
+}
+
+:where([data-sonner-toast]) :where([data-button]):first-of-type {
+  margin-left: var(--toast-button-margin-start);
+  margin-right: var(--toast-button-margin-end);
+}
+
+:where([data-sonner-toast]) :where([data-cancel]) {
+  color: var(--normal-text);
+  background: rgba(0, 0, 0, 0.08);
+}
+
+:where([data-sonner-toast][data-theme='dark']) :where([data-cancel]) {
+  background: rgba(255, 255, 255, 0.3);
+}
+
+[data-sonner-toast] [data-close-button] {
+  position: absolute;
+  left: var(--toast-close-button-start);
+  right: var(--toast-close-button-end);
+  top: 0;
+  height: 20px;
+  width: 20px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 0;
+  color: var(--gray12);
+  border: 1px solid var(--gray4);
+  transform: var(--toast-close-button-transform);
+  border-radius: 50%;
+  cursor: pointer;
+  z-index: 1;
+  transition: opacity 100ms, background 200ms, border-color 200ms;
+}
+
+[data-sonner-toast] [data-close-button] {
+  background: var(--gray1);
+}
+
+:where([data-sonner-toast]) :where([data-close-button]):focus-visible {
+  box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.1), 0 0 0 2px rgba(0, 0, 0, 0.2);
+}
+
+:where([data-sonner-toast]) :where([data-disabled='true']) {
+  cursor: not-allowed;
+}
+
+[data-sonner-toast]:hover [data-close-button]:hover {
+  background: var(--gray2);
+  border-color: var(--gray5);
+}
+
+/* Leave a ghost div to avoid setting hover to false when swiping out */
+:where([data-sonner-toast][data-swiping='true'])::before {
+  content: '';
+  position: absolute;
+  left: 0;
+  right: 0;
+  height: 100%;
+  z-index: -1;
+}
+
+:where([data-sonner-toast][data-y-position='top'][data-swiping='true'])::before {
+  /* y 50% needed to distribute height additional height evenly */
+  bottom: 50%;
+  transform: scaleY(3) translateY(50%);
+}
+
+:where([data-sonner-toast][data-y-position='bottom'][data-swiping='true'])::before {
+  /* y -50% needed to distribute height additional height evenly */
+  top: 50%;
+  transform: scaleY(3) translateY(-50%);
+}
+
+/* Leave a ghost div to avoid setting hover to false when transitioning out */
+:where([data-sonner-toast][data-swiping='false'][data-removed='true'])::before {
+  content: '';
+  position: absolute;
+  inset: 0;
+  transform: scaleY(2);
+}
+
+/* Needed to avoid setting hover to false when inbetween toasts */
+:where([data-sonner-toast])::after {
+  content: '';
+  position: absolute;
+  left: 0;
+  height: calc(var(--gap) + 1px);
+  bottom: 100%;
+  width: 100%;
+}
+
+:where([data-sonner-toast][data-mounted='true']) {
+  --y: translateY(0);
+  opacity: 1;
+}
+
+:where([data-sonner-toast][data-expanded='false'][data-front='false']) {
+  --scale: var(--toasts-before) * 0.05 + 1;
+  --y: translateY(calc(var(--lift-amount) * var(--toasts-before))) scale(calc(-1 * var(--scale)));
+  height: var(--front-toast-height);
+}
+
+:where([data-sonner-toast]) > * {
+  transition: opacity 400ms;
+}
+
+:where([data-sonner-toast][data-expanded='false'][data-front='false'][data-styled='true']) > * {
+  opacity: 0;
+}
+
+:where([data-sonner-toast][data-visible='false']) {
+  opacity: 0;
+  pointer-events: none;
+}
+
+:where([data-sonner-toast][data-mounted='true'][data-expanded='true']) {
+  --y: translateY(calc(var(--lift) * var(--offset)));
+  height: var(--initial-height);
+}
+
+:where([data-sonner-toast][data-removed='true'][data-front='true'][data-swipe-out='false']) {
+  --y: translateY(calc(var(--lift) * -100%));
+  opacity: 0;
+}
+
+:where([data-sonner-toast][data-removed='true'][data-front='false'][data-swipe-out='false'][data-expanded='true']) {
+  --y: translateY(calc(var(--lift) * var(--offset) + var(--lift) * -100%));
+  opacity: 0;
+}
+
+:where([data-sonner-toast][data-removed='true'][data-front='false'][data-swipe-out='false'][data-expanded='false']) {
+  --y: translateY(40%);
+  opacity: 0;
+  transition: transform 500ms, opacity 200ms;
+}
+
+/* Bump up the height to make sure hover state doesn't get set to false */
+:where([data-sonner-toast][data-removed='true'][data-front='false'])::before {
+  height: calc(var(--initial-height) + 20%);
+}
+
+[data-sonner-toast][data-swiping='true'] {
+  transform: var(--y) translateY(var(--swipe-amount, 0px));
+  transition: none;
+}
+
+[data-sonner-toast][data-swiped='true'] {
+  user-select: none;
+}
+
+[data-sonner-toast][data-swipe-out='true'][data-y-position='bottom'],
+[data-sonner-toast][data-swipe-out='true'][data-y-position='top'] {
+  animation: swipe-out 200ms ease-out forwards;
+}
+
+@keyframes swipe-out {
+  from {
+    transform: translateY(calc(var(--lift) * var(--offset) + var(--swipe-amount)));
+    opacity: 1;
+  }
+
+  to {
+    transform: translateY(calc(var(--lift) * var(--offset) + var(--swipe-amount) + var(--lift) * -100%));
+    opacity: 0;
+  }
+}
+
+@media (max-width: 600px) {
+  [data-sonner-toaster] {
+    position: fixed;
+    --mobile-offset: 16px;
+    right: var(--mobile-offset);
+    left: var(--mobile-offset);
+    width: 100%;
+  }
+
+  [data-sonner-toaster][dir='rtl'] {
+    left: calc(var(--mobile-offset) * -1);
+  }
+
+  [data-sonner-toaster] [data-sonner-toast] {
+    left: 0;
+    right: 0;
+    width: calc(100% - var(--mobile-offset) * 2);
+  }
+
+  [data-sonner-toaster][data-x-position='left'] {
+    left: var(--mobile-offset);
+  }
+
+  [data-sonner-toaster][data-y-position='bottom'] {
+    bottom: 20px;
+  }
+
+  [data-sonner-toaster][data-y-position='top'] {
+    top: 20px;
+  }
+
+  [data-sonner-toaster][data-x-position='center'] {
+    left: var(--mobile-offset);
+    right: var(--mobile-offset);
+    transform: none;
+  }
+}
+
+[data-sonner-toaster][data-theme='light'] {
+  --normal-bg: #fff;
+  --normal-border: var(--gray4);
+  --normal-text: var(--gray12);
+
+  --success-bg: hsl(143, 85%, 96%);
+  --success-border: hsl(145, 92%, 91%);
+  --success-text: hsl(140, 100%, 27%);
+
+  --info-bg: hsl(208, 100%, 97%);
+  --info-border: hsl(221, 91%, 91%);
+  --info-text: hsl(210, 92%, 45%);
+
+  --warning-bg: hsl(49, 100%, 97%);
+  --warning-border: hsl(49, 91%, 91%);
+  --warning-text: hsl(31, 92%, 45%);
+
+  --error-bg: hsl(359, 100%, 97%);
+  --error-border: hsl(359, 100%, 94%);
+  --error-text: hsl(360, 100%, 45%);
+}
+
+[data-sonner-toaster][data-theme='light'] [data-sonner-toast][data-invert='true'] {
+  --normal-bg: #000;
+  --normal-border: hsl(0, 0%, 20%);
+  --normal-text: var(--gray1);
+}
+
+[data-sonner-toaster][data-theme='dark'] [data-sonner-toast][data-invert='true'] {
+  --normal-bg: #fff;
+  --normal-border: var(--gray3);
+  --normal-text: var(--gray12);
+}
+
+[data-sonner-toaster][data-theme='dark'] {
+  --normal-bg: #000;
+  --normal-border: hsl(0, 0%, 20%);
+  --normal-text: var(--gray1);
+
+  --success-bg: hsl(150, 100%, 6%);
+  --success-border: hsl(147, 100%, 12%);
+  --success-text: hsl(150, 86%, 65%);
+
+  --info-bg: hsl(215, 100%, 6%);
+  --info-border: hsl(223, 100%, 12%);
+  --info-text: hsl(216, 87%, 65%);
+
+  --warning-bg: hsl(64, 100%, 6%);
+  --warning-border: hsl(60, 100%, 12%);
+  --warning-text: hsl(46, 87%, 65%);
+
+  --error-bg: hsl(358, 76%, 10%);
+  --error-border: hsl(357, 89%, 16%);
+  --error-text: hsl(358, 100%, 81%);
+}
+
+[data-rich-colors='true'][data-sonner-toast][data-type='success'] {
+  background: var(--success-bg);
+  border-color: var(--success-border);
+  color: var(--success-text);
+}
+
+[data-rich-colors='true'][data-sonner-toast][data-type='success'] [data-close-button] {
+  background: var(--success-bg);
+  border-color: var(--success-border);
+  color: var(--success-text);
+}
+
+[data-rich-colors='true'][data-sonner-toast][data-type='info'] {
+  background: var(--info-bg);
+  border-color: var(--info-border);
+  color: var(--info-text);
+}
+
+[data-rich-colors='true'][data-sonner-toast][data-type='info'] [data-close-button] {
+  background: var(--info-bg);
+  border-color: var(--info-border);
+  color: var(--info-text);
+}
+
+[data-rich-colors='true'][data-sonner-toast][data-type='warning'] {
+  background: var(--warning-bg);
+  border-color: var(--warning-border);
+  color: var(--warning-text);
+}
+
+[data-rich-colors='true'][data-sonner-toast][data-type='warning'] [data-close-button] {
+  background: var(--warning-bg);
+  border-color: var(--warning-border);
+  color: var(--warning-text);
+}
+
+[data-rich-colors='true'][data-sonner-toast][data-type='error'] {
+  background: var(--error-bg);
+  border-color: var(--error-border);
+  color: var(--error-text);
+}
+
+[data-rich-colors='true'][data-sonner-toast][data-type='error'] [data-close-button] {
+  background: var(--error-bg);
+  border-color: var(--error-border);
+  color: var(--error-text);
+}
+
+.sonner-loading-wrapper {
+  --size: 16px;
+  height: var(--size);
+  width: var(--size);
+  position: absolute;
+  inset: 0;
+  z-index: 10;
+}
+
+.sonner-loading-wrapper[data-visible='false'] {
+  transform-origin: center;
+  animation: sonner-fade-out 0.2s ease forwards;
+}
+
+.sonner-spinner {
+  position: relative;
+  top: 50%;
+  left: 50%;
+  height: var(--size);
+  width: var(--size);
+}
+
+.sonner-loading-bar {
+  animation: sonner-spin 1.2s linear infinite;
+  background: var(--gray11);
+  border-radius: 6px;
+  height: 8%;
+  left: -10%;
+  position: absolute;
+  top: -3.9%;
+  width: 24%;
+}
+
+.sonner-loading-bar:nth-child(1) {
+  animation-delay: -1.2s;
+  transform: rotate(0.0001deg) translate(146%);
+}
+
+.sonner-loading-bar:nth-child(2) {
+  animation-delay: -1.1s;
+  transform: rotate(30deg) translate(146%);
+}
+
+.sonner-loading-bar:nth-child(3) {
+  animation-delay: -1s;
+  transform: rotate(60deg) translate(146%);
+}
+
+.sonner-loading-bar:nth-child(4) {
+  animation-delay: -0.9s;
+  transform: rotate(90deg) translate(146%);
+}
+
+.sonner-loading-bar:nth-child(5) {
+  animation-delay: -0.8s;
+  transform: rotate(120deg) translate(146%);
+}
+
+.sonner-loading-bar:nth-child(6) {
+  animation-delay: -0.7s;
+  transform: rotate(150deg) translate(146%);
+}
+
+.sonner-loading-bar:nth-child(7) {
+  animation-delay: -0.6s;
+  transform: rotate(180deg) translate(146%);
+}
+
+.sonner-loading-bar:nth-child(8) {
+  animation-delay: -0.5s;
+  transform: rotate(210deg) translate(146%);
+}
+
+.sonner-loading-bar:nth-child(9) {
+  animation-delay: -0.4s;
+  transform: rotate(240deg) translate(146%);
+}
+
+.sonner-loading-bar:nth-child(10) {
+  animation-delay: -0.3s;
+  transform: rotate(270deg) translate(146%);
+}
+
+.sonner-loading-bar:nth-child(11) {
+  animation-delay: -0.2s;
+  transform: rotate(300deg) translate(146%);
+}
+
+.sonner-loading-bar:nth-child(12) {
+  animation-delay: -0.1s;
+  transform: rotate(330deg) translate(146%);
+}
+
+@keyframes sonner-fade-in {
+  0% {
+    opacity: 0;
+    transform: scale(0.8);
+  }
+  100% {
+    opacity: 1;
+    transform: scale(1);
+  }
+}
+
+@keyframes sonner-fade-out {
+  0% {
+    opacity: 1;
+    transform: scale(1);
+  }
+  100% {
+    opacity: 0;
+    transform: scale(0.8);
+  }
+}
+
+@keyframes sonner-spin {
+  0% {
+    opacity: 1;
+  }
+  100% {
+    opacity: 0.15;
+  }
+}
+
+@media (prefers-reduced-motion) {
+  [data-sonner-toast],
+  [data-sonner-toast] > *,
+  .sonner-loading-bar {
+    transition: none !important;
+    animation: none !important;
+  }
+}
+
+.sonner-loader {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  transform-origin: center;
+  transition: opacity 200ms, transform 200ms;
+}
+
+.sonner-loader[data-visible='false'] {
+  opacity: 0;
+  transform: scale(0.8) translate(-50%, -50%);
+}
--- a/@tailwind-shared/theme-variants.css
+++ b/@tailwind-shared/theme-variants.css
@@ -1,92 +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);
-  --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);
-  --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);
-  --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);
-  --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 {
-  --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
@@ -84,23 +84,23 @@
  --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);
+  /* Header colors */
+  --color-header-text-primary: var(--header-text-primary);
+  --color-header-text-secondary: var(--header-text-secondary);
+  --color-header-background-color: var(--header-background-color);

-  /* 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);
+  /* Legacy colors */
+  --color-alpha: var(--color-alpha);
+  --color-beta: var(--color-beta);
+  --color-gamma: var(--color-gamma);
+  --color-gamma-opaque: var(--color-gamma-opaque);
+  --color-customgradient-start: var(--color-customgradient-start);
+  --color-customgradient-end: var(--color-customgradient-end);

-  /* 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;
+  /* Gradients */
+  --color-header-gradient-start: var(--header-gradient-start);
+  --color-header-gradient-end: var(--header-gradient-end);
+  --color-banner-gradient: var(--banner-gradient);

  /* Font sizes */
  --font-10px: 10px;
@@ -167,27 +167,6 @@
  --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;
--- 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
@@ -128,6 +128,9 @@ Enables GraphQL playground at `http://tower.local/graphql`
 - **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
@@ -154,7 +157,4 @@ Enables GraphQL playground at `http://tower.local/graphql`

 - 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)
+- never run or restart the API server or web server. I will handle the lifecylce, simply wait and ask me to do this for you
--- a/api/.env.development
+++ b/api/.env.development
@@ -31,4 +31,3 @@ BYPASS_CORS_CHECKS=true
 CHOKIDAR_USEPOLLING=true
 LOG_TRANSPORT=console
 LOG_LEVEL=trace
-ENABLE_NEXT_DOCKER_RELEASE=true
--- a/api/.gitignore
+++ b/api/.gitignore
@@ -93,6 +93,3 @@ dev/local-session

 # local OIDC config for testing - contains secrets
 dev/configs/oidc.local.json
-
-# local api keys
-dev/keys/*
--- a/api/CHANGELOG.md
+++ b/api/CHANGELOG.md
@@ -1,230 +1,5 @@
 # Changelog

-## [4.25.1](https://github.com/unraid/api/compare/v4.25.0...v4.25.1) (2025-09-30)
-
-
-### Bug Fixes
-
-* add cache busting to web component extractor ([#1731](https://github.com/unraid/api/issues/1731)) ([0d165a6](https://github.com/unraid/api/commit/0d165a608740505bdc505dcf69fb615225969741))
-* Connect won't appear within Apps - Previous Apps ([#1727](https://github.com/unraid/api/issues/1727)) ([d73953f](https://github.com/unraid/api/commit/d73953f8ff3d7425c0aed32d16236ededfd948e1))
-
-## [4.25.0](https://github.com/unraid/api/compare/v4.24.1...v4.25.0) (2025-09-26)
-
-
-### Features
-
-* add Tailwind scoping plugin and integrate into Vite config ([#1722](https://github.com/unraid/api/issues/1722)) ([b7afaf4](https://github.com/unraid/api/commit/b7afaf463243b073e1ab1083961a16a12ac6c4a3))
-* notification filter controls pill buttons ([#1718](https://github.com/unraid/api/issues/1718)) ([661865f](https://github.com/unraid/api/commit/661865f97611cf802f239fde8232f3109281dde6))
-
-
-### Bug Fixes
-
-* enable auth guard for nested fields - thanks [@ingel81](https://github.com/ingel81) ([7bdeca8](https://github.com/unraid/api/commit/7bdeca8338a3901f15fde06fd7aede3b0c16e087))
-* enhance user context validation in auth module ([#1726](https://github.com/unraid/api/issues/1726)) ([cd5eff1](https://github.com/unraid/api/commit/cd5eff11bcb4398581472966cb7ec124eac7ad0a))
-
-## [4.24.1](https://github.com/unraid/api/compare/v4.24.0...v4.24.1) (2025-09-23)
-
-
-### Bug Fixes
-
-* cleanup leftover removed packages on upgrade ([#1719](https://github.com/unraid/api/issues/1719)) ([9972a5f](https://github.com/unraid/api/commit/9972a5f178f9a251e6c129d85c5f11cfd25e6281))
-* enhance version comparison logic in installation script ([d9c561b](https://github.com/unraid/api/commit/d9c561bfebed0c553fe4bfa26b088ae71ca59755))
-* issue with incorrect permissions on viewer / other roles ([378cdb7](https://github.com/unraid/api/commit/378cdb7f102f63128dd236c13f1a3745902d5a2c))
-
-## [4.24.0](https://github.com/unraid/api/compare/v4.23.1...v4.24.0) (2025-09-18)
-
-
-### Features
-
-* improve dom content loading by being more efficient about component mounting ([#1716](https://github.com/unraid/api/issues/1716)) ([d8b166e](https://github.com/unraid/api/commit/d8b166e4b6a718e07783d9c8ac8393b50ec89ae3))
-
-## [4.23.1](https://github.com/unraid/api/compare/v4.23.0...v4.23.1) (2025-09-17)
-
-
-### Bug Fixes
-
-* cleanup ini parser logic with better fallbacks ([#1713](https://github.com/unraid/api/issues/1713)) ([1691362](https://github.com/unraid/api/commit/16913627de9497a5d2f71edb710cec6e2eb9f890))
-
-## [4.23.0](https://github.com/unraid/api/compare/v4.22.2...v4.23.0) (2025-09-16)
-
-
-### Features
-
-* add unraid api status manager ([#1708](https://github.com/unraid/api/issues/1708)) ([1d9ce0a](https://github.com/unraid/api/commit/1d9ce0aa3d067726c2c880929408c68f53e13e0d))
-
-
-### Bug Fixes
-
-* **logging:** remove colorized logs ([#1705](https://github.com/unraid/api/issues/1705)) ([1d2c670](https://github.com/unraid/api/commit/1d2c6701ce56b1d40afdb776065295e9273d08e9))
-* no sizeRootFs unless queried ([#1710](https://github.com/unraid/api/issues/1710)) ([9714b21](https://github.com/unraid/api/commit/9714b21c5c07160b92a11512e8b703908adb0620))
-* use virtual-modal-container ([#1709](https://github.com/unraid/api/issues/1709)) ([44b4d77](https://github.com/unraid/api/commit/44b4d77d803aa724968307cfa463f7c440791a10))
-
-## [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)


--- a/api/codegen.ts
+++ b/api/codegen.ts
@@ -17,7 +17,6 @@ const config: CodegenConfig = {
            URL: 'URL',
            Port: 'number',
            UUID: 'string',
-            BigInt: 'number',
        },
        scalarSchemas: {
            URL: 'z.instanceof(URL)',
@@ -25,7 +24,6 @@ const config: CodegenConfig = {
            JSON: 'z.record(z.string(), z.any())',
            Port: 'z.number()',
            UUID: 'z.string()',
-            BigInt: 'z.number()',
        },
    },
    generates: {
--- a/api/dev/configs/api.json
+++ b/api/dev/configs/api.json
@@ -1,5 +1,5 @@
 {
-  "version": "4.22.2",
+  "version": "4.15.1",
  "extraOrigins": [],
  "sandbox": true,
  "ssoSubIds": [],
--- a/api/dev/configs/oidc.json
+++ b/api/dev/configs/oidc.json
@@ -17,6 +17,5 @@
      ],
      "buttonText": "Login With Unraid.net"
    }
-  ],
-  "defaultAllowedOrigins": []
+  ]
 }
--- 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/_category_.json
+++ b/api/docs/public/_category_.json
@@ -0,0 +1,4 @@
+{
+    "label": "Unraid API",
+    "position": 4
+}
--- a/api/docs/public/api-key-app-developer-authorization-flow.md
+++ b/api/docs/public/api-key-app-developer-authorization-flow.md
@@ -0,0 +1,100 @@
+# 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
@@ -0,0 +1,193 @@
+---
+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
+unraid-api start [--log-level <level>]
+```
+
+Starts the Unraid API service.
+
+Options:
+- `--log-level`: Set logging level (trace|debug|info|warn|error)
+
+### Stop
+
+```bash
+unraid-api stop [--delete]
+```
+
+Stops the Unraid API service.
+
+- `--delete`: Optional. Delete the PM2 home directory
+
+### Restart
+
+```bash
+unraid-api restart
+```
+
+Restarts the Unraid API service.
+
+### Logs
+
+```bash
+unraid-api logs [-l <lines>]
+```
+
+View the API logs.
+
+- `-l, --lines`: Optional. Number of lines to tail (default: 100)
+
+## ⚙️ Configuration Commands
+
+### Config
+
+```bash
+unraid-api config
+```
+
+Displays current configuration values.
+
+### Switch Environment
+
+```bash
+unraid-api switch-env [-e <environment>]
+```
+
+Switch between production and staging environments.
+
+- `-e, --environment`: Optional. Target environment (production|staging)
+
+### 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
+```
+
+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
+
+## 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.
+
+Options:
+
+- `--name <name>`: Name of the key
+- `--create`: Create a new key
+- `-r, --roles <roles>`: Comma-separated list of roles
+- `-p, --permissions <permissions>`: Comma-separated list of permissions
+- `-d, --description <description>`: Description for the key
+
+## 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
+unraid-api sso
+```
+
+#### Add SSO User
+
+```bash
+unraid-api sso add-user
+# or
+unraid-api sso add
+# or
+unraid-api sso a
+```
+
+Add a new user for SSO authentication.
+
+#### Remove SSO User
+
+```bash
+unraid-api sso remove-user
+# or
+unraid-api sso remove
+# or
+unraid-api sso r
+```
+
+Remove a user (or all users) from SSO.
+
+#### List SSO Users
+
+```bash
+unraid-api sso list-users
+# or
+unraid-api sso list
+# or
+unraid-api sso l
+```
+
+List all configured SSO users.
+
+#### Validate SSO Token
+
+```bash
+unraid-api sso validate-token <token>
+# or
+unraid-api sso validate
+# or
+unraid-api sso v
+```
+
+Validates an SSO token and returns its status.
+
+## Report Generation
+
+### Generate Report
+
+```bash
+unraid-api report [-r] [-j]
+```
+
+Generate a system report.
+
+- `-r, --raw`: Display raw command output
+- `-j, --json`: Display output in JSON format
+
+## Notes
+
+1. Most commands require appropriate permissions to modify system state
+2. Some commands require the API to be running or stopped
+3. Store API keys securely as they provide system access
+4. SSO configuration changes may require a service restart
--- a/api/docs/public/how-to-use-the-api.md
+++ b/api/docs/public/how-to-use-the-api.md
@@ -0,0 +1,255 @@
+---
+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
+
+### Web GUI Method (Recommended)
+
+:::info[Preferred Method]
+Using the Web GUI is the easiest way to enable the GraphQL sandbox.
+:::
+
+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
+
+Alternatively, you can enable developer mode using the CLI:
+
+```bash
+unraid-api developer --sandbox true
+```
+
+Or use the interactive mode:
+
+```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:
+
+```bash
+unraid-api apikey --create
+```
+
+Follow the prompts to set:
+
+- Name
+- Description
+- Roles
+- Permissions
+
+</tabItem>
+</tabs>
+
+### Using API Keys
+
+The generated API key should be included in your GraphQL requests as a header:
+
+```json
+{
+    "x-api-key": "YOUR_API_KEY"
+}
+```
+
+## 📊 Available Schemas
+
+The API provides access to various aspects of your Unraid server:
+
+### System Information
+
+- Query system details including CPU, memory, and OS information
+- Monitor system status and health
+- Access baseboard and hardware information
+
+### Array Management
+
+- Query array status and configuration
+- Manage array operations (start/stop)
+- Monitor disk status and health
+- Perform parity checks
+
+### Docker Management
+
+- List and manage Docker containers
+- Monitor container status
+- Manage Docker networks
+
+### Remote Access
+
+- Configure and manage remote access settings
+- Handle SSO configuration
+- Manage allowed origins
+
+### 💻 Example Queries
+
+#### Check System Status
+
+```graphql
+query {
+    info {
+        os {
+            platform
+            distro
+            release
+            uptime
+        }
+        cpu {
+            manufacturer
+            brand
+            cores
+            threads
+        }
+    }
+}
+```
+
+#### Monitor Array Status
+
+```graphql
+query {
+    array {
+        state
+        capacity {
+            disks {
+                free
+                used
+                total
+            }
+        }
+        disks {
+            name
+            size
+            status
+            temp
+        }
+    }
+}
+```
+
+#### List Docker Containers
+
+```graphql
+query {
+    dockerContainers {
+        id
+        names
+        state
+        status
+        autoStart
+    }
+}
+```
+
+## 🏗️ Schema Types
+
+The API includes several core types:
+
+### Base Types
+
+- `Node`: Interface for objects with unique IDs - please see [Object Identification](https://graphql.org/learn/global-object-identification/)
+- `JSON`: For complex JSON data
+- `DateTime`: For timestamp values
+- `Long`: For 64-bit integers
+
+### Resource Types
+
+- `Array`: Array and disk management
+- `Docker`: Container and network management
+- `Info`: System information
+- `Config`: Server configuration
+- `Connect`: Remote access settings
+
+### Role-Based Access
+
+Available roles:
+
+- `admin`: Full access
+- `connect`: Remote access features
+- `guest`: Limited read access
+
+## ✨ 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
+
+:::caution[Rate Limits]
+The API implements rate limiting to prevent abuse. Ensure your applications handle rate limit responses appropriately.
+:::
+
+## 🚨 Error Handling
+
+The API returns standard GraphQL errors in the following format:
+
+```json
+{
+  "errors": [
+    {
+      "message": "Error description",
+      "locations": [...],
+      "path": [...]
+    }
+  ]
+}
+```
+
+## 📚 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`.
+:::
--- 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
@@ -0,0 +1,94 @@
+---
+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!
+:::
+
+The Unraid API provides a GraphQL interface for programmatic interaction with your Unraid server. It enables automation, monitoring, and integration capabilities.
+
+## 📦 Availability
+
+### ✨ Native Integration (Unraid OS v7.2+)
+
+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
+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)
+
+:::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
+:::
+
+## 📚 Documentation Sections
+
+<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>
+
+
+## 🌟 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
+:::
+
+## 🚀 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.
--- a/api/docs/public/moved-to-docs-repo.md
+++ b/api/docs/public/moved-to-docs-repo.md
@@ -1 +0,0 @@
-# All Content Here has been permanently moved to [Unraid Docs](https://github.com/unraid/docs)
--- a/api/docs/public/oidc-provider-setup.md
+++ b/api/docs/public/oidc-provider-setup.md
@@ -0,0 +1,420 @@
+---
+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/upcoming-features.md
+++ b/api/docs/public/upcoming-features.md
@@ -0,0 +1,172 @@
+---
+title: Roadmap & Features
+description: Current status and upcoming features for the Unraid API
+sidebar_position: 10
+---
+
+# 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 |
+
+## 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 |
+
+## 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
+
+## 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 |
+
+## 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 |
+
+## 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 |
+
+## 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
+
+## 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 |
+
+## Notifications
+
+### Completed Features ✅
+
+| 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.
+:::
--- 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
@@ -139,9 +139,6 @@ type ArrayDisk implements Node {
  """ata | nvme | usb | (others)"""
  transport: String
  color: ArrayDiskFsColor
-
-  """Whether the disk is currently spinning"""
-  isSpinning: Boolean
 }

 interface Node {
@@ -349,9 +346,6 @@ type Disk implements Node {

  """The partitions on the disk"""
  partitions: [DiskPartition!]!
-
-  """Whether the disk is spinning or not"""
-  isSpinning: Boolean!
 }

 """The type of interface the disk uses to connect to the system"""
@@ -1050,19 +1044,6 @@ enum ThemeName {
  white
 }

-type ExplicitStatusItem {
-  name: String!
-  updateStatus: UpdateStatus!
-}
-
-"""Update status of a container."""
-enum UpdateStatus {
-  UP_TO_DATE
-  UPDATE_AVAILABLE
-  REBUILD_READY
-  UNKNOWN
-}
-
 type ContainerPort {
  ip: String
  privatePort: Port
@@ -1093,8 +1074,8 @@ type DockerContainer implements Node {
  created: Int!
  ports: [ContainerPort!]!

-  """Total size of all files in the container (in bytes)"""
-  sizeRootFs: BigInt
+  """Total size of all the files in the container"""
+  sizeRootFs: Int
  labels: JSON
  state: ContainerState!
  status: String!
@@ -1102,8 +1083,6 @@ type DockerContainer implements Node {
  networkSettings: JSON
  mounts: [JSON!]
  autoStart: Boolean!
-  isUpdateAvailable: Boolean
-  isRebuildReady: Boolean
 }

 enum ContainerState {
@@ -1134,7 +1113,6 @@ type Docker implements Node {
  containers(skipCache: Boolean! = false): [DockerContainer!]!
  networks(skipCache: Boolean! = false): [DockerNetwork!]!
  organizer: ResolvedOrganizerV1!
-  containerUpdateStatuses: [ExplicitStatusItem!]!
 }

 type ResolvedOrganizerView {
@@ -1383,12 +1361,6 @@ type CpuLoad {

  """The percentage of time the CPU spent servicing hardware interrupts."""
  percentIrq: Float!
-
-  """The percentage of time the CPU spent running virtual machines (guest)."""
-  percentGuest: Float!
-
-  """The percentage of CPU time stolen by the hypervisor."""
-  percentSteal: Float!
 }

 type CpuUtilization implements Node {
@@ -1826,8 +1798,6 @@ type Server implements Node {
  guid: String!
  apikey: String!
  name: String!
-
-  """Whether this server is online or offline"""
  status: ServerStatus!
  wanip: String!
  lanip: String!
@@ -1884,7 +1854,7 @@ type OidcProvider {
  """
  OIDC issuer URL (e.g., https://accounts.google.com). Required for auto-discovery via /.well-known/openid-configuration
  """
-  issuer: String
+  issuer: String!

  """
  OAuth2 authorization endpoint URL. If omitted, will be auto-discovered from issuer/.well-known/openid-configuration
@@ -1937,16 +1907,6 @@ enum AuthorizationRuleMode {
  AND
 }

-type OidcConfiguration {
-  """List of configured OIDC providers"""
-  providers: [OidcProvider!]!
-
-  """
-  Default allowed redirect origins that apply to all OIDC providers (e.g., Tailscale domains)
-  """
-  defaultAllowedOrigins: [String!]
-}
-
 type OidcSessionValidation {
  valid: Boolean!
  username: String
@@ -2347,6 +2307,8 @@ type Query {
  getApiKeyCreationFormSchema: ApiKeyFormSettings!
  config: Config!
  flash: Flash!
+  logFiles: [LogFile!]!
+  logFile(path: String!, lines: Int, startLine: Int): LogFileContent!
  me: UserAccount!

  """Get all notifications"""
@@ -2373,8 +2335,6 @@ type Query {
  disk(id: PrefixedID!): Disk!
  rclone: RCloneBackupSettings!
  info: Info!
-  logFiles: [LogFile!]!
-  logFile(path: String!, lines: Int, startLine: Int): LogFileContent!
  settings: Settings!
  isSSOEnabled: Boolean!

@@ -2387,9 +2347,6 @@ type Query {
  """Get a specific OIDC provider by ID"""
  oidcProvider(id: PrefixedID!): OidcProvider

-  """Get the full OIDC configuration (admin only)"""
-  oidcConfiguration: OidcConfiguration!
-
  """Validate an OIDC session token (internal use for CLI validation)"""
  validateOidcSession(token: String!): OidcSessionValidation!
  metrics: Metrics!
@@ -2435,7 +2392,6 @@ type Mutation {
  setDockerFolderChildren(folderId: String, childrenIds: [String!]!): ResolvedOrganizerV1!
  deleteDockerEntries(entryIds: [String!]!): ResolvedOrganizerV1!
  moveDockerEntriesToFolder(sourceEntryIds: [String!]!, destinationFolderId: String!): ResolvedOrganizerV1!
-  refreshDockerDigests: Boolean!

  """Initiates a flash drive backup using a configured remote."""
  initiateFlashBackup(input: InitiateFlashBackupInput!): FlashBackupStatus!
@@ -2634,13 +2590,13 @@ input AccessUrlInput {
 }

 type Subscription {
+  logFile(path: String!): LogFileContent!
  notificationAdded: Notification!
  notificationsOverview: NotificationOverview!
  ownerSubscription: Owner!
  serversSubscription: Server!
  parityHistorySubscription: ParityCheck!
  arraySubscription: UnraidArray!
-  logFile(path: String!): LogFileContent!
  systemMetricsCpu: CpuUtilization!
  systemMetricsMemory: MemoryUtilization!
  upsUpdates: UPSDevice!
--- a/api/package.json
+++ b/api/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@unraid/api",
-    "version": "4.25.1",
+    "version": "4.16.0",
    "main": "src/cli/index.ts",
    "type": "module",
    "corepack": {
@@ -56,7 +56,7 @@
        "@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",
@@ -84,7 +84,7 @@
        "bytes": "3.1.2",
        "cache-manager": "7.2.0",
        "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,16 +94,15 @@
        "command-exists": "1.2.9",
        "convert": "5.12.0",
        "cookie": "1.0.2",
-        "cron": "4.3.0",
+        "cron": "4.3.3",
        "cross-fetch": "4.1.0",
        "diff": "8.0.2",
        "dockerode": "4.0.7",
        "dotenv": "17.2.1",
-        "escape-html": "1.0.3",
        "execa": "9.6.0",
        "exit-hook": "4.0.0",
        "fastify": "5.5.0",
-        "filenamify": "7.0.0",
+        "filenamify": "6.0.0",
        "fs-extra": "11.3.1",
        "glob": "11.0.3",
        "global-agent": "3.0.0",
@@ -127,7 +126,7 @@
        "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",
@@ -141,7 +140,7 @@
        "strftime": "0.10.3",
        "systeminformation": "5.27.8",
        "undici": "7.15.0",
-        "uuid": "13.0.0",
+        "uuid": "11.1.0",
        "ws": "8.18.3",
        "zen-observable-ts": "1.1.0",
        "zod": "3.25.76"
@@ -156,14 +155,14 @@
    },
    "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",
+        "@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",
@@ -190,7 +189,7 @@
        "@types/stoppable": "1.1.3",
        "@types/strftime": "0.9.8",
        "@types/supertest": "6.0.3",
-        "@types/uuid": "11.0.0",
+        "@types/uuid": "10.0.0",
        "@types/ws": "8.18.1",
        "@types/wtfnode": "0.10.0",
        "@vitest/coverage-v8": "3.2.4",
@@ -205,7 +204,7 @@
        "rollup-plugin-node-externals": "8.1.0",
        "supertest": "7.1.4",
        "tsx": "4.20.5",
-        "type-fest": "5.0.0",
+        "type-fest": "4.41.0",
        "typescript": "5.9.2",
        "typescript-eslint": "8.41.0",
        "unplugin-swc": "1.5.7",
--- 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/parsers/ini-boolean-parser.test.ts
+++ b/api/src/test/core/utils/parsers/ini-boolean-parser.test.ts
@@ -1,178 +0,0 @@
-import { describe, expect, test } from 'vitest';
-
-import {
-    iniBooleanOrAutoToJsBoolean,
-    iniBooleanToJsBoolean,
-} from '@app/core/utils/parsers/ini-boolean-parser.js';
-
-describe('iniBooleanToJsBoolean', () => {
-    describe('valid boolean values', () => {
-        test('returns false for "no"', () => {
-            expect(iniBooleanToJsBoolean('no')).toBe(false);
-        });
-
-        test('returns false for "false"', () => {
-            expect(iniBooleanToJsBoolean('false')).toBe(false);
-        });
-
-        test('returns true for "yes"', () => {
-            expect(iniBooleanToJsBoolean('yes')).toBe(true);
-        });
-
-        test('returns true for "true"', () => {
-            expect(iniBooleanToJsBoolean('true')).toBe(true);
-        });
-    });
-
-    describe('malformed values', () => {
-        test('handles "no*" as false', () => {
-            expect(iniBooleanToJsBoolean('no*')).toBe(false);
-        });
-
-        test('handles "yes*" as true', () => {
-            expect(iniBooleanToJsBoolean('yes*')).toBe(true);
-        });
-
-        test('handles "true*" as true', () => {
-            expect(iniBooleanToJsBoolean('true*')).toBe(true);
-        });
-
-        test('handles "false*" as false', () => {
-            expect(iniBooleanToJsBoolean('false*')).toBe(false);
-        });
-
-        test('returns undefined for "n0!" (cleans to "n" which is invalid)', () => {
-            expect(iniBooleanToJsBoolean('n0!')).toBe(undefined);
-        });
-
-        test('returns undefined for "y3s!" (cleans to "ys" which is invalid)', () => {
-            expect(iniBooleanToJsBoolean('y3s!')).toBe(undefined);
-        });
-
-        test('handles mixed case with extra chars "YES*" as true', () => {
-            expect(iniBooleanToJsBoolean('YES*')).toBe(true);
-        });
-
-        test('handles mixed case with extra chars "NO*" as false', () => {
-            expect(iniBooleanToJsBoolean('NO*')).toBe(false);
-        });
-    });
-
-    describe('default values', () => {
-        test('returns default value for invalid input when provided', () => {
-            expect(iniBooleanToJsBoolean('invalid', true)).toBe(true);
-            expect(iniBooleanToJsBoolean('invalid', false)).toBe(false);
-        });
-
-        test('returns default value for empty string when provided', () => {
-            expect(iniBooleanToJsBoolean('', true)).toBe(true);
-            expect(iniBooleanToJsBoolean('', false)).toBe(false);
-        });
-    });
-
-    describe('undefined fallback cases', () => {
-        test('returns undefined for invalid input without default', () => {
-            expect(iniBooleanToJsBoolean('invalid')).toBe(undefined);
-        });
-
-        test('returns undefined for empty string without default', () => {
-            expect(iniBooleanToJsBoolean('')).toBe(undefined);
-        });
-
-        test('returns undefined for numeric string without default', () => {
-            expect(iniBooleanToJsBoolean('123')).toBe(undefined);
-        });
-    });
-});
-
-describe('iniBooleanOrAutoToJsBoolean', () => {
-    describe('valid boolean values', () => {
-        test('returns false for "no"', () => {
-            expect(iniBooleanOrAutoToJsBoolean('no')).toBe(false);
-        });
-
-        test('returns false for "false"', () => {
-            expect(iniBooleanOrAutoToJsBoolean('false')).toBe(false);
-        });
-
-        test('returns true for "yes"', () => {
-            expect(iniBooleanOrAutoToJsBoolean('yes')).toBe(true);
-        });
-
-        test('returns true for "true"', () => {
-            expect(iniBooleanOrAutoToJsBoolean('true')).toBe(true);
-        });
-    });
-
-    describe('auto value', () => {
-        test('returns null for "auto"', () => {
-            expect(iniBooleanOrAutoToJsBoolean('auto')).toBe(null);
-        });
-    });
-
-    describe('malformed values', () => {
-        test('handles "no*" as false', () => {
-            expect(iniBooleanOrAutoToJsBoolean('no*')).toBe(false);
-        });
-
-        test('handles "yes*" as true', () => {
-            expect(iniBooleanOrAutoToJsBoolean('yes*')).toBe(true);
-        });
-
-        test('handles "auto*" as null', () => {
-            expect(iniBooleanOrAutoToJsBoolean('auto*')).toBe(null);
-        });
-
-        test('handles "true*" as true', () => {
-            expect(iniBooleanOrAutoToJsBoolean('true*')).toBe(true);
-        });
-
-        test('handles "false*" as false', () => {
-            expect(iniBooleanOrAutoToJsBoolean('false*')).toBe(false);
-        });
-
-        test('handles "n0!" as undefined fallback (cleans to "n" which is invalid)', () => {
-            expect(iniBooleanOrAutoToJsBoolean('n0!')).toBe(undefined);
-        });
-
-        test('handles "a1ut2o!" as null (removes non-alphabetic chars)', () => {
-            expect(iniBooleanOrAutoToJsBoolean('a1ut2o!')).toBe(null);
-        });
-
-        test('handles mixed case "AUTO*" as null', () => {
-            expect(iniBooleanOrAutoToJsBoolean('AUTO*')).toBe(null);
-        });
-    });
-
-    describe('fallback behavior', () => {
-        test('returns undefined for completely invalid input', () => {
-            expect(iniBooleanOrAutoToJsBoolean('invalid123')).toBe(undefined);
-        });
-
-        test('returns undefined for empty string', () => {
-            expect(iniBooleanOrAutoToJsBoolean('')).toBe(undefined);
-        });
-
-        test('returns undefined for numeric string', () => {
-            expect(iniBooleanOrAutoToJsBoolean('123')).toBe(undefined);
-        });
-
-        test('returns undefined for special characters only', () => {
-            expect(iniBooleanOrAutoToJsBoolean('!@#$')).toBe(undefined);
-        });
-    });
-
-    describe('edge cases', () => {
-        test('handles undefined gracefully', () => {
-            expect(iniBooleanOrAutoToJsBoolean(undefined as any)).toBe(undefined);
-        });
-
-        test('handles null gracefully', () => {
-            expect(iniBooleanOrAutoToJsBoolean(null as any)).toBe(undefined);
-        });
-
-        test('handles non-string input gracefully', () => {
-            expect(iniBooleanOrAutoToJsBoolean(123 as any)).toBe(undefined);
-        });
-    });
-});
--- 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,11 +1,10 @@
 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 { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';

 import { isUnraidApiRunning } from '@app/core/utils/pm2/unraid-api-running.js';

@@ -18,6 +17,11 @@ const TEST_PROCESS_NAME = 'test-unraid-api';
 // Shared PM2 connection state
 let pm2Connected = false;

+// Helper function to run CLI command (assumes CLI is built)
+async function runCliCommand(command: string, options: any = {}) {
+    return await execa('node', [CLI_PATH, command], options);
+}
+
 // Helper to ensure PM2 connection is established
 async function ensurePM2Connection() {
    if (pm2Connected) return;
@@ -53,7 +57,7 @@ async function deleteTestProcesses() {
            }

            const processName = processNames[deletedCount];
-            pm2.delete(processName, () => {
+            pm2.delete(processName, (deleteErr) => {
                // Ignore errors, process might not exist
                deletedCount++;
                deleteNext();
@@ -88,7 +92,7 @@ async function cleanupAllPM2Processes() {
            }

            // Kill the daemon to ensure fresh state
-            pm2.killDaemon(() => {
+            pm2.killDaemon((killErr) => {
                pm2.disconnect();
                pm2Connected = false;
                // Small delay to let PM2 fully shutdown
@@ -100,9 +104,6 @@ async function cleanupAllPM2Processes() {

 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...');
@@ -197,13 +198,6 @@ describe.skipIf(!!process.env.CI)('PM2 integration tests', () => {
        }, 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';
--- 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', () => ({
@@ -75,7 +60,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,19 +68,19 @@ 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 } });
+        mockGot.post = vi.fn().mockResolvedValue({ body: { pid: 12345 } });

        // Mock RClone binary exists check
        vi.mocked(fileExists).mockResolvedValue(true);
@@ -112,10 +97,10 @@ describe('RCloneApiService', () => {
        mockPRetry.mockResolvedValue(undefined);

        service = new RCloneApiService();
-        await service.onApplicationBootstrap();
+        await service.onModuleInit();

        // Reset the mock after initialization to prepare for test-specific responses
-        mockGotPost.mockClear();
+        mockGot.post.mockClear();
    });

    describe('getProviders', () => {
@@ -124,15 +109,15 @@ 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',
@@ -145,7 +130,7 @@ describe('RCloneApiService', () => {
        });

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

            const result = await service.getProviders();

@@ -156,15 +141,15 @@ 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',
@@ -177,7 +162,7 @@ describe('RCloneApiService', () => {
        });

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

            const result = await service.listRemotes();

@@ -189,13 +174,13 @@ 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',
@@ -212,7 +197,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,13 +213,13 @@ 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',
@@ -258,13 +243,13 @@ 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',
@@ -284,13 +269,13 @@ 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',
@@ -311,13 +296,13 @@ 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',
@@ -338,13 +323,13 @@ 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',
@@ -363,13 +348,13 @@ 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',
@@ -393,7 +378,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 +395,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 +412,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 +421,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/store/modules/emhttp.test.ts
+++ b/api/src/test/store/modules/emhttp.test.ts
@@ -211,7 +211,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 +235,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 +259,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 +283,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 +307,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 +331,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 +355,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,
--- 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/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 pretty from 'pino-pretty';

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

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

@@ -17,33 +17,20 @@ const nullDestination = pino.destination({

 export const logDestination =
    process.env.SUPPRESS_LOGS === 'true' ? nullDestination : pino.destination();
-// Since PM2 captures stdout and writes to the log file, we should not colorize stdout
-// to avoid ANSI escape codes in the log file
+const localFileDestination = pino.destination({
+    dest: PATHS_LOGS_FILE,
+    sync: true,
+});
+
 const stream = SUPPRESS_LOGS
    ? nullDestination
    : LOG_TYPE === 'pretty'
      ? pretty({
            singleLine: true,
            hideObject: false,
-            colorize: false, // No colors since PM2 writes stdout to file
-            colorizeObjects: false,
-            levelFirst: false,
+            colorize: true,
            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 label instead of labelColorized for non-colored output
-                    const { label } = extras;
-                    const context = log.context || log.logger || 'app';
-                    return `${label} ${context}]`;
-                },
-            },
-            messageFormat: (log: any, messageKey: string) => {
-                const msg = log[messageKey] || log.msg || '';
-                return msg;
-            },
        })
      : logDestination;

@@ -95,7 +82,7 @@ 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' });
+export const pluginLogger = logger.child({ logger: 'plugin', stream: localFileDestination });

 export const loggers = [
    internalLogger,
--- a/api/src/core/pubsub.ts
+++ b/api/src/core/pubsub.ts
@@ -13,11 +13,10 @@ 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
+    channel: GRAPHQL_PUBSUB_CHANNEL
 ): AsyncIterableIterator<T> => {
    return pubsub.asyncIterableIterator<T>(channel);
 };
--- 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/parsers/ini-boolean-parser.ts
+++ b/api/src/core/utils/parsers/ini-boolean-parser.ts
@@ -1,86 +0,0 @@
-import { type IniStringBoolean, type IniStringBooleanOrAuto } from '@app/core/types/ini.js';
-
-/**
- * Converts INI boolean string values to JavaScript boolean values.
- * Handles malformed values by cleaning them of non-alphabetic characters.
- *
- * @param value - The string value to parse ("yes", "no", "true", "false", etc.)
- * @returns boolean value or undefined if parsing fails
- */
-export function iniBooleanToJsBoolean(value: string): boolean | undefined;
-/**
- * Converts INI boolean string values to JavaScript boolean values.
- * Handles malformed values by cleaning them of non-alphabetic characters.
- *
- * @param value - The string value to parse ("yes", "no", "true", "false", etc.)
- * @param defaultValue - Default value to return if parsing fails
- * @returns boolean value or defaultValue if parsing fails (never undefined when defaultValue is provided)
- */
-export function iniBooleanToJsBoolean(value: string, defaultValue: boolean): boolean;
-export function iniBooleanToJsBoolean(value: string, defaultValue?: boolean): boolean | undefined {
-    if (value === 'no' || value === 'false') {
-        return false;
-    }
-
-    if (value === 'yes' || value === 'true') {
-        return true;
-    }
-
-    // Handle malformed values by cleaning them first
-    if (typeof value === 'string') {
-        const cleanValue = value.replace(/[^a-zA-Z]/g, '').toLowerCase();
-        if (cleanValue === 'no' || cleanValue === 'false') {
-            return false;
-        }
-        if (cleanValue === 'yes' || cleanValue === 'true') {
-            return true;
-        }
-    }
-
-    // Always return defaultValue when provided (even if undefined)
-    if (arguments.length >= 2) {
-        return defaultValue;
-    }
-
-    // Return undefined only when no default was provided
-    return undefined;
-}
-
-/**
- * Converts INI boolean or auto string values to JavaScript boolean or null values.
- * Handles malformed values by cleaning them of non-alphabetic characters.
- *
- * @param value - The string value to parse ("yes", "no", "auto", "true", "false", etc.)
- * @returns boolean value for yes/no/true/false, null for auto, or undefined as fallback
- */
-export const iniBooleanOrAutoToJsBoolean = (
-    value: IniStringBooleanOrAuto | string
-): boolean | null | undefined => {
-    // Handle auto first
-    if (value === 'auto') {
-        return null;
-    }
-
-    // Try to parse as boolean
-    const boolResult = iniBooleanToJsBoolean(value as IniStringBoolean);
-    if (boolResult !== undefined) {
-        return boolResult;
-    }
-
-    // Handle malformed values like "auto*" by extracting the base value
-    if (typeof value === 'string') {
-        const cleanValue = value.replace(/[^a-zA-Z]/g, '').toLowerCase();
-        if (cleanValue === 'auto') {
-            return null;
-        }
-        if (cleanValue === 'no' || cleanValue === 'false') {
-            return false;
-        }
-        if (cleanValue === 'yes' || cleanValue === 'true') {
-            return true;
-        }
-    }
-
-    // Return undefined as fallback instead of throwing to prevent API crash
-    return undefined;
-};
--- 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';

@@ -98,7 +99,7 @@ export const MOTHERSHIP_GRAPHQL_LINK = process.env.MOTHERSHIP_GRAPHQL_LINK
      ? '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 =
@@ -110,6 +111,3 @@ export const PATHS_CONFIG_MODULES =

 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/store/state-parsers/slots.ts
+++ b/api/src/store/state-parsers/slots.ts
@@ -36,7 +36,6 @@ export type IniSlot = {
    size: string;
    sizeSb: string;
    slots: string;
-    spundown: string;
    status: SlotStatus;
    temp: string;
    type: SlotType;
@@ -83,7 +82,6 @@ export const parse: StateFileToIniParserMap['disks'] = (disksIni) =>
                fsType: slot.fsType ?? null,
                format: slot.format === '-' ? null : slot.format,
                transport: slot.transport ?? null,
-                isSpinning: slot.spundown ? slot.spundown === '0' : null,
            };
            // @TODO Zod Parse This
            return result;
--- a/api/src/store/state-parsers/var.ts
+++ b/api/src/store/state-parsers/var.ts
@@ -1,10 +1,6 @@
 import type { StateFileToIniParserMap } from '@app/store/types.js';
 import { type IniStringBoolean, type IniStringBooleanOrAuto } from '@app/core/types/ini.js';
 import { toNumber } from '@app/core/utils/index.js';
-import {
-    iniBooleanOrAutoToJsBoolean,
-    iniBooleanToJsBoolean,
-} from '@app/core/utils/parsers/ini-boolean-parser.js';
 import { ArrayState } from '@app/unraid-api/graph/resolvers/array/array.model.js';
 import { DiskFsType } from '@app/unraid-api/graph/resolvers/disks/disks.model.js';
 import {
@@ -161,6 +157,36 @@ export type VarIni = {
    useUpnp: IniStringBoolean;
 };

+const iniBooleanToJsBoolean = (value: string, defaultValue?: boolean) => {
+    if (value === 'no' || value === 'false') {
+        return false;
+    }
+
+    if (value === 'yes' || value === 'true') {
+        return true;
+    }
+
+    if (defaultValue !== undefined) {
+        return defaultValue;
+    }
+
+    throw new Error(`Value "${value}" is not false/true or no/yes.`);
+};
+
+const iniBooleanOrAutoToJsBoolean = (value: IniStringBooleanOrAuto) => {
+    try {
+        // Either it'll return true/false or throw
+        return iniBooleanToJsBoolean(value as IniStringBoolean);
+    } catch {
+        // Auto or null
+        if (value === 'auto') {
+            return null;
+        }
+    }
+
+    throw new Error(`Value "${value as string}" is not auto/no/yes.`);
+};
+
 const safeParseMdState = (mdState: string | undefined): ArrayState => {
    if (!mdState || typeof mdState !== 'string') {
        return ArrayState.STOPPED;
@@ -184,7 +210,7 @@ export const parse: StateFileToIniParserMap['var'] = (iniFile) => {
        ...iniFile,
        defaultFsType: DiskFsType[iniFile.defaultFsType] || DiskFsType.XFS,
        mdState: safeParseMdState(iniFile.mdState),
-        bindMgt: iniBooleanOrAutoToJsBoolean(iniFile.bindMgt) ?? null,
+        bindMgt: iniBooleanOrAutoToJsBoolean(iniFile.bindMgt),
        cacheNumDevices: toNumber(iniFile.cacheNumDevices),
        cacheSbNumDisks: toNumber(iniFile.cacheSbNumDisks),
        configValid: iniBooleanToJsBoolean(iniFile.configValid, false),
@@ -195,8 +221,8 @@ export const parse: StateFileToIniParserMap['var'] = (iniFile) => {
        fsCopyPrcnt: toNumber(iniFile.fsCopyPrcnt),
        fsNumMounted: toNumber(iniFile.fsNumMounted),
        fsNumUnmountable: toNumber(iniFile.fsNumUnmountable),
-        hideDotFiles: iniBooleanToJsBoolean(iniFile.hideDotFiles, false),
-        localMaster: iniBooleanToJsBoolean(iniFile.localMaster, false),
+        hideDotFiles: iniBooleanToJsBoolean(iniFile.hideDotFiles),
+        localMaster: iniBooleanToJsBoolean(iniFile.localMaster),
        maxArraysz: toNumber(iniFile.maxArraysz),
        maxCachesz: toNumber(iniFile.maxCachesz),
        mdNumDisabled: toNumber(iniFile.mdNumDisabled),
@@ -228,34 +254,34 @@ export const parse: StateFileToIniParserMap['var'] = (iniFile) => {
        regState:
            RegistrationState[(iniFile.regCheck || iniFile.regTy || '').toUpperCase()] ??
            RegistrationState.EGUID,
-        safeMode: iniBooleanToJsBoolean(iniFile.safeMode, false),
-        sbClean: iniBooleanToJsBoolean(iniFile.sbClean, false),
+        safeMode: iniBooleanToJsBoolean(iniFile.safeMode),
+        sbClean: iniBooleanToJsBoolean(iniFile.sbClean),
        sbEvents: toNumber(iniFile.sbEvents),
        sbNumDisks: toNumber(iniFile.sbNumDisks),
        sbSynced: toNumber(iniFile.sbSynced),
        sbSynced2: toNumber(iniFile.sbSynced2),
        sbSyncErrs: toNumber(iniFile.sbSyncErrs),
-        shareAvahiEnabled: iniBooleanToJsBoolean(iniFile.shareAvahiEnabled, false),
-        shareCacheEnabled: iniBooleanToJsBoolean(iniFile.shareCacheEnabled, false),
+        shareAvahiEnabled: iniBooleanToJsBoolean(iniFile.shareAvahiEnabled),
+        shareCacheEnabled: iniBooleanToJsBoolean(iniFile.shareCacheEnabled),
        shareCount: toNumber(iniFile.shareCount),
-        shareMoverActive: iniBooleanToJsBoolean(iniFile.shareMoverActive, false),
-        shareMoverLogging: iniBooleanToJsBoolean(iniFile.shareMoverLogging, false),
+        shareMoverActive: iniBooleanToJsBoolean(iniFile.shareMoverActive),
+        shareMoverLogging: iniBooleanToJsBoolean(iniFile.shareMoverLogging),
        shareNfsCount: toNumber(iniFile.shareNfsCount),
-        shareNfsEnabled: iniBooleanToJsBoolean(iniFile.shareNfsEnabled, false),
+        shareNfsEnabled: iniBooleanToJsBoolean(iniFile.shareNfsEnabled),
        shareSmbCount: toNumber(iniFile.shareSmbCount),
        shareSmbEnabled: ['yes', 'ads'].includes(iniFile.shareSmbEnabled),
        shareSmbMode: iniFile.shareSmbEnabled === 'ads' ? 'active-directory' : 'workgroup',
        shutdownTimeout: toNumber(iniFile.shutdownTimeout),
        spindownDelay: toNumber(iniFile.spindownDelay),
-        spinupGroups: iniBooleanToJsBoolean(iniFile.spinupGroups, false),
-        startArray: iniBooleanToJsBoolean(iniFile.startArray, false),
+        spinupGroups: iniBooleanToJsBoolean(iniFile.spinupGroups),
+        startArray: iniBooleanToJsBoolean(iniFile.startArray),
        sysArraySlots: toNumber(iniFile.sysArraySlots),
        sysCacheSlots: toNumber(iniFile.sysCacheSlots),
        sysFlashSlots: toNumber(iniFile.sysFlashSlots),
-        useNtp: iniBooleanToJsBoolean(iniFile.useNtp, false),
-        useSsh: iniBooleanToJsBoolean(iniFile.useSsh, false),
-        useSsl: iniBooleanOrAutoToJsBoolean(iniFile.useSsl) ?? null,
-        useTelnet: iniBooleanToJsBoolean(iniFile.useTelnet, false),
-        useUpnp: iniBooleanToJsBoolean(iniFile.useUpnp, false),
+        useNtp: iniBooleanToJsBoolean(iniFile.useNtp),
+        useSsh: iniBooleanToJsBoolean(iniFile.useSsh),
+        useSsl: iniBooleanOrAutoToJsBoolean(iniFile.useSsl),
+        useTelnet: iniBooleanToJsBoolean(iniFile.useTelnet),
+        useUpnp: iniBooleanToJsBoolean(iniFile.useUpnp),
    };
 };
--- a/api/src/unraid-api/app/test/module-dependencies.integration.spec.ts
+++ b/api/src/unraid-api/app/test/module-dependencies.integration.spec.ts
@@ -1,4 +1,3 @@
-import { CacheModule } from '@nestjs/cache-manager';
 import { Test } from '@nestjs/testing';

 import { describe, expect, it } from 'vitest';
@@ -10,7 +9,7 @@ describe('Module Dependencies Integration', () => {
        let module;
        try {
            module = await Test.createTestingModule({
-                imports: [CacheModule.register({ isGlobal: true }), RestModule],
+                imports: [RestModule],
            }).compile();

            expect(module).toBeDefined();
--- a/api/src/unraid-api/app/app.module.ts
+++ b/api/src/unraid-api/app/app.module.ts
@@ -14,7 +14,6 @@ import { AuthModule } from '@app/unraid-api/auth/auth.module.js';
 import { AuthenticationGuard } from '@app/unraid-api/auth/authentication.guard.js';
 import { LegacyConfigModule } from '@app/unraid-api/config/legacy-config.module.js';
 import { CronModule } from '@app/unraid-api/cron/cron.module.js';
-import { JobModule } from '@app/unraid-api/cron/job.module.js';
 import { GraphModule } from '@app/unraid-api/graph/graph.module.js';
 import { GlobalDepsModule } from '@app/unraid-api/plugin/global-deps.module.js';
 import { RestModule } from '@app/unraid-api/rest/rest.module.js';
@@ -25,7 +24,7 @@ import { UnraidFileModifierModule } from '@app/unraid-api/unraid-file-modifier/u
        GlobalDepsModule,
        LegacyConfigModule,
        PubSubModule,
-        JobModule,
+        ScheduleModule.forRoot(),
        LoggerModule.forRoot({
            pinoHttp: {
                logger: apiLogger,
@@ -35,15 +34,6 @@ import { UnraidFileModifierModule } from '@app/unraid-api/unraid-file-modifier/u
                    req: () => undefined,
                    res: () => undefined,
                },
-                formatters: {
-                    log: (obj) => {
-                        // Map NestJS context to Pino context field for pino-pretty
-                        if (obj.context && !obj.logger) {
-                            return { ...obj, logger: obj.context };
-                        }
-                        return obj;
-                    },
-                },
            },
        }),
        AuthModule,
--- a/api/src/unraid-api/auth/api-key.service.spec.ts
+++ b/api/src/unraid-api/auth/api-key.service.spec.ts
@@ -681,104 +681,4 @@ describe('ApiKeyService', () => {
            ]);
        });
    });
-
-    describe('convertRolesStringArrayToRoles', () => {
-        beforeEach(async () => {
-            vi.mocked(getters.paths).mockReturnValue({
-                'auth-keys': mockBasePath,
-            } as ReturnType<typeof getters.paths>);
-
-            // Create a fresh mock logger for each test
-            mockLogger = {
-                log: vi.fn(),
-                error: vi.fn(),
-                warn: vi.fn(),
-                debug: vi.fn(),
-                verbose: vi.fn(),
-            };
-
-            apiKeyService = new ApiKeyService();
-            // Replace the logger with our mock
-            (apiKeyService as any).logger = mockLogger;
-        });
-
-        it('should convert uppercase role strings to Role enum values', () => {
-            const roles = ['ADMIN', 'CONNECT', 'VIEWER'];
-            const result = apiKeyService.convertRolesStringArrayToRoles(roles);
-
-            expect(result).toEqual([Role.ADMIN, Role.CONNECT, Role.VIEWER]);
-        });
-
-        it('should convert lowercase role strings to Role enum values', () => {
-            const roles = ['admin', 'connect', 'guest'];
-            const result = apiKeyService.convertRolesStringArrayToRoles(roles);
-
-            expect(result).toEqual([Role.ADMIN, Role.CONNECT, Role.GUEST]);
-        });
-
-        it('should convert mixed case role strings to Role enum values', () => {
-            const roles = ['Admin', 'CoNnEcT', 'ViEwEr'];
-            const result = apiKeyService.convertRolesStringArrayToRoles(roles);
-
-            expect(result).toEqual([Role.ADMIN, Role.CONNECT, Role.VIEWER]);
-        });
-
-        it('should handle roles with whitespace', () => {
-            const roles = [' ADMIN ', '  CONNECT  ', 'VIEWER  '];
-            const result = apiKeyService.convertRolesStringArrayToRoles(roles);
-
-            expect(result).toEqual([Role.ADMIN, Role.CONNECT, Role.VIEWER]);
-        });
-
-        it('should filter out invalid roles and warn', () => {
-            const roles = ['ADMIN', 'INVALID_ROLE', 'VIEWER', 'ANOTHER_INVALID'];
-            const result = apiKeyService.convertRolesStringArrayToRoles(roles);
-
-            expect(result).toEqual([Role.ADMIN, Role.VIEWER]);
-            expect(mockLogger.warn).toHaveBeenCalledWith(
-                'Ignoring invalid roles: INVALID_ROLE, ANOTHER_INVALID'
-            );
-        });
-
-        it('should return empty array when all roles are invalid', () => {
-            const roles = ['INVALID1', 'INVALID2', 'INVALID3'];
-            const result = apiKeyService.convertRolesStringArrayToRoles(roles);
-
-            expect(result).toEqual([]);
-            expect(mockLogger.warn).toHaveBeenCalledWith(
-                'Ignoring invalid roles: INVALID1, INVALID2, INVALID3'
-            );
-        });
-
-        it('should return empty array for empty input', () => {
-            const result = apiKeyService.convertRolesStringArrayToRoles([]);
-
-            expect(result).toEqual([]);
-            expect(mockLogger.warn).not.toHaveBeenCalled();
-        });
-
-        it('should handle all valid Role enum values', () => {
-            const roles = Object.values(Role);
-            const result = apiKeyService.convertRolesStringArrayToRoles(roles);
-
-            expect(result).toEqual(Object.values(Role));
-            expect(mockLogger.warn).not.toHaveBeenCalled();
-        });
-
-        it('should deduplicate roles', () => {
-            const roles = ['ADMIN', 'admin', 'ADMIN', 'VIEWER', 'viewer'];
-            const result = apiKeyService.convertRolesStringArrayToRoles(roles);
-
-            // Note: Current implementation doesn't deduplicate, but this test documents the behavior
-            expect(result).toEqual([Role.ADMIN, Role.ADMIN, Role.ADMIN, Role.VIEWER, Role.VIEWER]);
-        });
-
-        it('should handle mixed valid and invalid roles correctly', () => {
-            const roles = ['ADMIN', 'invalid', 'CONNECT', 'bad_role', 'GUEST', 'VIEWER'];
-            const result = apiKeyService.convertRolesStringArrayToRoles(roles);
-
-            expect(result).toEqual([Role.ADMIN, Role.CONNECT, Role.GUEST, Role.VIEWER]);
-            expect(mockLogger.warn).toHaveBeenCalledWith('Ignoring invalid roles: invalid, bad_role');
-        });
-    });
 });
--- a/api/src/unraid-api/auth/api-key.service.ts
+++ b/api/src/unraid-api/auth/api-key.service.ts
@@ -35,29 +35,11 @@ export class ApiKeyService implements OnModuleInit {

    async onModuleInit() {
        this.memoryApiKeys = await this.loadAllFromDisk();
-        await this.cleanupLegacyInternalKeys();
        if (environment.IS_MAIN_PROCESS) {
            this.setupWatch();
        }
    }

-    private async cleanupLegacyInternalKeys() {
-        const legacyNames = ['CliInternal', 'ConnectInternal'];
-        const keysToDelete = this.memoryApiKeys.filter((key) => legacyNames.includes(key.name));
-
-        if (keysToDelete.length > 0) {
-            try {
-                await this.deleteApiKeys(keysToDelete.map((key) => key.id));
-                this.logger.log(`Cleaned up ${keysToDelete.length} legacy internal keys`);
-            } catch (error) {
-                this.logger.debug(
-                    error,
-                    `Failed to delete legacy internal keys: ${keysToDelete.map((key) => key.name).join(', ')}`
-                );
-            }
-        }
-    }
-
    public async findAll(): Promise<ApiKey[]> {
        return this.memoryApiKeys;
    }
@@ -110,25 +92,9 @@ export class ApiKeyService implements OnModuleInit {
    }

    public convertRolesStringArrayToRoles(roles: string[]): Role[] {
-        const validRoles: Role[] = [];
-        const invalidRoles: string[] = [];
-
-        for (const roleStr of roles) {
-            const upperRole = roleStr.trim().toUpperCase();
-            const role = Role[upperRole as keyof typeof Role];
-
-            if (role && ApiKeyService.validRoles.has(role)) {
-                validRoles.push(role);
-            } else {
-                invalidRoles.push(roleStr);
-            }
-        }
-
-        if (invalidRoles.length > 0) {
-            this.logger.warn(`Ignoring invalid roles: ${invalidRoles.join(', ')}`);
-        }
-
-        return validRoles;
+        return roles
+            .map((roleStr) => Role[roleStr.trim().toUpperCase() as keyof typeof Role])
+            .filter(Boolean);
    }

    async create({
--- a/api/src/unraid-api/auth/auth.module.ts
+++ b/api/src/unraid-api/auth/auth.module.ts
@@ -8,7 +8,6 @@ import { AuthService } from '@app/unraid-api/auth/auth.service.js';
 import { CasbinModule } from '@app/unraid-api/auth/casbin/casbin.module.js';
 import { CasbinService } from '@app/unraid-api/auth/casbin/casbin.service.js';
 import { BASE_POLICY, CASBIN_MODEL } from '@app/unraid-api/auth/casbin/index.js';
-import { resolveSubjectFromUser } from '@app/unraid-api/auth/casbin/resolve-subject.util.js';
 import { CookieService, SESSION_COOKIE_CONFIG } from '@app/unraid-api/auth/cookie.service.js';
 import { UserCookieStrategy } from '@app/unraid-api/auth/cookie.strategy.js';
 import { ServerHeaderStrategy } from '@app/unraid-api/auth/header.strategy.js';
@@ -29,7 +28,6 @@ import { getRequest } from '@app/utils.js';
        CasbinModule,
        AuthZModule.register({
            imports: [CasbinModule],
-            enablePossession: false,
            enforcerProvider: {
                provide: AUTHZ_ENFORCER,
                useFactory: async (casbinService: CasbinService) => {
@@ -42,7 +40,13 @@ import { getRequest } from '@app/utils.js';

                try {
                    const request = getRequest(ctx);
-                    return resolveSubjectFromUser(request?.user);
+                    const roles = request?.user?.roles || [];
+
+                    if (!Array.isArray(roles)) {
+                        throw new UnauthorizedException('User roles must be an array');
+                    }
+
+                    return roles.join(',');
                } catch (error) {
                    logger.error('Failed to extract user context', error);
                    throw new UnauthorizedException('Failed to authenticate user');
--- a/api/src/unraid-api/auth/casbin/authz.guard.integration.spec.ts
+++ b/api/src/unraid-api/auth/casbin/authz.guard.integration.spec.ts
@@ -1,133 +0,0 @@
-import { ExecutionContext, Type } from '@nestjs/common';
-import { Reflector } from '@nestjs/core';
-import { ExecutionContextHost } from '@nestjs/core/helpers/execution-context-host.js';
-
-import type { Enforcer } from 'casbin';
-import { AuthAction, Resource, Role } from '@unraid/shared/graphql.model.js';
-import { AuthZGuard, BatchApproval } from 'nest-authz';
-import { beforeAll, describe, expect, it } from 'vitest';
-
-import { CasbinService } from '@app/unraid-api/auth/casbin/casbin.service.js';
-import { CASBIN_MODEL } from '@app/unraid-api/auth/casbin/model.js';
-import { BASE_POLICY } from '@app/unraid-api/auth/casbin/policy.js';
-import { resolveSubjectFromUser } from '@app/unraid-api/auth/casbin/resolve-subject.util.js';
-import { DockerMutationsResolver } from '@app/unraid-api/graph/resolvers/docker/docker.mutations.resolver.js';
-import { DockerResolver } from '@app/unraid-api/graph/resolvers/docker/docker.resolver.js';
-import { VmMutationsResolver } from '@app/unraid-api/graph/resolvers/vms/vms.mutations.resolver.js';
-import { MeResolver } from '@app/unraid-api/graph/user/user.resolver.js';
-import { getRequest } from '@app/utils.js';
-
-type Handler = (...args: any[]) => unknown;
-
-type TestUser = {
-    id?: string;
-    roles?: Role[];
-};
-
-type TestRequest = {
-    user?: TestUser;
-};
-
-function createExecutionContext(
-    handler: Handler,
-    classRef: Type<unknown> | null,
-    roles: Role[],
-    userId = 'api-key-viewer'
-): ExecutionContext {
-    const request: TestRequest = {
-        user: {
-            id: userId,
-            roles: [...roles],
-        },
-    };
-
-    const graphqlContextHost = new ExecutionContextHost(
-        [undefined, undefined, { req: request }, undefined],
-        classRef,
-        handler
-    );
-
-    graphqlContextHost.setType('graphql');
-
-    return graphqlContextHost as unknown as ExecutionContext;
-}
-
-describe('AuthZGuard + Casbin policies', () => {
-    let guard: AuthZGuard;
-    let enforcer: Enforcer;
-
-    beforeAll(async () => {
-        const casbinService = new CasbinService();
-        enforcer = await casbinService.initializeEnforcer(CASBIN_MODEL, BASE_POLICY);
-
-        await enforcer.addGroupingPolicy('api-key-viewer', Role.VIEWER);
-        await enforcer.addGroupingPolicy('api-key-admin', Role.ADMIN);
-
-        guard = new AuthZGuard(new Reflector(), enforcer, {
-            enablePossession: false,
-            batchApproval: BatchApproval.ALL,
-            userFromContext: (ctx: ExecutionContext) => {
-                const request = getRequest(ctx) as TestRequest | undefined;
-
-                return resolveSubjectFromUser(request?.user);
-            },
-        });
-    });
-
-    it('denies viewer role from stopping docker containers', async () => {
-        const context = createExecutionContext(
-            DockerMutationsResolver.prototype.stop,
-            DockerMutationsResolver,
-            [Role.VIEWER],
-            'api-key-viewer'
-        );
-
-        await expect(guard.canActivate(context)).resolves.toBe(false);
-    });
-
-    it('allows admin role to stop docker containers', async () => {
-        const context = createExecutionContext(
-            DockerMutationsResolver.prototype.stop,
-            DockerMutationsResolver,
-            [Role.ADMIN],
-            'api-key-admin'
-        );
-
-        await expect(guard.canActivate(context)).resolves.toBe(true);
-    });
-
-    it('denies viewer role from stopping virtual machines', async () => {
-        const context = createExecutionContext(
-            VmMutationsResolver.prototype.stop,
-            VmMutationsResolver,
-            [Role.VIEWER],
-            'api-key-viewer'
-        );
-
-        await expect(guard.canActivate(context)).resolves.toBe(false);
-    });
-
-    it('allows viewer role to read docker data', async () => {
-        const context = createExecutionContext(
-            DockerResolver.prototype.containers,
-            DockerResolver,
-            [Role.VIEWER],
-            'api-key-viewer'
-        );
-
-        await expect(guard.canActivate(context)).resolves.toBe(true);
-    });
-
-    it('allows API key with explicit permission to access ME resource', async () => {
-        await enforcer.addPolicy('api-key-custom', Resource.ME, AuthAction.READ_ANY);
-
-        const context = createExecutionContext(
-            MeResolver.prototype.me,
-            MeResolver,
-            [],
-            'api-key-custom'
-        );
-
-        await expect(guard.canActivate(context)).resolves.toBe(true);
-    });
-});
--- a/api/src/unraid-api/auth/casbin/resolve-subject.util.spec.ts
+++ b/api/src/unraid-api/auth/casbin/resolve-subject.util.spec.ts
@@ -1,43 +0,0 @@
-import { UnauthorizedException } from '@nestjs/common';
-
-import { describe, expect, it } from 'vitest';
-
-import { resolveSubjectFromUser } from '@app/unraid-api/auth/casbin/resolve-subject.util.js';
-
-describe('resolveSubjectFromUser', () => {
-    it('returns trimmed user id when available', () => {
-        const subject = resolveSubjectFromUser({ id: '  user-123  ', roles: ['viewer'] });
-
-        expect(subject).toBe('user-123');
-    });
-
-    it('falls back to a single non-empty role', () => {
-        const subject = resolveSubjectFromUser({ roles: ['  viewer  '] });
-
-        expect(subject).toBe('viewer');
-    });
-
-    it('throws when role list is empty', () => {
-        expect(() => resolveSubjectFromUser({ roles: [] })).toThrow(UnauthorizedException);
-    });
-
-    it('throws when multiple roles are present', () => {
-        expect(() => resolveSubjectFromUser({ roles: ['viewer', 'admin'] })).toThrow(
-            UnauthorizedException
-        );
-    });
-
-    it('throws when roles is not an array', () => {
-        expect(() => resolveSubjectFromUser({ roles: 'viewer' as unknown })).toThrow(
-            UnauthorizedException
-        );
-    });
-
-    it('throws when role subject is blank', () => {
-        expect(() => resolveSubjectFromUser({ roles: ['  '] })).toThrow(UnauthorizedException);
-    });
-
-    it('throws when user is missing', () => {
-        expect(() => resolveSubjectFromUser(undefined)).toThrow(UnauthorizedException);
-    });
-});
--- a/api/src/unraid-api/auth/casbin/resolve-subject.util.ts
+++ b/api/src/unraid-api/auth/casbin/resolve-subject.util.ts
@@ -1,46 +0,0 @@
-import { UnauthorizedException } from '@nestjs/common';
-
-type CasbinUser = {
-    id?: unknown;
-    roles?: unknown;
-};
-
-/**
- * Determine the Casbin subject for a request user.
- *
- * Prefers a non-empty `user.id`, otherwise falls back to a single non-empty role.
- * Throws when the subject cannot be resolved.
- */
-export function resolveSubjectFromUser(user: CasbinUser | undefined): string {
-    if (!user) {
-        throw new UnauthorizedException('Request user context missing');
-    }
-
-    const roles = user.roles ?? [];
-
-    if (!Array.isArray(roles)) {
-        throw new UnauthorizedException('User roles must be an array');
-    }
-
-    const userId = typeof user.id === 'string' ? user.id.trim() : '';
-
-    if (userId.length > 0) {
-        return userId;
-    }
-
-    if (roles.length === 1) {
-        const [role] = roles;
-
-        if (typeof role === 'string') {
-            const trimmedRole = role.trim();
-
-            if (trimmedRole.length > 0) {
-                return trimmedRole;
-            }
-        }
-
-        throw new UnauthorizedException('Role subject must be a non-empty string');
-    }
-
-    throw new UnauthorizedException('Unable to determine subject from user context');
-}
--- a/api/src/unraid-api/cli/test/api-key.command.test.ts
+++ b/api/src/unraid-api/cli/test/api-key.command.test.ts
@@ -1,192 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-
-import { InquirerService } from 'nest-commander';
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
-import { ApiKeyService } from '@app/unraid-api/auth/api-key.service.js';
-import { AddApiKeyQuestionSet } from '@app/unraid-api/cli/apikey/add-api-key.questions.js';
-import { ApiKeyCommand } from '@app/unraid-api/cli/apikey/api-key.command.js';
-import { LogService } from '@app/unraid-api/cli/log.service.js';
-
-describe('ApiKeyCommand', () => {
-    let command: ApiKeyCommand;
-    let apiKeyService: ApiKeyService;
-    let logService: LogService;
-    let inquirerService: InquirerService;
-    let questionSet: AddApiKeyQuestionSet;
-
-    beforeEach(async () => {
-        const module: TestingModule = await Test.createTestingModule({
-            providers: [
-                ApiKeyCommand,
-                AddApiKeyQuestionSet,
-                {
-                    provide: ApiKeyService,
-                    useValue: {
-                        findByField: vi.fn(),
-                        create: vi.fn(),
-                        findAll: vi.fn(),
-                        deleteApiKeys: vi.fn(),
-                        convertRolesStringArrayToRoles: vi.fn((roles) => roles),
-                        convertPermissionsStringArrayToPermissions: vi.fn((perms) => perms),
-                        getAllValidPermissions: vi.fn(() => []),
-                    },
-                },
-                {
-                    provide: LogService,
-                    useValue: {
-                        log: vi.fn(),
-                        error: vi.fn(),
-                    },
-                },
-                {
-                    provide: InquirerService,
-                    useValue: {
-                        prompt: vi.fn(),
-                    },
-                },
-            ],
-        }).compile();
-
-        command = module.get<ApiKeyCommand>(ApiKeyCommand);
-        apiKeyService = module.get<ApiKeyService>(ApiKeyService);
-        logService = module.get<LogService>(LogService);
-        inquirerService = module.get<InquirerService>(InquirerService);
-        questionSet = module.get<AddApiKeyQuestionSet>(AddApiKeyQuestionSet);
-    });
-
-    describe('AddApiKeyQuestionSet', () => {
-        describe('shouldAskOverwrite', () => {
-            it('should return true when an API key with the given name exists', () => {
-                vi.mocked(apiKeyService.findByField).mockReturnValue({
-                    key: 'existing-key',
-                    name: 'test-key',
-                    description: 'Test key',
-                    roles: [],
-                    permissions: [],
-                } as any);
-
-                const result = questionSet.shouldAskOverwrite({ name: 'test-key' });
-
-                expect(result).toBe(true);
-                expect(apiKeyService.findByField).toHaveBeenCalledWith('name', 'test-key');
-            });
-
-            it('should return false when no API key with the given name exists', () => {
-                vi.mocked(apiKeyService.findByField).mockReturnValue(null);
-
-                const result = questionSet.shouldAskOverwrite({ name: 'non-existent-key' });
-
-                expect(result).toBe(false);
-                expect(apiKeyService.findByField).toHaveBeenCalledWith('name', 'non-existent-key');
-            });
-        });
-    });
-
-    describe('run', () => {
-        it('should find and return existing key when not creating', async () => {
-            const mockKey = { key: 'test-api-key-123', name: 'test-key' };
-            vi.mocked(apiKeyService.findByField).mockReturnValue(mockKey as any);
-
-            await command.run([], { name: 'test-key', create: false });
-
-            expect(apiKeyService.findByField).toHaveBeenCalledWith('name', 'test-key');
-            expect(logService.log).toHaveBeenCalledWith('test-api-key-123');
-        });
-
-        it('should create new key when key does not exist and create flag is set', async () => {
-            vi.mocked(apiKeyService.findByField).mockReturnValue(null);
-            vi.mocked(apiKeyService.create).mockResolvedValue({ key: 'new-api-key-456' } as any);
-
-            await command.run([], {
-                name: 'new-key',
-                create: true,
-                roles: ['ADMIN'] as any,
-                description: 'Test description',
-            });
-
-            expect(apiKeyService.create).toHaveBeenCalledWith({
-                name: 'new-key',
-                description: 'Test description',
-                roles: ['ADMIN'],
-                permissions: undefined,
-                overwrite: false,
-            });
-            expect(logService.log).toHaveBeenCalledWith('new-api-key-456');
-        });
-
-        it('should error when key exists and overwrite is not set in non-interactive mode', async () => {
-            const mockKey = { key: 'existing-key', name: 'test-key' };
-            vi.mocked(apiKeyService.findByField)
-                .mockReturnValueOnce(null) // First call in line 131
-                .mockReturnValueOnce(mockKey as any); // Second call in non-interactive check
-            const exitSpy = vi.spyOn(process, 'exit').mockImplementation(() => {
-                throw new Error('process.exit');
-            });
-
-            await expect(
-                command.run([], {
-                    name: 'test-key',
-                    create: true,
-                    roles: ['ADMIN'] as any,
-                })
-            ).rejects.toThrow();
-
-            expect(logService.error).toHaveBeenCalledWith(
-                "API key with name 'test-key' already exists. Use --overwrite to replace it."
-            );
-            expect(exitSpy).toHaveBeenCalledWith(1);
-            exitSpy.mockRestore();
-        });
-
-        it('should create key with overwrite when key exists and overwrite is set', async () => {
-            const mockKey = { key: 'existing-key', name: 'test-key' };
-            vi.mocked(apiKeyService.findByField)
-                .mockReturnValueOnce(null) // First call in line 131
-                .mockReturnValueOnce(mockKey as any); // Second call in non-interactive check
-            vi.mocked(apiKeyService.create).mockResolvedValue({ key: 'overwritten-key' } as any);
-
-            await command.run([], {
-                name: 'test-key',
-                create: true,
-                roles: ['ADMIN'] as any,
-                overwrite: true,
-            });
-
-            expect(apiKeyService.create).toHaveBeenCalledWith({
-                name: 'test-key',
-                description: 'CLI generated key: test-key',
-                roles: ['ADMIN'],
-                permissions: undefined,
-                overwrite: true,
-            });
-            expect(logService.log).toHaveBeenCalledWith('overwritten-key');
-        });
-
-        it('should prompt for missing fields when creating without sufficient info', async () => {
-            vi.mocked(apiKeyService.findByField).mockReturnValue(null);
-            vi.mocked(inquirerService.prompt).mockResolvedValue({
-                name: 'prompted-key',
-                roles: ['USER'],
-                permissions: [],
-                description: 'Prompted description',
-                overwrite: false,
-            } as any);
-            vi.mocked(apiKeyService.create).mockResolvedValue({ key: 'prompted-api-key' } as any);
-
-            await command.run([], { name: '', create: true });
-
-            expect(inquirerService.prompt).toHaveBeenCalledWith('add-api-key', {
-                name: '',
-                create: true,
-            });
-            expect(apiKeyService.create).toHaveBeenCalledWith({
-                name: 'prompted-key',
-                description: 'Prompted description',
-                roles: ['USER'],
-                permissions: [],
-                overwrite: false,
-            });
-        });
-    });
-});
--- a/api/src/unraid-api/cli/test/version.command.test.ts
+++ b/api/src/unraid-api/cli/test/version.command.test.ts
@@ -1,111 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-
-import { afterEach, beforeEach, describe, expect, it, MockInstance, vi } from 'vitest';
-
-import { LogService } from '@app/unraid-api/cli/log.service.js';
-import { VersionCommand } from '@app/unraid-api/cli/version.command.js';
-
-let API_VERSION_MOCK = '4.18.2+build123';
-
-vi.mock('@app/environment.js', async (importOriginal) => {
-    const actual = (await importOriginal()) as any;
-    return {
-        ...actual,
-        get API_VERSION() {
-            return API_VERSION_MOCK;
-        },
-    };
-});
-
-describe('VersionCommand', () => {
-    let command: VersionCommand;
-    let logService: LogService;
-    let consoleLogSpy: MockInstance<typeof console.log>;
-
-    beforeEach(async () => {
-        API_VERSION_MOCK = '4.18.2+build123'; // Reset to default before each test
-        consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
-
-        const module: TestingModule = await Test.createTestingModule({
-            providers: [
-                VersionCommand,
-                {
-                    provide: LogService,
-                    useValue: {
-                        info: vi.fn(),
-                    },
-                },
-            ],
-        }).compile();
-
-        command = module.get<VersionCommand>(VersionCommand);
-        logService = module.get<LogService>(LogService);
-    });
-
-    afterEach(() => {
-        vi.restoreAllMocks();
-    });
-
-    describe('run', () => {
-        it('should output version with logger when no options provided', async () => {
-            await command.run([]);
-
-            expect(logService.info).toHaveBeenCalledWith('Unraid API v4.18.2+build123');
-            expect(consoleLogSpy).not.toHaveBeenCalled();
-        });
-
-        it('should output version with logger when json option is false', async () => {
-            await command.run([], { json: false });
-
-            expect(logService.info).toHaveBeenCalledWith('Unraid API v4.18.2+build123');
-            expect(consoleLogSpy).not.toHaveBeenCalled();
-        });
-
-        it('should output JSON when json option is true', async () => {
-            await command.run([], { json: true });
-
-            expect(logService.info).not.toHaveBeenCalled();
-            expect(consoleLogSpy).toHaveBeenCalledWith(
-                JSON.stringify({
-                    version: '4.18.2',
-                    build: 'build123',
-                    combined: '4.18.2+build123',
-                })
-            );
-        });
-
-        it('should handle version without build info', async () => {
-            API_VERSION_MOCK = '4.18.2'; // Set version without build info
-
-            const module: TestingModule = await Test.createTestingModule({
-                providers: [
-                    VersionCommand,
-                    {
-                        provide: LogService,
-                        useValue: {
-                            info: vi.fn(),
-                        },
-                    },
-                ],
-            }).compile();
-
-            const commandWithoutBuild = module.get<VersionCommand>(VersionCommand);
-
-            await commandWithoutBuild.run([], { json: true });
-
-            expect(consoleLogSpy).toHaveBeenCalledWith(
-                JSON.stringify({
-                    version: '4.18.2',
-                    build: undefined,
-                    combined: '4.18.2',
-                })
-            );
-        });
-    });
-
-    describe('parseJson', () => {
-        it('should return true', () => {
-            expect(command.parseJson()).toBe(true);
-        });
-    });
-});
--- a/api/src/unraid-api/cli/apikey/add-api-key.questions.ts
+++ b/api/src/unraid-api/cli/apikey/add-api-key.questions.ts
@@ -39,12 +39,6 @@ export class AddApiKeyQuestionSet {
        return this.apiKeyService.convertRolesStringArrayToRoles(val);
    }

-    @WhenFor({ name: 'roles' })
-    shouldAskRoles(options: { roles?: Role[]; permissions?: Permission[] }): boolean {
-        // Ask for roles if they weren't provided or are empty
-        return !options.roles || options.roles.length === 0;
-    }
-
    @ChoicesFor({ name: 'roles' })
    async getRoles() {
        return Object.values(Role);
@@ -59,12 +53,6 @@ export class AddApiKeyQuestionSet {
        return this.apiKeyService.convertPermissionsStringArrayToPermissions(val);
    }

-    @WhenFor({ name: 'permissions' })
-    shouldAskPermissions(options: { roles?: Role[]; permissions?: Permission[] }): boolean {
-        // Ask for permissions if they weren't provided or are empty
-        return !options.permissions || options.permissions.length === 0;
-    }
-
    @ChoicesFor({ name: 'permissions' })
    async getPermissions() {
        return this.apiKeyService
@@ -84,6 +72,6 @@ export class AddApiKeyQuestionSet {

    @WhenFor({ name: 'overwrite' })
    shouldAskOverwrite(options: { name: string }): boolean {
-        return Boolean(this.apiKeyService.findByField('name', options.name));
+        return Boolean(this.apiKeyService.findByKey(options.name));
    }
 }
--- a/api/src/unraid-api/cli/apikey/api-key.command.spec.ts
+++ b/api/src/unraid-api/cli/apikey/api-key.command.spec.ts
@@ -1,434 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-
-import { AuthAction, Resource, Role } from '@unraid/shared/graphql.model.js';
-import { InquirerService } from 'nest-commander';
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
-import { ApiKeyService } from '@app/unraid-api/auth/api-key.service.js';
-import { ApiKeyCommand } from '@app/unraid-api/cli/apikey/api-key.command.js';
-import { LogService } from '@app/unraid-api/cli/log.service.js';
-
-describe('ApiKeyCommand', () => {
-    let command: ApiKeyCommand;
-    let apiKeyService: ApiKeyService;
-    let logService: LogService;
-
-    beforeEach(async () => {
-        const module: TestingModule = await Test.createTestingModule({
-            providers: [
-                ApiKeyCommand,
-                {
-                    provide: ApiKeyService,
-                    useValue: {
-                        findByField: vi.fn(),
-                        create: vi.fn(),
-                        convertRolesStringArrayToRoles: vi.fn(),
-                        convertPermissionsStringArrayToPermissions: vi.fn(),
-                        findAll: vi.fn(),
-                        deleteApiKeys: vi.fn(),
-                    },
-                },
-                {
-                    provide: LogService,
-                    useValue: {
-                        log: vi.fn(),
-                        error: vi.fn(),
-                        warn: vi.fn(),
-                    },
-                },
-                {
-                    provide: InquirerService,
-                    useValue: {
-                        prompt: vi.fn(),
-                    },
-                },
-            ],
-        }).compile();
-
-        command = module.get<ApiKeyCommand>(ApiKeyCommand);
-        apiKeyService = module.get<ApiKeyService>(ApiKeyService);
-        logService = module.get<LogService>(LogService);
-    });
-
-    describe('parseRoles', () => {
-        it('should parse valid roles correctly', () => {
-            const mockConvert = vi
-                .spyOn(apiKeyService, 'convertRolesStringArrayToRoles')
-                .mockReturnValue([Role.ADMIN, Role.CONNECT]);
-
-            const result = command.parseRoles('ADMIN,CONNECT');
-
-            expect(mockConvert).toHaveBeenCalledWith(['ADMIN', 'CONNECT']);
-            expect(result).toEqual([Role.ADMIN, Role.CONNECT]);
-        });
-
-        it('should return GUEST role when no roles provided', () => {
-            const result = command.parseRoles('');
-
-            expect(result).toEqual([Role.GUEST]);
-        });
-
-        it('should handle roles with spaces', () => {
-            const mockConvert = vi
-                .spyOn(apiKeyService, 'convertRolesStringArrayToRoles')
-                .mockReturnValue([Role.ADMIN, Role.VIEWER]);
-
-            const result = command.parseRoles('ADMIN, VIEWER');
-
-            expect(mockConvert).toHaveBeenCalledWith(['ADMIN', ' VIEWER']);
-            expect(result).toEqual([Role.ADMIN, Role.VIEWER]);
-        });
-
-        it('should throw error when no valid roles found', () => {
-            vi.spyOn(apiKeyService, 'convertRolesStringArrayToRoles').mockReturnValue([]);
-
-            expect(() => command.parseRoles('INVALID_ROLE')).toThrow(
-                `Invalid roles. Valid options are: ${Object.values(Role).join(', ')}`
-            );
-        });
-
-        it('should handle mixed valid and invalid roles with warning', () => {
-            const mockConvert = vi
-                .spyOn(apiKeyService, 'convertRolesStringArrayToRoles')
-                .mockImplementation((roles) => {
-                    const validRoles: Role[] = [];
-                    const invalidRoles: string[] = [];
-
-                    for (const roleStr of roles) {
-                        const upperRole = roleStr.trim().toUpperCase();
-                        const role = Role[upperRole as keyof typeof Role];
-
-                        if (role) {
-                            validRoles.push(role);
-                        } else {
-                            invalidRoles.push(roleStr);
-                        }
-                    }
-
-                    if (invalidRoles.length > 0) {
-                        logService.warn(`Ignoring invalid roles: ${invalidRoles.join(', ')}`);
-                    }
-
-                    return validRoles;
-                });
-
-            const result = command.parseRoles('ADMIN,INVALID,VIEWER');
-
-            expect(mockConvert).toHaveBeenCalledWith(['ADMIN', 'INVALID', 'VIEWER']);
-            expect(logService.warn).toHaveBeenCalledWith('Ignoring invalid roles: INVALID');
-            expect(result).toEqual([Role.ADMIN, Role.VIEWER]);
-        });
-    });
-
-    describe('run', () => {
-        it('should create API key with roles without prompting', async () => {
-            const mockKey = {
-                id: 'test-id',
-                key: 'test-key-123',
-                name: 'TEST',
-                roles: [Role.ADMIN],
-                createdAt: new Date().toISOString(),
-                permissions: [],
-            };
-            vi.spyOn(apiKeyService, 'findByField').mockReturnValue(null);
-            vi.spyOn(apiKeyService, 'create').mockResolvedValue(mockKey);
-
-            await command.run([], {
-                name: 'TEST',
-                create: true,
-                roles: [Role.ADMIN],
-                permissions: undefined,
-                description: 'Test description',
-            });
-
-            expect(apiKeyService.create).toHaveBeenCalledWith({
-                name: 'TEST',
-                description: 'Test description',
-                roles: [Role.ADMIN],
-                permissions: undefined,
-                overwrite: false,
-            });
-            expect(logService.log).toHaveBeenCalledWith('test-key-123');
-        });
-
-        it('should create API key with permissions only without prompting', async () => {
-            const mockKey = {
-                id: 'test-id',
-                key: 'test-key-456',
-                name: 'TEST_PERMS',
-                roles: [],
-                createdAt: new Date().toISOString(),
-                permissions: [],
-            };
-            const mockPermissions = [
-                {
-                    resource: Resource.DOCKER,
-                    actions: [AuthAction.READ_ANY],
-                },
-            ];
-
-            vi.spyOn(apiKeyService, 'findByField').mockReturnValue(null);
-            vi.spyOn(apiKeyService, 'create').mockResolvedValue(mockKey);
-
-            await command.run([], {
-                name: 'TEST_PERMS',
-                create: true,
-                roles: undefined,
-                permissions: mockPermissions,
-                description: 'Test with permissions',
-            });
-
-            expect(apiKeyService.create).toHaveBeenCalledWith({
-                name: 'TEST_PERMS',
-                description: 'Test with permissions',
-                roles: undefined,
-                permissions: mockPermissions,
-                overwrite: false,
-            });
-            expect(logService.log).toHaveBeenCalledWith('test-key-456');
-        });
-
-        it('should use default description when not provided', async () => {
-            const mockKey = {
-                id: 'test-id',
-                key: 'test-key-789',
-                name: 'NO_DESC',
-                roles: [Role.VIEWER],
-                createdAt: new Date().toISOString(),
-                permissions: [],
-            };
-            vi.spyOn(apiKeyService, 'findByField').mockReturnValue(null);
-            vi.spyOn(apiKeyService, 'create').mockResolvedValue(mockKey);
-
-            await command.run([], {
-                name: 'NO_DESC',
-                create: true,
-                roles: [Role.VIEWER],
-                permissions: undefined,
-            });
-
-            expect(apiKeyService.create).toHaveBeenCalledWith({
-                name: 'NO_DESC',
-                description: 'CLI generated key: NO_DESC',
-                roles: [Role.VIEWER],
-                permissions: undefined,
-                overwrite: false,
-            });
-        });
-
-        it('should return existing key when found', async () => {
-            const existingKey = {
-                id: 'existing-id',
-                key: 'existing-key-123',
-                name: 'EXISTING',
-                roles: [Role.ADMIN],
-                createdAt: new Date().toISOString(),
-                permissions: [],
-            };
-            vi.spyOn(apiKeyService, 'findByField').mockReturnValue(existingKey);
-
-            await command.run([], {
-                name: 'EXISTING',
-                create: false,
-            });
-
-            expect(apiKeyService.findByField).toHaveBeenCalledWith('name', 'EXISTING');
-            expect(logService.log).toHaveBeenCalledWith('existing-key-123');
-            expect(apiKeyService.create).not.toHaveBeenCalled();
-        });
-
-        it('should handle uppercase role conversion', () => {
-            const mockConvert = vi
-                .spyOn(apiKeyService, 'convertRolesStringArrayToRoles')
-                .mockImplementation((roles) => {
-                    return roles
-                        .map((roleStr) => Role[roleStr.trim().toUpperCase() as keyof typeof Role])
-                        .filter(Boolean);
-                });
-
-            const result = command.parseRoles('admin,connect');
-
-            expect(mockConvert).toHaveBeenCalledWith(['admin', 'connect']);
-            expect(result).toEqual([Role.ADMIN, Role.CONNECT]);
-        });
-
-        it('should handle lowercase role conversion', () => {
-            const mockConvert = vi
-                .spyOn(apiKeyService, 'convertRolesStringArrayToRoles')
-                .mockImplementation((roles) => {
-                    return roles
-                        .map((roleStr) => Role[roleStr.trim().toUpperCase() as keyof typeof Role])
-                        .filter(Boolean);
-                });
-
-            const result = command.parseRoles('viewer');
-
-            expect(mockConvert).toHaveBeenCalledWith(['viewer']);
-            expect(result).toEqual([Role.VIEWER]);
-        });
-
-        it('should handle mixed case role conversion', () => {
-            const mockConvert = vi
-                .spyOn(apiKeyService, 'convertRolesStringArrayToRoles')
-                .mockImplementation((roles) => {
-                    return roles
-                        .map((roleStr) => Role[roleStr.trim().toUpperCase() as keyof typeof Role])
-                        .filter(Boolean);
-                });
-
-            const result = command.parseRoles('Admin,CoNnEcT');
-
-            expect(mockConvert).toHaveBeenCalledWith(['Admin', 'CoNnEcT']);
-            expect(result).toEqual([Role.ADMIN, Role.CONNECT]);
-        });
-    });
-
-    describe('JSON output functionality', () => {
-        let consoleSpy: ReturnType<typeof vi.spyOn>;
-
-        beforeEach(() => {
-            consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
-        });
-
-        it('should output JSON when creating key with --json flag', async () => {
-            const mockKey = {
-                id: 'test-id-123',
-                key: 'test-key-456',
-                name: 'JSON_TEST',
-                roles: [Role.ADMIN],
-                createdAt: new Date().toISOString(),
-                permissions: [],
-            };
-            vi.spyOn(apiKeyService, 'findByField').mockReturnValue(null);
-            vi.spyOn(apiKeyService, 'create').mockResolvedValue(mockKey);
-
-            await command.run([], {
-                name: 'JSON_TEST',
-                create: true,
-                roles: [Role.ADMIN],
-                json: true,
-            });
-
-            expect(consoleSpy).toHaveBeenCalledWith(
-                JSON.stringify({ key: 'test-key-456', name: 'JSON_TEST', id: 'test-id-123' })
-            );
-            expect(logService.log).not.toHaveBeenCalledWith('test-key-456');
-        });
-
-        it('should output JSON when fetching existing key with --json flag', async () => {
-            const existingKey = {
-                id: 'existing-id-456',
-                key: 'existing-key-789',
-                name: 'EXISTING_JSON',
-                roles: [Role.VIEWER],
-                createdAt: new Date().toISOString(),
-                permissions: [],
-            };
-            vi.spyOn(apiKeyService, 'findByField').mockReturnValue(existingKey);
-
-            await command.run([], {
-                name: 'EXISTING_JSON',
-                create: false,
-                json: true,
-            });
-
-            expect(consoleSpy).toHaveBeenCalledWith(
-                JSON.stringify({ key: 'existing-key-789', name: 'EXISTING_JSON', id: 'existing-id-456' })
-            );
-            expect(logService.log).not.toHaveBeenCalledWith('existing-key-789');
-        });
-
-        it('should output JSON when deleting key with --json flag', async () => {
-            const existingKeys = [
-                {
-                    id: 'delete-id-123',
-                    name: 'DELETE_JSON',
-                    key: 'delete-key-456',
-                    roles: [Role.GUEST],
-                    createdAt: new Date().toISOString(),
-                    permissions: [],
-                },
-            ];
-            vi.spyOn(apiKeyService, 'findAll').mockResolvedValue(existingKeys);
-            vi.spyOn(apiKeyService, 'deleteApiKeys').mockResolvedValue();
-
-            await command.run([], {
-                name: 'DELETE_JSON',
-                delete: true,
-                json: true,
-            });
-
-            expect(consoleSpy).toHaveBeenCalledWith(
-                JSON.stringify({
-                    deleted: 1,
-                    keys: [{ id: 'delete-id-123', name: 'DELETE_JSON' }],
-                })
-            );
-            expect(logService.log).not.toHaveBeenCalledWith('Successfully deleted 1 API key');
-        });
-
-        it('should output JSON error when deleting non-existent key with --json flag', async () => {
-            vi.spyOn(apiKeyService, 'findAll').mockResolvedValue([]);
-
-            await command.run([], {
-                name: 'NONEXISTENT',
-                delete: true,
-                json: true,
-            });
-
-            expect(consoleSpy).toHaveBeenCalledWith(
-                JSON.stringify({ deleted: 0, message: 'No API keys found to delete' })
-            );
-            expect(logService.log).not.toHaveBeenCalledWith('No API keys found to delete');
-        });
-
-        it('should not suppress creation message when not using JSON', async () => {
-            const mockKey = {
-                id: 'test-id',
-                key: 'test-key',
-                name: 'NO_JSON_TEST',
-                roles: [Role.ADMIN],
-                createdAt: new Date().toISOString(),
-                permissions: [],
-            };
-            vi.spyOn(apiKeyService, 'findByField').mockReturnValue(null);
-            vi.spyOn(apiKeyService, 'create').mockResolvedValue(mockKey);
-
-            await command.run([], {
-                name: 'NO_JSON_TEST',
-                create: true,
-                roles: [Role.ADMIN],
-                json: false,
-            });
-
-            expect(logService.log).toHaveBeenCalledWith('Creating API Key...');
-            expect(logService.log).toHaveBeenCalledWith('test-key');
-            expect(consoleSpy).not.toHaveBeenCalled();
-        });
-
-        it('should suppress creation message when using JSON', async () => {
-            const mockKey = {
-                id: 'test-id',
-                key: 'test-key',
-                name: 'JSON_SUPPRESS_TEST',
-                roles: [Role.ADMIN],
-                createdAt: new Date().toISOString(),
-                permissions: [],
-            };
-            vi.spyOn(apiKeyService, 'findByField').mockReturnValue(null);
-            vi.spyOn(apiKeyService, 'create').mockResolvedValue(mockKey);
-
-            await command.run([], {
-                name: 'JSON_SUPPRESS_TEST',
-                create: true,
-                roles: [Role.ADMIN],
-                json: true,
-            });
-
-            expect(logService.log).not.toHaveBeenCalledWith('Creating API Key...');
-            expect(consoleSpy).toHaveBeenCalledWith(
-                JSON.stringify({ key: 'test-key', name: 'JSON_SUPPRESS_TEST', id: 'test-id' })
-            );
-        });
-    });
-});
--- a/api/src/unraid-api/cli/apikey/api-key.command.ts
+++ b/api/src/unraid-api/cli/apikey/api-key.command.ts
@@ -10,13 +10,11 @@ import { Permission } from '@app/unraid-api/graph/resolvers/api-key/api-key.mode

 interface KeyOptions {
    name: string;
-    create?: boolean;
+    create: boolean;
    delete?: boolean;
    description?: string;
    roles?: Role[];
    permissions?: Permission[];
-    overwrite?: boolean;
-    json?: boolean;
 }

@Command({
@@ -54,15 +52,22 @@ export class ApiKeyCommand extends CommandRunner {
    })
    parseRoles(roles: string): Role[] {
        if (!roles) return [Role.GUEST];
+        const validRoles: Set<Role> = new Set(Object.values(Role));

-        const roleArray = roles.split(',').filter(Boolean);
-        const validRoles = this.apiKeyService.convertRolesStringArrayToRoles(roleArray);
+        const requestedRoles = roles.split(',').map((role) => role.trim().toLocaleLowerCase() as Role);
+        const validRequestedRoles = requestedRoles.filter((role) => validRoles.has(role));

-        if (validRoles.length === 0) {
-            throw new Error(`Invalid roles. Valid options are: ${Object.values(Role).join(', ')}`);
+        if (validRequestedRoles.length === 0) {
+            throw new Error(`Invalid roles. Valid options are: ${Array.from(validRoles).join(', ')}`);
        }

-        return validRoles;
+        const invalidRoles = requestedRoles.filter((role) => !validRoles.has(role));
+
+        if (invalidRoles.length > 0) {
+            this.logger.warn(`Ignoring invalid roles: ${invalidRoles.join(', ')}`);
+        }
+
+        return validRequestedRoles;
    }

    @Option({
@@ -93,137 +98,48 @@ ACTIONS: ${Object.values(AuthAction).join(', ')}`,
        return true;
    }

-    @Option({
-        flags: '--overwrite',
-        description: 'Overwrite existing API key if it exists',
-    })
-    parseOverwrite(): boolean {
-        return true;
-    }
-
-    @Option({
-        flags: '--json',
-        description: 'Output machine-readable JSON format',
-    })
-    parseJson(): boolean {
-        return true;
-    }
-
-    /** Helper to output either JSON or regular log message */
-    private output(message: string, jsonData?: object, jsonOutput?: boolean): void {
-        if (jsonOutput && jsonData) {
-            console.log(JSON.stringify(jsonData));
-        } else {
-            this.logger.log(message);
-        }
-    }
-
-    /** Helper to output either JSON or regular error message */
-    private outputError(message: string, jsonData?: object, jsonOutput?: boolean): void {
-        if (jsonOutput && jsonData) {
-            console.log(JSON.stringify(jsonData));
-        } else {
-            this.logger.error(message);
-        }
-    }
-
-    /** Delete API keys either by name (non-interactive) or by prompting user selection (interactive). */
-    private async deleteKeys(name?: string, jsonOutput?: boolean) {
+    /** Prompt the user to select API keys to delete. Then, delete the selected keys. */
+    private async deleteKeys() {
        const allKeys = await this.apiKeyService.findAll();
        if (allKeys.length === 0) {
-            this.output(
-                'No API keys found to delete',
-                { deleted: 0, message: 'No API keys found to delete' },
-                jsonOutput
-            );
+            this.logger.log('No API keys found to delete');
            return;
        }

-        let selectedKeyIds: string[];
-        let deletedKeys: { id: string; name: string }[] = [];
-
-        if (name) {
-            // Non-interactive mode: delete by name
-            const keyToDelete = allKeys.find((key) => key.name === name);
-            if (!keyToDelete) {
-                this.outputError(
-                    `No API key found with name: ${name}`,
-                    { deleted: 0, error: `No API key found with name: ${name}` },
-                    jsonOutput
-                );
-                process.exit(1);
-            }
-            selectedKeyIds = [keyToDelete.id];
-            deletedKeys = [{ id: keyToDelete.id, name: keyToDelete.name }];
-        } else {
-            // Interactive mode: prompt user to select keys
-            const answers = await this.inquirerService.prompt<DeleteApiKeyAnswers>(
-                DeleteApiKeyQuestionSet.name,
-                {}
-            );
-            if (!answers.selectedKeys || answers.selectedKeys.length === 0) {
-                this.output(
-                    'No keys selected for deletion',
-                    { deleted: 0, message: 'No keys selected for deletion' },
-                    jsonOutput
-                );
-                return;
-            }
-            selectedKeyIds = answers.selectedKeys;
-            deletedKeys = allKeys
-                .filter((key) => selectedKeyIds.includes(key.id))
-                .map((key) => ({ id: key.id, name: key.name }));
+        const answers = await this.inquirerService.prompt<DeleteApiKeyAnswers>(
+            DeleteApiKeyQuestionSet.name,
+            {}
+        );
+        if (!answers.selectedKeys || answers.selectedKeys.length === 0) {
+            this.logger.log('No keys selected for deletion');
+            return;
        }

        try {
-            await this.apiKeyService.deleteApiKeys(selectedKeyIds);
-            const message = `Successfully deleted ${selectedKeyIds.length} API key${selectedKeyIds.length === 1 ? '' : 's'}`;
-            this.output(message, { deleted: selectedKeyIds.length, keys: deletedKeys }, jsonOutput);
+            await this.apiKeyService.deleteApiKeys(answers.selectedKeys);
+            this.logger.log(`Successfully deleted ${answers.selectedKeys.length} API keys`);
        } catch (error) {
-            const errorMessage = error instanceof Error ? error.message : String(error);
-            this.outputError(errorMessage, { deleted: 0, error: errorMessage }, jsonOutput);
+            this.logger.error(error as any);
            process.exit(1);
        }
    }

-    async run(_: string[], options: KeyOptions = { name: '', delete: false }): Promise<void> {
+    async run(
+        _: string[],
+        options: KeyOptions = { create: false, name: '', delete: false }
+    ): Promise<void> {
        try {
            if (options.delete) {
-                await this.deleteKeys(options.name, options.json);
+                await this.deleteKeys();
                return;
            }

            const key = this.apiKeyService.findByField('name', options.name);
            if (key) {
-                this.output(key.key, { key: key.key, name: key.name, id: key.id }, options.json);
-            } else if (options.create === true) {
-                // Check if we have minimum required info from flags (name + at least one role or permission)
-                const hasMinimumInfo =
-                    options.name &&
-                    ((options.roles && options.roles.length > 0) ||
-                        (options.permissions && options.permissions.length > 0));
-
-                if (!hasMinimumInfo) {
-                    // Interactive mode - prompt for missing fields
-                    options = await this.inquirerService.prompt(AddApiKeyQuestionSet.name, options);
-                } else {
-                    // Non-interactive mode - check if key exists and handle overwrite
-                    const existingKey = this.apiKeyService.findByField('name', options.name);
-                    if (existingKey && !options.overwrite) {
-                        this.outputError(
-                            `API key with name '${options.name}' already exists. Use --overwrite to replace it.`,
-                            {
-                                error: `API key with name '${options.name}' already exists. Use --overwrite to replace it.`,
-                            },
-                            options.json
-                        );
-                        process.exit(1);
-                    }
-                }
-
-                if (!options.json) {
-                    this.logger.log('Creating API Key...');
-                }
+                this.logger.log(key.key);
+            } else if (options.create) {
+                options = await this.inquirerService.prompt(AddApiKeyQuestionSet.name, options);
+                this.logger.log('Creating API Key...' + JSON.stringify(options));

                if (!options.roles && !options.permissions) {
                    this.logger.error('Please add at least one role or permission to the key.');
@@ -238,10 +154,10 @@ ACTIONS: ${Object.values(AuthAction).join(', ')}`,
                    description: options.description || `CLI generated key: ${options.name}`,
                    roles: options.roles,
                    permissions: options.permissions,
-                    overwrite: options.overwrite ?? false,
+                    overwrite: true,
                });

-                this.output(key.key, { key: key.key, name: key.name, id: key.id }, options.json);
+                this.logger.log(key.key);
            } else {
                this.logger.log('No Key Found');
                process.exit(1);
--- a/api/src/unraid-api/cli/generated/graphql.ts
+++ b/api/src/unraid-api/cli/generated/graphql.ts
@@ -15,7 +15,7 @@ export type Scalars = {
  Int: { input: number; output: number; }
  Float: { input: number; output: number; }
  /** The `BigInt` scalar type represents non-fractional signed whole numeric values. */
-  BigInt: { input: number; output: number; }
+  BigInt: { input: any; output: any; }
  /** A date-time string at UTC, such as 2019-12-03T09:54:33Z, compliant with the date-time format. */
  DateTime: { input: string; output: string; }
  /** The `JSON` scalar type represents JSON values as specified by [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf). */
@@ -241,8 +241,6 @@ export type ArrayDisk = Node & {
  id: Scalars['PrefixedID']['output'];
  /** Array slot number. Parity1 is always 0 and Parity2 is always 29. Array slots will be 1 - 28. Cache slots are 30 - 53. Flash is 54. */
  idx: Scalars['Int']['output'];
-  /** Whether the disk is currently spinning */
-  isSpinning?: Maybe<Scalars['Boolean']['output']>;
  name?: Maybe<Scalars['String']['output']>;
  /** Number of unrecoverable errors reported by the device I/O drivers. Missing data due to unrecoverable array read errors is filled in on-the-fly using parity reconstruct (and we attempt to write this data back to the sector(s) which failed). Any unrecoverable write error results in disabling the disk. */
  numErrors?: Maybe<Scalars['BigInt']['output']>;
@@ -541,16 +539,12 @@ export type CoreVersions = {
 /** CPU load for a single core */
 export type CpuLoad = {
  __typename?: 'CpuLoad';
-  /** The percentage of time the CPU spent running virtual machines (guest). */
-  percentGuest: Scalars['Float']['output'];
  /** The percentage of time the CPU was idle. */
  percentIdle: Scalars['Float']['output'];
  /** The percentage of time the CPU spent servicing hardware interrupts. */
  percentIrq: Scalars['Float']['output'];
  /** The percentage of time the CPU spent on low-priority (niced) user space processes. */
  percentNice: Scalars['Float']['output'];
-  /** The percentage of CPU time stolen by the hypervisor. */
-  percentSteal: Scalars['Float']['output'];
  /** The percentage of time the CPU spent in kernel space. */
  percentSystem: Scalars['Float']['output'];
  /** The total CPU load on a single core, in percent. */
@@ -609,8 +603,6 @@ export type Disk = Node & {
  id: Scalars['PrefixedID']['output'];
  /** The interface type of the disk */
  interfaceType: DiskInterfaceType;
-  /** Whether the disk is spinning or not */
-  isSpinning: Scalars['Boolean']['output'];
  /** The model name of the disk */
  name: Scalars['String']['output'];
  /** The partitions on the disk */
@@ -678,7 +670,6 @@ export enum DiskSmartStatus {

 export type Docker = Node & {
  __typename?: 'Docker';
-  containerUpdateStatuses: Array<ExplicitStatusItem>;
  containers: Array<DockerContainer>;
  id: Scalars['PrefixedID']['output'];
  networks: Array<DockerNetwork>;
@@ -704,15 +695,13 @@ export type DockerContainer = Node & {
  id: Scalars['PrefixedID']['output'];
  image: Scalars['String']['output'];
  imageId: Scalars['String']['output'];
-  isRebuildReady?: Maybe<Scalars['Boolean']['output']>;
-  isUpdateAvailable?: Maybe<Scalars['Boolean']['output']>;
  labels?: Maybe<Scalars['JSON']['output']>;
  mounts?: Maybe<Array<Scalars['JSON']['output']>>;
  names: Array<Scalars['String']['output']>;
  networkSettings?: Maybe<Scalars['JSON']['output']>;
  ports: Array<ContainerPort>;
-  /** Total size of all files in the container (in bytes) */
-  sizeRootFs?: Maybe<Scalars['BigInt']['output']>;
+  /** Total size of all the files in the container */
+  sizeRootFs?: Maybe<Scalars['Int']['output']>;
  state: ContainerState;
  status: Scalars['String']['output'];
 };
@@ -777,12 +766,6 @@ export type EnableDynamicRemoteAccessInput = {
  url: AccessUrlInput;
 };

-export type ExplicitStatusItem = {
-  __typename?: 'ExplicitStatusItem';
-  name: Scalars['String']['output'];
-  updateStatus: UpdateStatus;
-};
-
 export type Flash = Node & {
  __typename?: 'Flash';
  guid: Scalars['String']['output'];
@@ -1238,7 +1221,6 @@ export type Mutation = {
  rclone: RCloneMutations;
  /** Reads each notification to recompute & update the overview. */
  recalculateOverview: NotificationOverview;
-  refreshDockerDigests: Scalars['Boolean']['output'];
  /** Remove one or more plugins from the API. Returns false if restart was triggered automatically, true if manual restart is required. */
  removePlugin: Scalars['Boolean']['output'];
  setDockerFolderChildren: ResolvedOrganizerV1;
@@ -1450,14 +1432,6 @@ export type OidcAuthorizationRule = {
  value: Array<Scalars['String']['output']>;
 };

-export type OidcConfiguration = {
-  __typename?: 'OidcConfiguration';
-  /** Default allowed redirect origins that apply to all OIDC providers (e.g., Tailscale domains) */
-  defaultAllowedOrigins?: Maybe<Array<Scalars['String']['output']>>;
-  /** List of configured OIDC providers */
-  providers: Array<OidcProvider>;
-};
-
 export type OidcProvider = {
  __typename?: 'OidcProvider';
  /** OAuth2 authorization endpoint URL. If omitted, will be auto-discovered from issuer/.well-known/openid-configuration */
@@ -1481,7 +1455,7 @@ export type OidcProvider = {
  /** The unique identifier for the OIDC provider */
  id: Scalars['PrefixedID']['output'];
  /** OIDC issuer URL (e.g., https://accounts.google.com). Required for auto-discovery via /.well-known/openid-configuration */
-  issuer?: Maybe<Scalars['String']['output']>;
+  issuer: Scalars['String']['output'];
  /** JSON Web Key Set URI for token validation. If omitted, will be auto-discovered from issuer/.well-known/openid-configuration */
  jwksUri?: Maybe<Scalars['String']['output']>;
  /** Display name of the OIDC provider */
@@ -1680,8 +1654,6 @@ export type Query = {
  network: Network;
  /** Get all notifications */
  notifications: Notifications;
-  /** Get the full OIDC configuration (admin only) */
-  oidcConfiguration: OidcConfiguration;
  /** Get a specific OIDC provider by ID */
  oidcProvider?: Maybe<OidcProvider>;
  /** Get all configured OIDC providers (admin only) */
@@ -1961,7 +1933,6 @@ export type Server = Node & {
  name: Scalars['String']['output'];
  owner: ProfileModel;
  remoteurl: Scalars['String']['output'];
-  /** Whether this server is online or offline */
  status: ServerStatus;
  wanip: Scalars['String']['output'];
 };
@@ -2274,14 +2245,6 @@ export type UpdateSettingsResponse = {
  warnings?: Maybe<Array<Scalars['String']['output']>>;
 };

-/** Update status of a container. */
-export enum UpdateStatus {
-  REBUILD_READY = 'REBUILD_READY',
-  UNKNOWN = 'UNKNOWN',
-  UPDATE_AVAILABLE = 'UPDATE_AVAILABLE',
-  UP_TO_DATE = 'UP_TO_DATE'
-}
-
 export type Uptime = {
  __typename?: 'Uptime';
  timestamp?: Maybe<Scalars['String']['output']>;
--- a/api/src/unraid-api/cli/pm2.service.spec.ts
+++ b/api/src/unraid-api/cli/pm2.service.spec.ts
@@ -1,76 +0,0 @@
-import * as fs from 'node:fs/promises';
-
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
-import { LogService } from '@app/unraid-api/cli/log.service.js';
-import { PM2Service } from '@app/unraid-api/cli/pm2.service.js';
-
-vi.mock('node:fs/promises');
-vi.mock('execa');
-vi.mock('@app/core/utils/files/file-exists.js', () => ({
-    fileExists: vi.fn().mockResolvedValue(false),
-}));
-vi.mock('@app/environment.js', () => ({
-    PATHS_LOGS_DIR: '/var/log/unraid-api',
-    PM2_HOME: '/var/log/.pm2',
-    PM2_PATH: '/path/to/pm2',
-    ECOSYSTEM_PATH: '/path/to/ecosystem.config.json',
-    SUPPRESS_LOGS: false,
-    LOG_LEVEL: 'info',
-}));
-
-describe('PM2Service', () => {
-    let pm2Service: PM2Service;
-    let logService: LogService;
-    const mockMkdir = vi.mocked(fs.mkdir);
-
-    beforeEach(() => {
-        vi.clearAllMocks();
-        logService = {
-            trace: vi.fn(),
-            warn: vi.fn(),
-            error: vi.fn(),
-            log: vi.fn(),
-            info: vi.fn(),
-            debug: vi.fn(),
-        } as unknown as LogService;
-        pm2Service = new PM2Service(logService);
-    });
-
-    afterEach(() => {
-        vi.restoreAllMocks();
-    });
-
-    describe('ensurePm2Dependencies', () => {
-        it('should create logs directory and log that PM2 will handle its own directory', async () => {
-            mockMkdir.mockResolvedValue(undefined);
-
-            await pm2Service.ensurePm2Dependencies();
-
-            expect(mockMkdir).toHaveBeenCalledWith('/var/log/unraid-api', { recursive: true });
-            expect(mockMkdir).toHaveBeenCalledTimes(1); // Only logs directory, not PM2_HOME
-            expect(logService.trace).toHaveBeenCalledWith(
-                'PM2_HOME will be created at /var/log/.pm2 when PM2 daemon starts'
-            );
-        });
-
-        it('should log error but not throw when logs directory creation fails', async () => {
-            mockMkdir.mockRejectedValue(new Error('Disk full'));
-
-            await expect(pm2Service.ensurePm2Dependencies()).resolves.not.toThrow();
-
-            expect(logService.error).toHaveBeenCalledWith(
-                expect.stringContaining('Failed to fully ensure PM2 dependencies: Disk full')
-            );
-        });
-
-        it('should handle mkdir with recursive flag for nested logs path', async () => {
-            mockMkdir.mockResolvedValue(undefined);
-
-            await pm2Service.ensurePm2Dependencies();
-
-            expect(mockMkdir).toHaveBeenCalledWith('/var/log/unraid-api', { recursive: true });
-            expect(mockMkdir).toHaveBeenCalledTimes(1);
-        });
-    });
-});
--- a/api/src/unraid-api/cli/pm2.service.ts
+++ b/api/src/unraid-api/cli/pm2.service.ts
@@ -42,22 +42,8 @@ export class PM2Service {

    async run(context: CmdContext, ...args: string[]) {
        const { tag, raw, ...execOptions } = context;
-        // Default to true to match execa's default behavior
-        execOptions.extendEnv ??= true;
+        execOptions.extendEnv ??= false;
        execOptions.shell ??= 'bash';
-
-        // Ensure /usr/local/bin is in PATH for Node.js
-        const currentPath = execOptions.env?.PATH || process.env.PATH || '/usr/bin:/bin:/usr/sbin:/sbin';
-        const needsPathUpdate = !currentPath.includes('/usr/local/bin');
-        const finalPath = needsPathUpdate ? `/usr/local/bin:${currentPath}` : currentPath;
-
-        // Always ensure PM2_HOME is set in the environment for every PM2 command
-        execOptions.env = {
-            ...execOptions.env,
-            PM2_HOME,
-            ...(needsPathUpdate && { PATH: finalPath }),
-        };
-
        const runCommand = () => execa(PM2_PATH, [...args], execOptions satisfies Options);
        if (raw) {
            return runCommand();
@@ -114,20 +100,8 @@ export class PM2Service {

    /**
     * Ensures that the dependencies necessary for PM2 to start and operate are present.
-     * Creates PM2_HOME directory with proper permissions if it doesn't exist.
     */
    async ensurePm2Dependencies() {
-        try {
-            // Create logs directory
-            await mkdir(PATHS_LOGS_DIR, { recursive: true });
-
-            // PM2 automatically creates and manages its home directory when the daemon starts
-            this.logger.trace(`PM2_HOME will be created at ${PM2_HOME} when PM2 daemon starts`);
-        } catch (error) {
-            // Log error but don't throw - let PM2 fail with its own error messages if the setup is incomplete
-            this.logger.error(
-                `Failed to fully ensure PM2 dependencies: ${error instanceof Error ? error.message : error}. PM2 may encounter issues during operation.`
-            );
-        }
+        await mkdir(PATHS_LOGS_DIR, { recursive: true });
    }
 }
--- a/api/src/unraid-api/cli/restart.command.ts
+++ b/api/src/unraid-api/cli/restart.command.ts
@@ -1,23 +1,9 @@
-import { Command, CommandRunner, Option } from 'nest-commander';
+import { Command, CommandRunner } from 'nest-commander';

-import type { LogLevel } from '@app/core/log.js';
-import { levels } from '@app/core/log.js';
-import { ECOSYSTEM_PATH, LOG_LEVEL } from '@app/environment.js';
+import { ECOSYSTEM_PATH } from '@app/environment.js';
 import { LogService } from '@app/unraid-api/cli/log.service.js';
 import { PM2Service } from '@app/unraid-api/cli/pm2.service.js';

-export interface LogLevelOptions {
-    logLevel?: LogLevel;
-}
-
-export function parseLogLevelOption(val: string, allowedLevels: string[] = [...levels]): LogLevel {
-    const normalized = val.toLowerCase() as LogLevel;
-    if (allowedLevels.includes(normalized)) {
-        return normalized;
-    }
-    throw new Error(`Invalid --log-level "${val}". Allowed: ${allowedLevels.join(', ')}`);
-}
-
@Command({ name: 'restart', description: 'Restart the Unraid API' })
 export class RestartCommand extends CommandRunner {
    constructor(
@@ -27,16 +13,14 @@ export class RestartCommand extends CommandRunner {
        super();
    }

-    async run(_?: string[], options: LogLevelOptions = {}): Promise<void> {
+    async run(): Promise<void> {
        try {
            this.logger.info('Restarting the Unraid API...');
-            const env = { LOG_LEVEL: options.logLevel };
            const { stderr, stdout } = await this.pm2.run(
-                { tag: 'PM2 Restart', raw: true, extendEnv: true, env },
+                { tag: 'PM2 Restart', raw: true },
                'restart',
                ECOSYSTEM_PATH,
-                '--update-env',
-                '--mini-list'
+                '--update-env'
            );

            if (stderr) {
@@ -56,13 +40,4 @@ export class RestartCommand extends CommandRunner {
            process.exit(1);
        }
    }
-
-    @Option({
-        flags: `--log-level <${levels.join('|')}>`,
-        description: 'log level to use',
-        defaultValue: LOG_LEVEL.toLowerCase(),
-    })
-    parseLogLevel(val: string): LogLevel {
-        return parseLogLevelOption(val);
-    }
 }
--- a/api/src/unraid-api/cli/start.command.ts
+++ b/api/src/unraid-api/cli/start.command.ts
@@ -1,12 +1,14 @@
 import { Command, CommandRunner, Option } from 'nest-commander';

 import type { LogLevel } from '@app/core/log.js';
-import type { LogLevelOptions } from '@app/unraid-api/cli/restart.command.js';
 import { levels } from '@app/core/log.js';
-import { ECOSYSTEM_PATH, LOG_LEVEL } from '@app/environment.js';
+import { ECOSYSTEM_PATH } from '@app/environment.js';
 import { LogService } from '@app/unraid-api/cli/log.service.js';
 import { PM2Service } from '@app/unraid-api/cli/pm2.service.js';
-import { parseLogLevelOption } from '@app/unraid-api/cli/restart.command.js';
+
+interface StartCommandOptions {
+    'log-level'?: string;
+}

@Command({ name: 'start', description: 'Start the Unraid API' })
 export class StartCommand extends CommandRunner {
@@ -25,16 +27,20 @@ export class StartCommand extends CommandRunner {
        await this.pm2.run({ tag: 'PM2 Delete' }, 'delete', ECOSYSTEM_PATH);
    }

-    async run(_: string[], options: LogLevelOptions): Promise<void> {
+    async run(_: string[], options: StartCommandOptions): Promise<void> {
        this.logger.info('Starting the Unraid API');
        await this.cleanupPM2State();
-        const env = { LOG_LEVEL: options.logLevel };
+
+        const env: Record<string, string> = {};
+        if (options['log-level']) {
+            env.LOG_LEVEL = options['log-level'];
+        }
+
        const { stderr, stdout } = await this.pm2.run(
-            { tag: 'PM2 Start', raw: true, extendEnv: true, env },
+            { tag: 'PM2 Start', env, raw: true },
            'start',
            ECOSYSTEM_PATH,
-            '--update-env',
-            '--mini-list'
+            '--update-env'
        );
        if (stdout) {
            this.logger.log(stdout.toString());
@@ -48,9 +54,9 @@ export class StartCommand extends CommandRunner {
    @Option({
        flags: `--log-level <${levels.join('|')}>`,
        description: 'log level to use',
-        defaultValue: LOG_LEVEL.toLowerCase(),
+        defaultValue: 'info',
    })
    parseLogLevel(val: string): LogLevel {
-        return parseLogLevelOption(val);
+        return levels.includes(val as LogLevel) ? (val as LogLevel) : 'info';
    }
 }
--- a/api/src/unraid-api/cli/status.command.ts
+++ b/api/src/unraid-api/cli/status.command.ts
@@ -8,11 +8,6 @@ export class StatusCommand extends CommandRunner {
        super();
    }
    async run(): Promise<void> {
-        await this.pm2.run(
-            { tag: 'PM2 Status', stdio: 'inherit', raw: true },
-            'status',
-            'unraid-api',
-            '--mini-list'
-        );
+        await this.pm2.run({ tag: 'PM2 Status', stdio: 'inherit', raw: true }, 'status', 'unraid-api');
    }
 }
--- a/api/src/unraid-api/cli/stop.command.ts
+++ b/api/src/unraid-api/cli/stop.command.ts
@@ -33,8 +33,7 @@ export class StopCommand extends CommandRunner {
                { tag: 'PM2 Delete', stdio: 'inherit' },
                'delete',
                ECOSYSTEM_PATH,
-                '--no-autorestart',
-                '--mini-list'
+                '--no-autorestart'
            );
        }
    }
--- a/api/src/unraid-api/cli/version.command.ts
+++ b/api/src/unraid-api/cli/version.command.ts
@@ -1,37 +1,14 @@
-import { Command, CommandRunner, Option } from 'nest-commander';
+import { Command, CommandRunner } from 'nest-commander';

 import { API_VERSION } from '@app/environment.js';
 import { LogService } from '@app/unraid-api/cli/log.service.js';

-interface VersionOptions {
-    json?: boolean;
-}
-
-@Command({ name: 'version', description: 'Display API version information' })
+@Command({ name: 'version' })
 export class VersionCommand extends CommandRunner {
    constructor(private readonly logger: LogService) {
        super();
    }
-
-    @Option({
-        flags: '-j, --json',
-        description: 'Output version information as JSON',
-    })
-    parseJson(): boolean {
-        return true;
-    }
-
-    async run(passedParam: string[], options?: VersionOptions): Promise<void> {
-        if (options?.json) {
-            const [baseVersion, buildInfo] = API_VERSION.split('+');
-            const versionInfo = {
-                version: baseVersion || API_VERSION,
-                build: buildInfo || undefined,
-                combined: API_VERSION,
-            };
-            console.log(JSON.stringify(versionInfo));
-        } else {
-            this.logger.info(`Unraid API v${API_VERSION}`);
-        }
+    async run(): Promise<void> {
+        this.logger.info(`Unraid API v${API_VERSION}`);
    }
 }
--- a/api/src/unraid-api/cron/cron.module.ts
+++ b/api/src/unraid-api/cron/cron.module.ts
@@ -1,11 +1,11 @@
 import { Module } from '@nestjs/common';
+import { ScheduleModule } from '@nestjs/schedule';

-import { JobModule } from '@app/unraid-api/cron/job.module.js';
 import { LogRotateService } from '@app/unraid-api/cron/log-rotate.service.js';
 import { WriteFlashFileService } from '@app/unraid-api/cron/write-flash-file.service.js';

@Module({
-    imports: [JobModule],
+    imports: [],
    providers: [WriteFlashFileService, LogRotateService],
 })
 export class CronModule {}
--- a/api/src/unraid-api/cron/job.module.ts
+++ b/api/src/unraid-api/cron/job.module.ts
@@ -1,13 +0,0 @@
-import { Module } from '@nestjs/common';
-import { ScheduleModule } from '@nestjs/schedule';
-
-/**
- * Sets up common dependencies for initializing jobs (e.g. scheduler registry, cron jobs).
- *
- * Simplifies testing setup & application dependency tree by ensuring `forRoot` is called only once.
- */
-@Module({
-    imports: [ScheduleModule.forRoot()],
-    exports: [ScheduleModule],
-})
-export class JobModule {}
--- a/api/src/unraid-api/decorators/omit-if.decorator.spec.ts
+++ b/api/src/unraid-api/decorators/omit-if.decorator.spec.ts
@@ -1,172 +0,0 @@
-import { Reflector } from '@nestjs/core';
-import { Field, Mutation, ObjectType, Query, ResolveField, Resolver } from '@nestjs/graphql';
-
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
-import { OMIT_IF_METADATA_KEY, OmitIf } from '@app/unraid-api/decorators/omit-if.decorator.js';
-
-describe('OmitIf Decorator', () => {
-    let reflector: Reflector;
-
-    beforeEach(() => {
-        reflector = new Reflector();
-    });
-
-    describe('OmitIf', () => {
-        it('should set metadata when condition is true', () => {
-            class TestResolver {
-                @OmitIf(true)
-                testMethod() {
-                    return 'test';
-                }
-            }
-
-            const instance = new TestResolver();
-            const metadata = reflector.get(OMIT_IF_METADATA_KEY, instance.testMethod);
-            expect(metadata).toBe(true);
-        });
-
-        it('should not set metadata when condition is false', () => {
-            class TestResolver {
-                @OmitIf(false)
-                testMethod() {
-                    return 'test';
-                }
-            }
-
-            const instance = new TestResolver();
-            const metadata = reflector.get(OMIT_IF_METADATA_KEY, instance.testMethod);
-            expect(metadata).toBeUndefined();
-        });
-
-        it('should evaluate function conditions', () => {
-            const mockCondition = vi.fn(() => true);
-
-            class TestResolver {
-                @OmitIf(mockCondition)
-                testMethod() {
-                    return 'test';
-                }
-            }
-
-            expect(mockCondition).toHaveBeenCalledOnce();
-            const instance = new TestResolver();
-            const metadata = reflector.get(OMIT_IF_METADATA_KEY, instance.testMethod);
-            expect(metadata).toBe(true);
-        });
-
-        it('should evaluate function conditions that return false', () => {
-            const mockCondition = vi.fn(() => false);
-
-            class TestResolver {
-                @OmitIf(mockCondition)
-                testMethod() {
-                    return 'test';
-                }
-            }
-
-            expect(mockCondition).toHaveBeenCalledOnce();
-            const instance = new TestResolver();
-            const metadata = reflector.get(OMIT_IF_METADATA_KEY, instance.testMethod);
-            expect(metadata).toBeUndefined();
-        });
-
-        it('should work with environment variables', () => {
-            const originalEnv = process.env.NODE_ENV;
-            process.env.NODE_ENV = 'production';
-
-            class TestResolver {
-                @OmitIf(process.env.NODE_ENV === 'production')
-                testMethod() {
-                    return 'test';
-                }
-            }
-
-            const instance = new TestResolver();
-            const metadata = reflector.get(OMIT_IF_METADATA_KEY, instance.testMethod);
-            expect(metadata).toBe(true);
-
-            process.env.NODE_ENV = originalEnv;
-        });
-    });
-
-    describe('Integration with NestJS GraphQL decorators', () => {
-        it('should work with @Query decorator', () => {
-            @Resolver()
-            class TestResolver {
-                @OmitIf(true)
-                @Query(() => String)
-                omittedQuery() {
-                    return 'test';
-                }
-
-                @OmitIf(false)
-                @Query(() => String)
-                includedQuery() {
-                    return 'test';
-                }
-            }
-
-            const instance = new TestResolver();
-            const omittedMetadata = reflector.get(OMIT_IF_METADATA_KEY, instance.omittedQuery);
-            const includedMetadata = reflector.get(OMIT_IF_METADATA_KEY, instance.includedQuery);
-
-            expect(omittedMetadata).toBe(true);
-            expect(includedMetadata).toBeUndefined();
-        });
-
-        it('should work with @Mutation decorator', () => {
-            @Resolver()
-            class TestResolver {
-                @OmitIf(true)
-                @Mutation(() => String)
-                omittedMutation() {
-                    return 'test';
-                }
-
-                @OmitIf(false)
-                @Mutation(() => String)
-                includedMutation() {
-                    return 'test';
-                }
-            }
-
-            const instance = new TestResolver();
-            const omittedMetadata = reflector.get(OMIT_IF_METADATA_KEY, instance.omittedMutation);
-            const includedMetadata = reflector.get(OMIT_IF_METADATA_KEY, instance.includedMutation);
-
-            expect(omittedMetadata).toBe(true);
-            expect(includedMetadata).toBeUndefined();
-        });
-
-        it('should work with @ResolveField decorator', () => {
-            @ObjectType()
-            class TestType {
-                @Field()
-                id: string = '';
-            }
-
-            @Resolver(() => TestType)
-            class TestResolver {
-                @OmitIf(true)
-                @ResolveField(() => String)
-                omittedField() {
-                    return 'test';
-                }
-
-                @OmitIf(false)
-                @ResolveField(() => String)
-                includedField() {
-                    return 'test';
-                }
-            }
-
-            const instance = new TestResolver();
-            const omittedMetadata = reflector.get(OMIT_IF_METADATA_KEY, instance.omittedField);
-            const includedMetadata = reflector.get(OMIT_IF_METADATA_KEY, instance.includedField);
-
-            expect(omittedMetadata).toBe(true);
-            expect(includedMetadata).toBeUndefined();
-        });
-    });
-});
--- a/api/src/unraid-api/decorators/omit-if.decorator.ts
+++ b/api/src/unraid-api/decorators/omit-if.decorator.ts
@@ -1,80 +0,0 @@
-import { SetMetadata } from '@nestjs/common';
-import { Extensions } from '@nestjs/graphql';
-
-import { MapperKind, mapSchema } from '@graphql-tools/utils';
-import { GraphQLFieldConfig, GraphQLSchema } from 'graphql';
-
-export const OMIT_IF_METADATA_KEY = 'omitIf';
-
-/**
- * Decorator that conditionally omits a GraphQL field/query/mutation based on a condition.
- * The field will only be omitted from the schema when the condition evaluates to true.
- *
- * @param condition - If the condition evaluates to true, the field will be omitted from the schema
- * @returns A decorator that wraps the target field/query/mutation
- *
- * @example
- * ```typescript
- * @OmitIf(process.env.NODE_ENV === 'production')
- * @Query(() => String)
- * async debugQuery() {
- *     return 'This query is omitted in production';
- * }
- * ```
- */
-export function OmitIf(condition: boolean | (() => boolean)): MethodDecorator & PropertyDecorator {
-    const shouldOmit = typeof condition === 'function' ? condition() : condition;
-
-    return (target: object, propertyKey?: string | symbol, descriptor?: PropertyDescriptor) => {
-        if (shouldOmit) {
-            SetMetadata(OMIT_IF_METADATA_KEY, true)(
-                target,
-                propertyKey as string,
-                descriptor as PropertyDescriptor
-            );
-            Extensions({ omitIf: true })(
-                target,
-                propertyKey as string,
-                descriptor as PropertyDescriptor
-            );
-        }
-
-        return descriptor;
-    };
-}
-
-/**
- * Schema transformer that omits fields/queries/mutations based on the OmitIf decorator.
- * @param schema - The GraphQL schema to transform
- * @returns The transformed GraphQL schema
- */
-export function omitIfSchemaTransformer(schema: GraphQLSchema): GraphQLSchema {
-    return mapSchema(schema, {
-        [MapperKind.OBJECT_FIELD]: (
-            fieldConfig: GraphQLFieldConfig<any, any>,
-            fieldName: string,
-            typeName: string
-        ) => {
-            const extensions = fieldConfig.extensions || {};
-
-            if (extensions.omitIf === true) {
-                return null;
-            }
-
-            return fieldConfig;
-        },
-        [MapperKind.ROOT_FIELD]: (
-            fieldConfig: GraphQLFieldConfig<any, any>,
-            fieldName: string,
-            typeName: string
-        ) => {
-            const extensions = fieldConfig.extensions || {};
-
-            if (extensions.omitIf === true) {
-                return null;
-            }
-
-            return fieldConfig;
-        },
-    });
-}
--- a/api/src/unraid-api/decorators/use-feature-flag.decorator.spec.ts
+++ b/api/src/unraid-api/decorators/use-feature-flag.decorator.spec.ts
@@ -1,317 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-nocheck
-// fixme: types don't sync with mocks, and there's no override to simplify testing.
-
-import { Reflector } from '@nestjs/core';
-import { Mutation, Query, ResolveField, Resolver } from '@nestjs/graphql';
-
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
-import { OMIT_IF_METADATA_KEY } from '@app/unraid-api/decorators/omit-if.decorator.js';
-import { UseFeatureFlag } from '@app/unraid-api/decorators/use-feature-flag.decorator.js';
-
-// Mock the FeatureFlags
-vi.mock('@app/consts.js', () => ({
-    FeatureFlags: Object.freeze({
-        ENABLE_NEXT_DOCKER_RELEASE: false,
-        ENABLE_EXPERIMENTAL_FEATURE: true,
-        ENABLE_DEBUG_MODE: false,
-        ENABLE_BETA_FEATURES: true,
-    }),
-}));
-
-describe('UseFeatureFlag Decorator', () => {
-    let reflector: Reflector;
-
-    beforeEach(() => {
-        reflector = new Reflector();
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('Basic functionality', () => {
-        it('should omit field when feature flag is false', () => {
-            @Resolver()
-            class TestResolver {
-                @UseFeatureFlag('ENABLE_NEXT_DOCKER_RELEASE')
-                @Query(() => String)
-                testQuery() {
-                    return 'test';
-                }
-            }
-
-            const instance = new TestResolver();
-            const metadata = reflector.get(OMIT_IF_METADATA_KEY, instance.testQuery);
-            expect(metadata).toBe(true); // Should be omitted because flag is false
-        });
-
-        it('should include field when feature flag is true', () => {
-            @Resolver()
-            class TestResolver {
-                @UseFeatureFlag('ENABLE_EXPERIMENTAL_FEATURE')
-                @Query(() => String)
-                testQuery() {
-                    return 'test';
-                }
-            }
-
-            const instance = new TestResolver();
-            const metadata = reflector.get(OMIT_IF_METADATA_KEY, instance.testQuery);
-            expect(metadata).toBeUndefined(); // Should not be omitted because flag is true
-        });
-    });
-
-    describe('With different decorator types', () => {
-        it('should work with @Query decorator', () => {
-            @Resolver()
-            class TestResolver {
-                @UseFeatureFlag('ENABLE_DEBUG_MODE')
-                @Query(() => String)
-                debugQuery() {
-                    return 'debug';
-                }
-
-                @UseFeatureFlag('ENABLE_BETA_FEATURES')
-                @Query(() => String)
-                betaQuery() {
-                    return 'beta';
-                }
-            }
-
-            const instance = new TestResolver();
-            const debugMetadata = reflector.get(OMIT_IF_METADATA_KEY, instance.debugQuery);
-            const betaMetadata = reflector.get(OMIT_IF_METADATA_KEY, instance.betaQuery);
-
-            expect(debugMetadata).toBe(true); // ENABLE_DEBUG_MODE is false
-            expect(betaMetadata).toBeUndefined(); // ENABLE_BETA_FEATURES is true
-        });
-
-        it('should work with @Mutation decorator', () => {
-            @Resolver()
-            class TestResolver {
-                @UseFeatureFlag('ENABLE_NEXT_DOCKER_RELEASE')
-                @Mutation(() => String)
-                dockerMutation() {
-                    return 'docker';
-                }
-
-                @UseFeatureFlag('ENABLE_EXPERIMENTAL_FEATURE')
-                @Mutation(() => String)
-                experimentalMutation() {
-                    return 'experimental';
-                }
-            }
-
-            const instance = new TestResolver();
-            const dockerMetadata = reflector.get(OMIT_IF_METADATA_KEY, instance.dockerMutation);
-            const experimentalMetadata = reflector.get(
-                OMIT_IF_METADATA_KEY,
-                instance.experimentalMutation
-            );
-
-            expect(dockerMetadata).toBe(true); // ENABLE_NEXT_DOCKER_RELEASE is false
-            expect(experimentalMetadata).toBeUndefined(); // ENABLE_EXPERIMENTAL_FEATURE is true
-        });
-
-        it('should work with @ResolveField decorator', () => {
-            @Resolver()
-            class TestResolver {
-                @UseFeatureFlag('ENABLE_DEBUG_MODE')
-                @ResolveField(() => String)
-                debugField() {
-                    return 'debug';
-                }
-
-                @UseFeatureFlag('ENABLE_BETA_FEATURES')
-                @ResolveField(() => String)
-                betaField() {
-                    return 'beta';
-                }
-            }
-
-            const instance = new TestResolver();
-            const debugMetadata = reflector.get(OMIT_IF_METADATA_KEY, instance.debugField);
-            const betaMetadata = reflector.get(OMIT_IF_METADATA_KEY, instance.betaField);
-
-            expect(debugMetadata).toBe(true); // ENABLE_DEBUG_MODE is false
-            expect(betaMetadata).toBeUndefined(); // ENABLE_BETA_FEATURES is true
-        });
-    });
-
-    describe('Multiple decorators on same class', () => {
-        it('should handle multiple feature flags independently', () => {
-            @Resolver()
-            class TestResolver {
-                @UseFeatureFlag('ENABLE_NEXT_DOCKER_RELEASE')
-                @Query(() => String)
-                dockerQuery() {
-                    return 'docker';
-                }
-
-                @UseFeatureFlag('ENABLE_EXPERIMENTAL_FEATURE')
-                @Query(() => String)
-                experimentalQuery() {
-                    return 'experimental';
-                }
-
-                @UseFeatureFlag('ENABLE_DEBUG_MODE')
-                @Query(() => String)
-                debugQuery() {
-                    return 'debug';
-                }
-
-                @UseFeatureFlag('ENABLE_BETA_FEATURES')
-                @Query(() => String)
-                betaQuery() {
-                    return 'beta';
-                }
-            }
-
-            const instance = new TestResolver();
-
-            expect(reflector.get(OMIT_IF_METADATA_KEY, instance.dockerQuery)).toBe(true);
-            expect(reflector.get(OMIT_IF_METADATA_KEY, instance.experimentalQuery)).toBeUndefined();
-            expect(reflector.get(OMIT_IF_METADATA_KEY, instance.debugQuery)).toBe(true);
-            expect(reflector.get(OMIT_IF_METADATA_KEY, instance.betaQuery)).toBeUndefined();
-        });
-    });
-
-    describe('Type safety', () => {
-        it('should only accept valid feature flag keys', () => {
-            // This test verifies TypeScript compile-time type safety
-            // The following would cause a TypeScript error if uncommented:
-            // @UseFeatureFlag('INVALID_FLAG')
-
-            @Resolver()
-            class TestResolver {
-                @UseFeatureFlag('ENABLE_NEXT_DOCKER_RELEASE')
-                @Query(() => String)
-                validQuery() {
-                    return 'valid';
-                }
-            }
-
-            const instance = new TestResolver();
-            expect(instance.validQuery).toBeDefined();
-        });
-    });
-
-    describe('Integration scenarios', () => {
-        it('should work correctly with other decorators', () => {
-            const customDecorator = (
-                target: any,
-                propertyKey: string | symbol,
-                descriptor: PropertyDescriptor
-            ) => {
-                Reflect.defineMetadata('custom', true, target, propertyKey);
-                return descriptor;
-            };
-
-            @Resolver()
-            class TestResolver {
-                @UseFeatureFlag('ENABLE_NEXT_DOCKER_RELEASE')
-                @customDecorator
-                @Query(() => String)
-                multiDecoratorQuery() {
-                    return 'multi';
-                }
-            }
-
-            const instance = new TestResolver();
-            const omitMetadata = reflector.get(OMIT_IF_METADATA_KEY, instance.multiDecoratorQuery);
-            const customMetadata = Reflect.getMetadata('custom', instance, 'multiDecoratorQuery');
-
-            expect(omitMetadata).toBe(true);
-            expect(customMetadata).toBe(true);
-        });
-
-        it('should maintain correct decorator order', () => {
-            const orderTracker: string[] = [];
-
-            const trackingDecorator = (name: string) => {
-                return (target: any, propertyKey: string | symbol, descriptor: PropertyDescriptor) => {
-                    orderTracker.push(name);
-                    return descriptor;
-                };
-            };
-
-            @Resolver()
-            class TestResolver {
-                @trackingDecorator('first')
-                @UseFeatureFlag('ENABLE_NEXT_DOCKER_RELEASE')
-                @trackingDecorator('last')
-                @Query(() => String)
-                orderedQuery() {
-                    return 'ordered';
-                }
-            }
-
-            // Decorators are applied bottom-up
-            expect(orderTracker).toEqual(['last', 'first']);
-        });
-    });
-
-    describe('Real-world usage patterns', () => {
-        it('should work with Docker resolver pattern', () => {
-            @Resolver()
-            class DockerResolver {
-                @UseFeatureFlag('ENABLE_NEXT_DOCKER_RELEASE')
-                @Mutation(() => String)
-                async createDockerFolder(name: string) {
-                    return `Created folder: ${name}`;
-                }
-
-                @UseFeatureFlag('ENABLE_NEXT_DOCKER_RELEASE')
-                @Mutation(() => String)
-                async deleteDockerEntries(entryIds: string[]) {
-                    return `Deleted entries: ${entryIds.join(', ')}`;
-                }
-
-                @Query(() => String)
-                async getDockerInfo() {
-                    return 'Docker info';
-                }
-            }
-
-            const instance = new DockerResolver();
-
-            // Feature flag is false, so these should be omitted
-            expect(reflector.get(OMIT_IF_METADATA_KEY, instance.createDockerFolder)).toBe(true);
-            expect(reflector.get(OMIT_IF_METADATA_KEY, instance.deleteDockerEntries)).toBe(true);
-
-            // No feature flag, so this should not be omitted
-            expect(reflector.get(OMIT_IF_METADATA_KEY, instance.getDockerInfo)).toBeUndefined();
-        });
-
-        it('should handle mixed feature flags in same resolver', () => {
-            @Resolver()
-            class MixedResolver {
-                @UseFeatureFlag('ENABLE_EXPERIMENTAL_FEATURE')
-                @Query(() => String)
-                experimentalQuery() {
-                    return 'experimental';
-                }
-
-                @UseFeatureFlag('ENABLE_NEXT_DOCKER_RELEASE')
-                @Query(() => String)
-                dockerQuery() {
-                    return 'docker';
-                }
-
-                @UseFeatureFlag('ENABLE_BETA_FEATURES')
-                @Mutation(() => String)
-                betaMutation() {
-                    return 'beta';
-                }
-            }
-
-            const instance = new MixedResolver();
-
-            expect(reflector.get(OMIT_IF_METADATA_KEY, instance.experimentalQuery)).toBeUndefined();
-            expect(reflector.get(OMIT_IF_METADATA_KEY, instance.dockerQuery)).toBe(true);
-            expect(reflector.get(OMIT_IF_METADATA_KEY, instance.betaMutation)).toBeUndefined();
-        });
-    });
-});
--- a/api/src/unraid-api/decorators/use-feature-flag.decorator.ts
+++ b/api/src/unraid-api/decorators/use-feature-flag.decorator.ts
@@ -1,22 +0,0 @@
-import { FeatureFlags } from '@app/consts.js';
-import { OmitIf } from '@app/unraid-api/decorators/omit-if.decorator.js';
-
-/**
- * Decorator that conditionally includes a GraphQL field/query/mutation based on a feature flag.
- * The field will only be included in the schema when the feature flag is enabled.
- *
- * @param flagKey - The key of the feature flag in FeatureFlags
- * @returns A decorator that wraps OmitIf
- *
- * @example
- * ```typescript
- * @UseFeatureFlag('ENABLE_NEXT_DOCKER_RELEASE')
- * @Mutation(() => String)
- * async experimentalMutation() {
- *     return 'This mutation is only available when ENABLE_NEXT_DOCKER_RELEASE is true';
- * }
- * ```
- */
-export function UseFeatureFlag(flagKey: keyof typeof FeatureFlags): MethodDecorator & PropertyDecorator {
-    return OmitIf(!FeatureFlags[flagKey]);
-}
--- a/api/src/unraid-api/graph/graph.module.ts
+++ b/api/src/unraid-api/graph/graph.module.ts
@@ -12,7 +12,6 @@ import { NoUnusedVariablesRule } from 'graphql';

 import { ENVIRONMENT } from '@app/environment.js';
 import { ApiConfigModule } from '@app/unraid-api/config/api-config.module.js';
-import { omitIfSchemaTransformer } from '@app/unraid-api/decorators/omit-if.decorator.js';

 // Import enum registrations to ensure they're registered with GraphQL
 import '@app/unraid-api/graph/auth/auth-action.enum.js';
@@ -49,7 +48,6 @@ import { PluginModule } from '@app/unraid-api/plugin/plugin.module.js';
                            extra,
                        };
                    },
-                    fieldResolverEnhancers: ['guards'],
                    plugins: [
                        createDynamicIntrospectionPlugin(isSandboxEnabled),
                        createSandboxPlugin(),
@@ -66,12 +64,7 @@ import { PluginModule } from '@app/unraid-api/plugin/plugin.module.js';
                    },
                    // Only add transform when not in test environment to avoid GraphQL version conflicts
                    transformSchema:
-                        process.env.NODE_ENV === 'test'
-                            ? undefined
-                            : (schema) => {
-                                  const schemaWithPermissions = usePermissionsSchemaTransformer(schema);
-                                  return omitIfSchemaTransformer(schemaWithPermissions);
-                              },
+                        process.env.NODE_ENV === 'test' ? undefined : usePermissionsSchemaTransformer,
                    validationRules: [NoUnusedVariablesRule],
                };
            },
--- a/api/src/unraid-api/graph/resolvers/array/array.model.ts
+++ b/api/src/unraid-api/graph/resolvers/array/array.model.ts
@@ -126,9 +126,6 @@ export class ArrayDisk extends Node {

    @Field(() => ArrayDiskFsColor, { nullable: true })
    color?: ArrayDiskFsColor | null;
-
-    @Field(() => Boolean, { nullable: true, description: 'Whether the disk is currently spinning' })
-    isSpinning?: boolean | null;
 }

@ObjectType({
--- a/api/src/unraid-api/graph/resolvers/disks/disks.model.ts
+++ b/api/src/unraid-api/graph/resolvers/disks/disks.model.ts
@@ -3,15 +3,7 @@ import { Field, ObjectType, registerEnumType } from '@nestjs/graphql';
 import { Node } from '@unraid/shared/graphql.model.js';
 import { PrefixedID } from '@unraid/shared/prefixed-id-scalar.js';
 import { Type } from 'class-transformer';
-import {
-    IsArray,
-    IsBoolean,
-    IsEnum,
-    IsNumber,
-    IsOptional,
-    IsString,
-    ValidateNested,
-} from 'class-validator';
+import { IsArray, IsEnum, IsNumber, IsOptional, IsString, ValidateNested } from 'class-validator';

 export enum DiskFsType {
    XFS = 'XFS',
@@ -144,8 +136,4 @@ export class Disk extends Node {
    @ValidateNested({ each: true })
    @Type(() => DiskPartition)
    partitions!: DiskPartition[];
-
-    @Field(() => Boolean, { description: 'Whether the disk is spinning or not' })
-    @IsBoolean()
-    isSpinning!: boolean;
 }
--- a/api/src/unraid-api/graph/resolvers/disks/disks.resolver.spec.ts
+++ b/api/src/unraid-api/graph/resolvers/disks/disks.resolver.spec.ts
@@ -66,7 +66,6 @@ describe('DisksResolver', () => {
                    smartStatus: DiskSmartStatus.OK,
                    temperature: -1,
                    partitions: [],
-                    isSpinning: false,
                },
            ];
            mockDisksService.getDisks.mockResolvedValue(mockResult);
@@ -93,7 +92,6 @@ describe('DisksResolver', () => {
            const mockDisk: Disk = {
                id: 'SERIAL123',
                device: '/dev/sda',
-                isSpinning: false,
                type: 'SSD',
                name: 'Samsung SSD 860 EVO 1TB',
                vendor: 'Samsung',
--- a/api/src/unraid-api/graph/resolvers/disks/disks.resolver.ts
+++ b/api/src/unraid-api/graph/resolvers/disks/disks.resolver.ts
@@ -33,9 +33,4 @@ export class DisksResolver {
    public async temperature(@Parent() disk: Disk) {
        return this.disksService.getTemperature(disk.device);
    }
-
-    @ResolveField(() => Boolean)
-    public async isSpinning(@Parent() disk: Disk) {
-        return disk.isSpinning;
-    }
 }
--- a/api/src/unraid-api/graph/resolvers/disks/disks.service.spec.ts
+++ b/api/src/unraid-api/graph/resolvers/disks/disks.service.spec.ts
@@ -1,17 +1,11 @@
-import { ConfigService } from '@nestjs/config';
 import { Test, TestingModule } from '@nestjs/testing';

 import type { Systeminformation } from 'systeminformation';
 import { execa } from 'execa';
 import { blockDevices, diskLayout } from 'systeminformation';
 // Vitest imports
-import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { beforeEach, describe, expect, it, Mock, MockedFunction, vi } from 'vitest';

-import {
-    ArrayDisk,
-    ArrayDiskStatus,
-    ArrayDiskType,
-} from '@app/unraid-api/graph/resolvers/array/array.model.js';
 import {
    Disk,
    DiskFsType,
@@ -39,86 +33,6 @@ const mockBatchProcess = batchProcess as any;

 describe('DisksService', () => {
    let service: DisksService;
-    let configService: ConfigService;
-
-    // Mock ArrayDisk data from state
-    const mockArrayDisks: ArrayDisk[] = [
-        {
-            id: 'S4ENNF0N123456',
-            device: 'sda',
-            name: 'cache',
-            size: 512110190592,
-            idx: 30,
-            type: ArrayDiskType.CACHE,
-            status: ArrayDiskStatus.DISK_OK,
-            isSpinning: null, // NVMe/SSD doesn't spin
-            rotational: false,
-            exportable: false,
-            numErrors: 0,
-            numReads: 1000,
-            numWrites: 2000,
-            temp: 42,
-            comment: 'NVMe Cache',
-            format: 'GPT: 4KiB-aligned',
-            fsType: 'btrfs',
-            transport: 'nvme',
-            warning: null,
-            critical: null,
-            fsFree: null,
-            fsSize: null,
-            fsUsed: null,
-        },
-        {
-            id: 'WD-WCC7K7YL9876',
-            device: 'sdb',
-            name: 'disk1',
-            size: 4000787030016,
-            idx: 1,
-            type: ArrayDiskType.DATA,
-            status: ArrayDiskStatus.DISK_OK,
-            isSpinning: true, // Currently spinning
-            rotational: true,
-            exportable: false,
-            numErrors: 0,
-            numReads: 5000,
-            numWrites: 3000,
-            temp: 35,
-            comment: 'Data Disk 1',
-            format: 'GPT: 4KiB-aligned',
-            fsType: 'xfs',
-            transport: 'sata',
-            warning: null,
-            critical: null,
-            fsFree: 1000000000,
-            fsSize: 4000000000,
-            fsUsed: 3000000000,
-        },
-        {
-            id: 'WD-SPUNDOWN123',
-            device: 'sdd',
-            name: 'disk2',
-            size: 4000787030016,
-            idx: 2,
-            type: ArrayDiskType.DATA,
-            status: ArrayDiskStatus.DISK_OK,
-            isSpinning: false, // Spun down
-            rotational: true,
-            exportable: false,
-            numErrors: 0,
-            numReads: 3000,
-            numWrites: 1000,
-            temp: 30,
-            comment: 'Data Disk 2 (spun down)',
-            format: 'GPT: 4KiB-aligned',
-            fsType: 'xfs',
-            transport: 'sata',
-            warning: null,
-            critical: null,
-            fsFree: 2000000000,
-            fsSize: 4000000000,
-            fsUsed: 2000000000,
-        },
-    ];

    const mockDiskLayoutData: Systeminformation.DiskLayoutData[] = [
        {
@@ -178,25 +92,6 @@ describe('DisksService', () => {
            smartStatus: 'unknown', // Simulate unknown status
            temperature: null,
        },
-        {
-            device: '/dev/sdd',
-            type: 'HD',
-            name: 'WD Spun Down',
-            vendor: 'Western Digital',
-            size: 4000787030016,
-            bytesPerSector: 512,
-            totalCylinders: 486401,
-            totalHeads: 255,
-            totalSectors: 7814037168,
-            totalTracks: 124032255,
-            tracksPerCylinder: 255,
-            sectorsPerTrack: 63,
-            firmwareRevision: '82.00A82',
-            serialNum: 'WD-SPUNDOWN123',
-            interfaceType: 'SATA',
-            smartStatus: 'Ok',
-            temperature: null,
-        },
    ];

    const mockBlockDeviceData: Systeminformation.BlockDevicesData[] = [
@@ -279,50 +174,17 @@ describe('DisksService', () => {
            protocol: 'SATA', // Assume SATA even if interface type unknown for disk
            identifier: '/dev/sdc1',
        },
-        // Partition for sdd
-        {
-            name: 'sdd1',
-            type: 'part',
-            fsType: 'xfs',
-            mount: '/mnt/disk2',
-            size: 4000787030016,
-            physical: 'HDD',
-            uuid: 'UUID-SDD1',
-            label: 'Data2',
-            model: 'WD Spun Down',
-            serial: 'WD-SPUNDOWN123',
-            removable: false,
-            protocol: 'SATA',
-            identifier: '/dev/sdd1',
-        },
    ];

    beforeEach(async () => {
        // Reset mocks before each test using vi
        vi.clearAllMocks();

-        // Create mock ConfigService
-        const mockConfigService = {
-            get: vi.fn().mockImplementation((key: string, defaultValue?: any) => {
-                if (key === 'store.emhttp.disks') {
-                    return mockArrayDisks;
-                }
-                return defaultValue;
-            }),
-        };
-
        const module: TestingModule = await Test.createTestingModule({
-            providers: [
-                DisksService,
-                {
-                    provide: ConfigService,
-                    useValue: mockConfigService,
-                },
-            ],
+            providers: [DisksService],
        }).compile();

        service = module.get<DisksService>(DisksService);
-        configService = module.get<ConfigService>(ConfigService);

        // Setup default mock implementations
        mockDiskLayout.mockResolvedValue(mockDiskLayoutData);
@@ -345,112 +207,46 @@ describe('DisksService', () => {
    // --- Test getDisks ---

    describe('getDisks', () => {
-        it('should return disks with spinning state from store', async () => {
+        it('should return disks without temperature', async () => {
            const disks = await service.getDisks();

            expect(mockDiskLayout).toHaveBeenCalledTimes(1);
            expect(mockBlockDevices).toHaveBeenCalledTimes(1);
-            expect(configService.get).toHaveBeenCalledWith('store.emhttp.disks', []);
-            expect(mockBatchProcess).toHaveBeenCalledTimes(1);
+            expect(mockExeca).not.toHaveBeenCalled(); // Temperature should not be fetched
+            expect(mockBatchProcess).toHaveBeenCalledTimes(1); // Still uses batchProcess for parsing

            expect(disks).toHaveLength(mockDiskLayoutData.length);
-
-            // Check NVMe disk with null spinning state
-            const nvmeDisk = disks.find((d) => d.id === 'S4ENNF0N123456');
-            expect(nvmeDisk).toBeDefined();
-            expect(nvmeDisk?.isSpinning).toBe(false); // null from state defaults to false
-            expect(nvmeDisk?.interfaceType).toBe(DiskInterfaceType.PCIE);
-            expect(nvmeDisk?.smartStatus).toBe(DiskSmartStatus.OK);
-            expect(nvmeDisk?.partitions).toHaveLength(2);
-
-            // Check spinning disk
-            const spinningDisk = disks.find((d) => d.id === 'WD-WCC7K7YL9876');
-            expect(spinningDisk).toBeDefined();
-            expect(spinningDisk?.isSpinning).toBe(true); // From state
-            expect(spinningDisk?.interfaceType).toBe(DiskInterfaceType.SATA);
-
-            // Check spun down disk
-            const spunDownDisk = disks.find((d) => d.id === 'WD-SPUNDOWN123');
-            expect(spunDownDisk).toBeDefined();
-            expect(spunDownDisk?.isSpinning).toBe(false); // From state
-
-            // Check disk not in state (defaults to not spinning)
-            const unknownDisk = disks.find((d) => d.id === 'OTHER-SERIAL-123');
-            expect(unknownDisk).toBeDefined();
-            expect(unknownDisk?.isSpinning).toBe(false); // Not in state, defaults to false
-            expect(unknownDisk?.interfaceType).toBe(DiskInterfaceType.UNKNOWN);
-            expect(unknownDisk?.smartStatus).toBe(DiskSmartStatus.UNKNOWN);
-        });
-
-        it('should handle empty state gracefully', async () => {
-            vi.mocked(configService.get).mockImplementation((key: string, defaultValue?: any) => {
-                if (key === 'store.emhttp.disks') {
-                    return [];
-                }
-                return defaultValue;
+            expect(disks[0]).toMatchObject({
+                id: 'S4ENNF0N123456',
+                device: '/dev/sda',
+                type: 'HD',
+                name: 'SAMSUNG MZVLB512HBJQ-000L7',
+                vendor: 'Samsung',
+                size: 512110190592,
+                interfaceType: DiskInterfaceType.PCIE,
+                smartStatus: DiskSmartStatus.OK,
+                temperature: null, // Temperature is now null by default
+                partitions: [
+                    { name: 'sda1', fsType: DiskFsType.VFAT, size: 536870912 },
+                    { name: 'sda2', fsType: DiskFsType.EXT4, size: 511560000000 },
+                ],
            });
-
-            const disks = await service.getDisks();
-
-            // All disks should default to not spinning when state is empty
-            expect(disks).toHaveLength(mockDiskLayoutData.length);
-            disks.forEach((disk) => {
-                expect(disk.isSpinning).toBe(false);
+            expect(disks[1]).toMatchObject({
+                id: 'WD-WCC7K7YL9876',
+                device: '/dev/sdb',
+                interfaceType: DiskInterfaceType.SATA,
+                smartStatus: DiskSmartStatus.OK,
+                temperature: null,
+                partitions: [{ name: 'sdb1', fsType: DiskFsType.XFS, size: 4000787030016 }],
            });
-        });
-
-        it('should handle trimmed serial numbers correctly', async () => {
-            // Add disk with spaces in ID
-            const disksWithSpaces = [...mockArrayDisks];
-            disksWithSpaces[0] = {
-                ...disksWithSpaces[0],
-                id: '  S4ENNF0N123456  ', // spaces around ID
-            };
-
-            vi.mocked(configService.get).mockImplementation((key: string, defaultValue?: any) => {
-                if (key === 'store.emhttp.disks') {
-                    return disksWithSpaces;
-                }
-                return defaultValue;
+            expect(disks[2]).toMatchObject({
+                id: 'OTHER-SERIAL-123',
+                device: '/dev/sdc',
+                interfaceType: DiskInterfaceType.UNKNOWN,
+                smartStatus: DiskSmartStatus.UNKNOWN,
+                temperature: null,
+                partitions: [{ name: 'sdc1', fsType: DiskFsType.NTFS, size: 1000204886016 }],
            });
-
-            const disks = await service.getDisks();
-            const disk = disks.find((d) => d.id === 'S4ENNF0N123456');
-
-            expect(disk).toBeDefined();
-            expect(disk?.isSpinning).toBe(false); // null becomes false
-        });
-
-        it('should correctly map partitions to disks', async () => {
-            const disks = await service.getDisks();
-
-            const disk1 = disks.find((d) => d.id === 'S4ENNF0N123456');
-            expect(disk1?.partitions).toHaveLength(2);
-            expect(disk1?.partitions[0]).toEqual({
-                name: 'sda1',
-                fsType: DiskFsType.VFAT,
-                size: 536870912,
-            });
-            expect(disk1?.partitions[1]).toEqual({
-                name: 'sda2',
-                fsType: DiskFsType.EXT4,
-                size: 511560000000,
-            });
-
-            const disk2 = disks.find((d) => d.id === 'WD-WCC7K7YL9876');
-            expect(disk2?.partitions).toHaveLength(1);
-            expect(disk2?.partitions[0]).toEqual({
-                name: 'sdb1',
-                fsType: DiskFsType.XFS,
-                size: 4000787030016,
-            });
-        });
-
-        it('should use ConfigService to get state data', async () => {
-            await service.getDisks();
-
-            // Verify we're accessing the state through ConfigService
-            expect(configService.get).toHaveBeenCalledWith('store.emhttp.disks', []);
        });

        it('should handle empty disk layout or block devices', async () => {
@@ -471,31 +267,6 @@ describe('DisksService', () => {
        });
    });

-    // --- Test getDisk ---
-    describe('getDisk', () => {
-        it('should return a specific disk by id', async () => {
-            const disk = await service.getDisk('S4ENNF0N123456');
-
-            expect(disk).toBeDefined();
-            expect(disk.id).toBe('S4ENNF0N123456');
-            expect(disk.isSpinning).toBe(false); // null becomes false
-        });
-
-        it('should return spinning disk correctly', async () => {
-            const disk = await service.getDisk('WD-WCC7K7YL9876');
-
-            expect(disk).toBeDefined();
-            expect(disk.id).toBe('WD-WCC7K7YL9876');
-            expect(disk.isSpinning).toBe(true);
-        });
-
-        it('should throw NotFoundException for non-existent disk', async () => {
-            await expect(service.getDisk('NONEXISTENT')).rejects.toThrow(
-                'Disk with id NONEXISTENT not found'
-            );
-        });
-    });
-
    // --- Test getTemperature ---
    describe('getTemperature', () => {
        it('should return temperature for a disk', async () => {
--- a/api/src/unraid-api/graph/resolvers/disks/disks.service.ts
+++ b/api/src/unraid-api/graph/resolvers/disks/disks.service.ts
@@ -1,11 +1,9 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';

 import type { Systeminformation } from 'systeminformation';
 import { execa } from 'execa';
 import { blockDevices, diskLayout } from 'systeminformation';

-import { ArrayDisk } from '@app/unraid-api/graph/resolvers/array/array.model.js';
 import {
    Disk,
    DiskFsType,
@@ -16,7 +14,6 @@ import { batchProcess } from '@app/utils.js';

@Injectable()
 export class DisksService {
-    constructor(private readonly configService: ConfigService) {}
    public async getTemperature(device: string): Promise<number | null> {
        try {
            const { stdout } = await execa('smartctl', ['-A', device]);
@@ -54,8 +51,7 @@ export class DisksService {

    private async parseDisk(
        disk: Systeminformation.DiskLayoutData,
-        partitionsToParse: Systeminformation.BlockDevicesData[],
-        arrayDisks: ArrayDisk[]
+        partitionsToParse: Systeminformation.BlockDevicesData[]
    ): Promise<Omit<Disk, 'temperature'>> {
        const partitions = partitionsToParse
            // Only get partitions from this disk
@@ -119,8 +115,6 @@ export class DisksService {
                mappedInterfaceType = DiskInterfaceType.UNKNOWN;
        }

-        const arrayDisk = arrayDisks.find((d) => d.id.trim() === disk.serialNum.trim());
-
        return {
            ...disk,
            id: disk.serialNum, // Ensure id is set
@@ -129,7 +123,6 @@ export class DisksService {
                DiskSmartStatus.UNKNOWN,
            interfaceType: mappedInterfaceType,
            partitions,
-            isSpinning: arrayDisk?.isSpinning ?? false,
        };
    }

@@ -140,9 +133,9 @@ export class DisksService {
        const partitions = await blockDevices().then((devices) =>
            devices.filter((device) => device.type === 'part')
        );
-        const arrayDisks = this.configService.get<ArrayDisk[]>('store.emhttp.disks', []);
+
        const { data } = await batchProcess(await diskLayout(), async (disk) =>
-            this.parseDisk(disk, partitions, arrayDisks)
+            this.parseDisk(disk, partitions)
        );
        return data;
    }
--- a/api/src/unraid-api/graph/resolvers/docker/container-status.job.ts
+++ b/api/src/unraid-api/graph/resolvers/docker/container-status.job.ts
@@ -1,47 +0,0 @@
-import { Injectable, Logger, OnApplicationBootstrap } from '@nestjs/common';
-import { SchedulerRegistry, Timeout } from '@nestjs/schedule';
-
-import { CronJob } from 'cron';
-
-import { DockerConfigService } from '@app/unraid-api/graph/resolvers/docker/docker-config.service.js';
-import { DockerManifestService } from '@app/unraid-api/graph/resolvers/docker/docker-manifest.service.js';
-
-@Injectable()
-export class ContainerStatusJob implements OnApplicationBootstrap {
-    private readonly logger = new Logger(ContainerStatusJob.name);
-    constructor(
-        private readonly dockerManifestService: DockerManifestService,
-        private readonly schedulerRegistry: SchedulerRegistry,
-        private readonly dockerConfigService: DockerConfigService
-    ) {}
-
-    /**
-     * Initialize cron job for refreshing the update status for all containers on a user-configurable schedule.
-     */
-    onApplicationBootstrap() {
-        if (!this.dockerConfigService.enabled()) return;
-        const cronExpression = this.dockerConfigService.getConfig().updateCheckCronSchedule;
-        const cronJob = CronJob.from({
-            cronTime: cronExpression,
-            onTick: () => {
-                this.dockerManifestService.refreshDigests().catch((error) => {
-                    this.logger.warn(error, 'Failed to refresh container update status');
-                });
-            },
-            start: true,
-        });
-        this.schedulerRegistry.addCronJob(ContainerStatusJob.name, cronJob);
-        this.logger.verbose(
-            `Initialized cron job for refreshing container update status: ${ContainerStatusJob.name}`
-        );
-    }
-
-    /**
-     * Refresh container digests 5 seconds after application start.
-     */
-    @Timeout(5_000)
-    async refreshContainerDigestsAfterStartup() {
-        if (!this.dockerConfigService.enabled()) return;
-        await this.dockerManifestService.refreshDigests();
-    }
-}
--- a/api/src/unraid-api/graph/resolvers/docker/docker-config.model.ts
+++ b/api/src/unraid-api/graph/resolvers/docker/docker-config.model.ts
@@ -1,7 +0,0 @@
-import { Field, ObjectType } from '@nestjs/graphql';
-
-@ObjectType()
-export class DockerConfig {
-    @Field(() => String)
-    updateCheckCronSchedule!: string;
-}
--- a/api/src/unraid-api/graph/resolvers/docker/docker-config.service.spec.ts
+++ b/api/src/unraid-api/graph/resolvers/docker/docker-config.service.spec.ts
@@ -1,195 +0,0 @@
-import { ConfigService } from '@nestjs/config';
-import { CronExpression } from '@nestjs/schedule';
-import { Test, TestingModule } from '@nestjs/testing';
-
-import { ValidationError } from 'class-validator';
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
-import { AppError } from '@app/core/errors/app-error.js';
-import { DockerConfigService } from '@app/unraid-api/graph/resolvers/docker/docker-config.service.js';
-
-vi.mock('cron', () => ({
-    validateCronExpression: vi.fn(),
-}));
-
-vi.mock('@app/unraid-api/graph/resolvers/validation.utils.js', () => ({
-    validateObject: vi.fn(),
-}));
-
-describe('DockerConfigService - validate', () => {
-    let service: DockerConfigService;
-
-    beforeEach(async () => {
-        const module: TestingModule = await Test.createTestingModule({
-            providers: [
-                DockerConfigService,
-                {
-                    provide: ConfigService,
-                    useValue: {
-                        get: vi.fn(),
-                    },
-                },
-            ],
-        }).compile();
-
-        service = module.get<DockerConfigService>(DockerConfigService);
-        vi.clearAllMocks();
-    });
-
-    describe('validate', () => {
-        it('should validate and return docker config for valid cron expression', async () => {
-            const inputConfig = { updateCheckCronSchedule: '0 6 * * *' };
-            const validatedConfig = { updateCheckCronSchedule: '0 6 * * *' };
-
-            const { validateObject } = await import(
-                '@app/unraid-api/graph/resolvers/validation.utils.js'
-            );
-            const { validateCronExpression } = await import('cron');
-
-            vi.mocked(validateObject).mockResolvedValue(validatedConfig);
-            vi.mocked(validateCronExpression).mockReturnValue({ valid: true });
-
-            const result = await service.validate(inputConfig);
-
-            expect(validateObject).toHaveBeenCalledWith(expect.any(Function), inputConfig);
-            expect(validateCronExpression).toHaveBeenCalledWith('0 6 * * *');
-            expect(result).toBe(validatedConfig);
-        });
-
-        it('should validate and return docker config for predefined cron expression', async () => {
-            const inputConfig = { updateCheckCronSchedule: CronExpression.EVERY_DAY_AT_6AM };
-            const validatedConfig = { updateCheckCronSchedule: CronExpression.EVERY_DAY_AT_6AM };
-
-            const { validateObject } = await import(
-                '@app/unraid-api/graph/resolvers/validation.utils.js'
-            );
-            const { validateCronExpression } = await import('cron');
-
-            vi.mocked(validateObject).mockResolvedValue(validatedConfig);
-            vi.mocked(validateCronExpression).mockReturnValue({ valid: true });
-
-            const result = await service.validate(inputConfig);
-
-            expect(validateObject).toHaveBeenCalledWith(expect.any(Function), inputConfig);
-            expect(validateCronExpression).toHaveBeenCalledWith(CronExpression.EVERY_DAY_AT_6AM);
-            expect(result).toBe(validatedConfig);
-        });
-
-        it('should throw AppError for invalid cron expression', async () => {
-            const inputConfig = { updateCheckCronSchedule: 'invalid-cron' };
-            const validatedConfig = { updateCheckCronSchedule: 'invalid-cron' };
-
-            const { validateObject } = await import(
-                '@app/unraid-api/graph/resolvers/validation.utils.js'
-            );
-            const { validateCronExpression } = await import('cron');
-
-            vi.mocked(validateObject).mockResolvedValue(validatedConfig);
-            vi.mocked(validateCronExpression).mockReturnValue({ valid: false });
-
-            await expect(service.validate(inputConfig)).rejects.toThrow(
-                new AppError('Cron expression not supported: invalid-cron')
-            );
-
-            expect(validateObject).toHaveBeenCalledWith(expect.any(Function), inputConfig);
-            expect(validateCronExpression).toHaveBeenCalledWith('invalid-cron');
-        });
-
-        it('should throw AppError for empty cron expression', async () => {
-            const inputConfig = { updateCheckCronSchedule: '' };
-            const validatedConfig = { updateCheckCronSchedule: '' };
-
-            const { validateObject } = await import(
-                '@app/unraid-api/graph/resolvers/validation.utils.js'
-            );
-            const { validateCronExpression } = await import('cron');
-
-            vi.mocked(validateObject).mockResolvedValue(validatedConfig);
-            vi.mocked(validateCronExpression).mockReturnValue({ valid: false });
-
-            await expect(service.validate(inputConfig)).rejects.toThrow(
-                new AppError('Cron expression not supported: ')
-            );
-
-            expect(validateObject).toHaveBeenCalledWith(expect.any(Function), inputConfig);
-            expect(validateCronExpression).toHaveBeenCalledWith('');
-        });
-
-        it('should throw AppError for malformed cron expression', async () => {
-            const inputConfig = { updateCheckCronSchedule: '* * * *' };
-            const validatedConfig = { updateCheckCronSchedule: '* * * *' };
-
-            const { validateObject } = await import(
-                '@app/unraid-api/graph/resolvers/validation.utils.js'
-            );
-            const { validateCronExpression } = await import('cron');
-
-            vi.mocked(validateObject).mockResolvedValue(validatedConfig);
-            vi.mocked(validateCronExpression).mockReturnValue({ valid: false });
-
-            await expect(service.validate(inputConfig)).rejects.toThrow(
-                new AppError('Cron expression not supported: * * * *')
-            );
-
-            expect(validateObject).toHaveBeenCalledWith(expect.any(Function), inputConfig);
-            expect(validateCronExpression).toHaveBeenCalledWith('* * * *');
-        });
-
-        it('should propagate validation errors from validateObject', async () => {
-            const inputConfig = { updateCheckCronSchedule: '0 6 * * *' };
-            const validationError = new ValidationError();
-            validationError.property = 'updateCheckCronSchedule';
-
-            const { validateObject } = await import(
-                '@app/unraid-api/graph/resolvers/validation.utils.js'
-            );
-
-            vi.mocked(validateObject).mockRejectedValue(validationError);
-
-            await expect(service.validate(inputConfig)).rejects.toThrow();
-
-            expect(validateObject).toHaveBeenCalledWith(expect.any(Function), inputConfig);
-        });
-
-        it('should handle complex valid cron expressions', async () => {
-            const inputConfig = { updateCheckCronSchedule: '0 0,12 * * 1-5' };
-            const validatedConfig = { updateCheckCronSchedule: '0 0,12 * * 1-5' };
-
-            const { validateObject } = await import(
-                '@app/unraid-api/graph/resolvers/validation.utils.js'
-            );
-            const { validateCronExpression } = await import('cron');
-
-            vi.mocked(validateObject).mockResolvedValue(validatedConfig);
-            vi.mocked(validateCronExpression).mockReturnValue({ valid: true });
-
-            const result = await service.validate(inputConfig);
-
-            expect(validateObject).toHaveBeenCalledWith(expect.any(Function), inputConfig);
-            expect(validateCronExpression).toHaveBeenCalledWith('0 0,12 * * 1-5');
-            expect(result).toBe(validatedConfig);
-        });
-
-        it('should handle input with extra properties', async () => {
-            const inputConfig = {
-                updateCheckCronSchedule: '0 6 * * *',
-                extraProperty: 'should be ignored',
-            };
-            const validatedConfig = { updateCheckCronSchedule: '0 6 * * *' };
-
-            const { validateObject } = await import(
-                '@app/unraid-api/graph/resolvers/validation.utils.js'
-            );
-            const { validateCronExpression } = await import('cron');
-
-            vi.mocked(validateObject).mockResolvedValue(validatedConfig);
-            vi.mocked(validateCronExpression).mockReturnValue({ valid: true });
-
-            const result = await service.validate(inputConfig);
-
-            expect(validateObject).toHaveBeenCalledWith(expect.any(Function), inputConfig);
-            expect(validateCronExpression).toHaveBeenCalledWith('0 6 * * *');
-            expect(result).toBe(validatedConfig);
-        });
-    });
-});
--- a/api/src/unraid-api/graph/resolvers/docker/docker-config.service.ts
+++ b/api/src/unraid-api/graph/resolvers/docker/docker-config.service.ts
@@ -1,45 +1,59 @@
 import { Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
-import { CronExpression } from '@nestjs/schedule';

 import { ConfigFilePersister } from '@unraid/shared/services/config-file.js';
-import { validateCronExpression } from 'cron';

-import { FeatureFlags } from '@app/consts.js';
 import { AppError } from '@app/core/errors/app-error.js';
-import { DockerConfig } from '@app/unraid-api/graph/resolvers/docker/docker-config.model.js';
 import { validateObject } from '@app/unraid-api/graph/resolvers/validation.utils.js';
+import {
+    DEFAULT_ORGANIZER_ROOT_ID,
+    DEFAULT_ORGANIZER_VIEW_ID,
+} from '@app/unraid-api/organizer/organizer.js';
+import { OrganizerV1 } from '@app/unraid-api/organizer/organizer.model.js';
+import { validateOrganizerIntegrity } from '@app/unraid-api/organizer/organizer.validation.js';

@Injectable()
-export class DockerConfigService extends ConfigFilePersister<DockerConfig> {
+export class DockerConfigService extends ConfigFilePersister<OrganizerV1> {
    constructor(configService: ConfigService) {
        super(configService);
    }

-    enabled(): boolean {
-        return FeatureFlags.ENABLE_NEXT_DOCKER_RELEASE;
-    }
-
    configKey(): string {
-        return 'docker';
+        return 'dockerOrganizer';
    }

    fileName(): string {
-        return 'docker.config.json';
+        return 'docker.organizer.json';
    }

-    defaultConfig(): DockerConfig {
+    defaultConfig(): OrganizerV1 {
        return {
-            updateCheckCronSchedule: CronExpression.EVERY_DAY_AT_6AM,
+            version: 1,
+            resources: {},
+            views: {
+                default: {
+                    id: DEFAULT_ORGANIZER_VIEW_ID,
+                    name: 'Default',
+                    root: DEFAULT_ORGANIZER_ROOT_ID,
+                    entries: {
+                        root: {
+                            type: 'folder',
+                            id: DEFAULT_ORGANIZER_ROOT_ID,
+                            name: 'Root',
+                            children: [],
+                        },
+                    },
+                },
+            },
        };
    }

-    async validate(config: object): Promise<DockerConfig> {
-        const dockerConfig = await validateObject(DockerConfig, config);
-        const cronExpression = validateCronExpression(dockerConfig.updateCheckCronSchedule);
-        if (!cronExpression.valid) {
-            throw new AppError(`Cron expression not supported: ${dockerConfig.updateCheckCronSchedule}`);
+    async validate(config: object): Promise<OrganizerV1> {
+        const organizer = await validateObject(OrganizerV1, config);
+        const { isValid, errors } = await validateOrganizerIntegrity(organizer);
+        if (!isValid) {
+            throw new AppError(`Docker organizer validation failed: ${JSON.stringify(errors, null, 2)}`);
        }
-        return dockerConfig;
+        return organizer;
    }
 }
--- a/api/src/unraid-api/graph/resolvers/docker/docker-container.resolver.ts
+++ b/api/src/unraid-api/graph/resolvers/docker/docker-container.resolver.ts
@@ -1,51 +0,0 @@
-import { Logger } from '@nestjs/common';
-import { Mutation, Parent, ResolveField, Resolver } from '@nestjs/graphql';
-
-import { Resource } from '@unraid/shared/graphql.model.js';
-import { AuthAction, UsePermissions } from '@unraid/shared/use-permissions.directive.js';
-
-import { AppError } from '@app/core/errors/app-error.js';
-import { UseFeatureFlag } from '@app/unraid-api/decorators/use-feature-flag.decorator.js';
-import { DockerManifestService } from '@app/unraid-api/graph/resolvers/docker/docker-manifest.service.js';
-import { DockerContainer } from '@app/unraid-api/graph/resolvers/docker/docker.model.js';
-
-@Resolver(() => DockerContainer)
-export class DockerContainerResolver {
-    private readonly logger = new Logger(DockerContainerResolver.name);
-    constructor(private readonly dockerManifestService: DockerManifestService) {}
-
-    @UseFeatureFlag('ENABLE_NEXT_DOCKER_RELEASE')
-    @UsePermissions({
-        action: AuthAction.READ_ANY,
-        resource: Resource.DOCKER,
-    })
-    @ResolveField(() => Boolean, { nullable: true })
-    public async isUpdateAvailable(@Parent() container: DockerContainer) {
-        try {
-            return await this.dockerManifestService.isUpdateAvailableCached(container.image);
-        } catch (error) {
-            this.logger.error(error);
-            throw new AppError('Failed to read cached update status. See graphql-api.log for details.');
-        }
-    }
-
-    @UseFeatureFlag('ENABLE_NEXT_DOCKER_RELEASE')
-    @UsePermissions({
-        action: AuthAction.READ_ANY,
-        resource: Resource.DOCKER,
-    })
-    @ResolveField(() => Boolean, { nullable: true })
-    public async isRebuildReady(@Parent() container: DockerContainer) {
-        return this.dockerManifestService.isRebuildReady(container.hostConfig?.networkMode);
-    }
-
-    @UseFeatureFlag('ENABLE_NEXT_DOCKER_RELEASE')
-    @UsePermissions({
-        action: AuthAction.UPDATE_ANY,
-        resource: Resource.DOCKER,
-    })
-    @Mutation(() => Boolean)
-    public async refreshDockerDigests() {
-        return this.dockerManifestService.refreshDigests();
-    }
-}
--- a/api/src/unraid-api/graph/resolvers/docker/docker-manifest.service.ts
+++ b/api/src/unraid-api/graph/resolvers/docker/docker-manifest.service.ts
@@ -1,62 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { AsyncMutex } from '@unraid/shared/util/processing.js';
-
-import { docker } from '@app/core/utils/index.js';
-import {
-    CachedStatusEntry,
-    DockerPhpService,
-} from '@app/unraid-api/graph/resolvers/docker/docker-php.service.js';
-
-@Injectable()
-export class DockerManifestService {
-    constructor(private readonly dockerPhpService: DockerPhpService) {}
-
-    private readonly refreshDigestsMutex = new AsyncMutex(() => {
-        return this.dockerPhpService.refreshDigestsViaPhp();
-    });
-
-    /**
-     * Recomputes local/remote docker container digests and writes them to /var/lib/docker/unraid-update-status.json
-     * @param mutex - Optional mutex to use for the operation. If not provided, a default mutex will be used.
-     * @param dockerUpdatePath - Optional path to the DockerUpdate.php file. If not provided, the default path will be used.
-     * @returns True if the digests were refreshed, false if the operation failed
-     */
-    async refreshDigests(mutex = this.refreshDigestsMutex, dockerUpdatePath?: string) {
-        return mutex.do(() => {
-            return this.dockerPhpService.refreshDigestsViaPhp(dockerUpdatePath);
-        });
-    }
-
-    /**
-     * Checks if an update is available for a given container image.
-     * @param imageRef - The image reference to check, e.g. "unraid/baseimage:latest". If no tag is provided, "latest" is assumed, following the webgui's implementation.
-     * @param cacheData read from /var/lib/docker/unraid-update-status.json by default
-     * @returns True if an update is available, false if not, or null if the status is unknown
-     */
-    async isUpdateAvailableCached(imageRef: string, cacheData?: Record<string, CachedStatusEntry>) {
-        let taggedRef = imageRef;
-        if (!taggedRef.includes(':')) taggedRef += ':latest';
-
-        cacheData ??= await this.dockerPhpService.readCachedUpdateStatus();
-        const containerData = cacheData[taggedRef];
-        if (!containerData) return null;
-        return containerData.status?.toLowerCase() === 'true';
-    }
-
-    /**
-     * Checks if a container is rebuild ready.
-     * @param networkMode - The network mode of the container, e.g. "container:unraid/baseimage:latest".
-     * @returns True if the container is rebuild ready, false if not
-     */
-    async isRebuildReady(networkMode?: string) {
-        if (!networkMode || !networkMode.startsWith('container:')) return false;
-        const target = networkMode.slice('container:'.length);
-        try {
-            await docker.getContainer(target).inspect();
-            return false;
-        } catch {
-            return true; // unresolved target -> ':???' equivalent
-        }
-    }
-}
--- a/api/src/unraid-api/graph/resolvers/docker/organizer/docker-organizer.service.spec.ts
+++ b/api/src/unraid-api/graph/resolvers/docker/organizer/docker-organizer.service.spec.ts
@@ -2,17 +2,17 @@ import { Test } from '@nestjs/testing';

 import { beforeEach, describe, expect, it, vi } from 'vitest';

+import { DockerConfigService } from '@app/unraid-api/graph/resolvers/docker/docker-config.service.js';
+import {
+    containerToResource,
+    DockerOrganizerService,
+} from '@app/unraid-api/graph/resolvers/docker/docker-organizer.service.js';
 import {
    ContainerPortType,
    ContainerState,
    DockerContainer,
 } from '@app/unraid-api/graph/resolvers/docker/docker.model.js';
 import { DockerService } from '@app/unraid-api/graph/resolvers/docker/docker.service.js';
-import { DockerOrganizerConfigService } from '@app/unraid-api/graph/resolvers/docker/organizer/docker-organizer-config.service.js';
-import {
-    containerToResource,
-    DockerOrganizerService,
-} from '@app/unraid-api/graph/resolvers/docker/organizer/docker-organizer.service.js';
 import { OrganizerV1 } from '@app/unraid-api/organizer/organizer.model.js';

 describe('containerToResource', () => {
@@ -138,7 +138,7 @@ describe('containerToResource', () => {

 describe('DockerOrganizerService', () => {
    let service: DockerOrganizerService;
-    let configService: DockerOrganizerConfigService;
+    let configService: DockerConfigService;
    let dockerService: DockerService;

    const mockOrganizer: OrganizerV1 = {
@@ -178,7 +178,7 @@ describe('DockerOrganizerService', () => {
            providers: [
                DockerOrganizerService,
                {
-                    provide: DockerOrganizerConfigService,
+                    provide: DockerConfigService,
                    useValue: {
                        getConfig: vi.fn().mockImplementation(() => structuredClone(mockOrganizer)),
                        validate: vi.fn().mockImplementation((config) => Promise.resolve(config)),
@@ -220,7 +220,7 @@ describe('DockerOrganizerService', () => {
        }).compile();

        service = moduleRef.get<DockerOrganizerService>(DockerOrganizerService);
-        configService = moduleRef.get<DockerOrganizerConfigService>(DockerOrganizerConfigService);
+        configService = moduleRef.get<DockerConfigService>(DockerConfigService);
        dockerService = moduleRef.get<DockerService>(DockerService);
    });

--- a/api/src/unraid-api/graph/resolvers/docker/organizer/docker-organizer.service.ts
+++ b/api/src/unraid-api/graph/resolvers/docker/organizer/docker-organizer.service.ts
@@ -3,9 +3,9 @@ import { Injectable, Logger } from '@nestjs/common';
 import type { ContainerListOptions } from 'dockerode';

 import { AppError } from '@app/core/errors/app-error.js';
+import { DockerConfigService } from '@app/unraid-api/graph/resolvers/docker/docker-config.service.js';
 import { DockerContainer } from '@app/unraid-api/graph/resolvers/docker/docker.model.js';
 import { DockerService } from '@app/unraid-api/graph/resolvers/docker/docker.service.js';
-import { DockerOrganizerConfigService } from '@app/unraid-api/graph/resolvers/docker/organizer/docker-organizer-config.service.js';
 import {
    addMissingResourcesToView,
    createFolderInView,
@@ -47,7 +47,7 @@ export function containerListToResourcesObject(containers: DockerContainer[]): O
 export class DockerOrganizerService {
    private readonly logger = new Logger(DockerOrganizerService.name);
    constructor(
-        private readonly dockerConfigService: DockerOrganizerConfigService,
+        private readonly dockerConfigService: DockerConfigService,
        private readonly dockerService: DockerService
    ) {}

--- a/api/src/unraid-api/graph/resolvers/docker/docker-php.service.ts
+++ b/api/src/unraid-api/graph/resolvers/docker/docker-php.service.ts
@@ -1,130 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-import { readFile } from 'fs/promises';
-
-import { z } from 'zod';
-
-import { phpLoader } from '@app/core/utils/plugins/php-loader.js';
-import {
-    ExplicitStatusItem,
-    UpdateStatus,
-} from '@app/unraid-api/graph/resolvers/docker/docker-update-status.model.js';
-import { parseDockerPushCalls } from '@app/unraid-api/graph/resolvers/docker/utils/docker-push-parser.js';
-
-type StatusItem = { name: string; updateStatus: 0 | 1 | 2 | 3 };
-
-/**
- * These types reflect the structure of the /var/lib/docker/unraid-update-status.json file,
- * which is not controlled by the Unraid API.
- */
-const CachedStatusEntrySchema = z.object({
-    /** sha256 digest - "sha256:..." */
-    local: z.string(),
-    /** sha256 digest - "sha256:..." */
-    remote: z.string(),
-    /** whether update is available (true), not available (false), or unknown (null) */
-    status: z.enum(['true', 'false']).nullable(),
-});
-const CachedStatusSchema = z.record(z.string(), CachedStatusEntrySchema);
-export type CachedStatusEntry = z.infer<typeof CachedStatusEntrySchema>;
-
-@Injectable()
-export class DockerPhpService {
-    private readonly logger = new Logger(DockerPhpService.name);
-    constructor() {}
-
-    /**
-     * Reads JSON from a file containing cached update status.
-     * If the file does not exist, an empty object is returned.
-     * @param cacheFile
-     * @returns
-     */
-    async readCachedUpdateStatus(
-        cacheFile = '/var/lib/docker/unraid-update-status.json'
-    ): Promise<Record<string, CachedStatusEntry>> {
-        try {
-            const cache = await readFile(cacheFile, 'utf8');
-            const cacheData = JSON.parse(cache);
-            const { success, data } = CachedStatusSchema.safeParse(cacheData);
-            if (success) return data;
-            this.logger.warn(cacheData, 'Invalid cached update status');
-            return {};
-        } catch (error) {
-            this.logger.warn(error, 'Failed to read cached update status');
-            return {};
-        }
-    }
-
-    /**----------------------
-     * Refresh Container Digests
-     *------------------------**/
-
-    /**
-     * Recomputes local/remote digests by triggering `DockerTemplates->getAllInfo(true)` via DockerUpdate.php
-     * @param dockerUpdatePath - Path to the DockerUpdate.php file
-     * @returns True if the digests were refreshed, false if the file is not found or the operation failed
-     */
-    async refreshDigestsViaPhp(
-        dockerUpdatePath = '/usr/local/emhttp/plugins/dynamix.docker.manager/include/DockerUpdate.php'
-    ) {
-        try {
-            await phpLoader({
-                file: dockerUpdatePath,
-                method: 'GET',
-            });
-            return true;
-        } catch {
-            // ignore; offline may keep remote as 'undef'
-            return false;
-        }
-    }
-
-    /**----------------------
-     * Parse Container Statuses
-     *------------------------**/
-
-    private parseStatusesFromDockerPush(js: string): ExplicitStatusItem[] {
-        const matches = parseDockerPushCalls(js);
-        return matches.map(({ name, updateStatus }) => ({
-            name,
-            updateStatus: this.updateStatusToString(updateStatus as StatusItem['updateStatus']),
-        }));
-    }
-
-    private updateStatusToString(updateStatus: 0): UpdateStatus.UP_TO_DATE;
-    private updateStatusToString(updateStatus: 1): UpdateStatus.UPDATE_AVAILABLE;
-    private updateStatusToString(updateStatus: 2): UpdateStatus.REBUILD_READY;
-    private updateStatusToString(updateStatus: 3): UpdateStatus.UNKNOWN;
-    // prettier-ignore
-    private updateStatusToString(updateStatus: StatusItem['updateStatus']): ExplicitStatusItem['updateStatus'];
-    private updateStatusToString(
-        updateStatus: StatusItem['updateStatus']
-    ): ExplicitStatusItem['updateStatus'] {
-        switch (updateStatus) {
-            case 0:
-                return UpdateStatus.UP_TO_DATE;
-            case 1:
-                return UpdateStatus.UPDATE_AVAILABLE;
-            case 2:
-                return UpdateStatus.REBUILD_READY;
-            default:
-                return UpdateStatus.UNKNOWN;
-        }
-    }
-
-    /**
-     * Gets the update statuses for all containers by triggering `DockerTemplates->getAllInfo(true)` via DockerContainers.php
-     * @param dockerContainersPath - Path to the DockerContainers.php file
-     * @returns The update statuses for all containers
-     */
-    async getContainerUpdateStatuses(
-        dockerContainersPath = '/usr/local/emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php'
-    ): Promise<ExplicitStatusItem[]> {
-        const stdout = await phpLoader({
-            file: dockerContainersPath,
-            method: 'GET',
-        });
-        const parts = stdout.split('\0'); // [html, "docker.push(...)", busyFlag]
-        const js = parts[1] || '';
-        return this.parseStatusesFromDockerPush(js);
-    }
-}
--- a/api/src/unraid-api/graph/resolvers/docker/docker-update-status.model.ts
+++ b/api/src/unraid-api/graph/resolvers/docker/docker-update-status.model.ts
@@ -1,25 +0,0 @@
-import { Field, ObjectType, registerEnumType } from '@nestjs/graphql';
-
-/**
- * Note that these values propagate down to API consumers, so be aware of breaking changes.
- */
-export enum UpdateStatus {
-    UP_TO_DATE = 'UP_TO_DATE',
-    UPDATE_AVAILABLE = 'UPDATE_AVAILABLE',
-    REBUILD_READY = 'REBUILD_READY',
-    UNKNOWN = 'UNKNOWN',
-}
-
-registerEnumType(UpdateStatus, {
-    name: 'UpdateStatus',
-    description: 'Update status of a container.',
-});
-
-@ObjectType()
-export class ExplicitStatusItem {
-    @Field(() => String)
-    name!: string;
-
-    @Field(() => UpdateStatus)
-    updateStatus!: UpdateStatus;
-}
--- a/api/src/unraid-api/graph/resolvers/docker/docker.model.ts
+++ b/api/src/unraid-api/graph/resolvers/docker/docker.model.ts
@@ -1,7 +1,7 @@
 import { Field, ID, Int, ObjectType, registerEnumType } from '@nestjs/graphql';

 import { Node } from '@unraid/shared/graphql.model.js';
-import { GraphQLBigInt, GraphQLJSON, GraphQLPort } from 'graphql-scalars';
+import { GraphQLJSON, GraphQLPort } from 'graphql-scalars';

 export enum ContainerPortType {
    TCP = 'TCP',
@@ -89,10 +89,7 @@ export class DockerContainer extends Node {
    @Field(() => [ContainerPort])
    ports!: ContainerPort[];

-    @Field(() => GraphQLBigInt, {
-        nullable: true,
-        description: 'Total size of all files in the container (in bytes)',
-    })
+    @Field(() => Int, { nullable: true, description: 'Total size of all the files in the container' })
    sizeRootFs?: number;

    @Field(() => GraphQLJSON, { nullable: true })
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
renovate[bot]	bb7a26a63d	Merge `16dfdd7082` into `ab11e7ff7f`	2025-08-27 20:27:40 +00:00
renovate[bot]	16dfdd7082	chore(deps): pin dependency prettier-plugin-tailwindcss to 0.6.14	2025-08-27 20:27:37 +00:00
				`@@ -1 +0,0 @@`
				`# All Content Here has been permanently moved to [Unraid Docs](https://github.com/unraid/docs)`