Merge origin/main conversation search updates

wenshao · Sep 24, 2026 · Sep 20, 2026 · Sep 20, 2026 · Sep 20, 2026 · Sep 20, 2026
commit 2e424efa8ee875995edf0c363db85a262c0f3e76
diff --git a/packages/web-shell/README.md b/packages/web-shell/README.md
@@ -421,6 +421,9 @@ daemon 参数的完整含义和配置方式见
 | `onAssistantTurnSettled`   | `(event: WebShellAssistantTurnSettledEvent) => void`                                                                                  | daemon 权威终态提交后触发；多个 provider 可能重复上报，宿主按 `(sessionId, promptId)` 去重                                                     |
 | `settings`                 | `WebShellSettingsOptions`                                                                                                             | 可选。控制原生 `/settings` 页面的呈现；见 [原生设置呈现](#原生设置呈现)。                                                                      |
 | `showToolCalls`            | `boolean`                                                                                                                             | 是否展示用户消息旁的工具调用入口；默认 `false`，独立页面设置为 `true`。                                                                        |
+| `modelManagement`          | `WebShellModelManagementOptions`                                                                                                      | 可选。控制 WebShell 内模型新增/删除交互，默认均允许；见 [模型增删交互](#模型增删交互)。                                                        |
+
+移动访问二维码入口由 `header.showMobileAccess?: boolean` 控制，默认隐藏，适用于主聊天和分屏页头。独立入口 `main.tsx` 显式设为 `true`，保留本地 Qwen Code 用户的入口。
 
 宿主可以通过 `onContextUsageOpen?: (sessionId: string) => void` 接管上下文
 详情的打开操作：

diff --git a/packages/web-shell/client/components/TranscriptViewport.test.tsx b/packages/web-shell/client/components/TranscriptViewport.test.tsx
@@ -225,6 +225,66 @@ describe('TranscriptViewport', () => {
       'old',
     );
   });
+  it('keeps an open search and its query when the navigation host changes', async () => {
+    const { store, props, ref } = await setup(true, false, 4);
+    const renderSearch = (hidden = false, sessionKey = 'session') =>
+      act(async () =>
+        root!.render(
+          <ConversationSearch
+            key={sessionKey}
+            threshold={0}
+            messageListRef={ref}
+          >
+            {(trigger) => (
+              <TranscriptViewport
+                {...props}
+                ref={ref}
+                hideSessionTimeline={hidden}
+                timelineAction={trigger}
+              />
+            )}
+          </ConversationSearch>,
+        ),
+      );
+    await renderSearch();
+    const trigger = container!.querySelector<HTMLButtonElement>(
+      'button[aria-label="chat.searchConversation"]',
+    )!;
+    expect(trigger).not.toBeNull();
+    await act(async () => trigger.click());
+    const input = document.querySelector<HTMLInputElement>(
+      'input[type="search"]',
+    )!;
+    await act(async () => {
+      input.focus();
+      Object.getOwnPropertyDescriptor(
+        HTMLInputElement.prototype,
+        'value',
+      )!.set!.call(input, 'typed query');
+      input.dispatchEvent(new Event('input', { bubbles: true }));
+    });
+    expect(input.value).toBe('typed query');
+    await act(async () =>
+      store.configure({ sessionId: 'session', supported: false }),
+    );
+    expect(document.querySelector('[role="dialog"]')).not.toBeNull();
+    expect(
+      document.querySelector<HTMLInputElement>('input[type="search"]')?.value,
+    ).toBe('typed query');
+    expect(document.activeElement).not.toBe(document.body);
+    await renderSearch(true);
+    expect(
+      container!.querySelector('button[aria-label="chat.searchConversation"]'),
+    ).toBeNull();
+    expect(document.querySelector('[role="dialog"]')).not.toBeNull();
+    expect(
+      document.querySelector<HTMLInputElement>('input[type="search"]')?.value,
+    ).toBe('typed query');
+    expect(document.activeElement).not.toBe(document.body);
+    await renderSearch(false, 'other-session');
+    expect(document.querySelector('[role="dialog"]')).toBeNull();
+  });
+
   it.each([0, 3, 4])(
     'requires at least four indexed turns (count=%i)',
     async (count) => {

diff --git a/packages/web-shell/client/components/TranscriptViewport.tsx b/packages/web-shell/client/components/TranscriptViewport.tsx
@@ -526,6 +526,9 @@ export const TranscriptViewport = forwardRef<
               key={viewport.viewKey}
               ref={list}
               messages={viewport.messages}
+              timelineAction={
+                globalNavigation ? undefined : props.timelineAction
+              }
               hideSessionTimeline={
                 historical || globalNavigation || props.hideSessionTimeline
               }