merge: upstream/experimental with citations feature

- Merge upstream changes including image search, tooltips, and UI improvements
- Keep citations feature with inline hover cards
- Resolve conflict in message-list-item.tsx: use upstream img max-width (90%) while preserving citations logic
- Maintain file upload improvements with citations support

Co-authored-by: Cursor <cursoragent@cursor.com>

frontend/src/core/i18n/locales/en-US.ts

@@ -106,6 +106,9 @@ export const enUS: Translations = {
     needYourHelp: "Need your help",
     useTool: (toolName: string) => `Use "${toolName}" tool`,
     searchForRelatedInfo: "Search for related information",
+    searchForRelatedImages: "Search for related images",
+    searchForRelatedImagesFor: (query: string) =>
+      `Search for related images for "${query}"`,
     searchOnWebFor: (query: string) => `Search on the web for "${query}"`,
     viewWebPage: "View web page",
     listFolder: "List folder",

frontend/src/core/i18n/locales/types.ts

@@ -101,6 +101,8 @@ export interface Translations {
     needYourHelp: string;
     useTool: (toolName: string) => string;
     searchForRelatedInfo: string;
+    searchForRelatedImages: string;
+    searchForRelatedImagesFor: (query: string) => string;
     searchOnWebFor: (query: string) => string;
     viewWebPage: string;
     listFolder: string;

frontend/src/core/i18n/locales/zh-CN.ts

@@ -104,6 +104,8 @@ export const zhCN: Translations = {
     needYourHelp: "需要你的协助",
     useTool: (toolName: string) => `使用 “${toolName}” 工具`,
     searchForRelatedInfo: "搜索相关信息",
+    searchForRelatedImages: "搜索相关图片",
+    searchForRelatedImagesFor: (query: string) => `搜索相关图片 “${query}”`,
     searchOnWebFor: (query: string) => `在网络上搜索 “${query}”`,
     viewWebPage: "查看网页",
     listFolder: "列出文件夹",

frontend/src/core/messages/utils.ts

@@ -14,11 +14,14 @@ interface AssistantMessageGroup extends GenericMessageGroup<"assistant"> {}
 
 interface AssistantPresentFilesGroup extends GenericMessageGroup<"assistant:present-files"> {}
 
+interface AssistantClarificationGroup extends GenericMessageGroup<"assistant:clarification"> {}
+
 type MessageGroup =
   | HumanMessageGroup
   | AssistantProcessingGroup
   | AssistantMessageGroup
-  | AssistantPresentFilesGroup;
+  | AssistantPresentFilesGroup
+  | AssistantClarificationGroup;
 
 export function groupMessages<T>(
   messages: Message[],
@@ -38,10 +41,28 @@ export function groupMessages<T>(
         messages: [message],
       });
     } else if (message.type === "tool") {
-      if (
+      // Check if this is a clarification tool message
+      if (isClarificationToolMessage(message)) {
+        // Add to processing group if available (to maintain tool call association)
+        if (
+          lastGroup &&
+          lastGroup.type !== "human" &&
+          lastGroup.type !== "assistant" &&
+          lastGroup.type !== "assistant:clarification"
+        ) {
+          lastGroup.messages.push(message);
+        }
+        // Also create a separate clarification group for prominent display
+        groups.push({
+          id: message.id,
+          type: "assistant:clarification",
+          messages: [message],
+        });
+      } else if (
         lastGroup &&
         lastGroup.type !== "human" &&
-        lastGroup.type !== "assistant"
+        lastGroup.type !== "assistant" &&
+        lastGroup.type !== "assistant:clarification"
       ) {
         lastGroup.messages.push(message);
       } else {
@@ -186,10 +207,15 @@ export function hasToolCalls(message: Message) {
 
 export function hasPresentFiles(message: Message) {
   return (
-    message.type === "ai" && message.tool_calls?.[0]?.name === "present_files"
+    message.type === "ai" &&
+    message.tool_calls?.some((toolCall) => toolCall.name === "present_files")
   );
 }
 
+export function isClarificationToolMessage(message: Message) {
+  return message.type === "tool" && message.name === "ask_clarification";
+}
+
 export function extractPresentFilesFromMessage(message: Message) {
   if (message.type !== "ai" || !hasPresentFiles(message)) {
     return [];