Merge branch 'dhk-1' of http://192.168.0.200/knowledge-base-bj/deerflow-server into dhk-1

frontend-web/src/components/workspace/messages/message-list.tsx

@@ -24,6 +24,7 @@ import type { Subtask } from "@/core/tasks";
 import { useUpdateSubtask } from "@/core/tasks/context";
 import type { AgentThreadState } from "@/core/threads";
 import { cn } from "@/lib/utils";
+import { resolveAllowMultiple } from "@/roundtable-planning/lib/clarification";
 
 import { ArtifactFileList } from "../artifacts/artifact-file-list";
 import { StreamingIndicator } from "../streaming-indicator";
@@ -102,7 +103,9 @@ export function MessageList({
     [],
   );
 
-  const handleSubmitAllClarifications = useCallback(async () => {
+  const handleSubmitAllClarifications = useCallback(async (
+    selectionOverrides?: Map<string, ClarificationSelection>,
+  ) => {
     if (pendingClarificationIds.length === 0 || !onClarificationSubmit) {
       return;
     }
@@ -111,7 +114,7 @@ export function MessageList({
       const id = pendingClarificationIds[index]!;
       const message = messages.find((msg) => msg.id === id);
       const payload = message ? getClarificationPayload(message) : null;
-      const selection = clarificationSelections.get(id) ?? {
+      const selection = selectionOverrides?.get(id) ?? clarificationSelections.get(id) ?? {
         selectedIds: [],
         custom: "",
       };
@@ -221,7 +224,12 @@ export function MessageList({
                     }
                     submitting={submittingClarification}
                     canSubmit={hasAnyClarificationAnswer}
-                    onSubmitAll={handleSubmitAllClarifications}
+                    onSubmitAll={(override) => {
+                      const overrides = override
+                        ? new Map([[messageId, override]])
+                        : undefined;
+                      void handleSubmitAllClarifications(overrides);
+                    }}
                   />
                   <MessageTokenUsageList
                     enabled={tokenUsageEnabled}
@@ -412,6 +420,7 @@ type ClarificationPayload = {
   clarification_type?: string;
   options?: ClarificationOption[];
   allow_custom?: boolean;
+  allow_multiple?: boolean;
 };
 
 type ClarificationSelection = {
@@ -600,7 +609,7 @@ function ClarificationCard({
   onSelectionChange: (next: ClarificationSelection) => void;
   submitting: boolean;
   canSubmit: boolean;
-  onSubmitAll: () => void | Promise<void>;
+  onSubmitAll: (override?: ClarificationSelection) => void | Promise<void>;
 }) {
   const payload = getClarificationPayload(message);
 
@@ -624,11 +633,21 @@ function ClarificationCard({
 
   const disabled = !isPending || submitting;
   const multiPending = (pendingCount ?? 0) > 1;
+  const allowMultiple = resolveAllowMultiple(
+    payload.allow_multiple,
+    payload.clarification_type,
+  );
 
-  function toggleOption(optionId: string) {
+  function handleOptionClick(optionId: string) {
     if (disabled) {
       return;
     }
+    if (!allowMultiple) {
+      const next = { selectedIds: [optionId], custom: "" };
+      onSelectionChange(next);
+      void onSubmitAll(next);
+      return;
+    }
     const next = selection.selectedIds.includes(optionId)
       ? selection.selectedIds.filter((id) => id !== optionId)
       : [...selection.selectedIds, optionId];
@@ -666,7 +685,7 @@ function ClarificationCard({
       {options.length > 0 ? (
         <div className="mt-4 grid gap-2">
           <div className="text-muted-foreground text-xs">
-            可多选（再次点击取消选择）
+            {allowMultiple ? "可多选（再次点击取消选择）" : "请选择一项（点击即发送）"}
           </div>
           {options.map((option) => {
             const optionId = option.id || option.label;
@@ -675,10 +694,10 @@ function ClarificationCard({
               <Button
                 key={optionId}
                 type="button"
-                variant={isSelected ? "default" : "outline"}
+                variant={isSelected && allowMultiple ? "default" : "outline"}
                 className="h-auto justify-start whitespace-normal px-3 py-2 text-left"
                 disabled={disabled}
-                onClick={() => toggleOption(optionId)}
+                onClick={() => handleOptionClick(optionId)}
               >
                 <span className="flex min-w-0 flex-1 flex-col items-start gap-1">
                   <span>{option.label}</span>
@@ -695,7 +714,7 @@ function ClarificationCard({
                     </span>
                   ) : null}
                 </span>
-                {isSelected ? (
+                {isSelected && allowMultiple ? (
                   <CheckIcon className="ml-2 h-4 w-4 shrink-0" />
                 ) : null}
               </Button>
@@ -720,10 +739,10 @@ function ClarificationCard({
         </div>
       ) : null}
 
-      {isPending ? (
+      {isPending && (allowMultiple || payload.allow_custom !== false) ? (
         isLastPending ? (
           <div className="mt-3 flex items-center justify-end gap-2">
-            {multiPending ? (
+            {multiPending && allowMultiple ? (
               <span className="text-muted-foreground text-xs">
                 将一起提交以上 {pendingCount} 个问题的回答
               </span>
@@ -735,14 +754,14 @@ function ClarificationCard({
               onClick={() => void onSubmitAll()}
             >
               <SendIcon className="h-4 w-4" />
-              {submitting ? "发送中…" : multiPending ? "全部发送" : "发送回答"}
+              {submitting ? "发送中…" : multiPending && allowMultiple ? "全部发送" : "发送回答"}
             </Button>
           </div>
-        ) : (
+        ) : allowMultiple ? (
           <div className="text-muted-foreground mt-3 text-right text-xs">
             选择后等待最后一题统一提交
           </div>
-        )
+        ) : null
       ) : null}
     </div>
   );