@flamingo-stack/openframe-frontend-core 0.0.518-1663.4312.1 → 0.0.518

package/src/components/chat/hooks/use-jetstream-dialog-subscription.ts

@@ -1,6 +1,6 @@
 'use client'
 
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import {
   acquireClient as acquireSharedClient,
   releaseClient as releaseSharedClient,
@@ -20,24 +20,7 @@ const DEFAULT_STREAM_NAME = 'CHAT_CHUNKS'
  * absence worth resyncing for. Alt-tabbing must not churn the consumer; a
  * window that sat in the tray must not come back showing a stale conversation.
  */
-export const RESYNC_AFTER_HIDDEN_MS = 10_000
-/**
- * How long resync requests are gathered before one is acted on.
- *
- * A single reveal can be reported twice: the page sees `visibilitychange`, and
- * a host that knows the window was away reports it too (`resyncSignal`),
- * neither able to tell whether the other noticed. Both land within a frame or
- * two of each other, being driven by the same OS event, and acting on both
- * rebuilds the consumer and refetches history twice for one reveal.
- *
- * Gathered on the TRAILING edge, so a request is deferred and never dropped.
- * Two reports of one reveal collapse into one rebuild; two genuinely different
- * signals — a notification reply landing just before the user opens the window
- * — also collapse into one, which is correct, because a single refetch after
- * the last of them covers both. The cost is a second of latency on a path whose
- * next step is a network round trip.
- */
-const RESYNC_COALESCE_MS = 1_000
+const RESYNC_AFTER_HIDDEN_MS = 10_000
 /**
  * Floor between two reported recoveries. Every recovery costs the caller a
  * history refetch, and a consumer that cannot hold its sequence — gap, reset,
@@ -77,7 +60,6 @@ export function useJetStreamDialogSubscription({
   clientConfig = {},
   reconnectionBackoff,
   inactiveThresholdMs,
-  resyncSignal = 0,
 }: UseJetStreamDialogSubscriptionOptions): UseJetStreamDialogSubscriptionReturn {
   const [isConnected, setIsConnected] = useState(false)
   const [isSubscribed, setIsSubscribed] = useState(false)
@@ -91,8 +73,6 @@ export function useJetStreamDialogSubscription({
   const [currentStreamSeq, setCurrentStreamSeq] = useState<number | null>(null)
 
   const lastRecoveryReportRef = useRef(0)
-  const resyncTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
-  const lastResyncSignalRef = useRef(resyncSignal)
   const clientRef = useRef<NatsClient | null>(null)
   const subscriptionRef = useRef<JetStreamSubscriptionHandle | null>(null)
   const highestStreamSeqRef = useRef<number | null>(null)
@@ -265,26 +245,7 @@ export function useJetStreamDialogSubscription({
   // ignoring optStartSeq).
   useEffect(() => {
     highestStreamSeqRef.current = null
-    // A host's signal counts per dialog (it can carry a per-conversation term),
-    // so the baseline has to move with the dialog or a switch to one with a
-    // LOWER count would swallow every later resync for it.
-    lastResyncSignalRef.current = resyncSignal
     setCurrentStreamSeq(null)
-    // A resync gathered for the previous dialog must not land on this one: the
-    // counter says nothing about which conversation it meant, so callers would
-    // refetch the wrong one. The dialog change supersedes it — the new dialog
-    // loads its own history regardless. As cleanup, so it covers unmount too,
-    // which is the same rule.
-    return () => {
-      if (resyncTimerRef.current !== null) {
-        clearTimeout(resyncTimerRef.current)
-        resyncTimerRef.current = null
-      }
-    }
-    // `resyncSignal` is read as the new baseline, not depended on: reacting to
-    // it here would reset the baseline on the very change meant to trigger a
-    // resync, and the effect below owns that.
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [dialogId])
 
   // Coming back into view after a real absence is treated exactly like a
@@ -295,20 +256,8 @@ export function useJetStreamDialogSubscription({
   // report that: the tail simply stays quiet, and the conversation on screen
   // stays frozen at whatever was there when the window went away (the user's
   // manual fix is a page refresh, which is exactly the history refetch this
-  // triggers). Rebuilds the consumer from the last sequence seen AND tells
-  // callers to refetch history.
-  //
-  // Every source funnels through here (see `RESYNC_COALESCE_MS`). Restarting
-  // the timer rather than dropping is what makes that safe: a request is only
-  // ever folded into the one that follows it, never discarded.
-  const requestResync = useCallback(() => {
-    if (resyncTimerRef.current !== null) clearTimeout(resyncTimerRef.current)
-    resyncTimerRef.current = setTimeout(() => {
-      resyncTimerRef.current = null
-      setReconnectionCount((c) => c + 1)
-    }, RESYNC_COALESCE_MS)
-  }, [])
-
+  // triggers). Bumping the counter rebuilds the consumer from the last sequence
+  // seen AND tells callers to refetch history.
   useEffect(() => {
     if (!enabled) return
     let hiddenSince = document.visibilityState === 'hidden' ? Date.now() : 0
@@ -321,27 +270,13 @@ export function useJetStreamDialogSubscription({
       const awayMs = hiddenSince === 0 ? 0 : Date.now() - hiddenSince
       hiddenSince = 0
       if (awayMs >= RESYNC_AFTER_HIDDEN_MS) {
-        requestResync()
+        setReconnectionCount((c) => c + 1)
       }
     }
 
     document.addEventListener('visibilitychange', onVisibilityChange)
     return () => document.removeEventListener('visibilitychange', onVisibilityChange)
-  }, [enabled, requestResync])
-
-  useEffect(() => {
-    // Held, not consumed, while disabled: it fires once on enable instead.
-    // A host reports a signal against the conversation, not against this hook's
-    // readiness, so one arriving while the caller is still assembling the
-    // subscription describes a gap in the history the caller is fetching right
-    // now. Dropping it would leave that fetch's result stale with nothing left
-    // to say so.
-    if (!enabled) return
-    // The mount value is a baseline, not a signal.
-    if (resyncSignal <= lastResyncSignalRef.current) return
-    lastResyncSignalRef.current = resyncSignal
-    requestResync()
-  }, [enabled, resyncSignal, requestResync])
+  }, [enabled])
 
   // Subscription lifecycle: (re)create the ephemeral JetStream consumer whenever
   // we transition into a connected state for a dialog, and whenever the dialog

package/src/components/chat/types/api.types.ts

@@ -131,22 +131,6 @@ export interface UseJetStreamDialogSubscriptionOptions {
   /** Consumer inactivity threshold in ms before NATS auto-cleans it. Defaults to the
    *  client's, and applies only to the first consumer — recreations use nats.ws's. */
   inactiveThresholdMs?: number
-  /**
-   * A counter the host bumps when it knows, from outside the page, that the tail
-   * may have missed something.
-   *
-   * The hook's own detector is `visibilitychange`, which a browser tab reports
-   * honestly and an embedding shell may not — and which says nothing at all
-   * about a write made on the page's behalf while it was away. A host holding
-   * either kind of knowledge bumps this instead of hoping the page noticed.
-   *
-   * Treated exactly like a reconnect: the consumer is rebuilt from the highest
-   * sequence already seen, and `reconnectionCount` moves so callers refetch
-   * persisted history. Any increase counts; the value itself means nothing, and
-   * an increase arriving alongside a `visibilitychange` costs one rebuild, not
-   * two.
-   */
-  resyncSignal?: number
 }
 
 export interface UseJetStreamDialogSubscriptionReturn {
@@ -154,12 +138,10 @@ export interface UseJetStreamDialogSubscriptionReturn {
   isSubscribed: boolean
   /**
    * Incremented each time the live tail is re-established: a NATS reconnect, a
-   * JetStream ordered-consumer recreation, the page returning to view after
-   * being hidden long enough to have missed something, or a host reporting the
-   * same via `resyncSignal`. All of them mean the same thing to the caller —
-   * the tail may have skipped messages, so persisted history has to be
-   * refetched. One absence counts once even when two sources report it.
-   * Starts at 0.
+   * JetStream ordered-consumer recreation, or the page returning to view after
+   * being hidden long enough to have missed something. All three mean the same
+   * thing to the caller — the tail may have skipped messages, so persisted
+   * history has to be refetched. Starts at 0.
    */
   reconnectionCount: number
   /** Highest JetStream stream sequence observed so far (null before first delivery). */

package/src/components/chat/utils/__tests__/history-merge.test.ts

@@ -930,102 +930,3 @@ describe('mid-stream refetch (turn partially persisted)', () => {
     expect(ids(merged)).toEqual([U0.id, A0.id, PERSISTED_PARTIAL.id, unrelatedLive.id])
   })
 })
-
-describe('ordering of surviving realtime messages', () => {
-  // The merge concatenates: all persisted history, then every realtime message
-  // the coverage rules kept, each side in its own order. These pin that
-  // contract, which nothing asserted before — the suite tested only WHICH
-  // messages survive, never where they land — and which an attempt to
-  // chronologically interleave the two sides repeatedly broke.
-  const H_U0: TestMessage = { ...U0, streamSeq: 5 }
-  const H_A0: TestMessage = { ...A0, streamSeq: 10 }
-  /**
-   * Sent from a notification while the window was away, and persisted. NO
-   * `streamSeq`: the backend does not stamp user MESSAGE_REQUEST rows, which is
-   * the missing signal that makes interleaving guesswork.
-   */
-  const AWAY_U: TestMessage = {
-    id: 'bbbb0001',
-    role: 'user',
-    content: 'replied from a notification',
-    timestamp: t(3000),
-  }
-  /** Mingo's answer to it. Assistant rows DO carry a sequence. */
-  const AWAY_A: TestMessage = {
-    id: 'bbbb0002',
-    role: 'assistant',
-    content: txt('answered while the window was away'),
-    timestamp: t(3100),
-    streamSeq: 80,
-  }
-
-  it('appends surviving realtime messages after all persisted history', () => {
-    // A technician direct message the snapshot has not caught up with. Its own
-    // role's persisted max (H_U0, seq 5) is below it, so coverage keeps it.
-    const unpersistedDirect: TestMessage = {
-      id: 'direct-1500-old',
-      role: 'user',
-      content: 'a direct message history has not persisted yet',
-      timestamp: t(1500),
-      streamSeq: 40,
-    }
-    const merged = mergeHistoryWithRealtime({
-      processedHistory: [H_U0, H_A0, AWAY_U, AWAY_A],
-      existingMessages: [H_U0, H_A0, unpersistedDirect],
-      streamingMessageId: null,
-      historyFetchedAt: 9000,
-      historyMaxStreamSeq: 80,
-      realtimeSeenStreamSeq: 40,
-    })
-
-    expect(ids(merged)).toEqual([H_U0.id, H_A0.id, AWAY_U.id, AWAY_A.id, unpersistedDirect.id])
-  })
-
-  it('keeps survivors in store order, sequence or no sequence', () => {
-    // The guard against reordering the two kinds against each other: an
-    // optimistic bubble carries no sequence and a replayed direct message does,
-    // and sorting by sequence would render the user's question below the reply
-    // that came after it.
-    const optimistic: TestMessage = {
-      id: 'optimistic-9400-x',
-      role: 'user',
-      content: 'just typed, no seq of its own',
-      timestamp: t(9400),
-    }
-    const laterDirect: TestMessage = {
-      id: 'direct-9500-x',
-      role: 'user',
-      content: 'and a direct message after it',
-      timestamp: t(9500),
-      streamSeq: 40,
-    }
-    const merged = mergeHistoryWithRealtime({
-      processedHistory: [H_U0, H_A0, AWAY_U, AWAY_A],
-      existingMessages: [H_U0, H_A0, optimistic, laterDirect],
-      streamingMessageId: null,
-      // Before either was minted, so neither can be in the snapshot.
-      historyFetchedAt: 9000,
-      historyMaxStreamSeq: 80,
-      realtimeSeenStreamSeq: 40,
-    })
-
-    expect(ids(merged)).toEqual([H_U0.id, H_A0.id, AWAY_U.id, AWAY_A.id, optimistic.id, laterDirect.id])
-  })
-
-  it('keeps history in snapshot order even when its sequences do not climb', () => {
-    // The snapshot is the server's account of the conversation; the merge is
-    // not entitled to second-guess it from a `streamSeq` that looks out of
-    // order, which is what any sort of the two sides together would do.
-    const outOfOrder: TestMessage = { ...H_A0, id: 'aaaa0009', streamSeq: 3 }
-    const merged = mergeHistoryWithRealtime({
-      processedHistory: [H_U0, outOfOrder, AWAY_U, AWAY_A],
-      existingMessages: [H_U0],
-      streamingMessageId: null,
-      historyFetchedAt: 9000,
-      historyMaxStreamSeq: 80,
-      realtimeSeenStreamSeq: 0,
-    })
-
-    expect(ids(merged)).toEqual([H_U0.id, outOfOrder.id, AWAY_U.id, AWAY_A.id])
-  })
-})

package/src/components/ui/button/button.tsx

@@ -55,6 +55,15 @@ const buttonVariants = cva(
         // metadata rather than CTAs — author-page social rows, share rows.
         // Pair with variant="transparent" for the ghost treatment.
         'icon-sm': 'p-[var(--spacing-system-xxs)] h-8 w-8 [&_svg]:h-4 [&_svg]:w-4',
+        // 20px inline glyph for affordances that sit INSIDE a line of text —
+        // an info hint beside a badge, a copy glyph after an id. `icon-sm`'s
+        // 32px target is correct for a metadata row but visually swamps a
+        // 10px badge or a 14px label, so hosts were reaching for className
+        // overrides to shrink it. Below the WCAG 2.5.8 target floor on purpose:
+        // this is only for glyphs whose information is ALSO available another
+        // way (tooltip content mirrored into an aria-describedby node), never
+        // for a sole means of performing an action.
+        'icon-inline': 'p-0 h-5 w-5 min-h-0 min-w-0 shrink-0 [&_svg]:h-3.5 [&_svg]:w-3.5',
         // Bare 56px media glyph (play / unmute over video). A size variant so
         // hosts stop re-implementing a <button> to escape the 20px svg cap.
         'icon-glyph': 'p-0 h-14 w-14 [&_svg]:h-14 [&_svg]:w-14',