fix: unblock playback when mpv plugin is already installed

launcher/commands/playback-command.ts

@@ -21,7 +21,9 @@ import {
   getDefaultConfigDir,
   getSetupStatePath,
   readSetupState,
+  resolveDefaultMpvInstallPaths,
 } from '../../src/shared/setup-state.js';
+import { detectInstalledFirstRunPlugin } from '../../src/main/runtime/first-run-setup-plugin.js';
 import { hasLauncherExternalYomitanProfileConfig } from '../config.js';
 
 const SETUP_WAIT_TIMEOUT_MS = 10 * 60 * 1000;
@@ -105,6 +107,14 @@ async function ensurePlaybackSetupReady(context: LauncherCommandContext): Promis
   const ready = await ensureLauncherSetupReady({
     readSetupState: () => readSetupState(statePath),
     isExternalYomitanConfigured: () => hasLauncherExternalYomitanProfileConfig(),
+    isPluginInstalled: () => {
+      const installPaths = resolveDefaultMpvInstallPaths(
+        process.platform,
+        os.homedir(),
+        process.env.XDG_CONFIG_HOME,
+      );
+      return detectInstalledFirstRunPlugin(installPaths);
+    },
     launchSetupApp: () => {
       const setupArgs = ['--background', '--setup'];
       if (args.logLevel) {

launcher/setup-gate.test.ts

@@ -116,6 +116,36 @@ test('ensureLauncherSetupReady bypasses setup gate when external yomitan is conf
   assert.deepEqual(calls, []);
 });
 
+test('ensureLauncherSetupReady bypasses setup gate when plugin is already installed', async () => {
+  const calls: string[] = [];
+
+  const ready = await ensureLauncherSetupReady({
+    readSetupState: () => ({
+      version: 3,
+      status: 'cancelled',
+      completedAt: null,
+      completionSource: null,
+      yomitanSetupMode: null,
+      lastSeenYomitanDictionaryCount: 0,
+      pluginInstallStatus: 'unknown',
+      pluginInstallPathSummary: null,
+      windowsMpvShortcutPreferences: { startMenuEnabled: true, desktopEnabled: true },
+      windowsMpvShortcutLastStatus: 'unknown',
+    }),
+    isPluginInstalled: () => true,
+    launchSetupApp: () => {
+      calls.push('launch');
+    },
+    sleep: async () => undefined,
+    now: () => 0,
+    timeoutMs: 5_000,
+    pollIntervalMs: 100,
+  });
+
+  assert.equal(ready, true);
+  assert.deepEqual(calls, []);
+});
+
 test('ensureLauncherSetupReady fails on timeout/cancelled state', async () => {
   const result = await ensureLauncherSetupReady({
     readSetupState: () => ({
@@ -139,3 +169,63 @@ test('ensureLauncherSetupReady fails on timeout/cancelled state', async () => {
 
   assert.equal(result, false);
 });
+
+test('ensureLauncherSetupReady ignores stale cancelled state after launching setup app', async () => {
+  let reads = 0;
+
+  const result = await ensureLauncherSetupReady({
+    readSetupState: () => {
+      reads += 1;
+      if (reads <= 2) {
+        return {
+          version: 3,
+          status: 'cancelled',
+          completedAt: null,
+          completionSource: null,
+          yomitanSetupMode: null,
+          lastSeenYomitanDictionaryCount: 0,
+          pluginInstallStatus: 'unknown',
+          pluginInstallPathSummary: null,
+          windowsMpvShortcutPreferences: { startMenuEnabled: true, desktopEnabled: true },
+          windowsMpvShortcutLastStatus: 'unknown',
+        };
+      }
+      if (reads === 3) {
+        return {
+          version: 3,
+          status: 'in_progress',
+          completedAt: null,
+          completionSource: null,
+          yomitanSetupMode: null,
+          lastSeenYomitanDictionaryCount: 0,
+          pluginInstallStatus: 'unknown',
+          pluginInstallPathSummary: null,
+          windowsMpvShortcutPreferences: { startMenuEnabled: true, desktopEnabled: true },
+          windowsMpvShortcutLastStatus: 'unknown',
+        };
+      }
+      return {
+        version: 3,
+        status: 'completed',
+        completedAt: '2026-03-07T00:00:00.000Z',
+        completionSource: 'legacy_auto_detected',
+        yomitanSetupMode: 'internal',
+        lastSeenYomitanDictionaryCount: 1,
+        pluginInstallStatus: 'installed',
+        pluginInstallPathSummary: '/tmp/mpv',
+        windowsMpvShortcutPreferences: { startMenuEnabled: true, desktopEnabled: true },
+        windowsMpvShortcutLastStatus: 'unknown',
+      };
+    },
+    launchSetupApp: () => undefined,
+    sleep: async () => undefined,
+    now: (() => {
+      let value = 0;
+      return () => (value += 100);
+    })(),
+    timeoutMs: 5_000,
+    pollIntervalMs: 100,
+  });
+
+  assert.equal(result, true);
+});

launcher/setup-gate.ts

@@ -6,15 +6,24 @@ export async function waitForSetupCompletion(deps: {
   now: () => number;
   timeoutMs: number;
   pollIntervalMs: number;
+  ignoreInitialCancelledState?: boolean;
 }): Promise<'completed' | 'cancelled' | 'timeout'> {
   const deadline = deps.now() + deps.timeoutMs;
+  let ignoringCancelled = deps.ignoreInitialCancelledState === true;
 
   while (deps.now() <= deadline) {
     const state = deps.readSetupState();
     if (isSetupCompleted(state)) {
       return 'completed';
     }
+    if (ignoringCancelled && state?.status !== 'cancelled') {
+      ignoringCancelled = false;
+    }
     if (state?.status === 'cancelled') {
+      if (ignoringCancelled) {
+        await deps.sleep(deps.pollIntervalMs);
+        continue;
+      }
       return 'cancelled';
     }
     await deps.sleep(deps.pollIntervalMs);
@@ -26,6 +35,7 @@ export async function waitForSetupCompletion(deps: {
 export async function ensureLauncherSetupReady(deps: {
   readSetupState: () => SetupState | null;
   isExternalYomitanConfigured?: () => boolean;
+  isPluginInstalled?: () => boolean;
   launchSetupApp: () => void;
   sleep: (ms: number) => Promise<void>;
   now: () => number;
@@ -35,11 +45,18 @@ export async function ensureLauncherSetupReady(deps: {
   if (deps.isExternalYomitanConfigured?.()) {
     return true;
   }
-  if (isSetupCompleted(deps.readSetupState())) {
+  if (deps.isPluginInstalled?.()) {
+    return true;
+  }
+  const initialState = deps.readSetupState();
+  if (isSetupCompleted(initialState)) {
     return true;
   }
 
   deps.launchSetupApp();
-  const result = await waitForSetupCompletion(deps);
+  const result = await waitForSetupCompletion({
+    ...deps,
+    ignoreInitialCancelledState: initialState?.status === 'cancelled',
+  });
   return result === 'completed';
 }