Skip to content

Open-source AI coworkers that each get a computer of their own: a browser, files and tools, with every action decided before it happens and recorded after. Bring any AG-UI agent.

Wait for a composed character before the desktop question box asks (#508)

David McKay19fdcbb7fd5c
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02d1aa49..5b589a4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,12 @@ Newest first. `Unreleased` is what is on `main` and not yet tagged.
## Unreleased
+### The desktop setup's question box waits for a composed character before it asks
+
+Enter confirms a character being typed through an input method (Japanese, Chinese, Korean). On the
+final setup screen that Enter also sent the question, with its last character still unconfirmed. The
+box now waits for the character to be confirmed, the way a chat composer does, and an ordinary Enter
+still asks.
### Revoking a grant with a blank ref or Bot is refused instead of reported as done
`DELETE /api/plugins/grants` checked its query params with truthiness, and a query param is
diff --git a/desktop/src/App.test.tsx b/desktop/src/App.test.tsx
index fc1060d8..daea7ff6 100644
--- a/desktop/src/App.test.tsx
+++ b/desktop/src/App.test.tsx
@@ -1,6 +1,12 @@
import { afterAll, afterEach, beforeAll, expect, mock, test } from "bun:test";
import { GlobalRegistrator } from "@happy-dom/global-registrator";
-import { act, cleanup, render, waitFor } from "@testing-library/react";
+import {
+ act,
+ cleanup,
+ fireEvent,
+ render,
+ waitFor,
+} from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import { StrictMode } from "react";
@@ -1870,3 +1876,30 @@ test("Start credential failures do not expose a restore action", async () => {
),
).toEqual([]);
});
+
+test("the Enter that finishes a composed character does not ask the Bot", async () => {
+ useCompatibleEndpointSetup({});
+ const previous = invokeHandler;
+ invokeHandler = async (command, args) => {
+ if (command === "ask_the_bot") return "42";
+ return previous(command, args);
+ };
+ const view = await enterCompatibleEndpoint("https://models.example/v1");
+ await userEvent.click(view.getByRole("button", { name: "Continue" }));
+ await userEvent.click(view.getByRole("button", { name: "Start OpenBot" }));
+ const question = await view.findByLabelText("Your question");
+ // Keys land on the focused field.
+ await userEvent.click(question);
+
+ // Japanese, Chinese and Korean are typed through an input method, where Enter confirms the
+ // character being built. Chromium marks that keydown `isComposing`; the macOS WebKit webview
+ // sends it after compositionend with key code 229. Neither should send the question.
+ await act(async () => {
+ fireEvent.keyDown(question, { key: "Enter", isComposing: true });
+ fireEvent.keyDown(question, { key: "Enter", keyCode: 229 });
+ });
+
+ expect(invokeCalls.filter((call) => call.command === "ask_the_bot")).toEqual(
+ [],
+ );
+});
diff --git a/desktop/src/Ask.tsx b/desktop/src/Ask.tsx
index 65a6e0ea..9c6cbec3 100644
--- a/desktop/src/Ask.tsx
+++ b/desktop/src/Ask.tsx
@@ -70,7 +70,16 @@ export function Ask({
}}
disabled={asking}
onKeyDown={(event) => {
- if (event.key === "Enter" && !asking) {
+ // Enter also confirms a character being composed through an input method (Japanese,
+ // Chinese, Korean). Asking on that Enter would send the question with its last character
+ // still unconfirmed. Chromium marks that keydown `isComposing`; the macOS WebKit webview
+ // instead sends it after compositionend with key code 229. Wait for either.
+ if (
+ event.key === "Enter" &&
+ !asking &&
+ !event.nativeEvent.isComposing &&
+ event.nativeEvent.keyCode !== 229
+ ) {
ask();
}
}}