@nextclaw/ui 0.5.45 → 0.5.46

package/src/lib/chat-message.ts

@@ -19,19 +19,28 @@ export type ChatTimelineMessageItem = {
   message: SessionMessageView;
 };
 
-export type ChatTimelineAssistantFlowItem = {
-  kind: 'assistant_flow';
+export type ChatTimelineAssistantTurnSegment =
+  | {
+      kind: 'assistant_message';
+      key: string;
+      text: string;
+      reasoning: string;
+    }
+  | {
+      kind: 'tool_card';
+      key: string;
+      card: ToolCard;
+    };
+
+export type ChatTimelineAssistantTurnItem = {
+  kind: 'assistant_turn';
   key: string;
   role: 'assistant';
   timestamp: string;
-  primaryText: string;
-  primaryReasoning: string;
-  followupText: string;
-  followupReasoning: string;
-  toolCards: ToolCard[];
+  segments: ChatTimelineAssistantTurnSegment[];
 };
 
-export type ChatTimelineItem = ChatTimelineMessageItem | ChatTimelineAssistantFlowItem;
+export type ChatTimelineItem = ChatTimelineMessageItem | ChatTimelineAssistantTurnItem;
 
 const TOOL_DETAIL_FIELDS = ['cmd', 'command', 'query', 'q', 'path', 'url', 'to', 'channel', 'agentId', 'sessionKey'];
 
@@ -263,17 +272,54 @@ export function buildChatTimeline(events: SessionEventView[]): ChatTimelineItem[
     });
 
   const timeline: ChatTimelineItem[] = [];
-  let activeFlow:
+  let activeTurn:
     | {
-        item: ChatTimelineAssistantFlowItem;
+        item: ChatTimelineAssistantTurnItem;
         cardByCallId: Map<string, ToolCard>;
-        pendingCallIds: Set<string>;
-        awaitingFollowup: boolean;
       }
     | null = null;
 
-  const closeActiveFlow = () => {
-    activeFlow = null;
+  const closeActiveTurn = () => {
+    activeTurn = null;
+  };
+
+  const ensureActiveTurn = (eventKey: string, timestamp: string) => {
+    if (activeTurn) {
+      activeTurn.item.timestamp = timestamp;
+      return activeTurn;
+    }
+    const item: ChatTimelineAssistantTurnItem = {
+      kind: 'assistant_turn',
+      key: `turn-${eventKey}`,
+      role: 'assistant',
+      timestamp,
+      segments: []
+    };
+    timeline.push(item);
+    activeTurn = {
+      item,
+      cardByCallId: new Map<string, ToolCard>()
+    };
+    return activeTurn;
+  };
+
+  const pushAssistantMessageSegment = (
+    target: { item: ChatTimelineAssistantTurnItem },
+    eventKey: string,
+    message: SessionMessageView
+  ) => {
+    const text = extractMessageText(message.content).trim();
+    const reasoning =
+      typeof message.reasoning_content === 'string' ? message.reasoning_content.trim() : '';
+    if (!text && !reasoning) {
+      return;
+    }
+    target.item.segments.push({
+      kind: 'assistant_message',
+      key: `assistant-${eventKey}-${target.item.segments.length}`,
+      text,
+      reasoning
+    });
   };
 
   for (const event of normalized) {
@@ -287,80 +333,58 @@ export function buildChatTimeline(events: SessionEventView[]): ChatTimelineItem[
       typeof message.timestamp === 'string' && message.timestamp
         ? message.timestamp
         : event.timestamp;
+    const eventKey = `${event._seq}-${event._idx}`;
+
+    if (role === 'assistant') {
+      const turn = ensureActiveTurn(eventKey, timestamp);
+      pushAssistantMessageSegment(turn, eventKey, message);
+      if (!hasToolCalls(message)) {
+        continue;
+      }
 
-    if (role === 'assistant' && hasToolCalls(message)) {
-      closeActiveFlow();
       const toolCards = buildToolCallCards(message);
-      const item: ChatTimelineAssistantFlowItem = {
-        kind: 'assistant_flow',
-        key: `flow-${event._seq}-${event._idx}`,
-        role: 'assistant',
-        timestamp,
-        primaryText: extractMessageText(message.content).trim(),
-        primaryReasoning:
-          typeof message.reasoning_content === 'string' ? message.reasoning_content.trim() : '',
-        followupText: '',
-        followupReasoning: '',
-        toolCards
-      };
-
-      const cardByCallId = new Map<string, ToolCard>();
-      const pendingCallIds = new Set<string>();
       for (const card of toolCards) {
+        turn.item.segments.push({
+          kind: 'tool_card',
+          key: `tool-call-${eventKey}-${turn.item.segments.length}`,
+          card
+        });
         if (typeof card.callId === 'string' && card.callId.trim()) {
-          cardByCallId.set(card.callId, card);
-          pendingCallIds.add(card.callId);
+          turn.cardByCallId.set(card.callId, card);
         }
       }
-
-      timeline.push(item);
-      activeFlow = {
-        item,
-        cardByCallId,
-        pendingCallIds,
-        awaitingFollowup: pendingCallIds.size === 0
-      };
       continue;
     }
 
     if (role === 'tool') {
+      const turn = ensureActiveTurn(eventKey, timestamp);
       const callId =
         typeof message.tool_call_id === 'string' && message.tool_call_id.trim()
           ? message.tool_call_id.trim()
           : undefined;
-      if (activeFlow && callId && activeFlow.cardByCallId.has(callId)) {
-        const card = activeFlow.cardByCallId.get(callId)!;
+      if (callId && turn.cardByCallId.has(callId)) {
+        const card = turn.cardByCallId.get(callId)!;
         const resultText = extractMessageText(message.content).trim();
         card.text = appendText(card.text ?? '', resultText);
         card.hasResult = true;
         if (typeof message.name === 'string' && message.name.trim()) {
           card.name = message.name.trim();
         }
-        activeFlow.pendingCallIds.delete(callId);
-        activeFlow.awaitingFollowup = activeFlow.pendingCallIds.size === 0;
-        activeFlow.item.timestamp = timestamp;
+        turn.item.timestamp = timestamp;
         continue;
       }
 
-      timeline.push({
-        kind: 'message',
-        key: `message-${event._seq}-${event._idx}`,
-        role,
-        timestamp,
-        message
+      turn.item.segments.push({
+        kind: 'tool_card',
+        key: `tool-result-${eventKey}-${turn.item.segments.length}`,
+        card: {
+          kind: 'result',
+          name: toToolName(message.name),
+          text: extractMessageText(message.content).trim(),
+          callId,
+          hasResult: true
+        }
       });
-      closeActiveFlow();
-      continue;
-    }
-
-    if (role === 'assistant' && activeFlow && activeFlow.awaitingFollowup && !hasToolCalls(message)) {
-      const text = extractMessageText(message.content).trim();
-      const reasoning =
-        typeof message.reasoning_content === 'string' ? message.reasoning_content.trim() : '';
-      activeFlow.item.followupText = appendText(activeFlow.item.followupText, text);
-      activeFlow.item.followupReasoning = appendText(activeFlow.item.followupReasoning, reasoning);
-      activeFlow.item.timestamp = timestamp;
-      closeActiveFlow();
       continue;
     }
 
@@ -371,7 +395,7 @@ export function buildChatTimeline(events: SessionEventView[]): ChatTimelineItem[
       timestamp,
       message
     });
-    closeActiveFlow();
+    closeActiveTurn();
   }
 
   return timeline;

package/dist/assets/chat-message-D0s61C4e.js

@@ -1,5 +0,0 @@
-const q=["cmd","command","query","q","path","url","to","channel","agentId","sessionKey"];function m(t){return typeof t=="object"&&t!==null&&!Array.isArray(t)}function _(t,n=2400){return t.length<=n?t:`${t.slice(0,n)}
-…`}function h(t){if(typeof t=="string")return t;if(typeof t=="number"||typeof t=="boolean")return String(t);if(t==null)return"";try{return _(JSON.stringify(t,null,2))}catch{return String(t)}}function A(t){if(m(t))return t;if(typeof t!="string")return null;const n=t.trim();if(!n.startsWith("{")&&!n.startsWith("["))return null;try{const r=JSON.parse(n);return m(r)?r:null}catch{return null}}function C(t){const n=A(t);if(!n){const o=h(t).trim();return o?_(o,120):void 0}const r=[];for(const o of q){const e=n[o];if(typeof e=="string"&&e.trim()?r.push(`${o}: ${e.trim()}`):(typeof e=="number"||typeof e=="boolean")&&r.push(`${o}: ${String(e)}`),r.length>=2)break}return r.length>0?r.join(" · "):_(h(n),140)}function T(t){return typeof t!="string"||!t.trim()?"tool":t.trim()}function w(t){return Array.isArray(t.tool_calls)&&t.tool_calls.length>0}function x(t){const n=t.role.toLowerCase().trim();return n==="user"?"user":n==="assistant"?"assistant":n==="system"?"system":n==="tool"||n==="tool_result"||n==="toolresult"||n==="function"||typeof t.tool_call_id=="string"||Array.isArray(t.tool_calls)||typeof t.name=="string"?"tool":"other"}function d(t){if(typeof t=="string")return t;if(Array.isArray(t)){const n=[];for(const r of t){if(typeof r=="string"){n.push(r);continue}if(m(r)){if(typeof r.text=="string"){n.push(r.text);continue}typeof r.content=="string"&&n.push(r.content)}}if(n.length>0)return n.join(`
-`)}return h(t)}function I(t){const n=[],r=Array.isArray(t.tool_calls)?t.tool_calls:[];for(const o of r){if(!m(o))continue;const e=m(o.function)?o.function:null,s=T((e==null?void 0:e.name)??o.name),i=(e==null?void 0:e.arguments)??o.arguments;n.push({kind:"call",name:s,detail:C(i),callId:typeof o.id=="string"&&o.id.trim()?o.id:void 0,hasResult:!1})}return n}function F(t){var o;const n=I(t);return(x(t)==="tool"||typeof t.tool_call_id=="string")&&n.push({kind:"result",name:T(t.name??((o=n[0])==null?void 0:o.name)),text:d(t.content).trim(),callId:typeof t.tool_call_id=="string"?t.tool_call_id:void 0,hasResult:!0}),n}function $(t,n){var e;const r=Number.isFinite(t.seq)&&t.seq>0?Math.trunc(t.seq):n+1,o=typeof t.timestamp=="string"&&t.timestamp?t.timestamp:((e=t.message)==null?void 0:e.timestamp)??new Date().toISOString();return{...t,timestamp:o,_idx:n,_seq:r}}function b(t){const n=x(t);return n==="assistant"&&w(t)?"assistant.tool_call":n==="tool"?"tool.result":`message.${n}`}function k(t){return t.map((n,r)=>({seq:r+1,type:b(n),timestamp:n.timestamp,message:n}))}function g(t,n){return n?t?`${t}
-
-${n}`:n:t}function R(t){const n=t.map((s,i)=>$(s,i)).sort((s,i)=>{if(s._seq!==i._seq)return s._seq-i._seq;const l=Date.parse(s.timestamp),a=Date.parse(i.timestamp);return Number.isFinite(l)&&Number.isFinite(a)&&l!==a?l-a:s._idx-i._idx}),r=[];let o=null;const e=()=>{o=null};for(const s of n){const i=s.message;if(!i)continue;const l=x(i),a=typeof i.timestamp=="string"&&i.timestamp?i.timestamp:s.timestamp;if(l==="assistant"&&w(i)){e();const c=I(i),u={kind:"assistant_flow",key:`flow-${s._seq}-${s._idx}`,role:"assistant",timestamp:a,primaryText:d(i.content).trim(),primaryReasoning:typeof i.reasoning_content=="string"?i.reasoning_content.trim():"",followupText:"",followupReasoning:"",toolCards:c},p=new Map,y=new Set;for(const f of c)typeof f.callId=="string"&&f.callId.trim()&&(p.set(f.callId,f),y.add(f.callId));r.push(u),o={item:u,cardByCallId:p,pendingCallIds:y,awaitingFollowup:y.size===0};continue}if(l==="tool"){const c=typeof i.tool_call_id=="string"&&i.tool_call_id.trim()?i.tool_call_id.trim():void 0;if(o&&c&&o.cardByCallId.has(c)){const u=o.cardByCallId.get(c),p=d(i.content).trim();u.text=g(u.text??"",p),u.hasResult=!0,typeof i.name=="string"&&i.name.trim()&&(u.name=i.name.trim()),o.pendingCallIds.delete(c),o.awaitingFollowup=o.pendingCallIds.size===0,o.item.timestamp=a;continue}r.push({kind:"message",key:`message-${s._seq}-${s._idx}`,role:l,timestamp:a,message:i}),e();continue}if(l==="assistant"&&o&&o.awaitingFollowup&&!w(i)){const c=d(i.content).trim(),u=typeof i.reasoning_content=="string"?i.reasoning_content.trim():"";o.item.followupText=g(o.item.followupText,c),o.item.followupReasoning=g(o.item.followupReasoning,u),o.item.timestamp=a,e();continue}r.push({kind:"message",key:`message-${s._seq}-${s._idx}`,role:l,timestamp:a,message:i}),e()}return r}export{F as a,R as b,k as c,d as e,x as n};