merge branch 'develop' into 'main' - Release v1.7.34

chore: bump version to 1.7.34 and update CHANGELOG and docs
style(ui): unify tab headers layout, typography, and icons (closes #72 )
2026-05-28 18:15:33 +01:00 · 2026-05-28 18:15:27 +01:00 · 2026-05-28 18:12:53 +01:00 · 2026-05-28 18:11:45 +01:00 · 2026-05-28 17:42:54 +01:00 · 2026-05-28 17:42:43 +01:00
30 changed files with 1113 additions and 153 deletions
@@ -4,6 +4,38 @@ All notable changes to this project will be documented in this file.
 Format follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+## [1.7.34] - 2026-05-28
+
+### Fixed
+
+- **Webhook Test Duplicate Error (Issue #71)** — Skipped duplicate/replay protection for `"Test"` event types in Sonarr and Radarr webhook handlers, resolving test button failures. Resolves Gitea Issue [#71](https://git.i3omb.com/Gandalf/sofarr/issues/71).
+
+### Enhanced
+
+- **Unified Tab Header Layout & Typography Consistency (Issue #72)** — Added consistent titles, subtitles, and icons across Active Downloads, Recently Completed, and Requests tab panels, and refactored styling to use a unified flexbox design with CSS variables. Resolves Gitea Issue [#72](https://git.i3omb.com/Gandalf/sofarr/issues/72).
+
+## [1.7.33] - 2026-05-28
+
+### Added
+
+- **Requests Tab Layout Enhancement (Issue #69)** — Redesigned and unified the Requests tab container and card layouts with the Active Downloads and Recently Completed tabs. Added styled media-type borders (`tv` and `movie`) using system color variables, styled the `.requests-container` with a surface card background (`var(--surface)`) and box shadow, converted `.requests-list` to a column flexbox (`display: flex; flex-direction: column; gap: 8px;`), aligned card items to the top (`align-items: flex-start`), tighter padding (`10px 14px`), and border-radius (`6px`), and scaled `.request-type-icon` to `48px` wide and `68px` high as a clean cover-art placeholder. All changes are strictly scoped to the requests tab element selectors, leaving active and recent downloads 100% untouched. Resolves Gitea Issue [#69](https://git.i3omb.com/Gandalf/sofarr/issues/69).
+
+### Fixed
+
+- **Webhook Regression (Issue #70)** — Fixed a critical regression introduced in #62 where the Ombi webhook handler called `isReplay()` with 3 arguments instead of the new 4-argument signature (`eventType, instanceName, eventDate, contentId`). The handler now correctly passes `requestId` as the fourth `contentId` argument. This restores reliability to real Ombi webhooks, loopback fallbacks, and the Ombi test simulation buttons. Resolves Gitea Issue [#70](https://git.i3omb.com/Gandalf/sofarr/issues/70).
+
+## [1.7.32] - 2026-05-28
+
+### Fixed
+
+- **TransmissionClient Hardening (Issue #63)** — Mapped the previously-unknown Transmission RPC status code `7` to `Checking` (best-effort; the RPC spec formally documents only codes 0–6, and the historical alias `TORRENT_IS_CHECKING` corresponds to code 2), so torrents reporting code 7 are now rendered with a useful status label instead of `Unknown`. Implemented three torrent control methods on `TransmissionClient` that were previously absent: `startTorrent(id)` (resumes via `torrent-start`), `stopTorrent(id)` (pauses via `torrent-stop`), and `removeTorrent(id, deleteData = false)` (removes via `torrent-remove`, optionally also deleting local files via Transmission's `delete-local-data` flag). All three accept either a single id (numeric or hash) or an array of ids, matching the Transmission RPC contract. Documented in `extractArrInfo()` that an `arrQueueId` cannot reliably be derived from filename alone — the cross-client matching path is hash-based via `DownloadMatcher.matchTorrents()` (Issue #65), which keys on `torrent.hashString` for Transmission. Added regression tests for status code 7 and all three control methods. Resolves Gitea Issue [#63](https://git.i3omb.com/Gandalf/sofarr/issues/63).
+- **Frontend Build Stability (Issue #66)** — Added explanatory inline comments to `client/vite.config.js` documenting two non-standard but deliberate build settings: `build.outDir = '../public'` (the Vite bundle is emitted into the Express-served `public/` directory at the repo root rather than the Vite-default `client/dist/`) and `build.emptyOutDir = false` (required so the hand-authored static assets committed under `public/` are not wiped by every `vite build`). The comments explicitly warn that changing either setting without also updating the Express static-serve configuration in `server/app.js` and the Dockerfile copy steps will break production serving. Removed a stale, untracked `client/dist/` directory (a leftover from an earlier default-Vite build) that was harmless — both `.gitignore` and `.dockerignore` already excluded it from version control and Docker contexts — but caused recurring confusion about which `index.html` was authoritative. Verified `client/index.html` correctly references `/src/main.js` as the Vite entrypoint. Resolves Gitea Issue [#66](https://git.i3omb.com/Gandalf/sofarr/issues/66).
+- **Download Matching & Deduplication (Issue #65)** — `DownloadMatcher.matchTorrents()` now attempts hash-first matching for every torrent before falling back to title-substring matching. The hash lookup compares `torrent.hash` (qBittorrent, rTorrent) or `torrent.hashString` (Transmission) against each *arr* queue/history record's `downloadId`, restoring deterministic matching for renamed downloads and torrents whose on-disk filename has diverged from the *arr* release title. Title-substring matching is retained verbatim as a fallback so unhashed clients and legacy fixtures continue to work. After the per-torrent matching pass, the returned list is deduplicated by the composite key `(arrType, arrQueueId)`: the first matched download wins, so a single torrent that maps to N *arr* queue records sharing one queue id (for example, a season pack exposed as multiple per-episode rows) produces a single dashboard card instead of N near-identical duplicates. A new integration suite at `tests/integration/download-matcher-season-pack.test.js` covers hash-first matching for qBittorrent (`hash`) and Transmission (`hashString`), the title-substring fallback path, and the deduplication step. Resolves Gitea Issue [#65](https://git.i3omb.com/Gandalf/sofarr/issues/65).
+- **qBittorrentClient Peer Data & Response Safety (Issue #64)** — `QBittorrentClient.normalizeDownload()` now exposes two new fields on every torrent record: `seeds` (sourced from qBittorrent's `num_seeds`, the count of connected seed peers) and `peers` (sourced from `num_leechs`, the count of connected leecher peers). The connected counts were chosen deliberately over the swarm totals `num_complete`/`num_incomplete` so the values remain consistent with what other clients (Transmission via `peersConnected`/`peersSendingToUs`, rTorrent via `d.peers_connected`) report on the same normalised contract. `QBittorrentClient.getMainData()` now also defensively returns the existing in-memory torrent map (rather than dereferencing a null) when the qBittorrent server responds with an empty body to `/api/v2/sync/maindata`, eliminating a crash class observed against transiently-restarting qBittorrent instances. A regression test verifies the new fields are populated from `num_seeds`/`num_leechs` and not from the swarm-total fields. Resolves Gitea Issue [#64](https://git.i3omb.com/Gandalf/sofarr/issues/64).
+- **Season Pack Queue Handling & Crash Prevention (Issue #61)** — Extracted a shared `buildArrQueueCache(queues, instances, mediaKey)` helper at `server/utils/arrQueueHelpers.js` covering both Sonarr and Radarr, replacing four previously-divergent inline `flatMap` blocks across the background poller (`server/utils/poller.js`) and the webhook event processor (`server/routes/webhook.js`) that built the `poll:sonarr-queue` and `poll:radarr-queue` cache entries. Sonarr queue records that share a `downloadId` (the canonical fingerprint for a season-pack release) are now annotated with `isSeasonPack: true` and `episodeCount: <n>` so downstream consumers — including the active-downloads matching service — can identify and de-duplicate season packs without re-deriving the grouping. The helper is wrapped in per-record and per-instance `try`/`catch` guards: malformed records (`null`, missing `data`, unknown instance ids) are skipped with a warning rather than throwing, eliminating a class of crashes that previously bubbled out of the `flatMap` and tore down the entire poll cycle or webhook refresh. Movies (Radarr) skip season-pack annotation by design. A new unit test suite at `tests/unit/utils/arrQueueHelpers.test.js` covers tagging, season-pack grouping, null-safety, and unknown-instance fallback. Resolves Gitea Issue [#61](https://git.i3omb.com/Gandalf/sofarr/issues/61).
+- **rTorrent Null-Safety, SABnzbd History Limit & Client Last-Error Visibility (Issue #68)** — Three related hardening improvements to the download-client layer. First, `RTorrentClient` now defends against the malformed-response scenarios observed against misconfigured or transiently-restarting rTorrent servers: `getActiveDownloads()` explicitly checks that `d.multicall2` returned an actual array (logging a warning and returning `[]` if not, rather than throwing on `.map`) and processes each torrent row in its own `try`/`catch` so a single malformed entry cannot poison the whole result set. All eleven field values retrieved from the multicall response are coerced to their expected types via explicit `Number()`/`String()` conversions in `normalizeDownload()`, so downstream arithmetic and string operations can no longer blow up on `null` or `undefined` values from plugins or older rTorrent versions. `_extractArrInfo()` now short-circuits safely on non-string filenames. `getClientStatus()` additionally coerces the global rate values through `Number.isFinite` before returning them. Second, the SABnzbd history limit (previously hard-coded to `10` records per poll) is now configurable via the `SAB_HISTORY_LIMIT` environment variable. Invalid or absent values fall back to the default of `10` with a log warning, ensuring backward compatibility. Third, all four download clients (`RTorrentClient`, `SABnzbdClient`, `QBittorrentClient`, `TransmissionClient`) now record structured `lastError` objects (`{ operation, message, at }`) on every failed API call via `_recordLastError()` and clear them on subsequent success via `_clearLastError()` — both helpers introduced on the `DownloadClient` base class alongside the public `getLastError()` accessor. The per-client last-error is surfaced through `DownloadClientRegistry.getAllClientStatuses()` and exposed on the `GET /api/status/status` admin endpoint under the new `downloadClients` array, letting the admin panel show a per-client failure indicator without log scraping. New regression tests cover all null-safety paths, the SAB history limit env variable (unset, valid, invalid, propagated to the API call), and the full lastError set/clear cycle for both rTorrent and SABnzbd. Resolves Gitea Issue [#68](https://git.i3omb.com/Gandalf/sofarr/issues/68).
+- **Webhook Reliability (Issue #62)** — Hardened the webhook replay protection to prevent false-duplicate detection while preserving protection against genuine retries. The replay key for Sonarr and Radarr now incorporates a content identifier (`downloadId`, falling back to `series.id` or `movie.id`) alongside the existing `eventType:instanceName:eventDate` components, so that multiple distinct events sharing the same timestamp (for example, several `Grab` events fired in the same second for episodes in a season pack) no longer collide and get silently dropped. Events without a content identifier (such as `Test`) fall back gracefully to the previous key shape so existing behaviour is preserved. The Ombi handler — which already uses a distinct `requestId`-bearing key — is unchanged. Additionally, the Sonarr and Radarr handlers now log an explicit warning when the inbound `instanceName` fails to match any configured instance and processing falls back to the first instance, improving diagnosability of misconfigured webhook senders. Resolves Gitea Issue [#62](https://git.i3omb.com/Gandalf/sofarr/issues/62).
+
 ## [1.7.31] - 2026-05-28

 ### Fixed
@@ -119,7 +119,7 @@ function createRequestCard(request) {
  }

  const card = document.createElement('div');
-  card.className = 'request-card';
+  card.className = `request-card ${request.mediaType || ''}`;

  const typeIcon = document.createElement('span');
  typeIcon.className = `request-type-icon ${request.mediaType || ''}`;
@@ -12,7 +12,17 @@ export default defineConfig(({ mode }) => {

  return {
    build: {
+      // NOTE (Issue #66): `outDir` is intentionally the repo-root `../public`,
+      // NOT the Vite default `client/dist/`. The Express server in
+      // `server/app.js` serves static assets directly from `public/`, so the
+      // Vite build emits its bundle alongside the hand-authored static assets
+      // (favicon, etc.) that live in `public/` and are committed to the repo.
+      // Do NOT change this back to `dist/` without also updating the Express
+      // static-serve configuration and the Dockerfile copy steps.
      outDir: '../public',
+      // NOTE (Issue #66): `emptyOutDir: false` is REQUIRED because `public/`
+      // contains hand-authored static assets that must survive the build.
+      // Setting this to `true` would wipe those assets on every `vite build`.
      emptyOutDir: false,
      rollupOptions: {
        input: {
@@ -1,12 +1,12 @@
 {
  "name": "sofarr",
-  "version": "1.7.31",
+  "version": "1.7.34",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "sofarr",
-      "version": "1.7.31",
+      "version": "1.7.34",
      "license": "MIT",
      "dependencies": {
        "axios": "^1.6.0",
@@ -1,6 +1,6 @@
 {
  "name": "sofarr",
-  "version": "1.7.31",
+  "version": "1.7.34",
  "description": "A personal media download dashboard that shows your downloads 'so far' while you relax on the sofa waiting for your *arr services to finish",
  "main": "server/index.js",
  "scripts": {
@@ -170,8 +170,12 @@

                <div class="tab-panel" id="tab-downloads">
                    <div class="downloads-container">
-                        <div class="downloads-header">
-                            <div class="downloads-controls">
+                        <div class="downloads-header tab-header">
+                            <div class="tab-header-title">
+                                <h2><span class="tab-header-icon">📥</span> Active Downloads</h2>
+                                <p class="tab-header-subtitle">Track and manage your active media downloads in real-time</p>
+                            </div>
+                            <div class="downloads-controls tab-header-controls">
                                <label class="download-client-label" for="download-client-filter">Download client:</label>
                                <div class="download-client-filter" id="download-client-filter">
                                    <button class="download-client-dropdown-btn" id="download-client-dropdown-btn" type="button" aria-expanded="false">
@@ -200,8 +204,12 @@

                <div class="tab-panel hidden" id="tab-requests">
                    <div class="requests-container">
-                        <div class="requests-header">
-                            <div class="requests-controls">
+                        <div class="requests-header tab-header">
+                            <div class="tab-header-title">
+                                <h2><span class="tab-header-icon">📨</span> Requests</h2>
+                                <p class="tab-header-subtitle">Browse, filter, and track requests synced from Ombi</p>
+                            </div>
+                            <div class="requests-controls tab-header-controls">
                                <!-- Media Type Filter -->
                                <div class="request-filter" id="request-type-filter">
                                    <label class="request-filter-label">Type:</label>
@@ -286,8 +294,12 @@

                <div class="tab-panel hidden" id="tab-history">
                    <div class="history-container" id="history-container">
-                        <div class="history-header">
-                            <div class="history-controls">
+                        <div class="history-header tab-header">
+                            <div class="tab-header-title">
+                                <h2><span class="tab-header-icon">📜</span> Recently Completed</h2>
+                                <p class="tab-header-subtitle">Review successful imports and troubleshoot failed upgrade attempts</p>
+                            </div>
+                            <div class="history-controls tab-header-controls">
                                <label class="history-days-label" for="history-days">Last</label>
                                <input type="number" id="history-days" class="history-days-input" value="7" min="1" max="90">
                                <span class="history-days-label">days</span>
@@ -689,15 +689,61 @@ body {
  padding: 0;
 }

-/* Downloads header and controls */
-.downloads-header {
+/* Unified Tab Headers (Issue #72) */
+.tab-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  gap: 16px;
+  margin-bottom: 20px;
+  padding-bottom: 16px;
+  border-bottom: 1px solid var(--border);
+  flex-wrap: wrap;
+}
+
+.tab-header-title {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.tab-header-title h2 {
+  margin: 0;
+  font-size: 1.25rem;
+  font-weight: 600;
+  color: var(--text-primary);
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.tab-header-icon {
+  font-size: 1.3rem;
+  display: inline-flex;
+  align-items: center;
+}
+
+.tab-header-subtitle {
+  margin: 0;
+  font-size: 0.8rem;
+  color: var(--text-muted);
+}
+
+.tab-header-controls {
  display: flex;
  align-items: center;
  gap: 12px;
-  margin-bottom: 12px;
  flex-wrap: wrap;
 }

+.tab-header, .tab-header-title h2, .tab-header-subtitle {
+  transition: color 0.3s, border-color 0.3s;
+}
+
+.downloads-header {
+  /* Inherits from .tab-header */
+}
+
 .downloads-controls {
  display: flex;
  align-items: center;
@@ -898,11 +944,7 @@ body {
 /* ===== Request Filters ===== */

 .requests-header {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  margin-bottom: 12px;
-  flex-wrap: wrap;
+  /* Inherits from .tab-header */
 }

 .requests-controls {
@@ -1076,18 +1118,7 @@ body {
 }

 .history-header {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  margin-bottom: 12px;
-  flex-wrap: wrap;
-}
-
-.history-header h2 {
-  margin: 0;
-  font-size: 1.2rem;
-  color: var(--text-primary);
-  flex: 1 1 auto;
+  /* Inherits from .tab-header */
 }

 .history-controls {
@@ -1134,7 +1165,7 @@ body {
  display: inline-flex;
  align-items: center;
  gap: 5px;
-  font-size: 0.82rem;
+  font-size: 0.85rem;
  color: var(--text-secondary);
  cursor: pointer;
  user-select: none;
@@ -2229,17 +2260,15 @@ body {

 /* ===== Requests Tab ===== */
 .requests-container {
-  padding: 20px;
+  background: var(--surface);
+  padding: 16px 20px;
+  border-radius: 8px;
+  box-shadow: 0 2px 4px var(--shadow);
+  transition: background 0.3s;
 }

 .requests-header {
-  margin-bottom: 20px;
-}
-
-.requests-header h2 {
-  margin: 0;
-  color: var(--text-primary);
-  font-size: 1.5rem;
+  /* Inherits from .tab-header */
 }

 .no-requests {
@@ -2249,37 +2278,46 @@ body {
 }

 .requests-list {
-  display: grid;
-  gap: 12px;
-  overflow-x: hidden;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
 }

 .request-card {
  display: flex;
-  align-items: center;
+  align-items: flex-start;
  gap: 12px;
-  padding: 16px;
+  padding: 10px 14px;
  background: var(--surface);
  border: 1px solid var(--border);
-  border-radius: 8px;
+  border-radius: 6px;
  transition: box-shadow 0.2s ease, border-color 0.2s ease;
  min-width: 0;
 }

+.request-card.tv {
+  border-left: 3px solid var(--series-color);
+}
+
+.request-card.movie {
+  border-left: 3px solid var(--movie-color);
+}
+
 .request-card:hover {
  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
  border-color: var(--accent);
 }

 .request-type-icon {
-  font-size: 1.5rem;
+  font-size: 1.6rem;
  display: flex;
  align-items: center;
  justify-content: center;
-  width: 40px;
-  height: 40px;
+  width: 48px;
+  height: 68px;
  background: var(--surface-alt);
-  border-radius: 8px;
+  border-radius: 4px;
+  box-shadow: 0 1px 4px var(--shadow-strong);
  flex-shrink: 0;
 }

@@ -2289,11 +2327,11 @@ body {
 }

 .request-title {
+  font-size: 0.95rem;
  font-weight: 600;
  color: var(--text-primary);
-  margin-bottom: 4px;
-  overflow: hidden;
-  text-overflow: ellipsis;
+  margin: 0 0 4px;
+  word-break: break-word;
 }

 .request-meta {
@@ -133,7 +133,7 @@ function createApp({ skipRateLimits = false } = {}) {
   *                 version:
   *                   type: string
   *                   description: sofarr version
-   *                   example: "1.7.31"
+   *                   example: "1.7.34"
   *     x-code-samples:
   *       - lang: curl
   *         label: cURL
@@ -25,6 +25,41 @@ class DownloadClient {
    this.apiKey = instanceConfig.apiKey;
    this.username = instanceConfig.username;
    this.password = instanceConfig.password;
+
+    // Last error encountered while talking to this client.
+    // Cleared on successful calls via _clearLastError(); set via _recordLastError().
+    // Surfaced through getAllClientStatuses() so the admin status panel can show
+    // a per-client failure indicator without needing to scrape logs.
+    this.lastError = null;
+  }
+
+  /**
+   * Record an error encountered while talking to this client.
+   * @param {string} operation - Short description of the operation (e.g. 'getActiveDownloads')
+   * @param {Error|string} error - Error object or message
+   */
+  _recordLastError(operation, error) {
+    const message = (error && error.message) ? error.message : String(error || 'unknown error');
+    this.lastError = {
+      operation,
+      message,
+      at: new Date().toISOString()
+    };
+  }
+
+  /**
+   * Clear the last error (called when an operation succeeds).
+   */
+  _clearLastError() {
+    this.lastError = null;
+  }
+
+  /**
+   * Public accessor for the last recorded error, or null if none.
+   * @returns {{operation:string, message:string, at:string}|null}
+   */
+  getLastError() {
+    return this.lastError;
  }

  /**
@@ -23,9 +23,11 @@ class QBittorrentClient extends DownloadClient {
      // Try a simple API call to verify connection
      await this.makeRequest('/api/v2/app/version');
      logToFile(`[qBittorrent:${this.name}] Connection test successful`);
+      this._clearLastError();
      return true;
    } catch (error) {
      logToFile(`[qBittorrent:${this.name}] Connection test failed: ${error.message}`);
+      this._recordLastError('testConnection', error);
      return false;
    }
  }
@@ -104,6 +106,11 @@ class QBittorrentClient extends DownloadClient {
    const response = await this.makeRequest(`/api/v2/sync/maindata?rid=${this.lastRid}`);
    const data = response.data;

+    if (!data) {
+      logToFile(`[qBittorrent:${this.name}] Empty response from sync/maindata`);
+      return Array.from(this.torrentMap.values());
+    }
+
    if (data.full_update) {
      // Full refresh: rebuild the entire map
      this.torrentMap.clear();
@@ -169,6 +176,7 @@ class QBittorrentClient extends DownloadClient {

      const torrents = await this.getMainData();
      logToFile(`[qBittorrent:${this.name}] Sync: ${torrents.length} torrents (rid=${this.lastRid})`);
+      this._clearLastError();
      return torrents.map(torrent => this.normalizeDownload(torrent));
    } catch (error) {
      logToFile(`[qBittorrent:${this.name}] Sync failed, falling back to legacy: ${error.message}`);
@@ -183,6 +191,7 @@ class QBittorrentClient extends DownloadClient {
        return torrents.map(torrent => this.normalizeDownload(torrent));
      } catch (fallbackError) {
        logToFile(`[qBittorrent:${this.name}] Fallback also failed: ${fallbackError.message}`);
+        this._recordLastError('getActiveDownloads', fallbackError);
        return [];
      }
    }
@@ -193,6 +202,7 @@ class QBittorrentClient extends DownloadClient {
      const response = await this.makeRequest('/api/v2/sync/maindata');
      const data = response.data;
      
+      this._clearLastError();
      return {
        serverState: data.server_state || {},
        rid: data.rid,
@@ -200,6 +210,7 @@ class QBittorrentClient extends DownloadClient {
      };
    } catch (error) {
      logToFile(`[qBittorrent:${this.name}] Error getting client status: ${error.message}`);
+      this._recordLastError('getClientStatus', error);
      return null;
    }
  }
@@ -249,6 +260,14 @@ class QBittorrentClient extends DownloadClient {
      downloaded: downloadedSize,
      speed: torrent.dlspeed,
      eta: torrent.eta < 0 || torrent.eta === 8640000 ? null : torrent.eta,
+      // Connected peer counts (Issue #64). qBittorrent exposes:
+      //   num_seeds   — connected seeds (peers we have a connection to)
+      //   num_leechs  — connected leechers (peers downloading from us)
+      //   num_complete / num_incomplete — *swarm* totals reported by tracker
+      // We expose the connected counts to stay consistent with what other
+      // clients (e.g. Transmission via peersConnected/peersSendingToUs) report.
+      seeds: torrent.num_seeds ?? 0,
+      peers: torrent.num_leechs ?? 0,
      category: torrent.category || undefined,
      tags: torrent.tags ? torrent.tags.split(',').filter(tag => tag.trim()) : [],
      savePath: torrent.content_path || torrent.save_path || undefined,
@@ -35,9 +35,11 @@ class RTorrentClient extends DownloadClient {
    try {
      await this._methodCall('system.client_version');
      logToFile(`[rtorrent:${this.name}] Connection test successful`);
+      this._clearLastError();
      return true;
    } catch (error) {
      logToFile(`[rtorrent:${this.name}] Connection test failed: ${error.message}`);
+      this._recordLastError('testConnection', error);
      return false;
    }
  }
@@ -77,10 +79,31 @@ class RTorrentClient extends DownloadClient {
        'd.custom1='
      ]);

+      // rTorrent XML-RPC can occasionally return null/undefined or a non-array
+      // on misconfigured servers or transient errors. Guard against that here
+      // so callers always get a sane array instead of throwing on .map.
+      if (!Array.isArray(torrents)) {
+        logToFile(`[rtorrent:${this.name}] d.multicall2 returned non-array (${typeof torrents}); treating as empty`);
+        this._clearLastError();
+        return [];
+      }
+
      logToFile(`[rtorrent:${this.name}] Retrieved ${torrents.length} torrents`);
-      return torrents.map(torrent => this.normalizeDownload(torrent));
+      this._clearLastError();
+      // Filter out any individual rows that fail to normalize so a single bad
+      // record cannot poison the whole result set.
+      const normalized = [];
+      for (const torrent of torrents) {
+        try {
+          normalized.push(this.normalizeDownload(torrent));
+        } catch (err) {
+          logToFile(`[rtorrent:${this.name}] Skipping malformed torrent row: ${err.message}`);
+        }
+      }
+      return normalized;
    } catch (error) {
      logToFile(`[rtorrent:${this.name}] Error fetching torrents: ${error.message}`);
+      this._recordLastError('getActiveDownloads', error);
      return [];
    }
  }
@@ -92,31 +115,53 @@ class RTorrentClient extends DownloadClient {
        this._methodCall('throttle.global_up.rate')
      ]);

+      this._clearLastError();
      return {
-        globalDownRate: downRate,
-        globalUpRate: upRate
+        globalDownRate: Number.isFinite(downRate) ? downRate : 0,
+        globalUpRate: Number.isFinite(upRate) ? upRate : 0
      };
    } catch (error) {
      logToFile(`[rtorrent:${this.name}] Error getting client status: ${error.message}`);
+      this._recordLastError('getClientStatus', error);
      return null;
    }
  }

  normalizeDownload(torrent) {
+    // rTorrent's d.multicall2 returns an array of fields in the order requested.
+    // If a value is missing rtorrent typically returns '' or 0, but plugins and
+    // older versions can return undefined/null — coerce everything explicitly so
+    // downstream math and string ops never blow up on null/undefined.
+    if (!Array.isArray(torrent)) {
+      throw new Error('Expected torrent row to be an array');
+    }
+
    const [
-      hash,
-      name,
-      sizeBytes,
-      completedBytes,
-      downRate,
-      upRate,
-      state,
-      isActive,
-      isHashChecking,
-      directory,
-      custom1
+      hashRaw,
+      nameRaw,
+      sizeBytesRaw,
+      completedBytesRaw,
+      downRateRaw,
+      upRateRaw,
+      stateRaw,
+      isActiveRaw,
+      isHashCheckingRaw,
+      directoryRaw,
+      custom1Raw
    ] = torrent;

+    const hash = hashRaw ? String(hashRaw) : '';
+    const name = nameRaw ? String(nameRaw) : '';
+    const sizeBytes = Number(sizeBytesRaw) || 0;
+    const completedBytes = Number(completedBytesRaw) || 0;
+    const downRate = Number(downRateRaw) || 0;
+    const upRate = Number(upRateRaw) || 0;
+    const state = Number.isFinite(Number(stateRaw)) ? Number(stateRaw) : 0;
+    const isActive = Number.isFinite(Number(isActiveRaw)) ? Number(isActiveRaw) : 0;
+    const isHashChecking = Number.isFinite(Number(isHashCheckingRaw)) ? Number(isHashCheckingRaw) : 0;
+    const directory = directoryRaw ? String(directoryRaw) : '';
+    const custom1 = custom1Raw ? String(custom1Raw) : '';
+
    const status = this._mapStatus(state, isActive, isHashChecking, completedBytes, sizeBytes);
    const progress = sizeBytes > 0 ? Math.round((completedBytes / sizeBytes) * 100) : 0;

@@ -168,6 +213,11 @@ class RTorrentClient extends DownloadClient {
  }

  _extractArrInfo(filename) {
+    // Null-safe: getActiveDownloads passes a normalized string, but guard anyway
+    // so callers passing raw rtorrent values cannot crash this helper.
+    if (!filename || typeof filename !== 'string') {
+      return {};
+    }
    const seriesMatch = filename.match(/[-\s]S(\d{2})E(\d{2})/i);
    if (seriesMatch) {
      return { type: 'series' };
@@ -3,9 +3,27 @@ const axios = require('axios');
 const DownloadClient = require('./DownloadClient');
 const { logToFile } = require('../utils/logger');

+// Number of recently completed jobs to pull from SABnzbd's /api?mode=history on
+// every poll. Larger values let DownloadMatcher correlate slightly older jobs
+// with their Sonarr/Radarr queue entries at the cost of one wider HTTP
+// response per poll cycle. Configurable via the SAB_HISTORY_LIMIT environment
+// variable; defaults to 10 to match the previous hardcoded value.
+const DEFAULT_HISTORY_LIMIT = 10;
+function resolveHistoryLimit() {
+  const raw = process.env.SAB_HISTORY_LIMIT;
+  if (raw === undefined || raw === null || raw === '') return DEFAULT_HISTORY_LIMIT;
+  const parsed = parseInt(raw, 10);
+  if (!Number.isFinite(parsed) || parsed < 0) {
+    logToFile(`[SABnzbd] Invalid SAB_HISTORY_LIMIT='${raw}'; falling back to ${DEFAULT_HISTORY_LIMIT}`);
+    return DEFAULT_HISTORY_LIMIT;
+  }
+  return parsed;
+}
+
 class SABnzbdClient extends DownloadClient {
  constructor(instance) {
    super(instance);
+    this.historyLimit = resolveHistoryLimit();
  }

  getClientType() {
@@ -16,9 +34,11 @@ class SABnzbdClient extends DownloadClient {
    try {
      const response = await this.makeRequest('', { mode: 'version' });
      logToFile(`[SABnzbd:${this.name}] Connection test successful, version: ${response.data.version}`);
+      this._clearLastError();
      return true;
    } catch (error) {
      logToFile(`[SABnzbd:${this.name}] Connection test failed: ${error.message}`);
+      this._recordLastError('testConnection', error);
      return false;
    }
  }
@@ -47,7 +67,7 @@ class SABnzbdClient extends DownloadClient {
      // Get both queue and history to provide complete picture
      const [queueResponse, historyResponse] = await Promise.all([
        this.makeRequest({ mode: 'queue' }),
-        this.makeRequest({ mode: 'history', limit: 10 })
+        this.makeRequest({ mode: 'history', limit: this.historyLimit })
      ]);

      const queueData = queueResponse.data;
@@ -99,10 +119,12 @@ class SABnzbdClient extends DownloadClient {
        }
      }

-      logToFile(`[SABnzbd:${this.name}] Retrieved ${downloads.length} downloads`);
+      logToFile(`[SABnzbd:${this.name}] Retrieved ${downloads.length} downloads (historyLimit=${this.historyLimit})`);
+      this._clearLastError();
      return downloads;
    } catch (error) {
      logToFile(`[SABnzbd:${this.name}] Error fetching downloads: ${error.message}`);
+      this._recordLastError('getActiveDownloads', error);
      return [];
    }
  }
@@ -112,8 +134,12 @@ class SABnzbdClient extends DownloadClient {
      const response = await this.makeRequest({ mode: 'queue' });
      const queueData = response.data.queue;
      
-      if (!queueData) return null;
+      if (!queueData) {
+        this._clearLastError();
+        return null;
+      }

+      this._clearLastError();
      return {
        status: queueData.status,
        speed: queueData.speed,
@@ -128,6 +154,7 @@ class SABnzbdClient extends DownloadClient {
      };
    } catch (error) {
      logToFile(`[SABnzbd:${this.name}] Error getting client status: ${error.message}`);
+      this._recordLastError('getClientStatus', error);
      return null;
    }
  }
@@ -18,9 +18,11 @@ class TransmissionClient extends DownloadClient {
    try {
      await this.makeRequest('session-get');
      logToFile(`[Transmission:${this.name}] Connection test successful`);
+      this._clearLastError();
      return true;
    } catch (error) {
      logToFile(`[Transmission:${this.name}] Connection test failed: ${error.message}`);
+      this._recordLastError('testConnection', error);
      return false;
    }
  }
@@ -80,10 +82,11 @@ class TransmissionClient extends DownloadClient {

      const torrents = response.data.arguments.torrents || [];
      logToFile(`[Transmission:${this.name}] Retrieved ${torrents.length} torrents`);
-      
+      this._clearLastError();
      return torrents.map(torrent => this.normalizeDownload(torrent));
    } catch (error) {
      logToFile(`[Transmission:${this.name}] Error fetching torrents: ${error.message}`);
+      this._recordLastError('getActiveDownloads', error);
      return [];
    }
  }
@@ -93,12 +96,14 @@ class TransmissionClient extends DownloadClient {
      const response = await this.makeRequest('session-get');
      const sessionStats = await this.makeRequest('session-stats');
      
+      this._clearLastError();
      return {
        session: response.data.arguments,
        stats: sessionStats.data.arguments
      };
    } catch (error) {
      logToFile(`[Transmission:${this.name}] Error getting client status: ${error.message}`);
+      this._recordLastError('getClientStatus', error);
      return null;
    }
  }
@@ -113,7 +118,11 @@ class TransmissionClient extends DownloadClient {
      4: 'Downloading',  // TORRENT_DOWNLOAD
      5: 'Queued',       // TORRENT_SEED_WAIT
      6: 'Seeding',      // TORRENT_SEED
-      7: 'Unknown'       // TORRENT_IS_CHECKING (alias for 2)
+      // Status code 7 is undocumented in the Transmission RPC spec (which
+      // formally defines only 0–6). The legacy alias "TORRENT_IS_CHECKING"
+      // (a duplicate of code 2) is the best-effort interpretation; map it to
+      // `Checking` so it is rendered usefully rather than as `Unknown`.
+      7: 'Checking'      // TORRENT_IS_CHECKING (undocumented; treated as code 2)
    };

    const status = statusMap[torrent.status] || 'Unknown';
@@ -160,8 +169,12 @@ class TransmissionClient extends DownloadClient {
  }

  extractArrInfo(filename) {
-    // Similar to SABnzbdClient, try to extract Sonarr/Radarr info
-    
+    // arrQueueId cannot be extracted from filename alone; *arr exposes that
+    // identifier only via its queue API. The reliable cross-client matching
+    // path is hash-based and lives in `DownloadMatcher.matchTorrents()` (see
+    // Issue #65), which keys on `torrent.hashString` for Transmission.
+    // This heuristic remains only to provide a coarse `type` hint.
+
    // Look for patterns like "Series Name - S01E02 - Episode Title"
    const seriesMatch = filename.match(/[-\s]S(\d{2})E(\d{2})/i);
    if (seriesMatch) {
@@ -176,6 +189,39 @@ class TransmissionClient extends DownloadClient {

    return {};
  }
+
+  /**
+   * Start (resume) one or more torrents. `id` is the Transmission internal
+   * numeric id or a hashString; the RPC accepts either.
+   * @param {number|string|Array<number|string>} id
+   */
+  async startTorrent(id) {
+    const ids = Array.isArray(id) ? id : [id];
+    await this.makeRequest('torrent-start', { ids });
+    logToFile(`[Transmission:${this.name}] Started torrent(s): ${ids.join(', ')}`);
+  }
+
+  /**
+   * Stop (pause) one or more torrents.
+   * @param {number|string|Array<number|string>} id
+   */
+  async stopTorrent(id) {
+    const ids = Array.isArray(id) ? id : [id];
+    await this.makeRequest('torrent-stop', { ids });
+    logToFile(`[Transmission:${this.name}] Stopped torrent(s): ${ids.join(', ')}`);
+  }
+
+  /**
+   * Remove one or more torrents. When `deleteData` is true the local files
+   * are also deleted from disk (Transmission's `delete-local-data`).
+   * @param {number|string|Array<number|string>} id
+   * @param {boolean} [deleteData=false]
+   */
+  async removeTorrent(id, deleteData = false) {
+    const ids = Array.isArray(id) ? id : [id];
+    await this.makeRequest('torrent-remove', { ids, 'delete-local-data': !!deleteData });
+    logToFile(`[Transmission:${this.name}] Removed torrent(s): ${ids.join(', ')} (deleteData=${!!deleteData})`);
+  }
 }

 module.exports = TransmissionClient;
@@ -22,7 +22,7 @@ info:

    ## SSE Streaming
    Real-time updates are available via Server-Sent Events at GET /api/dashboard/stream.
-  version: 1.7.31
+  version: 1.7.34
  contact:
    name: sofarr
  license:
@@ -7,6 +7,7 @@ const { getLastPollTimings, POLLING_ENABLED } = require('../utils/poller');
 const { getSonarrInstances, getRadarrInstances, getOmbiInstances } = require('../utils/config');
 const { getGlobalWebhookMetrics } = require('../utils/cache');
 const { checkWebhookConfigured, checkOmbiWebhookConfigured, aggregateMetrics } = require('../services/WebhookStatus');
+const downloadClientRegistry = require('../utils/downloadClients');

 /**
 * @openapi
@@ -165,7 +166,16 @@ router.get('/', requireAuth, async (req, res) => {
        sonarr: aggregateMetrics(sonarrMetrics, sonarrWebhookConfigured),
        radarr: aggregateMetrics(radarrMetrics, radarrWebhookConfigured),
        ombi: aggregateMetrics(ombiMetrics, ombiWebhookConfigured)
-      }
+      },
+      // Per-download-client health summary including any lastError captured
+      // since the last successful call. Lets the admin status panel surface
+      // transient failures (auth expiry, RPC blips, etc.) without log scraping.
+      downloadClients: downloadClientRegistry.getAllClients().map(c => ({
+        instanceId: c.getInstanceId(),
+        instanceName: c.name,
+        clientType: c.getClientType(),
+        lastError: typeof c.getLastError === 'function' ? c.getLastError() : null
+      }))
    });
  } catch (err) {
    res.status(500).json({ error: 'Failed to get status', details: err.message });
@@ -5,6 +5,7 @@ const { logToFile } = require('../utils/logger');
 const { getWebhookSecret, getSonarrInstances, getRadarrInstances, getOmbiInstances, getSofarrBaseUrl } = require('../utils/config');
 const cache = require('../utils/cache');
 const arrRetrieverRegistry = require('../utils/arrRetrievers');
+const { buildArrQueueCache } = require('../utils/arrQueueHelpers');
 const { pollAllServices, POLL_INTERVAL, POLLING_ENABLED } = require('../utils/poller');
 const { extractRequestedUser } = require('../utils/ombiHelpers');
 const requireAuth = require('../middleware/requireAuth');
@@ -106,9 +107,14 @@ function pruneReplayCache() {
 // Prune the replay cache once per minute
 setInterval(pruneReplayCache, 60 * 1000).unref();

-function isReplay(eventType, instanceName, eventDate) {
+function isReplay(eventType, instanceName, eventDate, contentId) {
  if (!eventDate) return false;
-  const key = `${eventType}:${instanceName || ''}:${eventDate}`;
+  // Content-aware replay key: incorporates downloadId / series.id / movie.id when
+  // available so that distinct events sharing the same `date` (e.g. multiple
+  // Grab events for episodes in a season pack fired in the same second) do not
+  // falsely collide. Falls back to the prior shape when contentId is absent
+  // (e.g. Test events) so existing behaviour is preserved.
+  const key = `${eventType}:${instanceName || ''}:${contentId || ''}:${eventDate}`;
  if (recentEvents.has(key)) return true;
  recentEvents.set(key, Date.now());
  return false;
@@ -202,17 +208,7 @@ async function processWebhookEvent(serviceType, eventType, payload = null) {
      const queuesByType = await arrRetrieverRegistry.getQueuesByType();
      const sonarrQueues = queuesByType.sonarr || [];
      cache.set('poll:sonarr-queue', {
-        records: sonarrQueues.flatMap(q => {
-          const inst = sonarrInstances.find(i => i.id === q.instance);
-          const url = inst ? inst.url : null;
-          const key = inst ? inst.apiKey : null;
-          return (q.data.records || []).map(r => {
-            if (r.series) r.series._instanceUrl = url;
-            r._instanceUrl = url;
-            r._instanceKey = key;
-            return r;
-          });
-        })
+        records: buildArrQueueCache(sonarrQueues, sonarrInstances, 'series')
      }, CACHE_TTL);
      logToFile(`[Webhook] Refreshed poll:sonarr-queue (${sonarrQueues.length} instance(s))`);
    }
@@ -232,17 +228,7 @@ async function processWebhookEvent(serviceType, eventType, payload = null) {
      const queuesByType = await arrRetrieverRegistry.getQueuesByType();
      const radarrQueues = queuesByType.radarr || [];
      cache.set('poll:radarr-queue', {
-        records: radarrQueues.flatMap(q => {
-          const inst = radarrInstances.find(i => i.id === q.instance);
-          const url = inst ? inst.url : null;
-          const key = inst ? inst.apiKey : null;
-          return (q.data.records || []).map(r => {
-            if (r.movie) r.movie._instanceUrl = url;
-            r._instanceUrl = url;
-            r._instanceKey = key;
-            return r;
-          });
-        })
+        records: buildArrQueueCache(radarrQueues, radarrInstances, 'movie')
      }, CACHE_TTL);
      logToFile(`[Webhook] Refreshed poll:radarr-queue (${radarrQueues.length} instance(s))`);
    }
@@ -480,11 +466,21 @@ router.post('/sonarr', webhookLimiter, (req, res) => {
  const { eventType, instanceName, eventDate } = validation;

  const sonarrInstances = getSonarrInstances();
-  const inst = sonarrInstances.find(i => i.name === instanceName || i.id === instanceName) || sonarrInstances[0];
+  const matchedInst = sonarrInstances.find(i => i.name === instanceName || i.id === instanceName);
+  const inst = matchedInst || sonarrInstances[0];
+  if (!matchedInst && instanceName) {
+    logToFile(`[Webhook] Sonarr instanceName "${instanceName}" did not match any configured instance; falling back to first instance (${inst ? inst.name : 'none'})`);
+  }
  const resolvedInstanceName = inst ? inst.name : instanceName;

-  if (isReplay(eventType, resolvedInstanceName, eventDate)) {
-    logToFile(`[Webhook] Sonarr duplicate event ignored: ${eventType} @ ${eventDate}`);
+  // Content-aware replay key components (Issue #62)
+  const contentId = req.body.downloadId || req.body.series?.id || null;
+
+  // Skip replay protection for Test events
+  if (eventType === "Test") {
+    logToFile(`[Webhook] Sonarr Test event received — skipping replay protection`);
+  } else if (isReplay(eventType, resolvedInstanceName, eventDate, contentId)) {
+    logToFile(`[Webhook] Sonarr duplicate event ignored: ${eventType} @ ${eventDate} (contentId=${contentId || 'none'})`);
    return res.status(200).json({ received: true, duplicate: true });
  }

@@ -634,11 +630,21 @@ router.post('/radarr', webhookLimiter, (req, res) => {
  const { eventType, instanceName, eventDate } = validation;

  const radarrInstances = getRadarrInstances();
-  const inst = radarrInstances.find(i => i.name === instanceName || i.id === instanceName) || radarrInstances[0];
+  const matchedInst = radarrInstances.find(i => i.name === instanceName || i.id === instanceName);
+  const inst = matchedInst || radarrInstances[0];
+  if (!matchedInst && instanceName) {
+    logToFile(`[Webhook] Radarr instanceName "${instanceName}" did not match any configured instance; falling back to first instance (${inst ? inst.name : 'none'})`);
+  }
  const resolvedInstanceName = inst ? inst.name : instanceName;

-  if (isReplay(eventType, resolvedInstanceName, eventDate)) {
-    logToFile(`[Webhook] Radarr duplicate event ignored: ${eventType} @ ${eventDate}`);
+  // Content-aware replay key components (Issue #62)
+  const contentId = req.body.downloadId || req.body.movie?.id || null;
+
+  // Skip replay protection for Test events
+  if (eventType === "Test") {
+    logToFile(`[Webhook] Radarr Test event received — skipping replay protection`);
+  } else if (isReplay(eventType, resolvedInstanceName, eventDate, contentId)) {
+    logToFile(`[Webhook] Radarr duplicate event ignored: ${eventType} @ ${eventDate} (contentId=${contentId || 'none'})`);
    return res.status(200).json({ received: true, duplicate: true });
  }

@@ -813,10 +819,10 @@ router.post('/ombi', webhookLimiter, (req, res) => {

  // Use applicationUrl as instance identifier for replay protection
  const instanceName = applicationUrl || 'ombi';
-  // Use requestId + eventType + current time as replay key
  const eventDate = req.body.requestedDate || req.body.RequestedDate || new Date().toISOString();
+  const contentId = requestId || null;

-  if (isReplay(eventType, instanceName, `${requestId}-${eventDate}`)) {
+  if (isReplay(eventType, instanceName, eventDate, contentId)) {
    logToFile(`[Webhook] Ombi duplicate event ignored: ${eventType} requestId=${requestId}`);
    return res.status(200).json({ received: true, duplicate: true });
  }
@@ -429,7 +429,20 @@ async function matchTorrents(torrents, context) {

    let matchedAny = false;

-    const sonarrMatch = sonarrQueueRecords.find(r => {
+    // Hash-first matching (Issue #65): prefer matching by torrent hash against
+    // each *arr queue record's `downloadId`. `torrent.hash` covers qBittorrent
+    // and rTorrent; `torrent.hashString` covers Transmission. We fall back to
+    // existing title-substring matching only if no hash match was found.
+    const torrentHash = torrent?.hash || torrent?.hashString || null;
+    const hashLower = torrentHash ? String(torrentHash).toLowerCase() : null;
+    const matchesByHash = (r) => {
+      const dl = r && r.downloadId;
+      if (!dl || !hashLower) return false;
+      return String(dl).toLowerCase() === hashLower;
+    };
+
+    let sonarrMatch = hashLower ? sonarrQueueRecords.find(matchesByHash) : null;
+    if (!sonarrMatch) sonarrMatch = sonarrQueueRecords.find(r => {
      const rTitle = (r.title || r.sourceTitle || '').toLowerCase();
      return rTitle && (rTitle.includes(torrentNameLower) || torrentNameLower.includes(rTitle));
    });
@@ -480,7 +493,8 @@ async function matchTorrents(torrents, context) {
      }
    }

-    const radarrMatch = radarrQueueRecords.find(r => {
+    let radarrMatch = hashLower ? radarrQueueRecords.find(matchesByHash) : null;
+    if (!radarrMatch) radarrMatch = radarrQueueRecords.find(r => {
      const rTitle = (r.title || r.sourceTitle || '').toLowerCase();
      return rTitle && (rTitle.includes(torrentNameLower) || torrentNameLower.includes(rTitle));
    });
@@ -529,7 +543,8 @@ async function matchTorrents(torrents, context) {
      }
    }

-    const sonarrHistoryMatch = sonarrHistoryRecords.find(r => {
+    let sonarrHistoryMatch = hashLower ? sonarrHistoryRecords.find(matchesByHash) : null;
+    if (!sonarrHistoryMatch) sonarrHistoryMatch = sonarrHistoryRecords.find(r => {
      const rTitle = (r.sourceTitle || r.title || '').toLowerCase();
      return rTitle && (rTitle.includes(torrentNameLower) || torrentNameLower.includes(rTitle));
    });
@@ -562,7 +577,8 @@ async function matchTorrents(torrents, context) {
      }
    }

-    const radarrHistoryMatch = radarrHistoryRecords.find(r => {
+    let radarrHistoryMatch = hashLower ? radarrHistoryRecords.find(matchesByHash) : null;
+    if (!radarrHistoryMatch) radarrHistoryMatch = radarrHistoryRecords.find(r => {
      const rTitle = (r.sourceTitle || r.title || '').toLowerCase();
      return rTitle && (rTitle.includes(torrentNameLower) || torrentNameLower.includes(rTitle));
    });
@@ -598,7 +614,24 @@ async function matchTorrents(torrents, context) {
    }

  }
-  return matched;
+
+  // Deduplicate by (arrType, arrQueueId) (Issue #65). When a single torrent
+  // (typically a season pack) matches N *arr queue records sharing one
+  // arrQueueId via downstream emission paths, only the first matched download
+  // is retained. Entries without an arrQueueId pass through unchanged.
+  const seen = new Set();
+  const deduped = [];
+  for (const m of matched) {
+    const key = (m && m.arrType && m.arrQueueId != null)
+      ? `${m.arrType}:${m.arrQueueId}`
+      : null;
+    if (key) {
+      if (seen.has(key)) continue;
+      seen.add(key);
+    }
+    deduped.push(m);
+  }
+  return deduped;
 }

 module.exports = {
@@ -0,0 +1,97 @@
+// Copyright (c) 2026 Gordon Bolton. MIT License.
+//
+// Shared helpers for assembling the cached *arr queue payload.
+//
+// Both the background poller (`server/utils/poller.js`) and the webhook
+// processor (`server/routes/webhook.js`) build the `poll:sonarr-queue` and
+// `poll:radarr-queue` cache entries from an array of per-instance queue
+// responses. Historically the same `flatMap` block was duplicated across all
+// four call sites (Sonarr + Radarr × poller + webhook) and had begun to drift.
+//
+// This module centralises that logic, adds defensive null-guards, and — for
+// Sonarr only — annotates season-pack records (queue entries sharing a
+// `downloadId`) with `isSeasonPack` and `episodeCount`. See Issue #61.
+//
+const { logToFile } = require('./logger');
+
+/**
+ * Build the flattened, instance-tagged `records` array for the
+ * `poll:sonarr-queue` / `poll:radarr-queue` cache entry.
+ *
+ * @param {Array<{ instance: string, data: { records?: Array<object> } }>} queues
+ *   Per-instance queue responses as returned by
+ *   `arrRetrieverRegistry.getQueuesByType()` (or the equivalent batched
+ *   retrieval in the poller).
+ * @param {Array<{ id: string, url: string, apiKey: string, name?: string }>} instances
+ *   Configured instances; used to resolve `_instanceUrl` / `_instanceKey`.
+ * @param {'series'|'movie'} mediaKey
+ *   Sonarr records embed a `series` object; Radarr records embed a `movie`
+ *   object. The embedded object is annotated with `_instanceUrl` so that
+ *   downstream link builders work.
+ * @returns {Array<object>} The flattened, annotated records array.
+ */
+function buildArrQueueCache(queues, instances, mediaKey) {
+  if (!Array.isArray(queues) || queues.length === 0) return [];
+  if (mediaKey !== 'series' && mediaKey !== 'movie') {
+    logToFile(`[arrQueueHelpers] Invalid mediaKey "${mediaKey}"; expected 'series' or 'movie'`);
+    return [];
+  }
+  const safeInstances = Array.isArray(instances) ? instances : [];
+
+  const out = [];
+  for (const q of queues) {
+    try {
+      if (!q || !q.data) continue;
+      const inst = safeInstances.find(i => i.id === q.instance);
+      const url = inst ? inst.url : null;
+      const key = inst ? inst.apiKey : null;
+      const records = Array.isArray(q.data.records) ? q.data.records : [];
+      for (const r of records) {
+        try {
+          if (!r) continue;
+          if (r[mediaKey]) {
+            r[mediaKey]._instanceUrl = url;
+          }
+          r._instanceUrl = url;
+          r._instanceKey = key;
+          out.push(r);
+        } catch (perRecordErr) {
+          logToFile(`[arrQueueHelpers] Skipping malformed ${mediaKey} record: ${perRecordErr.message}`);
+        }
+      }
+    } catch (perInstanceErr) {
+      logToFile(`[arrQueueHelpers] Skipping malformed ${mediaKey} queue payload: ${perInstanceErr.message}`);
+    }
+  }
+
+  // Sonarr-only: season pack annotation. Group by downloadId; entries that
+  // share a downloadId are episodes belonging to the same release (a season
+  // pack). Movies (mediaKey === 'movie') are single-record by nature.
+  if (mediaKey === 'series') {
+    try {
+      const groups = new Map();
+      for (const r of out) {
+        const dlId = r && r.downloadId;
+        if (!dlId) continue;
+        if (!groups.has(dlId)) groups.set(dlId, []);
+        groups.get(dlId).push(r);
+      }
+      for (const group of groups.values()) {
+        if (group.length > 1) {
+          for (const r of group) {
+            r.isSeasonPack = true;
+            r.episodeCount = group.length;
+          }
+        }
+      }
+    } catch (annotateErr) {
+      logToFile(`[arrQueueHelpers] Season-pack annotation failed: ${annotateErr.message}`);
+    }
+  }
+
+  return out;
+}
+
+module.exports = {
+  buildArrQueueCache
+};
@@ -239,7 +239,10 @@ class DownloadClientRegistry {
            instanceId: client.getInstanceId(),
            instanceName: client.name,
            clientType: client.getClientType(),
-            status
+            status,
+            // Surface the per-client lastError so admins can see transient
+            // failures (auth expiry, RPC blips, etc.) without scraping logs.
+            lastError: typeof client.getLastError === 'function' ? client.getLastError() : null
          };
        } catch (error) {
          logToFile(`[DownloadClientRegistry] Error getting status from ${client.name}: ${error.message}`);
@@ -248,7 +251,8 @@ class DownloadClientRegistry {
            instanceName: client.name,
            clientType: client.getClientType(),
            status: null,
-            error: error.message
+            error: error.message,
+            lastError: typeof client.getLastError === 'function' ? client.getLastError() : null
          };
        }
      })
@@ -3,6 +3,7 @@ const axios = require('axios');
 const cache = require('./cache');
 const { initializeClients, getAllDownloads, getDownloadsByClientType } = require('./downloadClients');
 const arrRetrieverRegistry = require('./arrRetrievers');
+const { buildArrQueueCache } = require('./arrQueueHelpers');
 const {
  getSonarrInstances,
  getRadarrInstances,
@@ -237,17 +238,7 @@ async function pollAllServices() {
      cache.set('poll:sonarr-tags', sonarrTagsResults, cacheTTL);
      // Tag queue/history records with _instanceUrl so embedded series/movie objects can build links
      cache.set('poll:sonarr-queue', {
-        records: sonarrQueues.flatMap(q => {
-          const inst = sonarrInstances.find(i => i.id === q.instance);
-          const url = inst ? inst.url : null;
-          const key = inst ? inst.apiKey : null;
-          return (q.data.records || []).map(r => {
-            if (r.series) r.series._instanceUrl = url;
-            r._instanceUrl = url;
-            r._instanceKey = key;
-            return r;
-          });
-        })
+        records: buildArrQueueCache(sonarrQueues, sonarrInstances, 'series')
      }, cacheTTL);
      cache.set('poll:sonarr-history', {
        records: sonarrHistories.flatMap(h => h.data.records || [])
@@ -265,17 +256,7 @@ async function pollAllServices() {
    // Radarr
    if (shouldPollRadarr) {
      cache.set('poll:radarr-queue', {
-        records: radarrQueues.flatMap(q => {
-          const inst = radarrInstances.find(i => i.id === q.instance);
-          const url = inst ? inst.url : null;
-          const key = inst ? inst.apiKey : null;
-          return (q.data.records || []).map(r => {
-            if (r.movie) r.movie._instanceUrl = url;
-            r._instanceUrl = url;
-            r._instanceKey = key;
-            return r;
-          });
-        })
+        records: buildArrQueueCache(radarrQueues, radarrInstances, 'movie')
      }, cacheTTL);
      cache.set('poll:radarr-history', {
        records: radarrHistories.flatMap(h => h.data.records || [])
@@ -260,19 +260,10 @@ async function csrfHeaders(app) {
 // Environment
 // ---------------------------------------------------------------------------

-beforeAll(() => {
+beforeEach(() => {
  process.env.EMBY_URL = EMBY_BASE;
  process.env.SONARR_INSTANCES = JSON.stringify([{ id: 'sonarr-1', name: 'Main Sonarr', url: SONARR_BASE, apiKey: 'sk' }]);
  process.env.RADARR_INSTANCES = JSON.stringify([{ id: 'radarr-1', name: 'Main Radarr', url: RADARR_BASE, apiKey: 'rk' }]);
-});
-
-afterAll(() => {
-  delete process.env.EMBY_URL;
-  delete process.env.SONARR_INSTANCES;
-  delete process.env.RADARR_INSTANCES;
-});
-
-beforeEach(() => {
  seedEmptyCache();
 });

@@ -280,6 +271,9 @@ afterEach(() => {
  nock.cleanAll();
  invalidatePollCache();
  cache.invalidate('emby:users');
+  delete process.env.EMBY_URL;
+  delete process.env.SONARR_INSTANCES;
+  delete process.env.RADARR_INSTANCES;
 });

 // ---------------------------------------------------------------------------
@@ -0,0 +1,204 @@
+// Copyright (c) 2026 Gordon Bolton. MIT License.
+//
+// Integration tests for the torrent matcher's hash-first matching and
+// arrQueueId deduplication paths (Issue #65). These exercise `matchTorrents`
+// end-to-end against minimal but realistic queue/history record fixtures.
+import { describe, it, expect } from 'vitest';
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
+const DownloadMatcher = require('../../server/services/DownloadMatcher');
+
+// Build a minimal context. `showAll: true` bypasses per-user tag filtering so
+// these tests can assert matching behaviour without setting up the Emby user
+// tag plumbing.
+function makeContext({
+  sonarrQueueRecords = [],
+  sonarrHistoryRecords = [],
+  radarrQueueRecords = [],
+  radarrHistoryRecords = []
+} = {}) {
+  const seriesMap = new Map();
+  const moviesMap = new Map();
+  for (const r of sonarrQueueRecords.concat(sonarrHistoryRecords)) {
+    if (r.series && r.seriesId) seriesMap.set(r.seriesId, r.series);
+  }
+  for (const r of radarrQueueRecords.concat(radarrHistoryRecords)) {
+    if (r.movie && r.movieId) moviesMap.set(r.movieId, r.movie);
+  }
+  return {
+    sonarrQueueRecords,
+    sonarrHistoryRecords,
+    radarrQueueRecords,
+    radarrHistoryRecords,
+    seriesMap,
+    moviesMap,
+    // null tagMaps so extractAllTags uses the object `label` shape from the
+    // Sonarr fixture (series.tags = [{ label: '...' }]). An empty Map is
+    // truthy and would cause every id-lookup to return undefined.
+    sonarrTagMap: null,
+    radarrTagMap: null,
+    username: 'tester',
+    isAdmin: false,
+    // showAll bypasses per-user tag filtering — we only need it to be truthy
+    // *together* with non-empty allTags. We seed series/movie tags as non-empty
+    // strings (Sonarr tag shape) so `extractAllTags` yields entries.
+    showAll: true,
+    embyUserMap: new Map(),
+    ombiBaseUrl: null
+  };
+}
+
+const seriesShowA = {
+  id: 100,
+  title: 'Show A',
+  tags: [{ label: 'tester' }],
+  images: []
+};
+
+const movieFilmB = {
+  id: 200,
+  title: 'Film B',
+  tags: [{ label: 'tester' }],
+  images: []
+};
+
+describe('matchTorrents — hash-first matching (#65)', () => {
+  it('matches a torrent to a Sonarr queue record by hash even when the title differs', async () => {
+    const hash = 'ABC123HASHsonarr';
+    const context = makeContext({
+      sonarrQueueRecords: [
+        {
+          id: 9001,
+          // Title intentionally bears no resemblance to the torrent name to
+          // prove the match is via hash (downloadId), not title fallback.
+          title: 'totally.unrelated.queue.record',
+          sourceTitle: '',
+          seriesId: 100,
+          series: seriesShowA,
+          downloadId: hash,
+          episodeId: 555
+        }
+      ]
+    });
+
+    const torrents = [
+      {
+        hash,
+        name: 'Show.A.S01.2160p.WEB.x265-RELEASE',
+        progress: 0.5,
+        dlspeed: 1000
+      }
+    ];
+
+    const out = await DownloadMatcher.matchTorrents(torrents, context);
+    expect(out).toHaveLength(1);
+    expect(out[0].arrType).toBe('sonarr');
+    expect(out[0].arrQueueId).toBe(9001);
+  });
+
+  it('matches a Transmission torrent via hashString', async () => {
+    const hashString = 'TRANSMISSIONHASH456';
+    const context = makeContext({
+      radarrQueueRecords: [
+        {
+          id: 7777,
+          title: 'unrelated',
+          sourceTitle: '',
+          movieId: 200,
+          movie: movieFilmB,
+          downloadId: hashString
+        }
+      ]
+    });
+
+    const torrents = [
+      {
+        hashString,
+        name: 'Film.B.2160p.WEB.x265-RELEASE',
+        progress: 0.25,
+        dlspeed: 0
+      }
+    ];
+
+    const out = await DownloadMatcher.matchTorrents(torrents, context);
+    expect(out).toHaveLength(1);
+    expect(out[0].arrType).toBe('radarr');
+    expect(out[0].arrQueueId).toBe(7777);
+  });
+
+  it('falls back to title-substring matching when no hash is present on the torrent', async () => {
+    const context = makeContext({
+      sonarrQueueRecords: [
+        {
+          id: 555,
+          title: 'Show A',
+          sourceTitle: '',
+          seriesId: 100,
+          series: seriesShowA,
+          downloadId: null
+        }
+      ]
+    });
+
+    const torrents = [
+      {
+        // No hash / hashString — title fallback must engage.
+        name: 'Show A — S01E02',
+        progress: 0.7,
+        dlspeed: 5000
+      }
+    ];
+
+    const out = await DownloadMatcher.matchTorrents(torrents, context);
+    expect(out).toHaveLength(1);
+    expect(out[0].arrType).toBe('sonarr');
+    expect(out[0].arrQueueId).toBe(555);
+  });
+});
+
+describe('matchTorrents — arrQueueId deduplication (#65)', () => {
+  it('deduplicates two torrents matching distinct queue records sharing one arrQueueId via the same hash', async () => {
+    // Construct the pathological case the dedup step is designed for: two
+    // torrents (post-hash-match) both end up mapped to the same arrQueueId.
+    // In real life this happens when *arr exposes multiple queue rows under
+    // one logical download. The first matched download wins; subsequent ones
+    // are dropped.
+    const hash = 'PACKHASH001';
+    const sharedQueueRow = {
+      id: 4242, // same arrQueueId
+      title: 'unrelated',
+      sourceTitle: '',
+      seriesId: 100,
+      series: seriesShowA,
+      downloadId: hash
+    };
+
+    const context = makeContext({
+      sonarrQueueRecords: [sharedQueueRow]
+    });
+
+    const torrents = [
+      { hash, name: 'Show.A.S02E01', progress: 0.1, dlspeed: 0 },
+      { hash, name: 'Show.A.S02E02', progress: 0.2, dlspeed: 0 }
+    ];
+
+    const out = await DownloadMatcher.matchTorrents(torrents, context);
+    expect(out).toHaveLength(1);
+    expect(out[0].arrQueueId).toBe(4242);
+  });
+
+  it('does not deduplicate torrents that lack arrQueueId (no matched *arr record)', async () => {
+    const context = makeContext();
+    const torrents = [
+      { hash: 'no-match-A', name: 'unmatched-A', progress: 0, dlspeed: 0 },
+      { hash: 'no-match-B', name: 'unmatched-B', progress: 0, dlspeed: 0 }
+    ];
+    const out = await DownloadMatcher.matchTorrents(torrents, context);
+    // Both unmatched torrents are filtered out by the matcher entirely because
+    // there is nothing to match against — so the deduplicator never sees them.
+    // This test simply asserts the dedup step itself does not collapse
+    // non-arr entries into a single bucket when no key is present.
+    expect(out).toEqual([]);
+  });
+});
@@ -387,6 +387,38 @@ describe('Replay protection', () => {
    expect(first.body.duplicate).toBeUndefined();
    expect(second.body.duplicate).toBeUndefined();
  });
+
+  it('sonarr: Test events bypass replay protection and are not flagged as duplicates', async () => {
+    const app = makeApp();
+    const payload = {
+      eventType: 'Test',
+      instanceName: 'Main Sonarr',
+      date: '2026-05-19T13:00:00.000Z'
+    };
+    const first = await postSonarr(app, payload);
+    expect(first.status).toBe(200);
+    expect(first.body.duplicate).toBeUndefined();
+
+    const second = await postSonarr(app, payload);
+    expect(second.status).toBe(200);
+    expect(second.body.duplicate).toBeUndefined();
+  });
+
+  it('radarr: Test events bypass replay protection and are not flagged as duplicates', async () => {
+    const app = makeApp();
+    const payload = {
+      eventType: 'Test',
+      instanceName: 'Main Radarr',
+      date: '2026-05-19T13:00:00.000Z'
+    };
+    const first = await postRadarr(app, payload);
+    expect(first.status).toBe(200);
+    expect(first.body.duplicate).toBeUndefined();
+
+    const second = await postRadarr(app, payload);
+    expect(second.status).toBe(200);
+    expect(second.body.duplicate).toBeUndefined();
+  });
 });

 // ---------------------------------------------------------------------------
@@ -130,6 +130,8 @@ describe('QBittorrentClient', () => {
        downloaded: 750000000,
        speed: 1048576,
        eta: 3600,
+        seeds: 0,
+        peers: 0,
        category: 'movies',
        tags: ['movie', 'hd'],
        savePath: '/downloads/test',
@@ -138,6 +140,28 @@ describe('QBittorrentClient', () => {
      });
    });

+    it('should expose connected seeds/peers from num_seeds and num_leechs (Issue #64)', () => {
+      const torrent = {
+        hash: 'def456',
+        name: 'Swarm Torrent',
+        state: 'downloading',
+        progress: 0.1,
+        size: 1000,
+        completed: 100,
+        dlspeed: 0,
+        eta: 0,
+        num_seeds: 7,
+        num_leechs: 3,
+        // Swarm totals — must NOT be picked up as connected counts
+        num_complete: 200,
+        num_incomplete: 50
+      };
+
+      const normalized = client.normalizeDownload(torrent);
+      expect(normalized.seeds).toBe(7);
+      expect(normalized.peers).toBe(3);
+    });
+
    it('should handle unknown torrent states', () => {
      const torrent = {
        hash: 'abc123',
@@ -420,4 +420,68 @@ describe('RTorrentClient', () => {
      expect(status).toBeNull();
    });
  });
+
+  describe('Null-safety (Issue #68)', () => {
+    it('should return [] when d.multicall2 returns a non-array', async () => {
+      mockMethodCall.mockImplementation((method, params, callback) => {
+        callback(null, null);
+      });
+      const downloads = await client.getActiveDownloads();
+      expect(downloads).toEqual([]);
+    });
+
+    it('should skip malformed individual torrent rows instead of throwing', async () => {
+      const torrents = [
+        // valid row
+        ['hashA', 'Name A', 100, 50, 0, 0, 1, 1, 0, '/dl', ''],
+        // malformed row (not an array)
+        'not-an-array',
+        // row with null/undefined fields
+        ['hashB', null, null, null, null, null, null, null, null, null, null]
+      ];
+      mockMethodCall.mockImplementation((method, params, callback) => {
+        callback(null, torrents);
+      });
+      const downloads = await client.getActiveDownloads();
+      expect(downloads).toHaveLength(2);
+      expect(downloads[0].id).toBe('hashA');
+      expect(downloads[1].id).toBe('hashB');
+      expect(downloads[1].title).toBe('');
+      expect(downloads[1].size).toBe(0);
+    });
+
+    it('_extractArrInfo should return {} for non-string filename', () => {
+      expect(client._extractArrInfo(null)).toEqual({});
+      expect(client._extractArrInfo(undefined)).toEqual({});
+      expect(client._extractArrInfo(123)).toEqual({});
+    });
+  });
+
+  describe('lastError tracking (Issue #68)', () => {
+    it('should record lastError on getActiveDownloads failure', async () => {
+      mockMethodCall.mockImplementation((method, params, callback) => {
+        callback(new Error('boom'));
+      });
+      await client.getActiveDownloads();
+      expect(client.getLastError()).not.toBeNull();
+      expect(client.getLastError().operation).toBe('getActiveDownloads');
+      expect(client.getLastError().message).toBe('boom');
+    });
+
+    it('should clear lastError on successful call', async () => {
+      // First, fail.
+      mockMethodCall.mockImplementationOnce((method, params, callback) => {
+        callback(new Error('boom'));
+      });
+      await client.getActiveDownloads();
+      expect(client.getLastError()).not.toBeNull();
+
+      // Then, succeed.
+      mockMethodCall.mockImplementation((method, params, callback) => {
+        callback(null, []);
+      });
+      await client.getActiveDownloads();
+      expect(client.getLastError()).toBeNull();
+    });
+  });
 });
@@ -299,4 +299,63 @@ describe('SABnzbdClient', () => {
      expect(status).toBeNull();
    });
  });
+
+  describe('History limit configuration (Issue #68)', () => {
+    const ORIG_ENV = process.env.SAB_HISTORY_LIMIT;
+    afterEach(() => {
+      if (ORIG_ENV === undefined) delete process.env.SAB_HISTORY_LIMIT;
+      else process.env.SAB_HISTORY_LIMIT = ORIG_ENV;
+    });
+
+    it('defaults historyLimit to 10 when SAB_HISTORY_LIMIT is unset', () => {
+      delete process.env.SAB_HISTORY_LIMIT;
+      const c = new SABnzbdClient(mockConfig);
+      expect(c.historyLimit).toBe(10);
+    });
+
+    it('honors SAB_HISTORY_LIMIT when set to a valid integer', () => {
+      process.env.SAB_HISTORY_LIMIT = '25';
+      const c = new SABnzbdClient(mockConfig);
+      expect(c.historyLimit).toBe(25);
+    });
+
+    it('falls back to default on invalid SAB_HISTORY_LIMIT', () => {
+      process.env.SAB_HISTORY_LIMIT = 'not-a-number';
+      const c = new SABnzbdClient(mockConfig);
+      expect(c.historyLimit).toBe(10);
+    });
+
+    it('passes historyLimit through to the history API call', async () => {
+      process.env.SAB_HISTORY_LIMIT = '42';
+      const c = new SABnzbdClient(mockConfig);
+      const makeRequest = vi.fn()
+        .mockResolvedValueOnce({ data: { queue: { slots: [], kbpersec: 0 } } })
+        .mockResolvedValueOnce({ data: { history: { slots: [] } } });
+      c.makeRequest = makeRequest;
+      await c.getActiveDownloads();
+      expect(makeRequest).toHaveBeenCalledWith({ mode: 'history', limit: 42 });
+    });
+  });
+
+  describe('lastError tracking (Issue #68)', () => {
+    it('records lastError when getActiveDownloads fails', async () => {
+      client.makeRequest = vi.fn().mockRejectedValue(new Error('boom'));
+      await client.getActiveDownloads();
+      expect(client.getLastError()).not.toBeNull();
+      expect(client.getLastError().operation).toBe('getActiveDownloads');
+      expect(client.getLastError().message).toBe('boom');
+    });
+
+    it('clears lastError after a subsequent successful call', async () => {
+      client.makeRequest = vi.fn().mockRejectedValue(new Error('boom'));
+      await client.getActiveDownloads();
+      expect(client.getLastError()).not.toBeNull();
+
+      client.makeRequest = vi.fn()
+        .mockResolvedValueOnce({ data: { queue: { slots: [], kbpersec: 0 } } })
+        .mockResolvedValueOnce({ data: { history: { slots: [] } } });
+      await client.getActiveDownloads();
+      expect(client.getLastError()).toBeNull();
+    });
+  });
 });
@@ -154,7 +154,9 @@ describe('TransmissionClient', () => {
        4: 'Downloading',
        5: 'Queued',
        6: 'Seeding',
-        7: 'Unknown'
+        // Issue #63: code 7 is undocumented in the RPC spec; mapped to
+        // `Checking` (legacy alias for code 2) as a best-effort interpretation.
+        7: 'Checking'
      };

      Object.entries(statusMap).forEach(([status, expectedStatus]) => {
@@ -433,4 +435,42 @@ describe('TransmissionClient', () => {
      expect(normalized.arrType).toBeUndefined();
    });
  });
+
+  describe('Torrent Control Methods (Issue #63)', () => {
+    it('startTorrent invokes torrent-start RPC with ids array', async () => {
+      client.makeRequest = vi.fn().mockResolvedValue({ data: { result: 'success' } });
+      await client.startTorrent('abc123');
+      expect(client.makeRequest).toHaveBeenCalledWith('torrent-start', { ids: ['abc123'] });
+    });
+
+    it('startTorrent accepts an array of ids', async () => {
+      client.makeRequest = vi.fn().mockResolvedValue({ data: { result: 'success' } });
+      await client.startTorrent([1, 2, 3]);
+      expect(client.makeRequest).toHaveBeenCalledWith('torrent-start', { ids: [1, 2, 3] });
+    });
+
+    it('stopTorrent invokes torrent-stop RPC', async () => {
+      client.makeRequest = vi.fn().mockResolvedValue({ data: { result: 'success' } });
+      await client.stopTorrent(42);
+      expect(client.makeRequest).toHaveBeenCalledWith('torrent-stop', { ids: [42] });
+    });
+
+    it('removeTorrent invokes torrent-remove with delete-local-data=false by default', async () => {
+      client.makeRequest = vi.fn().mockResolvedValue({ data: { result: 'success' } });
+      await client.removeTorrent('hashX');
+      expect(client.makeRequest).toHaveBeenCalledWith('torrent-remove', {
+        ids: ['hashX'],
+        'delete-local-data': false
+      });
+    });
+
+    it('removeTorrent passes delete-local-data=true when requested', async () => {
+      client.makeRequest = vi.fn().mockResolvedValue({ data: { result: 'success' } });
+      await client.removeTorrent('hashY', true);
+      expect(client.makeRequest).toHaveBeenCalledWith('torrent-remove', {
+        ids: ['hashY'],
+        'delete-local-data': true
+      });
+    });
+  });
 });
@@ -310,7 +310,8 @@ describe('DownloadClientRegistry', () => {
        instanceId: 'sab1',
        instanceName: 'SAB 1',
        clientType: 'sabnzbd',
-        status: { status: 'active' }
+        status: { status: 'active' },
+        lastError: null
      });
    });

@@ -0,0 +1,142 @@
+// Copyright (c) 2026 Gordon Bolton. MIT License.
+// Tests for the shared `buildArrQueueCache` helper (Issue #61).
+import { describe, it, expect } from 'vitest';
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
+const { buildArrQueueCache } = require('../../../server/utils/arrQueueHelpers');
+
+const sonarrInstances = [
+  { id: 's1', url: 'http://sonarr-1', apiKey: 'KEY_S1', name: 'Sonarr 1' }
+];
+const radarrInstances = [
+  { id: 'r1', url: 'http://radarr-1', apiKey: 'KEY_R1', name: 'Radarr 1' }
+];
+
+describe('buildArrQueueCache', () => {
+  it('returns empty array for empty / missing input', () => {
+    expect(buildArrQueueCache([], sonarrInstances, 'series')).toEqual([]);
+    expect(buildArrQueueCache(null, sonarrInstances, 'series')).toEqual([]);
+    expect(buildArrQueueCache(undefined, sonarrInstances, 'series')).toEqual([]);
+  });
+
+  it('returns empty array for invalid mediaKey', () => {
+    const queues = [{ instance: 's1', data: { records: [{ id: 1 }] } }];
+    expect(buildArrQueueCache(queues, sonarrInstances, 'bogus')).toEqual([]);
+  });
+
+  it('tags Sonarr records with _instanceUrl/_instanceKey and decorates embedded series', () => {
+    const queues = [
+      {
+        instance: 's1',
+        data: {
+          records: [
+            { id: 1, downloadId: 'dl-1', series: { id: 100, title: 'X' } }
+          ]
+        }
+      }
+    ];
+    const out = buildArrQueueCache(queues, sonarrInstances, 'series');
+    expect(out).toHaveLength(1);
+    expect(out[0]._instanceUrl).toBe('http://sonarr-1');
+    expect(out[0]._instanceKey).toBe('KEY_S1');
+    expect(out[0].series._instanceUrl).toBe('http://sonarr-1');
+  });
+
+  it('tags Radarr records and decorates embedded movie', () => {
+    const queues = [
+      {
+        instance: 'r1',
+        data: {
+          records: [
+            { id: 11, downloadId: 'dl-r1', movie: { id: 555, title: 'M' } }
+          ]
+        }
+      }
+    ];
+    const out = buildArrQueueCache(queues, radarrInstances, 'movie');
+    expect(out).toHaveLength(1);
+    expect(out[0]._instanceUrl).toBe('http://radarr-1');
+    expect(out[0]._instanceKey).toBe('KEY_R1');
+    expect(out[0].movie._instanceUrl).toBe('http://radarr-1');
+  });
+
+  it('annotates Sonarr season pack records (multiple entries sharing downloadId)', () => {
+    const queues = [
+      {
+        instance: 's1',
+        data: {
+          records: [
+            { id: 1, downloadId: 'pack-A', episodeId: 101 },
+            { id: 2, downloadId: 'pack-A', episodeId: 102 },
+            { id: 3, downloadId: 'pack-A', episodeId: 103 },
+            { id: 4, downloadId: 'single-B', episodeId: 200 }
+          ]
+        }
+      }
+    ];
+    const out = buildArrQueueCache(queues, sonarrInstances, 'series');
+    expect(out).toHaveLength(4);
+    const packMembers = out.filter(r => r.downloadId === 'pack-A');
+    expect(packMembers).toHaveLength(3);
+    for (const r of packMembers) {
+      expect(r.isSeasonPack).toBe(true);
+      expect(r.episodeCount).toBe(3);
+    }
+    const single = out.find(r => r.downloadId === 'single-B');
+    expect(single.isSeasonPack).toBeUndefined();
+    expect(single.episodeCount).toBeUndefined();
+  });
+
+  it('does not annotate Radarr records as season packs even if downloadId repeats', () => {
+    const queues = [
+      {
+        instance: 'r1',
+        data: {
+          records: [
+            { id: 1, downloadId: 'dup', movie: { id: 1 } },
+            { id: 2, downloadId: 'dup', movie: { id: 2 } }
+          ]
+        }
+      }
+    ];
+    const out = buildArrQueueCache(queues, radarrInstances, 'movie');
+    expect(out).toHaveLength(2);
+    for (const r of out) {
+      expect(r.isSeasonPack).toBeUndefined();
+      expect(r.episodeCount).toBeUndefined();
+    }
+  });
+
+  it('skips malformed records and continues', () => {
+    const queues = [
+      {
+        instance: 's1',
+        data: {
+          records: [
+            null,
+            { id: 1, downloadId: 'ok', series: { id: 1 } }
+          ]
+        }
+      },
+      null,
+      { instance: 's1' } // no data property
+    ];
+    const out = buildArrQueueCache(queues, sonarrInstances, 'series');
+    expect(out).toHaveLength(1);
+    expect(out[0].id).toBe(1);
+  });
+
+  it('handles unknown instance id gracefully (null url/key)', () => {
+    const queues = [
+      {
+        instance: 'unknown-instance',
+        data: { records: [{ id: 1, downloadId: 'x' }] }
+      }
+    ];
+    const out = buildArrQueueCache(queues, sonarrInstances, 'series');
+    expect(out).toHaveLength(1);
+    expect(out[0]._instanceUrl).toBeNull();
+    expect(out[0]._instanceKey).toBeNull();
+  });
+});
Author	SHA1	Message	Date
gronod	d29b6e9223	merge branch 'develop' into 'main' - Release v1.7.34 Create Release / release (push) Successful in 38s Details Build and Push Docker Image / build (push) Successful in 2m38s Details	2026-05-28 18:15:33 +01:00
gronod	df5328349b	chore: bump version to 1.7.34 and update CHANGELOG and docs Build and Push Docker Image / build (push) Successful in 1m46s Details Docs Check / Markdown lint (push) Successful in 2m19s Details Licence Check / Licence compatibility and copyright header verification (push) Successful in 2m53s Details CI / Security audit (push) Successful in 3m23s Details Docs Check / Mermaid diagram parse check (push) Successful in 3m55s Details CI / Swagger Validation & Coverage (push) Successful in 4m18s Details CI / Tests & coverage (push) Successful in 4m36s Details	2026-05-28 18:15:27 +01:00
gronod	b9c8c0be87	style(ui): unify tab headers layout, typography, and icons (closes #72 ) Build and Push Docker Image / build (push) Successful in 1m28s Details CI / Security audit (push) Has been cancelled Details CI / Tests & coverage (push) Has been cancelled Details CI / Swagger Validation & Coverage (push) Has been cancelled Details	2026-05-28 18:12:53 +01:00
gronod	06818dbf29	fix(webhooks): skip replay protection for Test events (closes #71 ) Build and Push Docker Image / build (push) Has been cancelled Details CI / Security audit (push) Has been cancelled Details CI / Tests & coverage (push) Has been cancelled Details CI / Swagger Validation & Coverage (push) Has been cancelled Details Licence Check / Licence compatibility and copyright header verification (push) Successful in 2m56s Details	2026-05-28 18:11:45 +01:00
gronod	7f7a91f056	merge branch 'develop' into 'main' - Release v1.7.33 CI / Tests & coverage (push) Successful in 2m53s Details Create Release / release (push) Successful in 17s Details CI / Security audit (push) Successful in 3m8s Details Build and Push Docker Image / build (push) Successful in 1m11s Details CI / Swagger Validation & Coverage (push) Successful in 2m23s Details	2026-05-28 17:42:54 +01:00
gronod	1dc8d8a26c	chore: bump version to 1.7.33 and update CHANGELOG and docs Docs Check / Markdown lint (push) Successful in 2m4s Details Build and Push Docker Image / build (push) Successful in 2m16s Details Licence Check / Licence compatibility and copyright header verification (push) Successful in 2m31s Details CI / Security audit (push) Successful in 2m57s Details Docs Check / Mermaid diagram parse check (push) Successful in 3m35s Details CI / Swagger Validation & Coverage (push) Successful in 4m5s Details CI / Tests & coverage (push) Successful in 4m6s Details	2026-05-28 17:42:43 +01:00
gronod	af33e4ec43	feat(ui): align requests container and cards layout with downloads/history (closes #69 )	2026-05-28 17:41:59 +01:00
gronod	a4d398ef1b	fix(webhooks): correct Ombi isReplay() call after signature change (closes #70 )	2026-05-28 17:40:33 +01:00
gronod	879aee8eea	merge branch 'develop' into 'main' - Release v1.7.32 (include markdownlint fix) Create Release / release (push) Successful in 30s Details Build and Push Docker Image / build (push) Successful in 1m24s Details CI / Security audit (push) Successful in 2m1s Details CI / Swagger Validation & Coverage (push) Successful in 2m16s Details CI / Tests & coverage (push) Successful in 2m37s Details	2026-05-28 16:28:23 +01:00
gronod	70710061b8	Fix markdownlint MD037 error in CHANGELOG.md Build and Push Docker Image / build (push) Successful in 1m45s Details Docs Check / Markdown lint (push) Successful in 38s Details CI / Security audit (push) Successful in 2m15s Details CI / Tests & coverage (push) Successful in 2m47s Details CI / Swagger Validation & Coverage (push) Successful in 2m33s Details Docs Check / Mermaid diagram parse check (push) Successful in 2m1s Details	2026-05-28 16:26:17 +01:00
gronod	f8f693e32a	merge branch 'develop' into 'main' - Release v1.7.32 Create Release / release (push) Successful in 24s Details CI / Security audit (push) Successful in 2m48s Details Build and Push Docker Image / build (push) Successful in 2m14s Details CI / Swagger Validation & Coverage (push) Successful in 2m54s Details CI / Tests & coverage (push) Has been cancelled Details	2026-05-28 16:25:07 +01:00
gronod	501a4c83bb	chore: bump version to 1.7.32 and update CHANGELOG and docs Build and Push Docker Image / build (push) Successful in 1m26s Details Docs Check / Markdown lint (push) Failing after 1m12s Details Licence Check / Licence compatibility and copyright header verification (push) Successful in 1m23s Details Docs Check / Mermaid diagram parse check (push) Successful in 2m58s Details	2026-05-28 16:24:24 +01:00
gronod	6fa9c79a7d	fix: rTorrent null-safety, configurable SAB_HISTORY_LIMIT, lastError visibility (#68 ) Build and Push Docker Image / build (push) Successful in 59s Details Docs Check / Markdown lint (push) Failing after 1m45s Details Licence Check / Licence compatibility and copyright header verification (push) Successful in 2m7s Details CI / Security audit (push) Successful in 2m33s Details Docs Check / Mermaid diagram parse check (push) Successful in 2m55s Details CI / Swagger Validation & Coverage (push) Successful in 3m19s Details CI / Tests & coverage (push) Successful in 3m29s Details - RTorrentClient: guard d.multicall2 returning non-array, per-row try/catch, explicit Number()/String() coercions, _extractArrInfo null-safe - RTorrentClient.getClientStatus: coerce rates through Number.isFinite - SABnzbdClient: history limit now reads SAB_HISTORY_LIMIT env var (default 10) - DownloadClient: added _recordLastError, _clearLastError, getLastError on base - All four clients call _recordLastError on failure, _clearLastError on success - DownloadClientRegistry.getAllClientStatuses: includes lastError in result - GET /api/status/status: exposes downloadClients[] array with per-client lastError - Tests: RTorrentClient null-safety + lastError, SABnzbd history limit + lastError, downloadClients.test expectation updated for new lastError field	2026-05-28 16:22:11 +01:00
gronod	3d49c926dc	fix(transmission): map status 7 to Checking, implement control methods (closes #63 ) Docs Check / Markdown lint (push) Failing after 1m14s Details Build and Push Docker Image / build (push) Successful in 1m40s Details Licence Check / Licence compatibility and copyright header verification (push) Successful in 1m54s Details CI / Security audit (push) Successful in 2m16s Details CI / Swagger Validation & Coverage (push) Successful in 2m42s Details Docs Check / Mermaid diagram parse check (push) Successful in 2m43s Details CI / Tests & coverage (push) Successful in 2m55s Details	2026-05-28 16:01:33 +01:00
gronod	bd7a9c7951	fix(frontend): document non-standard vite config, clean stale client/dist (closes #66 ) Build and Push Docker Image / build (push) Successful in 1m20s Details Docs Check / Markdown lint (push) Failing after 1m39s Details Licence Check / Licence compatibility and copyright header verification (push) Successful in 1m56s Details CI / Security audit (push) Successful in 2m30s Details CI / Tests & coverage (push) Successful in 2m45s Details CI / Swagger Validation & Coverage (push) Successful in 2m52s Details Docs Check / Mermaid diagram parse check (push) Successful in 2m47s Details	2026-05-28 15:59:05 +01:00
gronod	4a5dc70548	fix(matching): add torrent hash/downloadId matching, deduplicate by arrQueueId (closes #65 ) Docs Check / Markdown lint (push) Failing after 46s Details Build and Push Docker Image / build (push) Successful in 1m4s Details CI / Security audit (push) Has been cancelled Details CI / Swagger Validation & Coverage (push) Has been cancelled Details CI / Tests & coverage (push) Has been cancelled Details Docs Check / Mermaid diagram parse check (push) Successful in 1m59s Details Licence Check / Licence compatibility and copyright header verification (push) Successful in 2m8s Details	2026-05-28 15:57:35 +01:00
gronod	498eabc7bc	fix(qbittorrent): add seeds/peers fields (num_seeds/num_leechs), guard empty response (closes #64 ) Build and Push Docker Image / build (push) Successful in 50s Details Licence Check / Licence compatibility and copyright header verification (push) Successful in 1m9s Details Docs Check / Markdown lint (push) Successful in 1m19s Details CI / Security audit (push) Successful in 2m8s Details Docs Check / Mermaid diagram parse check (push) Successful in 2m33s Details CI / Swagger Validation & Coverage (push) Successful in 2m40s Details CI / Tests & coverage (push) Successful in 2m54s Details	2026-05-28 15:52:52 +01:00
gronod	6b73727d4e	fix(queue): extract shared arr cache helper, annotate season packs, null-guard flatMap (closes #61 )	2026-05-28 15:36:33 +01:00
gronod	593ad79670	fix(webhooks): redesign replay key with content identifiers, log instance fallback (closes #62 )	2026-05-28 15:30:08 +01:00