Merge remote-tracking branch 'origin/master-dev' into ji-dev

frontend-web/src/components/workspace/agents/agent-selector.tsx

@@ -93,43 +93,47 @@ export function AgentSelector({
   return (
     <>
       <Dialog open={open} onOpenChange={setOpen}>
-        <DialogTrigger asChild>
-          {iconMode ? (
-            <Tooltip content={iconTooltipLabel}>
-              <Button
-                type="button"
-                variant="ghost"
-                size="icon"
-                disabled={disabled}
-                aria-label={selectedAgent ? `已选择智能体：${triggerLabel}` : "选择智能体"}
-                className={cn(
-                  "relative size-9 rounded-full text-muted-foreground shadow-none hover:bg-muted/60 hover:text-foreground",
-                  selectedAgent && "text-amber-600 hover:text-amber-700",
-                  selectedAgent && iconActiveClassName,
-                  iconButtonClassName,
-                )}
-              >
-                <BotIcon className="size-4" />
-                {selectedAgent && (
-                  <span
-                    role="button"
-                    tabIndex={0}
-                    aria-label="清除已选 agent"
-                    className="absolute -right-1 -top-1 inline-flex size-4 items-center justify-center rounded-full border bg-background text-foreground shadow-sm hover:bg-muted"
-                    onClick={handleClear}
-                    onKeyDown={(e) => {
-                      if (e.key === "Enter" || e.key === " ") {
-                        e.preventDefault();
-                        onAgentChange(null);
-                      }
-                    }}
-                  >
-                    <XIcon className="size-2.5" />
-                  </span>
-                )}
-              </Button>
-            </Tooltip>
-          ) : (
+        {iconMode ? (
+          <Tooltip content={iconTooltipLabel}>
+            <div>
+              <DialogTrigger asChild>
+                <Button
+                  type="button"
+                  variant="ghost"
+                  size="icon"
+                  disabled={disabled}
+                  aria-label={selectedAgent ? `已选择智能体：${triggerLabel}` : "选择智能体"}
+                  className={cn(
+                    "relative size-9 rounded-full text-muted-foreground shadow-none hover:bg-muted/60 hover:text-foreground",
+                    selectedAgent && "text-amber-600 hover:text-amber-700",
+                    selectedAgent && iconActiveClassName,
+                    iconButtonClassName,
+                  )}
+                >
+                  <BotIcon className="size-4" />
+                  {selectedAgent && (
+                    <span
+                      role="button"
+                      tabIndex={0}
+                      aria-label="清除已选 agent"
+                      className="absolute -right-1 -top-1 inline-flex size-4 items-center justify-center rounded-full border bg-background text-foreground shadow-sm hover:bg-muted"
+                      onClick={handleClear}
+                      onKeyDown={(e) => {
+                        if (e.key === "Enter" || e.key === " ") {
+                          e.preventDefault();
+                          onAgentChange(null);
+                        }
+                      }}
+                    >
+                      <XIcon className="size-2.5" />
+                    </span>
+                  )}
+                </Button>
+              </DialogTrigger>
+            </div>
+          </Tooltip>
+        ) : (
+          <DialogTrigger asChild>
             <PromptInputButton
               type="button"
               disabled={disabled}
@@ -167,8 +171,8 @@ export function AgentSelector({
                 </span>
               )}
             </PromptInputButton>
-          )}
-        </DialogTrigger>
+          </DialogTrigger>
+        )}
         <DialogContent className="overflow-hidden p-0 sm:max-w-md">
           <DialogTitle className="sr-only">选择 Agent</DialogTitle>
           <Command className="**:data-[slot=command-input-wrapper]:h-auto">

frontend-web/src/core/plugin-management/domain-agent.test.mjs

@@ -187,4 +187,4 @@ test("unmapped incoming url resets auto-selected agent back to default when ther
       forceDefaultAssistant: true,
     },
   );
-});
+});

frontend-web/src/pages/IframeChatPage.tsx

@@ -707,4 +707,4 @@ export default function IframeChatPage() {
       </ChatBox>
     </ThreadContext.Provider>
   );
-}
+}