fix(ui): preserve session picker on empty search blur

ryan4559 · claude · ryan4559 · commit 6c55ff0535ab · 2026-05-28T12:33:13.000Z
Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/ui/src/ui/chat/session-controls.ts b/ui/src/ui/chat/session-controls.ts
@@ -594,7 +594,11 @@ function renderChatSessionPickerPopover(
                 void applyChatSessionPickerSearch(state);
               }
             }}
-            @blur=${() => void applyChatSessionPickerSearch(state)}
+            @blur=${() => {
+              if (normalizeOptionalString(state.chatSessionPickerQuery)) {
+                void applyChatSessionPickerSearch(state);
+              }
+            }}
           />
         </label>
         <button
diff --git a/ui/src/ui/views/chat.test.ts b/ui/src/ui/views/chat.test.ts
@@ -1433,6 +1433,92 @@ describe("chat session controls", () => {
     });
   });
 
+  it("does not destroy picker result when blurring an initially empty search input", async () => {
+    const { state, request } = createChatHeaderState();
+    state.sessionsIncludeGlobal = false;
+    state.sessionsIncludeUnknown = false;
+    const container = document.createElement("div");
+    render(renderChatSessionSelect(state), container);
+
+    container.querySelector<HTMLButtonElement>('button[data-chat-session-select="true"]')!.click();
+    await vi.waitFor(() => expect(state.chatSessionPickerResult).not.toBeNull());
+    render(renderChatSessionSelect(state), container);
+    const pickerResultBefore = state.chatSessionPickerResult;
+    const optionsBefore = container.querySelectorAll(
+      'button[data-chat-session-picker-option="true"]',
+    );
+    expect(optionsBefore.length).toBeGreaterThan(0);
+
+    const input = container.querySelector<HTMLInputElement>(
+      'input[data-chat-session-picker-search="true"]',
+    );
+    expect(input!.value).toBe("");
+    const searchCallsBefore = request.mock.calls.filter(
+      ([method]) => method === "sessions.list",
+    ).length;
+
+    input!.dispatchEvent(new FocusEvent("blur", { bubbles: false }));
+    render(renderChatSessionSelect(state), container);
+
+    expect(state.chatSessionPickerResult).toBe(pickerResultBefore);
+    expect(state.chatSessionPickerOpen).toBe(true);
+    const optionsAfter = container.querySelectorAll(
+      'button[data-chat-session-picker-option="true"]',
+    );
+    expect(optionsAfter.length).toBe(optionsBefore.length);
+    const searchCallsAfter = request.mock.calls.filter(
+      ([method]) => method === "sessions.list",
+    ).length;
+    expect(searchCallsAfter).toBe(searchCallsBefore);
+  });
+
+  it("session option click still works after blurring an empty search input", async () => {
+    const { state } = createChatHeaderState();
+    state.sessionsIncludeGlobal = false;
+    state.sessionsIncludeUnknown = false;
+    state.sessionsResult = createSessionsResultFromRows([
+      { key: "main", kind: "direct", label: "Main", updatedAt: 2 },
+      { key: "agent:main:work", kind: "direct", label: "Work", updatedAt: 1 },
+    ]);
+    const request = vi.fn((method: string) => {
+      if (method === "sessions.list") {
+        return Promise.resolve(
+          createSessionsResultFromRows([
+            { key: "main", kind: "direct", label: "Main", updatedAt: 2 },
+            { key: "agent:main:work", kind: "direct", label: "Work", updatedAt: 1 },
+          ]),
+        );
+      }
+      throw new Error(`Unexpected request: ${method}`);
+    });
+    state.client = { request } as unknown as GatewayBrowserClient;
+    const onSwitchSession = vi.fn();
+    const container = document.createElement("div");
+    render(renderChatSessionSelect(state, onSwitchSession), container);
+
+    container.querySelector<HTMLButtonElement>('button[data-chat-session-select="true"]')!.click();
+    await vi.waitFor(() => expect(state.chatSessionPickerResult).not.toBeNull());
+    render(renderChatSessionSelect(state, onSwitchSession), container);
+
+    const input = container.querySelector<HTMLInputElement>(
+      'input[data-chat-session-picker-search="true"]',
+    );
+    expect(input!.value).toBe("");
+    input!.dispatchEvent(new FocusEvent("blur", { bubbles: false }));
+    render(renderChatSessionSelect(state, onSwitchSession), container);
+
+    const options = container.querySelectorAll<HTMLButtonElement>(
+      'button[data-chat-session-picker-option="true"]',
+    );
+    const target = [...options].find(
+      (button) => button.dataset.sessionKey && button.dataset.sessionKey !== state.sessionKey,
+    );
+    expect(target).toBeTruthy();
+    target!.click();
+
+    expect(onSwitchSession).toHaveBeenCalledWith(state, target!.dataset.sessionKey);
+  });
+
   it("clears applied chat session picker search when the input is cleared", async () => {
     const { state } = createChatHeaderState();
     state.sessionsIncludeGlobal = false;
