Merge branch 'master' into dhk-1

frontend-web/src/components/assistant-ui/document-upload-popup.tsx

@@ -826,7 +826,13 @@ const DocumentUploadPopupContent: FC<{
                         </Button>
                       </div>
                     )}
-                    {listData.length === 0 && <Empty />}
+                    {isSearching ? (
+                      <div className="flex items-center justify-center py-16">
+                        <Loader2 className="h-8 w-8 animate-spin text-muted-foreground" />
+                      </div>
+                    ) : (
+                      listData.length === 0 && <Empty />
+                    )}
                     {searchType === "human" && (
                       <div className="bg-white p-[10px] grid grid-cols-5 gap-[10px]">
                         {listData.map((item: listDataItem, index: number) => {

frontend-web/src/components/assistant-ui/network-actor.tsx

@@ -545,7 +545,12 @@ export function NetworkActor({ inputValue, searchSpaceId, onSuccess }: NetworkAc
           </div>
         )}
         <div className="p-[10px]">
-          <div className="grid grid-cols-4 gap-[10px] user-list">
+          {isSearching ? (
+            <div className="flex items-center justify-center py-16">
+              <Loader2 className="h-8 w-8 animate-spin text-muted-foreground" />
+            </div>
+          ) : null}
+          <div className={`grid grid-cols-4 gap-[10px] user-list${isSearching ? ' hidden' : ''}`}>
             {userList.map((item, index) => (
               <div key={index} className="user-item p-[10px] relative">
                 <div className="absolute top-[5px] right-[10px]">

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

@@ -32,6 +32,10 @@ interface AgentSelectorProps {
   disabled?: boolean;
   /** 紧凑模式（CM 参考图）：触发器改为灰底胶囊 + 主色机器人图标。 */
   compact?: boolean;
+  /** 图标模式：用于 iframe 等底栏场景，仅显示机器人图标和可选清空按钮。 */
+  triggerVariant?: "default" | "icon";
+  iconButtonClassName?: string;
+  iconActiveClassName?: string;
 }
 
 /**
@@ -48,6 +52,9 @@ export function AgentSelector({
   onAgentChange,
   disabled,
   compact = false,
+  triggerVariant = "default",
+  iconButtonClassName,
+  iconActiveClassName,
 }: AgentSelectorProps) {
   const [open, setOpen] = useState(false);
   const [manageOpen, setManageOpen] = useState(false);
@@ -79,48 +86,84 @@ export function AgentSelector({
   };
 
   const triggerLabel = selectedAgent ? desensitize(selectedAgent.name) : "选择 Agent";
+  const iconMode = triggerVariant === "icon";
 
   return (
     <>
       <Dialog open={open} onOpenChange={setOpen}>
         <DialogTrigger asChild>
-          <PromptInputButton
-            type="button"
-            disabled={disabled}
-            className={cn(
-              "gap-1.5! rounded-full border px-3! shadow-none transition-colors",
-              compact && "rounded-lg px-2.5! py-1! text-[11px] font-medium",
-              compact
-                ? "border-transparent bg-gray-50/60 text-gray-600 hover:bg-gray-100/80 hover:text-gray-800 dark:bg-slate-700/50 dark:text-slate-300 dark:hover:bg-slate-700"
-                : selectedAgent
-                  ? "border-[#d6a868] bg-[#fff3df] text-[#7a5417] hover:bg-[#ffe8c4]"
-                  : "border-[#eee3d5] bg-[#fffaf5] text-[#7e6a57] hover:bg-white dark:border-slate-600 dark:bg-slate-700/50 dark:text-slate-300 dark:hover:bg-slate-700",
-            )}
-          >
-            <BotIcon
-              className={cn("size-3", compact && "text-[var(--primary)]")}
-            />
-            <span className="max-w-[140px] truncate text-xs font-normal">
-              {triggerLabel}
-            </span>
-            {selectedAgent && (
-              <span
-                role="button"
-                tabIndex={0}
-                aria-label="清除已选 agent"
-                className="ml-0.5 inline-flex items-center justify-center rounded-full p-0.5 hover:bg-[#ffd9a7]"
-                onClick={handleClear}
-                onKeyDown={(e) => {
-                  if (e.key === "Enter" || e.key === " ") {
-                    e.preventDefault();
-                    onAgentChange(null);
-                  }
-                }}
-              >
-                <XIcon className="size-3" />
+          {iconMode ? (
+            <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>
+          ) : (
+            <PromptInputButton
+              type="button"
+              disabled={disabled}
+              className={cn(
+                "gap-1.5! rounded-full border px-3! shadow-none transition-colors",
+                compact && "rounded-lg px-2.5! py-1! text-[11px] font-medium",
+                compact
+                  ? "border-transparent bg-gray-50/60 text-gray-600 hover:bg-gray-100/80 hover:text-gray-800 dark:bg-slate-700/50 dark:text-slate-300 dark:hover:bg-slate-700"
+                  : selectedAgent
+                    ? "border-[#d6a868] bg-[#fff3df] text-[#7a5417] hover:bg-[#ffe8c4]"
+                    : "border-[#eee3d5] bg-[#fffaf5] text-[#7e6a57] hover:bg-white dark:border-slate-600 dark:bg-slate-700/50 dark:text-slate-300 dark:hover:bg-slate-700",
+              )}
+            >
+              <BotIcon
+                className={cn("size-3", compact && "text-[var(--primary)]")}
+              />
+              <span className="max-w-[140px] truncate text-xs font-normal">
+                {triggerLabel}
               </span>
-            )}
-          </PromptInputButton>
+              {selectedAgent && (
+                <span
+                  role="button"
+                  tabIndex={0}
+                  aria-label="清除已选 agent"
+                  className="ml-0.5 inline-flex items-center justify-center rounded-full p-0.5 hover:bg-[#ffd9a7]"
+                  onClick={handleClear}
+                  onKeyDown={(e) => {
+                    if (e.key === "Enter" || e.key === " ") {
+                      e.preventDefault();
+                      onAgentChange(null);
+                    }
+                  }}
+                >
+                  <XIcon className="size-3" />
+                </span>
+              )}
+            </PromptInputButton>
+          )}
         </DialogTrigger>
         <DialogContent className="overflow-hidden p-0 sm:max-w-md">
           <DialogTitle className="sr-only">选择 Agent</DialogTitle>

frontend-web/src/components/workspace/settings/account-settings-page.tsx

@@ -7,6 +7,8 @@ import { toast } from "sonner";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { clearStoredAuth, getAccountDisplayName, getStoredAuth } from "@/core/auth";
+import { OptType, writeYLog } from "@/core/log/y-log";
+import { clearYLogToken } from "@/core/log/y-log-token";
 
 import { SettingsSection } from "./settings-section";
 
@@ -40,7 +42,15 @@ export function AccountSettingsPage() {
   const displayName = getAccountDisplayName(auth);
 
   const handleLogout = () => {
+    // 操作日志(Y-Log)：在清除 token1 之前上报登出（此时 token1 还在），keepalive 保证发出。
+    writeYLog({
+      optType: OptType.logout,
+      optDetail: "B1-CM助手-登出",
+      url: "/api/v1/auth/logout",
+      keepalive: true,
+    });
     clearStoredAuth();
+    clearYLogToken();
     // Match the rest of the app's logout flow: blow away the cookie session
     // by hitting the gateway logout endpoint and then forcing a full reload
     // so any cached query state goes too.