Skip to content
Python

fix: keep search open during IME confirmation

Akash Pathakba2d8393d006
diff --git a/surfaces/gui/src/components/SearchModal.test.tsx b/surfaces/gui/src/components/SearchModal.test.tsx
new file mode 100644
index 00000000..4dbd301d
--- /dev/null
+++ b/surfaces/gui/src/components/SearchModal.test.tsx
@@ -0,0 +1,47 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { cleanup, fireEvent, render, screen } from "@testing-library/react";
+import type { SessionInfo } from "../types";
+import { SearchModal } from "./SearchModal";
+
+const sessions: SessionInfo[] = [
+ {
+ session_id: "s1",
+ title: "Beijing launch notes",
+ workspace: "",
+ agent: "chat",
+ model: "gpt-5.6-sol",
+ mode: "interactive",
+ updated_at: "2026-07-25T10:00:00Z",
+ messages: 2,
+ },
+];
+
+afterEach(cleanup);
+
+describe("SearchModal keyboard selection", () => {
+ it("does not open a chat when Enter confirms an active IME composition", () => {
+ const onSelect = vi.fn();
+ const onClose = vi.fn();
+ render(<SearchModal sessions={sessions} onSelect={onSelect} onClose={onClose} />);
+
+ const input = screen.getByPlaceholderText("Search chats");
+ fireEvent.change(input, { target: { value: "北京" } });
+ fireEvent.keyDown(input, { key: "Enter", isComposing: true });
+ fireEvent.keyDown(input, { key: "Enter", keyCode: 229 });
+
+ expect(onSelect).not.toHaveBeenCalled();
+ expect(onClose).not.toHaveBeenCalled();
+ expect((input as HTMLInputElement).value).toBe("北京");
+ });
+
+ it("still opens the highlighted chat on a normal Enter", () => {
+ const onSelect = vi.fn();
+ const onClose = vi.fn();
+ render(<SearchModal sessions={sessions} onSelect={onSelect} onClose={onClose} />);
+
+ fireEvent.keyDown(screen.getByPlaceholderText("Search chats"), { key: "Enter" });
+
+ expect(onSelect).toHaveBeenCalledWith("s1", "", "chat");
+ expect(onClose).toHaveBeenCalledOnce();
+ });
+});
diff --git a/surfaces/gui/src/components/SearchModal.tsx b/surfaces/gui/src/components/SearchModal.tsx
index ebb59d95..619c0296 100644
--- a/surfaces/gui/src/components/SearchModal.tsx
+++ b/surfaces/gui/src/components/SearchModal.tsx
@@ -63,6 +63,10 @@ export function SearchModal({
};
const onKey = (e: React.KeyboardEvent) => {
+ // Enter confirms the highlighted candidate while a CJK IME is composing. Let the input
+ // method handle that keystroke instead of opening the highlighted chat and closing search.
+ // keyCode 229 covers older WebKit and Windows IMEs that report "being processed".
+ if (e.nativeEvent.isComposing || e.keyCode === 229) return;
if (e.key === "Escape") {
e.preventDefault();
onClose();