@opengeni/react 2.2.0-canary.0 → 2.3.0-canary.0

package/src/components/message-timeline.tsx

@@ -371,6 +371,11 @@ export function MessageTimeline({
   // leaves that band (scrolls down / sentinel exits) — never from scrolling
   // further toward y=0 (that was the batch-top load loop).
   const olderLoadGateRef = useRef<"armed" | "cooling">("armed");
+  // A collapsed history tail can be shorter than the viewport. In that state
+  // there is no upward scroll range, so reader intent can never arm the top
+  // sentinel. Request one older page per loaded window until history either
+  // fills the viewport or the host reports that no older rows remain.
+  const underfillLoadWindowRef = useRef<string | null>(null);
   const resizeFollowRafRef = useRef<number | null>(null);
   const firstGroupKey = allGroups[0] ? timelineGroupKey(allGroups[0]) : null;
   // Content stays invisible until the tip is hard-parked across a short
@@ -447,6 +452,8 @@ export function MessageTimeline({
   const groupKeyByItemIdRef = useRef<Map<string, string>>(new Map());
   const groupOffsetByKeyRef = useRef<Map<string, number>>(new Map());
   const firstItemId = resolvedItems[0]?.id ?? null;
+  const lastItemId = resolvedItems.at(-1)?.id ?? null;
+  const loadedWindowKey = JSON.stringify([firstItemId, lastItemId, resolvedItems.length]);
   // Bulk paints (the initial tail window, a prepended older window — detected
   // by the first group key changing) must not run per-row entrance animations.
   const firstKeyChangedForBulk =
@@ -722,6 +729,39 @@ export function MessageTimeline({
     [beginUserMessageDisclosureChange],
   );
 
+  const requestOlderIfUnderfilled = useCallback(
+    (node: HTMLElement) => {
+      if (
+        underfillLoadWindowRef.current !== null &&
+        underfillLoadWindowRef.current !== loadedWindowKey
+      ) {
+        // The requested page landed. Ordinary sentinel prefetch may own the
+        // next approach to the top once this window has a usable scroll range.
+        olderLoadGateRef.current = "armed";
+      }
+      // clientHeight=0 is pre-layout/headless, not evidence that the rendered
+      // history underfills a real viewport.
+      if (
+        node.clientHeight <= 1 ||
+        maxScrollOf(node) > 1 ||
+        !hasOlder ||
+        loadingOlder ||
+        !onLoadOlder ||
+        underfillLoadWindowRef.current === loadedWindowKey
+      ) {
+        return;
+      }
+      underfillLoadWindowRef.current = loadedWindowKey;
+      // If the reader had already armed ordinary prefetch, do not let its
+      // sentinel duplicate this request while the same short page is loading.
+      if (olderPrefetchArmedRef.current) {
+        olderLoadGateRef.current = "cooling";
+      }
+      onLoadOlder();
+    },
+    [hasOlder, loadedWindowKey, loadingOlder, onLoadOlder],
+  );
+
   const driveFollowRef = useRef<(node: HTMLElement, now?: number) => void>(() => undefined);
   const driveFollow = useCallback(
     (node: HTMLElement, nowMs?: number) => {
@@ -1018,10 +1058,21 @@ export function MessageTimeline({
     foldMemoryRef.current.clear();
     userMessageDisclosureMemoryRef.current.clear();
     disclosureKeepsUnpinnedRef.current = false;
+    underfillLoadWindowRef.current = null;
     seenActivityIdsRef.current.clear();
     applyPinned(true);
   }, [allGroups.length, revealed, applyPinned]);
 
+  // Parent commits cover the initial/history-loading cases. Disclosure state
+  // changes are child-local, so the ResizeObserver below owns dynamic collapse
+  // and expansion after mount.
+  useEffect(() => {
+    const node = scrollRef.current;
+    if (node) {
+      requestOlderIfUnderfilled(node);
+    }
+  });
+
   // Clear the bulk-paint marker a frame after it renders, so rows appended
   // live (streams, new turns) animate exactly as before.
   useLayoutEffect(() => {
@@ -1119,6 +1170,7 @@ export function MessageTimeline({
         if (!current) {
           return;
         }
+        requestOlderIfUnderfilled(current);
         if (!autoFollow || !pinnedRef.current || hasNewerRef.current) {
           return;
         }
@@ -1141,7 +1193,7 @@ export function MessageTimeline({
         resizeFollowRafRef.current = null;
       }
     };
-  }, [autoFollow, driveFollow, snapToBottom]);
+  }, [autoFollow, driveFollow, requestOlderIfUnderfilled, snapToBottom]);
 
   // Entering a non-tip history window: drop any live pin so the page bottom
   // cannot re-stick follow across loadNewer. Leaving it (the tip window

package/src/timeline/projection.ts

@@ -397,6 +397,7 @@ export function buildTimeline(events: SessionEvent[]): TimelineItem[] {
 
       case "agent.message.completed": {
         const text = stringValue(payload.text);
+        const phase = assistantMessagePhase(payload.phase);
         // Reconcile the most recent same-turn agent message — even when
         // activity (tool calls, reasoning) landed after its deltas — so the
         // completed text never duplicates the streamed one.
@@ -420,6 +421,9 @@ export function buildTimeline(events: SessionEvent[]): TimelineItem[] {
             open.text = text || open.text;
           }
           open.streaming = false;
+          // A phase-less settlement mirror (the worker's final-output receipt)
+          // must not erase the provider-declared phase captured by the SDK item.
+          if (phase) open.phase = phase;
           // Completion time is what the footer shows ("finished at"); keep the
           // first-delta stamp only until this event arrives.
           open.occurredAt = event.occurredAt;
@@ -451,6 +455,7 @@ export function buildTimeline(events: SessionEvent[]): TimelineItem[] {
             id: event.id,
             turnId,
             text,
+            ...(phase ? { phase } : {}),
             streaming: false,
             occurredAt: event.occurredAt,
             annotationSource: {
@@ -1675,7 +1680,12 @@ function foldSettledTurn(groups: TimelineGroup[], turnEnd: TurnEndItem): void {
   }
 
   const finalMessage = extractFinalAgentMessage(collected, turnEnd);
-  const body = finalMessage ? collected.slice(0, -1) : collected;
+  const fallbackMessage =
+    finalMessage || hasOrdinaryFinalAgentMessage(collected, turnEnd)
+      ? null
+      : extractLatestCompletedCommentary(collected, turnEnd);
+  const visibleMessage = finalMessage ?? fallbackMessage;
+  const body = visibleMessage ? collected.filter((group) => group !== visibleMessage) : collected;
   if (body.length === 0) {
     return;
   }
@@ -1704,7 +1714,7 @@ function foldSettledTurn(groups: TimelineGroup[], turnEnd: TurnEndItem): void {
   groups.splice(
     startIndex,
     collected.length,
-    ...(finalMessage ? [turnGroup, finalMessage] : [turnGroup]),
+    ...(visibleMessage ? [turnGroup, visibleMessage] : [turnGroup]),
   );
 }
 
@@ -1761,6 +1771,43 @@ function extractFinalAgentMessage(
   return tail;
 }
 
+function hasOrdinaryFinalAgentMessage(groups: TimelineGroup[], turnEnd: TurnEndItem): boolean {
+  return groups.some((group) => {
+    if (group.kind !== "item" || group.item.kind !== "agent-message") return false;
+    const message = group.item;
+    return (
+      !message.streaming &&
+      message.phase !== "commentary" &&
+      message.text.trim().length > 0 &&
+      belongsToTurn(message, turnEnd.turnId)
+    );
+  });
+}
+
+function extractLatestCompletedCommentary(
+  groups: TimelineGroup[],
+  turnEnd: TurnEndItem,
+): Extract<TimelineGroup, { kind: "item" }> | null {
+  for (let index = groups.length - 1; index >= 0; index -= 1) {
+    const group = groups[index];
+    if (group?.kind !== "item" || group.item.kind !== "agent-message") continue;
+    const message = group.item;
+    if (
+      !message.streaming &&
+      message.phase === "commentary" &&
+      message.text.trim().length > 0 &&
+      belongsToTurn(message, turnEnd.turnId)
+    ) {
+      return group;
+    }
+  }
+  return null;
+}
+
+function belongsToTurn(message: AgentMessageItem, turnId: string | null): boolean {
+  return !message.turnId || !turnId || message.turnId === turnId;
+}
+
 function groupStartedAt(group: TimelineGroup | undefined): string | undefined {
   if (!group) {
     return undefined;
@@ -1783,6 +1830,10 @@ function stringValue(value: unknown): string {
   return typeof value === "string" ? value : "";
 }
 
+function assistantMessagePhase(value: unknown): AgentMessageItem["phase"] {
+  return value === "commentary" || value === "final_answer" ? value : undefined;
+}
+
 function numberOrNull(value: unknown): number | null {
   return typeof value === "number" && Number.isFinite(value) ? value : null;
 }

package/src/timeline/types.ts

@@ -88,6 +88,8 @@ export type AgentMessageItem = {
   id: string;
   turnId: string | null;
   text: string;
+  /** Provider-declared assistant channel. Absent on legacy and non-Responses events. */
+  phase?: "commentary" | "final_answer" | undefined;
   /** Still receiving deltas (no completed/turn-end seen yet). */
   streaming: boolean;
   occurredAt: string;