diff --git a/.specstory/history/2026-03-21_19-01-32Z-nas-cleanup-process-on-desktop-files.md b/.specstory/history/2026-03-21_19-01-32Z-nas-cleanup-process-on-desktop-files.md
index be00243..6df969d 100644
--- a/.specstory/history/2026-03-21_19-01-32Z-nas-cleanup-process-on-desktop-files.md
+++ b/.specstory/history/2026-03-21_19-01-32Z-nas-cleanup-process-on-desktop-files.md
@@ -8158,7 +8158,6 @@ hey, the thumbs are working in all dirs! i just needed to wait
 
 _**Agent (composer-2-fast)**_
 
-
 Good to hear it’s all showing up now.
 
 A bit of delay is normal: **Synology Drive** has to **finish syncing** the `@eaDir` trees and the **client** has to **refresh** its view, so “run the pipeline → wait → thumbs appear” is a real pattern.
@@ -8186,7 +8185,6 @@ I'm updating the PowerShell command to properly handle paths with spaces using s
 
 _**Agent (composer-2-fast)**_
 
-
 Updating the batch file to remove every `eaDir_tmp` under the pasted path (including subfolders like `gameplay\eaDir_tmp`).
 
 
@@ -8219,13 +8217,6 @@ I'm adjusting the batch script to properly handle environment variables using `s
 
 I'm updating the PowerShell script to properly handle directory removal with error handling and logging. </details></think>
 
-_**Agent (composer-2-fast)**_
-
-
-
-
-
-
 _**Agent (composer-2-fast)**_
 
 <tool-use data-tool-type="write" data-tool-name="edit_file_v2">
@@ -8250,13 +8241,6 @@ I'm adjusting the PowerShell command syntax to use semicolon instead of pipe for
 
 I'm double-escaping pipes as `^|` in batch to prevent cmd from interpreting them, but need to verify nested braces in PowerShell blocks don't cause issues. I'm checking if ForEach needs different quoting and reviewing the replaced line for syntax errors. I'm testing the PowerShell command in cmd to verify nested braces syntax and handle environment variable expansion properly. </details></think>
 
-_**Agent (composer-2-fast)**_
-
-
-
-
-
-
 _**Agent (composer-2-fast)**_
 
 <tool-use data-tool-type="shell" data-tool-name="run_terminal_command_v2">
@@ -8321,7 +8305,6 @@ I'm replacing `$_` with `$d` in the PowerShell loop to avoid variable scope issu
 
 _**Agent (composer-2-fast)**_
 
-
 Fixing the PowerShell one-liner: `$_` was mangled by cmd quoting. Using a `foreach` loop instead of pipeline `$_`:
 
 
@@ -8341,13 +8324,6 @@ _**Agent (composer-2-fast)**_
 
 </details></tool-use>
 
-_**Agent (composer-2-fast)**_
-
-
-
-
-
-
 _**Agent (composer-2-fast)**_
 
 <tool-use data-tool-type="shell" data-tool-name="run_terminal_command_v2">
@@ -8390,13 +8366,6 @@ _**Agent (composer-2-fast)**_
 
 I'm running the PowerShell command through cmd.exe to prevent Cursor's $ variable stripping. </details></think>
 
-_**Agent (composer-2-fast)**_
-
-
-
-
-
-
 _**Agent (composer-2-fast)**_
 
 <tool-use data-tool-type="shell" data-tool-name="run_terminal_command_v2">
@@ -8447,7 +8416,6 @@ I'm reviewing the FOR /R syntax to understand how it handles directory matching
 
 _**Agent (composer-2-fast)**_
 
-
 Avoiding fragile inline PowerShell (cmd strips `$` in some contexts). Adding a small helper script and calling it from the batch file.
 
 
@@ -8482,13 +8450,6 @@ _**Agent (composer-2-fast)**_
 
 </details></tool-use>
 
-_**Agent (composer-2-fast)**_
-
-
-
-
-
-
 _**Agent (composer-2-fast)**_
 
 <tool-use data-tool-type="shell" data-tool-name="run_terminal_command_v2">
@@ -8507,7 +8468,6 @@ cmd /c "powershell -NoProfile -ExecutionPolicy Bypass -File C:\Users\Nathan\Desk
 
 _**Agent (composer-2-fast)**_
 
-
 Here’s what changed.
 
 ## Cause
@@ -8544,7 +8504,6 @@ I'm crafting a commit message under 72 chars describing the indexer layout flatt
 
 _**Agent (composer-2-fast)**_
 
-
 Here are some options under 72 characters:
 
 - **`autoThumbs: SMB cleanup for @eaDir; recursive eaDir_tmp removal`** (58)
@@ -8565,7 +8524,6 @@ _**User**_
 
 _**Agent (composer-2-fast)**_
 
-
 That message means the **HTTPS** connection to `https://nlhydra.ddns.net/...` is failing during the **TLS handshake** (Windows **Schannel**). It’s common with **self‑hosted Git on Synology** or **custom certs**, not necessarily a bad password.
 
 **Things to try (pick what fits your setup):**
@@ -8591,3 +8549,818 @@ That message means the **HTTPS** connection to `https://nlhydra.ddns.net/...` is
 6. **Browser test**: open `https://nlhydra.ddns.net/Raincloud/synology-thumbgen.git` — if the browser warns about the cert, Git will too until you fix the cert or `sslVerify`.
 
 **Safest long-term:** fix the server certificate or use **SSH** with a key so you don’t rely on HTTPS TLS to Schannel.
+
+---
+
+_**User**_
+
+@c:\Users\Nathan\.cursor\projects\c-Users-Nathan-Desktop-synology-thumbgen\terminals\5.txt what is the purpose of flattening?
+
+---
+
+_**Agent (composer-2-fast)**_
+
+<think><details><summary>Thought Process</summary>
+**Explaining flattening**
+
+I'm explaining that flattening in synology thumbgen merges nested thumbnail directories into a single level for easier access. </details></think>
+
+_**Agent (composer-2-fast)**_
+
+
+**Flattening** in `nascleanup.sh` fixes **layout**, not the image bytes.
+
+**What goes wrong without it**
+
+- Your generator writes thumbnails under  
+  `…/eaDir_tmp/<video>.ts.mp4/SYNOPHOTO_*.jpg` (and similar).
+- **Synology’s indexer** can also create  
+  `…/eaDir_tmp/<video>.ts.mp4/@eaDir/SYNOPHOTO_*.jpg` (an extra **`@eaDir`** level).
+- If you **`cp`** that tree into **`@eaDir`** as-is, you get  
+  **`@eaDir/<video>.ts.mp4/@eaDir/…`** — **nested** `@eaDir`.
+
+**What Synology Drive / DSM expect for folder thumbnails**
+
+- Thumbs under **`@eaDir/<name>/SYNOPHOTO_*.jpg`** (and the video screenshot), with **`<name>`** as a directory whose name matches the file — **not** another **`@eaDir`** under that.
+
+**What flattening does**
+
+- For each inner **`…/<basename>/@eaDir/`**, it **moves** the `SYNO*.jpg` files **up** into **`…/<basename>/`** and **removes** that inner `@eaDir` (skipping `SYNOINDEX_MEDIA_INFO` when moving).
+- So after promote, you get the **same flat shape** as on “good” folders (e.g. 2020), which **Drive** can use.
+
+So: **flattening = turn indexer-style nested `@eaDir` into the flat Synology layout your tool and Drive both expect.**
+
+---
+
+_**User**_
+
+@c:\Users\Nathan\.cursor\projects\c-Users-Nathan-Desktop-synology-thumbgen\terminals\4.txt some changes:
+1. we don't need the line with rm failed anymore, since we're clearing the tmpdirs locally with SMB, not on Hydra.
+2. let's make it so it recognizes when the tmp > eadir migration fails.
+
+---
+
+_**Agent (composer-2-fast)**_
+
+
+
+
+
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="read" data-tool-name="read_file_v2">
+<details><summary>Tool use: **read_file_v2** • Read file: C:\Users\Nathan\Desktop\synology-thumbgen\nascleanup.sh</summary>
+
+</details>
+</tool-use>
+
+<tool-use data-tool-type="read" data-tool-name="read_file_v2"><details>
+<summary>Tool use: **read_file_v2**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="read" data-tool-name="read_file_v2">
+<details><summary>Tool use: **read_file_v2** • Read file: C:\Users\Nathan\Desktop\synology-thumbgen\autoThumbs.bat</summary>
+
+</details>
+</tool-use>
+
+<tool-use data-tool-type="read" data-tool-name="read_file_v2"><details>
+<summary>Tool use: **read_file_v2**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+<think><details><summary>Thought Process</summary>
+**Cleaning up NAS script**
+
+I'm removing the permission denied footer and simplifying the rm block in nascleanup.sh. I'm simplifying the rm block to use `rm -rf "$EADIR_TMP" 2>/dev/null || true` without the long echo message. I'm removing the echo block and using a silent `rm -rf || true` command for the NAS cleanup. 
+
+I'm adding error detection after `cp` to handle cases where it exits with non-zero status. I'm adding robust error checking for `cp` operations to handle partial failures and empty targets. I'm implementing cp exit status capture and file count verification to ensure migration integrity. 
+
+I'm adding exit status capture for cp command and implementing secondary file count verification to handle partial failures. 
+
+**Counting files after flatten**
+
+I'm counting files after flatten to verify cp operations succeeded. 
+
+**Comparing file counts**
+
+I'm comparing SRC_N and DST_N counts to detect incomplete migrations. 
+
+**Verifying copy operations**
+
+I'm adding count verification after flatten to ensure copy operations complete successfully. I'm checking copy operation counts to ensure promote completeness. I'm verifying copy operation counts to ensure promote completeness. 
+
+**Updating cleanup script**
+
+I'm adding error handling to the NAS cleanup script with conditional execution based on error levels. I'm removing the rm failed line and replacing problematic lines with silent rm -rf commands. 
+
+I'm adding early exits after failed cp and count mismatch to prevent further operations. I'm fixing the wc -l output trimming by using `tr -d ' '` to remove leading spaces in POSIX mode. </details></think>
+
+_**Agent (composer-2-fast)**_
+
+
+Removing the `rm`-failure messaging and sudo-retry echoes, adding `cp` exit-code and SYNO*.jpg count verification, and making `autoThumbs.bat` detect SSH/nascleanup failures.
+
+
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2">
+
+<details><summary>Tool use: **edit_file_v2** • Edit file: C:\Users\Nathan\Desktop\synology-thumbgen\nascleanup.sh</summary>
+
+</details>
+
+</tool-use>
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2"><details>
+<summary>Tool use: **edit_file_v2**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2">
+
+<details><summary>Tool use: **edit_file_v2** • Edit file: C:\Users\Nathan\Desktop\synology-thumbgen\nascleanup.sh</summary>
+
+</details>
+
+</tool-use>
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2"><details>
+<summary>Tool use: **edit_file_v2**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2">
+
+<details><summary>Tool use: **edit_file_v2** • Edit file: C:\Users\Nathan\Desktop\synology-thumbgen\autoThumbs.bat</summary>
+
+</details>
+
+</tool-use>
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2"><details>
+<summary>Tool use: **edit_file_v2**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2">
+
+<details><summary>Tool use: **edit_file_v2** • Edit file: C:\Users\Nathan\Desktop\synology-thumbgen\autoThumbs.bat</summary>
+
+</details>
+
+</tool-use>
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2"><details>
+<summary>Tool use: **edit_file_v2**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+
+
+
+
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="read" data-tool-name="read_file_v2">
+<details><summary>Tool use: **read_file_v2** • Read file: C:\Users\Nathan\Desktop\synology-thumbgen\autoThumbs.bat</summary>
+
+</details>
+</tool-use>
+
+<tool-use data-tool-type="read" data-tool-name="read_file_v2"><details>
+<summary>Tool use: **read_file_v2**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+<think><details><summary>Thought Process</summary>
+**Verifying cleanup script**
+
+I'm checking the order of operations in nascleanup.sh to ensure SRC_JPG is counted after flatten_indexer_layout. I confirmed SRC_JPG counting occurs after flatten_indexer_layout in the cleanup script. I confirmed the cleanup script exits with code 1 when ssh fails, and verified Windows batch error handling works correctly. I'm double-checking the bash arithmetic syntax in the cleanup script to handle potential whitespace in wc output. </details></think>
+
+_**Agent (composer-2-fast)**_
+
+
+
+
+
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="read" data-tool-name="read_file_v2">
+<details><summary>Tool use: **read_file_v2** • Read file: C:\Users\Nathan\Desktop\synology-thumbgen\nascleanup.sh</summary>
+
+</details>
+</tool-use>
+
+<tool-use data-tool-type="read" data-tool-name="read_file_v2"><details>
+<summary>Tool use: **read_file_v2**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+<think><details><summary>Thought Process</summary>
+**Fixing arithmetic**
+
+I'm using `tr -d '[:space:]'` to remove whitespace from wc -l output for robustness. </details></think>
+
+_**Agent (composer-2-fast)**_
+
+
+
+
+
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2">
+
+<details><summary>Tool use: **edit_file_v2** • Edit file: C:\Users\Nathan\Desktop\synology-thumbgen\nascleanup.sh</summary>
+
+</details>
+
+</tool-use>
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2"><details>
+<summary>Tool use: **edit_file_v2**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2">
+
+<details><summary>Tool use: **edit_file_v2** • Edit file: C:\Users\Nathan\Desktop\synology-thumbgen\nascleanup.sh</summary>
+
+</details>
+
+</tool-use>
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2"><details>
+<summary>Tool use: **edit_file_v2**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+<think><details><summary>Thought Process</summary>
+**Handling empty variables**
+
+I'm using `${SRC_JPG:-0}` to handle empty SRC_JPG variable in test condition. 
+
+**Handling error levels**
+
+The errorlevel reset issue after ssh calls needs investigation. </details></think>
+
+_**Agent (composer-2-fast)**_
+
+
+Here’s what changed:
+
+### 1. Removed “rm failed” guidance
+- Dropped the footer line about **Permission denied** / SMB / `sudo rm`.
+- Replaced the noisy **`rm eaDir_tmp`** block with a quiet **`rm`** (and **`sudo -n`** only if needed), with **no** echo — leftover **`eaDir_tmp`** is expected to be cleared by **`remove_eadir_tmp_recursive.ps1`** on **`R:\`**.
+
+### 2. Detect failed **eaDir_tmp → @eaDir** promote
+In **`nascleanup.sh`** (when **`eaDir_tmp`** exists):
+
+- Count **`SYNO*.jpg`** under **`eaDir_tmp`** after flatten ( **`SRC_JPG`** ).
+- Run **`cp -R`**; on **non-zero** exit → **`ERROR: eaDir_tmp -> @eaDir copy failed`** and **`exit 1`**.
+- Flatten **`@eaDir`**, then count **`SYNO*.jpg`** there (**`DST_JPG`**).
+- If **`SRC_JPG` > 0** and **`DST_JPG` ≠ `SRC_JPG`** → **`ERROR: Promote incomplete: …`** and **`exit 1`**.
+
+Counts use **`tr -d '[:space:]'`** so **`wc -l`** padding doesn’t break **`test`**.
+
+### 3. **`autoThumbs.bat`**
+After each **`ssh … nascleanup.sh`** (options **2** and **3**):
+
+```bat
+if errorlevel 1 echo ERROR: nascleanup failed on NAS — check promote (eaDir_tmp -> @eaDir) messages above.
+```
+
+So a failed promote surfaces in the batch window even after the SSH stream ends.
+
+---
+
+_**User**_
+
+let's have it so if errorlevel1 happens, the eadir tmps are kept so ffmpeg extraction doesn't have to run all over again.
+
+---
+
+_**Agent (composer-2-fast)**_
+
+<think><details><summary>Thought Process</summary>
+**Reviewing cleanup logic**
+
+I'm examining autoThumbs.bat to identify the exact lines for ssh nascleanup and the removal of eaDir_tmp folders. I'm updating the batch script to only call `:WIN_REMOVE_LOCAL_EADIR_TMP` on successful ssh execution, using either errorlevel check or a skip variable. 
+
+**Updating batch script logic**
+
+I'm adjusting the Windows batch script to only remove local tmp dir after successful SSH execution by checking errorlevel 0 explicitly. </details></think>
+
+_**Agent (composer-2-fast)**_
+
+
+Skipping recursive `eaDir_tmp` removal when `ssh`/nascleanup fails so staging remains for a retry.
+
+
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="read" data-tool-name="read_file_v2">
+<details><summary>Tool use: **read_file_v2** • Read file: C:\Users\Nathan\Desktop\synology-thumbgen\autoThumbs.bat</summary>
+
+</details>
+</tool-use>
+
+<tool-use data-tool-type="read" data-tool-name="read_file_v2"><details>
+<summary>Tool use: **read_file_v2**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+<think><details><summary>Thought Process</summary>
+**Fixing batch script**
+
+I'm fixing a critical batch script bug where 'if errorlevel 1' after ssh wasn't handling errors properly. I discovered that the echo command can reset errorlevel, so I'm reordering the script to check errorlevel immediately after ssh. 
+
+I'm rewriting the SSH block to avoid errorlevel reset by using explicit error handling instead of relying on echo. I'm updating the SSH error handling to explicitly check errorlevel within the if block to ensure proper error state preservation. I confirmed that `if errorlevel 1` works correctly with parenthesized blocks in cmd, preserving error state. I'll use parenthesized block for failure branch only to preserve error state. </details></think>
+
+_**Agent (composer-2-fast)**_
+
+
+
+
+
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2">
+
+<details><summary>Tool use: **edit_file_v2** • Edit file: C:\Users\Nathan\Desktop\synology-thumbgen\autoThumbs.bat</summary>
+
+</details>
+
+</tool-use>
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2"><details>
+<summary>Tool use: **edit_file_v2**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2">
+
+<details><summary>Tool use: **edit_file_v2** • Edit file: C:\Users\Nathan\Desktop\synology-thumbgen\autoThumbs.bat</summary>
+
+</details>
+
+</tool-use>
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2"><details>
+<summary>Tool use: **edit_file_v2**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+<think><details><summary>Thought Process</summary>
+**Handling cleanup failures**
+
+I'm skipping the Windows remove script when NAS cleanup fails to preserve eaDir_tmp on Windows/SMB. </details></think>
+
+_**Agent (composer-2-fast)**_
+
+
+Here’s what changed.
+
+**Behavior**
+
+- After **`ssh … nascleanup.sh`**, **`WIN_REMOVE_LOCAL_EADIR_TMP`** (recursive SMB wipe of **`eaDir_tmp`**) runs **only if** the SSH step **succeeds** (`errorlevel` 0).
+- If **`errorlevel` ≥ 1**, the batch prints the existing **ERROR** line plus:  
+  **`Keeping eaDir_tmp on the share so you can retry without re-running FFmpeg.`**  
+  and **does not** call the SMB cleanup.
+
+This is applied for **option 2** and **option 3**.
+
+**Note:** On promote failure, **`nascleanup.sh`** already **`exit 1`** before it tries to remove **`eaDir_tmp`** on the NAS, so staging should still be there on the share for a retry. Skipping the Windows delete avoids wiping **`eaDir_tmp`** from **`R:\`** when you’re about to fix permissions and run cleanup again.
+
+---
+
+_**User**_
+
+@c:\Users\Nathan\.cursor\projects\c-Users-Nathan-Desktop-synology-thumbgen\terminals\4.txt 
+
+---
+
+_**Agent (composer-2-fast)**_
+
+
+
+
+
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="read" data-tool-name="read_file_v2">
+<details><summary>Tool use: **read_file_v2** • Read file: c:\Users\Nathan\.cursor\projects\c-Users-Nathan-Desktop-synology-thumbgen\terminals\4.txt</summary>
+
+</details>
+</tool-use>
+
+<tool-use data-tool-type="read" data-tool-name="read_file_v2"><details>
+<summary>Tool use: **read_file_v2**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="read" data-tool-name="read_file_v2">
+<details><summary>Tool use: **read_file_v2** • Read file: c:\Users\Nathan\.cursor\projects\c-Users-Nathan-Desktop-synology-thumbgen\terminals\4.txt</summary>
+
+</details>
+</tool-use>
+
+<tool-use data-tool-type="read" data-tool-name="read_file_v2"><details>
+<summary>Tool use: **read_file_v2**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+<think><details><summary>Thought Process</summary>
+**Processing gameplay files**
+
+I'm handling 100+ gameplay files in the 2025 folder with thumbnail generation failing on _gameplay.mp4 variants. I found that Synology treats SYNOPHOTO_THUMB_XL.jpg as a directory with SYNOINDEX_MEDIA_INFO inside, causing copy permission errors. </details></think>
+
+_**Agent (composer-2-fast)**_
+
+
+Summarizing the log and fixing garbled `—` characters in the batch file (showing as `ΓÇö` in the console).
+
+
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="unknown" data-tool-name="ripgrep_raw_search">
+<details>
+<summary>Tool use: **ripgrep_raw_search**</summary>
+
+
+Parameters:
+
+```json
+{
+  "caseInsensitive": false,
+  "path": "C:\\Users\\Nathan\\Desktop\\synology-thumbgen\\autoThumbs.bat",
+  "pattern": "—"
+}
+```
+Additional data:
+
+```json
+{
+  "isPruned": true,
+  "outputMode": "content",
+  "path": "C:\\Users\\Nathan\\Desktop\\synology-thumbgen\\autoThumbs.bat",
+  "pattern": "—",
+  "topFiles": [
+    {
+      "matchCount": 2,
+      "uri": "autoThumbs.bat"
+    }
+  ],
+  "totalFiles": 1,
+  "totalMatches": 2
+}
+```
+Status: **completed**
+
+
+</details>
+</tool-use>
+
+<tool-use data-tool-type="unknown" data-tool-name="ripgrep_raw_search"><details>
+<summary>Tool use: **ripgrep_raw_search**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+
+
+
+
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2">
+
+<details><summary>Tool use: **edit_file_v2** • Edit file: C:\Users\Nathan\Desktop\synology-thumbgen\autoThumbs.bat</summary>
+
+</details>
+
+</tool-use>
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2"><details>
+<summary>Tool use: **edit_file_v2**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+
+## What `4.txt` shows
+
+1. **`psthumbgen`** ran on **`R:\YouTube\Streams\MixerTwitch\2025\gameplay`** (100+ files; Shell/`GetThumbnail` noise on some `_gameplay.mp4` names is normal; FFmpeg fills in where needed).
+
+2. **`nascleanup`** on **`…/MixerTwitch/2025`** **failed at `cp`**:
+   - **`rm`** hits **Permission denied** on **`SYNOINDEX_MEDIA_INFO`** under paths like  
+     `…/@eaDir/<video>.ts.mp4/@eaDir/SYNOPHOTO_THUMB_*.jpg/SYNOINDEX_MEDIA_INFO`  
+     So the old **`@eaDir`** tree is partly **indexer-style** (some **`.jpg` names are directories** with sidecars inside), and your user **can’t** rip it all out over SSH without **`sudo`** / SMB clearing first.
+   - **`cp`** then **can’t** create/update files under **`…/2025/@eaDir/...`** → **`ERROR: eaDir_tmp -> @eaDir copy failed`**.
+
+3. **Your new behavior is working:** after that, the batch prints the **ERROR** lines and **`Keeping eaDir_tmp on the share so you can retry without re-running FFmpeg.`** — so staging should still be there for a **retry** after you fix **`@eaDir`** (e.g. delete **`R:\YouTube\Streams\MixerTwitch\2025\@eaDir`** via Explorer/SMB or **`sudo rm -rf`** on Hydra), then run **option 2** (or **3**) again **without** regenerating.
+
+4. **`ΓÇö`** in the log is **mojibake** for the Unicode em dash **`—`** in **`echo`**. Those lines are updated to a **plain ASCII `-`** so **cmd** won’t garble them.
+
+**Next step for 2025:** clear the locked **`@eaDir`** on the share (SMB or **`sudo`**), then **cleanup-only** (or full run) again; **`eaDir_tmp`** should still be intact from this run so you don’t need another full FFmpeg pass if the script left it on disk.
+
+---
+
+_**User**_
+
+in case of this failure, make it print the command to run on Hydra to clear the existing eadirs.
+
+---
+
+_**Agent (composer-2-fast)**_
+
+<think><details><summary>Thought Process</summary>
+**Generating cleanup command**
+
+I'm generating a helpful SSH command to clear @eaDir via sudo rm -rf on Hydra. </details></think>
+
+_**Agent (composer-2-fast)**_
+
+
+
+
+
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="read" data-tool-name="read_file_v2">
+<details><summary>Tool use: **read_file_v2** • Read file: C:\Users\Nathan\Desktop\synology-thumbgen\autoThumbs.bat</summary>
+
+</details>
+</tool-use>
+
+<tool-use data-tool-type="read" data-tool-name="read_file_v2"><details>
+<summary>Tool use: **read_file_v2**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+<think><details><summary>Thought Process</summary>
+**Adding cleanup command**
+
+I'm adding a cleanup command with proper quoting for NASPATH in both failure blocks. </details></think>
+
+_**Agent (composer-2-fast)**_
+
+
+Adding a small subroutine that prints the Hydra `sudo rm -rf` command using `NASPATH`, and calling it from both failure branches.
+
+
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2">
+
+<details><summary>Tool use: **edit_file_v2** • Edit file: C:\Users\Nathan\Desktop\synology-thumbgen\autoThumbs.bat</summary>
+
+</details>
+
+</tool-use>
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2"><details>
+<summary>Tool use: **edit_file_v2**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2">
+
+<details><summary>Tool use: **edit_file_v2** • Edit file: C:\Users\Nathan\Desktop\synology-thumbgen\autoThumbs.bat</summary>
+
+</details>
+
+</tool-use>
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2"><details>
+<summary>Tool use: **edit_file_v2**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2">
+
+<details><summary>Tool use: **edit_file_v2** • Edit file: C:\Users\Nathan\Desktop\synology-thumbgen\autoThumbs.bat</summary>
+
+</details>
+
+</tool-use>
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2"><details>
+<summary>Tool use: **edit_file_v2**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+<think><details><summary>Thought Process</summary>
+**Fixing SSH command syntax**
+
+I'm correcting the SSH command syntax to properly escape the path for remote execution. I'm simplifying the SSH command by using a direct sudo rm -rf with escaped path for easier user execution. I'm escaping the NASPATH variable properly in the echo command to handle spaces and special characters in the Linux path. I'm correcting the SSH command syntax to properly escape the @eaDir path component with quotes. I removed the nested ssh command and simplified to direct sudo execution with proper quoting around the full path. 
+
+I'm replacing PRINT_HYDRA_CLEAR_EADIR with a simplified one-line sudo command for Hydra shell. I'm updating the SSH command to properly quote paths with spaces for remote execution. I'm correcting the SSH command syntax to handle paths with spaces using nested quoting for remote execution. </details></think>
+
+_**Agent (composer-2-fast)**_
+
+
+
+
+
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="unknown" data-tool-name="ripgrep_raw_search">
+<details>
+<summary>Tool use: **ripgrep_raw_search**</summary>
+
+
+Parameters:
+
+```json
+{
+  "caseInsensitive": false,
+  "contextAfter": 6,
+  "path": "C:\\Users\\Nathan\\Desktop\\synology-thumbgen\\autoThumbs.bat",
+  "pattern": "PRINT_HYDRA"
+}
+```
+Additional data:
+
+```json
+{
+  "isPruned": true,
+  "outputMode": "content",
+  "path": "C:\\Users\\Nathan\\Desktop\\synology-thumbgen\\autoThumbs.bat",
+  "pattern": "PRINT_HYDRA",
+  "topFiles": [
+    {
+      "matchCount": 21,
+      "uri": "autoThumbs.bat"
+    }
+  ],
+  "totalFiles": 1,
+  "totalMatches": 3
+}
+```
+Status: **completed**
+
+
+</details>
+</tool-use>
+
+<tool-use data-tool-type="unknown" data-tool-name="ripgrep_raw_search"><details>
+<summary>Tool use: **ripgrep_raw_search**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+<think><details><summary>Thought Process</summary>
+**Fixing shell escaping**
+
+I'm simplifying the remote command to use single quotes for the path to avoid escaping issues. </details></think>
+
+_**Agent (composer-2-fast)**_
+
+
+
+
+
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2">
+
+<details><summary>Tool use: **edit_file_v2** • Edit file: C:\Users\Nathan\Desktop\synology-thumbgen\autoThumbs.bat</summary>
+
+</details>
+
+</tool-use>
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2"><details>
+<summary>Tool use: **edit_file_v2**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+<think><details><summary>Thought Process</summary>
+**Testing batch parsing**
+
+I'm verifying that the batch script correctly handles `%NASPATH%/@eaDir` by ensuring the `@` symbol doesn't cause parsing issues in the echo command. </details></think>
+
+_**Agent (composer-2-fast)**_
+
+
+Here’s what was added.
+
+When **`nascleanup`** fails (**option 2** or **3**), the batch now runs **`:PRINT_HYDRA_CLEAR_EADIR`**, which prints something like:
+
+```text
+To clear locked @eaDir, paste on Windows:
+  ssh Hydra "sudo rm -rf '/volume1/Hydra/YouTube/Streams/MixerTwitch/2025/@eaDir'"
+```
+
+**`NASPATH`** is the same **`/volume1/Hydra/...`** value as in your **`DEBUG: NASPATH`** line, so it matches the folder you chose (including subpaths like **`.../2025/gameplay`**).
+
+Single quotes wrap the remote path so spaces in names stay safe. You can copy that one line from **cmd** and run it; it will **`ssh`** to **Hydra** and **`sudo rm -rf`** that **`@eaDir`**. After that, run **option 2** again (with **`eaDir_tmp`** still there) to retry the promote.
+
+---
+
+_**User**_
+
+@c:\Users\Nathan\.cursor\projects\c-Users-Nathan-Desktop-synology-thumbgen\terminals\4.txt I have to ssh Hydra first, then run command, fix accordingly.
+
+---
+
+_**Agent (composer-2-fast)**_
+
+
+
+
+
+
+_**Agent (composer-2-fast)**_
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2">
+
+<details><summary>Tool use: **edit_file_v2** • Edit file: C:\Users\Nathan\Desktop\synology-thumbgen\autoThumbs.bat</summary>
+
+</details>
+
+</tool-use>
+
+<tool-use data-tool-type="write" data-tool-name="edit_file_v2"><details>
+<summary>Tool use: **edit_file_v2**</summary>
+
+</details></tool-use>
+
+_**Agent (composer-2-fast)**_
+
+<think><details><summary>Thought Process</summary>
+**Updating sudo command**
+
+I'm updating the sudo command to use double quotes for paths with spaces. I'm adding double quotes around paths in the sudo command to handle spaces properly. </details></think>
+
+_**Agent (composer-2-fast)**_
+
+
+Updated **`:PRINT_HYDRA_CLEAR_EADIR`** so it prints a **two-step** flow:
+
+```text
+To clear locked @eaDir on Hydra: ssh in first, then run:
+  sudo rm -rf "/volume1/Hydra/.../@eaDir"
+```
+
+So you **`ssh Hydra`** (or your usual host) in one step, then paste **`sudo rm -rf "…"`** in that shell. The path is still built from **`NASPATH`**, with **double quotes** for any spaces in names.
diff --git a/.specstory/statistics.json b/.specstory/statistics.json
index 2c82f2d..1584748 100644
--- a/.specstory/statistics.json
+++ b/.specstory/statistics.json
@@ -46,13 +46,13 @@
       "last_updated": "2026-03-22T18:11:22Z"
     },
     "88555ca4-9c88-4bcf-825f-dd19b19b7145": {
-      "user_message_count": 35,
-      "agent_message_count": 341,
+      "user_message_count": 41,
+      "agent_message_count": 396,
       "start_timestamp": "2026-03-21T13:01:32-06:00",
       "end_timestamp": "2026-03-21T13:01:32-06:00",
-      "markdown_size_bytes": 310211,
+      "markdown_size_bytes": 335861,
       "provider": "cursoride",
-      "last_updated": "2026-03-22T18:11:22Z"
+      "last_updated": "2026-03-22T18:45:49Z"
     },
     "8a226504-a2e0-4b10-b083-a609486034c7": {
       "user_message_count": 9,
@@ -70,7 +70,7 @@
       "end_timestamp": "2025-06-25T22:09:21-06:00",
       "markdown_size_bytes": 38319,
       "provider": "cursoride",
-      "last_updated": "2026-03-22T18:11:10Z"
+      "last_updated": "2026-03-22T18:13:12Z"
     },
     "b90a47f3-3c59-4ca3-a099-690412afaab1": {
       "user_message_count": 7,
diff --git a/autoThumbs.bat b/autoThumbs.bat
index ed5df8e..d916e50 100644
--- a/autoThumbs.bat
+++ b/autoThumbs.bat
@@ -72,7 +72,13 @@ if not exist "%~dp0nascleanup.sh" (
 )
 ssh Hydra "cat > ~/nascleanup.sh" < "%~dp0nascleanup.sh"
 ssh Hydra "bash -lc 'if command -v dos2unix >/dev/null 2>&1; then dos2unix -f ~/nascleanup.sh; else tr -d \"\r\" < ~/nascleanup.sh > ~/nascleanup.sh.tmp && mv ~/nascleanup.sh.tmp ~/nascleanup.sh; fi; chmod +x ~/nascleanup.sh; ~/nascleanup.sh \"%NASPATH%\"'"
-call :WIN_REMOVE_LOCAL_EADIR_TMP
+if errorlevel 1 (
+    echo ERROR: nascleanup failed on NAS - check promote ^(eaDir_tmp -^> @eaDir^) messages above.
+    echo Keeping eaDir_tmp on the share so you can retry without re-running FFmpeg.
+    call :PRINT_HYDRA_CLEAR_EADIR
+) else (
+    call :WIN_REMOVE_LOCAL_EADIR_TMP
+)
 goto END
 
 :BOTH
@@ -117,7 +123,13 @@ if not exist "%~dp0nascleanup.sh" (
 )
 ssh Hydra "cat > ~/nascleanup.sh" < "%~dp0nascleanup.sh"
 ssh Hydra "bash -lc 'if command -v dos2unix >/dev/null 2>&1; then dos2unix -f ~/nascleanup.sh; else tr -d \"\r\" < ~/nascleanup.sh > ~/nascleanup.sh.tmp && mv ~/nascleanup.sh.tmp ~/nascleanup.sh; fi; chmod +x ~/nascleanup.sh; ~/nascleanup.sh \"%NASPATH%\"'"
-call :WIN_REMOVE_LOCAL_EADIR_TMP
+if errorlevel 1 (
+    echo ERROR: nascleanup failed on NAS - check promote ^(eaDir_tmp -^> @eaDir^) messages above.
+    echo Keeping eaDir_tmp on the share so you can retry without re-running FFmpeg.
+    call :PRINT_HYDRA_CLEAR_EADIR
+) else (
+    call :WIN_REMOVE_LOCAL_EADIR_TMP
+)
 goto END
 
 :FIX_ONEDRIVE
@@ -163,6 +175,13 @@ echo 3. Your custom thumbnails should now have priority!
 echo.
 goto END
 
+REM Print ssh Hydra command to wipe @eaDir when NAS cleanup failed (matches NASPATH from pasted R:\ path).
+:PRINT_HYDRA_CLEAR_EADIR
+if "%NASPATH%"=="" goto :eof
+echo To clear locked @eaDir on Hydra: ssh in first, then run:
+echo   sudo rm -rf "%NASPATH%/@eaDir"
+goto :eof
+
 REM Remove folder-level @eaDir on the pasted Windows path (same files as NAS over SMB).
 :WIN_REMOVE_LOCAL_EADIR
 if "%WINPATH%"=="" goto :eof
diff --git a/nascleanup.sh b/nascleanup.sh
index 7d2cec7..688b71f 100644
--- a/nascleanup.sh
+++ b/nascleanup.sh
@@ -87,18 +87,24 @@ if [ -d "$EADIR_TMP" ]; then
     flatten_indexer_layout "$EADIR_TMP"
     TARGET_AT="$TARGET_DIR/@eaDir"
     echo "  -> Replacing $EADIR_TMP -> $TARGET_AT"
+    SRC_JPG=$(find "$EADIR_TMP" -type f -name 'SYNO*.jpg' 2>/dev/null | wc -l | tr -d '[:space:]')
     rm -rf "$TARGET_AT"
     mkdir -p "$TARGET_AT"
-    cp -R "$EADIR_TMP/." "$TARGET_AT/"
+    if ! cp -R "$EADIR_TMP/." "$TARGET_AT/"; then
+        echo "ERROR: eaDir_tmp -> @eaDir copy failed (see cp messages above)."
+        exit 1
+    fi
     echo "  -> Flattening @eaDir after copy (same layout fix)"
     flatten_indexer_layout "$TARGET_AT"
+    DST_JPG=$(find "$TARGET_AT" -type f -name 'SYNO*.jpg' 2>/dev/null | wc -l | tr -d '[:space:]')
+    if [ "$SRC_JPG" -gt 0 ] && [ "$DST_JPG" -ne "$SRC_JPG" ]; then
+        echo "ERROR: Promote incomplete: $DST_JPG SYNO*.jpg in @eaDir vs $SRC_JPG in eaDir_tmp (expected equal)."
+        exit 1
+    fi
     chmod -R 755 "$EADIR_TMP" 2>/dev/null || true
     find "$EADIR_TMP" -type f -exec chmod u+w '{}' \; 2>/dev/null || true
     find "$EADIR_TMP" -type d -exec chmod u+w '{}' \; 2>/dev/null || true
-    if ! rm -rf "$EADIR_TMP" 2>/dev/null; then
-        echo "  -> rm eaDir_tmp failed; retrying with sudo -n"
-        sudo -n rm -rf "$EADIR_TMP" 2>/dev/null || echo "  -> WARNING: remove stale eaDir_tmp manually: sudo rm -rf \"$EADIR_TMP\""
-    fi
+    rm -rf "$EADIR_TMP" 2>/dev/null || sudo -n rm -rf "$EADIR_TMP" 2>/dev/null || true
 else
     echo "  -> No $EADIR_TMP; skipping install step"
 fi
@@ -124,5 +130,4 @@ elif command -v systemctl >/dev/null 2>&1; then
         sudo -n systemctl start "$u" 2>/dev/null || systemctl start "$u" 2>/dev/null || true
     done
 fi
-echo "Note: If indexing was stopped and needs restarting, use DSM UI or: sudo systemctl restart synoindexd"
-echo "If rm failed with Permission denied: delete @eaDir and eaDir_tmp on your pasted Windows path (SMB), or: sudo rm -rf ${TARGET_DIR}/eaDir_tmp ${TARGET_DIR}/@eaDir — then re-run option 3."
\ No newline at end of file
+echo "Note: If indexing was stopped and needs restarting, use DSM UI or: sudo systemctl restart synoindexd"
\ No newline at end of file