@flamingo-stack/openframe-frontend-core 0.0.512-1640.4220.1 → 0.0.512

package/src/components/chat/entity-cards/dispatch.tsx

@@ -1026,26 +1026,34 @@ const FINANCIAL_CARD_CONFIGS: Record<string, FinancialCardConfig> = {
   balance_sheet: { label: 'Balance sheet', icon: () => <BankIcon size={24} /> },
   cash_flow: { label: 'Cash flow', icon: () => <CoinsExchangeCurrencyIcon size={24} /> },
 }
-function financialRegistryEntries(): Record<string, ChatCardRegistryEntry> {
+/** Expand a per-family config map into registry entries — ONE loop shell
+ *  for every card family (financial, github, program, roadmap); adding a
+ *  family is a config map + one `registryEntries(...)` call. */
+function registryEntries<C>(
+  configs: Record<string, C>,
+  build: (cfg: C) => ChatCardRegistryEntry,
+): Record<string, ChatCardRegistryEntry> {
   const out: Record<string, ChatCardRegistryEntry> = {}
-  for (const [docType, cfg] of Object.entries(FINANCIAL_CARD_CONFIGS)) {
-    out[docType] = {
-      mode: 'no-fetch',
-      label: cfg.label,
-      bareInline: true,
-      render: (chatRef, opts) => (
-        <GenericFinancialChatCard
-          chatRef={chatRef}
-          icon={cfg.icon()}
-          isNewTab={opts.isNewTab}
-          discuss={opts.discuss}
-        />
-      ),
-    }
-  }
+  for (const [docType, cfg] of Object.entries(configs)) out[docType] = build(cfg)
   return out
 }
 
+function financialRegistryEntries(): Record<string, ChatCardRegistryEntry> {
+  return registryEntries(FINANCIAL_CARD_CONFIGS, (cfg) => ({
+    mode: 'no-fetch',
+    label: cfg.label,
+    bareInline: true,
+    render: (chatRef, opts) => (
+      <GenericFinancialChatCard
+        chatRef={chatRef}
+        icon={cfg.icon()}
+        isNewTab={opts.isNewTab}
+        discuss={opts.discuss}
+      />
+    ),
+  }))
+}
+
 interface GitHubCardConfig {
   label: string
   kind: GitHubActivityKind
@@ -1059,19 +1067,15 @@ const GITHUB_CARD_CONFIGS: Record<string, GitHubCardConfig> = {
   github_pr_review_public: { label: 'GitHub review (public)', kind: 'pr_review' },
 }
 function githubRegistryEntries(): Record<string, ChatCardRegistryEntry> {
-  const out: Record<string, ChatCardRegistryEntry> = {}
-  for (const [docType, cfg] of Object.entries(GITHUB_CARD_CONFIGS)) {
-    out[docType] = {
-      mode: 'no-fetch',
-      label: cfg.label,
-      bareInline: true,
-      render: (chatRef, opts) => (
-        <GitHubChatCard chatRef={chatRef} kind={cfg.kind} isNewTab={opts.isNewTab}
-          discuss={opts.discuss} />
-      ),
-    }
-  }
-  return out
+  return registryEntries(GITHUB_CARD_CONFIGS, (cfg) => ({
+    mode: 'no-fetch',
+    label: cfg.label,
+    bareInline: true,
+    render: (chatRef, opts) => (
+      <GitHubChatCard chatRef={chatRef} kind={cfg.kind} isNewTab={opts.isNewTab}
+        discuss={opts.discuss} />
+    ),
+  }))
 }
 
 type ProgramConfigKey = 'podcast' | 'webinar' | 'event'
@@ -1086,28 +1090,24 @@ const PROGRAM_CARD_CONFIGS: Record<string, ProgramCardConfig> = {
   event: { label: 'Event', configKey: 'event', contentRefType: 'event' },
 }
 function programRegistryEntries(): Record<string, ChatCardRegistryEntry> {
-  const out: Record<string, ChatCardRegistryEntry> = {}
-  for (const [docType, cfg] of Object.entries(PROGRAM_CARD_CONFIGS)) {
-    out[docType] = {
-      mode: 'fetch',
-      label: cfg.label,
-      contentRefType: cfg.contentRefType,
-      bareInline: true,
-      skeleton: () => <ProgramCardSkeleton size="sm" />,
-      render: (item, chatRef, opts) => (
-        <ProgramChatCard
-          item={item}
-          chatRef={chatRef}
-          isNewTab={opts.isNewTab}
-          discuss={opts.discuss}
-          configKey={cfg.configKey}
-          label={cfg.configKey.charAt(0).toUpperCase() + cfg.configKey.slice(1)}
-          ogPlaceholder={opts?.extras?.buildOgPlaceholderUrl?.(item?.title ?? '') ?? null}
-        />
-      ),
-    }
-  }
-  return out
+  return registryEntries(PROGRAM_CARD_CONFIGS, (cfg) => ({
+    mode: 'fetch',
+    label: cfg.label,
+    contentRefType: cfg.contentRefType,
+    bareInline: true,
+    skeleton: () => <ProgramCardSkeleton size="sm" />,
+    render: (item, chatRef, opts) => (
+      <ProgramChatCard
+        item={item}
+        chatRef={chatRef}
+        isNewTab={opts.isNewTab}
+        discuss={opts.discuss}
+        configKey={cfg.configKey}
+        label={cfg.configKey.charAt(0).toUpperCase() + cfg.configKey.slice(1)}
+        ogPlaceholder={opts?.extras?.buildOgPlaceholderUrl?.(item?.title ?? '') ?? null}
+      />
+    ),
+  }))
 }
 
 type RoadmapCardType = 'roadmap_item' | 'delivery_item' | 'internal_task'
@@ -1135,27 +1135,23 @@ const ROADMAP_CARD_CONFIGS: Record<string, RoadmapEntryConfig> = {
   },
 }
 function roadmapRegistryEntries(): Record<string, ChatCardRegistryEntry> {
-  const out: Record<string, ChatCardRegistryEntry> = {}
-  for (const [docType, cfg] of Object.entries(ROADMAP_CARD_CONFIGS)) {
-    out[docType] = {
-      mode: 'fetch',
-      label: cfg.label,
-      contentRefType: cfg.contentRefType,
-      bareInline: true,
-      ...(cfg.noComposedHref ? { noComposedHref: true } : {}),
-      skeleton: () => <RoadmapCardSkeleton size="sm" />,
-      render: (item, chatRef, opts) => (
-        <RoadmapChatCard
-          item={item}
-          chatRef={chatRef}
-          isNewTab={opts.isNewTab}
-          discuss={opts.discuss}
-          cardType={cfg.cardType}
-        />
-      ),
-    }
-  }
-  return out
+  return registryEntries(ROADMAP_CARD_CONFIGS, (cfg) => ({
+    mode: 'fetch',
+    label: cfg.label,
+    contentRefType: cfg.contentRefType,
+    bareInline: true,
+    ...(cfg.noComposedHref ? { noComposedHref: true } : {}),
+    skeleton: () => <RoadmapCardSkeleton size="sm" />,
+    render: (item, chatRef, opts) => (
+      <RoadmapChatCard
+        item={item}
+        chatRef={chatRef}
+        isNewTab={opts.isNewTab}
+        discuss={opts.discuss}
+        cardType={cfg.cardType}
+      />
+    ),
+  }))
 }
 
 const CHAT_CARD_REGISTRY: Record<string, ChatCardRegistryEntry> = {
@@ -1558,7 +1554,7 @@ export function ChatCardLoader({
   // `contentRefType` is empty so the hook returns `isLoading=false` and
   // `item=undefined`, which we ignore.
   const fetchEntry = entry && entry.mode === 'fetch' ? entry : null
-  const { item, isLoading, isError } = useChatCardItem<any>(
+  const { item, isLoading, isError, isFetched } = useChatCardItem<any>(
     fetchEntry?.contentRefType ?? '',
     fetchEntry ? resolvedChatRef.id : '',
   )
@@ -1668,6 +1664,23 @@ export function ChatCardLoader({
       {children}
     </ChatCardNavWrap>
   )
+  // ONE render tail for both modes — bare-inline cards skip the discuss
+  // wrapper; everything else gets the ChatCardWithDiscuss chrome. Kept
+  // here (not per-branch) so the two paths can never drift on the
+  // discuss-menu wiring.
+  const finish = (node: React.ReactNode) =>
+    entry.bareInline ? (
+      <>{navWrap(node)}</>
+    ) : (
+      <ChatCardWithDiscuss
+        chatRef={finalChatRef}
+        onDiscuss={onDiscuss}
+        onDisplay={onDisplay}
+        displayAction={entry.displayAction}
+      >
+        {navWrap(node)}
+      </ChatCardWithDiscuss>
+    )
   if (entry.mode === 'no-fetch') {
     // Synthetic-ref gate. `chat-message-enhanced.tsx` builds a minimal
     // `{ type, id, title: cardId, url: null }` ChatRef when the LLM
@@ -1690,19 +1703,7 @@ export function ChatCardLoader({
     // Fetch-mode types already handle this gracefully: a synthetic
     // id leads to a fetch miss → `!item` → null at line ~1034.
     if (!finalChatRef.sourceRepo) return null
-    if (entry.bareInline) {
-      return navWrap(entry.render(finalChatRef, renderOpts))
-    }
-    return (
-      <ChatCardWithDiscuss
-        chatRef={finalChatRef}
-        onDiscuss={onDiscuss}
-        onDisplay={onDisplay}
-        displayAction={entry.displayAction}
-      >
-        {navWrap(entry.render(finalChatRef, renderOpts))}
-      </ChatCardWithDiscuss>
-    )
+    return finish(entry.render(finalChatRef, renderOpts))
   }
   if (isLoading) return <>{entry.skeleton()}</>
   if (!item) {
@@ -1711,6 +1712,10 @@ export function ChatCardLoader({
     // "deleted" claim. Only a SUCCESSFUL fetch that lacks the id
     // reaches the tombstone below.
     if (isError) return null
+    // NEVER-FETCHED (query disabled — no list URL registered for this
+    // type, or an empty id): no request was made, so absence of `item`
+    // proves nothing. Render nothing rather than a false "deleted".
+    if (!isFetched) return null
     // FETCH MISS. Two distinct cases, split by ref provenance:
     //
     //   - SERVER-BUILT ref (`sourceRepo` present — the entity provably
@@ -1738,19 +1743,7 @@ export function ChatCardLoader({
     }
     return null
   }
-  if (entry.bareInline) {
-    return <>{navWrap(entry.render(item, finalChatRef, renderOpts))}</>
-  }
-  return (
-    <ChatCardWithDiscuss
-      chatRef={finalChatRef}
-      onDiscuss={onDiscuss}
-      onDisplay={onDisplay}
-      displayAction={entry.displayAction}
-    >
-      {navWrap(entry.render(item, finalChatRef, renderOpts))}
-    </ChatCardWithDiscuss>
-  )
+  return finish(entry.render(item, finalChatRef, renderOpts))
 }
 
 // =============================================================================

package/src/components/chat/hooks/use-chat-card-item.ts

@@ -28,6 +28,9 @@ export interface UseChatCardItemResult<T = unknown> {
   item: T | undefined
   isLoading: boolean
   isError: boolean
+  /** True only after a fetch actually completed — false for disabled
+   *  queries (no list URL for the type / empty id). */
+  isFetched: boolean
 }
 
 // `extractItems` / `extractItemId` hoisted to `src/utils/extract-items.ts`
@@ -84,5 +87,11 @@ export function useChatCardItem<T = unknown>(
     item: (query.data ?? undefined) as T | undefined,
     isLoading: query.isLoading,
     isError: query.isError,
+    // True only after the query actually completed a fetch. DISABLED
+    // queries (no list URL registered for the type, empty id) never
+    // fetch — `item` is undefined there as well, and callers must not
+    // read that as "fetched fine, entity absent" (tombstone gate in
+    // entity-cards/dispatch.tsx).
+    isFetched: query.isFetched,
   }
 }

package/src/components/chat/hooks/use-sse-chat-adapter.ts

@@ -254,21 +254,21 @@ export function useSseChatAdapter(
 
   // Approve/reject pass the transport's boolean outcome through so batch
   // approve-all loops can mark a FAILED row (expired proposal, network
-  // error) instead of leaving its execution loader spinning.
-  const cardApprove = useCallback((reqId?: string): void | Promise<boolean> => {
-    if (!reqId) return
-    return sendMessageRef.current('', {
-      hidden: true,
-      approvalAction: { proposalId: reqId, action: 'approve' },
-    })
-  }, [])
-  const cardReject = useCallback((reqId?: string): void | Promise<boolean> => {
-    if (!reqId) return
-    return sendMessageRef.current('', {
-      hidden: true,
-      approvalAction: { proposalId: reqId, action: 'reject' },
-    })
-  }, [])
+  // error) instead of leaving its execution loader spinning. ONE factory
+  // — the two handlers differ only in the action literal.
+  const cardResolve = useCallback(
+    (action: 'approve' | 'reject') =>
+      (reqId?: string): void | Promise<boolean> => {
+        if (!reqId) return
+        return sendMessageRef.current('', {
+          hidden: true,
+          approvalAction: { proposalId: reqId, action },
+        })
+      },
+    [],
+  )
+  const cardApprove = useMemo(() => cardResolve('approve'), [cardResolve])
+  const cardReject = useMemo(() => cardResolve('reject'), [cardResolve])
 
   const createReducerOptions = useCallback(
     (): ChatStreamReducerOptions => ({

package/src/components/chat/remark-strip-citations.ts

@@ -27,11 +27,13 @@ export const remarkStripCitations: Plugin<[], Root> = () => {
   return (tree: Root) => {
     visit(tree, "text", (node: Text) => {
       if (!node.value || !node.value.includes("[")) return
-      const stripped = node.value
-        .replace(CITATION_REGEX, "$1")
-        // Collapse doubled spaces the removal can leave mid-sentence.
-        .replace(/ {2,}/g, " ")
-      if (stripped !== node.value) node.value = stripped
+      const withoutCitations = node.value.replace(CITATION_REGEX, "$1")
+      // No citation matched → leave the node untouched, INCLUDING its
+      // whitespace (collapsing unconditionally would rewrite deliberate
+      // spacing in prose like `array[1]  value`).
+      if (withoutCitations === node.value) return
+      // Collapse doubled spaces the removal can leave mid-sentence.
+      node.value = withoutCitations.replace(/ {2,}/g, " ")
     })
   }
 }

package/src/components/chat/stream/__tests__/chat-stream-reducer-approval-batch.test.ts

@@ -175,4 +175,22 @@ describe('decoder — approval_batch frame mapping', () => {
     expect(approval!.toolCalls?.[0].toolTitle).toContain('Fix Website Header')
     expect(approval!.toolCalls?.[1].toolExecutionRequestId).toBe('prop-2')
   })
+
+  it('a colliding anchor id (misbehaving server) still cannot pre-tick a row execution', async () => {
+    // Defense-in-depth pin: the click-time flip uses the STATUS-ONLY
+    // projection, so even a server that (incorrectly) reuses a row's
+    // proposal id as the batchId cannot mark that row done before its
+    // confirm actually resolves.
+    const onApprove = vi.fn().mockResolvedValue(undefined)
+    const r = createChatStreamReducer({ transport: 'sse', callbacks: { onApprove } })
+    r.beginSseSend({ text: 'delete both', assistantName: 'Mingo AI' })
+    r.apply({ ...batchEvent, requestId: 'prop-1' })
+    const batch = findBatch(r)
+    await batch.onApprove?.(batch.data.approvalRequestId)
+    const after = findBatch(r)
+    expect(after.status).toBe('approved')
+    // The flip itself wrote NO execution for prop-1 — its icon state
+    // comes only from the confirm result / approval-resolved event.
+    expect(after.data.executions ?? {}).toEqual({})
+  })
 })

package/src/components/chat/stream/chat-stream-reducer.ts

@@ -95,6 +95,7 @@ import {
   nextId,
   projectApprovalResolutionToMessages,
   projectBatchRowFailureToMessages,
+  projectBatchStatusToMessages,
   updateTrailingAssistant,
   upsertTrailingCompaction,
 } from './message-mutations'
@@ -1562,9 +1563,11 @@ export function createChatStreamReducer(
               const resolveBatch =
                 (status: 'approved' | 'rejected', confirm: typeof callbacks.onApprove) =>
                 async () => {
-                  setMessagesInternal(
-                    projectApprovalResolutionToMessages(messages, anchorId, status),
-                  )
+                  // STATUS-ONLY projection (defense-in-depth): even a
+                  // batchId colliding with a row id cannot pre-tick an
+                  // execution here — rows resolve exclusively via their
+                  // own confirm results / approval-resolved events.
+                  setMessagesInternal(projectBatchStatusToMessages(messages, anchorId, status))
                   for (const id of ids) {
                     const ok = await confirm?.(id)
                     if (ok === false) {
@@ -1975,6 +1978,12 @@ export function createChatStreamReducer(
       setMessagesInternal(
         projectApprovalResolutionToMessages(messages, requestId, status, resolvedByName),
       )
+      // Status-map mirror — kept in lockstep with the other two flip
+      // paths (SSE approval-resolved at ~1240, NATS at ~1950): the map
+      // restores status when a replayed approval-request event
+      // re-renders the card, and a flip applied through THIS path must
+      // survive that replay the same way.
+      mirrorApprovalStatus(requestId, status)
       return segments
     },
     getPendingEscalated() {