fix: preserve composition across input mode switches

Author: ensan-hcl

Core/Sources/ConverterServer/main.swift

@@ -326,7 +326,6 @@ private final class ConverterServer: NSObject, ConverterServerXPCProtocol, @unch
             submitSelectedCandidate(manager: manager, leftSideContext: request.leftSideContext, effects: &effects)
             manager.requestResettingSelection()
         case .selectInputLanguage(let language):
-            manager.stopComposition()
             inputLanguage = language
             effects.append(.switchInputLanguage(language))
         case .commitMarkedTextAndSelectInputLanguage(let language):

Core/Tests/CoreTests/InputUtilsTests/ControlShortcutRoutingTests.swift

@@ -265,6 +265,54 @@ private func makeControlEvent(
     }
 }
 
+@Test func testEisuKeepsCompositionWhenSwitchingToEnglish() {
+    let event = makeControlEvent(
+        logicalKey: nil,
+        characters: nil,
+        modifiers: [],
+        keyCode: 102
+    )
+    let composingStates: [InputState] = [.composing, .previewing, .replaceSuggestion]
+    for state in composingStates {
+        let (action, callback) = state.event(
+            eventCore: event,
+            userAction: .英数,
+            inputLanguage: .japanese,
+            liveConversionEnabled: false,
+            enableDebugWindow: false,
+            enableSuggestion: false
+        )
+        guard case .selectInputLanguage(.english) = action, case .fallthrough = callback else {
+            Issue.record("Expected Eisu in \(state) to keep composition while switching, got \(action), \(callback)")
+            return
+        }
+    }
+}
+
+@Test func testKanaDoesNotDropJapaneseComposition() {
+    let event = makeControlEvent(
+        logicalKey: nil,
+        characters: nil,
+        modifiers: [],
+        keyCode: 104
+    )
+    let composingStates: [InputState] = [.composing, .previewing, .selecting, .replaceSuggestion]
+    for state in composingStates {
+        let (action, callback) = state.event(
+            eventCore: event,
+            userAction: .かな,
+            inputLanguage: .japanese,
+            liveConversionEnabled: false,
+            enableDebugWindow: false,
+            enableSuggestion: false
+        )
+        guard case .selectInputLanguage(.japanese) = action, case .fallthrough = callback else {
+            Issue.record("Expected Kana in Japanese \(state) to keep composition, got \(action), \(callback)")
+            return
+        }
+    }
+}
+
 @Test func testNonModifierUnknownStillFallsThroughDuringComposing() {
     // Ctrlを伴わない.unknownは従来通りfallthroughされる（既存挙動の回帰防止）
     let bareEvent = makeControlEvent(

azooKeyMac/InputController/azooKeyMacInputController.swift

@@ -241,7 +241,6 @@ class azooKeyMacInputController: IMKInputController, NSMenuItemValidation { // s
                 if self.inputLanguage == .japanese {
                     self.inputLanguage = .english
                     self.segmentsManager.stopJapaneseInput()
-                    self.discardConverterServerComposition()
                     self.refreshCandidateWindow()
                     self.refreshPredictionWindow()
                 }
@@ -509,7 +508,6 @@ class azooKeyMacInputController: IMKInputController, NSMenuItemValidation { // s
         case .english:
             client.selectMode("dev.ensan.inputmethod.azooKeyMac.Roman")
             self.segmentsManager.stopJapaneseInput()
-            self.discardConverterServerComposition()
         case .japanese:
             client.selectMode("dev.ensan.inputmethod.azooKeyMac.Japanese")
         }

azooKeyMac/Windows/ConfigWindow.swift

@@ -65,6 +65,10 @@ struct ConfigWindow: View {
     }
 
     private var azooKeyApplicationSupportDirectoryURL: URL {
+        AppGroup.applicationSupportDirectoryURL()
+    }
+
+    private var legacyAzooKeyApplicationSupportDirectoryURL: URL {
         if #available(macOS 13, *) {
             URL.applicationSupportDirectory
                 .appending(path: "azooKey", directoryHint: .isDirectory)
@@ -80,6 +84,12 @@ struct ConfigWindow: View {
         )
     }
 
+    private var legacyDebugTypoCorrectionModelDirectoryURL: URL {
+        DebugTypoCorrectionWeights.modelDirectoryURL(
+            azooKeyApplicationSupportDirectoryURL: self.legacyAzooKeyApplicationSupportDirectoryURL
+        )
+    }
+
     private var debugTypoCorrectionStatusText: String {
         if self.debugTypoCorrectionDownloadInProgress {
             return "ダウンロード中..."
@@ -97,8 +107,13 @@ struct ConfigWindow: View {
     @MainActor
     private func refreshDebugTypoCorrectionState() async {
         let modelDirectoryURL = self.debugTypoCorrectionModelDirectoryURL
-        let state = await Task.detached(priority: .utility) {
-            DebugTypoCorrectionWeights.state(modelDirectoryURL: modelDirectoryURL)
+        let legacyModelDirectoryURL = self.legacyDebugTypoCorrectionModelDirectoryURL
+        let state = await Task.detached(priority: .utility) { () -> DebugTypoCorrectionState in
+            Self.migrateLegacyDebugTypoCorrectionWeightsIfNeeded(
+                from: legacyModelDirectoryURL,
+                to: modelDirectoryURL
+            )
+            return DebugTypoCorrectionWeights.state(modelDirectoryURL: modelDirectoryURL)
         }.value
         self.debugTypoCorrectionState = state
         if state != .failed {
@@ -136,6 +151,29 @@ struct ConfigWindow: View {
         }
     }
 
+    nonisolated private static func migrateLegacyDebugTypoCorrectionWeightsIfNeeded(from sourceURL: URL, to targetURL: URL) {
+        guard sourceURL.standardizedFileURL != targetURL.standardizedFileURL else {
+            return
+        }
+        guard !DebugTypoCorrectionWeights.hasRequiredWeightFiles(modelDirectoryURL: targetURL),
+              DebugTypoCorrectionWeights.hasRequiredWeightFiles(modelDirectoryURL: sourceURL) else {
+            return
+        }
+        do {
+            let fileManager = FileManager.default
+            try fileManager.createDirectory(
+                at: targetURL.deletingLastPathComponent(),
+                withIntermediateDirectories: true
+            )
+            if fileManager.fileExists(atPath: targetURL.path) {
+                try fileManager.removeItem(at: targetURL)
+            }
+            try fileManager.copyItem(at: sourceURL, to: targetURL)
+        } catch {
+            // The status check below will surface a notDownloaded/failed state.
+        }
+    }
+
     private func openAzooKeyDataDirectoryInFinder() {
         do {
             try FileManager.default.createDirectory(