@yumiai/chat-widget 0.1.0 → 0.1.2

package/dist/index.d.cts

@@ -139,6 +139,8 @@ interface Round {
     plan?: TaskPlan;
     messages: AggregatedMessage[];
     topPosition?: number;
+    /** 本轮次内已收到 agent_end 的 agent_instance_id 集合，与 notification_turns 的 agent start/stop 对齐，用于子 Agent 卡片「已完成」判断 */
+    endedAgentInstanceIds?: Set<number>;
 }
 type ExecutionStatus = 'idle' | 'running' | 'compressing' | 'completed' | 'error';
 interface ChatWidgetConfig {
@@ -273,6 +275,10 @@ interface ChildAgentCardProps {
     config?: ChatWidgetConfig;
     defaultExpanded?: boolean;
     parentTaskPurpose?: string;
+    /** 本轮次已收到 agent_end 的 agent_instance_id（与 notification_turns 对齐），有则优先据此显示「已完成」 */
+    endedAgentInstanceIds?: Set<number>;
+    /** 本轮次全部消息，用于判断该 agent 是否有未完成的工具（子 agent 的 MCP 消息可能挂在别的 parent 下，不在此卡片的 children 里） */
+    allRoundMessages?: AggregatedMessage[];
 }
 interface PlanCardProps {
     plan: TaskPlan;
@@ -331,6 +337,8 @@ declare function useSSE(options: UseSSEOptions): UseSSEReturn;
 interface MessageAggregatorState {
     rounds: Map<string, Round>;
     currentInteractionId: string | null;
+    /** 每轮次已收到 agent_end 的 agent_instance_id，与 notification_turns 的 turn_type=agent_end 对齐 */
+    endedAgentInstanceIdsByRound: Map<string, Set<number>>;
 }
 interface UseMessageAggregatorReturn {
     state: MessageAggregatorState;

package/dist/index.d.ts

@@ -139,6 +139,8 @@ interface Round {
     plan?: TaskPlan;
     messages: AggregatedMessage[];
     topPosition?: number;
+    /** 本轮次内已收到 agent_end 的 agent_instance_id 集合，与 notification_turns 的 agent start/stop 对齐，用于子 Agent 卡片「已完成」判断 */
+    endedAgentInstanceIds?: Set<number>;
 }
 type ExecutionStatus = 'idle' | 'running' | 'compressing' | 'completed' | 'error';
 interface ChatWidgetConfig {
@@ -273,6 +275,10 @@ interface ChildAgentCardProps {
     config?: ChatWidgetConfig;
     defaultExpanded?: boolean;
     parentTaskPurpose?: string;
+    /** 本轮次已收到 agent_end 的 agent_instance_id（与 notification_turns 对齐），有则优先据此显示「已完成」 */
+    endedAgentInstanceIds?: Set<number>;
+    /** 本轮次全部消息，用于判断该 agent 是否有未完成的工具（子 agent 的 MCP 消息可能挂在别的 parent 下，不在此卡片的 children 里） */
+    allRoundMessages?: AggregatedMessage[];
 }
 interface PlanCardProps {
     plan: TaskPlan;
@@ -331,6 +337,8 @@ declare function useSSE(options: UseSSEOptions): UseSSEReturn;
 interface MessageAggregatorState {
     rounds: Map<string, Round>;
     currentInteractionId: string | null;
+    /** 每轮次已收到 agent_end 的 agent_instance_id，与 notification_turns 的 turn_type=agent_end 对齐 */
+    endedAgentInstanceIdsByRound: Map<string, Set<number>>;
 }
 interface UseMessageAggregatorReturn {
     state: MessageAggregatorState;

package/dist/index.js

@@ -55,7 +55,8 @@ function extractTaskPurposeFromPreview(preview) {
 function useMessageAggregator() {
   const [state, setState] = useState({
     rounds: /* @__PURE__ */ new Map(),
-    currentInteractionId: null
+    currentInteractionId: null,
+    endedAgentInstanceIdsByRound: /* @__PURE__ */ new Map()
   });
   const [todoMap, setTodoMap] = useState(/* @__PURE__ */ new Map());
   const todoMapRef = useRef(/* @__PURE__ */ new Map());
@@ -65,6 +66,7 @@ function useMessageAggregator() {
   const roundIndexRef = useRef(/* @__PURE__ */ new Map());
   const processedChunksRef = useRef(/* @__PURE__ */ new Set());
   const callBatchToRoundRef = useRef(/* @__PURE__ */ new Map());
+  const endedAgentInstanceIdsByRoundRef = useRef(/* @__PURE__ */ new Map());
   const parsePlan = useCallback((content) => {
     try {
       const parsed = JSON.parse(content);
@@ -206,6 +208,18 @@ function useMessageAggregator() {
       } else if (!existingRoundForBatch) {
         callBatchToRoundRef.current.set(call_batch_id, interaction_id);
       }
+      if (msg.notification_type === "agent_end") {
+        const iid = interaction_id;
+        const aid = msg.agent_instance_id;
+        if (iid != null && aid != null) {
+          const prev = endedAgentInstanceIdsByRoundRef.current;
+          const set = new Set(prev.get(iid) || []);
+          set.add(aid);
+          endedAgentInstanceIdsByRoundRef.current = new Map(prev).set(iid, set);
+        }
+        latestInteractionId = interaction_id;
+        continue;
+      }
       let round = roundIndexRef.current.get(interaction_id);
       if (!round) {
         round = {
@@ -353,9 +367,14 @@ function useMessageAggregator() {
     }
     setState(() => {
       const newRounds = new Map(roundIndexRef.current);
+      const endedByRound = endedAgentInstanceIdsByRoundRef.current;
+      const endedAgentInstanceIdsByRound = new Map(
+        [...endedByRound.entries()].map(([k, v]) => [k, new Set(v)])
+      );
       return {
         rounds: newRounds,
-        currentInteractionId: latestInteractionId
+        currentInteractionId: latestInteractionId,
+        endedAgentInstanceIdsByRound
       };
     });
     if (todoMapChanged) {
@@ -370,8 +389,12 @@ function useMessageAggregator() {
     }
   }, [flushUpdates]);
   const getRoundsList = useCallback(() => {
-    return Array.from(state.rounds.values()).sort((a, b) => a.index - b.index);
-  }, [state.rounds]);
+    const endedByRound = state.endedAgentInstanceIdsByRound;
+    return Array.from(state.rounds.values()).map((r) => ({
+      ...r,
+      endedAgentInstanceIds: endedByRound.get(r.interactionId) || /* @__PURE__ */ new Set()
+    })).sort((a, b) => a.index - b.index);
+  }, [state.rounds, state.endedAgentInstanceIdsByRound]);
   const getCurrentRound = useCallback(() => {
     if (!state.currentInteractionId) return null;
     return state.rounds.get(state.currentInteractionId) || null;
@@ -391,7 +414,8 @@ function useMessageAggregator() {
       newRounds.set(interactionId, round);
       return {
         rounds: newRounds,
-        currentInteractionId: interactionId
+        currentInteractionId: interactionId,
+        endedAgentInstanceIdsByRound: prevState.endedAgentInstanceIdsByRound
       };
     });
   }, []);
@@ -400,6 +424,7 @@ function useMessageAggregator() {
     messageIndexRef.current.clear();
     callBatchToRoundRef.current.clear();
     processedChunksRef.current.clear();
+    endedAgentInstanceIdsByRoundRef.current.clear();
     const newRounds = /* @__PURE__ */ new Map();
     for (const round of rounds) {
       newRounds.set(round.interactionId, round);
@@ -412,7 +437,7 @@ function useMessageAggregator() {
       }
     }
     const lastId = rounds.length > 0 ? rounds[rounds.length - 1].interactionId : null;
-    setState({ rounds: newRounds, currentInteractionId: lastId });
+    setState({ rounds: newRounds, currentInteractionId: lastId, endedAgentInstanceIdsByRound: /* @__PURE__ */ new Map() });
   }, []);
   const finalizeRound = useCallback((interactionId) => {
     const round = roundIndexRef.current.get(interactionId);
@@ -428,9 +453,11 @@ function useMessageAggregator() {
       }
     }
     if (changed) {
+      const endedByRound = endedAgentInstanceIdsByRoundRef.current;
       setState(() => ({
         rounds: new Map(roundIndexRef.current),
-        currentInteractionId: interactionId
+        currentInteractionId: interactionId,
+        endedAgentInstanceIdsByRound: new Map([...endedByRound.entries()].map(([k, v]) => [k, new Set(v)]))
       }));
     }
   }, []);
@@ -440,6 +467,7 @@ function useMessageAggregator() {
     roundIndexRef.current.clear();
     processedChunksRef.current.clear();
     callBatchToRoundRef.current.clear();
+    endedAgentInstanceIdsByRoundRef.current.clear();
     todoMapRef.current.clear();
     if (rafId.current) {
       cancelAnimationFrame(rafId.current);
@@ -447,7 +475,8 @@ function useMessageAggregator() {
     }
     setState({
       rounds: /* @__PURE__ */ new Map(),
-      currentInteractionId: null
+      currentInteractionId: null,
+      endedAgentInstanceIdsByRound: /* @__PURE__ */ new Map()
     });
     setTodoMap(/* @__PURE__ */ new Map());
   }, []);
@@ -2219,7 +2248,7 @@ var ArtifactCard = ({ artifact, onClick }) => {
 var MessageContent_default = MessageContent;
 
 // src/components/ChildAgentCard.tsx
-import { useState as useState10, useRef as useRef5, useEffect as useEffect3 } from "react";
+import { useState as useState10, useRef as useRef5, useEffect as useEffect3, useMemo as useMemo4 } from "react";
 import { jsx as jsx18, jsxs as jsxs18 } from "react/jsx-runtime";
 var ChildAgentCard = ({
   message,
@@ -2228,14 +2257,25 @@ var ChildAgentCard = ({
   config,
   onArtifactClick,
   defaultExpanded = false,
-  parentTaskPurpose
+  parentTaskPurpose,
+  endedAgentInstanceIds,
+  allRoundMessages
 }) => {
   const [isExpanded, setIsExpanded] = useState10(defaultExpanded);
   const contentRef = useRef5(null);
-  const hasActiveContent = children.some(
+  const allMessages = useMemo4(() => [message, ...children], [message, children]);
+  const hasExplicitEnd = endedAgentInstanceIds != null && endedAgentInstanceIds.has(message.agentInstanceId);
+  const hasActiveContent = allMessages.some(
     (m) => m.contentType === "text" && m.contentChunks.join("").trim()
   );
-  const status = hasActiveContent ? "completed" : "running";
+  const hasInProgressTool = useMemo4(() => {
+    if (allMessages.some((m) => m.toolPhase === "generating" || m.toolPhase === "executing")) return true;
+    if (allRoundMessages == null) return false;
+    return allRoundMessages.some(
+      (m) => m.agentInstanceId === message.agentInstanceId && (m.toolPhase === "generating" || m.toolPhase === "executing")
+    );
+  }, [allMessages, allRoundMessages, message.agentInstanceId]);
+  const status = hasExplicitEnd ? "completed" : hasActiveContent && !hasInProgressTool ? "completed" : "running";
   useEffect3(() => {
     if (isExpanded && contentRef.current) {
       contentRef.current.scrollTop = contentRef.current.scrollHeight;
@@ -2711,7 +2751,9 @@ var ChatWidget = ({
                   config,
                   onArtifactClick: handleArtifactClick,
                   defaultExpanded: true,
-                  parentTaskPurpose: msg.taskPurpose
+                  parentTaskPurpose: msg.taskPurpose,
+                  endedAgentInstanceIds: round.endedAgentInstanceIds,
+                  allRoundMessages: round.messages
                 },
                 `child-${childKey}-${agentInstanceId}`
               )