feat(audit): Batch 25 — project reorg (CC12), leading DI args (CC7), CC10 by-design

CC12: renderer views/ (5 screens + Onboarding + settings cards) +
lib/ (theme/thumb/datetime/id/qualityOptions/useClipboardLink/queueStats);
main core/ (buildArgs/validation/indexerCore/ytdlpPolicy). git mv preserved
history; all src+test imports updated. Build emits view chunks from views/,
344 tests + typecheck green, live probe rendered all screens.
CC7: wc/onProgress is the leading arg everywhere — downloadAppUpdate(wc,url),
indexSource(onProgress,url,signal), indexSourceCancelable(onProgress,url).
CC10: closed by-design — jsonStore backs all records; settings stay in
electron-store for DPAPI secret encryption (a deliberate two-store split).
Also closes the UI24/W4 context-menu cross-reference.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

src/main/backup.ts

@@ -3,7 +3,7 @@ import { readFileSync, writeFileSync } from 'fs'
 import { getSettings, setSettings, SECRET_KEYS } from './settings'
 import { migrateSettingsKeys } from './settingsMigration'
 import { listTemplates, replaceTemplates } from './templates'
-import { isTemplateLike } from './validation'
+import { isTemplateLike } from './core/validation'
 import type { BackupExportResult, BackupImportResult, Settings, CommandTemplate } from '@shared/ipc'
 
 interface BackupFile {

src/main/download.ts

@@ -23,7 +23,7 @@ import { ensureManagedYtdlp } from './ytdlp'
 import { materializeCookies, hasStoredCookies } from './cookies'
 import { listTemplates } from './templates'
 import { assertHttpUrl } from './url'
-import { isSafeOutputDir } from './validation'
+import { isSafeOutputDir } from './core/validation'
 import {
   buildArgs,
   selectExtraArgs,
@@ -32,7 +32,7 @@ import {
   PROGRESS_MARKER,
   FILEPATH_MARKER,
   DEST_MARKER
-} from './buildArgs'
+} from './core/buildArgs'
 import { cleanError } from './log'
 import { addErrorLog } from './errorlog'
 import {

src/main/errorlog.ts

@@ -1,5 +1,5 @@
 import type { ErrorLogEntry } from '@shared/ipc'
-import { isValidErrorLogEntry } from './validation'
+import { isValidErrorLogEntry } from './core/validation'
 import { createJsonStore } from './jsonStore'
 import { ERRORLOG_MAX_ENTRIES } from './constants'
 

src/main/history.ts

@@ -1,5 +1,5 @@
 import { HISTORY_MAX_ENTRIES, type HistoryEntry } from '@shared/ipc'
-import { isValidHistoryEntry } from './validation'
+import { isValidHistoryEntry } from './core/validation'
 import { createJsonStore } from './jsonStore'
 
 // Plain JSON in userData (portable build redirects userData next to the exe).

src/main/indexer.ts

@@ -24,7 +24,7 @@ import {
   stableSourceId,
   type RawEntry,
   type NamedPlaylist
-} from './indexerCore'
+} from './core/indexerCore'
 import { getSource, upsertSource, mergeMediaItems } from './sources'
 import type { IndexProgress, IndexSourceResult, Source, SourceKind } from '@shared/ipc'
 
@@ -89,13 +89,13 @@ export function cancelIndexing(): void {
  * The IPC layer calls this; sync.ts calls the raw indexSource (not cancelable).
  */
 export async function indexSourceCancelable(
-  url: string,
-  onProgress: (p: IndexProgress) => void
+  onProgress: (p: IndexProgress) => void,
+  url: string
 ): Promise<IndexSourceResult> {
   const controller = new AbortController()
   activeIndexAborts.add(controller)
   try {
-    return await indexSource(url, onProgress, controller.signal)
+    return await indexSource(onProgress, url, controller.signal)
   } finally {
     activeIndexAborts.delete(controller)
   }
@@ -107,8 +107,8 @@ export async function indexSourceCancelable(
  * status line — it's best-effort and never affects the result.
  */
 export async function indexSource(
-  url: string,
   onProgress: (p: IndexProgress) => void,
+  url: string,
   signal?: AbortSignal
 ): Promise<IndexSourceResult> {
   // Returned whenever a Cancel arrives mid-walk. It deliberately does NOT push a

src/main/ipc.ts

@@ -101,7 +101,7 @@ export function registerIpcHandlers(getMainWindow: () => BrowserWindow | null):
 
   ipcMain.handle(IpcChannels.appUpdateCheck, () => checkForAppUpdate())
   ipcMain.handle(IpcChannels.appUpdateDownload, (e, url: string) =>
-    downloadAppUpdate(url, e.sender)
+    downloadAppUpdate(e.sender, url)
   )
   ipcMain.handle(IpcChannels.appUpdateCancel, () => cancelAppUpdate())
   ipcMain.handle(IpcChannels.appUpdateRun, (_e, filePath: string) => runAppUpdate(filePath))
@@ -253,16 +253,16 @@ export function registerIpcHandlers(getMainWindow: () => BrowserWindow | null):
   // Indexing pushes live progress to the requesting renderer over `indexProgress`
   // and resolves with the final result.
   ipcMain.handle(IpcChannels.sourceIndex, (e, url: string) =>
-    indexSourceCancelable(url, (p) => {
+    indexSourceCancelable((p) => {
       if (!e.sender.isDestroyed()) e.sender.send(IpcChannels.indexProgress, p)
-    })
+    }, url)
   )
   ipcMain.handle(IpcChannels.sourceReindex, (e, id: string) => {
     const src = getSource(id)
     if (!src) return { ok: false, error: 'Source not found.' }
-    return indexSourceCancelable(src.url, (p) => {
+    return indexSourceCancelable((p) => {
       if (!e.sender.isDestroyed()) e.sender.send(IpcChannels.indexProgress, p)
-    })
+    }, src.url)
   })
   // Abort the in-flight index/reindex walk (kills the current probe child). (B2)
   ipcMain.handle(IpcChannels.sourceIndexCancel, () => cancelIndexing())

src/main/probe.ts

@@ -5,7 +5,7 @@ import { PROBE_MAX_BUFFER, PROBE_TIMEOUT_MS } from './constants'
 import { fmtBytes } from '@shared/format'
 import { cleanError } from './log'
 import { assertHttpUrl } from './url'
-import { entryUrl, fmtDuration, type RawEntry } from './indexerCore'
+import { entryUrl, fmtDuration, type RawEntry } from './core/indexerCore'
 import {
   BEST_FORMAT_ID,
   type ProbeResult,

src/main/settingsSchema.ts

@@ -25,7 +25,7 @@ import {
   isValidSyncTime,
   type Settings
 } from '@shared/ipc'
-import { isSafeOutputDir, isSafeFilenameTemplate } from './validation'
+import { isSafeOutputDir, isSafeFilenameTemplate } from './core/validation'
 import { sanitizeOptions } from './settingsOptions'
 
 /** Coerce to a finite number, round, and clamp into [min, max] (maxConcurrent, aria2c). */

src/main/sources.ts

@@ -13,8 +13,8 @@
  */
 
 import type { Source, MediaItem } from '@shared/ipc'
-import { isValidSource, isValidMediaItem } from './validation'
-import { mergeItemsPreservingState } from './indexerCore'
+import { isValidSource, isValidMediaItem } from './core/validation'
+import { mergeItemsPreservingState } from './core/indexerCore'
 import { createJsonStore } from './jsonStore'
 // A generous global cap (MEDIA_ITEMS_MAX, see constants.ts) so a runaway index
 // can't grow the file unbounded; large enough for several big channels. When

src/main/sync.ts

@@ -7,7 +7,7 @@
 
 import { listSources, listMediaItems } from './sources'
 import { indexSource } from './indexer'
-import { parseRssVideoIds, isYouTubeFeedUrl } from './indexerCore'
+import { parseRssVideoIds, isYouTubeFeedUrl } from './core/indexerCore'
 import { FEED_FETCH_TIMEOUT_MS } from './constants'
 import type { IndexProgress, MediaItem, SyncResult } from '@shared/ipc'
 
@@ -41,7 +41,7 @@ export async function syncWatchedSources(
         if (recent && recent.length > 0 && recent.every((id) => known.has(id))) continue
       }
       const before = new Set(listMediaItems(src.id).map((m) => m.videoId))
-      const res = await indexSource(src.url, onProgress)
+      const res = await indexSource(onProgress, src.url)
       if (res.ok) {
         for (const it of listMediaItems(src.id)) {
           if (!before.has(it.videoId)) newItems.push(it)

src/main/templates.ts

@@ -1,5 +1,5 @@
 import type { CommandTemplate } from '@shared/ipc'
-import { isTemplateLike } from './validation'
+import { isTemplateLike } from './core/validation'
 import { createJsonStore } from './jsonStore'
 import { TEMPLATES_MAX } from './constants'
 

src/main/terminal.ts

@@ -14,7 +14,7 @@ import { getYtdlpPath, getBinDir, getSystem32Path } from './binaries'
 import { getSettings } from './settings'
 import { ensureManagedYtdlp } from './ytdlp'
 import { isYtdlpUpdating, acquireSpawn, releaseSpawn } from './ytdlpLock'
-import { parseExtraArgs } from './buildArgs'
+import { parseExtraArgs } from './core/buildArgs'
 import { createLineBuffer } from './lib/lineBuffer'
 import { IpcChannels, type TerminalEvent, type TerminalRunResult } from '@shared/ipc'
 

src/main/updater.ts

@@ -411,7 +411,7 @@ function streamInstallerToFile(opts: {
 }
 
 /** Stream the installer to a temp file, pushing progress events to the renderer. */
-export async function downloadAppUpdate(url: string, wc: WebContents): Promise<AppUpdateDownload> {
+export async function downloadAppUpdate(wc: WebContents, url: string): Promise<AppUpdateDownload> {
   if (!isTrustedDownloadUrl(url)) {
     return { ok: false, error: 'Refused to download from an untrusted location.' }
   }

src/main/ytdlp.ts

@@ -5,7 +5,7 @@ import { execFileAsync } from './lib/exec'
 import { cleanError } from './log'
 import { VERSION_TIMEOUT_MS, YTDLP_UPDATE_TIMEOUT_MS } from './constants'
 import { getSettings, setSettings } from './settings'
-import { shouldAutoCheckYtdlp } from './ytdlpPolicy'
+import { shouldAutoCheckYtdlp } from './core/ytdlpPolicy'
 import { beginYtdlpUpdate, endYtdlpUpdate, liveSpawnCount } from './ytdlpLock'
 import {
   isYtdlpUpdateChannel,