refactor: extract cli command context factory wiring

src/main.ts

@@ -256,7 +256,7 @@ import {
   createBuildSetFieldGroupingResolverMainDepsHandler,
 } from './main/runtime/field-grouping-resolver-main-deps';
 import { createBuildFieldGroupingOverlayMainDepsHandler } from './main/runtime/field-grouping-overlay-main-deps';
-import { createCliCommandContext } from './main/runtime/cli-command-context';
+import { createCliCommandContextFactory } from './main/runtime/cli-command-context-factory';
 import { createBindMpvMainEventHandlersHandler } from './main/runtime/mpv-main-event-bindings';
 import { createBuildBindMpvMainEventHandlersMainDepsHandler } from './main/runtime/mpv-main-event-main-deps';
 import { createBuildMpvClientRuntimeServiceFactoryDepsHandler } from './main/runtime/mpv-client-runtime-service-main-deps';
@@ -409,8 +409,6 @@ import {
 import { createYomitanExtensionRuntime } from './main/runtime/yomitan-extension-runtime';
 import { createBuildInitializeOverlayRuntimeOptionsHandler } from './main/runtime/overlay-runtime-options';
 import { createBuildInitializeOverlayRuntimeMainDepsHandler } from './main/runtime/overlay-runtime-options-main-deps';
-import { createBuildCliCommandContextDepsHandler } from './main/runtime/cli-command-context-deps';
-import { createBuildCliCommandContextMainDepsHandler } from './main/runtime/cli-command-context-main-deps';
 import {
   createOnWillQuitCleanupHandler,
   createRestoreWindowsOnActivateHandler,
@@ -2237,7 +2235,7 @@ const handleTexthookerOnlyModeTransitionHandler = createHandleTexthookerOnlyMode
 function handleCliCommand(args: CliArgs, source: CliCommandSource = 'initial'): void {
   handleTexthookerOnlyModeTransitionHandler(args);
 
-  const cliContext = createCliCommandContext(buildCliCommandContextDepsHandler());
+  const cliContext = createCliCommandContextHandler();
   handleCliCommandRuntimeServiceWithContext(args, source, cliContext);
 }
 
@@ -2961,7 +2959,7 @@ const { handleMpvCommandFromIpc: handleMpvCommandFromIpcHandler, runSubsyncManua
       runManualFromIpc: (request) => subsyncRuntime.runManualFromIpc(request),
     },
   });
-const buildCliCommandContextMainDepsHandler = createBuildCliCommandContextMainDepsHandler({
+const createCliCommandContextHandler = createCliCommandContextFactory({
     appState,
     texthookerService,
     getResolvedConfig: () => getResolvedConfig(),
@@ -3003,10 +3001,6 @@ const buildCliCommandContextMainDepsHandler = createBuildCliCommandContextMainDe
     logWarn: (message: string) => logger.warn(message),
     logError: (message: string, err: unknown) => logger.error(message, err),
   });
-const cliCommandContextMainDeps = buildCliCommandContextMainDepsHandler();
-const buildCliCommandContextDepsHandler = createBuildCliCommandContextDepsHandler(
-  cliCommandContextMainDeps,
-);
 const createOverlayWindowHandler = createCreateOverlayWindowHandler<BrowserWindow>(
   createBuildCreateOverlayWindowMainDepsHandler<BrowserWindow>({
     createOverlayWindowCore: (kind, options) => createOverlayWindowCore(kind, options),

src/main/runtime/cli-command-context-factory.test.ts

@@ -0,0 +1,71 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { createCliCommandContextFactory } from './cli-command-context-factory';
+
+test('cli command context factory composes main deps and context handlers', () => {
+  const calls: string[] = [];
+  const appState = {
+    mpvSocketPath: '/tmp/mpv.sock',
+    mpvClient: null as unknown,
+    texthookerPort: 5174,
+    overlayRuntimeInitialized: false,
+  };
+
+  const createContext = createCliCommandContextFactory({
+    appState,
+    texthookerService: { start: () => null },
+    getResolvedConfig: () => ({ texthooker: { openBrowser: true } }),
+    openExternal: async () => {},
+    logBrowserOpenError: () => {},
+    showMpvOsd: (text) => calls.push(`osd:${text}`),
+    initializeOverlayRuntime: () => calls.push('init-overlay'),
+    toggleVisibleOverlay: () => calls.push('toggle-visible'),
+    toggleInvisibleOverlay: () => calls.push('toggle-invisible'),
+    setVisibleOverlayVisible: (visible) => calls.push(`set-visible:${visible}`),
+    setInvisibleOverlayVisible: (visible) => calls.push(`set-invisible:${visible}`),
+    copyCurrentSubtitle: () => calls.push('copy-sub'),
+    startPendingMultiCopy: (timeoutMs) => calls.push(`multi:${timeoutMs}`),
+    mineSentenceCard: async () => {},
+    startPendingMineSentenceMultiple: () => {},
+    updateLastCardFromClipboard: async () => {},
+    refreshKnownWordCache: async () => {},
+    triggerFieldGrouping: async () => {},
+    triggerSubsyncFromConfig: async () => {},
+    markLastCardAsAudioCard: async () => {},
+    getAnilistStatus: () => ({ status: 'ok' }),
+    clearAnilistToken: () => {},
+    openAnilistSetupWindow: () => {},
+    openJellyfinSetupWindow: () => {},
+    getAnilistQueueStatus: () => ({ queued: 0 }),
+    processNextAnilistRetryUpdate: async () => ({ ok: true, message: 'ok' }),
+    runJellyfinCommand: async () => {},
+    openYomitanSettings: () => {},
+    cycleSecondarySubMode: () => {},
+    openRuntimeOptionsPalette: () => {},
+    printHelp: () => {},
+    stopApp: () => {},
+    hasMainWindow: () => true,
+    getMultiCopyTimeoutMs: () => 5000,
+    schedule: (fn) => setTimeout(fn, 0),
+    logInfo: () => {},
+    logWarn: () => {},
+    logError: () => {},
+  });
+
+  const context = createContext();
+  context.setSocketPath('/tmp/new.sock');
+  context.showOsd('hello');
+  context.setVisibleOverlay(true);
+  context.setInvisibleOverlay(false);
+  context.toggleVisibleOverlay();
+  context.toggleInvisibleOverlay();
+
+  assert.equal(appState.mpvSocketPath, '/tmp/new.sock');
+  assert.deepEqual(calls, [
+    'osd:hello',
+    'set-visible:true',
+    'set-invisible:false',
+    'toggle-visible',
+    'toggle-invisible',
+  ]);
+});

src/main/runtime/cli-command-context-factory.ts

@@ -0,0 +1,16 @@
+import { createCliCommandContext } from './cli-command-context';
+import { createBuildCliCommandContextDepsHandler } from './cli-command-context-deps';
+import { createBuildCliCommandContextMainDepsHandler } from './cli-command-context-main-deps';
+
+type CliCommandContextMainDeps = Parameters<
+  typeof createBuildCliCommandContextMainDepsHandler
+>[0];
+
+export function createCliCommandContextFactory(deps: CliCommandContextMainDeps) {
+  const buildCliCommandContextMainDepsHandler = createBuildCliCommandContextMainDepsHandler(deps);
+  const cliCommandContextMainDeps = buildCliCommandContextMainDepsHandler();
+  const buildCliCommandContextDepsHandler =
+    createBuildCliCommandContextDepsHandler(cliCommandContextMainDeps);
+
+  return () => createCliCommandContext(buildCliCommandContextDepsHandler());
+}