refactor: 重複パターン4種を共通ヘルパーに集約

- observer::gji_idle_ms(): 2行の idle 計算を関数化（6箇所削減）
- WindowsPlatform::dispatch_gji_event(): gji_on_event+dispatch_gji_response 4行→1行（5メソッド簡略化）
- Output::on_f22_f21_sent(): borrow_mut+f22+f21 の3行を1行に（probe_io 2箇所）
- KeyInjector::format_vk_run(): VK map+join を関数化（send_vk_runs* 3メソッド共用）

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: cuzic

crates/awase-windows/src/output/key_injector.rs

@@ -227,23 +227,22 @@ impl KeyInjector {
         }
     }
 
+    fn format_vk_run(run: &[(VkCode, bool)]) -> String {
+        run.iter()
+            .map(|&(v, s)| if s { format!("S{v:02X}") } else { format!("{v:02X}") })
+            .join(",")
+    }
+
     /// VK run 分割送信: 同一 VK 連続境界でバッチを分割して IME のオートリピート誤検出を回避する。
     pub(crate) fn send_vk_runs(chars: &[(VkCode, bool)], cold_seq: u32) {
         let runs = Self::split_vk_runs(chars);
         let total_runs = runs.len();
 
         for (run_idx, run) in runs.into_iter().enumerate() {
-            let last_io = crate::tsf::observer::gji_last_io_ms();
-            let run_gji_idle = crate::hook::current_tick_ms().saturating_sub(last_io);
+            let run_gji_idle = crate::tsf::observer::gji_idle_ms();
             log::debug!(
                 "[h1-run] cold={cold_seq} run={run_idx}/{total_runs} gji={run_gji_idle}ms vks=[{}]",
-                run.iter()
-                    .map(|&(v, s)| if s {
-                        format!("S{v:02X}")
-                    } else {
-                        format!("{v:02X}")
-                    })
-                    .join(","),
+                Self::format_vk_run(&run),
             );
             Self::send_vk_run_batch(run, VkMarker::Tsf);
         }
@@ -257,17 +256,10 @@ impl KeyInjector {
         let runs = Self::split_vk_runs(&f2_plus_chars);
         let total_runs = runs.len();
         for (run_idx, run) in runs.into_iter().enumerate() {
-            let last_io = crate::tsf::observer::gji_last_io_ms();
-            let run_gji_idle = crate::hook::current_tick_ms().saturating_sub(last_io);
+            let run_gji_idle = crate::tsf::observer::gji_idle_ms();
             log::debug!(
                 "[h1-run] cold={cold_seq} run={run_idx}/{total_runs} gji={run_gji_idle}ms vks=[{}] (f2-leading)",
-                run.iter()
-                    .map(|&(v, s)| if s {
-                        format!("S{v:02X}")
-                    } else {
-                        format!("{v:02X}")
-                    })
-                    .join(","),
+                Self::format_vk_run(&run),
             );
             Self::send_vk_run_batch(run, VkMarker::Tsf);
         }
@@ -297,17 +289,10 @@ impl KeyInjector {
         let total_runs = runs.len();
 
         for (run_idx, run) in runs.into_iter().enumerate() {
-            let last_io = crate::tsf::observer::gji_last_io_ms();
-            let run_gji_idle = crate::hook::current_tick_ms().saturating_sub(last_io);
+            let run_gji_idle = crate::tsf::observer::gji_idle_ms();
             log::debug!(
                 "[h1-run] cold={cold_seq} run={run_idx}/{total_runs} gji={run_gji_idle}ms vks=[{}] ({leading_label})",
-                run.iter()
-                    .map(|&(v, s)| if s {
-                        format!("S{v:02X}")
-                    } else {
-                        format!("{v:02X}")
-                    })
-                    .join(","),
+                Self::format_vk_run(&run),
             );
             Self::send_vk_run_batch(run, VkMarker::Tsf);
         }

crates/awase-windows/src/output/mod.rs

@@ -313,10 +313,18 @@ impl Output {
             .set(self.ime_mode_focus_gen.get().wrapping_add(1));
     }
 
+    /// VK_IME_OFF → VK_IME_ON の連続送信を ImeModeFsm に通知する。
+    ///
+    /// `send_sacrificial_ime_off_on` / `send_chrome_gji_reinit_and_poll` で使う。
+    pub(crate) fn on_f22_f21_sent(&self) {
+        let mut fsm = self.ime_mode_fsm.borrow_mut();
+        fsm.on_f22_sent();
+        fsm.on_f21_sent();
+    }
+
     /// VK_IME_ON/OFF 送信時に `ImeModeFsm` の belief を即時更新する。
     ///
-    /// `send_chrome_gji_reinit_and_poll` は個別に `on_f22_sent()`/`on_f21_sent()` を呼ぶため、
-    /// このメソッドは通常 IME ON/OFF（`send_engine_state_ime_key` 経由）用。
+    /// 通常 IME ON/OFF（`send_engine_state_ime_key` 経由）用。
     pub(crate) fn on_ime_mode_vk_sent(&self, vk: VkCode) {
         let mut fsm = self.ime_mode_fsm.borrow_mut();
         if vk == crate::vk::VK_IME_ON {

crates/awase-windows/src/output/probe_io.rs

@@ -228,12 +228,7 @@ impl ProbeIo for Output {
             make_key_input_ex(VK_IME_ON, true, IME_KANJI_MARKER),
         ];
         log::debug!("[sacr-warmup] cold={cold_seq} VK_IME_OFF→ON 送信（vim 安全プローブ）");
-        // ImeModeFsm belief を即時更新する。
-        {
-            let mut fsm = self.ime_mode_fsm.borrow_mut();
-            fsm.on_f22_sent();
-            fsm.on_f21_sent();
-        }
+        self.on_f22_f21_sent();
         unsafe {
             SendInput(
                 &inputs,
@@ -335,11 +330,7 @@ impl ProbeIo for Output {
         let _ = crate::win32::send_input_safe(&inputs);
 
         // 2. ImeModeFsm belief を即時更新: VK_IME_OFF → Off, VK_IME_ON → Hiragana。
-        {
-            let mut fsm = self.ime_mode_fsm.borrow_mut();
-            fsm.on_f22_sent();
-            fsm.on_f21_sent();
-        }
+        self.on_f22_f21_sent();
 
         // 3. async IMC ポーリング開始（CHROME_GJI_REINIT_CONFIRM_MS の間、10ms ごとに発行）。
         //    with_app 再入を避けるため spawn_local で defer する。
@@ -534,8 +525,7 @@ where
                             // 診断ログ: IMC_GETCONVERSIONMODE は SendMessageTimeoutW を呼ぶため、
                             // with_app 再入を避けるため async タスクへオフロードする (Step 3)。
                             // ログ出力タイミングが数 ms 遅れるが診断用途のため許容。
-                            let last_io = crate::tsf::observer::gji_last_io_ms();
-                            let gji_idle = crate::hook::current_tick_ms().saturating_sub(last_io);
+                            let gji_idle = crate::tsf::observer::gji_idle_ms();
                             let romaji_owned: String = romaji.clone();
                             let chars_len = chars.len();
                             win32_async::spawn_local(async move {

crates/awase-windows/src/platform.rs

@@ -463,8 +463,7 @@ impl WindowsPlatform {
             crate::tsf::composition_fsm::CompositionEvent::FocusChange { tsf_mode },
             None,
         );
-        let last_io = crate::tsf::observer::gji_last_io_ms();
-        let gji_idle_ms = crate::hook::current_tick_ms().saturating_sub(last_io);
+        let gji_idle_ms = crate::tsf::observer::gji_idle_ms();
         let resp = self.output.gji_on_event(crate::tsf::gji_fsm::GjiEvent::FocusChange {
             injection_mode,
             gji_idle_ms,
@@ -495,20 +494,21 @@ impl WindowsPlatform {
 
     /// IME ON を GjiFsm に通知する（`on_ime_applied(open=true)` から呼ぶ）。
     pub(crate) fn gji_on_ime_on(&mut self, injection_mode: crate::output::types::InjectionMode) {
-        let last_io = crate::tsf::observer::gji_last_io_ms();
-        let gji_idle_ms = crate::hook::current_tick_ms().saturating_sub(last_io);
+        let gji_idle_ms = crate::tsf::observer::gji_idle_ms();
         let resp = self
             .output
             .gji_on_event(crate::tsf::gji_fsm::GjiEvent::ImeOn { injection_mode, gji_idle_ms });
         self.dispatch_gji_response(resp);
     }
 
+    fn dispatch_gji_event(&mut self, event: crate::tsf::gji_fsm::GjiEvent) {
+        let resp = self.output.gji_on_event(event);
+        self.dispatch_gji_response(resp);
+    }
+
     /// IME OFF を GjiFsm に通知する（`on_ime_applied(open=false)` から呼ぶ）。
     pub(crate) fn gji_on_ime_off(&mut self) {
-        let resp = self
-            .output
-            .gji_on_event(crate::tsf::gji_fsm::GjiEvent::ImeOff);
-        self.dispatch_gji_response(resp);
+        self.dispatch_gji_event(crate::tsf::gji_fsm::GjiEvent::ImeOff);
     }
 
     /// TIMER_GJI_LONG_IDLE ハンドラ。LongIdle タイムアウトを GjiFsm に通知する。
@@ -522,21 +522,15 @@ impl WindowsPlatform {
     /// `on_passthrough_key` の PassthroughKey / F2NonTsf や
     /// `mark_cold_raw_tsf`（`step_probe` 経由）から呼ぶ。
     pub(crate) fn gji_on_composition_reset(&mut self) {
-        let resp = self
-            .output
-            .gji_on_event(crate::tsf::gji_fsm::GjiEvent::CompositionReset);
-        self.dispatch_gji_response(resp);
+        self.dispatch_gji_event(crate::tsf::gji_fsm::GjiEvent::CompositionReset);
     }
 
     /// TSF mode で物理 F2 が消費されたことを GjiFsm に通知する（`on_reinject_key` の NativeF2Consumed パス）。
     ///
     /// Medium/Long cold 中は probe が継続（saw_native_f2=true）。Short cold / OnWarm / OnComposing は
     /// CompositionReset 相当として処理される（GjiFsm 側で分岐）。
     pub(crate) fn gji_on_native_f2_consumed(&mut self) {
-        let resp = self
-            .output
-            .gji_on_event(crate::tsf::gji_fsm::GjiEvent::NativeF2Consumed);
-        self.dispatch_gji_response(resp);
+        self.dispatch_gji_event(crate::tsf::gji_fsm::GjiEvent::NativeF2Consumed);
     }
 
     /// GJI candidate SHOW → GjiFsm::StartComposition を dispatch する。
@@ -545,10 +539,7 @@ impl WindowsPlatform {
     /// `advance_tsf_probe` / `send_keys` で `take_pending_start_composition()` が true を返したときに呼ぶ。
     pub(crate) fn gji_on_start_composition(&mut self) {
         log::debug!("[gji-fsm] StartComposition (candidate SHOW)");
-        let resp = self
-            .output
-            .gji_on_event(crate::tsf::gji_fsm::GjiEvent::StartComposition);
-        self.dispatch_gji_response(resp);
+        self.dispatch_gji_event(crate::tsf::gji_fsm::GjiEvent::StartComposition);
     }
 
     /// GJI candidate HIDE → GjiFsm::EndComposition を dispatch する。
@@ -559,10 +550,7 @@ impl WindowsPlatform {
     pub(crate) fn gji_on_end_composition(&mut self) {
         if let Some(epoch) = self.output.gji_current_composition_epoch() {
             log::debug!("[gji-fsm] EndComposition (candidate HIDE) epoch={epoch:?}");
-            let resp = self
-                .output
-                .gji_on_event(crate::tsf::gji_fsm::GjiEvent::EndComposition { epoch });
-            self.dispatch_gji_response(resp);
+            self.dispatch_gji_event(crate::tsf::gji_fsm::GjiEvent::EndComposition { epoch });
         }
     }
 

crates/awase-windows/src/tsf/observer.rs

@@ -333,6 +333,11 @@ pub(crate) fn gji_last_io_ms() -> u64 {
     TSF_OBS.gji_last_io_ms.load(Ordering::Relaxed)
 }
 
+/// 現在時刻と最終 GJI I/O 時刻の差（アイドル時間）を ms で返す。
+pub(crate) fn gji_idle_ms() -> u64 {
+    crate::hook::current_tick_ms().saturating_sub(gji_last_io_ms())
+}
+
 /// GJI プロセスの最終 WriteOperationCount 変化時刻 (ms) を返す。0 = 未観測。live 読み取り。
 ///
 /// 読み書き問わず更新される `gji_last_io_ms` と異なり、書き込みのみを追跡する。