feat(soundtouch-web): add multi-room zone management

Backend: - GET /api/zone/{id} — zone info enriched with device names and role flags - POST /api/zone/{id}/add/{slaveId} — add slave (creates zone if standalone) - POST /api/zone/{id}/remove/{slaveId} — remove slave from zone - POST /api/zone/{id}/dissolve — dissolve zone to standalone - POST /api/zone/{id}/leave — slave leaves its zone (backend finds master) Frontend (Zone.js): - Standalone: shows "Group with…" button, opens device picker overlay - Master: member list with per-row Remove, Add speaker, Dissolve buttons - Slave: shows master name, Leave zone button - Lazy-loads on device detail open; refreshes after each zone operation Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
feat(soundtouch-web): add recents panel with play support
2026-08-24 14:47:23 +00:00 · 2026-05-08 21:22:57 +02:00 · 2026-05-08 21:22:57 +02:00 · 2026-05-08 21:22:57 +02:00 · 2026-05-08 21:22:57 +02:00
684 changed files with 9442 additions and 71418 deletions
@@ -1,87 +0,0 @@
-Draft a "News & Updates" blog post for AfterTouch covering recent git activity, then open a draft PR for review.
-
-## Step 1 — Determine lookback window
-
-Run:
-```
-git log --format="%ad" --date=short -- docs/content/blog/ | grep -v '_index' | head -1
-```
-
-If a date is returned, use it as SINCE.
-If the output is empty (no posts yet), compute SINCE = 30 days before today:
- macOS: `date -v-30d +%Y-%m-%d`
- Linux: `date -d '30 days ago' +%Y-%m-%d`
-
-## Step 2 — Collect commits since SINCE
-
-Run:
-```
-git log --format="%ad %h %s" --date=short --since="$SINCE" --no-merges
-```
-
-Exclude these (they are noise):
- Subjects matching: `^(ci|chore|deps|bump|Bump|test|lint|style|code style|debug)`
- Dependabot bumps (subject contains "bump" and includes a package name pattern)
- Routine doc link/URL fixes
-
-Group the remaining commits into categories:
- **NEW FEATURES** — subjects starting with `feat(` or `feat:`
- **BUG FIXES** — subjects starting with `fix(` or `fix:`
- **SECURITY** — subjects starting with `sec` or containing "security", "inject", "path expression"
- **DOCS** — user-visible doc changes only (new guides, major restructures)
- **MAINTENANCE** — everything else that passed the filter
-
-Omit empty categories entirely.
-
-## Step 3 — Current version
-
-Run: `git tag --sort=-version:refname | head -1`
-
-## Step 4 — Determine the period label
-
-Use the first and last commit dates from Step 2 to produce a human-readable label,
-e.g. "May 2026" or "April – May 2026".
-
-## Step 5 — Write the blog post
-
-Create the file at: `docs/content/blog/YYYY-MM-slug.md`
- YYYY-MM = today's year-month
- slug = short kebab-case summary of the biggest theme
-
-Use this exact frontmatter shape:
-```yaml
---
-title: "AfterTouch PERIOD: <one-line theme>"
-date: YYYY-MM-DD
-description: "<one sentence, ≤200 chars, suitable as a standalone teaser>"
-tags:
-  - <up to 4 tags from: security, tls, discovery, docs, cli, web, spotify, amazon, health, migration, fixes, ci>
-sidebar:
-  exclude: true
---
-```
-
-Body structure:
-1. Opening paragraph (3–5 sentences) explaining what happened and why it matters to someone running AfterTouch.
-2. One `##` section per non-empty category. Use bullet points written for an operator audience — no raw git subjects, no internal Go package paths.
-3. End with: `**Current release:** vX.Y.Z`
-
-Target length: 300–600 words. Never include real IPs, MAC addresses, account IDs, or device names.
-
-## Step 6 — Create a branch and open a draft PR
-
-```bash
-git checkout -b blog/YYYY-MM-update
-git add docs/content/blog/YYYY-MM-slug.md
-git commit -m "docs(blog): add PERIOD update post"
-git push -u origin blog/YYYY-MM-update
-gh pr create --draft \
-  --title "Blog: PERIOD update post" \
-  --body "Automated draft from /blog-update skill. Review content before merging — deployment is automatic on merge to main."
-```
-
-If the `documentation` label exists on the repo, add `--label documentation`.
-
-## Step 7 — Done
-
-Report the PR URL. Do not merge, approve, or request review.
@@ -5,24 +5,6 @@
 SOUNDTOUCH_HOSTNAME=soundtouch.local
 SOUNDTOUCH_VERSION=latest

-# Stockholm frontend (used by make prepare-stockholm and by the Go service at startup)
-# BACKEND_URL is the base URL your speakers and browser can reach the service at.
-# Corresponds to SERVER_URL in the Go service.
-# BACKEND_URL=http://soundtouch.local:8000
-#
-# STREAMING_URL is used for streaming.bose.com rewrites (defaults to BACKEND_URL).
-# Set to $(BACKEND_URL)/marge only when routing through a soundcork backend.
-# STREAMING_URL=http://soundtouch.local:8000
-#
-# AUTH_SERVICE_URL is written into config.json as the auth endpoint (defaults to BACKEND_URL).
-# A trailing slash is added automatically; the JS appends paths like "oauth/account/..." directly.
-# AUTH_SERVICE_URL=http://soundtouch.local:8000
-#
-# STOCKHOLM_BASE_PATH mounts the Stockholm UI under a URL prefix, freeing / for the management UI.
-# The bridge API (/api/native/*, /api/http-proxy) remains at root regardless of this setting.
-# Defaults to /stockholm. Set to empty to serve at root.
-# STOCKHOLM_BASE_PATH=/stockholm
-
 # Discovery Settings
 DISCOVERY_TIMEOUT=5s
 UPNP_ENABLED=true
@@ -43,23 +25,23 @@ CACHE_TTL=30s

 # Examples:
 # Single device with default port:
-# PREFERRED_DEVICES="192.0.2.100"
+# PREFERRED_DEVICES="192.168.1.100"

 # Single device with custom name:
-# PREFERRED_DEVICES="Living Room@192.0.2.100"
+# PREFERRED_DEVICES="Living Room@192.168.1.100"

 # Single device with custom port:
-# PREFERRED_DEVICES="192.0.2.100:8091"
+# PREFERRED_DEVICES="192.168.1.100:8091"

 # Multiple devices with mixed configurations:
-PREFERRED_DEVICES="Living Room@192.0.2.100:8090;Kitchen@192.0.2.101;192.0.2.102:8091"
+PREFERRED_DEVICES="Living Room@192.168.1.100:8090;Kitchen@192.168.1.101;192.168.1.102:8091"

-# Example — replace with your speakers' names and IPs:
-# PREFERRED_DEVICES="Living Room SoundTouch@192.0.2.10;Kitchen SoundTouch@192.0.2.11"
+# Real example based on your devices:
+# PREFERRED_DEVICES="Sound Machinechen@192.168.178.35;A Sound Machine@192.168.178.28"

 # Alternative format examples:
-# PREFERRED_DEVICES="192.0.2.10;192.0.2.11"
-# PREFERRED_DEVICES="SoundTouch 10@192.0.2.10;SoundTouch 20@192.0.2.11"
+# PREFERRED_DEVICES="192.168.178.35;192.168.178.28"
+# PREFERRED_DEVICES="SoundTouch 10@192.168.178.35;SoundTouch 20@192.168.178.28"

 # Spotify Integration
 # Create an app at https://developer.spotify.com/dashboard
@@ -30,7 +30,7 @@ A clear and concise description of what you expected to happen.
 **Command/Code that failed**
 ```bash
 # If using CLI tool, provide the exact command
-soundtouch-cli --host 192.0.2.100 info get
+soundtouch-cli --host 192.168.1.100 info get

 # If using Go library, provide minimal code example
 ```
@@ -163,7 +163,7 @@ body:
      label: Network Configuration
      description: Details about your network setup (if relevant to the issue)
      placeholder: |
-        - Device IP: 192.0.2.100
+        - Device IP: 192.168.1.100
        - Network type: WiFi/Ethernet
        - Router model:
        - Any firewalls or network restrictions:
@@ -69,8 +69,8 @@ List any features that don't work or behave unexpectedly:
 **Testing Commands Used**
 ```bash
 # List the specific commands you used for testing
-soundtouch-cli --host 192.0.2.100 info get
-soundtouch-cli --host 192.0.2.100 play start
+soundtouch-cli --host 192.168.1.100 info get
+soundtouch-cli --host 192.168.1.100 play start
 # ... etc
 ```

@@ -50,7 +50,7 @@ client.NewFeature(parameters)

 ```bash
 # CLI example
-soundtouch-cli --host 192.0.2.100 new-feature --param value
+soundtouch-cli --host 192.168.1.100 new-feature --param value
 ```

 **Priority**
@@ -131,7 +131,7 @@ body:
      render: go
      placeholder: |
        // Example of how you envision using this feature
-        client := soundtouch.New("192.0.2.100", 8090)
+        client := soundtouch.New("192.168.1.100", 8090)

        // Your desired API call
        result, err := client.NewFeature(options)
@@ -1,29 +1,74 @@
-# CodeQL configuration
-# https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning
+# CodeQL configuration for enhanced security analysis
+# See: https://docs.github.com/en/code-security/codeql-cli/using-the-codeql-cli/creating-codeql-query-suites

 name: "Go Security Analysis"

 disable-default-queries: false

 queries:
+  # Include default security queries
  - uses: security-extended
  - uses: security-and-quality

-# Paths to include
+  # Additional Go-specific security queries
+  - name: go-security-extra
+    uses:
+      - go/bad-redirect-check
+      - go/clear-text-logging
+      - go/incorrect-integer-conversion
+      - go/log-injection
+      - go/missing-regexp-anchor
+      - go/path-injection
+      - go/request-forgery
+      - go/sensitive-package-import
+      - go/sql-injection
+      - go/uncontrolled-allocation-size
+      - go/unsafe-quoting
+      - go/useless-regexp-character-escape
+      - go/zip-slip
+
+# Configure paths to exclude from analysis
+paths-ignore:
+  - "**/*.pb.go"          # Generated protobuf files
+  - "**/*_gen.go"         # Generated code
+  - "**/vendor/**"        # Vendor dependencies
+  - "**/build/**"         # Build artifacts
+  - "**/scripts/**"       # Build scripts
+  - "**/*_test.go"        # Test files (optional - remove if you want to analyze tests)
+
+# Configure paths to include (if not specified, all Go files are included)
 paths:
  - "cmd/**/*.go"
  - "pkg/**/*.go"
  - "*.go"

-# Paths to exclude from analysis
-paths-ignore:
-  - "**/*.pb.go"       # Generated protobuf files
-  - "**/*_gen.go"      # Generated code
-  - "**/vendor/**"     # Vendor dependencies
-  - "**/build/**"      # Build artifacts
-  - "**/scripts/**"    # Build scripts
-  - "**/*_test.go"     # Test files
-
+# Query filters to reduce noise
 query-filters:
+  - exclude:
+      id: go/unused-variable
+      reason: "Can be noisy in development"
  - exclude:
      id: go/hardcoded-credentials
+      reason: "Will be handled by separate secret scanning"
+
+# Configuration for specific query packs
+packs:
+  # Use the official CodeQL Go queries
+  - codeql/go-queries
+
+  # Additional community query packs for enhanced security
+  - codeql/go-queries@~0.0.0  # Latest version
+
+# Custom configuration for specific queries
+query-config:
+  go/path-injection:
+    # Configure severity levels
+    severity: "error"
+  go/sql-injection:
+    severity: "error"
+  go/request-forgery:
+    severity: "warning"
+  go/log-injection:
+    severity: "warning"
+  go/clear-text-logging:
+    severity: "note"
@@ -38,69 +38,6 @@ updates:
        patterns:
          - "golang.org/*"

-  # Hugo module dependency updates (docs site)
-  - package-ecosystem: "gomod"
-    directory: "/docs"
-    schedule:
-      interval: "weekly"
-      day: "monday"
-      time: "09:00"
-      timezone: "UTC"
-    open-pull-requests-limit: 3
-    reviewers:
-      - "gesellix"
-    assignees:
-      - "gesellix"
-    commit-message:
-      prefix: "deps"
-      include: "scope"
-    labels:
-      - "dependencies"
-      - "go"
-      - "docs"
-    rebase-strategy: "auto"
-
-  # Example module dependency updates
-  - package-ecosystem: "gomod"
-    directory: "/examples/navigation-station-demo"
-    schedule:
-      interval: "weekly"
-      day: "monday"
-      time: "09:00"
-      timezone: "UTC"
-    open-pull-requests-limit: 3
-    reviewers:
-      - "gesellix"
-    assignees:
-      - "gesellix"
-    commit-message:
-      prefix: "deps"
-      include: "scope"
-    labels:
-      - "dependencies"
-      - "go"
-    rebase-strategy: "auto"
-
-  - package-ecosystem: "gomod"
-    directory: "/examples/preset-management"
-    schedule:
-      interval: "weekly"
-      day: "monday"
-      time: "09:00"
-      timezone: "UTC"
-    open-pull-requests-limit: 3
-    reviewers:
-      - "gesellix"
-    assignees:
-      - "gesellix"
-    commit-message:
-      prefix: "deps"
-      include: "scope"
-    labels:
-      - "dependencies"
-      - "go"
-    rebase-strategy: "auto"
-
  # GitHub Actions workflow dependency updates
  - package-ecosystem: "github-actions"
    directory: "/"
@@ -161,25 +98,3 @@ updates:
      - "dependencies"
      - "docker"
    rebase-strategy: "auto"
-
-  # npm dependency updates
-  - package-ecosystem: "npm"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-      day: "thursday"
-      time: "09:00"
-      timezone: "UTC"
-    open-pull-requests-limit: 3
-    reviewers:
-      - "gesellix"
-    assignees:
-      - "gesellix"
-    commit-message:
-      prefix: "deps"
-      include: "scope"
-    labels:
-      - "dependencies"
-      - "npm"
-      - "frontend"
-    rebase-strategy: "auto"
@@ -3,7 +3,7 @@
  "retryOn429": true,
  "retryCount": 3,
  "fallbackRetryDelay": "30s",
-  "aliveStatusCodes": [200, 202, 206],
+  "aliveStatusCodes": [200, 206],
  "ignorePatterns": [
    {
      "pattern": "^http://localhost"
@@ -27,7 +27,7 @@
      "pattern": "^https://pkg.go.dev.*badge"
    },
    {
-      "pattern": "^/images/"
+      "pattern": "^\\.\\./images/(dashboard-home|account-creation|account-dashboard|usb-remote-services|device-discovery|device-registration|account-migration|migration-setup|migration-progress|migration-health|migration-complete|backup-setup)\\.png$"
    },
    {
      "pattern": "https://www.contributor-covenant.org/version/2/0/code_of_conduct.html"
@@ -50,7 +50,7 @@ Please check the type of change your PR introduces:

 **Device(s) tested with:**
 - Device model: [e.g. SoundTouch 10]
- Device IP: [e.g. 192.0.2.100]
+- Device IP: [e.g. 192.168.1.100]
 - Test results: [brief description]

 ### Test Commands
@@ -58,7 +58,7 @@ Please check the type of change your PR introduces:
 # Commands used to test this change
 make test
 go test ./pkg/client -v -run TestNewFeature
-soundtouch-cli --host 192.0.2.100 new-command
+soundtouch-cli --host 192.168.1.100 new-command
 ```

 ## Documentation
@@ -17,15 +17,15 @@ jobs:

    steps:
      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@v6

      - name: Set up Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@v6
        with:
          go-version-file: "go.mod"

      - name: Cache Go modules
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@v5
        with:
          path: |
            ~/.cache/go-build
@@ -53,7 +53,7 @@ jobs:
        run: make test-http-client

      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
+        uses: codecov/codecov-action@v6
        with:
          file: ./coverage.out
          flags: unittests
@@ -66,10 +66,10 @@ jobs:

    steps:
      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@v6

      - name: Set up Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@v6
        with:
          go-version-file: "go.mod"

@@ -77,7 +77,7 @@ jobs:
        run: sudo apt-get install -y libpcap-dev

      - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@82606bf257cbaff209d206a39f5134f0cfbfd2ee # v9.2.1
+        uses: golangci/golangci-lint-action@v9
        with:
          version: latest
          args: --timeout=5m
@@ -86,76 +86,39 @@ jobs:
    name: Build
    runs-on: ubuntu-latest
    strategy:
-      fail-fast: false
      matrix:
-        include:
-          - goos: linux
-            goarch: amd64
-          - goos: linux
-            goarch: arm64
-          - goos: linux
-            goarch: arm
-            goarm: 7
-          - goos: darwin
-            goarch: amd64
-          - goos: darwin
-            goarch: arm64
+        goos: [linux, darwin, windows]
+        goarch: [amd64, arm64]
+        exclude:
+          # Windows ARM64 builds are experimental
          - goos: windows
-            goarch: amd64
-          - goos: freebsd
-            goarch: amd64
+            goarch: arm64

    steps:
      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@v6

      - name: Set up Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@v6
        with:
          go-version-file: "go.mod"

-      - name: Cache Go modules
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.mod') }}-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-
-      - name: Build binaries
+      - name: Build CLI
        env:
          GOOS: ${{ matrix.goos }}
          GOARCH: ${{ matrix.goarch }}
-          GOARM: ${{ matrix.goarm }}
-          CGO_ENABLED: 0
        run: |
-          ARCH_SUFFIX="${{ matrix.goos }}-${{ matrix.goarch }}"
-          if [[ -n "${{ matrix.goarm }}" ]]; then
-            ARCH_SUFFIX="${ARCH_SUFFIX}v${{ matrix.goarm }}"
+          output_name="soundtouch-cli-${{ matrix.goos }}-${{ matrix.goarch }}"
+          if [ "${{ matrix.goos }}" = "windows" ]; then
+            output_name="${output_name}.exe"
          fi
-
-          EXT=""
-          if [[ "${{ matrix.goos }}" == "windows" ]]; then
-            EXT=".exe"
-          fi
-
-          mkdir -p build
-
-          for binary in soundtouch-cli soundtouch-service soundtouch-web soundtouch-backup; do
-            OUTPUT="build/${binary}-${ARCH_SUFFIX}${EXT}"
-            echo "Building $OUTPUT"
-            go build -trimpath -ldflags="-s -w" -o "$OUTPUT" "./cmd/$binary"
-          done
-
-          ls -la build/
+          go build -trimpath -ldflags="-s -w" -o "$output_name" ./cmd/soundtouch-cli

      - name: Upload build artifacts
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@v7
        with:
-          name: binaries-${{ matrix.goos }}-${{ matrix.goarch }}${{ matrix.goarm }}
-          path: build/
+          name: soundtouch-cli-${{ matrix.goos }}-${{ matrix.goarch }}
+          path: soundtouch-cli-*

  security:
    name: Basic Security Check
@@ -163,10 +126,10 @@ jobs:

    steps:
      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@v6

      - name: Set up Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@v6
        with:
          go-version-file: "go.mod"

@@ -190,7 +153,7 @@ jobs:

    steps:
      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@v6

      - name: Check documentation links
        run: |
@@ -215,8 +178,8 @@ jobs:
          )

          for img in "${IMAGES[@]}"; do
-            if [ ! -f "docs/static/images/$img" ]; then
-              echo "::warning file=docs/content/docs/guides/MIGRATION-GUIDE.md::Pending image '$img' is missing from docs/static/images/"
+            if [ ! -f "docs/images/$img" ]; then
+              echo "::warning file=docs/guides/MIGRATION-GUIDE.md::Pending image '$img' is missing from docs/images/"
            fi
          done

@@ -226,7 +189,7 @@ jobs:
          echo "Validating API documentation consistency..."

          # Check API cookbook
-          if [ -f "docs/content/docs/reference/API-COOKBOOK.md" ]; then
+          if [ -f "docs/reference/API-COOKBOOK.md" ]; then
            echo "✓ API Cookbook exists"
          else
            echo "✗ API Cookbook missing"
@@ -234,7 +197,7 @@ jobs:
          fi

          # Check getting started guide
-          if [ -f "docs/content/docs/guides/GETTING-STARTED.md" ]; then
+          if [ -f "docs/guides/GETTING-STARTED.md" ]; then
            echo "✓ Getting Started guide exists"
          else
            echo "✗ Getting Started guide missing"
@@ -248,10 +211,10 @@ jobs:

    steps:
      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@v6

      - name: Set up Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@v6
        with:
          go-version-file: "go.mod"

@@ -275,7 +238,7 @@ jobs:

          func main() {
              // Test basic client creation
-              c := client.NewClientFromHost("192.0.2.100")
+              c := client.NewClientFromHost("192.168.1.100")
              fmt.Printf("Client created for %s\n", c.BaseURL())

              // Test models can be imported
@@ -303,32 +266,14 @@ jobs:

    steps:
      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@v6

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
-
-      - name: Set build date
-        id: build_date
-        run: echo "date=$(date -u +%Y-%m-%d)" >> $GITHUB_OUTPUT
-
-      - name: Determine push eligibility
-        id: push-check
-        run: |
-          # Push on main, and on same-repo PRs (forks can't push to GHCR via GITHUB_TOKEN).
-          SHOULD_PUSH="false"
-          if [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" == "refs/heads/main" ]]; then
-            SHOULD_PUSH="true"
-          elif [[ "${{ github.event_name }}" == "pull_request" && \
-                  "${{ github.event.pull_request.head.repo.full_name }}" == "${{ github.repository }}" ]]; then
-            SHOULD_PUSH="true"
-          fi
-          echo "should-push=$SHOULD_PUSH" >> "$GITHUB_OUTPUT"
-          echo "Will push: $SHOULD_PUSH"
+        uses: docker/setup-buildx-action@v4

      - name: Log in to GitHub Container Registry
-        if: steps.push-check.outputs.should-push == 'true'
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+        uses: docker/login-action@v4
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -336,93 +281,46 @@ jobs:

      - name: Extract metadata (tags, labels) for soundtouch-service
        id: meta-service
-        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
+        uses: docker/metadata-action@v6
        with:
          images: ghcr.io/${{ github.repository }}
          tags: |
            type=raw,value=edge,enable=${{ github.ref == 'refs/heads/main' }}
-            type=ref,event=pr,prefix=preview-pr-
-            type=sha,prefix=preview-sha-,format=short,enable=${{ github.event_name == 'pull_request' }}
-            type=ref,event=branch,prefix=preview-branch-,enable=${{ github.event_name == 'push' && github.ref != 'refs/heads/main' }}
+            type=ref,event=pr

      - name: Build and push soundtouch-service Docker image
-        uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
+        uses: docker/build-push-action@v7
        with:
          context: .
          target: soundtouch-service
          platforms: linux/amd64,linux/arm64,linux/arm64/v8,linux/arm/v7
-          push: ${{ steps.push-check.outputs.should-push == 'true' }}
+          push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
          tags: ${{ steps.meta-service.outputs.tags }}
          labels: ${{ steps.meta-service.outputs.labels }}
-          build-args: |
-            COMMIT=${{ github.sha }}
-            DATE=${{ steps.build_date.outputs.date }}
          cache-from: type=gha
          cache-to: type=gha,mode=max

      - name: Extract metadata (tags, labels) for soundtouch-web
        id: meta-web
-        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
+        uses: docker/metadata-action@v6
        with:
          images: ghcr.io/${{ github.repository }}-web
          tags: |
            type=raw,value=edge,enable=${{ github.ref == 'refs/heads/main' }}
-            type=ref,event=pr,prefix=preview-pr-
-            type=sha,prefix=preview-sha-,format=short,enable=${{ github.event_name == 'pull_request' }}
-            type=ref,event=branch,prefix=preview-branch-,enable=${{ github.event_name == 'push' && github.ref != 'refs/heads/main' }}
+            type=ref,event=pr

      - name: Build and push soundtouch-web Docker image
-        uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
+        uses: docker/build-push-action@v7
        with:
          context: .
          target: soundtouch-web
          platforms: linux/amd64,linux/arm64,linux/arm64/v8,linux/arm/v7
-          push: ${{ steps.push-check.outputs.should-push == 'true' }}
+          push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
          tags: ${{ steps.meta-web.outputs.tags }}
          labels: ${{ steps.meta-web.outputs.labels }}
-          build-args: |
-            COMMIT=${{ github.sha }}
-            DATE=${{ steps.build_date.outputs.date }}
          cache-from: type=gha
          cache-to: type=gha,mode=max

-      - name: Summarize published images
-        if: steps.push-check.outputs.should-push == 'true'
-        env:
-          SERVICE_TAGS: ${{ steps.meta-service.outputs.tags }}
-          WEB_TAGS: ${{ steps.meta-web.outputs.tags }}
-          EVENT_NAME: ${{ github.event_name }}
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-          REF_NAME: ${{ github.ref_name }}
-        run: |
-          {
-            echo "## 🐳 Published Docker Images"
-            echo ""
-            if [[ "$EVENT_NAME" == "pull_request" ]]; then
-              echo "**Preview** images for PR #${PR_NUMBER}. These are not release builds."
-            elif [[ "$REF_NAME" == "main" ]]; then
-              echo "**Edge** images from \`main\`."
-            else
-              echo "**Preview** images from branch \`${REF_NAME}\`. These are not release builds."
-            fi
-            echo ""
-            echo "### soundtouch-service"
-            echo ""
-            echo '```bash'
-            while IFS= read -r tag; do
-              [[ -n "$tag" ]] && echo "docker pull $tag"
-            done <<< "$SERVICE_TAGS"
-            echo '```'
-            echo ""
-            echo "### soundtouch-web"
-            echo ""
-            echo '```bash'
-            while IFS= read -r tag; do
-              [[ -n "$tag" ]] && echo "docker pull $tag"
-            done <<< "$WEB_TAGS"
-            echo '```'
-          } >> "$GITHUB_STEP_SUMMARY"
-
  notify:
    name: Notify Status
    runs-on: ubuntu-latest
@@ -457,7 +355,7 @@ jobs:

      - name: Update commit status
        if: always()
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        uses: actions/github-script@v9
        with:
          script: |
            try {
@@ -1,56 +0,0 @@
-name: "CodeQL Advanced"
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-  schedule:
-    - cron: '36 6 * * 1'
-
-jobs:
-  analyze:
-    name: Analyze (${{ matrix.language }})
-    runs-on: ubuntu-latest
-    permissions:
-      security-events: write
-      packages: read
-      actions: read
-      contents: read
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - language: actions
-            build-mode: none
-          - language: go
-            build-mode: manual
-          - language: javascript-typescript
-            build-mode: none
-          - language: python
-            build-mode: none
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-
-      - name: Install libpcap (required for Go build)
-        if: matrix.language == 'go'
-        run: sudo apt-get install -y libpcap-dev
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4.36.1
-        with:
-          languages: ${{ matrix.language }}
-          build-mode: ${{ matrix.build-mode }}
-          config-file: ${{ matrix.language == 'go' && './.github/codeql-config.yml' || '' }}
-
-      - name: Build Go (required for manual build-mode)
-        if: matrix.language == 'go'
-        run: go build ./...
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4.36.1
-        with:
-          category: "/language:${{ matrix.language }}"
@@ -20,24 +20,18 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@v6
      - name: Setup Pages
-        id: pages
-        uses: actions/configure-pages@45bfe0192ca1faeb007ade9deae92b16b8254a0d # v6.0.0
-      - name: Setup Hugo
-        uses: peaceiris/actions-hugo@2752ce1d29631191ea3f27c23495fa06139a5b78 # v3.2.1
+        uses: actions/configure-pages@v6
+      - name: Build with Jekyll
+        uses: actions/jekyll-build-pages@v1
        with:
-          hugo-version: 'latest'
-          extended: true
-      - name: Build with Hugo
-        run: hugo --source docs/ --minify --destination ../_site --baseURL "${{ steps.pages.outputs.base_url }}"
-        env:
-          HUGO_ENVIRONMENT: production
-          HUGO_PARAMS_GITHASH: ${{ github.sha }}
+          source: 'docs/'
+          destination: '_site'
      - name: Upload artifact
-        uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5.0.0
+        uses: actions/upload-pages-artifact@v5
        with:
          path: '_site'
      - name: Deploy to GitHub Pages
        id: deployment
-        uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128 # v5.0.0
+        uses: actions/deploy-pages@v5
@@ -28,7 +28,7 @@ jobs:

    steps:
      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0

@@ -64,7 +64,7 @@ jobs:
          fi

      - name: Set up Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@v6
        with:
          go-version-file: ${{ env.GO_VERSION_FILE }}

@@ -102,15 +102,15 @@ jobs:

    steps:
      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@v6

      - name: Set up Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@v6
        with:
          go-version-file: ${{ env.GO_VERSION_FILE }}

      - name: Cache Go modules
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@v5
        with:
          path: |
            ~/.cache/go-build
@@ -206,7 +206,7 @@ jobs:
          echo "✅ Checksums generated successfully"

      - name: Upload build artifact
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@v7
        with:
          name: binaries-${{ matrix.goos }}-${{ matrix.goarch }}${{ matrix.goarm }}
          path: |
@@ -223,7 +223,7 @@ jobs:

    steps:
      - name: Download binary artifacts
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@v8
        with:
          pattern: binaries-*
          path: ./binaries
@@ -280,7 +280,7 @@ jobs:
          fi

      - name: Upload checksums
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@v7
        with:
          name: checksums
          path: |
@@ -291,7 +291,7 @@ jobs:
          retention-days: 1

      - name: Upload all release assets
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@v7
        with:
          name: release-assets
          path: binaries/release-files/
@@ -305,12 +305,12 @@ jobs:

    steps:
      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0

      - name: Download release assets
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@v8
        with:
          name: release-assets
          path: ./release-assets
@@ -358,7 +358,7 @@ jobs:

          func main() {
              // Create client
-              c := client.New("192.0.2.100", 8090)
+              c := client.New("192.168.1.100", 8090)

              // Get device info
              info, err := c.GetInfo()
@@ -468,7 +468,7 @@ jobs:
          echo "release_notes_file=release_notes.md" >> $GITHUB_OUTPUT

      - name: Create GitHub Release
-        uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
+        uses: softprops/action-gh-release@v3
        with:
          tag_name: ${{ github.event.inputs.tag }}
          name: "Bose SoundTouch Go Library ${{ github.event.inputs.tag }}"
@@ -494,13 +494,13 @@ jobs:

    steps:
      - name: Download release assets
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@v8
        with:
          name: release-assets
          path: ./release-assets

      - name: Upload additional assets to existing release
-        uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
+        uses: softprops/action-gh-release@v3
        with:
          tag_name: ${{ github.event.release.tag_name }}
          files: |
@@ -521,17 +521,13 @@ jobs:

    steps:
      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-
-      - name: Set build date
-        id: build_date
-        run: echo "date=$(date -u +%Y-%m-%d)" >> $GITHUB_OUTPUT
+        uses: actions/checkout@v6

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
+        uses: docker/setup-buildx-action@v4

      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+        uses: docker/login-action@v4
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -539,7 +535,7 @@ jobs:

      - name: Extract metadata (tags, labels) for soundtouch-service
        id: meta-service
-        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
+        uses: docker/metadata-action@v6
        with:
          images: ghcr.io/${{ github.repository }}
          tags: |
@@ -548,7 +544,7 @@ jobs:
            type=raw,value=latest,enable=${{ needs.validate.outputs.is_prerelease == 'false' }}

      - name: Build and push soundtouch-service Docker image
-        uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
+        uses: docker/build-push-action@v7
        with:
          context: .
          target: soundtouch-service
@@ -556,16 +552,12 @@ jobs:
          push: true
          tags: ${{ steps.meta-service.outputs.tags }}
          labels: ${{ steps.meta-service.outputs.labels }}
-          build-args: |
-            VERSION=v${{ needs.validate.outputs.version }}
-            COMMIT=${{ github.sha }}
-            DATE=${{ steps.build_date.outputs.date }}
          cache-from: type=gha
          cache-to: type=gha,mode=max

      - name: Extract metadata (tags, labels) for soundtouch-web
        id: meta-web
-        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
+        uses: docker/metadata-action@v6
        with:
          images: ghcr.io/${{ github.repository }}-web
          tags: |
@@ -574,7 +566,7 @@ jobs:
            type=raw,value=latest,enable=${{ needs.validate.outputs.is_prerelease == 'false' }}

      - name: Build and push soundtouch-web Docker image
-        uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
+        uses: docker/build-push-action@v7
        with:
          context: .
          target: soundtouch-web
@@ -582,10 +574,6 @@ jobs:
          push: true
          tags: ${{ steps.meta-web.outputs.tags }}
          labels: ${{ steps.meta-web.outputs.labels }}
-          build-args: |
-            VERSION=v${{ needs.validate.outputs.version }}
-            COMMIT=${{ github.sha }}
-            DATE=${{ steps.build_date.outputs.date }}
          cache-from: type=gha
          cache-to: type=gha,mode=max

@@ -19,18 +19,20 @@ jobs:

    steps:
      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@v6

      - name: Set up Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@v6
        with:
          go-version-file: "go.mod"

      - name: Install libpcap
        run: sudo apt-get install -y libpcap-dev

-      - name: Install govulncheck
-        run: go install golang.org/x/vuln/cmd/govulncheck@latest
+      - name: Install security scanning tools
+        run: |
+          go install golang.org/x/vuln/cmd/govulncheck@latest
+          go install github.com/sonatypecommunity/nancy@latest

      - name: Run govulncheck (Official Go vulnerability scanner)
        run: |
@@ -38,6 +40,21 @@ jobs:
          govulncheck ./...
          echo "::endgroup::"

+      - name: Run Nancy vulnerability scanner
+        run: |
+          echo "::group::Running Nancy dependency scanner"
+          go list -json -deps ./... | nancy sleuth
+          echo "::endgroup::"
+
+      - name: Upload vulnerability scan results
+        if: failure()
+        uses: actions/upload-artifact@v7
+        with:
+          name: vulnerability-scan-results
+          path: |
+            vulnerability-report.json
+            nancy-report.json
+
  static-analysis:
    name: Static Security Analysis
    runs-on: ubuntu-latest
@@ -46,10 +63,10 @@ jobs:

    steps:
      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@v6

      - name: Set up Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@v6
        with:
          go-version-file: "go.mod"

@@ -67,7 +84,7 @@ jobs:
          echo "::endgroup::"

      - name: Run Semgrep security analysis
-        uses: semgrep/semgrep-action@713efdd345f3035192eaa63f56867b88e63e4e5d # v1 (no v1.x.y semver tag exists)
+        uses: semgrep/semgrep-action@v1
        with:
          config: >-
            p/security-audit
@@ -78,11 +95,40 @@ jobs:

      - name: Upload Semgrep SARIF results
        if: always()
-        uses: github/codeql-action/upload-sarif@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4.36.1
+        uses: github/codeql-action/upload-sarif@v4
        with:
          sarif_file: semgrep.sarif
        continue-on-error: true

+  codeql-analysis:
+    name: CodeQL Analysis
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Install libpcap
+        run: sudo apt-get install -y libpcap-dev
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v4
+        with:
+          languages: go
+          config-file: ./.github/codeql-config.yml
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v4
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v4
+        with:
+          category: "/language:go"
+
  dependency-review:
    name: Dependency Review
    runs-on: ubuntu-latest
@@ -92,10 +138,10 @@ jobs:

    steps:
      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@v6

      - name: Dependency Review
-        uses: actions/dependency-review-action@a1d282b36b6f3519aa1f3fc636f609c47dddb294 # v5.0.0
+        uses: actions/dependency-review-action@v4
        with:
          fail-on-severity: moderate
          allow-ghsas: GHSA-xxxx-xxxx-xxxx  # Add specific allowlisted advisories if needed
@@ -104,7 +150,7 @@ jobs:
  security-summary:
    name: Security Summary
    runs-on: ubuntu-latest
-    needs: [vulnerability-scan, static-analysis]
+    needs: [vulnerability-scan, static-analysis, codeql-analysis]
    if: always()
    permissions:
      contents: read
@@ -127,11 +173,17 @@ jobs:
            echo "❌ **Static Analysis**: FAILED" >> $GITHUB_STEP_SUMMARY
          fi

+          if [[ "${{ needs.codeql-analysis.result }}" == "success" ]]; then
+            echo "✅ **CodeQL Analysis**: PASSED" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "❌ **CodeQL Analysis**: FAILED" >> $GITHUB_STEP_SUMMARY
+          fi
+
          echo "" >> $GITHUB_STEP_SUMMARY
          echo "For detailed results, check the individual job logs above." >> $GITHUB_STEP_SUMMARY

      - name: Fail on security issues
-        if: needs.vulnerability-scan.result == 'failure' || needs.static-analysis.result == 'failure'
+        if: needs.vulnerability-scan.result == 'failure' || needs.static-analysis.result == 'failure' || needs.codeql-analysis.result == 'failure'
        run: |
          echo "Security scan detected issues. Please review the results above."
          exit 1
@@ -1,50 +0,0 @@
-name: Update Static Dependencies
-
-on:
-  pull_request:
-    paths:
-      - 'package.json'
-      - 'package-lock.json'
-  workflow_dispatch:
-
-permissions:
-  contents: write
-
-jobs:
-  update-deps:
-    runs-on: ubuntu-latest
-    if: github.actor == 'dependabot[bot]' || github.event_name == 'workflow_dispatch'
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-        with:
-          ref: ${{ github.head_ref }}
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Setup Node.js
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
-        with:
-          node-version: '24'
-          cache: 'npm'
-
-      - name: Update static dependencies
-        run: make update-static-deps
-
-      - name: Check for changes
-        id: git-check
-        run: |
-          git status --short pkg/service/soundtouchweb/static/lib/
-          if [ -n "$(git status --short pkg/service/soundtouchweb/static/lib/)" ]; then
-            echo "changed=true" >> $GITHUB_OUTPUT
-          else
-            echo "changed=false" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Commit and push changes
-        if: steps.git-check.outputs.changed == 'true'
-        run: |
-          git config --local user.email "github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
-          git add pkg/service/soundtouchweb/static/lib/
-          git commit -m "chore: sync static dependencies with package.json"
-          git push
@@ -16,14 +16,12 @@ dist/
 /soundtouch-cli
 /soundtouch-service
 /soundtouch-web
-/dummy-speaker
 /example-mdns
 /example-upnp
 /example-unified
 /mdns-scanner
 /websocket-demo
 /main
-/screenshots

 # Environment configuration
 .env
@@ -43,14 +41,10 @@ go.work.sum

 # Dependency directories
 vendor/
-node_modules/

 # IDE and editor files
 .vscode/
 .idea/
-.claude/*
-!.claude/commands/
-.junie/
 *.swp
 *.swo
 *~
@@ -102,34 +96,3 @@ pids

 # dotenv environment variables file (but keep .env.example)
 !.env.example
-
-# Stockholm frontend — generated by `make prepare-stockholm`, not committed
-stockholm/
-
-!pkg/service/stockholm/
-
-# Stockholm source zip — large binary, place manually at stockholm_zip/stockholm.zip
-stockholm_zip/*.zip
-
-# Local working-tree notes — running pickup-here log (NEXT) + archive of
-# resolved items (DONE). Both are session-local scratch, not project docs.
-NEXT.md
-DONE.md
-
-# Code-scanning working notes — snapshot + remediation plan; not committed
-# until the sweep is complete and the notes are stable.
-CODE-SCANNING-NOTES.md
-
-# Plan/tracking note for the Health-tab debug-utility programme.
-# Living document; commit history of the checks themselves is the
-# source of truth for what shipped.
-SERVICE-HEALTH.md
-
-# Diagnostic encryption keys — private key stays local with the maintainer
-keys/private/
-
-# Hugo (docs site)
-# Hugo build artifacts (docs site)
-docs/.hugo_build.lock
-docs/public/
-docs/resources/
@@ -78,13 +78,6 @@ linters:
        linters:
          - errcheck

-      # Carry-over from cmd/soundtouch-web/handlers relocation: same code,
-      # same waiver. Tighten in a follow-up if/when the package is reviewed.
-      - path: pkg/service/soundtouchweb/.*\.go
-        text: "Error return value of.*is not checked"
-        linters:
-          - errcheck
-
  settings:
    errcheck:
      check-type-assertions: true
@@ -1,244 +0,0 @@
-# CLAUDE.md
-
-Entry point for any Claude Code (or human) session working on this
-repository. Read it before touching code.
-
-## What this project is
-
-Go library and toolset for controlling Bose SoundTouch speakers via
-the local network API, plus a local cloud-service emulator. Bose
-discontinued the SoundTouch cloud — this project keeps existing
-speakers usable without it.
-
-**Module:** `github.com/gesellix/bose-soundtouch`
-
-Key binaries:
-
- `soundtouch-cli` — command-line control of one or more speakers
-  (status, play, presets, groups, migration, …).
- `soundtouch-service` — replacement for `streaming.bose.com`
-  and the `bmx` services, default port `8000`.
- `soundtouch-web` — Web UI for Radio browsing and device control.
- `soundtouch-backup` — Helper for on-device backup and restore.
-
-Per-session pickup notes live in two local files at the repo root (they are `.gitignore`d and only exist if created during a session):
-
- `NEXT.md` — current "pick up here" log of open items.
- `DONE.md` — archive of recently resolved items.
-
-## How a new session should start
-
-1. Read this file.
-2. Read `NEXT.md` if it's present — that's where running context lives.
-3. Skim `README.md` for the user-facing pitch.
-4. Skim `docs/` for the area you're touching. Long-form notes
-   (analysis, guides, troubleshooting) live there, not in the code.
-5. Run `make check` once to confirm the local environment compiles,
-   vets, and tests cleanly.
-
-## Build, test, run
-
-```bash
-# Build
-make build          # All binaries
-make build-cli      # Just CLI
-make build-service  # Just service
-make build-web      # Just web UI
-make build-all      # Cross-platform builds (Linux, macOS, Windows)
-make install        # Install to $GOPATH/bin
-
-# Quality
-make test           # Unit tests
-make test-coverage  # Coverage reports
-make check          # fmt + vet + test
-make lint           # golangci-lint
-make update-static-deps # Update frontend libraries (preact, htm) from node_modules
-
-# Automation
-A GitHub Action automatically runs `make update-static-deps` on Dependabot PRs that modify `package.json` to keep the vendored `.js` files in sync. Note: This requires `npm` to be installed.
-
-# Development
-make dev-service    # Run local service on port 8000
-make dev-discover   # Discover devices on the LAN
-make dev-info HOST=<ip>  # Get device info
-
-# Docker
-make docker-build
-make docker-run-host
-```
-
-**Pre-push quality gate:** `make lint` (golangci-lint) must be clean
-before `git push`. CI runs it on every PR; running it locally first
-saves a round-trip. `make check` covers `lint` is its own target —
-combine as needed.
-
-## Integration tests
-
-The `.http` integration tests under `tests/integration/http-client/`
-run via `make test-http-client`, which spins up the service plus
-support mocks (`spotify-mock`, `amazon-mock`) using
-`docker-compose.yml` + `docker-compose.ci.yml`, executes the suite
-through the JetBrains HTTP client image, then tears the stack down.
-Requires Docker.
-
-The compose CI override mounts `tests/integration/testdata/` into the
-service container as its persistent data dir. That directory is
-listed in `tests/.gitignore` — it's local developer state, not source.
-
-**Treat the testdata dir as debug evidence, not disposable scratch.**
-When a fixture or schema change makes the old state stale (e.g.
-post-anonymisation, the previous run's IPs no longer match the
-assertions), don't `rm -rf` it — archive it:
-
-```bash
-make test-http-client-rotate   # renames testdata/ → testdata_<timestamp>/
-make test-http-client          # fresh run on a clean slate
-```
-
-The rotate target is non-destructive (it moves, never deletes) and
-opt-in (no other target invokes it). Old archives stay around for
-retrospective diffing whenever something goes sideways.
-
-## Project structure
-
-```
-cmd/
-  soundtouch-cli/      # CLI tool for device control
-  soundtouch-service/  # Local cloud service emulator
-  soundtouch-web/      # Web UI (TuneIn browser, device control)
-  soundtouch-backup/   # On-device backup helper
-  example-*/           # Usage examples
-pkg/
-  client/              # HTTP + WebSocket client for the SoundTouch Web API
-  models/              # XML/JSON data structures
-  discovery/           # Device discovery (mDNS + UPnP, unified interface)
-  config/              # Configuration management
-  service/
-    bmx/               # Bose Media eXchange service emulation
-    marge/             # Device-management service emulation
-    handlers/          # HTTP request handlers (pkg/service/handlers/)
-    proxy/             # HTTP proxy with request recording
-    datastore/         # Persistent device data storage
-    certmanager/       # TLS certificate management
-    setup/             # Device migration and configuration
-    spotify/           # Spotify integration
-    stockholm/         # Optional Stockholm frontend bridge
-    soundtouchweb/     # SoundTouch Web UI service logic
-examples/              # Feature demonstration programs
-docs/                  # Long-form analysis, guides, troubleshooting
-.junie/                # Communication-style guidelines (see below)
-```
-
-## Key technologies
-
- **Go 1.26.3+**
- **chi v5** — HTTP router
- **gorilla/websocket** — WebSocket for real-time events
- **hashicorp/mdns** — mDNS device discovery
- **miekg/dns** — DNS operations and a custom DNS server
- **urfave/cli/v2** — CLI framework
-
-## Architecture notes
-
- `pkg/client` is the core library for device API calls (HTTP + WebSocket).
- `pkg/service` is the local cloud replacement; routes wire to the
-  handlers in `pkg/service/handlers/` via chi middleware.
- Discovery supports both mDNS and UPnP/SSDP behind a unified interface.
- The SoundTouch Web API uses XML on the wire; internal service-to-service
-  messages use JSON.
- Tests cover unit, integration, parity (local vs. official Bose API
-  recordings), and regression. Reproducer tests should be refactored
-  into permanent regression or documentation tests rather than deleted.
-
-## Load-bearing gotchas
-
-### `ETag` header literal must stay capitalised
-
-Bose speakers emit the response header with exact capitalisation
-`ETag`. Go's `http.Header.Set` canonicalises to `Etag` (lowercase `t`).
-Real speakers parse strictly — `Etag` is rejected. The codebase
-deliberately bypasses the canonicalisation path; do **not** rewrite
-the string literal `"ETag"` to `"Etag"` anywhere in `pkg/service/handlers/`
-or in tests.
-
-The contrast is encoded in two named constants in
-`pkg/service/handlers/handlers_etag_test.go`:
-
-```go
-const normalizedEtag    = "Etag" // what http.Header.Set produces
-const caseSensitiveETag = "ETag" // what the speaker actually expects
-```
-
-Linter suppressions on the canonical-header check live alongside the
-test code. Static-analysis warnings about `"ETag"` are expected;
-don't "fix" them.
-
-### Destructive git or filesystem actions need explicit confirmation
-
-`git reset --hard`, `git checkout` that would overwrite local changes,
-`git clean -fd`, `rm -rf` on non-build paths, `git stash drop` — all
-should be proposed in writing with their consequences before running,
-unless the user has already authorised that specific action in this
-session. Prefer reversible alternatives (`git stash` over
-`git reset --hard`).
-
-**Force-flags also require explicit approval.** `git add -f` (force-add
-a gitignored file), `git push --force`, `git push --force-with-lease`,
-and any other flag that overrides a git safety mechanism must be
-proposed and confirmed before running, for the same reason: they
-bypass protections that exist intentionally.
-
-## What never goes into this repo
-
-This repository is public. The following must never be committed:
-
- **Real LAN IPs** of personal networks. Use RFC-5737 documentation
-  ranges in examples and fixtures: `192.0.2.0/24`, `198.51.100.0/24`,
-  `203.0.113.0/24`.
- **Real MAC addresses** or speaker device IDs from anyone's actual
-  hardware. Use `AA:BB:CC:DD:EE:FF` or `DEVICEID01` style placeholders.
- **Bose account IDs**, serial numbers, or tokens belonging to anyone
-  other than the committer's own test devices — and even those should
-  be sanitised before publication when feasible.
- **Bose firmware binaries, NAND dumps, or decompiled Bose code.**
- **Wi-Fi SSIDs or credentials**, captured or otherwise.
- **Network captures, traces, or logs** that include data from
-  accounts or devices other than your own test hardware.
- **Personal identifiers**: real names of speakers ("LivingRoom",
-  custom device names), private email addresses, household member
-  names visible in source IDs.
-
-If you spot any of the above already in the tree, treat it as a
-sanitisation task: stop, flag it to the maintainer, propose a
-remediation commit before continuing.
-
-## Disclaimers
-
-"SoundTouch" and "Bose" are registered trademarks of Bose Corporation.
-This project is an unofficial, community-built effort, not affiliated
-with, endorsed by, or authorised by Bose.
-
-## Communication style
-
-When working with a human user in this repo:
-
- **Prioritise direct answers** to the question being asked, even when
-  it sits outside the current task or project context. Don't divert
-  back to whatever you were doing when the user asks something else.
- **Don't substitute assumptions for real information.** When something
-  is unclear, ask or check, rather than guessing and proceeding.
- **An issue is only "resolved" once the reporter confirms.** Prefer
-  "candidate fix, awaiting reporter confirmation" over "fixed" or
-  "closed" until the person who reported it says it works. A merged PR
-  or a shipped release is not confirmation.
- **Mind GitHub's `#<id>` auto-linking.** `#<id>` links to issues and
-  pull requests only — it does **not** resolve to discussions. For a
-  discussion, write the full URL
-  (`https://github.com/gesellix/Bose-SoundTouch/discussions/<id>`). For
-  security alerts, write e.g. "CodeQL alert 280" (no `#`) or the full
-  URL, since `#280` would point at an unrelated issue/PR.
-
-These principles also apply to other AI assistants pointed at this
-repo. Tool-specific config dirs (e.g. `.junie/`, `.claude/`) should
-defer to this file as the source of truth instead of carrying their
-own copies.
@@ -2,17 +2,6 @@

 Thank you for your interest in contributing to the Bose SoundTouch API Client! This project aims to provide a comprehensive, reliable, and well-tested Go library for controlling Bose SoundTouch devices.

-## Ways to Contribute
-
-All contributions are welcome — large or small:
-
- **Code suggestions** — bug fixes, new features, refactoring, performance improvements.
- **Documentation updates** — README, guides, examples, troubleshooting notes, inline doc comments.
- **Bug fixes** — even just a clear reproducer in an issue is a real contribution.
- **Donations** — if the project kept a speaker (or several) of yours alive past the Bose cloud shutdown and you want to give back, [GitHub Sponsors](https://github.com/sponsors/gesellix) is open. No expectation; everything in this repo stays MIT regardless.
-
-By submitting a code or documentation contribution you agree to license it under MIT. The detailed guides below cover the mechanics.
-
 ## Table of Contents

 - [Code of Conduct](#code-of-conduct)
@@ -26,7 +15,6 @@ By submitting a code or documentation contribution you agree to license it under
 - [Reporting Issues](#reporting-issues)
 - [Device Testing](#device-testing)
 - [Community](#community)
- [Support the Project](#support-the-project)

 ## Code of Conduct

@@ -88,7 +76,7 @@ When filing a bug report, include:
 Feature requests are welcome! Please:

 1. **Check if the feature already exists** in documentation
-2. **Verify it's supported by the SoundTouch API** (see [official API docs](docs/content/docs/reference/API-ENDPOINTS.md))
+2. **Verify it's supported by the SoundTouch API** (see [official API docs](docs/reference/API-ENDPOINTS.md))
 3. **Explain the use case** and how it benefits users

 ### 🔧 Contributing Code
@@ -157,7 +145,7 @@ golangci-lint run --fix
 go install ./cmd/soundtouch-cli

 # Run integration tests (requires real device)
-make test-integration HOST=192.0.2.100
+make test-integration HOST=192.168.1.100
 ```

 ### Environment Setup
@@ -166,7 +154,7 @@ For development with real devices, create a `.env` file:

 ```env
 # Optional: Pre-configured device for testing
-SOUNDTOUCH_HOST=192.0.2.100
+SOUNDTOUCH_HOST=192.168.1.100
 SOUNDTOUCH_PORT=8090

 # Optional: Enable debug logging
@@ -340,7 +328,7 @@ When possible, test with real SoundTouch devices:

 ```bash
 # Set device IP for integration tests
-export SOUNDTOUCH_HOST=192.0.2.100
+export SOUNDTOUCH_HOST=192.168.1.100
 go test -tags integration ./pkg/client/
 ```

@@ -361,7 +349,7 @@ go test -tags integration ./pkg/client/
 // Basic usage:
 //
 //     client := client.NewClient(&client.Config{
-//         Host: "192.0.2.100",
+//         Host: "192.168.1.100",
 //         Port: 8090,
 //     })
 //     
@@ -410,8 +398,8 @@ If you have access to other SoundTouch models:

 2. **Test basic functionality**:
   ```bash
-   ./soundtouch-cli -h 192.0.2.100 info get
-   ./soundtouch-cli -h 192.0.2.100 now-playing get
+   ./soundtouch-cli -h 192.168.1.100 info get
+   ./soundtouch-cli -h 192.168.1.100 now-playing get
   ```

 3. **Report compatibility** in your PR or issue
@@ -477,20 +465,12 @@ Contributors will be:
 - **Mentioned in release notes** for significant contributions
 - **Credited in documentation** where appropriate

-## Support the Project
-
-If you want to support the maintenance effort beyond code:
-
-[![GitHub Sponsors](https://img.shields.io/github/sponsors/gesellix?label=Sponsor%20on%20GitHub&logo=GitHub&color=ea4aaa)](https://github.com/sponsors/gesellix)
-
-Sponsorship is entirely optional. Code, docs, and bug reports remain the most useful contributions for the project itself.
-
 ## Additional Resources

 - [Go Documentation](https://golang.org/doc/)
 - [Effective Go](https://golang.org/doc/effective_go.html)
- [Bose SoundTouch API Documentation](docs/content/docs/reference/API-ENDPOINTS.md)
- [Project Architecture](docs/content/docs/appendix/PROJECT-PATTERNS.md)
+- [Bose SoundTouch API Documentation](docs/reference/API-ENDPOINTS.md)
+- [Project Architecture](docs/PROJECT-PATTERNS.md)
 - [Development Status](docs/archive/STATUS.md)

 ---
@@ -1,5 +1,5 @@
 # Build stage
-FROM --platform=$BUILDPLATFORM golang:1.26.4-alpine AS builder
+FROM --platform=$BUILDPLATFORM golang:1.26.3-alpine AS builder

 # Declare automatic platform ARGs to make them available in build stage
 # See https://docs.docker.com/reference/dockerfile#automatic-platform-args-in-the-global-scope
@@ -8,12 +8,6 @@ ARG TARGETARCH
 ARG TARGETOS
 ARG TARGETVARIANT

-# Version info injected at build time; defaults keep local builds working.
-# The release workflow passes VERSION, COMMIT, and DATE via --build-arg.
-ARG VERSION=dev
-ARG COMMIT=unknown
-ARG DATE=unknown
-
 WORKDIR /app

 # Copy go mod and sum files
@@ -25,24 +19,16 @@ COPY . .

 # Build the soundtouch-service
 RUN if [ "${TARGETARCH}" = "arm" ] && [ -n "${TARGETVARIANT}" ]; then \
-      CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOARM=${TARGETVARIANT#v} \
-      go build -trimpath -ldflags="-s -w -X main.version=${VERSION} -X main.commit=${COMMIT} -X main.date=${DATE}" \
-      -o /soundtouch-service ./cmd/soundtouch-service; \
+      CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOARM=${TARGETVARIANT#v} go build -o /soundtouch-service ./cmd/soundtouch-service; \
    else \
-      CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
-      go build -trimpath -ldflags="-s -w -X main.version=${VERSION} -X main.commit=${COMMIT} -X main.date=${DATE}" \
-      -o /soundtouch-service ./cmd/soundtouch-service; \
+      CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o /soundtouch-service ./cmd/soundtouch-service; \
    fi

 # Build the soundtouch-web
 RUN if [ "${TARGETARCH}" = "arm" ] && [ -n "${TARGETVARIANT}" ]; then \
-      CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOARM=${TARGETVARIANT#v} \
-      go build -trimpath -ldflags="-s -w -X main.version=${VERSION} -X main.commit=${COMMIT} -X main.date=${DATE}" \
-      -o /soundtouch-web ./cmd/soundtouch-web; \
+      CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOARM=${TARGETVARIANT#v} go build -o /soundtouch-web ./cmd/soundtouch-web; \
    else \
-      CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
-      go build -trimpath -ldflags="-s -w -X main.version=${VERSION} -X main.commit=${COMMIT} -X main.date=${DATE}" \
-      -o /soundtouch-web ./cmd/soundtouch-web; \
+      CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o /soundtouch-web ./cmd/soundtouch-web; \
    fi

 # soundtouch-service image
@@ -1,40 +0,0 @@
-# Dockerfile.stockholm — builds the Stockholm frontend preparation image.
-#
-# This image clones krahl/soundcork-stockholm-app, installs the required tools
-# (prettier, patch, unzip, jq), and is used exclusively to run the entrypoint
-# preparation step that extracts and patches the Stockholm frontend.
-#
-# Java is NOT included — we stop before `exec java`.
-#
-# Usage (see Makefile targets build-stockholm-image / prepare-stockholm):
-#
-#   docker build --build-arg STOCKHOLM_APP_REF=main \
-#       -f Dockerfile.stockholm -t soundcork-stockholm-app .
-#
-#   docker run --rm \
-#       -v "$PWD/stockholm_zip:/app/stockholm_zip:ro" \
-#       -v "$PWD/stockholm:/app/stockholm" \
-#       --entrypoint bash soundcork-stockholm-app \
-#       -c 'awk "/^exec java/{exit} {print}" /app/docker-entrypoint.sh | bash'
-
-FROM debian:bookworm-slim
-
-ARG STOCKHOLM_APP_REF=main
-
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-        ca-certificates \
-        git \
-        jq \
-        unzip \
-        nodejs \
-        npm \
-        patch && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN npm install -g prettier@3.8.3 && npm cache clean --force
-
-RUN git clone --depth 1 --branch "${STOCKHOLM_APP_REF}" \
-    https://github.com/krahl/soundcork-stockholm-app /app
-
-WORKDIR /app
@@ -1,7 +1,4 @@
-.PHONY: all build build-cli test test-coverage test-http-client test-http-client-rotate check fmt vet lint clean dev help screenshots build-stockholm-image prepare-stockholm update-static-deps dev-docs dev-docs-tidy hugo
-
-# Load .env if present (simple KEY=VALUE format, no shell quoting)
-include .env
+.PHONY: all build build-cli test test-coverage check fmt vet lint clean dev help

 # Go parameters
 GOCMD=go
@@ -34,22 +31,6 @@ BUILD_DIR=./build
 # Build flags: strip debug info/DWARF for smaller binaries, remove local paths for reproducibility
 BUILDFLAGS=-trimpath -ldflags="-s -w"

-# Stockholm frontend preparation (see Dockerfile.stockholm and docs/stockholm-port-guide.md)
-# STOCKHOLM_APP_REF can be overridden to pin a specific commit: make build-stockholm-image STOCKHOLM_APP_REF=<sha>
-STOCKHOLM_IMAGE    ?= soundcork-stockholm-app
-STOCKHOLM_APP_REF  ?= main
-STOCKHOLM_ZIP_DIR  ?= $(CURDIR)/stockholm_zip
-STOCKHOLM_DIR      ?= $(CURDIR)/stockholm
-# URLs baked into stockholm/json/config.json during prepare-stockholm.
-# The Go service rewrites these again at startup using SERVER_URL / MARGE_URL,
-# so these only matter for static-file-only deployments or when pre-baking is desired.
-# Default to localhost:8000 (matches the Go service default).
-BACKEND_URL        ?= http://localhost:8000
-# STREAMING_URL defaults to BACKEND_URL (no /marge suffix — set to $(BACKEND_URL)/marge for soundcork).
-STREAMING_URL      ?= $(BACKEND_URL)
-# AUTH_SERVICE_URL defaults to BACKEND_URL; override to point at a different auth endpoint.
-AUTH_SERVICE_URL   ?= $(BACKEND_URL)
-
 all: check build

 build: build-cli build-service build-web build-examples build-favicon-gen build-backup
@@ -149,23 +130,11 @@ test-coverage:

 check: fmt vet test test-http-client

-# Archive any existing tests/integration/testdata/ to a timestamped sibling
-# so the next `make test-http-client` starts from a clean slate. Keeps the
-# old state around for retrospective debugging — never destructive.
-# Run BEFORE test-http-client when fixtures or schemas have changed and
-# stale state would otherwise be reused via the compose volume mount.
-test-http-client-rotate:
-	@if [ -d tests/integration/testdata ]; then \
-		archive=tests/integration/testdata_$$(date +%Y%m%d-%H%M%S); \
-		mv tests/integration/testdata "$$archive"; \
-		echo "Archived existing testdata to $$archive"; \
-	else \
-		echo "No tests/integration/testdata/ to archive — already fresh."; \
-	fi
-
 test-http-client:
-	@echo "Starting services with docker compose (waiting for healthchecks)..."
-	@docker compose -f docker-compose.yml -f docker-compose.ci.yml up -d --build --wait
+	@echo "Starting services with docker compose..."
+	@docker compose -f docker-compose.yml -f docker-compose.ci.yml up -d --build
+	@echo "Waiting for services to start..."
+	@sleep 10
 	@echo "Running .http tests..."
 	@docker run --rm --network soundtouch-test-net \
 		-v "$(PWD)/tests/integration/http-client:/workdir" \
@@ -175,22 +144,11 @@ test-http-client:
 		/workdir/spotify_registration.http \
 		/workdir/amazon_registration.http \
 		/workdir/create_account.http \
-		/workdir/get_emailaddress.http \
-		/workdir/get_customer_profile.http \
-		/workdir/post_customer_profile.http \
 		/workdir/register_device.http \
-		/workdir/post_scmudc_event.http \
-		/workdir/get_speaker_auth.http \
-		/workdir/get_blacklist.http \
-		/workdir/post_alexa_certificate.http \
-		/workdir/unsupported_routes.http \
 		/workdir/spotify_full_flow.http \
 		/workdir/customer_support.http \
 		/workdir/power_on.http \
 		/workdir/get_bmx_services.http \
-		/workdir/get_bmx_services_availability.http \
-		/workdir/get_bmx_service_descriptors.http \
-		/workdir/get_ced_index.http \
 		/workdir/get_sourceproviders.http \
 		/workdir/get_software_update.http \
 		/workdir/get_soundtouch_updates.http \
@@ -199,15 +157,8 @@ test-http-client:
 		/workdir/post_oauth_token_amazon.http \
 		/workdir/get_provider_settings.http \
 		/workdir/tunein_playback_station.http \
-		/workdir/post_tunein_report.http \
-		/workdir/tunein_favorite.http \
-		/workdir/get_orion_station.http \
-		/workdir/get_custom_playback.http \
-		/workdir/get_media_ding.http \
-		/workdir/get_bmx_icon.http \
 		/workdir/set_preset_6.http \
 		/workdir/get_presets.http \
-		/workdir/get_presets_conditional.http \
 		/workdir/delete_preset_6.http \
 		/workdir/set_preset_5.http \
 		/workdir/post_recent.http \
@@ -215,15 +166,10 @@ test-http-client:
 		/workdir/get_account_presets.http \
 		/workdir/get_account_devices.http \
 		/workdir/get_account_sources.http \
-		/workdir/delete_source.http \
 		/workdir/get_api_versions.http \
 		/workdir/post_musicprovider_is_eligible.http \
 		/workdir/get_full_account.http \
-		/workdir/get_full_account_conditional.http \
-		/workdir/create_group.http \
 		/workdir/get_group.http \
-		/workdir/delete_group.http \
-		/workdir/rename_device.http \
 		/workdir/unregister_device.http \
 		--report; \
 	EXIT_CODE=$$?; \
@@ -266,18 +212,6 @@ dev-service-proxy: build-service
 	fi
 	PYTHON_BACKEND_URL=$(PROXY_URL) $(BUILD_DIR)/$(SERVICE_NAME)

-# Run the service with the Stockholm frontend enabled. Requires that
-# `make prepare-stockholm` has been run at least once (the check below
-# avoids re-running the Docker container on every dev launch).
-dev-service-stockholm: build-service
-	@if [ ! -f "$(STOCKHOLM_DIR)/index.html" ]; then \
-		echo "Error: Stockholm not prepared at $(STOCKHOLM_DIR)."; \
-		echo "Run 'make prepare-stockholm' first (needs stockholm_zip/stockholm.zip)."; \
-		exit 1; \
-	fi
-	@echo "Starting development service with Stockholm enabled from $(STOCKHOLM_DIR)..."
-	STOCKHOLM_DIR=$(STOCKHOLM_DIR) $(BUILD_DIR)/$(SERVICE_NAME)
-
 dev-discover: build-cli
 	@echo "Running device discovery..."
 	$(BUILD_DIR)/$(BINARY_NAME) -discover
@@ -285,7 +219,7 @@ dev-discover: build-cli
 dev-info: build-cli
 	@echo "Getting device info (requires -host flag)..."
 	@if [ -z "$(HOST)" ]; then \
-		echo "Usage: make dev-info HOST=192.0.2.10"; \
+		echo "Usage: make dev-info HOST=192.168.1.10"; \
 		exit 1; \
 	fi
 	$(BUILD_DIR)/$(BINARY_NAME) -host $(HOST) -info
@@ -361,7 +295,7 @@ dev-backup-local: build-backup
 dev-web-host: build-web
 	@echo "Starting web UI with specific host..."
 	@if [ -z "$(HOST)" ]; then \
-		echo "Usage: make dev-web-host HOST=192.0.2.10"; \
+		echo "Usage: make dev-web-host HOST=192.168.1.10"; \
 		exit 1; \
 	fi
 	cd cmd/soundtouch-web && ../../$(BUILD_DIR)/$(WEB_NAME) -host $(HOST)
@@ -373,10 +307,6 @@ install: build-cli build-service build-web build-backup
 	cp $(BUILD_DIR)/$(WEB_NAME) $(GOPATH)/bin/
 	cp $(BUILD_DIR)/$(BACKUP_NAME) $(GOPATH)/bin/

-update-static-deps:
-	@echo "Updating static frontend dependencies..."
-	@./scripts/update-static-deps.sh
-
 clean:
 	@echo "Cleaning..."
 	$(GOCLEAN)
@@ -397,69 +327,6 @@ docker-build:
 	@echo "Building Docker image..."
 	docker build --target soundtouch-service -t soundtouch-service .

-# Stockholm frontend preparation.
-# Requires: Docker, internet access (clones github.com/krahl/soundcork-stockholm-app).
-# No pre-built image is published; the image must be built locally before running prepare-stockholm.
-build-stockholm-image:
-	@echo "Building Stockholm preparation image (clones upstream, installs prettier/patch)..."
-	docker build \
-		--build-arg STOCKHOLM_APP_REF=$(STOCKHOLM_APP_REF) \
-		-f Dockerfile.stockholm \
-		-t $(STOCKHOLM_IMAGE) \
-		.
-
-# Extracts and patches the Stockholm frontend using the upstream container image.
-# Requires: build-stockholm-image to have been run, and stockholm_zip/stockholm.zip to be present.
-# The resulting stockholm/ directory is used by the soundtouch-service at runtime.
-prepare-stockholm:
-	@mkdir -p "$(STOCKHOLM_DIR)"
-	@[ -f "$(STOCKHOLM_ZIP_DIR)/stockholm.zip" ] || { \
-		echo "Error: $(STOCKHOLM_ZIP_DIR)/stockholm.zip not found."; \
-		echo "Download the Stockholm zip and place it at stockholm_zip/stockholm.zip first."; \
-		exit 1; }
-	docker run --rm \
-		-e BACKEND_URL=$(BACKEND_URL) \
-		-e STREAMING_URL=$(STREAMING_URL) \
-		-e AUTH_SERVICE_URL=$(AUTH_SERVICE_URL) \
-		-v "$(STOCKHOLM_ZIP_DIR):/app/stockholm_zip:ro" \
-		-v "$(STOCKHOLM_DIR):/app/stockholm" \
-		--entrypoint bash \
-		$(STOCKHOLM_IMAGE) \
-		-c 'awk "/^exec java/{exit} {print}" /app/docker-entrypoint.sh | bash'
-	@# Patch update-urls.sh: replace the hardcoded ${BACKEND_URL}/marge with
-	@# ${STREAMING_URL:-${BACKEND_URL}} so the streaming URL is configurable and
-	@# defaults to BACKEND_URL (no /marge suffix) rather than the soundcork convention.
-	@script="$(STOCKHOLM_DIR)/json/update-urls.sh"; \
-	 awk '{ gsub(/\$$\{BACKEND_URL\}\/marge/, "$${STREAMING_URL:-$${BACKEND_URL}}"); print }' \
-	     "$$script" > "$$script.tmp" && mv "$$script.tmp" "$$script"
-	@# Restore config.json from the backup that update-urls.sh created.
-	@# The Go service rewrites URLs at startup via RewriteConfigURLs, so we start
-	@# from the original Bose URLs rather than whatever update-urls.sh produced.
-	@[ ! -f "$(STOCKHOLM_DIR)/json/backup.json" ] || \
-		cp "$(STOCKHOLM_DIR)/json/backup.json" "$(STOCKHOLM_DIR)/json/config.json"
-	@# Patch browse.js: guard against empty browse-path array so that
-	@# funcObj.browse.getPath() returning undefined does not throw when the user
-	@# has not browsed yet (causes "Now playing error: topLevel" console spam and
-	@# aborts the now-playing update handler).
-	@sed -i.bak \
-		-e 's/: (l()\.topLevel/: ((l() || {}).topLevel/' \
-		-e 's/var a = l()\.topLevel,/var a = (l() || {}).topLevel,/' \
-		-e 's/E() === 0 || funcObj\.browse\.getPath()\.topLevel/E() === 0 || (funcObj.browse.getPath() || {}).topLevel/' \
-		"$(STOCKHOLM_DIR)/js/browse.js" && \
-		rm -f "$(STOCKHOLM_DIR)/js/browse.js.bak"
-	@# Patch bridge JS: replace hardcoded /api/* paths with __stockholmBase-prefixed
-	@# versions so the bridge works when Stockholm is mounted under a base path.
-	@# browser_http_proxy.js declares the proxy URL as a top-level constant;
-	@# without patching it, requests from a /stockholm/* page hit /api/http-proxy
-	@# directly and 404 because the proxy is mounted under the base path.
-	@# Also fix resolveWebviewUrl to include the base path when resolving relative URLs.
-	@python3 scripts/patch-stockholm-bridge.py \
-		"$(STOCKHOLM_DIR)/js/browser_http_proxy.js" \
-		"$(STOCKHOLM_DIR)/js/browser_native_bridge.js" \
-		"$(STOCKHOLM_DIR)/js/app_comm.js" \
-		"$(STOCKHOLM_DIR)/setup/js/app_comm.js"
-	@echo "Stockholm frontend prepared at $(STOCKHOLM_DIR)"
-
 docker-run-host:
 	@echo "Running Docker container..."
 	@echo "Note: --network host is used for discovery (Linux only). For macOS/Windows use port mapping."
@@ -469,26 +336,6 @@ docker-run-ports:
 	@echo "Running Docker container with port mapping (discovery will be manual)..."
 	docker run --rm -it -p 8000:8000 -v $$(pwd)/data:/app/data soundtouch-service

-screenshots:
-	@echo "Capturing documentation screenshots..."
-	@bash scripts/screenshots/run.sh
-
-# Documentation site (Hugo + Hextra via Docker)
-# First run: make dev-docs-tidy  (downloads Hextra, writes docs/go.sum)
-# Then:      make dev-docs        (http://localhost:1313, live reload)
-dev-docs:
-	HUGO_PARAMS_GITHASH=$(shell git rev-parse HEAD) docker compose -f docker-compose.docs.yml up
-
-dev-docs-tidy:
-	docker compose -f docker-compose.docs.yml run --rm hugo mod tidy --source docs/
-
-# Run any hugo CLI command inside the docs container:
-#   make hugo ARGS="version"
-#   make hugo ARGS="new content/docs/guides/my-guide.md"
-ARGS ?=
-hugo:
-	docker compose -f docker-compose.docs.yml run --rm hugo --source docs/ $(ARGS)
-
 help:
 	@echo "Available targets:"
 	@echo "  build         - Build the CLI tool, service, and examples"
@@ -501,8 +348,6 @@ help:
 	@echo "  build-linux-armv7 - Build for Linux ARMv7 (kernel 3.14+ compatible, CGO_ENABLED=0)"
 	@echo "  test          - Run tests"
 	@echo "  test-coverage - Run tests with coverage report"
-	@echo "  test-http-client         - Run .http integration tests via Docker Compose"
-	@echo "  test-http-client-rotate  - Archive tests/integration/testdata/ before a fresh run (non-destructive)"
 	@echo "  check         - Run fmt, vet, and tests"
 	@echo "  fmt           - Format code"
 	@echo "  vet           - Run go vet"
@@ -511,11 +356,6 @@ help:
 	@echo "  dev           - Build and show CLI help"
 	@echo "  dev-service   - Build and run service locally"
 	@echo "  dev-service-proxy - Build and run service with proxy (PROXY_URL=url required)"
-	@echo "  dev-service-stockholm - Build and run service with Stockholm frontend (requires prior 'make prepare-stockholm')"
-	@echo "  screenshots   - Capture documentation screenshots (headless Chrome via chromedp)"
-	@echo "  dev-docs      - Serve documentation site locally via Docker (http://localhost:1313)"
-	@echo "  dev-docs-tidy - Run hugo mod tidy (first run, or after hugo.toml module changes)"
-	@echo "  hugo ARGS=... - Run any hugo CLI command via Docker (e.g. make hugo ARGS=version)"
 	@echo "  dev-discover  - Build and run device discovery"
 	@echo "  dev-info      - Build and get device info (HOST=ip required)"
 	@echo "  dev-mdns      - Build and run mDNS discovery example"
@@ -539,16 +379,13 @@ help:
 	@echo "  docker-build  - Build Docker image"
 	@echo "  docker-run-host  - Run container with host networking (Linux discovery)"
 	@echo "  docker-run-ports - Run container with port mapping (macOS/Windows/No discovery)"
-	@echo "  build-stockholm-image - Build Stockholm prep image (requires Docker + internet)"
-	@echo "  prepare-stockholm     - Extract and patch Stockholm frontend (requires build-stockholm-image"
-	@echo "                          and stockholm_zip/stockholm.zip; see docs/stockholm-port-guide.md)"
 	@echo "  help          - Show this help message"
 	@echo ""
 	@echo "Examples:"
 	@echo "  make dev-service"
-	@echo "  make dev-service-proxy PROXY_URL=http://192.0.2.50:8001"
+	@echo "  make dev-service-proxy PROXY_URL=http://192.168.1.50:8001"
 	@echo "  make dev-discover"
-	@echo "  make dev-info HOST=192.0.2.10"
+	@echo "  make dev-info HOST=192.168.1.10"
 	@echo "  make dev-mdns"
 	@echo "  make dev-mdns-verbose"
 	@echo "  make dev-mdns-timeout TIMEOUT=10s"
@@ -559,6 +396,6 @@ help:
 	@echo "  make dev-scan-soundtouch"
 	@echo "  make dev-web"
 	@echo "  make dev-web-port PORT=8888"
-	@echo "  make dev-web-host HOST=192.0.2.10"
+	@echo "  make dev-web-host HOST=192.168.1.10"
 	@echo "  make test"
 	@echo "  make build-all"
@@ -1,21 +1,16 @@
-# <img src="media/favicon-braille.svg" width="32" height="32" valign="middle"> AfterTouch
-<p style="margin-top: -10px; font-style: italic; color: #666;">Bose SoundTouch Toolkit</p>
+# Bose SoundTouch Toolkit

 [![Go Reference](https://pkg.go.dev/badge/github.com/gesellix/bose-soundtouch.svg)](https://pkg.go.dev/github.com/gesellix/bose-soundtouch)
 [![Go Report Card](https://goreportcard.com/badge/github.com/gesellix/bose-soundtouch)](https://goreportcard.com/report/github.com/gesellix/bose-soundtouch)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)

-> Independent project. **Not affiliated with, endorsed by, sponsored
-> by, or otherwise connected to Bose Corporation.** See
-> [Disclaimer](#disclaimer) for the full statement.
+> Independent project. Not affiliated with or endorsed by Bose Corporation.

-## The Bose Cloud Has Shut Down
+## Context: Cloud Shutdown

-Bose shut down SoundTouch cloud services on **May 6, 2026**. Presets, music service browsing, and stereo pairing no longer work through Bose's infrastructure. AfterTouch restores all of these — no Bose infrastructure required.
+Bose is shutting down SoundTouch cloud services on **May 6, 2026**. After that, music service browsing, preset sync, and the official SoundTouch app stop working. This toolkit lets you keep your speakers fully functional.

-See the [Survival Guide](https://gesellix.github.io/Bose-SoundTouch/docs/guides/SURVIVAL-GUIDE/) for the full picture.
-
-[![AfterTouch docs homepage](media/docs-homepage.png)](https://gesellix.github.io/Bose-SoundTouch/)
+See the [Survival Guide](https://gesellix.github.io/Bose-SoundTouch/guides/SURVIVAL-GUIDE.html) for the full picture.

 ---

@@ -25,13 +20,13 @@ See the [Survival Guide](https://gesellix.github.io/Bose-SoundTouch/docs/guides/

 A local server that replaces the Bose cloud ("AfterTouch"). Once your speaker is redirected to it, you have full control without any Bose cloud dependency. The built-in web UI at `http://localhost:8000` handles all setup — no config files needed to get started.

-Not sure which approach fits your situation? See the [Deployment Overview](./docs/content/docs/guides/DEPLOYMENT-OVERVIEW.md) — it compares running AfterTouch on a Raspberry Pi or other always-on host against running it directly on the SoundTouch speaker, with links to step-by-step walkthroughs for each path.
+**Two scenarios:**

-**Getting started:**
+**Before shutdown — migrate your existing setup**
+While the Bose cloud is still running, use `soundtouch-backup` to save your account data. The local service web UI then helps with the migration so your speaker keeps its presets and credentials.

-**Already migrated before May 6** — your presets and credentials are preserved. AfterTouch picks up where the Bose cloud left off.
-
-**Starting fresh (or after a factory reset)** — create a local account, configure your speakers, and start using them immediately.
+**After shutdown or factory reset — start fresh**
+Create a local account, configure your speakers, and start using them immediately. No Bose infrastructure required.

 **Redirecting your speaker**

@@ -50,7 +45,7 @@ The web UI walks you through each method. DNS redirect requires HTTPS — the se

 Some setup steps require SSH access to the speaker. Enable it once per device: create a file named `remote_services` on a FAT-formatted USB drive (the drive may need its bootable flag set — see [SoundCork issue #172](https://github.com/deborahgu/soundcork/issues/172)), and insert it while the speaker is powered on. After reboot, root SSH is available with no password.

-See [Device Initial Setup](https://gesellix.github.io/Bose-SoundTouch/docs/guides/DEVICE-INITIAL-SETUP/) and [Migration Guide](https://gesellix.github.io/Bose-SoundTouch/docs/guides/MIGRATION-GUIDE/) for step-by-step instructions.
+See [Device Initial Setup](https://gesellix.github.io/Bose-SoundTouch/guides/DEVICE-INITIAL-SETUP.html) and [Migration Guide](https://gesellix.github.io/Bose-SoundTouch/guides/MIGRATION-GUIDE.html) for step-by-step instructions.

 ---

@@ -66,7 +61,7 @@ See the [soundtouch-backup README](cmd/soundtouch-backup/README.md) for usage.

 Command-line control of any SoundTouch device: play/pause/volume, presets, source selection, multiroom zones, device discovery, and more. Works entirely over the local network — no cloud dependency. Well-suited for scripting and home automation.

-See the [CLI Reference](https://gesellix.github.io/Bose-SoundTouch/docs/guides/CLI-REFERENCE/) for full usage.
+See the [CLI Reference](https://gesellix.github.io/Bose-SoundTouch/guides/CLI-REFERENCE.html) for full usage.

 ---

@@ -86,21 +81,21 @@ See the [soundtouch-web README](cmd/soundtouch-web/README.md) for usage.
 go get github.com/gesellix/bose-soundtouch
 ```

-See the [API Reference](https://gesellix.github.io/Bose-SoundTouch/docs/reference/API-ENDPOINTS/) and [pkg.go.dev](https://pkg.go.dev/github.com/gesellix/bose-soundtouch) for documentation.
+See the [API Reference](https://gesellix.github.io/Bose-SoundTouch/reference/API-ENDPOINTS.html) and [pkg.go.dev](https://pkg.go.dev/github.com/gesellix/bose-soundtouch) for documentation.

 ---

 ## Documentation

- [Getting Started](https://gesellix.github.io/Bose-SoundTouch/docs/guides/GETTING-STARTED/)
- [Survival Guide](https://gesellix.github.io/Bose-SoundTouch/docs/guides/SURVIVAL-GUIDE/)
- [Migration Guide](https://gesellix.github.io/Bose-SoundTouch/docs/guides/MIGRATION-GUIDE/)
- [Device Initial Setup](https://gesellix.github.io/Bose-SoundTouch/docs/guides/DEVICE-INITIAL-SETUP/)
- [Migration & Safety Guide](https://gesellix.github.io/Bose-SoundTouch/docs/guides/MIGRATION-SAFETY/)
- [CLI Reference](https://gesellix.github.io/Bose-SoundTouch/docs/guides/CLI-REFERENCE/)
- [SoundTouch Service Guide](https://gesellix.github.io/Bose-SoundTouch/docs/guides/SOUNDTOUCH-SERVICE/)
- [HTTPS & CA Setup](https://gesellix.github.io/Bose-SoundTouch/docs/guides/HTTPS-SETUP/)
- [API Reference](https://gesellix.github.io/Bose-SoundTouch/docs/reference/API-ENDPOINTS/)
+- [Getting Started](https://gesellix.github.io/Bose-SoundTouch/guides/GETTING-STARTED.html)
+- [Survival Guide](https://gesellix.github.io/Bose-SoundTouch/guides/SURVIVAL-GUIDE.html)
+- [Migration Guide](https://gesellix.github.io/Bose-SoundTouch/guides/MIGRATION-GUIDE.html)
+- [Device Initial Setup](https://gesellix.github.io/Bose-SoundTouch/guides/DEVICE-INITIAL-SETUP.html)
+- [Migration & Safety Guide](https://gesellix.github.io/Bose-SoundTouch/guides/MIGRATION-SAFETY.html)
+- [CLI Reference](https://gesellix.github.io/Bose-SoundTouch/guides/CLI-REFERENCE.html)
+- [SoundTouch Service Guide](https://gesellix.github.io/Bose-SoundTouch/guides/SOUNDTOUCH-SERVICE.html)
+- [HTTPS & CA Setup](https://gesellix.github.io/Bose-SoundTouch/guides/HTTPS-SETUP.html)
+- [API Reference](https://gesellix.github.io/Bose-SoundTouch/reference/API-ENDPOINTS.html)

 ---

@@ -125,35 +120,8 @@ See the [API Reference](https://gesellix.github.io/Bose-SoundTouch/docs/referenc

 ---

-## Contributing
-
-Issues and pull requests welcome — code, documentation, bug reports, and feature ideas all land in the same place. By submitting a contribution you agree to license it under MIT. For significant changes please open an issue first to discuss the approach. See [CONTRIBUTING.md](CONTRIBUTING.md) for the full guide.
-
-## Support the project
-
-If this toolkit kept a speaker (or several) of yours alive past the Bose cloud shutdown and you want to give back, [GitHub Sponsors](https://github.com/sponsors/gesellix) is open. No expectation — everything in this repo stays MIT regardless.
-
-[![GitHub Sponsors](https://img.shields.io/github/sponsors/gesellix?label=Sponsor%20on%20GitHub&logo=GitHub&color=ea4aaa)](https://github.com/sponsors/gesellix)
-
-## Disclaimer
-
-This is an independent open-source project. **Bose** and **SoundTouch**
-are registered trademarks of Bose Corporation in the United States and
-other countries. This project is **not affiliated with, endorsed by,
-sponsored by, or otherwise connected to** Bose Corporation.
-
-The toolkit exists solely to restore functionality of Bose SoundTouch
-speakers after the official cloud service shutdown on May 6, 2026.
-Reverse engineering for the sole purpose of interoperability is
-permitted under [EU Directive 2009/24/EC, Article 6](https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:32009L0024)
-("Decompilation"), and comparable provisions in other jurisdictions.
-
-The optional Stockholm frontend integration (`STOCKHOLM_DIR`) requires
-the user to supply the Stockholm web-app sources themselves; no Bose
-code is redistributed in this repository.
-
-The software is provided AS IS, without warranty. Use at your own risk.
-
 ## License

 MIT — see [LICENSE](LICENSE).
+
+SoundTouch is a trademark of Bose Corporation.
@@ -1,13 +0,0 @@
-package main
-
-import "strings"
-
-// sanitizeLog strips newline characters from s to prevent log-injection
-// (CodeQL go/log-injection). Values from speakers, HTTP requests, and
-// external APIs may contain attacker-controlled newlines.
-func sanitizeLog(s string) string {
-	s = strings.ReplaceAll(s, "\n", `\n`)
-	s = strings.ReplaceAll(s, "\r", `\r`)
-
-	return s
-}
@@ -1,107 +0,0 @@
-// Command dummy-speaker runs an HTTP-only fake SoundTouch speaker and
-// optionally registers it with a running soundtouch-service so the web UI
-// has a device to display.
-//
-// Intended for documentation screenshots and local UI smoke checks. Do not
-// use against a real network — the fixture payload is synthetic and would
-// confuse other tooling that expects live device data.
-//
-// Example:
-//
-//	dummy-speaker --port 8090 --register http://localhost:8000
-package main
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"log"
-	"net/http"
-	"os"
-	"os/signal"
-	"syscall"
-	"time"
-
-	"github.com/gesellix/bose-soundtouch/pkg/service/testing/fakespeaker"
-)
-
-func main() {
-	listen := flag.String("listen", "127.0.0.1:8090", "bind address for the fake speaker's HTTP API")
-	telnetListen := flag.String("telnet-listen", "127.0.0.1:17000", "bind address for the fake speaker's telnet diagnostic shell (empty to disable)")
-	register := flag.String("register", "", "service base URL (e.g. http://localhost:8000) to self-register with via POST /setup/devices")
-	registerAs := flag.String("register-as", "", "address to send to /setup/devices (defaults to --listen)")
-
-	flag.Parse()
-
-	s, err := fakespeaker.Start(fakespeaker.Config{
-		HTTPListen:   *listen,
-		TelnetListen: *telnetListen,
-	})
-	if err != nil {
-		log.Fatalf("start fake speaker: %v", err)
-	}
-
-	log.Printf("fake speaker HTTP listening on http://%s", sanitizeLog(s.HTTPAddr()))
-
-	if addr := s.TelnetAddr(); addr != "" {
-		log.Printf("fake speaker telnet listening on tcp://%s", sanitizeLog(addr))
-	}
-
-	if *register != "" {
-		target := *registerAs
-		if target == "" {
-			target = s.HTTPAddr()
-		}
-
-		if err := registerWithService(*register, target); err != nil {
-			log.Printf("self-register failed: %v (continuing anyway)", err)
-		} else {
-			log.Printf("registered %s with service at %s", sanitizeLog(target), sanitizeLog(*register))
-		}
-	}
-
-	sig := make(chan os.Signal, 1)
-	signal.Notify(sig, syscall.SIGINT, syscall.SIGTERM)
-	<-sig
-
-	log.Printf("shutting down")
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	if err := s.Stop(ctx); err != nil {
-		log.Printf("stop: %v", err)
-	}
-}
-
-func registerWithService(serviceURL, deviceAddr string) error {
-	body, err := json.Marshal(map[string]string{"ip": deviceAddr})
-	if err != nil {
-		return err
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-
-	req, err := http.NewRequestWithContext(ctx, http.MethodPost, serviceURL+"/setup/devices", bytes.NewReader(body))
-	if err != nil {
-		return err
-	}
-
-	req.Header.Set("Content-Type", "application/json")
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return err
-	}
-
-	defer func() { _ = resp.Body.Close() }()
-
-	if resp.StatusCode >= 300 {
-		return fmt.Errorf("service responded %s", resp.Status)
-	}
-
-	return nil
-}
@@ -1,13 +0,0 @@
-package main
-
-import "strings"
-
-// sanitizeLog strips newline characters from s to prevent log-injection
-// (CodeQL go/log-injection). Values from speakers, HTTP requests, and
-// external APIs may contain attacker-controlled newlines.
-func sanitizeLog(s string) string {
-	s = strings.ReplaceAll(s, "\n", `\n`)
-	s = strings.ReplaceAll(s, "\r", `\r`)
-
-	return s
-}
@@ -116,7 +116,7 @@ func main() {
 		defer close(entries)

 		if *verbose {
-			log.Printf("mDNS: Starting scan for service '%s' with timeout %v", sanitizeLog(*service), *timeout)
+			log.Printf("mDNS: Starting scan for service '%s' with timeout %v", *service, *timeout)
 		}

 		// Query for services
@@ -196,7 +196,7 @@ func parseServiceEntry(entry *mdns.ServiceEntry, verbose bool) *ServiceInfo {

 	if verbose {
 		log.Printf("mDNS: Received service entry: Name='%s', Host='%s', Port=%d, AddrV4=%v, AddrV6=%v",
-			sanitizeLog(entry.Name), sanitizeLog(entry.Host), entry.Port, entry.AddrV4, entry.AddrV6)
+			entry.Name, entry.Host, entry.Port, entry.AddrV4, entry.AddrV6)
 	}

 	service := &ServiceInfo{
@@ -17,9 +17,6 @@ func main() {

 	log.Printf("Starting mock Amazon LWA server on port %d", *port)

-	// Plaintext HTTP is intentional: this is a throwaway test mock that only
-	// runs on the loopback / CI compose network, never in production.
-	// nosemgrep: go.lang.security.audit.net.use-tls.use-tls
 	if err := http.ListenAndServe(fmt.Sprintf(":%d", *port), amazon.NewAmazonHandler()); err != nil {
 		log.Fatal(err)
 	}
@@ -17,9 +17,6 @@ func main() {

 	log.Printf("Starting mock Spotify server on port %d", *port)

-	// Plaintext HTTP is intentional: this is a throwaway test mock that only
-	// runs on the loopback / CI compose network, never in production.
-	// nosemgrep: go.lang.security.audit.net.use-tls.use-tls
 	if err := http.ListenAndServe(fmt.Sprintf(":%d", *port), spotify.NewSpotifyHandler()); err != nil {
 		log.Fatal(err)
 	}
@@ -1,26 +0,0 @@
-// Package main provides a mock TuneIn (radiotime.com) server for testing.
-package main
-
-import (
-	"flag"
-	"fmt"
-	"log"
-	"net/http"
-
-	"github.com/gesellix/bose-soundtouch/pkg/testutils/tunein"
-)
-
-func main() {
-	port := flag.Int("port", 8080, "Port to listen on")
-
-	flag.Parse()
-
-	log.Printf("Starting mock TuneIn server on port %d", *port)
-
-	// Plaintext HTTP is intentional: this is a throwaway test mock that only
-	// runs on the loopback / CI compose network, never in production.
-	// nosemgrep: go.lang.security.audit.net.use-tls.use-tls
-	if err := http.ListenAndServe(fmt.Sprintf(":%d", *port), tunein.NewTuneInHandler()); err != nil {
-		log.Fatal(err)
-	}
-}
@@ -107,10 +107,10 @@ Backs up each speaker over its HTTP API on port 8090. With `--ssh`, also capture
 soundtouch-backup local

 # Specific speaker
-soundtouch-backup local --host 192.0.2.11
+soundtouch-backup local --host 192.168.178.28

 # Multiple speakers
-soundtouch-backup local --host 192.0.2.11 --host 192.0.2.10
+soundtouch-backup local --host 192.168.178.28 --host 192.168.178.35

 # Include SSH filesystem backup
 soundtouch-backup local --ssh
@@ -207,6 +207,6 @@ Running `cloud` and `local` separately produces two archives. To combine them, u

 ## See also

- [Cloud Shutdown Survival Guide](../../docs/content/docs/guides/SURVIVAL-GUIDE.md) — full migration context
+- [Cloud Shutdown Survival Guide](../../docs/guides/SURVIVAL-GUIDE.md) — full migration context
 - [`soundtouch-cli`](../soundtouch-cli/) — live device control
 - [`soundtouch-service`](../soundtouch-service/) — local cloud replacement
@@ -157,33 +157,6 @@ func setClockTimeNow(c *cli.Context) error {
 	return nil
 }

-// setClockDisplayTimezone POSTs only the timezoneInfo attribute,
-// leaving format/brightness untouched. Useful after a clock now to
-// make the speaker's logs and front-panel display tick in local time
-// instead of UTC.
-func setClockDisplayTimezone(c *cli.Context) error {
-	clientConfig := GetClientConfig(c)
-	tz := c.String("tz")
-
-	PrintDeviceHeader(fmt.Sprintf("Setting clock timezone to %s", tz), clientConfig.Host, clientConfig.Port)
-
-	client, err := CreateSoundTouchClient(clientConfig)
-	if err != nil {
-		PrintError(fmt.Sprintf("Failed to create client: %v", err))
-		return err
-	}
-
-	request := models.NewClockDisplayRequest().SetTimeZone(tz)
-	if err := client.SetClockDisplay(request); err != nil {
-		PrintError(fmt.Sprintf("Failed to set timezone: %v", err))
-		return err
-	}
-
-	PrintSuccess(fmt.Sprintf("Timezone set to %s", tz))
-
-	return nil
-}
-
 // getClockDisplay retrieves the current clock display settings
 func getClockDisplay(c *cli.Context) error {
 	clientConfig := GetClientConfig(c)
@@ -1,128 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-	"strings"
-
-	"github.com/urfave/cli/v2"
-)
-
-// cloudCommand assembles the `soundtouch-cli cloud …` command group.
-// All subcommands talk to the AfterTouch service (not the speaker directly)
-// and require --service-url.
-func cloudCommand() *cli.Command {
-	return &cli.Command{
-		Name:  "cloud",
-		Usage: "Manage AfterTouch service data (sources, accounts, devices)",
-		Subcommands: []*cli.Command{
-			cloudSourceCmd(),
-		},
-	}
-}
-
-func cloudSourceCmd() *cli.Command {
-	return &cli.Command{
-		Name:  "source",
-		Usage: "Manage sources stored in AfterTouch",
-		Subcommands: []*cli.Command{
-			cloudSourceRemoveCmd(),
-		},
-	}
-}
-
-func cloudSourceRemoveCmd() *cli.Command {
-	return &cli.Command{
-		Name:  "remove",
-		Usage: "Remove a source from AfterTouch's datastore for a specific device",
-		Flags: append(CloudCommonFlags,
-			&cli.StringFlag{
-				Name:     "account",
-				Aliases:  []string{"a"},
-				Usage:    "Account ID",
-				Required: true,
-			},
-			&cli.StringFlag{
-				Name:     "device",
-				Aliases:  []string{"d"},
-				Usage:    "Device ID",
-				Required: true,
-			},
-			&cli.StringFlag{
-				Name:  "id",
-				Usage: "Source ID to remove (e.g. 10002)",
-			},
-			&cli.StringFlag{
-				Name:    "type",
-				Aliases: []string{"t"},
-				Usage:   "Source type to remove (e.g. INTERNET_RADIO). Resolved to a canonical ID; fails if multiple sources share the type.",
-			},
-		),
-		Action: cloudSourceRemove,
-	}
-}
-
-// canonicalSourceID maps well-known SourceKeyType values to their canonical IDs.
-// Used to resolve --type to an ID without requiring a round-trip GET.
-// TODO We need to ensure that ids here are consistent with the ones used in the AfterTouch service.
-var canonicalSourceID = map[string]string{
-	"AUX":                  "10001",
-	"INTERNET_RADIO":       "10002",
-	"LOCAL_INTERNET_RADIO": "10003",
-	"TUNEIN":               "10004",
-	"RADIO_BROWSER":        "10005",
-}
-
-func cloudSourceRemove(c *cli.Context) error {
-	serviceURL := strings.TrimRight(c.String("service-url"), "/")
-	account := c.String("account")
-	device := c.String("device")
-	sourceID := c.String("id")
-	sourceType := strings.ToUpper(c.String("type"))
-
-	if sourceID == "" && sourceType == "" {
-		return fmt.Errorf("one of --id or --type is required")
-	}
-
-	if sourceID != "" && sourceType != "" {
-		return fmt.Errorf("only one of --id or --type may be given")
-	}
-
-	if sourceType != "" {
-		id, ok := canonicalSourceID[sourceType]
-		if !ok {
-			return fmt.Errorf("unknown source type %q; use --id for non-canonical sources", sourceType)
-		}
-
-		sourceID = id
-	}
-
-	url := fmt.Sprintf("%s/setup/sources/%s/%s/%s", serviceURL, account, device, sourceID)
-
-	req, err := http.NewRequest(http.MethodDelete, url, nil)
-	if err != nil {
-		return fmt.Errorf("build request: %w", err)
-	}
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return fmt.Errorf("request failed: %w", err)
-	}
-
-	defer func() { _ = resp.Body.Close() }()
-
-	if resp.StatusCode == http.StatusNoContent {
-		PrintSuccess(fmt.Sprintf("Removed source %s from device %s (account %s)", sourceID, device, account))
-
-		if sourceType != "" {
-			fmt.Printf("  Type: %s\n", sourceType)
-		}
-
-		return nil
-	}
-
-	body, _ := io.ReadAll(io.LimitReader(resp.Body, 1<<10))
-
-	return fmt.Errorf("service returned %d: %s", resp.StatusCode, strings.TrimSpace(string(body)))
-}
@@ -15,11 +15,6 @@ import (
 func discoverDevices(c *cli.Context) error {
 	fmt.Printf("Discovering SoundTouch devices...\n")

-	// CLI discovery is interactive — flip on verbose protocol logging
-	// so operators can see per-packet / per-header detail. The service
-	// binary leaves this off so its log stays terse.
-	discovery.SetVerbose(c.Bool("verbose"))
-
 	// Load configuration
 	cfg, err := config.LoadFromEnv()
 	if err != nil {
@@ -23,12 +23,6 @@ func eventSubscribe(c *cli.Context) error {
 	filterStr := c.String("filter")
 	filters := parseEventFilters(filterStr)

-	debugMode, err := parseDebugMode(c.String("debug"))
-	if err != nil {
-		PrintError(err.Error())
-		return err
-	}
-
 	// Parse duration
 	duration := c.Duration("duration")
 	verbose := c.Bool("verbose")
@@ -66,10 +60,6 @@ func eventSubscribe(c *cli.Context) error {
 	// Set up event handlers
 	setupEventHandlers(wsClient, filters, verbose)

-	if debugMode != debugOff {
-		installDebugHook(wsClient, debugMode)
-	}
-
 	// Connect to WebSocket
 	fmt.Println("🔌 Connecting to WebSocket...")

@@ -137,78 +127,11 @@ func eventSubscribe(c *cli.Context) error {
 	return nil
 }

-// debugMode controls when the WebSocket subscribe loop prints raw frames
-// to stderr. "off" disables debug output entirely (the production default
-// when --debug is unset).
-type debugMode int
-
-const (
-	debugOff debugMode = iota
-	debugAll
-	debugUnknown
-	debugErrors
-)
-
-func parseDebugMode(s string) (debugMode, error) {
-	switch strings.TrimSpace(s) {
-	case "":
-		return debugOff, nil
-	case "all":
-		return debugAll, nil
-	case "unknown":
-		return debugUnknown, nil
-	case "errors":
-		return debugErrors, nil
-	default:
-		return debugOff, fmt.Errorf("invalid --debug value %q (want one of: all, unknown, errors)", s)
-	}
-}
-
-// installDebugHook wires an OnRawMessage handler that prints the raw
-// frame to stderr based on the chosen mode. Stays out of stdout so
-// debug output can be filtered/grep'd independently of normal events.
-func installDebugHook(ws *client.WebSocketClient, mode debugMode) {
-	ws.OnRawMessage(func(data []byte, parseErr error) {
-		switch mode {
-		case debugAll:
-			printRawFrame(data, parseErr, "all")
-		case debugErrors:
-			if parseErr != nil {
-				printRawFrame(data, parseErr, "errors")
-			}
-		case debugUnknown:
-			// "Unknown" = parsed successfully but no known event types
-			// matched. Parse errors also qualify, since they're frames
-			// the client couldn't interpret either.
-			if parseErr != nil {
-				printRawFrame(data, parseErr, "unknown:parse-error")
-				return
-			}
-
-			ev, err := models.ParseWebSocketEvent(data)
-			if err != nil || len(ev.GetEventTypes()) == 0 {
-				printRawFrame(data, err, "unknown")
-			}
-		case debugOff:
-			// nothing
-		}
-	})
-}
-
-func printRawFrame(data []byte, parseErr error, tag string) {
-	prefix := "[ws-debug:" + tag + "]"
-	if parseErr != nil {
-		fmt.Fprintf(os.Stderr, "%s parse-error: %v\n", prefix, parseErr)
-	}
-
-	fmt.Fprintf(os.Stderr, "%s %s\n", prefix, string(data))
-}
-
 // parseEventFilters validates and parses the filter string
 func parseEventFilters(eventFilter string) map[string]bool {
 	validFilters := map[string]bool{
 		"nowPlaying": true, "volume": true, "connection": true,
-		"preset": true, "zone": true, "group": true, "bass": true,
+		"preset": true, "zone": true, "bass": true,
 		"sdkInfo": true, "userActivity": true,
 	}

@@ -294,13 +217,6 @@ func setupEventHandlers(wsClient *client.WebSocketClient, filters map[string]boo
 		})
 	}

-	// Stereo-pair (group) events — ST-10 only
-	if filters == nil || filters["group"] {
-		wsClient.OnGroupUpdated(func(event *models.GroupUpdatedEvent) {
-			handleGroupEvent(event)
-		})
-	}
-
 	// Bass events
 	if filters == nil || filters["bass"] {
 		wsClient.OnBassUpdated(func(event *models.BassUpdatedEvent) {
@@ -413,11 +329,9 @@ func handlePresetEvent(event *models.PresetUpdatedEvent, verbose bool) {
 	for _, preset := range presets.Preset {
 		fmt.Printf("  📻 Preset %d:", preset.ID)

-		// IsEmpty catches both <preset/> and INVALID_SOURCE
-		// placeholders; using the nil-safe helpers below means the
-		// inner Printf never dereferences a nil ContentItem.
-		if !preset.IsEmpty() {
-			fmt.Printf(" %s (%s)", preset.GetDisplayName(), preset.GetSource())
+		if preset.ContentItem != nil {
+			fmt.Printf(" %s", preset.ContentItem.ItemName)
+			fmt.Printf(" (%s)", preset.ContentItem.Source)
 		}

 		fmt.Println()
@@ -444,34 +358,6 @@ func handleZoneEvent(event *models.ZoneUpdatedEvent) {
 	}
 }

-func handleGroupEvent(event *models.GroupUpdatedEvent) {
-	group := &event.Group
-	fmt.Printf("\n🎧 Stereo-Pair Update [%s]:\n", event.DeviceID)
-
-	if group.IsEmpty() {
-		fmt.Println("  ⛓️‍💥 Pair dissolved (no group configured)")
-		return
-	}
-
-	fmt.Printf("  🆔 ID:     %s\n", group.ID)
-	fmt.Printf("  📛 Name:   %s\n", group.Name)
-	fmt.Printf("  👑 Master: %s\n", group.MasterDeviceID)
-
-	if group.Status != "" {
-		fmt.Printf("  ✅ Status: %s\n", group.Status)
-	}
-
-	for _, r := range group.Roles.Roles {
-		fmt.Printf("  %-5s     %s", r.Role, r.DeviceID)
-
-		if r.IPAddress != "" {
-			fmt.Printf(" (IP: %s)", r.IPAddress)
-		}
-
-		fmt.Println()
-	}
-}
-
 func handleBassEvent(event *models.BassUpdatedEvent) {
 	bass := &event.Bass
 	fmt.Printf("\n🎵 Bass Update [%s]:\n", event.DeviceID)
@@ -568,7 +454,7 @@ type VerboseLogger struct{}

 func (v *VerboseLogger) Printf(format string, args ...interface{}) {
 	timestamp := time.Now().Format("15:04:05")
-	fmt.Printf("[%s] [WebSocket] %s\n", timestamp, sanitizeLog(fmt.Sprintf(format, args...)))
+	fmt.Printf("[%s] [WebSocket] %s\n", timestamp, fmt.Sprintf(format, args...))
 }

 type SilentLogger struct{}
@@ -1,383 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"net"
-	"sync"
-
-	"github.com/gesellix/bose-soundtouch/pkg/client"
-	"github.com/gesellix/bose-soundtouch/pkg/models"
-	"github.com/gesellix/bose-soundtouch/pkg/speaker"
-	"github.com/urfave/cli/v2"
-)
-
-// getGroupStatus retrieves and prints the device's current stereo-pair state.
-func getGroupStatus(c *cli.Context) error {
-	clientConfig := GetClientConfig(c)
-	PrintDeviceHeader("Getting group information", clientConfig.Host, clientConfig.Port)
-
-	client, err := CreateSoundTouchClient(clientConfig)
-	if err != nil {
-		PrintError(fmt.Sprintf("Failed to create client: %v", err))
-		return err
-	}
-
-	group, err := client.GetGroup()
-	if err != nil {
-		PrintError(fmt.Sprintf("Failed to get group: %v", err))
-		return err
-	}
-
-	if group.IsEmpty() {
-		fmt.Println("Device is not in a stereo pair")
-		return nil
-	}
-
-	printGroup(group)
-
-	return nil
-}
-
-// createGroup forms a stereo pair by POSTing /addGroup to both speakers in
-// parallel. LEFT is the master. Addressing each speaker directly (instead of
-// only the master and letting it propagate via marge) sidesteps the
-// inter-device round-trip that surfaced as client timeouts in #252.
-func createGroup(c *cli.Context) error {
-	leftIP := c.String("left")
-	rightIP := c.String("right")
-	name := c.String("name")
-
-	if net.ParseIP(leftIP) == nil {
-		PrintError(fmt.Sprintf("Invalid left IP address: %s", leftIP))
-		return fmt.Errorf("invalid left IP: %s", leftIP)
-	}
-
-	if net.ParseIP(rightIP) == nil {
-		PrintError(fmt.Sprintf("Invalid right IP address: %s", rightIP))
-		return fmt.Errorf("invalid right IP: %s", rightIP)
-	}
-
-	PrintDeviceHeader(fmt.Sprintf("Creating stereo pair: LEFT=%s RIGHT=%s", leftIP, rightIP), leftIP, speaker.HTTPPort)
-
-	leftInfo, err := fetchDeviceInfo(c, leftIP)
-	if err != nil {
-		PrintError(fmt.Sprintf("Failed to read LEFT device info: %v", err))
-		return err
-	}
-
-	rightInfo, err := fetchDeviceInfo(c, rightIP)
-	if err != nil {
-		PrintError(fmt.Sprintf("Failed to read RIGHT device info: %v", err))
-		return err
-	}
-
-	if name == "" {
-		name = fmt.Sprintf("%s + %s", leftInfo.Name, rightInfo.Name)
-	}
-
-	req := &models.Group{
-		Name:           name,
-		MasterDeviceID: leftInfo.DeviceID,
-		Roles: models.GroupRoles{
-			Roles: []models.GroupRole{
-				{DeviceID: leftInfo.DeviceID, Role: "LEFT", IPAddress: leftIP},
-				{DeviceID: rightInfo.DeviceID, Role: "RIGHT", IPAddress: rightIP},
-			},
-		},
-		// SenderIPAddress is intentionally omitted on the base request.
-		// propagateAddGroup adds it to the slave's copy only — see comment there.
-	}
-
-	leftClient, err := clientForHost(c, leftIP)
-	if err != nil {
-		PrintError(fmt.Sprintf("Failed to create client for LEFT: %v", err))
-		return err
-	}
-
-	rightClient, err := clientForHost(c, rightIP)
-	if err != nil {
-		PrintError(fmt.Sprintf("Failed to create client for RIGHT: %v", err))
-		return err
-	}
-
-	leftOut, rightOut := propagateAddGroup(leftClient, rightClient, leftIP, rightIP, req)
-
-	if leftOut.err != nil {
-		PrintError(fmt.Sprintf("LEFT (%s) /addGroup failed: %v", leftIP, leftOut.err))
-	}
-
-	if rightOut.err != nil {
-		PrintError(fmt.Sprintf("RIGHT (%s) /addGroup failed: %v", rightIP, rightOut.err))
-	}
-
-	if leftOut.err != nil || rightOut.err != nil {
-		if (leftOut.err == nil) != (rightOut.err == nil) {
-			succeeded := leftIP
-			if leftOut.err != nil {
-				succeeded = rightIP
-			}
-
-			PrintError(fmt.Sprintf("Partial group state on %s — clean up with `soundtouch-cli --host %s group remove`", succeeded, succeeded))
-		}
-
-		return fmt.Errorf("/addGroup propagation failed")
-	}
-
-	// The LEFT (master) response carries the assigned group ID; use it for display.
-	PrintSuccess(fmt.Sprintf("Stereo pair created (id=%s)", leftOut.group.ID))
-	printGroup(leftOut.group)
-
-	return nil
-}
-
-// addGroupOutcome is the per-speaker result of a parallel /addGroup call.
-type addGroupOutcome struct {
-	host  string
-	group *models.Group
-	err   error
-}
-
-// propagateAddGroup POSTs /addGroup to both speakers concurrently and returns
-// the (LEFT, RIGHT) outcomes. A non-GROUP_OK Status in the response is
-// reported as an error so callers don't have to re-inspect the body.
-//
-// The two POSTs carry different payloads: the master (LEFT) receives the base
-// request with no senderIPAddress so its state machine forms the group as the
-// master, while the slave (RIGHT) receives a copy with senderIPAddress set to
-// the master's IP so its state machine joins as the slave. Sending the same
-// payload to both makes both speakers think they're the slave — they enter
-// AddingSlave, wait for a master that never confirms, time out after 5 s, and
-// revert (issue #252).
-func propagateAddGroup(left, right *client.Client, leftIP, rightIP string, req *models.Group) (addGroupOutcome, addGroupOutcome) {
-	masterReq := *req
-	masterReq.SenderIPAddress = ""
-
-	slaveReq := *req
-	slaveReq.SenderIPAddress = leftIP
-
-	var (
-		wg                sync.WaitGroup
-		leftOut, rightOut addGroupOutcome
-	)
-
-	wg.Add(2)
-
-	go func() {
-		defer wg.Done()
-
-		leftOut = postAddGroup(left, leftIP, &masterReq)
-	}()
-
-	go func() {
-		defer wg.Done()
-
-		rightOut = postAddGroup(right, rightIP, &slaveReq)
-	}()
-
-	wg.Wait()
-
-	return leftOut, rightOut
-}
-
-func postAddGroup(cli *client.Client, host string, req *models.Group) addGroupOutcome {
-	out := addGroupOutcome{host: host}
-
-	g, err := cli.AddGroup(req)
-	if err != nil {
-		out.err = err
-		return out
-	}
-
-	out.group = g
-
-	if g != nil && g.Status != "" && g.Status != "GROUP_OK" {
-		out.err = fmt.Errorf("device returned status %q (want GROUP_OK)", g.Status)
-	}
-
-	return out
-}
-
-// renameGroup updates the name of the existing stereo pair. The device
-// requires the full structure on every update, so we fetch the current
-// state first.
-func renameGroup(c *cli.Context) error {
-	clientConfig := GetClientConfig(c)
-	newName := c.String("name")
-
-	if newName == "" {
-		PrintError("--name is required")
-		return fmt.Errorf("name is required")
-	}
-
-	PrintDeviceHeader(fmt.Sprintf("Renaming stereo pair to %q", newName), clientConfig.Host, clientConfig.Port)
-
-	stClient, err := CreateSoundTouchClient(clientConfig)
-	if err != nil {
-		PrintError(fmt.Sprintf("Failed to create client: %v", err))
-		return err
-	}
-
-	current, err := stClient.GetGroup()
-	if err != nil {
-		PrintError(fmt.Sprintf("Failed to read current group: %v", err))
-		return err
-	}
-
-	if current.IsEmpty() {
-		PrintError("Device is not in a stereo pair — nothing to rename")
-		return fmt.Errorf("no group configured")
-	}
-
-	// Status is read-only on the device side; don't echo it back.
-	current.Status = ""
-	current.Name = newName
-
-	result, err := stClient.UpdateGroup(current)
-	if err != nil {
-		PrintError(fmt.Sprintf("Failed to rename group: %v", err))
-		return err
-	}
-
-	PrintSuccess(fmt.Sprintf("Stereo pair renamed to %q", result.Name))
-	printGroup(result)
-
-	return nil
-}
-
-// removeGroup tears down the device's stereo pair by sending /removeGroup to
-// every member in parallel. Sending it only to the master (as the old code
-// did) leaves the slave stuck in GroupSlave state indefinitely — mirrors the
-// same symmetry as createGroup (see issue #252 comment there).
-func removeGroup(c *cli.Context) error {
-	clientConfig := GetClientConfig(c)
-	PrintDeviceHeader("Removing stereo pair", clientConfig.Host, clientConfig.Port)
-
-	stClient, err := CreateSoundTouchClient(clientConfig)
-	if err != nil {
-		PrintError(fmt.Sprintf("Failed to create client: %v", err))
-		return err
-	}
-
-	// Fetch current group to learn every member's IP before tearing down.
-	group, err := stClient.GetGroup()
-	if err != nil {
-		PrintError(fmt.Sprintf("Failed to read current group: %v", err))
-		return err
-	}
-
-	if group.IsEmpty() {
-		fmt.Println("Device is not in a stereo pair — nothing to remove")
-		return nil
-	}
-
-	// Collect the unique set of member IPs. The master is always reachable
-	// via clientConfig.Host; the roles carry all members including slaves.
-	type memberResult struct {
-		ip  string
-		err error
-	}
-
-	members := make([]string, 0, len(group.Roles.Roles))
-	seen := map[string]bool{}
-
-	for _, role := range group.Roles.Roles {
-		if role.IPAddress != "" && !seen[role.IPAddress] {
-			seen[role.IPAddress] = true
-			members = append(members, role.IPAddress)
-		}
-	}
-
-	// Always include the addressed host even if the group response omitted IPs.
-	if !seen[clientConfig.Host] {
-		members = append(members, clientConfig.Host)
-	}
-
-	results := make([]memberResult, len(members))
-
-	var wg sync.WaitGroup
-
-	for i, ip := range members {
-		wg.Add(1)
-
-		go func(idx int, host string) {
-			defer wg.Done()
-
-			mc, mcErr := clientForHost(c, host)
-			if mcErr != nil {
-				results[idx] = memberResult{ip: host, err: mcErr}
-				return
-			}
-
-			results[idx] = memberResult{ip: host, err: mc.RemoveGroup()}
-		}(i, ip)
-	}
-
-	wg.Wait()
-
-	anyErr := false
-
-	for _, r := range results {
-		if r.err != nil {
-			PrintError(fmt.Sprintf("%s /removeGroup failed: %v", r.ip, r.err))
-
-			anyErr = true
-		}
-	}
-
-	if anyErr {
-		return fmt.Errorf("/removeGroup propagation failed")
-	}
-
-	PrintSuccess("Stereo pair removed")
-
-	return nil
-}
-
-// fetchDeviceInfo builds a one-off client for the given IP and reads /info.
-// Reused for both halves of a `create` invocation so the caller doesn't have
-// to babysit two host/port pairs.
-func fetchDeviceInfo(c *cli.Context, host string) (*models.DeviceInfo, error) {
-	stClient, err := clientForHost(c, host)
-	if err != nil {
-		return nil, err
-	}
-
-	return stClient.GetDeviceInfo()
-}
-
-// clientForHost mirrors CreateSoundTouchClient but overrides the host so we
-// can talk to a speaker other than the one named in --host.
-func clientForHost(c *cli.Context, host string) (*client.Client, error) {
-	cfg, err := loadConfig(c.Duration("timeout"))
-	if err != nil {
-		return nil, fmt.Errorf("failed to load config: %w", err)
-	}
-
-	return client.NewClient(&client.Config{
-		Host:      host,
-		Port:      speaker.HTTPPort,
-		Timeout:   cfg.HTTPTimeout,
-		UserAgent: cfg.UserAgent,
-	}), nil
-}
-
-func printGroup(g *models.Group) {
-	fmt.Println("Stereo Pair Configuration:")
-	fmt.Printf("  ID:        %s\n", g.ID)
-	fmt.Printf("  Name:      %s\n", g.Name)
-	fmt.Printf("  Master:    %s\n", g.MasterDeviceID)
-
-	if g.Status != "" {
-		fmt.Printf("  Status:    %s\n", g.Status)
-	}
-
-	for _, r := range g.Roles.Roles {
-		fmt.Printf("  %-5s     %s", r.Role, r.DeviceID)
-
-		if r.IPAddress != "" {
-			fmt.Printf(" (IP: %s)", r.IPAddress)
-		}
-
-		fmt.Println()
-	}
-}
@@ -1,184 +0,0 @@
-package main
-
-import (
-	"encoding/xml"
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-
-	"github.com/gesellix/bose-soundtouch/pkg/client"
-	"github.com/gesellix/bose-soundtouch/pkg/models"
-)
-
-// happyAddGroupServer fakes a speaker's /addGroup that echoes the request
-// with an assigned ID and GROUP_OK status, matching real hardware behaviour.
-func happyAddGroupServer(t *testing.T, assignedID string) (*httptest.Server, *[]string) {
-	t.Helper()
-
-	bodies := make([]string, 0)
-
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.URL.Path != "/addGroup" || r.Method != http.MethodPost {
-			t.Errorf("unexpected request: %s %s", r.Method, r.URL.Path)
-			http.NotFound(w, r)
-
-			return
-		}
-
-		body, _ := io.ReadAll(r.Body)
-		bodies = append(bodies, string(body))
-
-		var got models.Group
-		if err := xml.Unmarshal(body, &got); err != nil {
-			t.Fatalf("decode request body: %v", err)
-		}
-
-		got.ID = assignedID
-		got.Status = "GROUP_OK"
-
-		w.Header().Set("Content-Type", "application/xml")
-
-		enc, _ := xml.Marshal(&got)
-		_, _ = w.Write(enc)
-	}))
-
-	return srv, &bodies
-}
-
-func newTestGroupClient(serverURL string) *client.Client {
-	return client.NewClientFromHost(serverURL)
-}
-
-func sampleGroupRequest(leftIP, rightIP string) *models.Group {
-	return &models.Group{
-		Name:           "Living Room",
-		MasterDeviceID: "9070658C9D4A",
-		Roles: models.GroupRoles{
-			Roles: []models.GroupRole{
-				{DeviceID: "9070658C9D4A", Role: "LEFT", IPAddress: leftIP},
-				{DeviceID: "F45EAB3115DA", Role: "RIGHT", IPAddress: rightIP},
-			},
-		},
-		// senderIPAddress is intentionally not set here; propagateAddGroup
-		// adds it to the slave's copy only.
-	}
-}
-
-func TestPropagateAddGroup_BothSucceed(t *testing.T) {
-	leftSrv, leftBodies := happyAddGroupServer(t, "9999999")
-	defer leftSrv.Close()
-
-	rightSrv, rightBodies := happyAddGroupServer(t, "9999999")
-	defer rightSrv.Close()
-
-	leftClient := newTestGroupClient(leftSrv.URL)
-	rightClient := newTestGroupClient(rightSrv.URL)
-
-	req := sampleGroupRequest("192.0.2.131", "192.0.2.134")
-
-	leftOut, rightOut := propagateAddGroup(leftClient, rightClient, "192.0.2.131", "192.0.2.134", req)
-
-	if leftOut.err != nil {
-		t.Errorf("LEFT err = %v, want nil", leftOut.err)
-	}
-
-	if rightOut.err != nil {
-		t.Errorf("RIGHT err = %v, want nil", rightOut.err)
-	}
-
-	if leftOut.group == nil || leftOut.group.ID != "9999999" || leftOut.group.Status != "GROUP_OK" {
-		t.Errorf("LEFT group = %+v, want id=9999999 status=GROUP_OK", leftOut.group)
-	}
-
-	if rightOut.group == nil || rightOut.group.Status != "GROUP_OK" {
-		t.Errorf("RIGHT group = %+v, want status=GROUP_OK", rightOut.group)
-	}
-
-	// Both speakers must have received the roles, but only the slave's payload
-	// carries senderIPAddress — see propagateAddGroup for the why.
-	for label, bodies := range map[string]*[]string{"LEFT": leftBodies, "RIGHT": rightBodies} {
-		if len(*bodies) != 1 {
-			t.Fatalf("%s: expected exactly one POST, got %d", label, len(*bodies))
-		}
-
-		body := (*bodies)[0]
-		for _, want := range []string{"<role>LEFT</role>", "<role>RIGHT</role>"} {
-			if !strings.Contains(body, want) {
-				t.Errorf("%s body missing %q\nbody:\n%s", label, want, body)
-			}
-		}
-	}
-
-	leftBody := (*leftBodies)[0]
-	if strings.Contains(leftBody, "<senderIPAddress>") {
-		t.Errorf("LEFT (master) body must NOT carry <senderIPAddress>, otherwise the master flips into slave mode (issue #252)\nbody:\n%s", leftBody)
-	}
-
-	rightBody := (*rightBodies)[0]
-	if !strings.Contains(rightBody, "<senderIPAddress>192.0.2.131</senderIPAddress>") {
-		t.Errorf("RIGHT (slave) body must carry <senderIPAddress>192.0.2.131</senderIPAddress>\nbody:\n%s", rightBody)
-	}
-}
-
-func TestPropagateAddGroup_RightFails(t *testing.T) {
-	leftSrv, _ := happyAddGroupServer(t, "9999999")
-	defer leftSrv.Close()
-
-	rightSrv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
-		http.Error(w, "boom", http.StatusInternalServerError)
-	}))
-	defer rightSrv.Close()
-
-	leftClient := newTestGroupClient(leftSrv.URL)
-	rightClient := newTestGroupClient(rightSrv.URL)
-
-	req := sampleGroupRequest("192.0.2.131", "192.0.2.134")
-
-	leftOut, rightOut := propagateAddGroup(leftClient, rightClient, "192.0.2.131", "192.0.2.134", req)
-
-	if leftOut.err != nil {
-		t.Errorf("LEFT err = %v, want nil", leftOut.err)
-	}
-
-	if rightOut.err == nil {
-		t.Error("RIGHT err = nil, want non-nil")
-	}
-}
-
-func TestPostAddGroup_StatusOtherThanGroupOKIsError(t *testing.T) {
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
-		w.Header().Set("Content-Type", "application/xml")
-		_, _ = w.Write([]byte(`<group><status>GROUP_NOT_READY</status></group>`))
-	}))
-	defer srv.Close()
-
-	out := postAddGroup(newTestGroupClient(srv.URL), "test", sampleGroupRequest("1.1.1.1", "2.2.2.2"))
-
-	if out.err == nil {
-		t.Fatal("expected error for non-GROUP_OK status")
-	}
-
-	if !strings.Contains(out.err.Error(), "GROUP_NOT_READY") {
-		t.Errorf("error %q does not mention returned status", out.err)
-	}
-}
-
-func TestPostAddGroup_EmptyStatusIsAccepted(t *testing.T) {
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
-		w.Header().Set("Content-Type", "application/xml")
-		_, _ = w.Write([]byte(`<group id="42"><name>n</name></group>`))
-	}))
-	defer srv.Close()
-
-	out := postAddGroup(newTestGroupClient(srv.URL), "test", sampleGroupRequest("1.1.1.1", "2.2.2.2"))
-
-	if out.err != nil {
-		t.Errorf("err = %v, want nil for empty status (some firmware omits it)", out.err)
-	}
-
-	if out.group == nil || out.group.ID != "42" {
-		t.Errorf("group = %+v, want id=42", out.group)
-	}
-}
@@ -177,36 +177,23 @@ func getPresets(c *cli.Context) error {

 	fmt.Printf("Device Presets:\n")

-	// Filter out placeholder presets the firmware emits for unconfigured
-	// slots (issue #308): self-closing <preset/> after factory reset,
-	// or <ContentItem source="INVALID_SOURCE"/> on healthy devices.
-	// IsEmpty covers both shapes; accessing fields like ContentItem.Source
-	// directly on the first shape panics.
-	configured := make([]models.Preset, 0, len(presets.Preset))
-
-	for _, p := range presets.Preset {
-		if !p.IsEmpty() {
-			configured = append(configured, p)
-		}
-	}
-
-	if len(configured) == 0 {
+	if len(presets.Preset) == 0 {
 		fmt.Printf("  No presets configured\n")
 		return nil
 	}

 	fmt.Printf("  Configured Presets:\n")

-	for _, preset := range configured {
+	for _, preset := range presets.Preset {
 		fmt.Printf("    %d. %s\n", preset.ID, preset.GetDisplayName())
-		fmt.Printf("       Source: %s\n", preset.GetSource())
+		fmt.Printf("       Source: %s\n", preset.ContentItem.Source)

-		if account := preset.GetSourceAccount(); account != "" && account != preset.GetSource() {
-			fmt.Printf("       Account: %s\n", account)
+		if preset.ContentItem.SourceAccount != "" && preset.ContentItem.SourceAccount != preset.ContentItem.Source {
+			fmt.Printf("       Account: %s\n", preset.ContentItem.SourceAccount)
 		}

-		if location := preset.GetLocation(); location != "" {
-			fmt.Printf("       Location: %s\n", location)
+		if preset.ContentItem.Location != "" {
+			fmt.Printf("       Location: %s\n", preset.ContentItem.Location)
 		}

 		// Show preset creation time if available
@@ -17,7 +17,7 @@ func TestIntrospectCommands(t *testing.T) {
 	}{
 		{
 			name: "introspect service with source flag",
-			args: []string{"soundtouch-cli", "--host", "192.0.2.100", "source", "introspect", "--source", "SPOTIFY"},
+			args: []string{"soundtouch-cli", "--host", "192.168.1.100", "source", "introspect", "--source", "SPOTIFY"},
 			expectedOutput: []string{
 				"Getting introspect data for SPOTIFY",
 				"=== SPOTIFY Service Introspect Data ===",
@@ -47,7 +47,7 @@ func TestIntrospectCommands(t *testing.T) {
 		},
 		{
 			name: "introspect spotify convenience command",
-			args: []string{"soundtouch-cli", "--host", "192.0.2.100", "source", "introspect-spotify"},
+			args: []string{"soundtouch-cli", "--host", "192.168.1.100", "source", "introspect-spotify"},
 			expectedOutput: []string{
 				"Getting Spotify introspect data",
 				"=== Spotify Service Introspect Data ===",
@@ -60,7 +60,7 @@ func TestIntrospectCommands(t *testing.T) {
 		},
 		{
 			name: "introspect with account parameter",
-			args: []string{"soundtouch-cli", "--host", "192.0.2.100", "source", "introspect", "--source", "SPOTIFY", "--account", "my_spotify_account"},
+			args: []string{"soundtouch-cli", "--host", "192.168.1.100", "source", "introspect", "--source", "SPOTIFY", "--account", "my_spotify_account"},
 			expectedOutput: []string{
 				"Getting introspect data for SPOTIFY",
 				"Source Account: my_spotify_account",
@@ -68,7 +68,7 @@ func TestIntrospectCommands(t *testing.T) {
 		},
 		{
 			name:        "introspect missing source flag",
-			args:        []string{"soundtouch-cli", "--host", "192.0.2.100", "source", "introspect"},
+			args:        []string{"soundtouch-cli", "--host", "192.168.1.100", "source", "introspect"},
 			expectError: true,
 		},
 		{
@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"strings"

-	bmxpkg "github.com/gesellix/bose-soundtouch/pkg/service/bmx"
-
 	"github.com/gesellix/bose-soundtouch/pkg/models"
 	"github.com/urfave/cli/v2"
 )
@@ -87,7 +85,6 @@ type presetParams struct {
 	name          string
 	itemType      string
 	artwork       string
-	serviceURL    string
 }

 // extractPresetParams extracts parameters from CLI context
@@ -100,16 +97,9 @@ func extractPresetParams(c *cli.Context) *presetParams {
 		name:          c.String("name"),
 		itemType:      c.String("type"),
 		artwork:       c.String("artwork"),
-		serviceURL:    strings.TrimRight(c.String("service-url"), "/"),
 	}
 }

-// isOrionLocation reports whether location is already an Orion station URL so
-// we don't double-wrap it.
-func isOrionLocation(location string) bool {
-	return strings.Contains(location, "/core02/svc-bmx-adapter-orion/")
-}
-
 // resolveLocationAndMetadata resolves location and fetches metadata if needed
 func resolveLocationAndMetadata(params *presetParams) error {
 	originalLocation := params.location
@@ -118,24 +108,6 @@ func resolveLocationAndMetadata(params *presetParams) error {
 	params.source = resolvedSource
 	params.location = resolvedLocation

-	// For LOCAL_INTERNET_RADIO, the speaker's BMX module calls GET on the stored
-	// location expecting a BmxPlaybackResponse JSON (the Orion station format).
-	// A direct stream URL returns raw audio, which BMX cannot parse, so playback
-	// silently stays on the previous source.
-	if params.source == "LOCAL_INTERNET_RADIO" &&
-		!isOrionLocation(params.location) &&
-		(strings.HasPrefix(params.location, "http://") || strings.HasPrefix(params.location, "https://")) {
-		if params.serviceURL != "" {
-			params.location = bmxpkg.BuildOrionLocation(params.serviceURL, params.name, params.artwork, resolvedLocation)
-
-			fmt.Printf("  Wrapped stream URL in Orion location for LOCAL_INTERNET_RADIO\n")
-		} else {
-			fmt.Printf("  ⚠️  --service-url not set: storing raw stream URL as location.\n")
-			fmt.Printf("     The speaker's BMX module expects an Orion station URL, not raw audio.\n")
-			fmt.Printf("     Re-run with --service-url <https://your-aftertouch-host> to fix this.\n")
-		}
-	}
-
 	// If metadata (name or artwork) is missing, try to fetch it
 	if params.name == "" || params.artwork == "" {
 		var (
@@ -17,7 +17,7 @@ func TestRecentsCommands(t *testing.T) {
 	}{
 		{
 			name: "recents list command",
-			args: []string{"soundtouch-cli", "--host", "192.0.2.100", "recents", "list"},
+			args: []string{"soundtouch-cli", "--host", "192.168.1.100", "recents", "list"},
 			expectedOutput: []string{
 				"Getting recently played content",
 				"Recent Items Summary:",
@@ -26,7 +26,7 @@ func TestRecentsCommands(t *testing.T) {
 		},
 		{
 			name: "recents filter by source",
-			args: []string{"soundtouch-cli", "--host", "192.0.2.100", "recents", "filter", "--source", "SPOTIFY"},
+			args: []string{"soundtouch-cli", "--host", "192.168.1.100", "recents", "filter", "--source", "SPOTIFY"},
 			expectedOutput: []string{
 				"Getting filtered recent content",
 				"filtered by source: SPOTIFY",
@@ -34,7 +34,7 @@ func TestRecentsCommands(t *testing.T) {
 		},
 		{
 			name: "recents latest command",
-			args: []string{"soundtouch-cli", "--host", "192.0.2.100", "recents", "latest"},
+			args: []string{"soundtouch-cli", "--host", "192.168.1.100", "recents", "latest"},
 			expectedOutput: []string{
 				"Getting most recent item",
 				"Most Recent Item:",
@@ -42,7 +42,7 @@ func TestRecentsCommands(t *testing.T) {
 		},
 		{
 			name: "recents stats command",
-			args: []string{"soundtouch-cli", "--host", "192.0.2.100", "recents", "stats"},
+			args: []string{"soundtouch-cli", "--host", "192.168.1.100", "recents", "stats"},
 			expectedOutput: []string{
 				"Getting recent items statistics",
 				"Recent Items Statistics",
@@ -1,310 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"io"
-	"os"
-	"strings"
-	"testing"
-
-	"github.com/gesellix/bose-soundtouch/pkg/models"
-	"github.com/gesellix/bose-soundtouch/pkg/service/setup"
-)
-
-// captureStdout runs fn and returns whatever it wrote to os.Stdout.
-// renderSourceTable prints directly via fmt.Print* — this lets us assert
-// on its output without restructuring the renderer to take an io.Writer.
-func captureStdout(t *testing.T, fn func()) string {
-	t.Helper()
-
-	orig := os.Stdout
-
-	r, w, err := os.Pipe()
-	if err != nil {
-		t.Fatalf("pipe: %v", err)
-	}
-
-	os.Stdout = w
-
-	done := make(chan struct{})
-	buf := &bytes.Buffer{}
-
-	go func() {
-		_, _ = io.Copy(buf, r)
-		close(done)
-	}()
-
-	fn()
-	_ = w.Close()
-
-	os.Stdout = orig
-	<-done
-
-	return buf.String()
-}
-
-func TestRenderSourceTable_AlignsColumnsAndDedupsDisplayName(t *testing.T) {
-	items := []models.SourceItem{
-		// displayName != account → kept as "AUX (AUX IN)"
-		{Source: "AUX", SourceAccount: "AUX", DisplayName: "AUX IN", Status: "READY", IsLocal: true, MultiroomAllowed: true},
-		// displayName == account → dropped (would otherwise duplicate the next column)
-		{Source: "AMAZON", SourceAccount: "amzn1.account.AFKTQOUNVZL7ODQCF4STPAAMVMPA", DisplayName: "amzn1.account.AFKTQOUNVZL7ODQCF4STPAAMVMPA", Status: "READY", MultiroomAllowed: true},
-		// No displayName at all, no account
-		{Source: "BLUETOOTH", Status: "UNAVAILABLE", IsLocal: true, MultiroomAllowed: true},
-		// Long source name, no catalog entry → provider#?
-		{Source: "STORED_MUSIC_MEDIA_RENDERER", SourceAccount: "StoredMusicUserName", DisplayName: "StoredMusicUserName", Status: "UNAVAILABLE", MultiroomAllowed: true},
-	}
-
-	out := captureStdout(t, func() { renderSourceTable(items) })
-
-	lines := strings.Split(strings.TrimRight(out, "\n"), "\n")
-	if len(lines) != 4 {
-		t.Fatalf("got %d output lines, want 4:\n%s", len(lines), out)
-	}
-
-	// (1) AUX keeps "(AUX IN)" because it differs from both source and account.
-	if !strings.Contains(lines[0], "AUX (AUX IN)") {
-		t.Errorf("AUX line should keep displayName parenthesis: %q", lines[0])
-	}
-
-	// (2) AMAZON drops "(amzn1…)" because displayName equals sourceAccount.
-	if strings.Contains(lines[1], "(amzn1.account") {
-		t.Errorf("AMAZON line should drop displayName when it duplicates account: %q", lines[1])
-	}
-
-	// (3) provider#? for the uncatalogued source.
-	if !strings.Contains(lines[3], "provider#?") {
-		t.Errorf("uncatalogued source should be tagged provider#?: %q", lines[3])
-	}
-
-	// (4) Column starts must align across all rows — find the column index
-	//     where "status=" appears in each line; they should all match.
-	statusCols := make([]int, len(lines))
-	for i, l := range lines {
-		statusCols[i] = strings.Index(l, "status=")
-		if statusCols[i] < 0 {
-			t.Fatalf("line %d missing status= column: %q", i, l)
-		}
-	}
-
-	for i := 1; i < len(statusCols); i++ {
-		if statusCols[i] != statusCols[0] {
-			t.Errorf("status= column misaligned: line 0 at col %d, line %d at col %d\n%s",
-				statusCols[0], i, statusCols[i], out)
-		}
-	}
-
-	// (5) account= column should likewise align across all rows.
-	accountCols := make([]int, len(lines))
-	for i, l := range lines {
-		accountCols[i] = strings.Index(l, "account=")
-		if accountCols[i] < 0 {
-			t.Fatalf("line %d missing account= column: %q", i, l)
-		}
-	}
-
-	for i := 1; i < len(accountCols); i++ {
-		if accountCols[i] != accountCols[0] {
-			t.Errorf("account= column misaligned: line 0 at col %d, line %d at col %d\n%s",
-				accountCols[0], i, accountCols[i], out)
-		}
-	}
-}
-
-func TestRenderSourceTable_EmptyShowsNonePlaceholder(t *testing.T) {
-	out := captureStdout(t, func() { renderSourceTable(nil) })
-	if !strings.Contains(out, "(none)") {
-		t.Errorf("expected (none) placeholder for empty list, got: %q", out)
-	}
-}
-
-func TestRecommendMigrationMethod_PrefersTelnet(t *testing.T) {
-	method, reason := recommendMigrationMethod("http://aftertouch.local:8000", &setup.MigrationSummary{
-		TelnetReachable: true,
-		SSHSuccess:      true,
-	})
-
-	if method != setup.MigrationMethodTelnet {
-		t.Errorf("method = %q, want telnet (simplest path when telnet works)", method)
-	}
-
-	if !strings.Contains(reason, "Telnet") {
-		t.Errorf("reason should mention Telnet: %q", reason)
-	}
-}
-
-func TestRecommendMigrationMethod_HTTPSAddsCaveatToTelnet(t *testing.T) {
-	_, reason := recommendMigrationMethod("https://aftertouch.local:8443", &setup.MigrationSummary{
-		TelnetReachable: true,
-	})
-
-	if !strings.Contains(reason, "install-ca") {
-		t.Errorf("HTTPS service URL should flag the CA-install caveat in the reason: %q", reason)
-	}
-}
-
-func TestRecommendMigrationMethod_FallsBackToResolvWhenTelnetDown(t *testing.T) {
-	method, _ := recommendMigrationMethod("http://aftertouch.local:8000", &setup.MigrationSummary{
-		TelnetReachable: false,
-		SSHSuccess:      true,
-	})
-
-	if method != setup.MigrationMethodResolvConf {
-		t.Errorf("method = %q, want resolv (DNS redirect via SSH)", method)
-	}
-}
-
-func TestRecommendMigrationMethod_EmptyWhenNoTransport(t *testing.T) {
-	method, _ := recommendMigrationMethod("http://aftertouch.local:8000", &setup.MigrationSummary{
-		TelnetReachable: false,
-		SSHSuccess:      false,
-	})
-
-	if method != "" {
-		t.Errorf("method = %q, want empty when no transport works", method)
-	}
-}
-
-func TestBuildPlanSteps_NoOpWhenAlreadyMigratedAndPaired(t *testing.T) {
-	summary := &setup.MigrationSummary{IsMigrated: true, IsPaired: true, TelnetMigrated: true}
-	inspect := &setup.InspectReport{Info: &setup.DeviceInfoXML{DeviceID: "AABBCCDDEEFF"}}
-
-	steps := buildPlanSteps("192.0.2.42", "http://aftertouch.local:8000", "", true, false, inspect, summary)
-
-	if len(steps) != 0 {
-		t.Errorf("expected no steps for fully-set-up device, got %d:\n%v", len(steps), steps)
-	}
-}
-
-func TestBuildPlanSteps_RecommendsPairWhenMigratedButUnpaired(t *testing.T) {
-	summary := &setup.MigrationSummary{IsMigrated: true, IsPaired: false, TelnetMigrated: true, TelnetReachable: true}
-	inspect := &setup.InspectReport{Info: &setup.DeviceInfoXML{DeviceID: "AABBCCDDEEFF"}}
-
-	steps := buildPlanSteps("192.0.2.42", "http://aftertouch.local:8000", "", true, false, inspect, summary)
-
-	if len(steps) != 1 {
-		t.Fatalf("expected exactly the pair step, got %d:\n%v", len(steps), steps)
-	}
-
-	if !strings.Contains(steps[0].cmd, "setup pair") {
-		t.Errorf("expected pair command, got %q", steps[0].cmd)
-	}
-}
-
-func TestBuildPlanSteps_MigrateRebootThenPairWhenFresh(t *testing.T) {
-	summary := &setup.MigrationSummary{TelnetReachable: true, SSHSuccess: false, IsPaired: false}
-	inspect := &setup.InspectReport{Info: &setup.DeviceInfoXML{DeviceID: "AABBCCDDEEFF"}}
-
-	steps := buildPlanSteps("192.0.2.42", "http://aftertouch.local:8000", "", true, false, inspect, summary)
-
-	// migrate → reboot → pair. The reboot step exists because envswitch's
-	// parallel-persistence layer only fully wins on the next boot, and we
-	// want the new URLs locked in before pairing posts to the speaker.
-	if len(steps) != 3 {
-		t.Fatalf("expected migrate+reboot+pair, got %d steps:\n%v", len(steps), steps)
-	}
-
-	if !strings.Contains(steps[0].cmd, "setup migrate") || !strings.Contains(steps[0].cmd, "method=telnet") {
-		t.Errorf("step 1 should be telnet migrate, got %q", steps[0].cmd)
-	}
-
-	if !strings.Contains(steps[1].cmd, "setup reboot") {
-		t.Errorf("step 2 should be reboot, got %q", steps[1].cmd)
-	}
-
-	if !strings.Contains(steps[2].cmd, "setup pair") {
-		t.Errorf("step 3 should be pair, got %q", steps[2].cmd)
-	}
-}
-
-func TestBuildPlanSteps_DNSMethodPrependsCAInstall(t *testing.T) {
-	// Telnet down, SSH up, CA not yet trusted → plan must install-ca
-	// before applying the resolv migration.
-	summary := &setup.MigrationSummary{
-		TelnetReachable: false,
-		SSHSuccess:      true,
-		CACertTrusted:   false,
-		IsPaired:        false,
-	}
-	inspect := &setup.InspectReport{Info: &setup.DeviceInfoXML{DeviceID: "X"}}
-
-	steps := buildPlanSteps("192.0.2.42", "http://aftertouch.local:8000", "", false, false, inspect, summary)
-
-	if len(steps) < 2 {
-		t.Fatalf("expected at least install-ca + migrate, got %d steps:\n%v", len(steps), steps)
-	}
-
-	if !strings.Contains(steps[0].cmd, "install-ca") {
-		t.Errorf("install-ca should come first when DNS method is chosen and CA is not trusted, got %q", steps[0].cmd)
-	}
-
-	if !strings.Contains(steps[1].cmd, "method=resolv") {
-		t.Errorf("step 2 should be resolv migrate, got %q", steps[1].cmd)
-	}
-}
-
-func TestBuildPlanSteps_ResetModeIncludesManualNetworkSwitches(t *testing.T) {
-	inspect := &setup.InspectReport{
-		Info: &setup.DeviceInfoXML{DeviceID: "506583DE4803"},
-		Network: &models.NetworkInformation{
-			Interfaces: models.NetworkInterfaces{
-				Interfaces: []models.NetworkInterface{
-					{Type: "WIFI_INTERFACE", SSID: "MyHomeNetwork"},
-				},
-			},
-		},
-	}
-	summary := &setup.MigrationSummary{IsMigrated: true, IsPaired: true} // doesn't matter in reset mode
-
-	steps := buildPlanSteps("192.0.2.42", "http://aftertouch.local:8000", "", true, true, inspect, summary)
-
-	// Expected sequence in --reset mode:
-	//   factory-reset, manual AP switch, wait-ap, wifi-push, manual home switch,
-	//   wait-online, migrate, pair (8 steps).
-	if len(steps) < 7 {
-		t.Fatalf("expected at least 7 steps in --reset mode, got %d:\n%v", len(steps), steps)
-	}
-
-	manualCount := 0
-	for _, s := range steps {
-		if s.manual {
-			manualCount++
-		}
-	}
-
-	if manualCount < 2 {
-		t.Errorf("expected at least 2 manual steps for the Wi-Fi switches, got %d", manualCount)
-	}
-
-	if !strings.Contains(steps[0].cmd, "factory-reset") {
-		t.Errorf("step 1 must be factory-reset, got %q", steps[0].cmd)
-	}
-
-	// wifi-push step should default to the inspected SSID
-	foundWiFi := false
-
-	for _, s := range steps {
-		if strings.Contains(s.cmd, "wifi-push") && strings.Contains(s.cmd, "MyHomeNetwork") {
-			foundWiFi = true
-			break
-		}
-	}
-
-	if !foundWiFi {
-		t.Errorf("expected wifi-push step to default to inspected SSID 'MyHomeNetwork'")
-	}
-
-	// wait-online --match should use the deviceID suffix
-	foundMatch := false
-
-	for _, s := range steps {
-		if strings.Contains(s.cmd, "wait-online") && strings.Contains(s.cmd, "--match=DE4803") {
-			foundMatch = true
-			break
-		}
-	}
-
-	if !foundMatch {
-		t.Errorf("expected wait-online step to use --match=DE4803 from deviceID suffix")
-	}
-}
@@ -3,8 +3,6 @@ package main
 import (
 	"encoding/base64"
 	"fmt"
-	"io"
-	"net/http"
 	"net/url"
 	"strings"

@@ -687,51 +685,3 @@ func boolToStatus(b bool) string {

 	return "❌ No"
 }
-
-// notifySourcesUpdated POSTs a sourcesUpdated notification directly to the
-// speaker's :8090/notification endpoint. The speaker re-fetches its source
-// list from AfterTouch immediately. Requires network access to the speaker.
-func notifySourcesUpdated(c *cli.Context) error {
-	if err := RequireHost(c); err != nil {
-		return err
-	}
-
-	clientConfig := GetClientConfig(c)
-
-	client, err := CreateSoundTouchClient(clientConfig)
-	if err != nil {
-		return err
-	}
-
-	info, err := client.GetDeviceInfo()
-	if err != nil {
-		return fmt.Errorf("failed to get device info from %s: %w", clientConfig.Host, err)
-	}
-
-	body := fmt.Sprintf(`<updates deviceID="%s"><sourcesUpdated/></updates>`, info.DeviceID)
-	notifyURL := fmt.Sprintf("http://%s:8090/notification", clientConfig.Host)
-
-	req, err := http.NewRequest(http.MethodPost, notifyURL, strings.NewReader(body))
-	if err != nil {
-		return fmt.Errorf("build request: %w", err)
-	}
-
-	req.Header.Set("Content-Type", "application/xml")
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return fmt.Errorf("post to speaker: %w", err)
-	}
-
-	defer func() { _ = resp.Body.Close() }()
-
-	if resp.StatusCode >= 300 {
-		respBody, _ := io.ReadAll(io.LimitReader(resp.Body, 1<<10))
-
-		return fmt.Errorf("speaker returned %d: %s", resp.StatusCode, strings.TrimSpace(string(respBody)))
-	}
-
-	PrintSuccess(fmt.Sprintf("Sent sourcesUpdated to %s (%s)", info.DeviceID, clientConfig.Host))
-
-	return nil
-}
@@ -2,23 +2,14 @@ package main

 import (
 	"fmt"
-	"net/url"
-	"path"
 	"strings"

 	"github.com/gesellix/bose-soundtouch/pkg/models"
-	"github.com/gesellix/bose-soundtouch/pkg/service/stations"
 	"github.com/urfave/cli/v2"
 )

 // searchStations handles searching for stations across different sources
 func searchStations(c *cli.Context) error {
-	PrintDeprecation(
-		"station search",
-		"It asks the speaker to search, which fails when the speaker's cloud is gone.",
-		`soundtouch-cli station find --provider tunein --query "<your search>"`,
-	)
-
 	source := c.String("source")
 	sourceAccount := c.String("source-account")
 	searchTerm := c.String("query")
@@ -58,12 +49,6 @@ func searchStations(c *cli.Context) error {

 // searchTuneIn handles searching TuneIn specifically
 func searchTuneIn(c *cli.Context) error {
-	PrintDeprecation(
-		"station search-tunein",
-		"It asks the speaker to search, which fails when the speaker's cloud is gone.",
-		`soundtouch-cli station find-tunein --query "<your search>"`,
-	)
-
 	searchTerm := c.String("query")

 	if searchTerm == "" {
@@ -99,12 +84,6 @@ func searchTuneIn(c *cli.Context) error {

 // searchPandora handles searching Pandora specifically
 func searchPandora(c *cli.Context) error {
-	PrintDeprecation(
-		"station search-pandora",
-		"There is no built-in Pandora search yet (it requires the speaker and your account).",
-		"",
-	)
-
 	sourceAccount := c.String("source-account")
 	searchTerm := c.String("query")

@@ -146,12 +125,6 @@ func searchPandora(c *cli.Context) error {

 // searchSpotify handles searching Spotify specifically
 func searchSpotify(c *cli.Context) error {
-	PrintDeprecation(
-		"station search-spotify",
-		"There is no built-in Spotify search yet (it requires the speaker and your account).",
-		"",
-	)
-
 	sourceAccount := c.String("source-account")
 	searchTerm := c.String("query")

@@ -500,182 +473,3 @@ func printStationList(response *models.NavigateResponse, source string) {
 	fmt.Printf("   • To play a station: Use the location value with 'play content' command\n")
 	fmt.Printf("   • To save as preset: Use 'preset set' command with the location\n")
 }
-
-// playbackID returns the bare station/episode id from a playback href,
-// e.g. "/v1/playback/station/s228737" -> "s228737" and
-// "/v1/playback/episodes/p1864248?encoded_name=…" -> "p1864248".
-// Returns "" when href is empty.
-func playbackID(href string) string {
-	if href == "" {
-		return ""
-	}
-
-	if i := strings.IndexByte(href, '?'); i >= 0 {
-		href = href[:i]
-	}
-
-	return path.Base(href)
-}
-
-// printBmxNavResults renders a *models.BmxNavResponse to stdout.
-// For each section it prints the section name as a header, then each item as a
-// leading id column followed by the name, with subtitle and playback location
-// indented below. The bare id sits alone in its own column so it is easy to
-// copy-paste.
-func printBmxNavResults(resp *models.BmxNavResponse) {
-	if len(resp.BmxSections) == 0 {
-		fmt.Println("  No results found")
-		return
-	}
-
-	for _, section := range resp.BmxSections {
-		if section.Name != "" {
-			fmt.Printf("\n  [%s]\n", section.Name)
-		}
-
-		if len(section.Items) == 0 {
-			fmt.Println("    (empty)")
-			continue
-		}
-
-		// Width of the leading id column = widest id in this section.
-		maxID := 0
-
-		for _, item := range section.Items {
-			if item.Links != nil && item.Links.BmxPlayback != nil {
-				maxID = max(maxID, len(playbackID(item.Links.BmxPlayback.Href)))
-			}
-		}
-
-		// Continuation lines align under the name: 4 leading spaces
-		// + id column + 2-space gap.
-		indent := strings.Repeat(" ", 4+maxID+2)
-
-		for _, item := range section.Items {
-			id := ""
-			if item.Links != nil && item.Links.BmxPlayback != nil {
-				id = playbackID(item.Links.BmxPlayback.Href)
-			}
-
-			fmt.Printf("    %-*s  %s\n", maxID, id, item.Name)
-
-			if item.Subtitle != "" {
-				fmt.Printf("%s%s\n", indent, item.Subtitle)
-			}
-
-			if item.Links != nil && item.Links.BmxPlayback != nil {
-				fmt.Printf("%sLocation: %s\n", indent, item.Links.BmxPlayback.Href)
-			}
-		}
-	}
-}
-
-// bmxNavCursor extracts the opaque cursor value from a section's BmxNext link.
-// The Href looks like "...?cursor=<value>"; this returns the cursor query param.
-// Returns "" when no next link is present.
-func bmxNavCursor(section *models.BmxNavSection) string {
-	if section == nil || section.Links == nil || section.Links.BmxNext == nil {
-		return ""
-	}
-
-	href := section.Links.BmxNext.Href
-	if href == "" {
-		return ""
-	}
-
-	// The cursor is the query parameter named "cursor".
-	parsed, err := url.Parse(href)
-	if err != nil {
-		return ""
-	}
-
-	return parsed.Query().Get("cursor")
-}
-
-// runFind performs a built-in station search for the given provider and
-// prints the results. The search runs inside the CLI itself, querying the
-// radio provider's public API directly — it needs neither the speaker's
-// cloud nor a running soundtouch-service. When more is true it follows up
-// to three additional result pages while a next cursor is available.
-func runFind(provider stations.Provider, label, query string, more bool) error {
-	if query == "" {
-		PrintError("Search query is required")
-		return fmt.Errorf("search query cannot be empty")
-	}
-
-	fmt.Printf("Searching %s for: %s\n", label, query)
-
-	resp, err := stations.Search(provider, query)
-	if err != nil {
-		PrintError(fmt.Sprintf("Search failed: %v", err))
-		return err
-	}
-
-	printBmxNavResults(resp)
-
-	if !more {
-		return nil
-	}
-
-	const maxExtraPages = 3
-	for page := 0; page < maxExtraPages; page++ {
-		// Find a cursor from any section that has one.
-		cursor := ""
-		for i := range resp.BmxSections {
-			cursor = bmxNavCursor(&resp.BmxSections[i])
-			if cursor != "" {
-				break
-			}
-		}
-
-		if cursor == "" {
-			break
-		}
-
-		fmt.Printf("\n  -- page %d --\n", page+2)
-
-		resp, err = stations.SearchNext(provider, cursor)
-		if err != nil {
-			PrintError(fmt.Sprintf("Failed to fetch next page: %v", err))
-			return err
-		}
-
-		printBmxNavResults(resp)
-	}
-
-	return nil
-}
-
-// findStations is the action for the unified `station find` with
-// --provider / --query / --more.
-func findStations(c *cli.Context) error {
-	providerStr := c.String("provider")
-
-	var (
-		provider stations.Provider
-		label    string
-	)
-
-	switch strings.ToLower(providerStr) {
-	case "tunein":
-		provider, label = stations.ProviderTuneIn, "TuneIn"
-	case "radiobrowser":
-		provider, label = stations.ProviderRadioBrowser, "Radio Browser"
-	default:
-		PrintError(fmt.Sprintf("Unknown provider %q: must be 'tunein' or 'radiobrowser'", providerStr))
-		return fmt.Errorf("unknown provider: %s", providerStr)
-	}
-
-	return runFind(provider, label, c.String("query"), c.Bool("more"))
-}
-
-// findTuneIn is the action for `station find-tunein` (built-in TuneIn search).
-func findTuneIn(c *cli.Context) error {
-	return runFind(stations.ProviderTuneIn, "TuneIn", c.String("query"), c.Bool("more"))
-}
-
-// findRadioBrowser is the action for `station find-radiobrowser`
-// (built-in Radio Browser search).
-func findRadioBrowser(c *cli.Context) error {
-	return runFind(stations.ProviderRadioBrowser, "Radio Browser", c.String("query"), c.Bool("more"))
-}
@@ -1,127 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"strings"
-
-	"github.com/urfave/cli/v2"
-)
-
-// ttsCloudCmd is the `speaker tts-cloud` subcommand. Unlike `speaker tts`
-// (which sends a Google Translate URL straight to the speaker), this routes
-// through the AfterTouch service, which synthesizes the audio with the
-// configured provider (e.g. Google Cloud TTS), hosts it, and plays it on the
-// speaker. It therefore needs --service-url. Target the speaker with the global
-// --host, or with --device (resolved to an IP by the service).
-func ttsCloudCmd() *cli.Command {
-	return &cli.Command{
-		Name:  "tts-cloud",
-		Usage: "Speak text via the AfterTouch service (Google Cloud TTS), synthesized server-side",
-		Description: "Routes through the AfterTouch service (requires --service-url), which\n" +
-			"synthesizes the audio with the configured provider, hosts it, and plays it\n" +
-			"on the speaker. Target the speaker with the global --host or with --device.\n\n" +
-			"Contrast with 'speaker tts', which sends a Google Translate URL directly to\n" +
-			"the speaker without involving the service.",
-		Flags: append(CloudCommonFlags,
-			&cli.StringFlag{
-				Name:     "text",
-				Aliases:  []string{"t"},
-				Usage:    "Text to speak",
-				Required: true,
-			},
-			&cli.StringFlag{
-				Name:    "device",
-				Aliases: []string{"d"},
-				Usage:   "Target device ID (the service resolves it to an IP); alternative to --host",
-			},
-			&cli.StringFlag{
-				Name:    "language",
-				Aliases: []string{"l"},
-				Usage:   "Language code (provider-specific; defaults to the service setting)",
-			},
-			&cli.StringFlag{
-				Name:  "voice",
-				Usage: "Voice name (Google Cloud TTS; ignored by the translate provider)",
-			},
-			&cli.IntFlag{
-				Name:    "volume",
-				Aliases: []string{"v"},
-				Usage:   "Playback volume (0-100, 0 = service default; only honoured by --method speaker)",
-			},
-			&cli.StringFlag{
-				Name:  "method",
-				Usage: "Playback method: 'speaker' (/speaker notification, ducks+resumes, supports volume) or 'radio' (LOCAL_INTERNET_RADIO, no app_key, replaces source)",
-				Value: "speaker",
-			},
-		),
-		Action: ttsCloud,
-	}
-}
-
-func ttsCloud(c *cli.Context) error {
-	serviceURL := strings.TrimRight(c.String("service-url"), "/")
-	device := c.String("device")
-	host := c.String("host") // global flag
-
-	if device == "" && host == "" {
-		return fmt.Errorf("one of --host or --device is required")
-	}
-
-	payload := map[string]interface{}{"text": c.String("text")}
-	if device != "" {
-		payload["deviceId"] = device
-	}
-
-	if host != "" {
-		payload["host"] = host
-	}
-
-	if l := c.String("language"); l != "" {
-		payload["language"] = l
-	}
-
-	if v := c.String("voice"); v != "" {
-		payload["voice"] = v
-	}
-
-	if c.IsSet("volume") {
-		payload["volume"] = c.Int("volume")
-	}
-
-	if m := c.String("method"); m != "" {
-		payload["method"] = m
-	}
-
-	body, err := json.Marshal(payload)
-	if err != nil {
-		return fmt.Errorf("marshal request: %w", err)
-	}
-
-	req, err := http.NewRequest(http.MethodPost, serviceURL+"/api/setup/tts/speak", bytes.NewReader(body))
-	if err != nil {
-		return fmt.Errorf("build request: %w", err)
-	}
-
-	req.Header.Set("Content-Type", "application/json")
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return fmt.Errorf("request failed: %w", err)
-	}
-
-	defer func() { _ = resp.Body.Close() }()
-
-	respBody, _ := io.ReadAll(io.LimitReader(resp.Body, 1<<12))
-
-	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("service returned %d: %s", resp.StatusCode, strings.TrimSpace(string(respBody)))
-	}
-
-	PrintSuccess(fmt.Sprintf("Spoke %q", c.String("text")))
-
-	return nil
-}
@@ -1,152 +0,0 @@
-// Package main — `soundtouch-cli source tunein` subcommand.
-//
-// Convenience shortcut for the verbose `source content --source TUNEIN
-// --type … --location …` pattern. Picks the right Type + location template
-// from the TuneIn guide-ID prefix, optionally fetches name + artwork from
-// TuneIn's describe endpoint, then calls the same SelectContentItem path
-// the generic `source content` command uses.
-//
-// Implements #226.
-package main
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/gesellix/bose-soundtouch/pkg/models"
-	"github.com/gesellix/bose-soundtouch/pkg/service/bmx"
-	"github.com/urfave/cli/v2"
-)
-
-// tuneInKind captures the three guide-ID shapes the SoundTouch firmware
-// distinguishes; each picks a different Bose `/v1/playback/...` location
-// template and a different ContentItem Type.
-type tuneInKind struct {
-	flag      string // CLI flag name (`station`, `episode`, `program`)
-	prefix    string // single-letter guide-ID prefix (`s`, `e`, `p`)
-	location  string // printf template, %s = guide ID
-	itemType  string // ContentItem.Type the speaker expects
-	humanName string // user-facing kind label for log lines
-}
-
-var tuneInKinds = []tuneInKind{
-	{flag: "station", prefix: "s", location: "/v1/playback/station/%s", itemType: "stationurl", humanName: "live station"},
-	{flag: "episode", prefix: "e", location: "/v1/playback/episode/%s", itemType: "stationurl", humanName: "podcast episode"},
-	{flag: "program", prefix: "p", location: "/v1/playback/episodes/%s", itemType: "tracklisturl", humanName: "podcast program"},
-}
-
-// resolveTuneInKind picks a kind from the CLI flags. Exactly one of
-// --station / --episode / --program must be set, OR --id with a prefix we
-// recognise. Returns the kind plus the bare guide ID.
-func resolveTuneInKind(c *cli.Context) (*tuneInKind, string, error) {
-	// Explicit kind flags take precedence over --id.
-	var picked *tuneInKind
-
-	var id string
-
-	for i, k := range tuneInKinds {
-		v := c.String(k.flag)
-		if v == "" {
-			continue
-		}
-
-		if picked != nil {
-			return nil, "", fmt.Errorf("only one of --station, --episode, --program may be set")
-		}
-
-		picked = &tuneInKinds[i]
-		id = v
-	}
-
-	if picked != nil {
-		return picked, strings.TrimSpace(id), nil
-	}
-
-	// Fall back to --id with prefix auto-detect.
-	raw := strings.TrimSpace(c.String("id"))
-	if raw == "" {
-		return nil, "", fmt.Errorf("one of --station, --episode, --program, or --id is required")
-	}
-
-	if raw == "" {
-		return nil, "", fmt.Errorf("--id is empty")
-	}
-
-	for i, k := range tuneInKinds {
-		if strings.HasPrefix(raw, k.prefix) {
-			return &tuneInKinds[i], raw, nil
-		}
-	}
-
-	return nil, "", fmt.Errorf("--id %q has no recognised TuneIn prefix; use --station/--episode/--program explicitly", raw)
-}
-
-// playTuneIn is the action wired into `soundtouch-cli source tunein`.
-func playTuneIn(c *cli.Context) error {
-	clientConfig := GetClientConfig(c)
-
-	client, err := CreateSoundTouchClient(clientConfig)
-	if err != nil {
-		return err
-	}
-
-	kind, id, err := resolveTuneInKind(c)
-	if err != nil {
-		return err
-	}
-
-	name := c.String("name")
-	artwork := c.String("artwork")
-
-	// Optional metadata enrichment — only fetch if the user hasn't already
-	// supplied both, and they haven't asked us to skip it.
-	if !c.Bool("no-lookup") && (name == "" || artwork == "") {
-		fetchedName, fetchedLogo, lookupErr := bmx.TuneInDescribeMeta(id)
-		if lookupErr != nil {
-			// Non-fatal: the speaker can resolve the title itself; just
-			// note the failure so an operator sees what went wrong.
-			fmt.Printf("  Note: TuneIn describe lookup failed (%v); proceeding without enrichment.\n", lookupErr)
-		} else {
-			if name == "" {
-				name = fetchedName
-			}
-
-			if artwork == "" {
-				artwork = fetchedLogo
-			}
-		}
-	}
-
-	if name == "" {
-		// Fall back to a sensible non-empty default so the speaker's
-		// now-playing UI doesn't show a blank source label.
-		name = "TuneIn"
-	}
-
-	contentItem := &models.ContentItem{
-		Source:       "TUNEIN",
-		Type:         kind.itemType,
-		Location:     fmt.Sprintf(kind.location, id),
-		ItemName:     name,
-		ContainerArt: artwork,
-		IsPresetable: true,
-	}
-
-	PrintDeviceHeader("Playing TuneIn "+kind.humanName, clientConfig.Host, clientConfig.Port)
-	fmt.Printf("  ID:       %s\n", id)
-	fmt.Printf("  Location: %s\n", contentItem.Location)
-	fmt.Printf("  Type:     %s\n", contentItem.Type)
-	fmt.Printf("  Name:     %s\n", contentItem.ItemName)
-
-	if contentItem.ContainerArt != "" {
-		fmt.Printf("  Artwork:  %s\n", contentItem.ContainerArt)
-	}
-
-	if err := client.SelectContentItem(contentItem); err != nil {
-		return fmt.Errorf("failed to select TuneIn content: %w", err)
-	}
-
-	PrintSuccess("TuneIn content selected")
-
-	return nil
-}
@@ -1,157 +0,0 @@
-package main
-
-import (
-	"flag"
-	"strings"
-	"testing"
-
-	"github.com/urfave/cli/v2"
-)
-
-// newCtx wires a *cli.Context with the kind-selection flags the resolver
-// reads, plus whatever values the test wants set. Empty-string values are
-// the default (flag not provided).
-func newCtx(t *testing.T, kv map[string]string) *cli.Context {
-	t.Helper()
-
-	fs := flag.NewFlagSet("test", flag.ContinueOnError)
-	for _, name := range []string{"station", "episode", "program", "id"} {
-		fs.String(name, "", "")
-	}
-
-	for k, v := range kv {
-		if err := fs.Set(k, v); err != nil {
-			t.Fatalf("fs.Set(%q, %q): %v", k, v, err)
-		}
-	}
-
-	return cli.NewContext(nil, fs, nil)
-}
-
-func TestResolveTuneInKind_Station(t *testing.T) {
-	c := newCtx(t, map[string]string{"station": "s14991"})
-
-	k, id, err := resolveTuneInKind(c)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if k.flag != "station" || k.itemType != "stationurl" {
-		t.Errorf("wrong kind: %+v", k)
-	}
-
-	if id != "s14991" {
-		t.Errorf("wrong id: %q", id)
-	}
-}
-
-func TestResolveTuneInKind_Episode(t *testing.T) {
-	c := newCtx(t, map[string]string{"episode": "e789012"})
-
-	k, id, err := resolveTuneInKind(c)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if k.flag != "episode" || k.itemType != "stationurl" {
-		t.Errorf("wrong kind: %+v", k)
-	}
-
-	if id != "e789012" {
-		t.Errorf("wrong id: %q", id)
-	}
-
-	if !strings.Contains(k.location, "/v1/playback/episode/") {
-		t.Errorf("wrong location template: %q", k.location)
-	}
-}
-
-func TestResolveTuneInKind_Program(t *testing.T) {
-	c := newCtx(t, map[string]string{"program": "p123456"})
-
-	k, id, err := resolveTuneInKind(c)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if k.flag != "program" || k.itemType != "tracklisturl" {
-		t.Errorf("wrong kind: %+v", k)
-	}
-
-	if id != "p123456" {
-		t.Errorf("wrong id: %q", id)
-	}
-
-	if !strings.Contains(k.location, "/v1/playback/episodes/") {
-		t.Errorf("wrong location template: %q", k.location)
-	}
-}
-
-func TestResolveTuneInKind_IDPrefixAutoDetect(t *testing.T) {
-	cases := []struct {
-		id       string
-		wantFlag string
-	}{
-		{"s14991", "station"},
-		{"e789012", "episode"},
-		{"p123456", "program"},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.id, func(t *testing.T) {
-			c := newCtx(t, map[string]string{"id": tc.id})
-
-			k, id, err := resolveTuneInKind(c)
-			if err != nil {
-				t.Fatalf("unexpected error: %v", err)
-			}
-
-			if k.flag != tc.wantFlag {
-				t.Errorf("auto-detect picked %q; want %q", k.flag, tc.wantFlag)
-			}
-
-			if id != tc.id {
-				t.Errorf("id round-tripped wrong: got %q want %q", id, tc.id)
-			}
-		})
-	}
-}
-
-func TestResolveTuneInKind_NoFlags(t *testing.T) {
-	c := newCtx(t, nil)
-
-	_, _, err := resolveTuneInKind(c)
-	if err == nil {
-		t.Fatal("expected error when no flags are set")
-	}
-
-	if !strings.Contains(err.Error(), "required") {
-		t.Errorf("error message should mention required flag: %v", err)
-	}
-}
-
-func TestResolveTuneInKind_ConflictingFlags(t *testing.T) {
-	c := newCtx(t, map[string]string{"station": "s14991", "episode": "e789012"})
-
-	_, _, err := resolveTuneInKind(c)
-	if err == nil {
-		t.Fatal("expected error when conflicting flags are set")
-	}
-
-	if !strings.Contains(err.Error(), "only one of") {
-		t.Errorf("error message should mention exclusivity: %v", err)
-	}
-}
-
-func TestResolveTuneInKind_UnknownPrefix(t *testing.T) {
-	c := newCtx(t, map[string]string{"id": "x999"})
-
-	_, _, err := resolveTuneInKind(c)
-	if err == nil {
-		t.Fatal("expected error for unknown ID prefix")
-	}
-
-	if !strings.Contains(err.Error(), "no recognised TuneIn prefix") {
-		t.Errorf("error message should explain prefix mismatch: %v", err)
-	}
-}
@@ -19,16 +19,6 @@ import (
 	"github.com/urfave/cli/v2"
 )

-// CloudCommonFlags defines flags for commands that talk to the AfterTouch service.
-var CloudCommonFlags = []cli.Flag{
-	&cli.StringFlag{
-		Name:     "service-url",
-		Usage:    "AfterTouch service URL",
-		Required: true,
-		EnvVars:  []string{"AFTERTOUCH_URL"},
-	},
-}
-
 // CommonFlags defines flags that are shared across multiple commands
 var CommonFlags = []cli.Flag{
 	&cli.StringFlag{
@@ -332,7 +322,7 @@ func PrintSuccess(message string) {

 // PrintError prints a standard error message
 func PrintError(message string) {
-	fmt.Printf("✗ %s\n", sanitizeLog(message))
+	fmt.Printf("✗ %s\n", message)
 }

 // PrintWarning prints a standard warning message
@@ -340,22 +330,6 @@ func PrintWarning(message string) {
 	fmt.Printf("⚠️  %s\n", message)
 }

-// PrintDeprecation prints a deprecation notice to stderr (so it does not
-// pollute piped stdout output). reason explains why the command is going
-// away; newUsage is an optional replacement example — pass "" when there
-// is no replacement yet.
-func PrintDeprecation(command, reason, newUsage string) {
-	fmt.Fprintf(os.Stderr, "⚠️  '%s' is deprecated and will be removed in a future release.\n", command)
-
-	if reason != "" {
-		fmt.Fprintf(os.Stderr, "    %s\n", reason)
-	}
-
-	if newUsage != "" {
-		fmt.Fprintf(os.Stderr, "    Use instead:\n      %s\n", newUsage)
-	}
-}
-
 // showVersionInfo displays detailed version information including build details
 func showVersionInfo(_ *cli.Context) error {
 	fmt.Printf("%s version %s\n", os.Args[0], version)
@@ -1,13 +0,0 @@
-package main
-
-import "strings"
-
-// sanitizeLog strips newline characters from s to prevent log-injection
-// (CodeQL go/log-injection). Values from speakers, HTTP requests, and
-// external APIs may contain attacker-controlled newlines.
-func sanitizeLog(s string) string {
-	s = strings.ReplaceAll(s, "\n", `\n`)
-	s = strings.ReplaceAll(s, "\r", `\r`)
-
-	return s
-}
@@ -132,11 +132,6 @@ func main() {
 								Aliases: []string{"a"},
 								Usage:   "Show detailed information for all devices",
 							},
-							&cli.BoolFlag{
-								Name:    "verbose",
-								Aliases: []string{"v"},
-								Usage:   "Print per-packet/per-header SSDP and mDNS trace logs",
-							},
 						},
 					},
 				},
@@ -385,11 +380,6 @@ func main() {
 								Name:  "artwork",
 								Usage: "Artwork URL",
 							},
-							&cli.StringFlag{
-								Name:    "service-url",
-								Usage:   "AfterTouch service HTTPS URL (e.g. https://soundtouch.local). Required for LOCAL_INTERNET_RADIO: the speaker's BMX module calls GET on the preset location and expects an Orion JSON response, not raw audio. When provided, the stream URL is automatically wrapped in the Orion station endpoint.",
-								EnvVars: []string{"SOUNDTOUCH_SERVICE_URL"},
-							},
 						},
 						Before: RequireHost,
 					},
@@ -589,72 +579,9 @@ func main() {
 				Aliases: []string{"st"},
 				Usage:   "Search and manage stations",
 				Subcommands: []*cli.Command{
-					// Built-in search ("find" family): runs inside the CLI,
-					// querying the radio provider's public API directly. No
-					// speaker cloud and no soundtouch-service required.
-					{
-						Name:   "find",
-						Usage:  "Find stations directly (built-in tunein or radiobrowser search; no speaker needed)",
-						Action: findStations,
-						Flags: []cli.Flag{
-							&cli.StringFlag{
-								Name:  "provider",
-								Usage: "Station provider: tunein or radiobrowser",
-								Value: "tunein",
-							},
-							&cli.StringFlag{
-								Name:     "query",
-								Aliases:  []string{"q"},
-								Usage:    "Search query",
-								Required: true,
-							},
-							&cli.BoolFlag{
-								Name:  "more",
-								Usage: "Follow up to 3 additional result pages when available",
-							},
-						},
-					},
-					{
-						Name:   "find-tunein",
-						Usage:  "Find TuneIn stations directly (built-in search; no speaker needed)",
-						Action: findTuneIn,
-						Flags: []cli.Flag{
-							&cli.StringFlag{
-								Name:     "query",
-								Aliases:  []string{"q"},
-								Usage:    "Search query",
-								Required: true,
-							},
-							&cli.BoolFlag{
-								Name:  "more",
-								Usage: "Follow up to 3 additional result pages when available",
-							},
-						},
-					},
-					{
-						Name:   "find-radiobrowser",
-						Usage:  "Find Radio Browser stations directly (built-in search; no speaker needed)",
-						Action: findRadioBrowser,
-						Flags: []cli.Flag{
-							&cli.StringFlag{
-								Name:     "query",
-								Aliases:  []string{"q"},
-								Usage:    "Search query",
-								Required: true,
-							},
-							&cli.BoolFlag{
-								Name:  "more",
-								Usage: "Follow up to 3 additional result pages when available",
-							},
-						},
-					},
-					// Deprecated speaker-based search commands. They ask the
-					// speaker to search, which fails once its cloud is gone.
-					// Prefer the "find" family above. Kept for now; each emits
-					// a deprecation notice on stderr.
 					{
 						Name:   "search",
-						Usage:  "[DEPRECATED] Search via the speaker; use 'station find' instead",
+						Usage:  "Search for stations and content",
 						Action: searchStations,
 						Flags: []cli.Flag{
 							&cli.StringFlag{
@@ -677,7 +604,7 @@ func main() {
 					},
 					{
 						Name:   "search-tunein",
-						Usage:  "[DEPRECATED] Search TuneIn via the speaker; use 'station find-tunein' instead",
+						Usage:  "Search TuneIn stations",
 						Action: searchTuneIn,
 						Flags: []cli.Flag{
 							&cli.StringFlag{
@@ -691,7 +618,7 @@ func main() {
 					},
 					{
 						Name:   "search-pandora",
-						Usage:  "[DEPRECATED] Search Pandora via the speaker (no built-in equivalent yet)",
+						Usage:  "Search Pandora stations",
 						Action: searchPandora,
 						Flags: []cli.Flag{
 							&cli.StringFlag{
@@ -710,7 +637,7 @@ func main() {
 					},
 					{
 						Name:   "search-spotify",
-						Usage:  "[DEPRECATED] Search Spotify via the speaker (no built-in equivalent yet)",
+						Usage:  "Search Spotify content",
 						Action: searchSpotify,
 						Flags: []cli.Flag{
 							&cli.StringFlag{
@@ -1127,43 +1054,6 @@ func main() {
 							},
 						},
 					},
-					{
-						Name:   "tunein",
-						Usage:  "Play a TuneIn station / episode / program by guide ID (#226)",
-						Action: playTuneIn,
-						Before: RequireHost,
-						Flags: []cli.Flag{
-							&cli.StringFlag{
-								Name:  "station",
-								Usage: "TuneIn live-station guide ID (e.g. s14991)",
-							},
-							&cli.StringFlag{
-								Name:  "episode",
-								Usage: "TuneIn single-episode guide ID (e.g. e789012)",
-							},
-							&cli.StringFlag{
-								Name:  "program",
-								Usage: "TuneIn podcast/program guide ID (e.g. p123456)",
-							},
-							&cli.StringFlag{
-								Name:  "id",
-								Usage: "TuneIn guide ID; kind auto-detected from s/e/p prefix",
-							},
-							&cli.StringFlag{
-								Name:    "name",
-								Aliases: []string{"n"},
-								Usage:   "Override the display name (skips name lookup)",
-							},
-							&cli.StringFlag{
-								Name:  "artwork",
-								Usage: "Override the artwork URL (skips artwork lookup)",
-							},
-							&cli.BoolFlag{
-								Name:  "no-lookup",
-								Usage: "Skip the TuneIn describe lookup; send the bare ContentItem",
-							},
-						},
-					},
 					{
 						Name:   "availability",
 						Usage:  "Show service availability",
@@ -1214,12 +1104,6 @@ func main() {
 						Action: introspectAllServices,
 						Before: RequireHost,
 					},
-					{
-						Name:   "notify-updated",
-						Usage:  "Tell the speaker to re-fetch its source list from AfterTouch",
-						Action: notifySourcesUpdated,
-						Before: RequireHost,
-					},
 				},
 			},
 			// Bass commands
@@ -1428,19 +1312,6 @@ func main() {
 								},
 								Before: RequireHost,
 							},
-							{
-								Name:   "timezone",
-								Usage:  "Set display timezone (IANA zone, e.g. Europe/Berlin)",
-								Action: setClockDisplayTimezone,
-								Flags: []cli.Flag{
-									&cli.StringFlag{
-										Name:     "tz",
-										Usage:    "IANA timezone identifier (e.g. Europe/Berlin, America/New_York)",
-										Required: true,
-									},
-								},
-								Before: RequireHost,
-							},
 						},
 					},
 				},
@@ -1607,64 +1478,6 @@ func main() {
 					},
 				},
 			},
-			// Stereo-pair (group) commands — ST-10 only
-			{
-				Name:    "group",
-				Aliases: []string{"g"},
-				Usage:   "ST-10 stereo-pair management (left/right channel pairing)",
-				Subcommands: []*cli.Command{
-					{
-						Name:   "status",
-						Usage:  "Show the device's current stereo-pair configuration",
-						Action: getGroupStatus,
-						Before: RequireHost,
-					},
-					{
-						Name:   "create",
-						Usage:  "Form a stereo pair (LEFT speaker becomes master)",
-						Action: createGroup,
-						Flags: []cli.Flag{
-							&cli.StringFlag{
-								Name:     "left",
-								Aliases:  []string{"l"},
-								Usage:    "IP address of the LEFT speaker (will be master)",
-								Required: true,
-							},
-							&cli.StringFlag{
-								Name:     "right",
-								Aliases:  []string{"r"},
-								Usage:    "IP address of the RIGHT speaker",
-								Required: true,
-							},
-							&cli.StringFlag{
-								Name:    "name",
-								Aliases: []string{"n"},
-								Usage:   "Pair name (defaults to \"<left> + <right>\")",
-							},
-						},
-					},
-					{
-						Name:   "rename",
-						Usage:  "Rename the existing stereo pair on the device",
-						Action: renameGroup,
-						Flags: []cli.Flag{
-							&cli.StringFlag{
-								Name:     "name",
-								Aliases:  []string{"n"},
-								Usage:    "New pair name",
-								Required: true,
-							},
-						},
-						Before: RequireHost,
-					},
-					{
-						Name:   "remove",
-						Usage:  "Dissolve the device's stereo pair",
-						Action: removeGroup,
-						Before: RequireHost,
-					},
-				},
-			},
 			// Advanced Audio commands
 			{
 				Name:    "audio",
@@ -1941,7 +1754,6 @@ func main() {
 						Action: playNotificationBeep,
 						Before: RequireHost,
 					},
-					ttsCloudCmd(),
 					{
 						Name:   "help",
 						Usage:  "Show detailed help about speaker functionality",
@@ -2281,7 +2093,7 @@ func main() {
 							&cli.StringFlag{
 								Name:    "filter",
 								Aliases: []string{"f"},
-								Usage:   "Filter events by type (comma-separated): nowPlaying,volume,connection,preset,zone,group,bass,sdkInfo,userActivity",
+								Usage:   "Filter events by type (comma-separated): nowPlaying,volume,connection,preset,zone,bass,sdkInfo,userActivity",
 							},
 							&cli.DurationFlag{
 								Name:    "duration",
@@ -2293,10 +2105,6 @@ func main() {
 								Name:  "no-reconnect",
 								Usage: "Disable automatic reconnection on connection loss",
 							},
-							&cli.StringFlag{
-								Name:  "debug",
-								Usage: "Print raw WebSocket frames to stderr — one of: all, unknown, errors",
-							},
 							&cli.BoolFlag{
 								Name:    "verbose",
 								Aliases: []string{"v"},
@@ -2309,14 +2117,6 @@ func main() {
 		},
 	}

-	// Speaker provisioning (factory-reset, Wi-Fi, URL rewrite, pairing).
-	// Defined in cmd_setup.go to keep the top-level command list readable.
-	app.Commands = append(app.Commands, setupCommand())
-
-	// AfterTouch service management (sources, accounts, devices).
-	// Defined in cmd_cloud.go.
-	app.Commands = append(app.Commands, cloudCommand())
-
 	// Sort commands alphabetically (including subcommands and flags recursively)
 	sortCommands(app.Commands)

@@ -14,16 +14,16 @@ func TestParseHostPort(t *testing.T) {
 	}{
 		{
 			name:        "IPv4 with port",
-			input:       "192.0.2.10:8090",
+			input:       "192.168.1.10:8090",
 			defaultPort: 8080,
-			wantHost:    "192.0.2.10",
+			wantHost:    "192.168.1.10",
 			wantPort:    8090,
 		},
 		{
 			name:        "IPv4 without port",
-			input:       "192.0.2.10",
+			input:       "192.168.1.10",
 			defaultPort: 8080,
-			wantHost:    "192.0.2.10",
+			wantHost:    "192.168.1.10",
 			wantPort:    8080,
 		},
 		{
@@ -63,30 +63,30 @@ func TestParseHostPort(t *testing.T) {
 		},
 		{
 			name:        "invalid port - non-numeric",
-			input:       "192.0.2.10:abc",
+			input:       "192.168.1.10:abc",
 			defaultPort: 8080,
-			wantHost:    "192.0.2.10",
+			wantHost:    "192.168.1.10",
 			wantPort:    8080,
 		},
 		{
 			name:        "invalid port - too high",
-			input:       "192.0.2.10:99999",
+			input:       "192.168.1.10:99999",
 			defaultPort: 8080,
-			wantHost:    "192.0.2.10",
+			wantHost:    "192.168.1.10",
 			wantPort:    8080,
 		},
 		{
 			name:        "invalid port - zero",
-			input:       "192.0.2.10:0",
+			input:       "192.168.1.10:0",
 			defaultPort: 8080,
-			wantHost:    "192.0.2.10",
+			wantHost:    "192.168.1.10",
 			wantPort:    8080,
 		},
 		{
 			name:        "invalid port - negative",
-			input:       "192.0.2.10:-123",
+			input:       "192.168.1.10:-123",
 			defaultPort: 8080,
-			wantHost:    "192.0.2.10",
+			wantHost:    "192.168.1.10",
 			wantPort:    8080,
 		},
 		{
@@ -105,37 +105,37 @@ func TestParseHostPort(t *testing.T) {
 		},
 		{
 			name:        "multiple colons - malformed",
-			input:       "192.0.2.100:8090:extra",
+			input:       "192.168.1.100:8090:extra",
 			defaultPort: 8080,
-			wantHost:    "192.0.2.100:8090:extra",
+			wantHost:    "192.168.1.100:8090:extra",
 			wantPort:    8080,
 		},
 		{
 			name:        "standard SoundTouch default",
-			input:       "192.0.2.10",
+			input:       "192.168.1.10",
 			defaultPort: 8090,
-			wantHost:    "192.0.2.10",
+			wantHost:    "192.168.1.10",
 			wantPort:    8090,
 		},
 		{
 			name:        "valid high port",
-			input:       "192.0.2.100:65535",
+			input:       "192.168.1.100:65535",
 			defaultPort: 8080,
-			wantHost:    "192.0.2.100",
+			wantHost:    "192.168.1.100",
 			wantPort:    65535,
 		},
 		{
 			name:        "valid low port",
-			input:       "192.0.2.100:1",
+			input:       "192.168.1.100:1",
 			defaultPort: 8080,
-			wantHost:    "192.0.2.100",
+			wantHost:    "192.168.1.100",
 			wantPort:    1,
 		},
 		{
 			name:        "real SoundTouch device example",
-			input:       "192.0.2.10:8090",
+			input:       "192.168.1.10:8090",
 			defaultPort: 8080,
-			wantHost:    "192.0.2.10",
+			wantHost:    "192.168.1.10",
 			wantPort:    8090,
 		},
 		{
@@ -166,8 +166,8 @@ func BenchmarkParseHostPort(b *testing.B) {
 		name  string
 		input string
 	}{
-		{"with_port", "192.0.2.100:8090"},
-		{"without_port", "192.0.2.100"},
+		{"with_port", "192.168.1.100:8090"},
+		{"without_port", "192.168.1.100"},
 		{"hostname_with_port", "soundtouch.local:8090"},
 		{"ipv6_with_port", "[::1]:8090"},
 	}
@@ -193,26 +193,26 @@ func TestParseHostPortSoundTouchScenarios(t *testing.T) {
 	}{
 		{
 			name:        "typical_cli_usage",
-			input:       "192.0.2.10:8091",
+			input:       "192.168.1.10:8091",
 			defaultPort: 8090,
 			description: "User specifies full host:port",
-			wantHost:    "192.0.2.10",
+			wantHost:    "192.168.1.10",
 			wantPort:    8091,
 		},
 		{
 			name:        "discovery_result_host_only",
-			input:       "192.0.2.10",
+			input:       "192.168.1.10",
 			defaultPort: 8090,
 			description: "Discovery returns IP, CLI uses default port",
-			wantHost:    "192.0.2.10",
+			wantHost:    "192.168.1.10",
 			wantPort:    8090,
 		},
 		{
 			name:        "custom_port_override",
-			input:       "192.0.2.100:9000",
+			input:       "192.168.1.100:9000",
 			defaultPort: 8090,
 			description: "User overrides default SoundTouch port",
-			wantHost:    "192.0.2.100",
+			wantHost:    "192.168.1.100",
 			wantPort:    9000,
 		},
 		{
@@ -225,10 +225,10 @@ func TestParseHostPortSoundTouchScenarios(t *testing.T) {
 		},
 		{
 			name:        "invalid_port_fallback",
-			input:       "192.0.2.10:invalid",
+			input:       "192.168.1.10:invalid",
 			defaultPort: 8090,
 			description: "Malformed port should fallback to default",
-			wantHost:    "192.0.2.10",
+			wantHost:    "192.168.1.10",
 			wantPort:    8090,
 		},
 	}
@@ -1,200 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"net/http"
-	"os"
-	"path/filepath"
-	"regexp"
-	"sort"
-	"strings"
-	"testing"
-
-	"github.com/gesellix/bose-soundtouch/pkg/service/handlers"
-	"github.com/go-chi/chi/v5"
-)
-
-// frozenFirstSegments are the top-level path prefixes that belong to the frozen
-// speaker / app contract (category 1a/1b in
-// docs/content/docs/architecture/API-ROUTE-LAYOUT.md). Routes under these must
-// not change shape across the issue #451 refactor, so each should have at least
-// one .http contract test (the suite under tests/integration/http-client/, run
-// by `make test-http-client`). Movable surfaces (/setup, /mgmt, /web) and infra
-// (/, /health, /docs, /favicon.ico) are intentionally excluded.
-var frozenFirstSegments = map[string]bool{
-	"streaming": true,
-	"accounts":  true,
-	"customer":  true,
-	"bmx":       true,
-	"bmx-icons": true,
-	"core02":    true,
-	"oauth":     true,
-	"custom":    true,
-	"media":     true,
-	"updates":   true,
-	"v1":        true,
-	"alexa":     true,
-	"ced":       true,
-}
-
-func coverageFirstSegment(p string) string {
-	p = strings.TrimPrefix(p, "/")
-	if i := strings.IndexByte(p, '/'); i >= 0 {
-		return p[:i]
-	}
-
-	return p
-}
-
-// patternToRegexp converts a chi route pattern into an anchored regexp:
-// `{param}` becomes a single path segment (`[^/]+`) and `*` becomes `.*`.
-func patternToRegexp(pattern string) *regexp.Regexp {
-	var b strings.Builder
-
-	b.WriteString("^")
-
-	for i, seg := range strings.Split(pattern, "/") {
-		if i > 0 {
-			b.WriteString("/")
-		}
-
-		switch {
-		case seg == "*":
-			b.WriteString(".*")
-		case strings.HasPrefix(seg, "{") && strings.HasSuffix(seg, "}"):
-			b.WriteString("[^/]+")
-		default:
-			b.WriteString(regexp.QuoteMeta(seg))
-		}
-	}
-
-	b.WriteString("$")
-
-	return regexp.MustCompile(b.String())
-}
-
-// loadHTTPClientRequests extracts (method, path) pairs from every .http file in
-// the integration suite. `{{host}}` is stripped (leaving a leading `/`), query
-// strings are dropped, and `{{var}}` template segments are left intact (they
-// contain no slash, so they match a `[^/]+` route segment).
-func loadHTTPClientRequests(t *testing.T, dir string) [][2]string {
-	t.Helper()
-
-	entries, err := os.ReadDir(dir)
-	if err != nil {
-		t.Fatalf("read http-client dir %s: %v", dir, err)
-	}
-
-	reqLine := regexp.MustCompile(`^\s*(GET|POST|PUT|DELETE|PATCH|HEAD)\s+(\S+)`)
-
-	var out [][2]string
-
-	for _, e := range entries {
-		if e.IsDir() || !strings.HasSuffix(e.Name(), ".http") {
-			continue
-		}
-
-		data, err := os.ReadFile(filepath.Join(dir, e.Name()))
-		if err != nil {
-			t.Fatalf("read %s: %v", e.Name(), err)
-		}
-
-		for _, line := range strings.Split(string(data), "\n") {
-			m := reqLine.FindStringSubmatch(line)
-			if m == nil {
-				continue
-			}
-
-			url := strings.ReplaceAll(m[2], "{{host}}", "")
-			if i := strings.IndexByte(url, '?'); i >= 0 {
-				url = url[:i]
-			}
-
-			if !strings.HasPrefix(url, "/") {
-				continue
-			}
-
-			out = append(out, [2]string{m[1], url})
-		}
-	}
-
-	return out
-}
-
-// TestFrozenRouteContractCoverage enforces that every frozen-contract route the
-// service registers is exercised by at least one .http integration test. The
-// set of *uncovered* frozen routes is golden-filed: adding a new frozen route
-// without a test (or adding a test that newly covers one) changes the set and
-// fails this test, forcing a conscious update of the golden file. It is the
-// machine-checked companion to tests/integration/http-client/COVERAGE.md.
-func TestFrozenRouteContractCoverage(t *testing.T) {
-	server := handlers.NewServer(nil, nil, "http://localhost:8000", true, true, true)
-	r := setupRouter(server, nil)
-
-	httpRequests := loadHTTPClientRequests(t, filepath.Join("..", "..", "tests", "integration", "http-client"))
-
-	// Only the request methods the contract suite actually exercises. Routes
-	// registered via chi HandleFunc carry every method (CONNECT/TRACE/...); those
-	// extra verbs are noise for coverage purposes.
-	meaningfulMethods := map[string]bool{
-		http.MethodGet: true, http.MethodPost: true, http.MethodPut: true, http.MethodDelete: true,
-	}
-
-	var uncovered []string
-
-	walkFunc := func(method, route string, _ http.Handler, _ ...func(http.Handler) http.Handler) error {
-		if !meaningfulMethods[method] {
-			return nil
-		}
-
-		if !frozenFirstSegments[coverageFirstSegment(route)] {
-			return nil
-		}
-
-		re := patternToRegexp(route)
-		for _, req := range httpRequests {
-			if req[0] == method && re.MatchString(req[1]) {
-				return nil
-			}
-		}
-
-		uncovered = append(uncovered, fmt.Sprintf("%-7s %s", method, route))
-
-		return nil
-	}
-
-	if err := chi.Walk(r, walkFunc); err != nil {
-		t.Fatalf("walk routes: %v", err)
-	}
-
-	sort.Strings(uncovered)
-	output := strings.Join(uncovered, "\n") + "\n"
-
-	const goldenPath = "testdata/frozen_routes_uncovered.txt"
-
-	actualPath := "testdata/frozen_routes_uncovered.actual.txt"
-	if err := os.WriteFile(actualPath, []byte(output), 0644); err != nil {
-		t.Fatalf("write actual: %v", err)
-	}
-
-	golden, err := os.ReadFile(goldenPath)
-	if os.IsNotExist(err) {
-		if err := os.WriteFile(goldenPath, []byte(output), 0644); err != nil {
-			t.Fatalf("create golden: %v", err)
-		}
-
-		t.Logf("created golden %s with %d uncovered frozen routes", goldenPath, len(uncovered))
-
-		return
-	}
-
-	if err != nil {
-		t.Fatalf("read golden: %v", err)
-	}
-
-	if string(golden) != output {
-		t.Errorf("Frozen-route contract coverage changed.\n"+
-			"A frozen route either lost its .http test or a new one was added without one.\n"+
-			"Review and, if intended, update %s from %s.", goldenPath, actualPath)
-	}
-}
@@ -1,47 +0,0 @@
-package main
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	"github.com/gesellix/bose-soundtouch/pkg/service/datastore"
-	"github.com/gesellix/bose-soundtouch/pkg/service/handlers"
-)
-
-// TestDeprecatedRouteSignal verifies the legacy admin paths are counted (and the
-// new /api/* twins are not), so the diagnostic export can show whether the old
-// paths are still in use before they are removed in a future major release.
-func TestDeprecatedRouteSignal(t *testing.T) {
-	ds := datastore.NewDataStore(t.TempDir())
-	_ = ds.Initialize()
-
-	server := handlers.NewServer(ds, nil, "http://localhost:8000", true, false, false)
-	r := setupRouter(server, nil)
-
-	ts := httptest.NewServer(r)
-	defer ts.Close()
-
-	hit := func(path string) {
-		resp, err := http.Get(ts.URL + path)
-		if err != nil {
-			t.Fatalf("GET %s: %v", path, err)
-		}
-
-		_ = resp.Body.Close()
-	}
-
-	hit("/setup/version")     // legacy — counted
-	hit("/setup/version")     // legacy again — count increments
-	hit("/api/setup/version") // new canonical — must NOT be counted
-
-	hits := server.DeprecatedRouteHits()
-
-	if got := hits["GET /setup/version"]; got != 2 {
-		t.Errorf("legacy GET /setup/version hits = %d, want 2", got)
-	}
-
-	if _, tracked := hits["GET /api/setup/version"]; tracked {
-		t.Errorf("/api/setup/version must not be tracked as deprecated; hits=%v", hits)
-	}
-}
@@ -1,86 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	"github.com/gesellix/bose-soundtouch/pkg/service/datastore"
-	"github.com/gesellix/bose-soundtouch/pkg/service/handlers"
-)
-
-// TestDualRouteEquivalence verifies the issue #451 step-1 aliasing invariant:
-// each admin-tier route served at both its legacy path and the new /api/* path
-// returns an identical response (same handler, same middleware). It fires the
-// same request at the old and new path and asserts equal status + body.
-//
-// The cases use endpoints whose body does not embed per-request time/random
-// values, so the only thing that can differ is the routing — which is exactly
-// what we want to pin while the routes are dual-mounted.
-func TestDualRouteEquivalence(t *testing.T) {
-	ds := datastore.NewDataStore(t.TempDir())
-	_ = ds.Initialize()
-
-	server := handlers.NewServer(ds, nil, "http://localhost:8000", true, false, false)
-	r := setupRouter(server, nil)
-
-	ts := httptest.NewServer(r)
-	defer ts.Close()
-
-	cases := []struct {
-		method  string
-		oldPath string
-		newPath string
-	}{
-		{http.MethodGet, "/setup/version", "/api/setup/version"},
-		{http.MethodGet, "/setup/settings", "/api/setup/settings"},
-		{http.MethodGet, "/setup/tts/config", "/api/setup/tts/config"},
-		{http.MethodGet, "/setup/logging-settings", "/api/setup/logging-settings"},
-		{http.MethodGet, "/setup/interaction-stats", "/api/setup/interaction-stats"},
-		{http.MethodGet, "/setup/dns-discoveries", "/api/setup/dns-discoveries"},
-		// /mgmt is Basic-Auth'd; without credentials both paths must reject
-		// identically — that pins the auth gate is mirrored onto /api/mgmt too.
-		{http.MethodGet, "/mgmt/accounts/", "/api/mgmt/accounts/"},
-		{http.MethodGet, "/mgmt/spotify/accounts", "/api/mgmt/spotify/accounts"},
-		{http.MethodGet, "/mgmt/amazon/accounts", "/api/mgmt/amazon/accounts"},
-	}
-
-	for _, c := range cases {
-		t.Run(c.method+" "+c.newPath, func(t *testing.T) {
-			oldStatus, oldBody := doEquivReq(t, ts.URL, c.method, c.oldPath)
-			newStatus, newBody := doEquivReq(t, ts.URL, c.method, c.newPath)
-
-			if oldStatus != newStatus {
-				t.Errorf("status mismatch for %s vs %s: old=%d new=%d", c.oldPath, c.newPath, oldStatus, newStatus)
-			}
-
-			if !bytes.Equal(oldBody, newBody) {
-				t.Errorf("body mismatch for %s vs %s:\n old=%q\n new=%q", c.oldPath, c.newPath, oldBody, newBody)
-			}
-		})
-	}
-}
-
-func doEquivReq(t *testing.T, base, method, path string) (int, []byte) {
-	t.Helper()
-
-	req, err := http.NewRequest(method, base+path, nil)
-	if err != nil {
-		t.Fatalf("build request %s: %v", path, err)
-	}
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		t.Fatalf("request %s: %v", path, err)
-	}
-	defer func() { _ = resp.Body.Close() }()
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		t.Fatalf("read body %s: %v", path, err)
-	}
-
-	return resp.StatusCode, body
-}
@@ -1,13 +0,0 @@
-package main
-
-import "strings"
-
-// sanitizeLog strips newline characters from s to prevent log-injection
-// (CodeQL go/log-injection). Values from speakers, HTTP requests, and
-// external APIs may contain attacker-controlled newlines.
-func sanitizeLog(s string) string {
-	s = strings.ReplaceAll(s, "\n", `\n`)
-	s = strings.ReplaceAll(s, "\r", `\r`)
-
-	return s
-}
@@ -90,100 +90,3 @@ func TestApplyPersistedSettings(t *testing.T) {
 		}
 	})
 }
-
-func TestMergeTLSExtraHosts(t *testing.T) {
-	cases := []struct {
-		name      string
-		cli       []string
-		persisted []string
-		want      []string
-	}{
-		{
-			name:      "CLI only",
-			cli:       []string{"a.example"},
-			persisted: nil,
-			want:      []string{"a.example"},
-		},
-		{
-			name:      "Persisted only",
-			cli:       nil,
-			persisted: []string{"b.example"},
-			want:      []string{"b.example"},
-		},
-		{
-			name:      "CLI wins ordering, persisted appended",
-			cli:       []string{"a.example"},
-			persisted: []string{"b.example"},
-			want:      []string{"a.example", "b.example"},
-		},
-		{
-			name:      "Dedupes overlap",
-			cli:       []string{"a.example", "b.example"},
-			persisted: []string{"b.example", "c.example"},
-			want:      []string{"a.example", "b.example", "c.example"},
-		},
-		{
-			name:      "Drops empty + whitespace",
-			cli:       []string{"  ", "a.example", ""},
-			persisted: []string{"", "  b.example  "},
-			want:      []string{"a.example", "b.example"},
-		},
-		{
-			name:      "Both empty",
-			cli:       nil,
-			persisted: nil,
-			want:      []string{},
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			got := mergeTLSExtraHosts(tc.cli, tc.persisted)
-			if len(got) != len(tc.want) {
-				t.Fatalf("len mismatch: got %v, want %v", got, tc.want)
-			}
-
-			for i := range got {
-				if got[i] != tc.want[i] {
-					t.Errorf("index %d: got %q, want %q (full: %v vs %v)", i, got[i], tc.want[i], got, tc.want)
-				}
-			}
-		})
-	}
-}
-
-func TestGetDomains_IncludesOAuthDerivation(t *testing.T) {
-	// Hostname-based serverURL: the derived OAuth variant must end up
-	// in the served TLS cert SAN list, otherwise the speaker rejects
-	// the TLS handshake on Spotify / Amazon Music token refresh.
-	got := getDomains("http://mac.fritz.box:8000", "https://mac.fritz.box:8443", "mac.fritz.box", nil)
-
-	want := "macoauth.fritz.box"
-	if !contains(got, want) {
-		t.Errorf("expected SAN list to include %q (derived from serverURL), got: %v", want, got)
-	}
-}
-
-func TestGetDomains_IPServerURLProducesNoOAuthDerivation(t *testing.T) {
-	// IP-based serverURL deliberately yields no derivation (the speaker's
-	// `<first-label>oauth.<rest>` construction would be malformed for an
-	// IP and no DNS resolver can answer for it). The cert SAN list must
-	// not pretend to cover something that can never be queried.
-	got := getDomains("http://192.168.0.30:8000", "https://192.168.0.30:8443", "192.168.0.30", nil)
-
-	for _, h := range got {
-		if h == "192oauth.168.0.30" {
-			t.Errorf("SAN list must not include malformed IP-derived OAuth name, got: %v", got)
-		}
-	}
-}
-
-func contains(haystack []string, needle string) bool {
-	for _, h := range haystack {
-		if h == needle {
-			return true
-		}
-	}
-
-	return false
-}
@@ -3,7 +3,6 @@ package main
 import (
 	"fmt"
 	"net/http"
-	"net/http/httptest"
 	"os"
 	"reflect"
 	"runtime"
@@ -11,7 +10,6 @@ import (
 	"strings"
 	"testing"

-	"github.com/gesellix/bose-soundtouch/pkg/service/datastore"
 	"github.com/gesellix/bose-soundtouch/pkg/service/handlers"
 	"github.com/go-chi/chi/v5"
 )
@@ -19,7 +17,7 @@ import (
 func TestPrintRoutes(t *testing.T) {
 	// Initialize a minimal server to get the router
 	server := handlers.NewServer(nil, nil, "http://localhost:8000", true, true, true)
-	r := setupRouter(server, nil)
+	r := setupRouter(server)

 	var routes []string
 	walkFunc := func(method string, route string, handler http.Handler, middlewares ...func(http.Handler) http.Handler) error {
@@ -104,56 +102,3 @@ func TestPrintRoutes(t *testing.T) {
 		t.Errorf("Router routes changed! Diff the snapshot at %s with %s", snapshotPath, actualPath)
 	}
 }
-
-// TestPUTRenameRoutesToLocalHandler reproduces the runtime routing
-// behaviour the user saw on their deployed v0.80.0: a PUT to
-// /streaming/account/{a}/device/{d} should land on
-// HandleMargeUpdateDevice, not fall through to the [UNHANDLED]
-// proxy. The handlers-package test (TestIssue285_*) uses a simplified
-// router that doesn't have the overlapping `/device` and
-// `/device/{device}` route groups, so it can't catch a chi radix-
-// tree resolution that prefers the more-specific subrouter.
-//
-// This test exercises the actual production setupRouter so a
-// regression in the route topology is caught against the same chi
-// behaviour speakers will see.
-func TestPUTRenameRoutesToLocalHandler(t *testing.T) {
-	tempDir, err := os.MkdirTemp("", "router-rename-")
-	if err != nil {
-		t.Fatalf("mkdir temp: %v", err)
-	}
-	defer os.RemoveAll(tempDir)
-
-	ds := datastore.NewDataStore(tempDir)
-	_ = ds.Initialize()
-
-	server := handlers.NewServer(ds, nil, "http://localhost:8000", false, false, false)
-	r := setupRouter(server, nil)
-	ts := httptest.NewServer(r)
-	defer ts.Close()
-
-	body := `<?xml version="1.0" encoding="UTF-8" ?><device deviceid="AABBCCDDEEFF"><name>Living Room SoundTouch</name><macaddress>AABBCCDDEEFF</macaddress></device>`
-
-	req, err := http.NewRequest(http.MethodPut,
-		ts.URL+"/streaming/account/1111111/device/AABBCCDDEEFF",
-		strings.NewReader(body))
-	if err != nil {
-		t.Fatalf("build request: %v", err)
-	}
-
-	req.Header.Set("Content-Type", "application/xml")
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		t.Fatalf("PUT: %v", err)
-	}
-	defer func() { _ = resp.Body.Close() }()
-
-	// 200 means our local HandleMargeUpdateDevice handled it.
-	// 401 / 502 / anything else means the request fell through to
-	// the [UNHANDLED] proxy and got the upstream response — which
-	// is exactly the failure mode #285 was supposed to fix.
-	if resp.StatusCode != http.StatusOK {
-		t.Fatalf("PUT status = %d, want 200 (local handler). Anything else means the request fell through to [UNHANDLED] proxy — chi is routing to a different subrouter than the PUT registration intended.", resp.StatusCode)
-	}
-}
@@ -1,35 +0,0 @@
-DELETE  /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter
-DELETE  /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter/*
-DELETE  /streaming/account/{account}/group
-GET     /bmx-icons/*
-GET     /bmx/tunein/v1/navigate
-GET     /bmx/tunein/v1/navigate/*
-GET     /bmx/tunein/v1/playback/episode/{podcastID}
-GET     /bmx/tunein/v1/playback/episodes/{podcastID}
-GET     /bmx/tunein/v1/search
-GET     /bmx/tunein/v1/search/next
-GET     /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter
-GET     /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter/*
-GET     /media/tts/{id}
-GET     /streaming/account/{account}/device/{device}/group
-GET     /streaming/account/{account}/device/{device}/group/member
-GET     /streaming/account/{account}/device/{device}/group/server
-GET     /streaming/account/{account}/device/{device}/recent
-GET     /streaming/account/{account}/presets
-GET     /streaming/device_setting/account/{account}/device/{device}/device_settings
-POST    /core02/svc-bmx-adapter-orion/prod/orion/token
-POST    /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter
-POST    /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter/*
-POST    /oauth/account/{account}/music/musicprovider/{sourceID}/token/cs
-POST    /oauth/device/{deviceID}/music/musicprovider/{sourceID}/token
-POST    /streaming/account/{account}/device/{device}
-POST    /streaming/account/{account}/device/{device}/presets/{presetNumber}
-POST    /streaming/account/{account}/group
-POST    /streaming/account/{account}/group/{groupId}
-POST    /streaming/device_setting/account/{account}/device/{device}/device_settings
-POST    /streaming/music/musicprovider/{providerID}/trial/is_eligible
-POST    /streaming/stats/error
-POST    /streaming/stats/usage
-POST    /v1/stapp/{deviceId}
-PUT     /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter
-PUT     /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter/*
@@ -1,91 +1,41 @@
-CONNECT  /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter handlers.(*Server).HandleSiriusXMLiveAdapter-fm
-CONNECT  /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter/* handlers.(*Server).HandleSiriusXMLiveAdapterSubpath-fm
-DELETE   /accounts/{account}/devices/{device}                         handlers.(*Server).HandleUnsupported-fm
-DELETE   /accounts/{account}/group                                    handlers.(*Server).HandleUnsupported-fm
-DELETE   /accounts/{account}/group/                                   handlers.(*Server).HandleUnsupported-fm
-DELETE   /accounts/{account}/group/{groupId}                          handlers.(*Server).HandleUnsupported-fm
-DELETE   /api/setup/devices/{deviceId}                                handlers.(*Server).HandleRemoveDevice-fm
-DELETE   /api/setup/dns-discoveries                                   handlers.(*Server).HandleClearDNSDiscoveries-fm
-DELETE   /api/setup/interactions/sessions                             handlers.(*Server).HandleCleanupSessions-fm
-DELETE   /api/setup/interactions/sessions/{session}                   handlers.(*Server).HandleDeleteSession-fm
-DELETE   /api/setup/sources/{account}/{device}/{sourceID}             handlers.(*Server).HandleDeleteSource-fm
+CONNECT  /oauth/*                                                     handlers.(*Server).HandleBoseProxy-fm
+DELETE   /accounts/{account}/devices/{device}                         handlers.(*Server).HandleMargeRemoveDevice-fm
+DELETE   /accounts/{account}/group/{groupId}                          handlers.(*Server).HandleMargeDeleteGroup-fm
 DELETE   /bmx/tunein/v1/favorite/{stationID}                          handlers.(*Server).HandleTuneInDeleteFavorite-fm
-DELETE   /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter handlers.(*Server).HandleSiriusXMLiveAdapter-fm
-DELETE   /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter/* handlers.(*Server).HandleSiriusXMLiveAdapterSubpath-fm
+DELETE   /oauth/*                                                     handlers.(*Server).HandleBoseProxy-fm
 DELETE   /setup/devices/{deviceId}                                    handlers.(*Server).HandleRemoveDevice-fm
 DELETE   /setup/dns-discoveries                                       handlers.(*Server).HandleClearDNSDiscoveries-fm
 DELETE   /setup/interactions/sessions                                 handlers.(*Server).HandleCleanupSessions-fm
 DELETE   /setup/interactions/sessions/{session}                       handlers.(*Server).HandleDeleteSession-fm
-DELETE   /setup/sources/{account}/{device}/{sourceID}                 handlers.(*Server).HandleDeleteSource-fm
-DELETE   /streaming/account/{account}/device/{device}                 handlers.(*Server).HandleMargeRemoveDevice-fm
+DELETE   /setup/parity-mismatches                                     handlers.(*Server).HandleClearParityMismatches-fm
 DELETE   /streaming/account/{account}/device/{device}/preset/{presetNumber} handlers.(*Server).HandleMargeRemovePreset-fm
-DELETE   /streaming/account/{account}/group                           handlers.(*Server).HandleMargeDeleteAccountGroups-fm
-DELETE   /streaming/account/{account}/group/                          handlers.(*Server).HandleMargeDeleteAccountGroups-fm
 DELETE   /streaming/account/{account}/group/{groupId}                 handlers.(*Server).HandleMargeDeleteGroup-fm
-DELETE   /streaming/account/{account}/source/{sourceID}               handlers.(*Server).HandleMargeDeleteSource-fm
 GET      /                                                            handlers.(*Server).HandleRoot-fm
-GET      /accounts/{account}/devices                                  handlers.(*Server).HandleUnsupported-fm
-GET      /accounts/{account}/devices/{device}/group                   handlers.(*Server).HandleUnsupported-fm
-GET      /accounts/{account}/devices/{device}/group/                  handlers.(*Server).HandleUnsupported-fm
-GET      /accounts/{account}/devices/{device}/group/member            handlers.(*Server).HandleUnsupported-fm
-GET      /accounts/{account}/devices/{device}/group/server            handlers.(*Server).HandleUnsupported-fm
-GET      /accounts/{account}/devices/{device}/presets                 handlers.(*Server).HandleUnsupported-fm
-GET      /accounts/{account}/devices/{device}/recents                 handlers.(*Server).HandleUnsupported-fm
-GET      /accounts/{account}/full                                     handlers.(*Server).HandleUnsupported-fm
-GET      /accounts/{account}/sources                                  handlers.(*Server).HandleUnsupported-fm
-GET      /api/mgmt/accounts/                                          handlers.(*Server).HandleMgmtListAccounts-fm
-GET      /api/mgmt/accounts/{accountId}                               handlers.(*Server).HandleMgmtAccountDetails-fm
-GET      /api/mgmt/accounts/{accountId}/speakers                      handlers.(*Server).HandleMgmtListSpeakers-fm
-GET      /api/mgmt/amazon/accounts                                    handlers.(*Server).HandleMgmtAmazonAccounts-fm
-GET      /api/mgmt/amazon/token                                       handlers.(*Server).HandleMgmtAmazonToken-fm
-GET      /api/mgmt/devices/{deviceId}/events                          handlers.(*Server).HandleMgmtDeviceEvents-fm
-GET      /api/mgmt/spotify/accounts                                   handlers.(*Server).HandleMgmtSpotifyAccounts-fm
-GET      /api/mgmt/spotify/token                                      handlers.(*Server).HandleMgmtSpotifyToken-fm
-GET      /api/setup/account-id-suggestions/{deviceId}                 handlers.(*Server).HandleAccountIDSuggestions-fm
-GET      /api/setup/ca.crt                                            handlers.(*Server).HandleGetCACert-fm
-GET      /api/setup/device-summary/{deviceId}                         handlers.(*Server).HandleDeviceSummary-fm
-GET      /api/setup/devices                                           handlers.(*Server).HandleListDiscoveredDevices-fm
-GET      /api/setup/devices/{deviceId}/events                         handlers.(*Server).HandleGetDeviceEvents-fm
-GET      /api/setup/discovery-status                                  handlers.(*Server).HandleGetDiscoveryStatus-fm
-GET      /api/setup/dns-discoveries                                   handlers.(*Server).HandleGetDNSDiscoveries-fm
-GET      /api/setup/dns-discoveries/download                          handlers.(*Server).HandleDownloadDNSDiscoveries-fm
-GET      /api/setup/export/diagnostic                                 handlers.(*Server).HandleExportDiagnostic-fm
-GET      /api/setup/health                                            handlers.(*Server).HandleHealthChecks-fm
-GET      /api/setup/info/{deviceId}                                   handlers.(*Server).HandleGetDeviceInfo-fm
-GET      /api/setup/interaction-content                               handlers.(*Server).HandleGetInteractionContent-fm
-GET      /api/setup/interaction-stats                                 handlers.(*Server).HandleGetInteractionStats-fm
-GET      /api/setup/interactions                                      handlers.(*Server).HandleListInteractions-fm
-GET      /api/setup/interactions/sessions/{session}/download          handlers.(*Server).HandleDownloadSession-fm
-GET      /api/setup/logging-settings                                  handlers.(*Server).HandleGetLoggingSettings-fm
-GET      /api/setup/logs                                              handlers.(*Server).HandleGetLogs-fm
-GET      /api/setup/settings                                          handlers.(*Server).HandleGetSettings-fm
-GET      /api/setup/summary/{deviceId}                                handlers.(*Server).HandleGetMigrationSummary-fm
-GET      /api/setup/tts/config                                        handlers.(*Server).HandleTTSConfig-fm
-GET      /api/setup/version                                           handlers.(*Server).HandleGetVersionInfo-fm
+GET      /accounts/{account}/devices                                  handlers.(*Server).HandleMargeAccountDevices-fm
+GET      /accounts/{account}/devices/{device}/group                   handlers.(*Server).HandleMargeDeviceGroup-fm
+GET      /accounts/{account}/devices/{device}/group/                  handlers.(*Server).HandleMargeDeviceGroup-fm
+GET      /accounts/{account}/devices/{device}/group/member            handlers.(*Server).HandleMargeDeviceGroupMember-fm
+GET      /accounts/{account}/devices/{device}/group/server            handlers.(*Server).HandleMargeDeviceGroupServer-fm
+GET      /accounts/{account}/devices/{device}/presets                 handlers.(*Server).HandleMargePresets-fm
+GET      /accounts/{account}/devices/{device}/recents                 handlers.(*Server).HandleMargeRecents-fm
+GET      /accounts/{account}/full                                     handlers.(*Server).HandleMargeAccountFull-fm
+GET      /accounts/{account}/sources                                  handlers.(*Server).HandleMargeAccountSources-fm
 GET      /bmx-icons/*                                                 handlers.(*Server).HandleBmxIcons
 GET      /bmx/registry/v1/services                                    handlers.(*Server).HandleBMXRegistry-fm
 GET      /bmx/registry/v1/servicesAvailability                        handlers.(*Server).HandleBMXServicesAvailability-fm
-GET      /bmx/tunein/                                                 handlers.(*Server).HandleTuneInService-fm
 GET      /bmx/tunein/v1/navigate                                      handlers.(*Server).HandleTuneInNavigate-fm
 GET      /bmx/tunein/v1/navigate/*                                    handlers.(*Server).HandleTuneInNavigate-fm
 GET      /bmx/tunein/v1/playback/episode/{podcastID}                  handlers.(*Server).HandleTuneInPlaybackPodcast-fm
 GET      /bmx/tunein/v1/playback/episodes/{podcastID}                 handlers.(*Server).HandleTuneInPodcastInfo-fm
 GET      /bmx/tunein/v1/playback/station/{stationID}                  handlers.(*Server).HandleTuneInPlayback-fm
 GET      /bmx/tunein/v1/search                                        handlers.(*Server).HandleTuneInSearch-fm
-GET      /bmx/tunein/v1/search/next                                   handlers.(*Server).HandleTuneInSearchNext-fm
 GET      /ced/*                                                       handlers.(*Server).HandleCedStatic
-GET      /core02/svc-bmx-adapter-orion/prod/orion                     handlers.(*Server).HandleOrionService-fm
-GET      /core02/svc-bmx-adapter-orion/prod/orion/station             handlers.(*Server).HandleOrionPlayback-fm
-GET      /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter handlers.(*Server).HandleSiriusXMLiveAdapter-fm
-GET      /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter/* handlers.(*Server).HandleSiriusXMLiveAdapterSubpath-fm
 GET      /custom/v1/playback/{encodedURL}                             handlers.(*Server).HandleCustomPlayback-fm
 GET      /customer/account/{account}                                  handlers.(*Server).HandleMargeAccountProfile-fm
 GET      /docs/*                                                      handlers.(*Server).HandleDocs-fm
 GET      /favicon.ico                                                 setupRouter
 GET      /health                                                      handlers.(*Server).HandleHealth-fm
 GET      /media/*                                                     handlers.(*Server).HandleMedia
-GET      /media/aftertouch-ding.wav                                   handlers.(*Server).HandleDing-fm
-GET      /media/tts/{id}                                              handlers.(*Server).HandleTTSMedia-fm
 GET      /mgmt/accounts/                                              handlers.(*Server).HandleMgmtListAccounts-fm
 GET      /mgmt/accounts/{accountId}                                   handlers.(*Server).HandleMgmtAccountDetails-fm
 GET      /mgmt/accounts/{accountId}/speakers                          handlers.(*Server).HandleMgmtListSpeakers-fm
@@ -96,26 +46,23 @@ GET      /mgmt/devices/{deviceId}/events                              handlers.(
 GET      /mgmt/spotify/accounts                                       handlers.(*Server).HandleMgmtSpotifyAccounts-fm
 GET      /mgmt/spotify/callback                                       handlers.(*Server).HandleMgmtSpotifyCallback-fm
 GET      /mgmt/spotify/token                                          handlers.(*Server).HandleMgmtSpotifyToken-fm
-GET      /setup/account-id-suggestions/{deviceId}                     handlers.(*Server).HandleAccountIDSuggestions-fm
+GET      /oauth/*                                                     handlers.(*Server).HandleBoseProxy-fm
+GET      /proxy/*                                                     handlers.(*Server).HandleProxyRequest-fm
 GET      /setup/ca.crt                                                handlers.(*Server).HandleGetCACert-fm
-GET      /setup/device-summary/{deviceId}                             handlers.(*Server).HandleDeviceSummary-fm
 GET      /setup/devices                                               handlers.(*Server).HandleListDiscoveredDevices-fm
 GET      /setup/devices/{deviceId}/events                             handlers.(*Server).HandleGetDeviceEvents-fm
 GET      /setup/discovery-status                                      handlers.(*Server).HandleGetDiscoveryStatus-fm
 GET      /setup/dns-discoveries                                       handlers.(*Server).HandleGetDNSDiscoveries-fm
 GET      /setup/dns-discoveries/download                              handlers.(*Server).HandleDownloadDNSDiscoveries-fm
-GET      /setup/export/diagnostic                                     handlers.(*Server).HandleExportDiagnostic-fm
-GET      /setup/health                                                handlers.(*Server).HandleHealthChecks-fm
 GET      /setup/info/{deviceId}                                       handlers.(*Server).HandleGetDeviceInfo-fm
 GET      /setup/interaction-content                                   handlers.(*Server).HandleGetInteractionContent-fm
 GET      /setup/interaction-stats                                     handlers.(*Server).HandleGetInteractionStats-fm
 GET      /setup/interactions                                          handlers.(*Server).HandleListInteractions-fm
 GET      /setup/interactions/sessions/{session}/download              handlers.(*Server).HandleDownloadSession-fm
-GET      /setup/logging-settings                                      handlers.(*Server).HandleGetLoggingSettings-fm
-GET      /setup/logs                                                  handlers.(*Server).HandleGetLogs-fm
+GET      /setup/parity-mismatches                                     handlers.(*Server).HandleListParityMismatches-fm
+GET      /setup/proxy-settings                                        handlers.(*Server).HandleGetProxySettings-fm
 GET      /setup/settings                                              handlers.(*Server).HandleGetSettings-fm
 GET      /setup/summary/{deviceId}                                    handlers.(*Server).HandleGetMigrationSummary-fm
-GET      /setup/tts/config                                            handlers.(*Server).HandleTTSConfig-fm
 GET      /setup/version                                               handlers.(*Server).HandleGetVersionInfo-fm
 GET      /streaming/account/{account}/device/{device}/group           handlers.(*Server).HandleMargeDeviceGroup-fm
 GET      /streaming/account/{account}/device/{device}/group/          handlers.(*Server).HandleMargeDeviceGroup-fm
@@ -137,57 +84,22 @@ GET      /streaming/resources/api_versions.xml                        handlers.(
 GET      /streaming/software/update/account/{account}                 handlers.(*Server).HandleMargeSoftwareUpdate-fm
 GET      /streaming/sourceproviders                                   handlers.(*Server).HandleMargeSourceProviders-fm
 GET      /updates/soundtouch                                          handlers.(*Server).HandleMargeSoftwareUpdate-fm
-GET      /v1/auth                                                     handlers.(*Server).HandleSpeakerAuth-fm
 GET      /v1/blacklist/{deviceId}                                     setupRouter
 GET      /web/*                                                       setupRouter.(*Server).HandleWeb
-HEAD     /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter handlers.(*Server).HandleSiriusXMLiveAdapter-fm
-HEAD     /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter/* handlers.(*Server).HandleSiriusXMLiveAdapterSubpath-fm
-OPTIONS  /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter handlers.(*Server).HandleSiriusXMLiveAdapter-fm
-OPTIONS  /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter/* handlers.(*Server).HandleSiriusXMLiveAdapterSubpath-fm
-PATCH    /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter handlers.(*Server).HandleSiriusXMLiveAdapter-fm
-PATCH    /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter/* handlers.(*Server).HandleSiriusXMLiveAdapterSubpath-fm
-POST     /accounts/{account}/devices                                  handlers.(*Server).HandleUnsupported-fm
-POST     /accounts/{account}/devices/{device}/presets/{presetNumber}  handlers.(*Server).HandleUnsupported-fm
-POST     /accounts/{account}/devices/{device}/recents                 handlers.(*Server).HandleUnsupported-fm
-POST     /accounts/{account}/group                                    handlers.(*Server).HandleUnsupported-fm
-POST     /accounts/{account}/group/                                   handlers.(*Server).HandleUnsupported-fm
-POST     /accounts/{account}/group/{groupId}                          handlers.(*Server).HandleUnsupported-fm
+HEAD     /oauth/*                                                     handlers.(*Server).HandleBoseProxy-fm
+OPTIONS  /oauth/*                                                     handlers.(*Server).HandleBoseProxy-fm
+PATCH    /oauth/*                                                     handlers.(*Server).HandleBoseProxy-fm
+POST     /accounts/{account}/devices                                  handlers.(*Server).HandleMargeAddDevice-fm
+POST     /accounts/{account}/devices/{device}/presets/{presetNumber}  handlers.(*Server).HandleMargeUpdatePreset-fm
+POST     /accounts/{account}/devices/{device}/recents                 handlers.(*Server).HandleMargeAddRecent-fm
+POST     /accounts/{account}/group                                    handlers.(*Server).HandleMargeAddGroup-fm
+POST     /accounts/{account}/group/{groupId}                          handlers.(*Server).HandleMargeModifyGroup-fm
 POST     /alexa/certificate                                           handlers.(*Server).HandleAlexaCertificate-fm
-POST     /api/mgmt/accounts/{accountId}/language                      handlers.(*Server).HandleMgmtUpdateAccountLanguage-fm
-POST     /api/mgmt/accounts/{accountId}/provider-settings             handlers.(*Server).HandleMgmtUpdateAccountProviderSetting-fm
-POST     /api/mgmt/amazon/confirm                                     handlers.(*Server).HandleMgmtAmazonConfirm-fm
-POST     /api/mgmt/amazon/init                                        handlers.(*Server).HandleMgmtAmazonInit-fm
-POST     /api/mgmt/amazon/prime                                       handlers.(*Server).HandleMgmtPrimeDeviceAmazon-fm
-POST     /api/mgmt/spotify/confirm                                    handlers.(*Server).HandleMgmtSpotifyConfirm-fm
-POST     /api/mgmt/spotify/entity                                     handlers.(*Server).HandleMgmtSpotifyEntity-fm
-POST     /api/mgmt/spotify/init                                       handlers.(*Server).HandleMgmtSpotifyInit-fm
-POST     /api/mgmt/spotify/prime                                      handlers.(*Server).HandleMgmtPrimeDevice-fm
-POST     /api/setup/backup/{deviceId}                                 handlers.(*Server).HandleBackupConfig-fm
-POST     /api/setup/devices                                           handlers.(*Server).HandleAddManualDevice-fm
-POST     /api/setup/discover                                          handlers.(*Server).HandleTriggerDiscovery-fm
-POST     /api/setup/ensure-remote-services/{deviceId}                 handlers.(*Server).HandleEnsureRemoteServices-fm
-POST     /api/setup/health/dns-path-probe                             handlers.(*Server).HandleDNSPathProbe-fm
-POST     /api/setup/health/fix                                        handlers.(*Server).HandleHealthFix-fm
-POST     /api/setup/logging-settings                                  handlers.(*Server).HandleUpdateLoggingSettings-fm
-POST     /api/setup/migrate/{deviceId}                                handlers.(*Server).HandleMigrateDevice-fm
-POST     /api/setup/pair-account/{deviceId}                           handlers.(*Server).HandlePairAccount-fm
-POST     /api/setup/peer-probe/{deviceId}                             handlers.(*Server).HandlePeerProbe-fm
-POST     /api/setup/reboot/{deviceId}                                 handlers.(*Server).HandleRebootDevice-fm
-POST     /api/setup/remove-remote-services/{deviceId}                 handlers.(*Server).HandleRemoveRemoteServices-fm
-POST     /api/setup/revert/{deviceId}                                 handlers.(*Server).HandleRevertMigration-fm
-POST     /api/setup/settings                                          handlers.(*Server).HandleUpdateSettings-fm
-POST     /api/setup/sync/{deviceId}                                   handlers.(*Server).HandleInitialSync-fm
-POST     /api/setup/test-connection/{deviceId}                        handlers.(*Server).HandleTestConnection-fm
-POST     /api/setup/test-dns/{deviceId}                               handlers.(*Server).HandleTestDNSRedirection-fm
-POST     /api/setup/test-hosts/{deviceId}                             handlers.(*Server).HandleTestHostsRedirection-fm
-POST     /api/setup/trust-ca/{deviceId}                               handlers.(*Server).HandleTrustCACert-fm
-POST     /api/setup/tts/speak                                         handlers.(*Server).HandleTTSSpeak-fm
+POST     /bmx/core02/svc-bmx-adapter-orion/prod/orion/token           handlers.(*Server).HandleOrionToken-fm
+POST     /bmx/orion/v1/playback/station/{data}                        handlers.(*Server).HandleOrionPlayback-fm
 POST     /bmx/tunein/v1/favorite/{stationID}                          handlers.(*Server).HandleTuneInFavorite-fm
 POST     /bmx/tunein/v1/report                                        handlers.(*Server).HandleTuneInReport-fm
 POST     /bmx/tunein/v1/token                                         handlers.(*Server).HandleTuneInToken-fm
-POST     /core02/svc-bmx-adapter-orion/prod/orion/token               handlers.(*Server).HandleOrionToken-fm
-POST     /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter handlers.(*Server).HandleSiriusXMLiveAdapter-fm
-POST     /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter/* handlers.(*Server).HandleSiriusXMLiveAdapterSubpath-fm
 POST     /customer/account/{account}                                  handlers.(*Server).HandleMargeUpdateAccountProfile-fm
 POST     /customer/account/{account}/password                         handlers.(*Server).HandleMargeChangePassword-fm
 POST     /mgmt/accounts/{accountId}/language                          handlers.(*Server).HandleMgmtUpdateAccountLanguage-fm
@@ -199,6 +111,7 @@ POST     /mgmt/spotify/confirm                                        handlers.(
 POST     /mgmt/spotify/entity                                         handlers.(*Server).HandleMgmtSpotifyEntity-fm
 POST     /mgmt/spotify/init                                           handlers.(*Server).HandleMgmtSpotifyInit-fm
 POST     /mgmt/spotify/prime                                          handlers.(*Server).HandleMgmtPrimeDevice-fm
+POST     /oauth/*                                                     handlers.(*Server).HandleBoseProxy-fm
 POST     /oauth/account/{account}/music/musicprovider/{sourceID}/token/cs handlers.(*Server).HandleBoseAccountToken-fm
 POST     /oauth/device/{deviceID}/music/musicprovider/{sourceID}/token handlers.(*Server).HandleBoseLegacyToken-fm
 POST     /oauth/device/{deviceID}/music/musicprovider/{sourceID}/token/cs1 handlers.(*Server).HandleBoseToken-fm
@@ -207,12 +120,8 @@ POST     /setup/backup/{deviceId}                                     handlers.(
 POST     /setup/devices                                               handlers.(*Server).HandleAddManualDevice-fm
 POST     /setup/discover                                              handlers.(*Server).HandleTriggerDiscovery-fm
 POST     /setup/ensure-remote-services/{deviceId}                     handlers.(*Server).HandleEnsureRemoteServices-fm
-POST     /setup/health/dns-path-probe                                 handlers.(*Server).HandleDNSPathProbe-fm
-POST     /setup/health/fix                                            handlers.(*Server).HandleHealthFix-fm
-POST     /setup/logging-settings                                      handlers.(*Server).HandleUpdateLoggingSettings-fm
 POST     /setup/migrate/{deviceId}                                    handlers.(*Server).HandleMigrateDevice-fm
-POST     /setup/pair-account/{deviceId}                               handlers.(*Server).HandlePairAccount-fm
-POST     /setup/peer-probe/{deviceId}                                 handlers.(*Server).HandlePeerProbe-fm
+POST     /setup/proxy-settings                                        handlers.(*Server).HandleUpdateProxySettings-fm
 POST     /setup/reboot/{deviceId}                                     handlers.(*Server).HandleRebootDevice-fm
 POST     /setup/remove-remote-services/{deviceId}                     handlers.(*Server).HandleRemoveRemoteServices-fm
 POST     /setup/revert/{deviceId}                                     handlers.(*Server).HandleRevertMigration-fm
@@ -222,7 +131,6 @@ POST     /setup/test-connection/{deviceId}                            handlers.(
 POST     /setup/test-dns/{deviceId}                                   handlers.(*Server).HandleTestDNSRedirection-fm
 POST     /setup/test-hosts/{deviceId}                                 handlers.(*Server).HandleTestHostsRedirection-fm
 POST     /setup/trust-ca/{deviceId}                                   handlers.(*Server).HandleTrustCACert-fm
-POST     /setup/tts/speak                                             handlers.(*Server).HandleTTSSpeak-fm
 POST     /streaming/account                                           handlers.(*Server).HandleMargeCreateAccount-fm
 POST     /streaming/account/login                                     handlers.(*Server).HandleMargeLogin-fm
 POST     /streaming/account/{account}/device/                         handlers.(*Server).HandleMargeAddDevice-fm
@@ -230,7 +138,6 @@ POST     /streaming/account/{account}/device/{device}                 handlers.(
 POST     /streaming/account/{account}/device/{device}/presets/{presetNumber} handlers.(*Server).HandleMargeUpdatePreset-fm
 POST     /streaming/account/{account}/device/{device}/recent          handlers.(*Server).HandleMargeAddRecent-fm
 POST     /streaming/account/{account}/group                           handlers.(*Server).HandleMargeAddGroup-fm
-POST     /streaming/account/{account}/group/                          handlers.(*Server).HandleMargeAddGroup-fm
 POST     /streaming/account/{account}/group/{groupId}                 handlers.(*Server).HandleMargeModifyGroup-fm
 POST     /streaming/account/{account}/source                          handlers.(*Server).HandleMargeAddSource-fm
 POST     /streaming/device_setting/account/{account}/device/{device}/device_settings handlers.(*Server).HandleMargeUpdateDeviceSettings-fm
@@ -242,9 +149,6 @@ POST     /streaming/support/customersupport                           handlers.(
 POST     /streaming/support/power_on                                  handlers.(*Server).HandleMargePowerOn-fm
 POST     /v1/scmudc/{deviceId}                                        handlers.(*Server).HandleAppEvents-fm
 POST     /v1/stapp/{deviceId}                                         handlers.(*Server).HandleAppEvents-fm
-PUT      /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter handlers.(*Server).HandleSiriusXMLiveAdapter-fm
-PUT      /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter/* handlers.(*Server).HandleSiriusXMLiveAdapterSubpath-fm
-PUT      /streaming/account/{account}/device/{device}                 handlers.(*Server).HandleMargeUpdateDevice-fm
+PUT      /oauth/*                                                     handlers.(*Server).HandleBoseProxy-fm
 PUT      /streaming/account/{account}/device/{device}/preset/{presetNumber} handlers.(*Server).HandleMargeUpdatePreset-fm
-TRACE    /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter handlers.(*Server).HandleSiriusXMLiveAdapter-fm
-TRACE    /core02/svc-bmx-adapter-siriusxm-everest-eco1/prod/live-adapter/* handlers.(*Server).HandleSiriusXMLiveAdapterSubpath-fm
+TRACE    /oauth/*                                                     handlers.(*Server).HandleBoseProxy-fm
@@ -88,43 +88,16 @@ go build -o soundtouch-web
 ./soundtouch-web -port 8888

 # Connect to specific device
-./soundtouch-web -host 192.0.2.100
+./soundtouch-web -host 192.168.1.100
 ```

 ### Command Line Options
 ```
--port, -p string    HTTP port to listen on (default "8080", env PORT)
--bind string        Address for the HTTP listener: host, IP, or interface name (env BIND_ADDR)
--interface string   Network interface name for mDNS/UPnP discovery (env DISCOVERY_INTERFACE)
--devices strings    SoundTouch device IP(s) to add manually, repeatable (env SOUNDTOUCH_DEVICES)
--service-url string AfterTouch service base URL, e.g. https://soundtouch.local (env SERVICE_URL)
--service-ca string  Path to the AfterTouch service CA certificate (PEM) to trust (env SERVICE_CA)
--help, -h           Show help information
+-port string    Web server port (default "8080")
+-host string    Specific SoundTouch device host (optional, enables single-device mode)
+-help          Show help information
 ```

-### Text-to-Speech (TTS)
-
-TTS synthesis and the Bose `app_key` live in the AfterTouch service, not in
-soundtouch-web, so the "Speak" feature proxies to the service's
-`/setup/tts/speak` endpoint. To use it, point soundtouch-web at the service
-with `--service-url`.
-
-When the service is served over HTTPS with its own self-signed certificate
-(the default), soundtouch-web also needs to trust the service's CA, or the
-proxied call fails with `x509: certificate signed by unknown authority`. Pass
-the CA with `--service-ca`; it is the service's `<dataDir>/certs/ca.crt`:
-
-```bash
-soundtouch-web \
-  --service-url https://soundtouch.fritz.box \
-  --service-ca /path/to/certs/ca.crt
-```
-
-The CA is appended to the system trust store, so a service URL that uses a
-publicly trusted certificate keeps working without the flag. The target
-speaker must be known to the service (it resolves the speaker against its own
-device datastore).
-
 ## Usage

 ### Accessing the Interface
@@ -1,13 +0,0 @@
-package main
-
-import "strings"
-
-// sanitizeLog strips newline characters from s to prevent log-injection
-// (CodeQL go/log-injection). Values from speakers, HTTP requests, and
-// external APIs may contain attacker-controlled newlines.
-func sanitizeLog(s string) string {
-	s = strings.ReplaceAll(s, "\n", `\n`)
-	s = strings.ReplaceAll(s, "\r", `\r`)
-
-	return s
-}
@@ -2,54 +2,16 @@
 package main

 import (
-	"context"
-	"fmt"
 	"log"
-	"net"
 	"net/http"
 	"os"
-	"runtime/debug"
-	"strings"
-	"time"

 	"github.com/gesellix/bose-soundtouch/pkg/service/soundtouchweb"
 	"github.com/go-chi/chi/v5"
 	"github.com/urfave/cli/v2"
 )

-var (
-	version = "dev"
-	commit  = "unknown"
-	date    = "unknown"
-	repoURL = "https://github.com/gesellix/bose-soundtouch"
-)
-
-func updateBuildInfo() {
-	if info, ok := debug.ReadBuildInfo(); ok {
-		if info.Main.Path != "" {
-			repoURL = "https://" + info.Main.Path
-		}
-
-		if info.Main.Version != "" && info.Main.Version != "(devel)" {
-			version = info.Main.Version
-		}
-
-		for _, setting := range info.Settings {
-			switch setting.Key {
-			case "vcs.revision":
-				commit = setting.Value
-			case "vcs.time":
-				if t, err := time.Parse(time.RFC3339, setting.Value); err == nil {
-					date = t.Format("2006-01-02 15:04:05")
-				}
-			}
-		}
-	}
-}
-
 func main() {
-	updateBuildInfo()
-
 	app := &cli.App{
 		Name:  "soundtouch-web",
 		Usage: "Web UI for controlling Bose SoundTouch devices",
@@ -63,98 +25,25 @@ func main() {
 			},
 			&cli.StringFlag{
 				Name:    "bind",
-				Usage:   "Address for the HTTP listener: host, IP, or local interface name (e.g. eth0). Leave empty to listen on all interfaces",
+				Usage:   "Network interface to bind to",
 				EnvVars: []string{"BIND_ADDR"},
 			},
-			&cli.StringFlag{
-				Name:    "interface",
-				Usage:   "Network interface name (e.g. eth0) for mDNS and UPnP device discovery. Defaults to the --bind interface name when one was given; leave empty otherwise to auto-pick",
-				EnvVars: []string{"DISCOVERY_INTERFACE"},
-			},
-			&cli.StringSliceFlag{
-				Name:    "devices",
-				Usage:   "SoundTouch device IP address(es) to add manually (can be specified multiple times)",
-				EnvVars: []string{"SOUNDTOUCH_DEVICES"},
-			},
-			&cli.StringFlag{
-				Name:    "service-url",
-				Usage:   "AfterTouch service base URL (e.g. https://soundtouch.local). Required for custom stream URLs to work as presets via LOCAL_INTERNET_RADIO",
-				EnvVars: []string{"SERVICE_URL"},
-			},
-			&cli.StringFlag{
-				Name:    "service-ca",
-				Usage:   "Path to the AfterTouch service CA certificate (PEM) to trust for server-side calls such as TTS. Typically the service's <dataDir>/certs/ca.crt. Appended to the system trust store",
-				EnvVars: []string{"SERVICE_CA"},
-			},
 		},
 		Action: func(c *cli.Context) error {
 			port := c.String("port")
-			rawBind := c.String("bind")
-
-			bindAddr, err := resolveBindAddr(rawBind)
-			if err != nil {
-				log.Fatal(err)
-			}
-
-			if rawBind != "" && bindAddr != rawBind {
-				log.Printf("Resolved --bind %q to %s", sanitizeLog(rawBind), sanitizeLog(bindAddr))
-			}
-
-			rawIface := c.String("interface")
-			manualHosts := c.StringSlice("devices")
-
-			ifaceName := defaultDiscoveryInterface(rawIface, rawBind, bindAddr)
-			if rawIface == "" && ifaceName != "" {
-				log.Printf("Defaulting --interface to %q from --bind", sanitizeLog(ifaceName))
-			}
+			bindAddr := c.String("bind")

 			addr := ":" + port
 			if bindAddr != "" {
 				addr = bindAddr + ":" + port
 			}

-			// Create web app without templates (SPA mode)
-			webApp := soundtouchweb.NewWebApp()
-			webApp.Version = version
-			webApp.Commit = commit
-			webApp.Date = date
-			webApp.RepoURL = repoURL
-			webApp.ServiceURL = strings.TrimRight(c.String("service-url"), "/")
-
-			if caPath := c.String("service-ca"); caPath != "" {
-				client, err := soundtouchweb.NewServiceHTTPClient(caPath)
-				if err != nil {
-					log.Fatalf("--service-ca: %v", err)
-				}
-
-				webApp.ServiceClient = client
-
-				log.Printf("Trusting AfterTouch service CA from %s", sanitizeLog(caPath))
-			}
-
-			discoveryService := soundtouchweb.NewDiscoveryService(ifaceName)
-
-			// Discover devices on startup
-			go func() {
-				ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-				defer cancel()
-
-				webApp.BroadcastDiscoveryStatus("starting", webApp.DeviceCount())
-
-				for _, host := range manualHosts {
-					webApp.AddDeviceByHost(host, 8090, "manual")
-				}
-
-				webApp.DiscoverDevices(ctx, discoveryService)
-
-				webApp.BroadcastDiscoveryStatus("completed", webApp.DeviceCount())
-				webApp.BroadcastDeviceList()
-			}()
+			webApp := soundtouchweb.New()

 			r := chi.NewRouter()
-			webApp.Mount(r, discoveryService)
+			webApp.Mount(r)

-			log.Printf("AfterTouch Web UI starting on http://%s", sanitizeLog(addr))
+			log.Printf("SoundTouch Web UI starting on http://%s", addr)

 			return http.ListenAndServe(addr, r)
 		},
@@ -164,85 +53,3 @@ func main() {
 		log.Fatal(err)
 	}
 }
-
-// defaultDiscoveryInterface picks the interface name to use for mDNS/UPnP
-// discovery. An explicit --interface always wins; otherwise, when --bind was
-// given an interface name (i.e. resolveBindAddr substituted an IP for it),
-// that name is reused so the common single-interface case "just works".
-// Returns the empty string when there is nothing to propagate, leaving the
-// discovery service to auto-pick.
-func defaultDiscoveryInterface(rawInterface, rawBind, resolvedBind string) string {
-	if rawInterface != "" {
-		return rawInterface
-	}
-
-	if rawBind != "" && rawBind != resolvedBind {
-		return rawBind
-	}
-
-	return ""
-}
-
-// resolveBindAddr returns the address to bind the HTTP listener to.
-//
-// If bindAddr names a local network interface, the interface's single IPv4
-// address is returned. When no IPv4 is present, the function falls back to the
-// interface's single non-link-local IPv6 address (wrapped in brackets so it
-// composes correctly with ":port"). Ambiguous interfaces (multiple addresses
-// in the chosen family) or interfaces with no usable address produce an error,
-// so misconfiguration surfaces immediately instead of becoming an obscure DNS
-// lookup failure at listen time.
-//
-// If bindAddr is not an interface name — including the empty string, a host
-// name, or a literal IP — it is returned unchanged.
-func resolveBindAddr(bindAddr string) (string, error) {
-	// A lookup failure here just means bindAddr isn't an interface name
-	// (it's a host, IP, or empty); fall through to pass-through.
-	iface, _ := net.InterfaceByName(bindAddr)
-	if iface == nil {
-		return bindAddr, nil
-	}
-
-	addrs, err := iface.Addrs()
-	if err != nil {
-		return "", fmt.Errorf("--bind %q: failed to list addresses for interface: %w", bindAddr, err)
-	}
-
-	var ipv4, ipv6 []net.IP
-
-	for _, addr := range addrs {
-		var ip net.IP
-
-		switch v := addr.(type) {
-		case *net.IPNet:
-			ip = v.IP
-		case *net.IPAddr:
-			ip = v.IP
-		}
-
-		if ip == nil {
-			continue
-		}
-
-		if v4 := ip.To4(); v4 != nil {
-			ipv4 = append(ipv4, v4)
-		} else if !ip.IsLinkLocalUnicast() {
-			// Skip IPv6 link-local (fe80::); it requires a zone ID and
-			// can't be used as a plain "[ip]:port" listen address.
-			ipv6 = append(ipv6, ip)
-		}
-	}
-
-	switch {
-	case len(ipv4) == 1:
-		return ipv4[0].String(), nil
-	case len(ipv4) > 1:
-		return "", fmt.Errorf("--bind %q: interface has multiple IPv4 addresses (%v); specify one directly", bindAddr, ipv4)
-	case len(ipv6) == 1:
-		return "[" + ipv6[0].String() + "]", nil
-	case len(ipv6) > 1:
-		return "", fmt.Errorf("--bind %q: interface has multiple IPv6 addresses (%v); specify one directly", bindAddr, ipv6)
-	default:
-		return "", fmt.Errorf("--bind %q: interface has no usable IPv4 or IPv6 address", bindAddr)
-	}
-}
@@ -1,162 +0,0 @@
-package main
-
-import (
-	"net"
-	"strings"
-	"testing"
-)
-
-func TestResolveBindAddr_PassThrough(t *testing.T) {
-	// Inputs that don't match any local interface name must be returned
-	// unchanged: empty string, hostnames, IPv4/IPv6 literals, and bogus
-	// strings the user might have typed.
-	tests := []string{
-		"",
-		"localhost",
-		"127.0.0.1",
-		"192.0.2.5",
-		"::1",
-		"definitely-not-an-iface-xyz",
-	}
-
-	for _, input := range tests {
-		t.Run(quoted(input), func(t *testing.T) {
-			got, err := resolveBindAddr(input)
-			if err != nil {
-				t.Fatalf("unexpected error: %v", err)
-			}
-
-			if got != input {
-				t.Errorf("got %q, want %q (input should pass through unchanged)", got, input)
-			}
-		})
-	}
-}
-
-func TestResolveBindAddr_LoopbackInterface(t *testing.T) {
-	loopback, expected, ok := findLoopbackWithSingleIPv4(t)
-	if !ok {
-		t.Skipf("no loopback interface with exactly one IPv4 address found")
-	}
-
-	got, err := resolveBindAddr(loopback)
-	if err != nil {
-		t.Fatalf("unexpected error resolving %q: %v", loopback, err)
-	}
-
-	if got != expected {
-		t.Errorf("got %q, want %q for loopback interface %q", got, expected, loopback)
-	}
-}
-
-// findLoopbackWithSingleIPv4 returns the name of a loopback interface and the
-// single IPv4 address attached to it. If the host has multiple loopback
-// interfaces or the loopback has zero or several IPv4 addresses, it returns
-// ok=false so the caller can skip the test rather than fail on an environment
-// quirk.
-func findLoopbackWithSingleIPv4(t *testing.T) (name, addr string, ok bool) {
-	t.Helper()
-
-	ifaces, err := net.Interfaces()
-	if err != nil {
-		t.Fatalf("net.Interfaces: %v", err)
-	}
-
-	for _, iface := range ifaces {
-		if iface.Flags&net.FlagLoopback == 0 {
-			continue
-		}
-
-		addrs, addrErr := iface.Addrs()
-		if addrErr != nil {
-			continue
-		}
-
-		var ipv4s []string
-
-		for _, a := range addrs {
-			if ipnet, isIPNet := a.(*net.IPNet); isIPNet {
-				if v4 := ipnet.IP.To4(); v4 != nil {
-					ipv4s = append(ipv4s, v4.String())
-				}
-			}
-		}
-
-		if len(ipv4s) == 1 {
-			return iface.Name, ipv4s[0], true
-		}
-	}
-
-	return "", "", false
-}
-
-func TestDefaultDiscoveryInterface(t *testing.T) {
-	tests := []struct {
-		name         string
-		rawInterface string
-		rawBind      string
-		resolvedBind string
-		want         string
-	}{
-		{
-			name:         "explicit interface wins over bind-derived default",
-			rawInterface: "eth1",
-			rawBind:      "eth0",
-			resolvedBind: "192.0.2.5",
-			want:         "eth1",
-		},
-		{
-			name:         "derive from --bind when --bind was an interface name",
-			rawInterface: "",
-			rawBind:      "eth0",
-			resolvedBind: "192.0.2.5",
-			want:         "eth0",
-		},
-		{
-			name:         "no derivation when --bind was an IP literal",
-			rawInterface: "",
-			rawBind:      "192.0.2.5",
-			resolvedBind: "192.0.2.5",
-			want:         "",
-		},
-		{
-			name:         "no derivation when --bind was a hostname (pass-through)",
-			rawInterface: "",
-			rawBind:      "localhost",
-			resolvedBind: "localhost",
-			want:         "",
-		},
-		{
-			name:         "both empty stays empty (auto-pick)",
-			rawInterface: "",
-			rawBind:      "",
-			resolvedBind: "",
-			want:         "",
-		},
-		{
-			name:         "explicit interface alone, --bind empty",
-			rawInterface: "eth1",
-			rawBind:      "",
-			resolvedBind: "",
-			want:         "eth1",
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			got := defaultDiscoveryInterface(tc.rawInterface, tc.rawBind, tc.resolvedBind)
-			if got != tc.want {
-				t.Errorf("got %q, want %q (rawInterface=%q rawBind=%q resolvedBind=%q)",
-					got, tc.want, tc.rawInterface, tc.rawBind, tc.resolvedBind)
-			}
-		})
-	}
-}
-
-func quoted(s string) string {
-	if s == "" {
-		return "(empty)"
-	}
-
-	return strings.ReplaceAll(s, "/", "_")
-}
@@ -7,6 +7,7 @@ import (
 	"net/http/httptest"
 	"strings"
 	"testing"
+	"time"

 	"github.com/gesellix/bose-soundtouch/pkg/models"
 	"github.com/gesellix/bose-soundtouch/pkg/service/soundtouchweb"
@@ -54,22 +55,19 @@ func TestSPARouting(t *testing.T) {
 			req := httptest.NewRequest("GET", tt.path, nil)
 			w := httptest.NewRecorder()

-			// Simulate SPA routing handler
 			spaHandler := func(w http.ResponseWriter, r *http.Request) {
-				// If it's an API route, let it pass through
 				if strings.HasPrefix(r.URL.Path, "/api/") || strings.HasPrefix(r.URL.Path, "/static/") || strings.HasPrefix(r.URL.Path, "/ws") {
 					http.NotFound(w, r)
 					return
 				}

-				// Serve the SPA index.html content (simulated)
 				w.Header().Set("Content-Type", "text/html")
 				w.WriteHeader(http.StatusOK)
 				w.Write([]byte(`<!doctype html>
 <html lang="en">
 <head>
    <meta charset="UTF-8" />
-    <title>AfterTouch Control Center</title>
+    <title>SoundTouch Web</title>
 </head>
 <body>
    <div id="app">SPA Content</div>
@@ -126,7 +124,7 @@ func TestAPIEndpoints(t *testing.T) {
 			name:           "device API with ID",
 			path:           "/api/device/test-device",
 			method:         "GET",
-			expectedStatus: http.StatusNotFound, // Device won't exist in test
+			expectedStatus: http.StatusNotFound,
 			expectedJSON:   true,
 		},
 	}
@@ -159,7 +157,6 @@ func TestAPIEndpoints(t *testing.T) {
 					t.Errorf("Expected JSON content type, got %s", contentType)
 				}

-				// Validate JSON response structure
 				var response webtypes.APIResponse
 				if err := json.NewDecoder(w.Body).Decode(&response); err != nil {
 					t.Errorf("Invalid JSON response: %v", err)
@@ -182,7 +179,6 @@ func TestAPIResponseFormat(t *testing.T) {
 		t.Fatalf("Failed to decode JSON response: %v", err)
 	}

-	// Check API response structure
 	if !response.Success {
 		t.Errorf("Expected success=true, got success=%v", response.Success)
 	}
@@ -191,7 +187,6 @@ func TestAPIResponseFormat(t *testing.T) {
 		t.Errorf("Expected data field to be present")
 	}

-	// Data should be an empty map for no devices
 	dataMap, ok := response.Data.(map[string]interface{})
 	if !ok {
 		t.Errorf("Expected data to be a map, got %T", response.Data)
@@ -248,10 +243,13 @@ func TestControlAPIValidation(t *testing.T) {
 		},
 	}

-	// Add a mock device for testing unknown action validation
-	mockDevice := webtypes.NewDeviceConnection(nil, &models.DeviceInfo{Name: "Test Device"})
-	mockDevice.SetStatus(&webtypes.DeviceStatus{IsConnected: true})
-	app.AddDevice("testdevice", mockDevice)
+	mockDevice := &webtypes.DeviceConnection{
+		Client:     nil,
+		DeviceInfo: &models.DeviceInfo{Name: "Test Device"},
+		LastSeen:   time.Now(),
+		Status:     webtypes.DeviceStatus{IsConnected: true},
+	}
+	app.Devices["testdevice"] = mockDevice

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -273,7 +271,6 @@ func TestControlAPIValidation(t *testing.T) {
 				t.Errorf("Test %s: Expected status %d, got %d. Response: %s", tt.name, tt.expectedStatus, w.Code, w.Body.String())
 			}

-			// Validate error response format
 			contentType := w.Header().Get("Content-Type")
 			if !strings.Contains(contentType, "application/json") {
 				t.Errorf("Expected JSON content type, got %s", contentType)
@@ -298,7 +295,6 @@ func TestControlAPIValidation(t *testing.T) {
 func TestWebSocketUpgrade(t *testing.T) {
 	app := soundtouchweb.NewWebApp()

-	// Test WebSocket upgrade request
 	req := httptest.NewRequest("GET", "/ws", nil)
 	req.Header.Set("Connection", "upgrade")
 	req.Header.Set("Upgrade", "websocket")
@@ -307,12 +303,7 @@ func TestWebSocketUpgrade(t *testing.T) {

 	w := httptest.NewRecorder()

-	// The actual WebSocket upgrade will fail in test environment,
-	// but we can check that the handler exists and accepts the request
 	app.HandleWebSocket(w, req)
-
-	// In a real test environment, this would fail with a websocket upgrade error
-	// We're just checking the handler doesn't panic and processes the request
 }

 func TestJSONAPIConsistency(t *testing.T) {
@@ -339,19 +330,16 @@ func TestJSONAPIConsistency(t *testing.T) {
 				}
 			}

-			// All API endpoints should return JSON
 			contentType := w.Header().Get("Content-Type")
 			if !strings.Contains(contentType, "application/json") {
 				t.Errorf("Endpoint %s should return JSON, got %s", endpoint, contentType)
 			}

-			// All responses should follow APIResponse structure
 			var response webtypes.APIResponse
 			if err := json.NewDecoder(w.Body).Decode(&response); err != nil {
 				t.Errorf("Endpoint %s returned invalid JSON: %v", endpoint, err)
 			}

-			// Response should have either data or error
 			if response.Success && response.Data == nil {
 				t.Errorf("Endpoint %s: success response should have data", endpoint)
 			}
@@ -1,13 +0,0 @@
-package main
-
-import "strings"
-
-// sanitizeLog strips newline characters from s to prevent log-injection
-// (CodeQL go/log-injection). Values from speakers, HTTP requests, and
-// external APIs may contain attacker-controlled newlines.
-func sanitizeLog(s string) string {
-	s = strings.ReplaceAll(s, "\n", `\n`)
-	s = strings.ReplaceAll(s, "\r", `\r`)
-
-	return s
-}
@@ -355,11 +355,9 @@ func handlePreset(event *models.PresetUpdatedEvent, verbose bool) {
 	for _, preset := range presets.Preset {
 		fmt.Printf("  📻 Preset %d:", preset.ID)

-		// IsEmpty catches both <preset/> and INVALID_SOURCE
-		// placeholders; using the nil-safe helpers below means the
-		// inner Printf never dereferences a nil ContentItem.
-		if !preset.IsEmpty() {
-			fmt.Printf(" %s (%s)", preset.GetDisplayName(), preset.GetSource())
+		if preset.ContentItem != nil {
+			fmt.Printf(" %s", preset.ContentItem.ItemName)
+			fmt.Printf(" (%s)", preset.ContentItem.Source)
 		}

 		fmt.Println()
@@ -546,13 +544,13 @@ func printHelp() {
 	fmt.Printf("  %s -discover\n", os.Args[0])
 	fmt.Println()
 	fmt.Println("  # Connect to specific device and monitor volume events only")
-	fmt.Printf("  %s -host 192.0.2.10 -filter volume\n", os.Args[0])
+	fmt.Printf("  %s -host 192.168.1.10 -filter volume\n", os.Args[0])
 	fmt.Println()
 	fmt.Println("  # Monitor for 5 minutes with verbose output")
-	fmt.Printf("  %s -host 192.0.2.10 -duration 5m -verbose\n", os.Args[0])
+	fmt.Printf("  %s -host 192.168.1.10 -duration 5m -verbose\n", os.Args[0])
 	fmt.Println()
 	fmt.Println("  # Monitor now playing and volume events")
-	fmt.Printf("  %s -host 192.0.2.10 -filter nowPlaying,volume\n", os.Args[0])
+	fmt.Printf("  %s -host 192.168.1.10 -filter nowPlaying,volume\n", os.Args[0])
 	fmt.Println()
 	fmt.Println("Event Types:")
 	fmt.Println("  🎵 nowPlaying  - Track changes, playback status")
@@ -573,7 +571,7 @@ type VerboseLogger struct{}

 func (v *VerboseLogger) Printf(format string, args ...interface{}) {
 	timestamp := time.Now().Format("15:04:05")
-	fmt.Printf("[%s] [WebSocket] %s\n", timestamp, sanitizeLog(fmt.Sprintf(format, args...)))
+	fmt.Printf("[%s] [WebSocket] %s\n", timestamp, fmt.Sprintf(format, args...))
 }

 // SilentLogger provides no-op WebSocket logging
@@ -27,7 +27,7 @@
 //	func main() {
 //		// Create a client for your SoundTouch device
 //		config := &client.Config{
-//			Host: "192.0.2.100",
+//			Host: "192.168.1.100",
 //			Port: 8090,
 //		}
 //		client := client.NewClient(config)
@@ -70,7 +70,7 @@
 //	soundtouch-cli discover devices
 //
 //	# Control a device
-//	soundtouch-cli --host 192.0.2.100 play start
+//	soundtouch-cli --host 192.168.1.100 play start
 //
 // # Supported Features
 //
@@ -16,26 +16,9 @@ services:
      - AMAZON_CLIENT_SECRET=mock-amazon-secret
      - AMAZON_TOKEN_URL=http://amazon-mock:8080/auth/o2/token
      - AMAZON_PROFILE_URL=http://amazon-mock:8080/user/profile
-      - TUNEIN_OPML_URL=http://tunein-mock:8080
-      - TUNEIN_API_URL=http://tunein-mock:8080
-    # Start only once every mock is actually listening (the mocks are `go run`,
-    # so cold compilation can take a while); see depends_on below.
-    depends_on:
-      spotify-mock:
-        condition: service_healthy
-      amazon-mock:
-        condition: service_healthy
-      tunein-mock:
-        condition: service_healthy
-    healthcheck:
-      test: ["CMD", "wget", "-q", "-O", "/dev/null", "http://localhost:8000/health"]
-      interval: 3s
-      timeout: 3s
-      retries: 30
-      start_period: 3s

  spotify-mock:
-    image: golang:1.26.4-alpine
+    image: golang:1.26.3-alpine
    container_name: spotify-mock
    working_dir: /app
    volumes:
@@ -45,15 +28,9 @@ services:
      - "8081:8080"
    networks:
      - soundtouch-test-net
-    healthcheck:
-      test: ["CMD", "wget", "-q", "-O", "/dev/null", "http://localhost:8080/healthz"]
-      interval: 3s
-      timeout: 3s
-      retries: 30
-      start_period: 3s

  amazon-mock:
-    image: golang:1.26.4-alpine
+    image: golang:1.26.3-alpine
    container_name: amazon-mock
    working_dir: /app
    volumes:
@@ -63,30 +40,6 @@ services:
      - "8082:8080"
    networks:
      - soundtouch-test-net
-    healthcheck:
-      test: ["CMD", "wget", "-q", "-O", "/dev/null", "http://localhost:8080/healthz"]
-      interval: 3s
-      timeout: 3s
-      retries: 30
-      start_period: 3s
-
-  tunein-mock:
-    image: golang:1.26.4-alpine
-    container_name: tunein-mock
-    working_dir: /app
-    volumes:
-      - .:/app
-    command: go run ./cmd/mock-tunein/main.go -port 8080
-    ports:
-      - "8083:8080"
-    networks:
-      - soundtouch-test-net
-    healthcheck:
-      test: ["CMD", "wget", "-q", "-O", "/dev/null", "http://localhost:8080/healthz"]
-      interval: 3s
-      timeout: 3s
-      retries: 30
-      start_period: 3s

 networks:
  soundtouch-test-net:
@@ -1,34 +0,0 @@
-# Local Hugo/Hextra documentation server.
-#
-# Usage:
-#   make dev-docs          # start the live-reload server (http://localhost:1313)
-#   make dev-docs-tidy     # run hugo mod tidy (required on first run, or after
-#                          # changing hugo.toml module imports)
-#   make hugo ARGS="..."   # run any other hugo CLI command, e.g.
-#                          #   make hugo ARGS="version"
-#                          #   make hugo ARGS="new content/blog/my-post.md"
-#
-# The hugomods/hugo:exts image bundles Hugo extended + Go so Hugo modules
-# (Hextra) work without any extra tooling on the host.
-
-services:
-  hugo:
-    image: hugomods/hugo:exts
-    # --source docs/ because docs/ is the Hugo root inside the repo.
-    # --baseURL / overrides the production subpath (/Bose-SoundTouch/) so
-    # absolute links work at http://localhost:1313/ during local development.
-    # The full repo is mounted so enableGitInfo can read git history.
-    command: server --source docs/ --baseURL / --bind 0.0.0.0 --buildDrafts --navigateToChanged
-    ports:
-      - "1313:1313"
-    volumes:
-      - .:/src
-      # Persist the Hugo module cache across runs so 'hugo mod tidy' only
-      # downloads Hextra once.
-      - hugo-mod-cache:/root/.cache/hugo_cache
-    working_dir: /src
-    environment:
-      - HUGO_PARAMS_GITHASH
-
-volumes:
-  hugo-mod-cache:
@@ -1,8 +1,5 @@
---
-title: "Navigation API Reference"
-sidebar:
-  exclude: true
---
+# Navigation API Reference
+
 ## Overview

 This document provides a complete API reference for the Bose SoundTouch navigation and station management functionality. For usage examples and workflows, see [NAVIGATION-GUIDE.md](NAVIGATION-GUIDE.md).
@@ -146,7 +143,7 @@ Browse stored/local music library.

 **Example:**
 ```go
-library, err := client.GetStoredMusicLibrary("AABBCCDDEEFF/0")
+library, err := client.GetStoredMusicLibrary("A81B6A536A98/0")
 ```

 **Validation:**
@@ -529,7 +526,7 @@ Search for stations and content.

 **Response Body:**
 ```xml
-<results deviceID="AABBCCDDEEFF" source="PANDORA" sourceAccount="user123">
+<results deviceID="A81B6A536A98" source="PANDORA" sourceAccount="user123">
  <songs>
    <searchResult source="PANDORA" sourceAccount="user123" token="S123">
      <name>Love Story</name>
@@ -710,7 +707,7 @@ Navigation and station operations generate WebSocket events:
 Generated when stations are added/removed that affect presets.

 ```xml
-<presetsUpdated deviceID="AABBCCDDEEFF">
+<presetsUpdated deviceID="A81B6A536A98">
  <presets>
    <!-- Updated preset list -->
  </presets>
@@ -722,7 +719,7 @@ Generated when stations are added/removed that affect presets.
 Generated when station operations affect current playback.

 ```xml
-<nowPlayingUpdated deviceID="AABBCCDDEEFF">
+<nowPlayingUpdated deviceID="A81B6A536A98">
  <nowPlaying source="PANDORA">
    <ContentItem source="PANDORA" location="R456" sourceAccount="user123" isPresetable="true">
      <itemName>Taylor Swift Radio</itemName>
@@ -1,15 +1,13 @@
---
-title: "CLAUDE.md - Development Guidelines for Bose SoundTouch Project"
-sidebar:
-  exclude: true
---
+# CLAUDE.md - Development Guidelines for Bose SoundTouch Project
+
 ## Documentation Overview

 This document contains important development guidelines for working on the Bose SoundTouch project. Please also read the following documentation:

- **[PLAN.md](../../../archive/PLAN.md)** - Project planning and roadmap
+- **[PLAN.md](archive/PLAN.md)** - Project planning and roadmap
 - **[PROJECT-PATTERNS.md](PROJECT-PATTERNS.md)** - Project structure and design patterns
- **[API-ENDPOINTS.md](../reference/API-ENDPOINTS.md)** - API endpoints overview
+- **[API-ENDPOINTS.md](reference/API-ENDPOINTS.md)** - API endpoints overview
+- **[SoundTouch Web API.pdf](2025.12.18%20SoundTouch%20Web%20API.pdf)** - Official API documentation

 ## Development Guidelines

@@ -75,8 +73,8 @@ For web components:
 When creating test data for API endpoints, prefer real device responses over hypothetical examples:

 - **Available test endpoints**:
-  - `http://192.0.2.11:8090/now_playing` - Different response type 1
-  - `http://192.0.2.10:8090/now_playing` - Different response type 2
+  - `http://192.168.178.28:8090/now_playing` - Different response type 1
+  - `http://192.168.178.35:8090/now_playing` - Different response type 2
 - **Usage**: Fetch real responses to create accurate test fixtures
 - **Privacy**: Anonymize any personal data (account names, personal playlists, etc.)
 - **Coverage**: Use multiple real devices to cover different response variations
@@ -1,8 +1,5 @@
---
-title: "Content Selection Implementation Summary"
-sidebar:
-  exclude: true
---
+# Content Selection Implementation Summary
+
 This document summarizes the implementation of advanced content selection features for the Bose SoundTouch Go client, including full support for the LOCAL_INTERNET_RADIO streamUrl format and LOCAL_MUSIC/STORED_MUSIC content selection.

 ## ✅ Implementation Status: COMPLETE
@@ -200,12 +197,12 @@ err := client.SelectContentItem(contentItem)
 ### CLI Usage
 ```bash
 # streamUrl format
-soundtouch-cli --host 192.0.2.100 source internet-radio \
+soundtouch-cli --host 192.168.1.100 source internet-radio \
  --location "http://contentapi.gmuth.de/station.php?name=MyStation&streamUrl=https://stream.example.com/radio" \
  --name "My Station"

 # Direct stream
-soundtouch-cli --host 192.0.2.100 source internet-radio \
+soundtouch-cli --host 192.168.1.100 source internet-radio \
  --location "https://stream.example.com/radio" \
  --name "Direct Stream"
 ```
@@ -215,9 +212,9 @@ soundtouch-cli --host 192.0.2.100 source internet-radio \
 - [SoundTouch WebServices API Wiki](https://github.com/thlucas1/homeassistantcomponent_soundtouchplus/wiki/SoundTouch-WebServices-API)
 - [LOCAL_INTERNET_RADIO - streamUrl format](https://github.com/thlucas1/homeassistantcomponent_soundtouchplus/wiki/SoundTouch-WebServices-API#select-local_internet_radio---streamurl-format)
 - [LOCAL_MUSIC](https://github.com/thlucas1/homeassistantcomponent_soundtouchplus/wiki/SoundTouch-WebServices-API#select-local_music)
- [Content Selection Example](https://github.com/gesellix/Bose-SoundTouch/tree/main/examples/content-selection/README.md)
- [CLI Reference](../guides/CLI-REFERENCE.md)
- [Content Selection Example (Direct)](https://github.com/gesellix/Bose-SoundTouch/tree/main/examples/content-selection)
+- [Content Selection Example](../examples/content-selection/README.md)
+- [CLI Reference](guides/CLI-REFERENCE.md)
+- [Content Selection Example (Direct)](../examples/content-selection/)

 ## ✅ Verification

@@ -1,8 +1,5 @@
---
-title: "Device Customization Setup Guide"
-sidebar:
-  exclude: true
---
+# Device Customization Setup Guide
+
 This guide documents the manual steps required to configure your Bose SoundTouch device for customization using the SoundCork approach.

 Based on: https://github.com/deborahgu/soundcork
@@ -49,7 +46,7 @@ usb0      Link encap:Ethernet  HWaddr CA:FE:BA:BE:1E:47

 Sun Feb  1 20:35:24 CET 2026

-Device name: "Kitchen SoundTouch"
+Device name: "A Sound Machine"
 Country EU, Region (not set)
 Module type: scm
 root@spotty:~#
@@ -86,7 +83,7 @@ usb0      Link encap:Ethernet  HWaddr CA:FE:BA:BE:1E:47

 Sun Feb  1 19:12:47 CET 2026

-Device name: "Kitchen SoundTouch"
+Device name: "A Sound Machine"
 Country EU, Region (not set)
 Module type: scm
 root@spotty:~#
@@ -1,8 +1,5 @@
---
-title: "Device Logging & Troubleshooting"
-sidebar:
-  exclude: true
---
+# Device Logging & Troubleshooting
+
 Accessing logs from SoundTouch devices is critical for debugging custom service integrations and understanding internal device behavior. This document outlines the methods for collecting logs, as discovered by the **SoundCork** and **ÜberBöse API** communities.

 ## Log Types
@@ -51,12 +48,6 @@ logread -f | grep -Ei '(marge|preset)'
 ```
 This is particularly useful for debugging preset synchronization and service redirection issues.

-For HTTPS / connection-refused debugging (e.g. `Curl 7, http 0`), drop the speaker's loopback chatter so only outbound calls remain visible:
-```bash
-logread -f | grep -v '127.0.0.1'
-```
-The speaker generates a steady stream of localhost-to-localhost HTTP traffic between its internal services; filtering it out makes the actual cloud / AfterTouch attempts (the ones that matter when diagnosing redirect or TLS issues) easy to read in real time.
-
 ---

 ## 2. Traffic Logging & Interception
@@ -83,7 +74,7 @@ If you have a managed switch or a router capable of port mirroring, you can use
 ### "IsItBose" Validation Failures
 If the device fails to connect to your custom service despite correct configuration, it may be failing the internal `IsItBose` regex check.
 -   **Evidence**: Look for SSL handshake failures or "Unauthorized" errors in your service logs.
-   **Solution**: See the [Binary Patching section in DEVICE-REDIRECT-METHODS.md](../analysis/DEVICE-REDIRECT-METHODS.md#method-3-binary-patching).
+-   **Solution**: See the [Binary Patching section in DEVICE-REDIRECT-METHODS.md](analysis/DEVICE-REDIRECT-METHODS.md#method-3-binary-patching).

 ### Disappearing Sources (TuneIn/Local Radio)
 If `TUNEIN` or `LOCAL_INTERNET_RADIO` sources disappear after a reboot in an offline environment.
@@ -1,8 +1,5 @@
---
-title: "Bose SoundTouch Device Setup Flow"
-sidebar:
-  exclude: true
---
+# Bose SoundTouch Device Setup Flow
+
 This document details the multi-step process required to fully set up a Bose SoundTouch device, as derived from the Stockholm firmware (`setup/js/`) analysis.

 A complete setup flow involves a sequence of local (WebSocket) and cloud (HTTP) actions that move the device from a factory-reset state to a fully registered, functional system.
@@ -1,8 +1,5 @@
---
-title: "Technical Proposal: External Service Provider Abstraction"
-sidebar:
-  exclude: true
---
+# Technical Proposal: External Service Provider Abstraction
+
 This document outlines a strategy to refactor the SoundTouch Service's content handling into a modular provider-based system.

 ## 1. Problem Statement
@@ -1,13 +1,10 @@
---
-title: "Feature Development History"
-sidebar:
-  exclude: true
---
+# Feature Development History
+
 This document tracks the detailed evolution of features and capabilities in the Bose SoundTouch API client library.

 ## Development Timeline

-### Phase 1: Foundation (January 2026)
+### Phase 1: Foundation (November 2024 - December 2024)

 #### Core HTTP Client
 - **HTTP Client with XML Support**: Complete client implementation for SoundTouch Web API
@@ -26,7 +23,7 @@ This document tracks the detailed evolution of features and capabilities in the
 - Device connectivity testing
 - Simple information retrieval commands

-### Phase 2: Media Control & Discovery (January 2026)
+### Phase 2: Media Control & Discovery (December 2024)

 #### Media Controls
 - **Key Commands**: Complete implementation of `/key` endpoint
@@ -51,7 +48,7 @@ This document tracks the detailed evolution of features and capabilities in the
 - **Comprehensive Commands**: Full coverage of implemented endpoints
 - **Interactive Features**: Better user experience with formatted output

-### Phase 3: Advanced Audio Controls (January 2026)
+### Phase 3: Advanced Audio Controls (January 2025)

 #### Audio Management Trilogy
 - **Bass Control**: `/bass` GET/POST endpoints
@@ -59,7 +56,7 @@ This document tracks the detailed evolution of features and capabilities in the
  - Incremental bass adjustment
  - Device capability detection via `/bassCapabilities`
  - Safety limits and user warnings
- **Balance Control**: `/balance` GET/POST endpoints
+- **Balance Control**: `/balance` GET/POST endpoints  
  - Stereo balance adjustment (-50 to +50)
  - Left/right channel convenience methods
  - Balance centering functionality
@@ -84,7 +81,7 @@ This document tracks the detailed evolution of features and capabilities in the
  - Preset categorization and filtering
 - **API Limitation Documentation**: Clarified that POST `/presets` is officially N/A

-### Phase 4: System Features (January 2026)
+### Phase 4: System Features (January 2025)

 #### Clock and Display Management
 - **Clock Time**: `/clockTime` GET/POST endpoints
@@ -107,7 +104,7 @@ This document tracks the detailed evolution of features and capabilities in the
 - **Multiple Discovery Protocols**: Fallback discovery methods for different network environments
 - **Corporate Network Support**: Discovery options for restricted networks

-### Phase 5: Real-time Events (January 2026)
+### Phase 5: Real-time Events (January 2025)

 #### WebSocket Implementation
 - **WebSocket Client**: Complete WebSocket implementation for real-time events
@@ -133,7 +130,7 @@ This document tracks the detailed evolution of features and capabilities in the
 - **Formatted Output**: Human-readable event display
 - **Demo Applications**: WebSocket demonstration tools

-### Phase 6: Multiroom Zone Management (January 2026)
+### Phase 6: Multiroom Zone Management (January 2025)

 #### Zone Operations
 - **Zone Information**: `/getZone` GET endpoint
@@ -169,7 +166,7 @@ This document tracks the detailed evolution of features and capabilities in the
 - **Error Handling**: Specific zone-related error types
 - **Zone Builder**: Fluent API for zone construction

-### Phase 7: Advanced Audio Controls (January 2026)
+### Phase 7: Advanced Audio Controls (January 2025)

 #### Professional Audio Features
 - **DSP Audio Controls**: `/audiodspcontrols` GET/POST endpoints
@@ -191,7 +188,7 @@ This document tracks the detailed evolution of features and capabilities in the
 - **Conditional Feature Availability**: Features only available on compatible devices
 - **Graceful Degradation**: Fallback to basic controls when advanced features unavailable

-### Phase 8: Speaker Notification System (February 2026)
+### Phase 8: Speaker Notification System (February 2025)

 #### Notification Features
 - **Text-to-Speech (TTS)**: `/speaker` POST endpoint for TTS messages
@@ -234,7 +231,7 @@ This document tracks the detailed evolution of features and capabilities in the
 - **Parameter Validation**: Complete input validation and error handling
 - **Usage Examples**: Extensive real-world usage examples

-### Phase 9: Bug Fixes and Stability (February 2026)
+### Phase 9: Bug Fixes and Stability (February 2025)

 #### Critical Bug Fixes
 - **PlayNotificationBeep HTTP Method Fix**: Corrected `/playNotification` endpoint to use GET instead of POST
@@ -252,17 +249,17 @@ This document tracks the detailed evolution of features and capabilities in the

 ### API Endpoint Coverage Evolution

-| Phase   | Endpoints Added | Cumulative Total | Completion %     |
-|---------|-----------------|------------------|------------------|
-| Phase 1 | 4               | 4                | 15%              |
-| Phase 2 | 6               | 10               | 38%              |
-| Phase 3 | 8               | 18               | 69%              |
-| Phase 4 | 3               | 21               | 81%              |
-| Phase 5 | 1               | 22               | 85%              |
-| Phase 6 | 2               | 24               | 92%              |
-| Phase 7 | 3               | 27               | 96%              |
-| Phase 8 | 2               | 29               | 100%             |
-| Phase 9 | 0               | 29               | 100% (Bug fixes) |
+| Phase | Endpoints Added | Cumulative Total | Completion % |
+|-------|-----------------|------------------|--------------|
+| Phase 1 | 4 | 4 | 15% |
+| Phase 2 | 6 | 10 | 38% |
+| Phase 3 | 8 | 18 | 69% |
+| Phase 4 | 3 | 21 | 81% |
+| Phase 5 | 1 | 22 | 85% |
+| Phase 6 | 2 | 24 | 92% |
+| Phase 7 | 3 | 27 | 96% |
+| Phase 8 | 2 | 29 | 100% |
+| Phase 9 | 0 | 29 | 100% (Bug fixes) |

 ### Testing Evolution

@@ -286,7 +283,7 @@ This document tracks the detailed evolution of features and capabilities in the
 ### CLI Tool Evolution

 #### Command Categories Added by Phase
- **Phase 1**: `info`, `name`, `capabilities`
+- **Phase 1**: `info`, `name`, `capabilities` 
 - **Phase 2**: `discover`, `play`, `volume`, `key`
 - **Phase 3**: `bass`, `balance`, `source`, `presets`
 - **Phase 4**: `clock`, `network`
@@ -297,7 +294,7 @@ This document tracks the detailed evolution of features and capabilities in the
 - **Phase 9**: Bug fixes (speaker beep reliability)

 #### CLI Feature Enhancements
- **Host:Port Parsing**: Support for `192.0.2.100:8090` format
+- **Host:Port Parsing**: Support for `192.168.1.100:8090` format
 - **Auto-Discovery Integration**: Seamless device discovery
 - **Formatted Output**: Human-readable, structured output
 - **Error Handling**: Comprehensive error messages and recovery suggestions
@@ -374,4 +371,4 @@ This document tracks the detailed evolution of features and capabilities in the

 ---

-**This document tracks the evolution of the Bose SoundTouch API client from initial concept to production-ready library.**
+**This document tracks the evolution of the Bose SoundTouch API client from initial concept to production-ready library.**
@@ -1,8 +1,5 @@
---
-title: "Host:Port Parsing Feature"
-sidebar:
-  exclude: true
---
+# Host:Port Parsing Feature
+
 This document describes the automatic host:port parsing functionality added to the SoundTouch CLI, which allows users to specify both host and port in a single `-host` flag.

 ## Overview
@@ -14,23 +11,23 @@ The SoundTouch CLI now supports parsing host and port combinations in the `-host
 ### Basic Host:Port Format
 ```bash
 # Specify host and port together
-soundtouch-cli -host 192.0.2.100:8090 -info
-soundtouch-cli -host 192.0.2.10:8090 -play
+soundtouch-cli -host 192.168.1.100:8090 -info
+soundtouch-cli -host 192.168.178.35:8090 -play
 soundtouch-cli -host soundtouch.local:8090 -pause
 ```

 ### Traditional Separate Flags (Still Supported)
 ```bash
 # Traditional separate host and port flags
-soundtouch-cli -host 192.0.2.100 -port 8090 -info
-soundtouch-cli -host 192.0.2.10 -port 8090 -play
+soundtouch-cli -host 192.168.1.100 -port 8090 -info
+soundtouch-cli -host 192.168.178.35 -port 8090 -play
 ```

 ### Precedence Rules
 When both formats are used, the port specified in the host:port format takes precedence:
 ```bash
 # Uses port 8090 from host:port, ignores -port 9999
-soundtouch-cli -host 192.0.2.100:8090 -port 9999 -info
+soundtouch-cli -host 192.168.1.100:8090 -port 9999 -info
 ```

 ## Supported Formats
@@ -38,10 +35,10 @@ soundtouch-cli -host 192.0.2.100:8090 -port 9999 -info
 ### IPv4 Addresses
 ```bash
 # Standard IPv4 with port
-soundtouch-cli -host 192.0.2.100:8090 -info
+soundtouch-cli -host 192.168.1.100:8090 -info

 # IPv4 without port (uses default 8090)
-soundtouch-cli -host 192.0.2.100 -info
+soundtouch-cli -host 192.168.1.100 -info
 ```

 ### Hostnames
@@ -102,8 +99,8 @@ Comprehensive test coverage in `cmd/soundtouch-cli/main_test.go`:

 ### Integration Tests
 Tested with real SoundTouch devices:
- ✅ SoundTouch 10 (192.0.2.11:8090)
- ✅ SoundTouch 20 (192.0.2.10:8090)
+- ✅ SoundTouch 10 (192.168.178.28:8090)
+- ✅ SoundTouch 20 (192.168.178.35:8090)

 ## Benefits

@@ -126,31 +123,31 @@ Tested with real SoundTouch devices:
 # Discover devices to find host:port
 $ soundtouch-cli -discover
 Found SoundTouch devices:
-  My SoundTouch Device (192.0.2.10:8090) - SoundTouch 20
+  My SoundTouch Device (192.168.1.10:8090) - SoundTouch 20

 # Use discovered host:port directly
-$ soundtouch-cli -host 192.0.2.10:8090 -play
+$ soundtouch-cli -host 192.168.1.10:8090 -play
 ```

 ### Different Port Scenarios
 ```bash
 # Standard SoundTouch port
-soundtouch-cli -host 192.0.2.100:8090 -info
+soundtouch-cli -host 192.168.1.100:8090 -info

 # Custom port (if device configured differently)
-soundtouch-cli -host 192.0.2.100:9000 -info
+soundtouch-cli -host 192.168.1.100:9000 -info

 # Default port fallback
-soundtouch-cli -host 192.0.2.100 -info  # Uses 8090
+soundtouch-cli -host 192.168.1.100 -info  # Uses 8090
 ```

 ### Error Scenarios
 ```bash
 # Invalid port - uses default 8090
-soundtouch-cli -host 192.0.2.100:invalid -info
+soundtouch-cli -host 192.168.1.100:invalid -info

 # Out of range port - uses default 8090  
-soundtouch-cli -host 192.0.2.100:99999 -info
+soundtouch-cli -host 192.168.1.100:99999 -info

 # Malformed input - treats as hostname
 soundtouch-cli -host "malformed::input" -info
@@ -166,10 +163,10 @@ Options:
  -port <port>      SoundTouch device port (default: 8090)

 Examples:
-  soundtouch-cli -host 192.0.2.100 -info
-  soundtouch-cli -host 192.0.2.100:8090 -info
-  soundtouch-cli -host 192.0.2.100:8090 -pause
-  soundtouch-cli -host 192.0.2.100:8090 -preset 1
+  soundtouch-cli -host 192.168.1.100 -info
+  soundtouch-cli -host 192.168.1.100:8090 -info
+  soundtouch-cli -host 192.168.1.100:8090 -pause
+  soundtouch-cli -host 192.168.1.100:8090 -preset 1
 ```

 ## Technical Implementation
@@ -200,7 +197,7 @@ The parsed values are used throughout the CLI:

 Potential improvements for the future:

-1. **URL Format Support**: Support full URLs like `http://192.0.2.100:8090`
+1. **URL Format Support**: Support full URLs like `http://192.168.1.100:8090`
 2. **Service Discovery**: Auto-detect port via service discovery protocols
 3. **Configuration File**: Save frequently used host:port combinations
 4. **Environment Variables**: Support `SOUNDTOUCH_HOST` with host:port format
@@ -1,8 +1,5 @@
---
-title: "Manual Network Discovery on macOS"
-sidebar:
-  exclude: true
---
+# Manual Network Discovery on macOS
+
 This document provides comprehensive guidance for manually discovering network services and devices using built-in macOS tools and command-line utilities. This is particularly useful for troubleshooting network discovery issues or understanding what services are available on your local network.

 ## Overview
@@ -319,7 +316,7 @@ MX:3
 NOTIFY * HTTP/1.1
 HOST:239.255.255.250:1900
 CACHE-CONTROL:max-age=1800
-LOCATION:http://192.0.2.100:8090/device_description.xml
+LOCATION:http://192.168.1.100:8090/device_description.xml
 NT:upnp:rootdevice
 NTS:ssdp:alive
 USN:uuid:12345678-1234-1234-1234-123456789012::upnp:rootdevice
@@ -331,7 +328,7 @@ HTTP/1.1 200 OK
 CACHE-CONTROL:max-age=1800
 DATE:Wed, 18 Dec 2024 10:30:00 GMT
 EXT:
-LOCATION:http://192.0.2.100:8090/device_description.xml
+LOCATION:http://192.168.1.100:8090/device_description.xml
 SERVER:Linux/3.0 UPnP/1.0 Device/1.0
 ST:upnp:rootdevice
 USN:uuid:12345678-1234-1234-1234-123456789012::upnp:rootdevice
@@ -366,7 +363,7 @@ arp -a

 # Scan local network segment (requires nmap)
 brew install nmap
-nmap -sn 192.0.2.0/24  # Adjust network range as needed
+nmap -sn 192.168.1.0/24  # Adjust network range as needed

 # Quick ping sweep (built-in)
 for i in {1..254}; do ping -c 1 -t 1 192.168.1.$i >/dev/null 2>&1 && echo "192.168.1.$i is up"; done
@@ -442,10 +439,10 @@ sudo tcpdump -i any -n -A 'port 5353' | grep -i soundtouch
 netstat -g

 # Test UDP connectivity
-nc -u 192.0.2.100 8090  # Replace with actual device IP
+nc -u 192.168.1.100 8090  # Replace with actual device IP

 # Test HTTP connectivity to discovered devices
-curl -i http://192.0.2.100:8090/info  # SoundTouch info endpoint
+curl -i http://192.168.1.100:8090/info  # SoundTouch info endpoint
 ```

 ## Protocol Comparison
@@ -1,8 +1,5 @@
---
-title: "Navigation and Station Management Guide"
-sidebar:
-  exclude: true
---
+# Navigation and Station Management Guide
+
 ## Overview

 The Bose SoundTouch Go client provides comprehensive navigation and station management functionality that allows you to:
@@ -43,7 +40,7 @@ import (
 func main() {
    // Create client
    config := &client.Config{
-        Host: "192.0.2.100",
+        Host: "192.168.1.100",
        Port: 8090,
    }
    soundtouch := client.NewClient(config)
@@ -898,4 +895,4 @@ For additional help:

 ---

-*This guide covers the complete navigation and station management functionality. For preset management, see [PRESET-MANAGEMENT.md](../reference/PRESET-MANAGEMENT.md).*
+*This guide covers the complete navigation and station management functionality. For preset management, see [PRESET-MANAGEMENT.md](reference/PRESET-MANAGEMENT.md).*
@@ -1,8 +1,5 @@
---
-title: "Official SoundTouch Web API Verification"
-sidebar:
-  exclude: true
---
+# Official SoundTouch Web API Verification
+
 **Source**: Official Bose SoundTouch Web API v1.0 Documentation (January 7, 2026)  
 **Verification Date**: January 9, 2026  
 **Project Status**: Complete API coverage verification
@@ -1,9 +1,3 @@
---
-title: "Parity Improvements"
-sidebar:
-  exclude: true
---
-
 ### Overview of Recent Improvements and Next Steps

 This document summarizes the improvements made to the **Marge service** to improve parity with the upstream Bose SoundTouch service, along with open issues and proposed next steps.
@@ -43,8 +37,9 @@ This document summarizes the improvements made to the **Marge service** to impro
    *   **Device Identity**: Added `<serialNumber>` and `<updatedOn>` to both the top-level `<device>` and its `<attachedProduct>`, ensuring consistent device identification.
    *   **Field-Level Parity**: Mapped missing fields like `<contentItemType>` and `<productlabel>` to match upstream expectations.
    *   **Improved Source Matching**: Enhanced internal logic to correctly link presets and recents to their configured sources based on multiple identifiers (ID, Key, or Type).
-*   **Verified Parity Mismatch Fixes**: The reproduction test `TestParityMismatchReproduction_V2` confirms parity for identified mismatches in `POST /recent` and `GET /recents`, including credentials and source-specific metadata.
+*   **Verified Parity Mismatch Fixes**: Comprehensive reproduction tests (`TestParityMismatchReproduction_V2` and `TestParityMismatchReproduction_V3`) now confirm parity for identified mismatches in `POST /recent` and `GET /recents`, including credentials and source-specific metadata.
 *   **Unified Response Logic**: Refactored the code so that both `POST /recent` and `GET /recents` use the same formatting functions, guaranteeing consistency.
+*   **Robust Parity Detection**: Updated the local parity checker to be whitespace-insensitive for XML bodies, significantly reducing noise from minor indentation or newline differences.
 *   **Maintainable XML Generation**: Reduced cyclomatic complexity and code duplication in `marge.go` by extracting focused helper functions for mapping internal data to response-specific XML models.

 ---
@@ -1,8 +1,5 @@
---
-title: "Parity Analysis: Bose-SoundTouch (Go) vs. OpenCloudTouch (Python)"
-sidebar:
-  exclude: true
---
+# Parity Analysis: Bose-SoundTouch (Go) vs. OpenCloudTouch (Python)
+
 This document provides a comparative analysis of the current Go implementation and the `scheilch/opencloudtouch` project, identifying functional gaps and potential improvements.

 ## 1. Core Architecture and Language
@@ -1,8 +1,5 @@
---
-title: "Parity Analysis: Bose-SoundTouch (Go) vs. SoundCork (Python)"
-sidebar:
-  exclude: true
---
+# Parity Analysis: Bose-SoundTouch (Go) vs. SoundCork (Python)
+
 This document provides a comparative analysis of the current Go implementation and the `deborahgu/soundcork` project, identifying functional gaps and potential improvements.

 ## 1. Core Architecture and Language
@@ -57,4 +54,4 @@ Group support and ZeroConf Spotify priming are now feature-complete in AfterTouc
 - **BMX service extensibility**: the `bmx_services.json` registry makes it trivial to add or mock new streaming providers without code changes (step C above).
 - **Group pairing logic**: master/slave relationship management for SoundTouch 10 stereo pairs goes beyond the CRUD AfterTouch implements.

-For the broader ecosystem context (feature matrix across all community projects, AfterTouch open tasks, and cross-project observations) see [docs/analysis/bose-soundtouch-community-tools.md](../analysis/bose-soundtouch-community-tools.md).
+For the broader ecosystem context (feature matrix across all community projects, AfterTouch open tasks, and cross-project observations) see [docs/analysis/bose-soundtouch-community-tools.md](analysis/bose-soundtouch-community-tools.md).
@@ -1,52 +1,29 @@
---
-title: "Preset Management Quick Start Guide"
-sidebar:
-  exclude: true
---
+# Preset Management Quick Start Guide
+
 **Save your favorite music, radio stations, and playlists as 1-6 presets for instant access.**

 ## Overview

-SoundTouch devices support 6 preset slots that can store your favorite content for instant access. This guide shows you how to manage presets using the soundtouch-web UI, the CLI, or the Go library.
-
-## Via soundtouch-web (browser UI)
-
-**soundtouch-web** (default port **8080**) is the easiest way to manage presets without the command line.  Two save paths are available whenever content is playing:
-
-### ★ Star button — save from Now Playing
-
-1. Navigate to your speaker's detail page.
-2. Play any station or track (via Radio Browser, TuneIn, or the speaker's own sources).
-3. A semi-transparent **★** appears in the top-right corner of the **Now Playing** card.
-4. Click the star — a slot picker **1 · 2 · 3 · 4 · 5 · 6** opens.
-5. Click the target slot number.  The star turns gold once the current content is saved to at least one slot.
-
-### + button — save directly to a preset tile
-
-While something is playing, hover over any of the six **Preset** tiles.  A small **+** button appears in the tile's corner; clicking it saves the current content to that slot immediately (no picker needed).
-
-Use the **+** when you already know which slot you want; use the **★** when you want to pick the slot after you've decided to save.
-
---
+SoundTouch devices support 6 preset slots that can store your favorite content for instant access. This guide shows you how to manage presets using both the CLI and Go library.

 ## Quick CLI Usage

 ### 1. See Current Presets
 ```bash
-soundtouch-cli --host 192.0.2.100 preset list
+soundtouch-cli --host 192.168.1.100 preset list
 ```

 ### 2. Store What's Currently Playing
 ```bash
 # Store current song/station as preset 1
-soundtouch-cli --host 192.0.2.100 preset store-current --slot 1
+soundtouch-cli --host 192.168.1.100 preset store-current --slot 1
 ```

 ### 3. Store Specific Content

 #### Spotify Playlist
 ```bash
-soundtouch-cli --host 192.0.2.100 preset store \
+soundtouch-cli --host 192.168.1.100 preset store \
  --slot 2 \
  --source SPOTIFY \
  --location "spotify:playlist:37i9dQZF1DXcBWIGoYBM5M" \
@@ -55,26 +32,26 @@ soundtouch-cli --host 192.0.2.100 preset store \

 #### Radio Station
 ```bash
-soundtouch-cli --host 192.0.2.100 preset store \
+soundtouch-cli --host 192.168.1.100 preset store \
  --slot 3 \
  --source TUNEIN \
-  --location "/v1/playback/station/s33828" \
+  --location "/v1/playbook/station/s33828" \
  --name "K-LOVE Radio"
 ```

 ### 4. Use Your Presets
 ```bash
 # Play preset 1
-soundtouch-cli --host 192.0.2.100 preset select --slot 1
+soundtouch-cli --host 192.168.1.100 preset select --slot 1

 # Play preset 2
-soundtouch-cli --host 192.0.2.100 preset select --slot 2
+soundtouch-cli --host 192.168.1.100 preset select --slot 2
 ```

 ### 5. Remove Presets
 ```bash
 # Remove preset 6
-soundtouch-cli --host 192.0.2.100 preset remove --slot 6
+soundtouch-cli --host 192.168.1.100 preset remove --slot 6
 ```

 ## Getting Content Locations
@@ -84,7 +61,7 @@ To store specific content, you need the `location` parameter. Here's how to get
 ### Method 1: From Currently Playing Content
 ```bash
 # Play the content you want to save, then:
-soundtouch-cli --host 192.0.2.100 play now
+soundtouch-cli --host 192.168.1.100 play now
 ```

 **Example output:**
@@ -126,7 +103,7 @@ Just replace `https://open.spotify.com/` with `spotify:` and `/` with `:`.
 ### Radio Stations
 ```bash
 # TuneIn Radio
--source TUNEIN --location "/v1/playback/station/s33828"
+--source TUNEIN --location "/v1/playbook/station/s33828"

 # Internet Radio Stream
 --source LOCAL_INTERNET_RADIO --location "https://stream.example.com/jazz"
@@ -158,7 +135,7 @@ import (
 func main() {
    // Create client
    c := client.NewClient(&client.Config{
-        Host: "192.0.2.100",
+        Host: "192.168.1.100",
        Port: 8090,
    })
    
@@ -258,43 +235,43 @@ select {} // Run forever
 ### Family Setup
 ```bash
 # Dad's morning playlist
-soundtouch-cli --host 192.0.2.100 preset store \
+soundtouch-cli --host 192.168.1.100 preset store \
  --slot 1 --source SPOTIFY \
  --location "spotify:playlist:morning-energy" \
  --name "Dad's Morning Mix"

 # Mom's cooking music
-soundtouch-cli --host 192.0.2.100 preset store \
+soundtouch-cli --host 192.168.1.100 preset store \
  --slot 2 --source SPOTIFY \
  --location "spotify:playlist:cooking-vibes" \
  --name "Kitchen Tunes"

 # Kids' bedtime stories
-soundtouch-cli --host 192.0.2.100 preset store \
+soundtouch-cli --host 192.168.1.100 preset store \
  --slot 3 --source TUNEIN \
-  --location "/v1/playback/station/bedtime-stories" \
+  --location "/v1/playbook/station/bedtime-stories" \
  --name "Bedtime Stories"
 ```

 ### Party Mode
 ```bash
 # Upbeat party playlist
-soundtouch-cli --host 192.0.2.100 preset store-current --slot 1
+soundtouch-cli --host 192.168.1.100 preset store-current --slot 1

 # Chill background music  
-soundtouch-cli --host 192.0.2.100 preset store-current --slot 2
+soundtouch-cli --host 192.168.1.100 preset store-current --slot 2

 # Dance music
-soundtouch-cli --host 192.0.2.100 preset store-current --slot 3
+soundtouch-cli --host 192.168.1.100 preset store-current --slot 3
 ```

 ### Smart Home Integration
 ```bash
 # Morning routine (preset 1) - triggered by smart home at 7 AM
-soundtouch-cli --host 192.0.2.100 preset select --slot 1
+soundtouch-cli --host 192.168.1.100 preset select --slot 1

 # Evening routine (preset 2) - triggered at sunset
-soundtouch-cli --host 192.0.2.100 preset select --slot 2
+soundtouch-cli --host 192.168.1.100 preset select --slot 2
 ```

 ## Troubleshooting
@@ -309,26 +286,26 @@ Not all content can be saved as presets:
 ### "All preset slots are occupied"
 ```bash
 # See which presets you have
-soundtouch-cli --host 192.0.2.100 preset list
+soundtouch-cli --host 192.168.1.100 preset list

 # Remove one you don't need
-soundtouch-cli --host 192.0.2.100 preset remove --slot 6
+soundtouch-cli --host 192.168.1.100 preset remove --slot 6

 # Or overwrite an existing one
-soundtouch-cli --host 192.0.2.100 preset store-current --slot 6
+soundtouch-cli --host 192.168.1.100 preset store-current --slot 6
 ```

 ### Getting Spotify URIs
 If you can't find Spotify URIs:

 1. **Play the content** in Spotify on your SoundTouch
-2. **Check what's playing**: `soundtouch-cli --host 192.0.2.100 play now`
+2. **Check what's playing**: `soundtouch-cli --host 192.168.1.100 play now`
 3. **Copy the location** from the output

 ### Device Connection Issues
 ```bash
 # Test connection first
-soundtouch-cli --host 192.0.2.100 info
+soundtouch-cli --host 192.168.1.100 info

 # If that fails, check:
 # - Device IP address is correct
@@ -355,11 +332,11 @@ soundtouch-cli --host 192.0.2.100 info

 ## Next Steps

- 📖 [Complete CLI Reference](../guides/CLI-REFERENCE.md)
- 🔧 [Full Implementation Guide](../reference/PRESET-MANAGEMENT.md)
- 📡 [WebSocket Events Documentation](../reference/WEBSOCKET-EVENTS.md)
- 💻 [Preset Management Example](https://github.com/gesellix/Bose-SoundTouch/tree/main/examples/preset-management)
- 📚 [API Endpoints Overview](../reference/API-ENDPOINTS.md)
+- 📖 [Complete CLI Reference](guides/CLI-REFERENCE.md)
+- 🔧 [Full Implementation Guide](reference/PRESET-MANAGEMENT.md)
+- 📡 [WebSocket Events Documentation](reference/WEBSOCKET-EVENTS.md)
+- 💻 [Preset Management Example](../examples/preset-management/)
+- 📚 [API Endpoints Overview](reference/API-ENDPOINTS.md)

 ## Need Help?

@@ -1,8 +1,4 @@
---
-title: "Project Structure Patterns: Bose SoundTouch API Client"
-sidebar:
-  exclude: true
---
+# Project Structure Patterns: Bose SoundTouch API Client
 ## Summary for Reuse in API Client Projects

 This document describes the most important patterns for the Bose SoundTouch API client, especially for XML-based API clients with Web UI, CLI tool, and WASM support.
@@ -368,7 +364,7 @@ func main() {

 ```go
 func handleClientProxy(w http.ResponseWriter, r *http.Request) {
-    // Extract device IP from path: /api/client/192.0.2.100/now_playing
+    // Extract device IP from path: /api/client/192.168.1.100/now_playing
    pathParts := strings.Split(r.URL.Path, "/")
    if len(pathParts) < 5 {
        http.Error(w, "Invalid path", http.StatusBadRequest)
@@ -1,9 +1,3 @@
---
-title: Introduction
-sidebar:
-  open: true
---
-
 # Bose SoundTouch Toolkit Documentation

 Welcome to the documentation for the Bose SoundTouch Toolkit. This comprehensive toolkit helps you keep your Bose SoundTouch speakers functional even after the Bose Cloud shutdown in May 2026, with enhanced local management and monitoring capabilities.
@@ -16,7 +10,7 @@ Welcome to the documentation for the Bose SoundTouch Toolkit. This comprehensive

 ### For Existing Users
 - **[Cloud Shutdown Survival Guide](guides/SURVIVAL-GUIDE.md)** - Prepare for the May 2026 shutdown
- **[Backup Tool](https://github.com/gesellix/Bose-SoundTouch/blob/main/cmd/soundtouch-backup/README.md)** - Back up your cloud account and speaker data before shutdown
+- **[Backup Tool](../cmd/soundtouch-backup/README.md)** - Back up your cloud account and speaker data before shutdown
 - **[SoundTouch Service Guide](guides/SOUNDTOUCH-SERVICE.md)** - Advanced service configuration

 ## 📋 Essential Documentation
@@ -47,7 +41,7 @@ The documentation is organized into three main categories:
 ### Advanced Features
 - [MAC Address Mapping](guides/MAC-ADDRESS-MAPPING.md) - Device identification
 - [CLI Reference](guides/CLI-REFERENCE.md) - Command-line tools
- [Backup Tool](https://github.com/gesellix/Bose-SoundTouch/blob/main/cmd/soundtouch-backup/README.md) - Cloud account and speaker data backup
+- [Backup Tool](../cmd/soundtouch-backup/README.md) - Cloud account and speaker data backup
 - [IoT Implementation Guide](guides/IOT-IMPLEMENTATION-GUIDE.md) - IoT integrations
 - [MQTT Integration Design](guides/MQTT-INTEGRATION-DESIGN.md) - MQTT setup

@@ -67,18 +61,19 @@ The documentation is organized into three main categories:
 - [IoT Config Summary](analysis/IOT-CONFIG-SUMMARY.md) - Configuration summaries

 ### Device Lifecycle & Network Independence
- **[Device Lifecycle and /power_on Enhancement](appendix/device-lifecycle-and-power-on-enhancement.md)** - Complete analysis of device registration and network independence improvements
- [/power_on Implementation Guide](appendix/power-on-implementation-guide.md) - Technical implementation details for enhanced device management
+- **[Device Lifecycle and /power_on Enhancement](device-lifecycle-and-power-on-enhancement.md)** - Complete analysis of device registration and network independence improvements
+- [/power_on Implementation Guide](power-on-implementation-guide.md) - Technical implementation details for enhanced device management

 ## 🏗 Concept Documentation

- [Spotify Overview](concepts/spotify-overview.md) — mental model, Spotify Connect vs OAuth-intercept, DNS rewrite gotcha
- [Spotify OAuth](concepts/spotify-oauth.md) — flows and management endpoints
- [Amazon Music OAuth](concepts/amazon-music-oauth.md) — companion to Spotify OAuth; same protocol shape, different scopes
- [Encrypted Export](concepts/ENCRYPTED-EXPORT.md) — `.age`-encrypted diagnostic bundles
- [Request Recording](appendix/REQUEST_RECORDING_CONCEPT.md) — how the proxy captures live device traffic for parity testing
+### Enhanced Service Architecture
+- **[Concept Overview](concepts/README.md)** - High-level architecture vision
+- [Upstream Service Simulation](concepts/upstream-service-simulation.md) - Complete concept design
+- [Implementation Plan](concepts/implementation-plan.md) - Development roadmap
+- [Technical Specification](concepts/technical-specification.md) - Detailed specifications

-Older planning artefacts ("Enhanced State Management System", "Upstream Service Simulation") live under [docs/archive/](../../archive/) — kept for the record, no longer current.
+### Development Planning
+- [Implementation Roadmap](concepts/implementation-roadmap.md) - Project phases and milestones

 ## 💡 Quick Reference

@@ -94,4 +89,4 @@ Older planning artefacts ("Enhanced State Management System", "Upstream Service
 - **Documentation**: Check troubleshooting guides first
 - **Community**: Share experiences and help others

-For a complete list of all documents, browse the sections in the sidebar.
+For a complete list of all documents, see the [Summary](SUMMARY.md).
@@ -1,8 +1,5 @@
---
-title: "Request Recording Concept"
-sidebar:
-  exclude: true
---
+# Request Recording Concept
+
 ## Problem Statement

 The current request recording system has fundamental issues when dealing with request cloning, body consumption, and multiple response scenarios. Specifically:
@@ -18,14 +15,14 @@ The current request recording system has fundamental issues when dealing with re

 **Local Recording** (complete):
 ```http
-### POST /v1/scmudc/AABBCCDDEEFF
-POST /v1/scmudc/AABBCCDDEEFF
+### POST /v1/scmudc/A81B6A536A98
+POST /v1/scmudc/A81B6A536A98
 Host: events.api.bosecm.com
 Content-Type: text/json; charset=utf-8
 Content-Length: 587
 Authorization: Bearer jGwEmFWr...

-{"envelope":{"monoTime":234906,"payloadProtocolVersion":"3.1","payloadType":"scmudc","protocolVersion":"1.0","time":"2026-02-25T23:03:14.976349+00:00","uniqueId":"AABBCCDDEEFF"},"payload":{"deviceInfo":{"boseID":"1000001","deviceID":"AABBCCDDEEFF","deviceType":"SoundTouch 10","serialNumber":"I6332527703739342000020","softwareVersion":"27.0.6.46330.5043500 epdbuild.trunk.hepdswbld04.2022-08-04T11:20:29","systemSerialNumber":"069231P63364828AE"},"events":[{"data":{"play-state":"PAUSE_STATE"},"monoTime":234904,"time":"2026-02-25T23:03:14.973466+00:00","type":"play-state-changed"}]}}
+{"envelope":{"monoTime":234906,"payloadProtocolVersion":"3.1","payloadType":"scmudc","protocolVersion":"1.0","time":"2026-02-25T23:03:14.976349+00:00","uniqueId":"A81B6A536A98"},"payload":{"deviceInfo":{"boseID":"3230304","deviceID":"A81B6A536A98","deviceType":"SoundTouch 10","serialNumber":"I6332527703739342000020","softwareVersion":"27.0.6.46330.5043500 epdbuild.trunk.hepdswbld04.2022-08-04T11:20:29","systemSerialNumber":"069231P63364828AE"},"events":[{"data":{"play-state":"PAUSE_STATE"},"monoTime":234904,"time":"2026-02-25T23:03:14.973466+00:00","type":"play-state-changed"}]}}

 {% raw %}
 > {%
@@ -36,8 +33,8 @@ Authorization: Bearer jGwEmFWr...

 **Mirror Recording** (missing body):
 ```http
-### POST /v1/scmudc/AABBCCDDEEFF
-POST /v1/scmudc/AABBCCDDEEFF
+### POST /v1/scmudc/A81B6A536A98
+POST /v1/scmudc/A81B6A536A98
 Host: events.api.bosecm.com
 Content-Type: text/json; charset=utf-8
 Content-Length: 587
@@ -1,8 +1,5 @@
---
-title: "SCMUDC Enrichment Implementation Summary"
-sidebar:
-  exclude: true
---
+# SCMUDC Enrichment Implementation Summary
+
 ## Overview

 This document summarizes the implementation of SCMUDC (Sound Control Management Usage Data Collection) event enrichment in the AfterTouch toolkit. The enhancement provides human-readable analysis of device telemetry data to improve usability and debugging capabilities.
@@ -62,8 +59,8 @@ Based on analysis of recorded data:

 ### Before (Raw)
 ```http
-### POST /v1/scmudc/AABBCCDDEEFF
-POST /v1/scmudc/AABBCCDDEEFF
+### POST /v1/scmudc/A81B6A536A98
+POST /v1/scmudc/A81B6A536A98
 Host: events.api.bosecm.com
 ...

@@ -72,7 +69,7 @@ Host: events.api.bosecm.com

 ### After (Enriched)
 ```http
-### POST /v1/scmudc/AABBCCDDEEFF
+### POST /v1/scmudc/A81B6A536A98
 // Origin: Internal System (device)
 // Action: play-item
 // Command: Billie Eilish - bad guy (instrumental version)
@@ -90,7 +87,7 @@ Host: events.api.bosecm.com
 //     <itemName>Billie Eilish - bad guy (instrumental version)</itemName>
 //     <containerArt>https://i.scdn.co/image/ab67616d0000b273...</containerArt>
 // </ContentItem>
-POST /v1/scmudc/AABBCCDDEEFF
+POST /v1/scmudc/A81B6A536A98
 ...

 {% raw %}
@@ -1,8 +1,5 @@
---
-title: "Service Availability Implementation Summary"
-sidebar:
-  exclude: true
---
+# Service Availability Implementation Summary
+
 ## Overview

 This document summarizes the implementation of the `/serviceAvailability` endpoint support in the Bose SoundTouch Go client library. This feature enables applications to query which music services and input sources are available on a SoundTouch device, providing better user feedback about supported stations and sources.
@@ -124,7 +121,7 @@ sa.GetUnavailableServiceCount()
 ### Basic Usage

 ```go
-client := client.NewClientFromHost("192.0.2.100")
+client := client.NewClientFromHost("192.168.1.100")

 serviceAvailability, err := client.GetServiceAvailability()
 if err != nil {
@@ -1,10 +1,7 @@
---
-title: "🎉 Introducing SoundTouch Service: Local Cloud Service Emulation"
-sidebar:
-  exclude: true
---
-**Date**: February 2026
-**Version**: v2.0.0+
+# 🎉 Introducing SoundTouch Service: Local Cloud Service Emulation
+
+**Date**: January 2024  
+**Version**: v2.0.0+  
 **Status**: Production Ready

 ## What's New?
@@ -71,7 +68,7 @@ Our implementation is heavily inspired by and based on [SoundCork](https://githu

 **Key contributions from SoundCork:**
 - Service emulation architecture
- BMX/Marge endpoint discovery
+- BMX/Marge endpoint discovery  
 - Device migration strategies
 - Python implementation reference

@@ -140,17 +137,17 @@ LOG_PROXY_BODY=true soundtouch-service
 ## 🚀 Future Plans

 - **Docker Images**: Official container images for easy deployment
- **Cluster Support**: Multi-instance deployment for high availability
+- **Cluster Support**: Multi-instance deployment for high availability  
 - **Advanced Analytics**: Machine learning-powered usage insights
 - **Extended Protocol Support**: Additional Bose protocol implementations
 - **Mobile App**: Companion mobile application for device management

 ## 📚 Documentation

- **[Complete Service Guide](../guides/SOUNDTOUCH-SERVICE.md)**: Comprehensive setup and configuration
- **[API Reference](../guides/SOUNDTOUCH-SERVICE.md#api-reference)**: Full endpoint documentation
- **[Migration Guide](../guides/SOUNDTOUCH-SERVICE.md#device-migration)**: Step-by-step device migration
- **[Troubleshooting](../guides/SOUNDTOUCH-SERVICE.md#troubleshooting)**: Common issues and solutions
+- **[Complete Service Guide](guides/SOUNDTOUCH-SERVICE.md)**: Comprehensive setup and configuration
+- **[API Reference](guides/SOUNDTOUCH-SERVICE.md#api-reference)**: Full endpoint documentation
+- **[Migration Guide](guides/SOUNDTOUCH-SERVICE.md#device-migration)**: Step-by-step device migration
+- **[Troubleshooting](guides/SOUNDTOUCH-SERVICE.md#troubleshooting)**: Common issues and solutions

 ## 🤝 Contributing

@@ -175,9 +172,9 @@ The collaborative spirit of reverse engineering and documentation in the SoundTo
 ## 🔗 Links

 - **[Main Repository](https://github.com/gesellix/bose-soundtouch)**
- **[Service Documentation](../guides/SOUNDTOUCH-SERVICE.md)**
- **[CLI Documentation](../guides/CLI-REFERENCE.md)**
- **[Getting Started Guide](../guides/GETTING-STARTED.md)**
+- **[Service Documentation](guides/SOUNDTOUCH-SERVICE.md)**
+- **[CLI Documentation](guides/CLI-REFERENCE.md)**
+- **[Getting Started Guide](guides/GETTING-STARTED.md)**
 - **[SoundCork Project](https://github.com/deborahgu/soundcork)**
 - **[ÜberBöse API](https://github.com/julius-d/ueberboese-api)**

@@ -0,0 +1,102 @@
+# Table of Contents
+
+* [Introduction](README.md)
+
+## User Guides
+* [Cloud Shutdown Survival Guide](guides/SURVIVAL-GUIDE.md)
+* [Self-Hosting AfterTouch](guides/SELF-HOSTING.md)
+* [Connecting Music Services](guides/MUSIC-SERVICES.md)
+* [Migration & Safety Guide](guides/MIGRATION-SAFETY.md)
+* [CLI Reference](guides/CLI-REFERENCE.md)
+* [Backup Tool](../cmd/soundtouch-backup/README.md)
+* [Getting Started](guides/GETTING-STARTED.md)
+* [SoundTouch Service](guides/SOUNDTOUCH-SERVICE.md)
+* [Initial Device Setup](guides/DEVICE-INITIAL-SETUP.md)
+* [Capture Device Pairing Traffic](guides/CAPTURE-DEVICE-PAIRING.md)
+* [Capture Migration Traffic](guides/CAPTURE-MIGRATION-TRAFFIC.md)
+* [Device Setup Flow](DEVICE-SETUP.md)
+* [MAC Address Mapping](guides/MAC-ADDRESS-MAPPING.md)
+* [HTTPS Setup](guides/HTTPS-SETUP.md)
+* [Deployment](guides/DEPLOYMENT.md)
+* [Raspberry Pi Guide](guides/RASPBERRY-PI.md)
+* [Troubleshooting](guides/TROUBLESHOOTING.md)
+* [IoT Implementation Guide](guides/IOT-IMPLEMENTATION-GUIDE.md)
+* [Migration Guide](guides/MIGRATION-GUIDE.md)
+* [MQTT Integration Design](guides/MQTT-INTEGRATION-DESIGN.md)
+* [Useful Links](#useful-links)
+
+### Useful Links
+* [Cloud Shutdown Survival Guide](guides/SURVIVAL-GUIDE.md)
+* [Raspberry Pi Installer](../scripts/raspberry-pi/README.md)
+* [Updating the Service](../scripts/raspberry-pi/README.md#updating-to-a-new-version)
+* [CLI Reference](guides/CLI-REFERENCE.md)
+
+## Technical Reference
+* [API Cookbook](reference/API-COOKBOOK.md)
+* [API Endpoints](reference/API-ENDPOINTS.md)
+* [Spotify Account Addition](reference/spotify-account-addition.md)
+* [Cloud API Emulation](reference/CLOUD-API.md)
+* [System Endpoints](reference/SYSTEM-ENDPOINTS.md)
+* [Speaker Endpoint](reference/SPEAKER-ENDPOINT.md)
+* [WebSocket Events](reference/WEBSOCKET-EVENTS.md)
+* [Device Pairing Flow](reference/DEVICE-PAIRING-FLOW.md)
+* [Discovery](reference/DISCOVERY.md)
+* [Zone Management](reference/ZONE-MANAGEMENT.md)
+* [Preset Management](reference/PRESET-MANAGEMENT.md)
+* [Source Selection](reference/SOURCE-SELECTION.md)
+* [Volume Controls](reference/VOLUME-CONTROLS.md)
+* [RadioBrowser](reference/radio-browser.md)
+* [Bass Controls](reference/BASS-CONTROLS.md)
+* [Key Controls](reference/KEY-CONTROLS.md)
+* [Feature Mapping](reference/FEATURE-MAPPING.md)
+
+## Concepts
+* [Request Recording](REQUEST_RECORDING_CONCEPT.md)
+* [Spotify Priming Strategy](concepts/spotify-priming-strategy.md)
+* [Spotify OAuth](concepts/spotify-oauth.md)
+
+## Analysis & Research
+* [API Coverage Analysis](analysis/API-COVERAGE.md)
+* [Supported URLs](analysis/SUPPORTED-URLS.md)
+* [Upstream URLs](analysis/UPSTREAM-URLS.md)
+* [Anonymization Summary](analysis/ANONYMIZATION-SUMMARY.md)
+* [Device Redirect Methods](analysis/DEVICE-REDIRECT-METHODS.md)
+* [Wiki API Comparison](analysis/WIKI-COMPARISON.md)
+* [IoT Config Summary](analysis/IOT-CONFIG-SUMMARY.md)
+* [IoT Configuration Analysis](analysis/IOT-CONFIGURATION-ANALYSIS.md)
+* [Bose Lab Runbook](analysis/BOSE-LAB-RUNBOOK.md)
+* [Missing Routes Spotify](analysis/MISSING-ROUTES-SPOTIFY.md)
+* [Bose App ADB Emulator](analysis/BOSE-APP-ADB-Emulator.md)
+* [Community Tools](analysis/bose-soundtouch-community-tools.md)
+
+## Parity Analysis
+* [Parity Improvements](PARITY-IMPROVEMENTS.md)
+* [Parity SoundCork](PARITY-SOUNDCORK.md)
+* [Parity OpenCloudTouch](PARITY-OPENCLOUDTOUCH.md)
+
+## Appendix (Other Documents)
+* [External Services Abstraction](EXTERNAL-SERVICES-ABSTRACTION.md)
+* [API Navigation Reference](API-NAVIGATION-REFERENCE.md)
+* [Claude Instructions](CLAUDE.md)
+* [Content Selection Implementation](CONTENT-SELECTION-IMPLEMENTATION.md)
+* [Device Customization Setup](DEVICE-CUSTOMIZATION-SETUP.md)
+* [Device Logging](DEVICE-LOGGING.md)
+* [Feature History](FEATURE_HISTORY.md)
+* [Host/Port Parsing](HOST-PORT-PARSING.md)
+* [Manual Network Discovery](MANUAL-NETWORK-DISCOVERY.md)
+* [Navigation Guide](NAVIGATION-GUIDE.md)
+* [Official API Verification](OFFICIAL-API-VERIFICATION.md)
+* [Preset Quickstart](PRESET-QUICKSTART.md)
+* [Project Patterns](PROJECT-PATTERNS.md)
+* [Service Availability Implementation](SERVICE-AVAILABILITY-IMPLEMENTATION.md)
+* [SoundTouch Service Announcement](SOUNDTOUCH-SERVICE-ANNOUNCEMENT.md)
+* [Undocumented Community Features](UNDOCUMENTED-COMMUNITY-FEATURES.md)
+* [Unimplemented Endpoints](UNIMPLEMENTED-ENDPOINTS.md)
+* [Preset Store](preset-store.md)
+* [SCMUDC Enrichment Implementation](SCMUDC-ENRICHMENT-IMPLEMENTATION.md)
+* [Device Lifecycle and Power On Enhancement](device-lifecycle-and-power-on-enhancement.md)
+* [Device Lifecycle Summary](device-lifecycle-summary.md)
+* [Power On Implementation Guide](power-on-implementation-guide.md)
+* [SCMUDC Events Analysis](scmudc-events-analysis.md)
+* [Parity Improvements](PARITY-IMPROVEMENTS.md)
+* [Parity SoundCork](PARITY-SOUNDCORK.md)
@@ -1,8 +1,4 @@
---
-title: "Undocumented Community Features & API Discoveries"
-sidebar:
-  exclude: true
---
+# Undocumented Community Features & API Discoveries
 This document captures advanced API endpoints and device behaviors discovered by the SoundTouch community through reverse engineering projects like **SoundCork** and **ÜberBöse API**. These features are not documented in the official Bose SoundTouch Web API v1.0 but are crucial for full device emulation and offline operation.
 ## Cloud Emulation (Marge/BMX) Discoveries
 While the local `/8090` API is well-documented, the cloud-side service emulation reveals deeper device integration points.
@@ -1,32 +1,12 @@
---
-title: "Unimplemented SoundTouch API Endpoints"
-sidebar:
-  exclude: true
---
-**Last Updated:** June 2026 (reconciled against `pkg/client`)  
+# Unimplemented SoundTouch API Endpoints
+
+**Last Updated:** January 2026  
 **Source:** [SoundTouch Plus Wiki](https://github.com/thlucas1/homeassistantcomponent_soundtouchplus/wiki/SoundTouch-WebServices-API)  
-**Current Implementation:** ~41 endpoints in `pkg/client` (see reconciliation note)  
+**Current Implementation:** 35 endpoints (including preset & navigation management discovered via SoundTouch Plus Wiki)  
 **Wiki Documentation:** 87 endpoints  
-**Implementation Gap:** ~46 endpoints
+**Implementation Gap:** 52 endpoints

-This document covers SoundTouch **device** WebServices API endpoints (the
-speaker's local `:8090` API consumed by `pkg/client`) documented in the community
-wiki but not yet implemented. It is **not** about the cloud-service router
-(`cmd/soundtouch-service`); for that surface see the contract checklist
-`tests/integration/http-client/COVERAGE.md`. Examples are based on real device
-responses and community testing.
-
-> **Reconciliation note (June 2026).** Verified against `pkg/client`. Since the
-> last update these are **now implemented** and have been re-marked below:
-> `setMusicServiceAccount` / `removeMusicServiceAccount` (`SetMusicServiceAccount`,
-> `RemoveMusicServiceAccount`) and the full stereo-pair group set
-> `getGroup` / `addGroup` / `removeGroup` / `updateGroup`
-> (`GetGroup`, `AddGroup`, `RemoveGroup`, `UpdateGroup`). The priority-matrix
-> counts further down are historical and have not all been recomputed; trust the
-> per-endpoint ✅ markers over the section totals. Endpoints still listed as
-> candidates (e.g. `/search`, `/standby`, `/powerManagement`, `/bluetoothInfo`,
-> `/language`, `/listMediaServers`) were confirmed absent from `pkg/client`
-> (some appear only in test fixtures).
+This document provides comprehensive information about SoundTouch API endpoints documented in the community wiki but not yet implemented in this Go library. All examples are based on real device responses and extensive community testing.

 ---

@@ -86,15 +66,12 @@ Specialized hardware-specific features.
 - CLI command: `preset select --slot <1-6>`
 - Alternative: Direct key commands (`SendKey("PRESET_1")` etc.)

-### ~~Music Service Management~~ ✅ **IMPLEMENTED**
+### Music Service Management
 Critical for streaming service integration.

-#### ~~POST /setMusicServiceAccount~~ ✅ **IMPLEMENTED**
+#### POST /setMusicServiceAccount 🔥 **CRITICAL**
 Adds a music service account to the sources list.

-**Status:** **COMPLETE** - `pkg/client` exposes `SetMusicServiceAccount(...)`
-(and `SetMusicServiceOAuthAccount(...)` for OAuth sources like Spotify/Amazon).
-
 **Request Examples:**

 Pandora Service:
@@ -131,11 +108,9 @@ NAS Music Library:
 - Note the `/0` suffix for STORED_MUSIC user names
 - Spotify requires PREMIUM account for most operations

-#### ~~POST /removeMusicServiceAccount~~ ✅ **IMPLEMENTED**
+#### POST /removeMusicServiceAccount 🔥 **CRITICAL**
 Removes an existing music service account.

-**Status:** **COMPLETE** - `pkg/client` exposes `RemoveMusicServiceAccount(...)`.
-
 **Request Examples:**

 Remove Pandora:
@@ -300,8 +275,8 @@ Returns detected UPnP/DLNA media servers.
 **Response Example:**
 ```xml
 <ListMediaServersResponse>
-  <media_server id="2f402f80-da50-11e1-9b23-123456789012" mac="0017886e13fe" ip="192.0.2.4" manufacturer="Signify" model_name="Philips hue bridge 2015" friendly_name="Hue Bridge (192.0.2.4)" model_description="Philips hue Personal Wireless Lighting" location="http://192.0.2.4:80/description.xml" />
-  <media_server id="d09708a1-5953-44bc-a413-123456789012" mac="S-1-5-21-240303764-901663538-1234567890-1001" ip="192.0.2.5" manufacturer="Microsoft Corporation" model_name="Windows Media Player Sharing" friendly_name="My NAS Media Library" model_description="" location="http://192.0.2.5:2869/upnphost/udhisapi.dll?content=uuid:d09708a1-5953-44bc-a413-123456789012" />
+  <media_server id="2f402f80-da50-11e1-9b23-123456789012" mac="0017886e13fe" ip="192.168.1.4" manufacturer="Signify" model_name="Philips hue bridge 2015" friendly_name="Hue Bridge (192.168.1.4)" model_description="Philips hue Personal Wireless Lighting" location="http://192.168.1.4:80/description.xml" />
+  <media_server id="d09708a1-5953-44bc-a413-123456789012" mac="S-1-5-21-240303764-901663538-1234567890-1001" ip="192.168.1.5" manufacturer="Microsoft Corporation" model_name="Windows Media Player Sharing" friendly_name="My NAS Media Library" model_description="" location="http://192.168.1.5:2869/upnphost/udhisapi.dll?content=uuid:d09708a1-5953-44bc-a413-123456789012" />
 </ListMediaServersResponse>
 ```

@@ -652,12 +627,9 @@ Selects LOCAL source (only way to select LOCAL on some devices).
 <status>/selectLocalSource</status>
 ```

-### ~~Group Management (ST-10 Stereo Pairs Only)~~ ✅ **IMPLEMENTED**
+### Group Management (ST-10 Stereo Pairs Only)

-**Status:** **COMPLETE** - the full stereo-pair set is implemented in `pkg/client`:
-`GetGroup()`, `AddGroup()`, `RemoveGroup()`, `UpdateGroup()`.
-
-#### ~~GET /getGroup~~ ✅ **IMPLEMENTED**
+#### GET /getGroup 📊 **MEDIUM**
 Gets current stereo pair configuration.

 **Response Example (paired):**
@@ -669,15 +641,15 @@ Gets current stereo pair configuration.
    <groupRole>
      <deviceId>9070658C9D4A</deviceId>
      <role>LEFT</role>
-      <ipAddress>192.0.2.131</ipAddress>
+      <ipAddress>192.168.1.131</ipAddress>
    </groupRole>
    <groupRole>
      <deviceId>F45EAB3115DA</deviceId>
      <role>RIGHT</role>
-      <ipAddress>192.0.2.134</ipAddress>
+      <ipAddress>192.168.1.134</ipAddress>
    </groupRole>
  </roles>
-  <senderIPAddress>192.0.2.131</senderIPAddress>
+  <senderIPAddress>192.168.1.131</senderIPAddress>
  <status>GROUP_OK</status>
 </group>
 ```
@@ -687,7 +659,7 @@ Gets current stereo pair configuration.
 <group />
 ```

-#### ~~POST /addGroup~~ ✅ **IMPLEMENTED**
+#### POST /addGroup 📊 **MEDIUM**
 Creates new stereo pair group.

 **Request Example:**
@@ -699,12 +671,12 @@ Creates new stereo pair group.
    <groupRole>
      <deviceId>9070658C9D4A</deviceId>
      <role>LEFT</role>
-      <ipAddress>192.0.2.131</ipAddress>
+      <ipAddress>192.168.1.131</ipAddress>
    </groupRole>
    <groupRole>
      <deviceId>F45EAB3115DA</deviceId>
      <role>RIGHT</role>
-      <ipAddress>192.0.2.134</ipAddress>
+      <ipAddress>192.168.1.134</ipAddress>
    </groupRole>
  </roles>
 </group>
@@ -713,7 +685,7 @@ Creates new stereo pair group.
 **Response:** Same as GET /getGroup  
 **WebSocket Event:** `groupUpdated` sent to both devices

-#### ~~GET /removeGroup~~ ✅ **IMPLEMENTED**
+#### GET /removeGroup 📊 **MEDIUM**
 Removes existing stereo pair group.

 **Response:**
@@ -723,7 +695,7 @@ Removes existing stereo pair group.

 **WebSocket Event:** `groupUpdated` sent to both devices

-#### ~~POST /updateGroup~~ ✅ **IMPLEMENTED**
+#### POST /updateGroup 📊 **MEDIUM**
 Updates stereo pair group name.

 **Request Example:**
@@ -735,12 +707,12 @@ Updates stereo pair group name.
    <groupRole>
      <deviceId>9070658C9D4A</deviceId>
      <role>LEFT</role>
-      <ipAddress>192.0.2.131</ipAddress>
+      <ipAddress>192.168.1.131</ipAddress>
    </groupRole>
    <groupRole>
      <deviceId>F45EAB3115DA</deviceId>
      <role>RIGHT</role>
-      <ipAddress>192.0.2.134</ipAddress>
+      <ipAddress>192.168.1.134</ipAddress>
    </groupRole>
  </roles>
 </group>
@@ -790,7 +762,7 @@ Returns network status configuration.
          <name>eth0</name>
          <mac-addr>1004567890AA</mac-addr>
          <bindings>
-            <ipv4address>192.0.2.131</ipv4address>
+            <ipv4address>192.168.1.131</ipv4address>
          </bindings>
          <running>true</running>
          <kind>Wireless</kind>
@@ -1007,8 +979,8 @@ func TestDeviceCompatibility(t *testing.T) {

 ### Phase 1: Essential Features (4 weeks)
 1. ✅ **Preset Management**: ~~`storePreset`, `removePreset`, `selectPreset`~~ (IMPLEMENTED)
-2. ✅ **Music Services**: ~~`setMusicServiceAccount`, `removeMusicServiceAccount`~~ (IMPLEMENTED)
-3. ✅ **Content Discovery**: ~~`navigate`~~ (IMPLEMENTED), `search`, `recents`
+2. **Music Services**: `setMusicServiceAccount`, `removeMusicServiceAccount`  
+3. ✅ **Content Discovery**: ~~`navigate`, `search`~~ (IMPLEMENTED), `recents`
 4. ✅ **Station Management**: ~~`searchStation`, `addStation`, `removeStation`~~ (IMPLEMENTED)
 5. **Enhanced Controls**: `userPlayControl`, `userRating`

@@ -1021,7 +993,7 @@ func TestDeviceCompatibility(t *testing.T) {
 ### Phase 3: Advanced Features (3 weeks)
 1. **Bluetooth**: `enterBluetoothPairing`, `clearBluetoothPaired`
 2. **Software Updates**: `swUpdateCheck`, `swUpdateQuery`
-3. ✅ **Stereo Pairs**: ~~`getGroup`, `addGroup`, `removeGroup`, `updateGroup`~~ (IMPLEMENTED)
+3. **Stereo Pairs**: `getGroup`, `addGroup`, `removeGroup`, `updateGroup`
 4. **Source Shortcuts**: `selectLastSource`, `selectLastSoundTouchSource`

 ### Phase 4: Specialized Features (2 weeks)
@@ -0,0 +1,11 @@
+title: Bose SoundTouch Toolkit
+description: Documentation for controlling and preserving Bose SoundTouch devices
+remote_theme: pages-themes/minimal@v0.2.0
+plugins:
+  - jekyll-remote-theme
+  - jekyll-relative-links
+relative_links:
+  enabled: true
+  collections: true
+include:
+  - SUMMARY.md
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tobias GesellchenandClaude Sonnet 4.6	b040c8a90c	feat(soundtouch-web): add multi-room zone management Backend: - GET /api/zone/{id} — zone info enriched with device names and role flags - POST /api/zone/{id}/add/{slaveId} — add slave (creates zone if standalone) - POST /api/zone/{id}/remove/{slaveId} — remove slave from zone - POST /api/zone/{id}/dissolve — dissolve zone to standalone - POST /api/zone/{id}/leave — slave leaves its zone (backend finds master) Frontend (Zone.js): - Standalone: shows "Group with…" button, opens device picker overlay - Master: member list with per-row Remove, Add speaker, Dissolve buttons - Slave: shows master name, Leave zone button - Lazy-loads on device detail open; refreshes after each zone operation Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-08 21:22:57 +02:00
Tobias GesellchenandClaude Sonnet 4.6	3122c4ed3a	feat(soundtouch-web): add recents panel with play support - GET /api/device-recents/{id} — fetches /recents from device - POST /api/device-play/{id} — generic content-item player (reusable) - Recents.js: lazy-loaded list with artwork, name, source badge, click-to-play - Hides itself when the device returns no recents - api.js: recents() and play() helpers Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-08 21:22:57 +02:00
Tobias GesellchenandClaude Sonnet 4.6	2edcc14342	feat(soundtouch-web): add progress bar, shuffle/repeat, and bass controls - NowPlaying: progress bar with live ticking (resets on position/state change) - Controls: shuffle toggle (🔀), repeat cycle (🔁/🔂), active state styling - Controls: bass slider (-9..+9), shown only when device reports bass support - api.js: add bass() helper posting JSON body to /api/control/{id}/bass - CSS: progress bar, progress time, bass-row styles Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-08 21:22:57 +02:00
Tobias GesellchenandClaude Sonnet 4.6	6723515f54	feat(soundtouch-web): migrate to pkg/service/soundtouchweb with Preact UI Move soundtouch-web from Bootstrap+vanilla JS to an embedded-asset Go service using Preact+htm (no build step). Implements Stockholm UI parity: device list, now playing, transport controls, presets, sources, and TuneIn browser. - Relocate handlers/websocket/webtypes to pkg/service/soundtouchweb/ - Replace old static/ with CSS-custom-property design system (dark mode) - Add Preact component tree: DeviceList, NowPlaying, Controls, Presets, Sources, TuneInBrowser - Wire WebSocket for real-time device status updates - Slim cmd/soundtouch-web/main.go to a thin CLI wrapper Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-08 21:22:57 +02:00