diff --git a/docs/subagents/INDEX.md b/docs/subagents/INDEX.md
index 9643df6..35568f5 100644
--- a/docs/subagents/INDEX.md
+++ b/docs/subagents/INDEX.md
@@ -6,7 +6,7 @@ Read first. Keep concise.
 | ------------ | -------------- | ---------------------------------------------------- | --------- | ------------------------------------- | ---------------------- |
 | `codex-generate-minecard-image-20260220T112900Z-vsxr` | `codex-generate-minecard-image` | `Generate media fallbacks (GIF) from assets/minecard.webm and wire README/docs fallback markup` | `done` | `docs/subagents/agents/codex-generate-minecard-image-20260220T112900Z-vsxr.md` | `2026-02-20T11:35:30Z` |
 | `codex-main` | `planner-exec` | `Fix frequency/N+1 regression in plugin --start flow` | `in_progress` | `docs/subagents/agents/codex-main.md` | `2026-02-19T19:36:46Z` |
-| `codex-task85-20260219T233711Z-46hc` | `codex-task85` | `Resume TASK-85 maintainability refactor from latest handoff point` | `in_progress` | `docs/subagents/agents/codex-task85-20260219T233711Z-46hc.md` | `2026-02-20T09:51:02Z` |
+| `codex-task85-20260219T233711Z-46hc` | `codex-task85` | `Resume TASK-85 maintainability refactor from latest handoff point` | `in_progress` | `docs/subagents/agents/codex-task85-20260219T233711Z-46hc.md` | `2026-02-20T09:51:57Z` |
 | `codex-config-validation-20260219T172015Z-iiyf` | `codex-config-validation` | `Find root cause of config validation error for ~/.config/SubMiner/config.jsonc` | `completed` | `docs/subagents/agents/codex-config-validation-20260219T172015Z-iiyf.md` | `2026-02-19T17:26:17Z` |
 | `codex-task85-20260219T233711Z-46hc` | `codex-task85` | `Resume TASK-85 maintainability refactor from latest handoff point` | `in_progress` | `docs/subagents/agents/codex-task85-20260219T233711Z-46hc.md` | `2026-02-20T02:56:34Z` |
 | `codex-anilist-deeplink-20260219T233926Z` | `anilist-deeplink` | `Fix external subminer:// AniList callback handling from browser` | `done` | `docs/subagents/agents/codex-anilist-deeplink-20260219T233926Z.md` | `2026-02-19T23:59:21Z` |
diff --git a/docs/subagents/agents/codex-task85-20260219T233711Z-46hc.md b/docs/subagents/agents/codex-task85-20260219T233711Z-46hc.md
index 7c406dd..3b7e0a6 100644
--- a/docs/subagents/agents/codex-task85-20260219T233711Z-46hc.md
+++ b/docs/subagents/agents/codex-task85-20260219T233711Z-46hc.md
@@ -9,6 +9,9 @@
 
 ## Current Work (newest first)
 
+- [2026-02-20T09:51:57Z] progress: completed another 2-slice safe batch (10 normalized sites) by prebuilding finalized deps for stop/run Jellyfin command handlers, app lifecycle runner, initial-args handler, MPV event binding, and numeric/overlay-shortcut related setup.
+- [2026-02-20T09:51:57Z] test: `bun run build` pass (expected macOS helper Swift cache fallback) + targeted suites pass for `jellyfin-command-dispatch*`, `jellyfin-remote-session-lifecycle`, `app-lifecycle-*`, `initial-args*`, `mpv-main-event-*`, `numeric-shortcut-*`, `overlay-shortcuts-lifecycle*`, and `anki-actions` (39/39).
+- [2026-02-20T09:51:57Z] scope: committing only `src/main.ts` + subagent bookkeeping files; unrelated workspace noise still excluded.
 - [2026-02-20T09:51:02Z] progress: completed 2 more safe slices (10 normalized sites) in `src/main.ts` by prebuilding finalized deps for numeric shortcut pending-session handlers and overlay-shortcuts/Anki action handler setup.
 - [2026-02-20T09:51:02Z] test: `bun run build` pass (expected macOS helper Swift cache fallback) + targeted suites pass for `numeric-shortcut-*`, `overlay-shortcuts-lifecycle*`, and `anki-actions` (17/17).
 - [2026-02-20T09:51:02Z] scope: commit includes only `src/main.ts` + subagent bookkeeping files; unrelated workspace deltas still excluded.
diff --git a/src/main.ts b/src/main.ts
index 22d0361..8fec3dd 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1497,8 +1497,10 @@ const buildStopJellyfinRemoteSessionMainDepsHandler =
     activeJellyfinRemotePlayback = null;
   },
 });
+const stopJellyfinRemoteSessionMainDeps =
+  buildStopJellyfinRemoteSessionMainDepsHandler();
 const stopJellyfinRemoteSession = createStopJellyfinRemoteSessionHandler(
-  buildStopJellyfinRemoteSessionMainDepsHandler(),
+  stopJellyfinRemoteSessionMainDeps,
 );
 
 const buildRunJellyfinCommandMainDepsHandler = createBuildRunJellyfinCommandMainDepsHandler({
@@ -1510,8 +1512,9 @@ const buildRunJellyfinCommandMainDepsHandler = createBuildRunJellyfinCommandMain
   handleListCommands: (params) => handleJellyfinListCommands(params),
   handlePlayCommand: (params) => handleJellyfinPlayCommand(params),
 });
+const runJellyfinCommandMainDeps = buildRunJellyfinCommandMainDepsHandler();
 const runJellyfinCommand = createRunJellyfinCommandHandler(
-  buildRunJellyfinCommandMainDepsHandler(),
+  runJellyfinCommandMainDeps,
 );
 
 const buildNotifyAnilistSetupMainDepsHandler = createBuildNotifyAnilistSetupMainDepsHandler({
@@ -2199,8 +2202,9 @@ const buildAppLifecycleRuntimeRunnerMainDepsHandler =
     restoreWindowsOnActivate: () => restoreWindowsOnActivateHandler(),
     shouldQuitOnWindowAllClosed: () => !appState.backgroundMode,
   });
+const appLifecycleRuntimeRunnerMainDeps = buildAppLifecycleRuntimeRunnerMainDepsHandler();
 const appLifecycleRuntimeRunner = createAppLifecycleRuntimeRunner(
-  buildAppLifecycleRuntimeRunnerMainDepsHandler(),
+  appLifecycleRuntimeRunnerMainDeps,
 );
 
 const buildStartupBootstrapMainDepsHandler = createBuildStartupBootstrapMainDepsHandler({
@@ -2276,8 +2280,9 @@ const buildHandleInitialArgsMainDepsHandler = createBuildHandleInitialArgsMainDe
   logInfo: (message) => logger.info(message),
   handleCliCommand: (args, source) => handleCliCommand(args, source),
 });
+const handleInitialArgsMainDeps = buildHandleInitialArgsMainDepsHandler();
 const handleInitialArgsRuntimeHandler = createHandleInitialArgsHandler(
-  buildHandleInitialArgsMainDepsHandler(),
+  handleInitialArgsMainDeps,
 );
 
 function handleInitialArgs(): void {
@@ -2332,8 +2337,9 @@ const buildBindMpvMainEventHandlersMainDepsHandler =
       updateMpvSubtitleRenderMetrics(patch as Partial<MpvSubtitleRenderMetrics>);
     },
   });
+const bindMpvMainEventHandlersMainDeps = buildBindMpvMainEventHandlersMainDepsHandler();
 const bindMpvClientEventHandlers = createBindMpvMainEventHandlersHandler(
-  buildBindMpvMainEventHandlersMainDepsHandler(),
+  bindMpvMainEventHandlersMainDeps,
 );
 
 const buildMpvClientRuntimeServiceFactoryMainDepsHandler =