refactor(ipc): 模式切换响应统一走 StatusUpdate, 删除 ModeChanged 协议

把 lshift/SystemModeSwitch/LangBar OnClick 三条同步操作的响应类型统一
为 StatusUpdate (自包含完整状态 + iconLabel), 删除半成品 ModeChanged。
理由: ModeChanged 只携带 chineseMode 一个 bit, 任务栏图标 / fullWidth /
punct 等字段必须靠后续 STATE_PUSH 补齐, 中间态导致 "模式对了图标错了"
的视觉不一致; StatusUpdate 一发到位, 响应路径自包含。

C++ 侧统一改造:
- KeyEventSink::ProcessResponse 删 case ResponseType::ModeChanged
- LangBarItemButton::OnClick 改用 StatusUpdate 回应 + UpdateFullStatus
- LangBarItemButton::_MsgWndProc WM_UPDATE_STATUS 改走 TextService::
  UpdateFullStatus (而非本类版本), 顺带同步 _SetConversionMode +
  _SetOpenCloseCompartment, 修复 push pipe 路径下 TSF compartment drift
- TextService::OnChange / HandleCtrlSpaceToggle 三处 ResponseType::
  ModeChanged 改为 StatusUpdate
- IPCClient.cpp 删 CMD_MODE_CHANGED decode 分支
- BinaryProtocol.h 删 CMD_MODE_CHANGED + ResponseType::ModeChanged enum

Go 侧统一改造:
- MessageHandler 接口 HandleToggleMode/HandleSystemModeSwitch 改返回
  (*StatusUpdateData, commitText string)
- coordinator.HandleSystemModeSwitch / HandleToggleMode 同步签名
- server_handler 两个 handler 走 encodeStatusUpdate; CommitOnSwitch
  边路仍走 CommitText 携带 ModeChanged bit, 状态由 push pipe 兜底
- 删 ResponseTypeModeChanged / CmdModeChanged / EncodeModeChanged

保留: STATUS_MODE_CHANGED (push payload flag) / COMMIT_FLAG_MODE_CHANGED
(CommitText payload flag) / KeyEventResult.ModeChanged (InsertText combo
标志), 这些是不同语义的位标志。

Author: huanfeng

wind_input/internal/bridge/deferred_handler.go

@@ -116,11 +116,11 @@ func (d *DeferredHandler) HandleIMEActivated(processID uint32) *StatusUpdateData
 	return d.loadingStatus()
 }
 
-func (d *DeferredHandler) HandleToggleMode() (commitText string, chineseMode bool) {
+func (d *DeferredHandler) HandleToggleMode() (status *StatusUpdateData, commitText string) {
 	if h := d.getHandler(); h != nil {
 		return h.HandleToggleMode()
 	}
-	return "", false
+	return d.loadingStatus(), ""
 }
 
 func (d *DeferredHandler) HandleCapsLockState(on bool) {
@@ -155,11 +155,11 @@ func (d *DeferredHandler) HandleModeNotify(data ModeNotifyData) {
 	}
 }
 
-func (d *DeferredHandler) HandleSystemModeSwitch(chineseMode bool) (commitText string) {
+func (d *DeferredHandler) HandleSystemModeSwitch(chineseMode bool) (status *StatusUpdateData, commitText string) {
 	if h := d.getHandler(); h != nil {
 		return h.HandleSystemModeSwitch(chineseMode)
 	}
-	return ""
+	return d.loadingStatus(), ""
 }
 
 func (d *DeferredHandler) HandleShowContextMenu(screenX, screenY int) {

wind_input/internal/bridge/protocol.go

@@ -10,7 +10,6 @@ const (
 	ResponseTypeClearComposition     ResponseType = "clear_composition"
 	ResponseTypeAck                  ResponseType = "ack"
 	ResponseTypePassThrough          ResponseType = "pass_through" // Key not handled, pass to system
-	ResponseTypeModeChanged          ResponseType = "mode_changed"
 	ResponseTypeStatusUpdate         ResponseType = "status_update"
 	ResponseTypeConsumed             ResponseType = "consumed"
 	ResponseTypeInsertTextWithCursor ResponseType = "insert_text_with_cursor" // 插入文本并定位光标
@@ -71,7 +70,7 @@ type KeyEventResult struct {
 	Type              ResponseType
 	Text              string // For InsertText
 	CaretPos          int    // For UpdateComposition
-	ChineseMode       bool   // For ModeChanged
+	ChineseMode       bool   // New mode (used with InsertText + ModeChanged combo)
 	ModeChanged       bool   // Whether mode was also changed (for InsertText + mode change combo)
 	NewComposition    string // New composition text after commit (inline preedit: actual text; non-inline: empty)
 	HasNewComposition bool   // Whether to restart composition after commit (set for both inline and non-inline when there is remaining input)
@@ -118,16 +117,22 @@ type MessageHandler interface {
 	HandleFocusGained(processID uint32) *StatusUpdateData
 	HandleIMEDeactivated()
 	HandleIMEActivated(processID uint32) *StatusUpdateData
-	HandleToggleMode() (commitText string, chineseMode bool)
+	// HandleToggleMode toggles the input mode. Returns the resulting full status
+	// (含 iconLabel) so the response can be self-contained. commitText carries
+	// pending input when CommitOnSwitch is enabled and we switch out of Chinese.
+	HandleToggleMode() (status *StatusUpdateData, commitText string)
 	HandleCapsLockState(on bool)
 	HandleMenuCommand(command string) *StatusUpdateData
 	HandleClientDisconnected(activeClients int)
 	// Barrier mechanism for async commit
 	HandleCommitRequest(data CommitRequestData) *CommitResultData
 	// Mode notification from TSF (local toggle)
 	HandleModeNotify(data ModeNotifyData)
-	// System mode switch (Ctrl+Space): system has decided the target mode, must follow
-	HandleSystemModeSwitch(chineseMode bool) (commitText string)
+	// HandleSystemModeSwitch handles a TSF-driven mode switch where the system
+	// has *already decided* the target mode (e.g. Ctrl+Space). Go must follow,
+	// not toggle. Returns the resulting full status; commitText set when
+	// CommitOnSwitch fires.
+	HandleSystemModeSwitch(chineseMode bool) (status *StatusUpdateData, commitText string)
 	// Context menu request from TSF (screen coordinates)
 	HandleShowContextMenu(screenX, screenY int)
 	// Selection changed outside of composition (from ITfTextEditSink::OnEndEdit)

wind_input/internal/bridge/server_handler.go

@@ -197,10 +197,6 @@ func (s *Server) handleKeyEvent(payload []byte, clientID int) []byte {
 	case ResponseTypeClearComposition:
 		return s.codec.EncodeClearComposition()
 
-	case ResponseTypeModeChanged:
-		s.logger.Debug("Returning ModeChanged response", "clientID", clientID, "chineseMode", result.ChineseMode)
-		return s.codec.EncodeModeChanged(result.ChineseMode)
-
 	case ResponseTypeStatusUpdate:
 		// 模式切换走这条：自包含 iconLabel，C++ 端 StatusUpdate handler 立刻
 		// UpdateFullStatus → 刷新任务栏图标，不依赖 push pipe。
@@ -349,40 +345,53 @@ func (s *Server) handleCommitRequest(payload []byte, clientID int) []byte {
 func (s *Server) handleToggleMode(clientID int) []byte {
 	s.logger.Info("Toggle mode request from UI", "clientID", clientID)
 
-	// Call handler to toggle mode
-	commitText, chineseMode := s.handler.HandleToggleMode()
+	// 统一架构：Go 决定最终状态后以 StatusUpdate 回应，C++ 端走 UpdateFullStatus
+	// 一并同步内部 mirror + TSF compartments + LangBar UI。
+	status, commitText := s.handler.HandleToggleMode()
 
 	s.logger.Debug("Toggle mode result", "clientID", clientID,
-		"chineseMode", chineseMode, "commitText", commitText)
+		"hasCommit", commitText != "", "hasStatus", status != nil)
 
-	// Return ModeChanged response (with optional commit text if there was pending input)
+	// commitText 路径仍走 CommitText（带 ModeChanged bit）；后续 push pipe 会推送
+	// 完整 status，C++ 端 LangBar 一致性由 push 路径保障。
 	if commitText != "" {
+		chineseMode := false
+		if status != nil {
+			chineseMode = status.ChineseMode
+		}
 		return s.codec.EncodeCommitText(commitText, "", true, chineseMode, false)
 	}
-	return s.codec.EncodeModeChanged(chineseMode)
+	if status == nil {
+		return s.codec.EncodeAck()
+	}
+	return s.encodeStatusUpdate(status)
 }
 
 func (s *Server) handleSystemModeSwitch(payload []byte, clientID int) []byte {
 	if len(payload) < 4 {
 		s.logger.Error("System mode switch payload too short", "clientID", clientID)
-		return s.codec.EncodeModeChanged(false)
+		return s.codec.EncodeAck()
 	}
 
-	// Parse flags (same format as StatusFlags)
+	// Parse flags (same format as StatusFlags). 注意：这是系统已经决定好的目标模式，
+	// Go 必须 follow 而非 toggle。
 	flags := binary.LittleEndian.Uint32(payload[0:4])
 	chineseMode := (flags & ipc.StatusChineseMode) != 0
 
 	s.logger.Info("System mode switch", "clientID", clientID, "targetMode", chineseMode)
 
-	commitText := s.handler.HandleSystemModeSwitch(chineseMode)
+	status, commitText := s.handler.HandleSystemModeSwitch(chineseMode)
 
 	s.logger.Debug("System mode switch result", "clientID", clientID,
-		"chineseMode", chineseMode, "commitText", commitText)
+		"chineseMode", chineseMode, "hasCommit", commitText != "")
 
 	if commitText != "" {
 		return s.codec.EncodeCommitText(commitText, "", true, chineseMode, false)
 	}
-	return s.codec.EncodeModeChanged(chineseMode)
+	if status == nil {
+		return s.codec.EncodeAck()
+	}
+	return s.encodeStatusUpdate(status)
 }
 
 func (s *Server) handleMenuCommand(payload []byte, clientID int) []byte {

wind_input/internal/coordinator/handle_mode.go

@@ -42,14 +42,15 @@ func (c *Coordinator) HandleModeNotify(data bridge.ModeNotifyData) {
 // HandleSystemModeSwitch handles system-initiated mode switch (e.g., Ctrl+Space).
 // Unlike HandleToggleMode, the target mode is decided by the system — Go must follow.
 // Returns commitText if CommitOnSwitch is enabled and there's pending input.
-func (c *Coordinator) HandleSystemModeSwitch(chineseMode bool) (commitText string) {
+func (c *Coordinator) HandleSystemModeSwitch(chineseMode bool) (status *bridge.StatusUpdateData, commitText string) {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
-	// If mode is already the same, nothing to do
+	// If mode is already the same, nothing to do — still return current full status
+	// so caller can echo it back to C++ for any drift recovery.
 	if c.chineseMode == chineseMode {
 		c.logger.Debug("System mode switch: already in target mode", "chineseMode", chineseMode)
-		return ""
+		return c.buildStatusUpdate(), ""
 	}
 
 	// 切换模式 = 短语终止符，通知造词策略（码表自动造词）
@@ -90,11 +91,11 @@ func (c *Coordinator) HandleSystemModeSwitch(chineseMode bool) (commitText strin
 	// Broadcast state to toolbar and all TSF clients
 	c.broadcastState()
 
-	return commitText
+	return c.buildStatusUpdate(), commitText
 }
 
-// HandleToggleMode toggles the input mode and returns the new state
-func (c *Coordinator) HandleToggleMode() (commitText string, chineseMode bool) {
+// HandleToggleMode toggles the input mode and returns the resulting full status.
+func (c *Coordinator) HandleToggleMode() (status *bridge.StatusUpdateData, commitText string) {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
@@ -137,7 +138,7 @@ func (c *Coordinator) HandleToggleMode() (commitText string, chineseMode bool) {
 	// Broadcast state to toolbar and all TSF clients
 	c.broadcastState()
 
-	return commitText, c.chineseMode
+	return c.buildStatusUpdate(), commitText
 }
 
 // HandleCapsLockState shows Caps Lock indicator (A/a) and updates toolbar

wind_input/internal/ipc/binary_codec.go

@@ -326,27 +326,6 @@ func (c *BinaryCodec) EncodeUpdateComposition(text string, caretPos int) []byte
 	return result
 }
 
-// EncodeModeChanged encodes a mode changed response
-// Format: StatusFlags (4 bytes)
-func (c *BinaryCodec) EncodeModeChanged(chineseMode bool) []byte {
-	var flags uint32
-	if chineseMode {
-		flags |= StatusChineseMode
-	}
-	flags |= StatusModeChanged
-
-	header := c.EncodeHeader(CmdModeChanged, 4)
-
-	payload := make([]byte, 4)
-	binary.LittleEndian.PutUint32(payload[0:4], flags)
-
-	result := make([]byte, 0, HeaderSize+4)
-	result = append(result, header...)
-	result = append(result, payload...)
-
-	return result
-}
-
 // EncodeStatusUpdate encodes a full status update response
 // Format: StatusHeader (12 bytes) + keyHash values + trailing UTF-8 icon label
 func (c *BinaryCodec) EncodeStatusUpdate(chineseMode, fullWidth, chinesePunct, toolbarVisible, capsLock bool,

wind_input/internal/ipc/binary_protocol.go

@@ -43,7 +43,6 @@ const (
 	CmdUpdateComposition    uint16 = 0x0102 // Update composition (preedit)
 	CmdClearComposition     uint16 = 0x0103 // Clear composition
 	CmdCommitResult         uint16 = 0x0105 // Commit result (response to COMMIT_REQUEST)
-	CmdModeChanged          uint16 = 0x0201 // Mode changed
 	CmdStatusUpdate         uint16 = 0x0202 // Full status update
 	CmdStatePush            uint16 = 0x0206 // State push (broadcast to all clients)
 	CmdServiceReady         uint16 = 0x0207 // Go service connected push pipe, TSF should sync state

wind_tsf/include/BinaryProtocol.h

@@ -46,7 +46,7 @@ constexpr uint16_t CMD_COMMIT_TEXT        = 0x0101; // Commit text
 constexpr uint16_t CMD_UPDATE_COMPOSITION = 0x0102; // Update composition
 constexpr uint16_t CMD_CLEAR_COMPOSITION  = 0x0103; // Clear composition
 constexpr uint16_t CMD_COMMIT_RESULT      = 0x0105; // Commit result (response to COMMIT_REQUEST)
-constexpr uint16_t CMD_MODE_CHANGED       = 0x0201; // Mode changed
+// 0x0201 (CMD_MODE_CHANGED) removed: 所有模式切换响应统一走 CMD_STATUS_UPDATE
 constexpr uint16_t CMD_STATUS_UPDATE      = 0x0202; // Full status update
 constexpr uint16_t CMD_STATE_PUSH         = 0x0206; // State push (broadcast to all clients)
 constexpr uint16_t CMD_SERVICE_READY      = 0x0207; // Go service connected push pipe, TSF should sync state
@@ -372,7 +372,6 @@ enum class ResponseType
     CommitText,
     UpdateComposition,
     ClearComposition,
-    ModeChanged,
     StatusUpdate,
     SyncHotkeys,
     Consumed,
@@ -398,7 +397,7 @@ struct ParsedResponse
     int caretPos = 0;
     int cursorOffset = 0;  // For InsertTextWithCursor: chars to move left from end
 
-    // For StatusUpdate / ModeChanged
+    // For StatusUpdate
     uint32_t statusFlags = 0;
 
     // Icon label for taskbar display (from Go service, e.g., "中", "英", "A", "拼", "五")

wind_tsf/include/IPCClient.h

@@ -52,7 +52,7 @@ struct ServiceResponse
     std::wstring composition;
     int caretPos = 0;
 
-    // For StatusUpdate / ModeChanged
+    // For StatusUpdate
     uint32_t statusFlags = 0;
 
     // Icon label for taskbar display (from Go service, e.g., "中", "英", "A", "拼", "五")
@@ -149,7 +149,7 @@ class CIPCClient
     BOOL SendModeNotify(bool chineseMode, bool clearInput);
 
     // Send toggle mode request (sync, from UI click)
-    // Go service will toggle mode and return ModeChanged response
+    // Go service will toggle mode and return StatusUpdate response (full state + iconLabel)
     BOOL SendToggleMode(ServiceResponse& response);
 
     // System mode switch (Ctrl+Space): sync request to Go with target mode

wind_tsf/src/IPCClient.cpp

@@ -811,7 +811,7 @@ BOOL CIPCClient::SendSystemModeSwitch(bool chineseMode, ServiceResponse& respons
 
     _LogInfo(L"Sending system_mode_switch (sync): chineseMode=%d", chineseMode);
 
-    // Send sync - wait for response (CommitText or ModeChanged)
+    // Send sync - wait for response (CommitText or StatusUpdate)
     if (!_SendBinaryMessage(CMD_SYSTEM_MODE_SWITCH, &flags, sizeof(flags)))
     {
         return FALSE;
@@ -834,7 +834,7 @@ BOOL CIPCClient::SendToggleMode(ServiceResponse& response)
 
     _LogInfo(L"Sending toggle_mode (sync)");
 
-    // Send sync - wait for ModeChanged response
+    // Send sync - wait for StatusUpdate response (carries full state + iconLabel)
     if (!_SendBinaryMessage(CMD_TOGGLE_MODE, nullptr, 0))
     {
         return FALSE;
@@ -1029,20 +1029,6 @@ BOOL CIPCClient::_ParseResponse(const IpcHeader& header, const std::vector<uint8
         }
         break;
 
-    case CMD_MODE_CHANGED:
-        {
-            response.type = ResponseType::ModeChanged;
-
-            if (payload.size() >= 4)
-            {
-                response.statusFlags = *reinterpret_cast<const uint32_t*>(payload.data());
-                response.chineseMode = (response.statusFlags & STATUS_CHINESE_MODE) != 0;
-            }
-
-            _LogDebug(L"Response: ModeChanged chineseMode=%d", response.chineseMode);
-        }
-        break;
-
     case CMD_STATUS_UPDATE:
         {
             response.type = ResponseType::StatusUpdate;

wind_tsf/src/LangBarItemButton.cpp

@@ -289,7 +289,9 @@ STDAPI CLangBarItemButton::OnClick(TfLBIClick click, POINT pt, const RECT* prcAr
     if (_bKeyboardDisabled)
         return S_OK;
 
-    // Left click: Toggle mode via Go service (all state changes go through Go)
+    // Left click: Toggle mode via Go service (all state changes go through Go).
+    // Go 端以 StatusUpdate 回应（含 iconLabel 完整状态），C++ 端走 UpdateFullStatus
+    // 一并同步 _bChineseMode/_bFullWidth 等 mirror + TSF compartments + LangBar UI。
     if (_pTextService != nullptr)
     {
         CIPCClient* pIPCClient = _pTextService->GetIPCClient();
@@ -298,10 +300,22 @@ STDAPI CLangBarItemButton::OnClick(TfLBIClick click, POINT pt, const RECT* prcAr
             ServiceResponse response;
             if (pIPCClient->SendToggleMode(response))
             {
-                // Apply mode change from Go service response
-                if (response.type == ResponseType::ModeChanged)
+                if (response.type == ResponseType::StatusUpdate)
                 {
-                    _pTextService->SetInputMode(response.chineseMode);
+                    _pTextService->UpdateFullStatus(
+                        response.IsChineseMode(),
+                        response.IsFullWidth(),
+                        response.IsChinesePunct(),
+                        response.IsToolbarVisible(),
+                        response.IsCapsLock(),
+                        response.iconLabel.empty() ? nullptr : response.iconLabel.c_str()
+                    );
+                }
+                else if (response.type == ResponseType::CommitText && !response.text.empty())
+                {
+                    // CommitOnSwitch 边路: 先把 pending 输入 commit，状态由随后到达的 push pipe 同步
+                    _pTextService->CommitText(response.text);
+                    _pTextService->SetInputMode(response.IsChineseMode());
                 }
             }
             // If IPC fails, don't toggle locally - keep state consistent with Go
@@ -679,10 +693,26 @@ LRESULT CALLBACK CLangBarItemButton::_MsgWndProc(HWND hwnd, UINT msg, WPARAM wPa
         if (pThis != nullptr && pData != nullptr)
         {
             WIND_LOG_DEBUG(L"MsgWndProc: Processing WM_UPDATE_STATUS\n");
-            // Call UpdateFullStatus on the UI thread (with icon label from Go service)
-            pThis->UpdateFullStatus(pData->bChineseMode, pData->bFullWidth,
-                                     pData->bChinesePunct, pData->bToolbarVisible, pData->bCapsLock,
-                                     pData->iconLabel[0] != L'\0' ? pData->iconLabel : nullptr);
+            // 走 TextService::UpdateFullStatus 而非本类的 UpdateFullStatus —— 前者会
+            // 顺带 _SetOpenCloseCompartment + _SetConversionMode 同步 TSF 全局 compartments,
+            // 否则 push pipe 推过来的状态变更会让 _bChineseMode 与 TSF 系统 compartment
+            // 出现 drift, 表现为 Ctrl+Space 失效 / 任务栏图标不刷新。
+            // TextService::UpdateFullStatus 内部会 cascade 调本类的 UpdateFullStatus，
+            // 因此 LangBar UI 仍然会被刷新。
+            if (pThis->_pTextService != nullptr)
+            {
+                pThis->_pTextService->UpdateFullStatus(
+                    pData->bChineseMode, pData->bFullWidth,
+                    pData->bChinesePunct, pData->bToolbarVisible, pData->bCapsLock,
+                    pData->iconLabel[0] != L'\0' ? pData->iconLabel : nullptr);
+            }
+            else
+            {
+                // Fallback: 没有 TextService 时只刷新 LangBar UI
+                pThis->UpdateFullStatus(pData->bChineseMode, pData->bFullWidth,
+                                         pData->bChinesePunct, pData->bToolbarVisible, pData->bCapsLock,
+                                         pData->iconLabel[0] != L'\0' ? pData->iconLabel : nullptr);
+            }
         }
 
         // Free the data allocated by sender