Fix managed playback exit and tokenizer grammar splits

- Ignore background stats daemons during regular app startup - Split standalone grammar endings before applying annotations - Clear helper-span annotations for auxiliary-only tokens
2026-05-04 00:41:33 -07:00 · 2026-05-02 18:36:41 -07:00
parent 2a06bfc989
commit 6607b06437
12 changed files with 583 additions and 88 deletions
@@ -0,0 +1,58 @@
+---
+id: TASK-315
+title: Suppress annotations for standalone じゃない and です ending tokens
+status: Done
+assignee:
+  - codex
+created_date: '2026-05-03 00:02'
+updated_date: '2026-05-03 00:31'
+labels:
+  - bug
+  - tokenizer
+dependencies: []
+priority: medium
+---
+
+## Description
+
+<!-- SECTION:DESCRIPTION:BEGIN -->
+Standalone `じゃない` grammar ending tokens should not display or persist subtitle annotations even if a dictionary assigns a rank or JLPT/known match. User observed `じゃない` still being marked frequent in overlay after tokenization produced it as a dictionary word.
+<!-- SECTION:DESCRIPTION:END -->
+
+## Acceptance Criteria
+<!-- AC:BEGIN -->
+- [x] #1 `じゃない` and `です` ending tokens have known-word, N+1, frequency, and JLPT annotation metadata cleared in subtitle annotation output.
+- [x] #2 Common polite/question variants such as `じゃないですか` and `ですよ` remain excluded when tokenized as a single ending token.
+- [x] #3 Regression coverage proves same-line Yomitan segments split content from trailing grammar endings so the content word can be annotated without coloring the ending.
+- [x] #4 Auxiliary-only helper spans such as `てく` + `れた` in `ベアトリスがいてくれたから` have known-word, N+1, frequency, and JLPT annotation metadata cleared.
+<!-- AC:END -->
+
+## Implementation Plan
+
+<!-- SECTION:PLAN:BEGIN -->
+1. Add a focused regression for `ベアトリスがいてくれたから` where Yomitan tokens include auxiliary-only `てく` and `れた` with pre-ranked/known/JLPT metadata candidates.
+2. Run the targeted test to verify the regression fails before production changes.
+3. Patch the shared subtitle annotation filter so kana-only auxiliary helper spans made only of grammar POS components are excluded while preserving lexical content tokens.
+4. Re-run targeted tokenizer/annotation tests, then run SubMiner change verification classifier/verifier for the touched files.
+5. Update TASK-315 acceptance criteria, notes, and final summary with commands and outcomes.
+<!-- SECTION:PLAN:END -->
+
+## Implementation Notes
+
+<!-- SECTION:NOTES:BEGIN -->
+Implemented as one focused tokenizer fix. Parser selection now splits dictionary-backed same-line grammar ending segments (`です`, `じゃない*`) from preceding content so annotation styling can apply only to the content token. Shared subtitle annotation filtering now treats bare `です` like the existing `ですか/ですよ/...` copula endings.
+
+2026-05-03: Reopened for approved add-on covering auxiliary-only `てく` + `れた` helper highlighting report.
+
+2026-05-03: Added regression coverage for `ベアトリスがいてくれたから` where Yomitan emits `てく` + `れた` and MeCab enrichment tags `てく` as `助詞|動詞` / `接続助詞|非自立`. The regression initially failed because `てく` kept `isKnown: true` and `jlptLevel: N4`. Added a shared-filter helper for kana-only particle+non-independent-verb helper spans, preserving lexical `自立` verbs. Verification: `bun test src/core/services/tokenizer/annotation-stage.test.ts`, `bun test src/core/services/tokenizer.test.ts`, `bun test src/core/services/tokenizer/parser-selection-stage.test.ts`, `bun x prettier --check ...`, and `bun run typecheck` passed. SubMiner verifier core lane passed typecheck but `bun run test:fast` failed on unrelated existing cross-suite issues: `window.electronAPI` undefined in `src/renderer/handlers/keyboard.ts` during `src/core/services/subsync.test.ts`, followed by Bun `node:test` nested-test cascade.
+<!-- SECTION:NOTES:END -->
+
+## Final Summary
+
+<!-- SECTION:FINAL_SUMMARY:BEGIN -->
+Split dictionary-backed trailing grammar ending segments (`です`, `じゃない*`) from preceding Yomitan same-line content before annotation, and added bare `です` to the explicit polite copula exclusion set.
+
+Added the approved auxiliary-helper fix for `ベアトリスがいてくれたから`: kana-only `てく` + `れた` helper spans now clear known-word, N+1, frequency, and JLPT annotation metadata when POS enrichment shows a particle + non-independent verb helper, while lexical `自立` verb forms like `くれ`/`くれる` remain eligible.
+
+Verification passed for targeted tokenizer/annotation/parser tests, Prettier check on touched files, and `bun run typecheck`. The SubMiner core verifier's `test:fast` step remains blocked by unrelated pre-existing cross-suite failures in `subsync`/renderer keyboard globals plus Bun `node:test` cascade; artifact: `.tmp/skill-verification/subminer-verify-20260502-173004-CMu3ai/`.
+<!-- SECTION:FINAL_SUMMARY:END -->
@@ -0,0 +1,68 @@
+---
+id: TASK-316
+title: Fix macOS launcher playback exit with background stats daemon
+status: Done
+assignee:
+  - '@Codex'
+created_date: '2026-05-03 00:32'
+updated_date: '2026-05-03 00:36'
+labels:
+  - bug
+  - macos
+  - mpv
+  - stats
+  - runtime
+dependencies: []
+priority: high
+---
+
+## Description
+
+<!-- SECTION:DESCRIPTION:BEGIN -->
+Launching a video on macOS when SubMiner is not already running should not leave the regular SubMiner app/tray alive after mpv closes. A separately running background stats daemon must remain non-blocking and must not be used as a foreground app dependency during playback startup/shutdown.
+<!-- SECTION:DESCRIPTION:END -->
+
+## Acceptance Criteria
+<!-- AC:BEGIN -->
+- [x] #1 Closing a launcher/plugin-managed mpv session exits the launcher-started regular SubMiner app/tray after mpv closes.
+- [x] #2 Explicit background/no-argument app launches still remain alive as before.
+- [x] #3 A live background stats daemon is ignored by normal in-app stats server routing during regular app startup/playback, so the regular app never depends on or connects to that background daemon.
+- [x] #4 Regression coverage demonstrates the managed playback shutdown and stats-daemon isolation behavior.
+<!-- AC:END -->
+
+## Implementation Plan
+
+<!-- SECTION:PLAN:BEGIN -->
+1. Add failing regressions first: stats routing should ignore a live foreign background daemon for normal app URL/server startup, and managed playback disconnect should request app quit directly without reconnecting or depending on overlay/youtube disconnect guards.
+2. Implement the narrow runtime changes in `src/main/runtime/stats-server-routing.ts` and, if needed, mpv disconnect plumbing in `src/core/services/mpv.ts` / event deps.
+3. Preserve explicit persistent background/no-arg behavior by keeping `--managed-playback` as the only playback-exit marker.
+4. Run focused tests (`stats-server-routing`, mpv client/protocol/event tests), then typecheck if focused checks pass.
+5. Update changelog and task acceptance/final notes.
+<!-- SECTION:PLAN:END -->
+
+## Implementation Notes
+
+<!-- SECTION:NOTES:BEGIN -->
+Implemented regular app stats routing isolation from live background daemon state and explicit managed-playback quit-on-disconnect wiring in main mpv event deps. Existing `MpvIpcClient` socket-close managed playback quit path remains covered.
+
+`bun run test:fast` was attempted after focused verification. It failed in the broad `test:core:src` lane with Bun/node:test nested-test runner errors across many unrelated files and one transient subsync renderer API failure; rerunning the concrete subsync failure alone passed. Focused runtime tests, typecheck, and changelog lint remain green.
+<!-- SECTION:NOTES:END -->
+
+## Final Summary
+
+<!-- SECTION:FINAL_SUMMARY:BEGIN -->
+Summary:
+- Regular app stats server routing no longer returns or depends on a live background daemon URL; it validates/cleans state, then uses the local app stats server path.
+- Managed playback is now explicitly treated as a quit-on-disconnect launch mode in main mpv event deps, in addition to the existing mpv socket-close quit request.
+- Added regressions for background daemon isolation and managed playback quit-on-disconnect classification.
+- Added changelog fragment `changes/316-macos-playback-stats-daemon.md`.
+
+Verification:
+- `bun test src/main/runtime/stats-server-routing.test.ts src/core/services/mpv.test.ts src/core/services/mpv-protocol.test.ts src/main/runtime/mpv-client-event-bindings.test.ts src/main/runtime/mpv-main-event-bindings.test.ts src/main/runtime/mpv-main-event-main-deps.test.ts`
+- `bun run typecheck`
+- `bun run changelog:lint`
+- `bun test src/core/services/subsync.test.ts --test-name-pattern "deterministic _retimed"`
+
+Blocked broader gate:
+- `bun run test:fast` failed in `test:core:src` with Bun/node:test nested-test runner errors across unrelated files; the concrete subsync failure from that run passed when isolated.
+<!-- SECTION:FINAL_SUMMARY:END -->
@@ -0,0 +1,4 @@
+type: fixed
+area: stats
+
+- Kept regular app stats routing isolated from a separately running background stats daemon during playback startup.
@@ -79,7 +79,7 @@ function createDeferred<T>() {
  };
 }

-test('tokenizeSubtitle assigns JLPT level to parsed Yomitan tokens', async () => {
+test('tokenizeSubtitle splits same-line grammar endings before applying annotations', async () => {
  const result = await tokenizeSubtitle(
    '猫です',
    makeDeps({
@@ -88,35 +88,51 @@ test('tokenizeSubtitle assigns JLPT level to parsed Yomitan tokens', async () =>
        ({
          isDestroyed: () => false,
          webContents: {
-            executeJavaScript: async () => [
-              {
-                source: 'scanning-parser',
-                index: 0,
-                content: [
-                  [
-                    {
-                      text: '猫',
-                      reading: 'ねこ',
-                      headwords: [[{ term: '猫' }]],
-                    },
-                    {
-                      text: 'です',
-                      reading: 'です',
-                      headwords: [[{ term: 'です' }]],
-                    },
+            executeJavaScript: async (script: string) => {
+              if (script.includes('getTermFrequencies')) {
+                return [];
+              }
+
+              return [
+                {
+                  source: 'scanning-parser',
+                  index: 0,
+                  content: [
+                    [
+                      {
+                        text: '猫',
+                        reading: 'ねこ',
+                        headwords: [[{ term: '猫' }]],
+                      },
+                      {
+                        text: 'です',
+                        reading: 'です',
+                        headwords: [[{ term: 'です' }]],
+                      },
+                    ],
                  ],
-                ],
-              },
-            ],
+                },
+              ];
+            },
          },
        }) as unknown as Electron.BrowserWindow,
      tokenizeWithMecab: async () => null,
-      getJlptLevel: (text) => (text === '猫' ? 'N5' : null),
+      getFrequencyDictionaryEnabled: () => true,
+      getFrequencyRank: (text) => (text === '猫' ? 40 : text === 'です' ? 50 : null),
+      getJlptLevel: (text) => (text === '猫' || text === 'です' ? 'N5' : null),
+      isKnownWord: (text) => text === 'です',
    }),
  );

-  assert.equal(result.tokens?.length, 1);
+  assert.equal(result.tokens?.length, 2);
+  assert.equal(result.tokens?.[0]?.surface, '猫');
  assert.equal(result.tokens?.[0]?.jlptLevel, 'N5');
+  assert.equal(result.tokens?.[0]?.frequencyRank, 40);
+  assert.equal(result.tokens?.[1]?.surface, 'です');
+  assert.equal(result.tokens?.[1]?.isKnown, false);
+  assert.equal(result.tokens?.[1]?.isNPlusOneTarget, false);
+  assert.equal(result.tokens?.[1]?.frequencyRank, undefined);
+  assert.equal(result.tokens?.[1]?.jlptLevel, undefined);
 });

 test('tokenizeSubtitle preserves Yomitan name-match metadata on tokens', async () => {
@@ -204,7 +220,7 @@ test('tokenizeSubtitle applies frequency dictionary ranks', async () => {

  assert.equal(result.tokens?.length, 2);
  assert.equal(result.tokens?.[0]?.frequencyRank, 23);
-  assert.equal(result.tokens?.[1]?.frequencyRank, 1200);
+  assert.equal(result.tokens?.[1]?.frequencyRank, undefined);
 });

 test('tokenizeSubtitle uses left-to-right yomitan scanning to keep full katakana name tokens', async () => {
@@ -2383,7 +2399,7 @@ test('tokenizeSubtitle applies N+1 target marking to Yomitan results', async ()
      getYomitanParserWindow: () => parserWindow,
      tokenizeWithMecab: async () => null,
      isKnownWord: (text) => text === 'です',
-      getMinSentenceWordsForNPlusOne: () => 2,
+      getMinSentenceWordsForNPlusOne: () => 1,
    }),
  );

@@ -4759,6 +4775,143 @@ test('tokenizeSubtitle clears annotations for auxiliary inflection fragments whi
  );
 });

+test('tokenizeSubtitle clears annotations for te-kureru auxiliary helper spans', async () => {
+  const result = await tokenizeSubtitle(
+    'ベアトリスがいてくれたから',
+    makeDepsFromYomitanTokens(
+      [
+        { surface: 'ベアトリス', reading: 'べあとりす', headword: 'ベアトリス' },
+        { surface: 'が', reading: 'が', headword: 'が' },
+        { surface: 'い', reading: 'い', headword: 'いる' },
+        { surface: 'てく', reading: 'てく', headword: 'てく' },
+        { surface: 'れた', reading: 'れた', headword: 'れる' },
+        { surface: 'から', reading: 'から', headword: 'から' },
+      ],
+      {
+        getFrequencyDictionaryEnabled: () => true,
+        getFrequencyRank: (text) =>
+          text === 'ベアトリス' ? 1000 : text === 'てく' ? 140 : text === 'れる' ? 19 : null,
+        getJlptLevel: (text) =>
+          text === 'てく' || text === 'れる' || text === 'いる' ? 'N4' : null,
+        isKnownWord: (text) => text === 'てく' || text === 'れる',
+        getMinSentenceWordsForNPlusOne: () => 1,
+        tokenizeWithMecab: async () => [
+          {
+            headword: 'ベアトリス',
+            surface: 'ベアトリス',
+            reading: 'ベアトリス',
+            startPos: 0,
+            endPos: 5,
+            partOfSpeech: PartOfSpeech.noun,
+            pos1: '名詞',
+            pos2: '固有名詞',
+            isMerged: false,
+            isKnown: false,
+            isNPlusOneTarget: false,
+          },
+          {
+            headword: 'が',
+            surface: 'が',
+            reading: 'ガ',
+            startPos: 5,
+            endPos: 6,
+            partOfSpeech: PartOfSpeech.particle,
+            pos1: '助詞',
+            pos2: '格助詞',
+            isMerged: false,
+            isKnown: false,
+            isNPlusOneTarget: false,
+          },
+          {
+            headword: 'いる',
+            surface: 'い',
+            reading: 'イ',
+            startPos: 6,
+            endPos: 7,
+            partOfSpeech: PartOfSpeech.verb,
+            pos1: '動詞',
+            pos2: '自立',
+            isMerged: false,
+            isKnown: false,
+            isNPlusOneTarget: false,
+          },
+          {
+            headword: 'てく',
+            surface: 'てく',
+            reading: 'テク',
+            startPos: 7,
+            endPos: 9,
+            partOfSpeech: PartOfSpeech.verb,
+            pos1: '助詞|動詞',
+            pos2: '接続助詞|非自立',
+            isMerged: false,
+            isKnown: false,
+            isNPlusOneTarget: false,
+          },
+          {
+            headword: 'れる',
+            surface: 'れた',
+            reading: 'レタ',
+            startPos: 9,
+            endPos: 11,
+            partOfSpeech: PartOfSpeech.verb,
+            pos1: '動詞|助動詞',
+            pos2: '接尾|*',
+            isMerged: false,
+            isKnown: false,
+            isNPlusOneTarget: false,
+          },
+          {
+            headword: 'から',
+            surface: 'から',
+            reading: 'カラ',
+            startPos: 11,
+            endPos: 13,
+            partOfSpeech: PartOfSpeech.particle,
+            pos1: '助詞',
+            pos2: '接続助詞',
+            isMerged: false,
+            isKnown: false,
+            isNPlusOneTarget: false,
+          },
+        ],
+      },
+    ),
+  );
+
+  const tokenSummary = result.tokens?.map((token) => ({
+    surface: token.surface,
+    headword: token.headword,
+    isKnown: token.isKnown,
+    isNPlusOneTarget: token.isNPlusOneTarget,
+    frequencyRank: token.frequencyRank,
+    jlptLevel: token.jlptLevel,
+  }));
+
+  assert.deepEqual(
+    tokenSummary?.find((token) => token.surface === 'てく'),
+    {
+      surface: 'てく',
+      headword: 'てく',
+      isKnown: false,
+      isNPlusOneTarget: false,
+      frequencyRank: undefined,
+      jlptLevel: undefined,
+    },
+  );
+  assert.deepEqual(
+    tokenSummary?.find((token) => token.surface === 'れた'),
+    {
+      surface: 'れた',
+      headword: 'れる',
+      isKnown: false,
+      isNPlusOneTarget: false,
+      frequencyRank: undefined,
+      jlptLevel: undefined,
+    },
+  );
+});
+
 test('tokenizeSubtitle excludes default non-independent pos2 from N+1 when JLPT/frequency are disabled', async () => {
  let mecabCalls = 0;
  const result = await tokenizeSubtitle(
@@ -1371,6 +1371,49 @@ test('annotateTokens clears all annotations for standalone auxiliary inflection
  }
 });

+test('annotateTokens clears all annotations for auxiliary-only te-kureru helper spans', () => {
+  const tokens = [
+    makeToken({
+      surface: 'てく',
+      headword: 'てく',
+      reading: 'テク',
+      partOfSpeech: PartOfSpeech.verb,
+      pos1: '助詞|動詞',
+      pos2: '接続助詞|非自立',
+      startPos: 0,
+      endPos: 2,
+      frequencyRank: 140,
+    }),
+    makeToken({
+      surface: 'れた',
+      headword: 'れる',
+      reading: 'レタ',
+      partOfSpeech: PartOfSpeech.verb,
+      pos1: '動詞|助動詞',
+      pos2: '接尾|*',
+      startPos: 2,
+      endPos: 4,
+      frequencyRank: 19,
+    }),
+  ];
+
+  const result = annotateTokens(
+    tokens,
+    makeDeps({
+      isKnownWord: (text) => text === 'てく' || text === 'れる',
+      getJlptLevel: (text) => (text === 'てく' || text === 'れる' ? 'N4' : null),
+    }),
+    { minSentenceWordsForNPlusOne: 1 },
+  );
+
+  for (const token of result) {
+    assert.equal(token.isKnown, false, token.surface);
+    assert.equal(token.isNPlusOneTarget, false, token.surface);
+    assert.equal(token.frequencyRank, undefined, token.surface);
+    assert.equal(token.jlptLevel, undefined, token.surface);
+  }
+});
+
 test('annotateTokens keeps lexical くれる forms eligible for annotation', () => {
  const tokens = [
    makeToken({
@@ -155,7 +155,7 @@ test('prefers the longest dictionary headword across merged segments', () => {
  );
 });

-test('keeps the first headword when later segments are standalone words', () => {
+test('splits trailing grammar endings when later segments are standalone words', () => {
  const parseResults = [
    makeParseItem('scanning-parser', [
      [
@@ -174,10 +174,47 @@ test('keeps the first headword when later segments are standalone words', () =>
    })),
    [
      {
-        surface: '猫です',
-        reading: 'ねこです',
+        surface: '猫',
+        reading: 'ねこ',
        headword: '猫',
      },
+      {
+        surface: 'です',
+        reading: 'です',
+        headword: 'です',
+      },
+    ],
+  );
+});
+
+test('splits trailing ja-nai grammar endings from preceding content', () => {
+  const parseResults = [
+    makeParseItem('scanning-parser', [
+      [
+        { text: 'いる', reading: 'いる', headword: 'いる' },
+        { text: 'じゃない', reading: 'じゃない', headword: 'じゃない' },
+      ],
+    ]),
+  ];
+
+  const tokens = selectYomitanParseTokens(parseResults, () => false, 'headword');
+  assert.deepEqual(
+    tokens?.map((token) => ({
+      surface: token.surface,
+      reading: token.reading,
+      headword: token.headword,
+    })),
+    [
+      {
+        surface: 'いる',
+        reading: 'いる',
+        headword: 'いる',
+      },
+      {
+        surface: 'じゃない',
+        reading: 'じゃない',
+        headword: 'じゃない',
+      },
    ],
  );
 });
@@ -24,6 +24,24 @@ export interface YomitanParseCandidate {
  tokens: MergedToken[];
 }

+const STANDALONE_GRAMMAR_ENDINGS = new Set([
+  'です',
+  'ですか',
+  'ですね',
+  'ですよ',
+  'ですな',
+  'じゃない',
+  'じゃないか',
+  'じゃないね',
+  'じゃないよ',
+  'じゃないな',
+  'じゃないです',
+  'じゃないですか',
+  'じゃないですね',
+  'じゃないですよ',
+  'じゃないですな',
+]);
+
 function isObject(value: unknown): value is Record<string, unknown> {
  return Boolean(value && typeof value === 'object');
 }
@@ -141,6 +159,15 @@ function isKanaOnlyText(text: string): boolean {
  return text.length > 0 && Array.from(text).every((char) => isKanaChar(char));
 }

+function isStandaloneGrammarEndingSegment(segment: YomitanParseSegment): boolean {
+  const surface = segment.text?.trim() ?? '';
+  const headword = extractYomitanHeadword(segment).trim();
+  return (
+    headword.length > 0 &&
+    (STANDALONE_GRAMMAR_ENDINGS.has(surface) || STANDALONE_GRAMMAR_ENDINGS.has(headword))
+  );
+}
+
 function shouldMergeKanaContinuation(
  previousToken: MergedToken | undefined,
  continuationSurface: string,
@@ -186,20 +213,97 @@ export function mapYomitanParseResultItemToMergedTokens(

    let combinedSurface = '';
    let combinedReading = '';
+    let combinedStart = charOffset;
    let firstHeadword = '';
    const expandedHeadwords: string[] = [];

+    const pushToken = (
+      surface: string,
+      reading: string,
+      headword: string,
+      start: number,
+      end: number,
+    ): void => {
+      tokens.push({
+        surface,
+        reading,
+        headword,
+        startPos: start,
+        endPos: end,
+        partOfSpeech: PartOfSpeech.other,
+        pos1: '',
+        isMerged: true,
+        isNPlusOneTarget: false,
+        isKnown: (() => {
+          const matchText = resolveKnownWordText(surface, headword, knownWordMatchMode);
+          return matchText ? isKnownWord(matchText) : false;
+        })(),
+      });
+    };
+
+    const flushCombinedToken = (end: number): void => {
+      if (!combinedSurface) {
+        combinedStart = end;
+        return;
+      }
+
+      const combinedHeadword = selectMergedHeadword(
+        firstHeadword,
+        expandedHeadwords,
+        combinedSurface,
+      );
+      if (!combinedHeadword) {
+        const previousToken = tokens[tokens.length - 1];
+        if (shouldMergeKanaContinuation(previousToken, combinedSurface)) {
+          previousToken.surface += combinedSurface;
+          previousToken.reading += combinedReading;
+          previousToken.endPos = end;
+        }
+      } else {
+        hasDictionaryMatch = true;
+        pushToken(combinedSurface, combinedReading, combinedHeadword, combinedStart, end);
+      }
+
+      combinedSurface = '';
+      combinedReading = '';
+      firstHeadword = '';
+      expandedHeadwords.length = 0;
+      combinedStart = end;
+    };
+
    for (const segment of line) {
      const segmentText = segment.text;
      if (!segmentText || segmentText.length === 0) {
        continue;
      }

+      const segmentStart = charOffset;
+      const segmentEnd = segmentStart + segmentText.length;
+      charOffset = segmentEnd;
      combinedSurface += segmentText;
      if (typeof segment.reading === 'string') {
        combinedReading += segment.reading;
      }
      const segmentHeadword = extractYomitanHeadword(segment);
+      if (isStandaloneGrammarEndingSegment(segment)) {
+        combinedSurface = combinedSurface.slice(0, -segmentText.length);
+        if (typeof segment.reading === 'string') {
+          combinedReading = combinedReading.slice(0, -segment.reading.length);
+        }
+        flushCombinedToken(segmentStart);
+        const grammarHeadword = segmentHeadword || segmentText;
+        hasDictionaryMatch = true;
+        pushToken(
+          segmentText,
+          typeof segment.reading === 'string' ? segment.reading : '',
+          grammarHeadword,
+          segmentStart,
+          segmentEnd,
+        );
+        combinedStart = segmentEnd;
+        continue;
+      }
+
      if (segmentHeadword) {
        if (!firstHeadword) {
          firstHeadword = segmentHeadword;
@@ -210,49 +314,7 @@ export function mapYomitanParseResultItemToMergedTokens(
      }
    }

-    if (!combinedSurface) {
-      continue;
-    }
-
-    const start = charOffset;
-    const end = start + combinedSurface.length;
-    charOffset = end;
-    const combinedHeadword = selectMergedHeadword(
-      firstHeadword,
-      expandedHeadwords,
-      combinedSurface,
-    );
-    if (!combinedHeadword) {
-      const previousToken = tokens[tokens.length - 1];
-      if (shouldMergeKanaContinuation(previousToken, combinedSurface)) {
-        previousToken.surface += combinedSurface;
-        previousToken.reading += combinedReading;
-        previousToken.endPos = end;
-        continue;
-      }
-
-      // No dictionary-backed headword for this merged unit; skip it entirely so
-      // downstream keyboard/frequency/JLPT flows only operate on lookup-backed tokens.
-      continue;
-    }
-    hasDictionaryMatch = true;
-    const headword = combinedHeadword;
-
-    tokens.push({
-      surface: combinedSurface,
-      reading: combinedReading,
-      headword,
-      startPos: start,
-      endPos: end,
-      partOfSpeech: PartOfSpeech.other,
-      pos1: '',
-      isMerged: true,
-      isNPlusOneTarget: false,
-      isKnown: (() => {
-        const matchText = resolveKnownWordText(combinedSurface, headword, knownWordMatchMode);
-        return matchText ? isKnownWord(matchText) : false;
-      })(),
-    });
+    flushCombinedToken(charOffset);
  }

  if (validLineCount === 0 || tokens.length === 0 || !hasDictionaryMatch) {
@@ -84,12 +84,7 @@ const SUBTITLE_ANNOTATION_EXCLUDED_EXPLANATORY_ENDING_THOUGHT_SUFFIXES = [
  'かな',
  'かね',
 ] as const;
-const SUBTITLE_ANNOTATION_EXCLUDED_POLITE_COPULA_SUFFIXES = [
-  'か',
-  'ね',
-  'よ',
-  'な',
-] as const;
+const SUBTITLE_ANNOTATION_EXCLUDED_POLITE_COPULA_SUFFIXES = ['', 'か', 'ね', 'よ', 'な'] as const;
 const SUBTITLE_ANNOTATION_EXCLUDED_JA_NAI_SUFFIXES = [
  '',
  'か',
@@ -129,6 +124,8 @@ const SUBTITLE_ANNOTATION_EXCLUDED_TRAILING_PARTICLE_SUFFIXES = new Set([
 const AUXILIARY_STEM_GRAMMAR_TAIL_POS1 = new Set(['名詞', '助動詞', '助詞']);
 const NON_INDEPENDENT_NOUN_HELPER_TAIL_POS1 = new Set(['助詞', '助動詞']);
 const AUXILIARY_INFLECTION_TRAILING_POS1 = new Set(['助動詞']);
+const AUXILIARY_HELPER_SPAN_POS1 = new Set(['助詞', '助動詞', '動詞']);
+const LEXICAL_VERB_POS2 = new Set(['自立']);
 const STANDALONE_GRAMMAR_PARTICLE_SURFACES = new Set([
  'か',
  'が',
@@ -396,6 +393,27 @@ function isStandaloneAuxiliaryInflectionFragment(token: MergedToken): boolean {
  );
 }

+function isAuxiliaryOnlyHelperSpan(token: MergedToken): boolean {
+  const normalizedSurface = normalizeKana(token.surface);
+  const normalizedHeadword = normalizeKana(token.headword);
+  if (!isKanaOnlyText(normalizedSurface) || !isKanaOnlyText(normalizedHeadword)) {
+    return false;
+  }
+
+  const pos1Parts = splitNormalizedTagParts(normalizePosTag(token.pos1));
+  if (
+    pos1Parts.length === 0 ||
+    !pos1Parts.every((part) => AUXILIARY_HELPER_SPAN_POS1.has(part)) ||
+    !pos1Parts.includes('助詞') ||
+    !pos1Parts.includes('動詞')
+  ) {
+    return false;
+  }
+
+  const pos2Parts = splitNormalizedTagParts(normalizePosTag(token.pos2));
+  return !pos2Parts.some((part) => LEXICAL_VERB_POS2.has(part));
+}
+
 function isStandaloneSuruTeGrammarHelper(token: MergedToken): boolean {
  const normalizedSurface = normalizeKana(token.surface);
  const normalizedHeadword = normalizeKana(token.headword);
@@ -404,7 +422,9 @@ function isStandaloneSuruTeGrammarHelper(token: MergedToken): boolean {
  }

  const pos1Parts = splitNormalizedTagParts(normalizePosTag(token.pos1));
-  return isKanaOnlyText(normalizedSurface) && (pos1Parts.length === 0 || pos1Parts.includes('動詞'));
+  return (
+    isKanaOnlyText(normalizedSurface) && (pos1Parts.length === 0 || pos1Parts.includes('動詞'))
+  );
 }

 function isStandaloneGrammarParticle(token: MergedToken): boolean {
@@ -518,6 +538,10 @@ export function shouldExcludeTokenFromSubtitleAnnotations(
    return true;
  }

+  if (isAuxiliaryOnlyHelperSpan(token)) {
+    return true;
+  }
+
  if (isStandaloneSuruTeGrammarHelper(token)) {
    return true;
  }
@@ -162,6 +162,48 @@ test('mpv main event main deps wire subtitle callbacks without suppression gate'
  assert.equal(typeof deps.setCurrentSubText, 'function');
 });

+test('mpv main event main deps treat managed playback as quit-on-disconnect', () => {
+  const deps = createBuildBindMpvMainEventHandlersMainDepsHandler({
+    appState: {
+      initialArgs: { managedPlayback: true },
+      overlayRuntimeInitialized: false,
+      mpvClient: null,
+      immersionTracker: null,
+      subtitleTimingTracker: null,
+      currentSubText: '',
+      currentSubAssText: '',
+      playbackPaused: null,
+      previousSecondarySubVisibility: false,
+    },
+    getQuitOnDisconnectArmed: () => true,
+    scheduleQuitCheck: () => {},
+    quitApp: () => {},
+    reportJellyfinRemoteStopped: () => {},
+    syncOverlayMpvSubtitleSuppression: () => {},
+    maybeRunAnilistPostWatchUpdate: async () => {},
+    logSubtitleTimingError: () => {},
+    broadcastToOverlayWindows: () => {},
+    onSubtitleChange: () => {},
+    ensureImmersionTrackerInitialized: () => {},
+    updateCurrentMediaPath: () => {},
+    restoreMpvSubVisibility: () => {},
+    resetSubtitleSidebarEmbeddedLayout: () => {},
+    getCurrentAnilistMediaKey: () => null,
+    resetAnilistMediaTracking: () => {},
+    maybeProbeAnilistDuration: () => {},
+    ensureAnilistMediaGuess: () => {},
+    syncImmersionMediaState: () => {},
+    updateCurrentMediaTitle: () => {},
+    resetAnilistMediaGuessState: () => {},
+    reportJellyfinRemoteProgress: () => {},
+    updateSubtitleRenderMetrics: () => {},
+    refreshDiscordPresence: () => {},
+  })();
+
+  assert.equal(deps.hasInitialPlaybackQuitOnDisconnectArg(), true);
+  assert.equal(deps.shouldQuitOnDisconnectWhenOverlayRuntimeInitialized(), true);
+});
+
 test('flushPlaybackPositionOnMediaPathClear ignores disconnected mpv time-pos reads', async () => {
  const recorded: number[] = [];
  const deps = createBuildBindMpvMainEventHandlersMainDepsHandler({
@@ -2,7 +2,11 @@ import type { MergedToken, SubtitleData } from '../../types';

 export function createBuildBindMpvMainEventHandlersMainDepsHandler(deps: {
  appState: {
-    initialArgs?: { jellyfinPlay?: unknown; youtubePlay?: unknown } | null;
+    initialArgs?: {
+      jellyfinPlay?: unknown;
+      managedPlayback?: unknown;
+      youtubePlay?: unknown;
+    } | null;
    overlayRuntimeInitialized: boolean;
    mpvClient: {
      connected?: boolean;
@@ -79,10 +83,14 @@ export function createBuildBindMpvMainEventHandlersMainDepsHandler(deps: {
    reportJellyfinRemoteStopped: () => deps.reportJellyfinRemoteStopped(),
    syncOverlayMpvSubtitleSuppression: () => deps.syncOverlayMpvSubtitleSuppression(),
    hasInitialPlaybackQuitOnDisconnectArg: () =>
-      Boolean(deps.appState.initialArgs?.jellyfinPlay || deps.appState.initialArgs?.youtubePlay),
+      Boolean(
+        deps.appState.initialArgs?.managedPlayback ||
+          deps.appState.initialArgs?.jellyfinPlay ||
+          deps.appState.initialArgs?.youtubePlay,
+      ),
    isOverlayRuntimeInitialized: () => deps.appState.overlayRuntimeInitialized,
    shouldQuitOnDisconnectWhenOverlayRuntimeInitialized: () =>
-      Boolean(deps.appState.initialArgs?.youtubePlay),
+      Boolean(deps.appState.initialArgs?.managedPlayback || deps.appState.initialArgs?.youtubePlay),
    isQuitOnDisconnectArmed: () => deps.getQuitOnDisconnectArmed(),
    scheduleQuitCheck: (callback: () => void) => deps.scheduleQuitCheck(callback),
    isMpvConnected: () => Boolean(deps.appState.mpvClient?.connected),
@@ -36,14 +36,14 @@ function createHarness(options?: {
  };
 }

-test('stats server routing defers to a live background daemon from another process', () => {
+test('stats server routing ignores a live background daemon from another process', () => {
  const { calls, handler } = createHarness({
    state: { pid: 200, port: 7979, startedAtMs: 1 },
    processAlive: true,
  });

-  assert.deepEqual(handler(), { url: 'http://127.0.0.1:7979', source: 'foreign' });
-  assert.deepEqual(calls, ['readBackgroundState', 'isProcessAlive']);
+  assert.deepEqual(handler(), { url: 'http://127.0.0.1:6969', source: 'local' });
+  assert.deepEqual(calls, ['readBackgroundState', 'isProcessAlive', 'startLocalStatsServer']);
 });

 test('stats server routing clears dead daemon state and starts local server', () => {
@@ -14,9 +14,7 @@ function formatStatsServerUrl(port: number): string {
  return `http://127.0.0.1:${port}`;
 }

-export type EnsureStatsServerUrlResult =
-  | { url: string; source: 'foreign' }
-  | { url: string; source: 'local' };
+export type EnsureStatsServerUrlResult = { url: string; source: 'local' };

 export function createEnsureStatsServerUrlHandler(
  deps: EnsureStatsServerUrlDeps,
@@ -29,8 +27,6 @@ export function createEnsureStatsServerUrlHandler(
      deps.removeBackgroundState();
    } else if (!deps.isProcessAlive(state.pid)) {
      deps.removeBackgroundState();
-    } else if (state.pid !== deps.currentPid) {
-      return { url: formatStatsServerUrl(state.port), source: 'foreign' };
    }

    if (!deps.hasLocalStatsServer()) {