Sync public snapshot from freebuff-private

Source: CodebuffAI/freebuff-private@e66d73be0e1a8e4c453136e031edb6c817cceaeb

Author: github-actions[bot]

bun.lock

@@ -9,13 +9,66 @@ import {
   getAdDisplayLabel,
   getCardAdLayout,
   getInlineAdLayout,
+  orderedRequestedAds,
 } from '../ad-banner'
 import { initializeThemeStore } from '../../hooks/use-theme'
 
 beforeAll(() => {
   initializeThemeStore()
 })
 
+describe('requested waiting-room ads', () => {
+  test('mount order follows the canonical request and excludes duplicates/unrequested ads', () => {
+    const ads = [
+      {
+        placementId: 'waiting-room-2',
+        impUrl: 'two',
+        adText: '',
+        title: '',
+        cta: '',
+        url: '',
+        favicon: '',
+        clickUrl: '',
+      },
+      {
+        placementId: 'waiting-room-1',
+        impUrl: 'one',
+        adText: '',
+        title: '',
+        cta: '',
+        url: '',
+        favicon: '',
+        clickUrl: '',
+      },
+      {
+        placementId: 'waiting-room-1',
+        impUrl: 'duplicate',
+        adText: '',
+        title: '',
+        cta: '',
+        url: '',
+        favicon: '',
+        clickUrl: '',
+      },
+      {
+        placementId: 'waiting-room-4',
+        impUrl: 'hidden',
+        adText: '',
+        title: '',
+        cta: '',
+        url: '',
+        favicon: '',
+        clickUrl: '',
+      },
+    ]
+    expect(
+      orderedRequestedAds(ads, ['waiting-room-1', 'waiting-room-2']).map(
+        (ad) => ad.impUrl,
+      ),
+    ).toEqual(['one', 'two'])
+  })
+})
+
 describe('card ad layout', () => {
   const ad = {
     adText:
@@ -171,6 +224,31 @@ describe('card ad render', () => {
     expect(await renderCard({})).toContain('Ad')
   })
 
+  test('reports presentation only after the card mounts', async () => {
+    const presented: string[] = []
+    const setup = await createTestRenderer({
+      width: 78,
+      height: AD_CARD_HEIGHT,
+    })
+    const root = createRoot(setup.renderer)
+    const mountedAd = { ...ad, provider: 'first_party' as const }
+
+    flushSync(() => {
+      root.render(
+        <AdCard
+          ad={mountedAd}
+          width={78}
+          onImpression={(presentedAd) => presented.push(presentedAd.impUrl)}
+        />,
+      )
+    })
+    await setup.renderOnce()
+    expect(presented).toEqual(['imp-1'])
+
+    flushSync(() => root.unmount())
+    setup.renderer.destroy()
+  })
+
   test('does not print the headline twice when there is no CTA', async () => {
     const frame = await renderCard({ cta: '' })
 

cli/src/components/__tests__/ad-banner.test.tsx

@@ -9,6 +9,7 @@ import {
   truncateToLines,
   truncateToWidth,
 } from '@codebuff/common/ads/inline-ad-layout'
+import { visibleWaitingRoomPlacementIds } from '@codebuff/common/ads/waiting-room-placements'
 import { safeOpen } from '../utils/open-url'
 import React, { useState, useMemo, useEffect } from 'react'
 
@@ -21,6 +22,7 @@ import type { AdResponse } from '../hooks/use-gravity-ad'
 
 interface ChoiceAdBannerProps {
   ads: AdResponse[]
+  placementIds?: readonly string[]
   onClick?: (ad: AdResponse) => void
   onImpression?: (ad: AdResponse) => void
 }
@@ -31,7 +33,6 @@ interface ChoiceAdBannerProps {
 // subtracts this from the model picker's height budget.
 export const AD_CARD_HEIGHT = 5
 export const INLINE_AD_CARD_HEIGHT = 4 // border-top + header row + detail row + border-bottom
-const MIN_CARD_WIDTH = 60 // Minimum width per ad card to remain readable
 
 // Layout lives in `common` so the advertiser campaign builder's creative
 // preview fits copy exactly the way this renderer does. Re-exported here
@@ -331,6 +332,7 @@ export const SingleAdBanner: React.FC<{
  */
 export const ChoiceAdBanner: React.FC<ChoiceAdBannerProps> = ({
   ads,
+  placementIds,
   onClick,
   onImpression,
 }) => {
@@ -340,11 +342,14 @@ export const ChoiceAdBanner: React.FC<ChoiceAdBannerProps> = ({
   const colAvail = terminalWidth - 2
 
   // Only show as many ads as fit with a healthy minimum width; hide the rest
-  const maxVisible = Math.max(1, Math.floor(colAvail / MIN_CARD_WIDTH))
-  const visibleAds = useMemo(
-    () => (ads.length > maxVisible ? ads.slice(0, maxVisible) : ads),
-    [ads, maxVisible],
-  )
+  const maxVisible =
+    placementIds?.length ?? visibleWaitingRoomPlacementIds(terminalWidth).length
+  const visibleAds = useMemo(() => {
+    const requested = placementIds?.length
+      ? orderedRequestedAds(ads, placementIds)
+      : ads
+    return requested.slice(0, maxVisible)
+  }, [ads, maxVisible, placementIds])
 
   const widths = useMemo(
     () => columnWidths(visibleAds.length, colAvail),
@@ -379,3 +384,14 @@ export const ChoiceAdBanner: React.FC<ChoiceAdBannerProps> = ({
     </box>
   )
 }
+
+/** Preserve canonical request order and never mount a duplicate slot response. */
+export function orderedRequestedAds(
+  ads: AdResponse[],
+  placementIds: readonly string[],
+): AdResponse[] {
+  return placementIds.flatMap((placementId) => {
+    const ad = ads.find((candidate) => candidate.placementId === placementId)
+    return ad ? [ad] : []
+  })
+}

cli/src/components/ad-banner.tsx

@@ -4,6 +4,7 @@ import React, { useCallback, useEffect, useRef, useState } from 'react'
 
 import { Button } from './button'
 import { ChoiceAdBanner, AD_CARD_HEIGHT } from './ad-banner'
+import { visibleWaitingRoomPlacementIds } from '@codebuff/common/ads/waiting-room-placements'
 import { FreebuffModelSelector } from './freebuff-model-selector'
 import { ShimmerText } from './shimmer-text'
 import {
@@ -405,13 +406,15 @@ export const FreebuffLandingScreen: React.FC<FreebuffLandingScreenProps> = ({
   // forceStart bypasses the "wait for first user message" gate inside the hook,
   // which would otherwise block ads here since no conversation exists yet.
   // The server tries Gravity first, then falls back to ZeroClick and Carbon.
+  const waitingRoomPlacementIds = visibleWaitingRoomPlacementIds(terminalWidth)
   const { ads, recordClick, recordImpression } = useGravityAd({
     enabled: true,
     forceStart: true,
     provider: 'gravity',
     // Legacy wire name for this surface — the ads API maps it to placements,
     // so it must not change with the component rename.
     surface: 'waiting_room',
+    placementIds: waitingRoomPlacementIds,
   })
 
   useFreebuffCtrlCExit()
@@ -871,6 +874,7 @@ export const FreebuffLandingScreen: React.FC<FreebuffLandingScreenProps> = ({
           {ads ? (
             <ChoiceAdBanner
               ads={ads}
+              placementIds={waitingRoomPlacementIds}
               onClick={recordClick}
               onImpression={recordImpression}
             />

cli/src/components/freebuff-landing-screen.tsx

@@ -2,11 +2,13 @@ import { describe, expect, test } from 'bun:test'
 
 import {
   claimAdImpression,
+  dispatchFirstPartyViewAcknowledgement,
   isAnswerMessage,
   isInlineAdEligibleAnswer,
 } from '../use-gravity-ad'
 
 import type { ChatMessage } from '../../types/chat'
+import type { FirstPartyViewAckRequest } from '@codebuff/common/ads/first-party-view-ack'
 
 const msg = (over: Partial<ChatMessage>): ChatMessage => ({
   id: 'user-1',
@@ -71,3 +73,76 @@ describe('claimAdImpression', () => {
     expect(fired).toEqual(new Set(['imp-1', 'imp-2']))
   })
 })
+
+describe('dispatchFirstPartyViewAcknowledgement', () => {
+  const request: Omit<FirstPartyViewAckRequest, 'onAttempt'> = {
+    token: 'opaque-imp-url',
+    url: 'https://app.codebuff.com/api/v1/ads/impression',
+    init: {
+      method: 'POST',
+      headers: {
+        Authorization: 'Bearer cli-token',
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({ impUrl: 'opaque-imp-url' }),
+    },
+    surface: 'waiting_room',
+    placementId: 'waiting-room-1',
+    clientFamily: 'cli',
+  }
+
+  test('uses shared acknowledgement with immutable bearer request/context for first-party ads', () => {
+    const calls: FirstPartyViewAckRequest[] = []
+    const telemetry: unknown[] = []
+    const dispatched = dispatchFirstPartyViewAcknowledgement(
+      'first_party',
+      request,
+      (event) => telemetry.push(event),
+      ((params: FirstPartyViewAckRequest) => {
+        calls.push(params)
+        params.onAttempt?.({
+          surface: 'waiting_room',
+          placement_id: 'waiting-room-1',
+          outcome: 'accepted',
+          attempt: 1,
+          duration_ms: 4,
+          client_family: 'cli',
+        })
+        return Promise.resolve()
+      }) as typeof import('@codebuff/common/ads/first-party-view-ack').acknowledgeFirstPartyView,
+    )
+    expect(dispatched).toBe(true)
+    expect(calls).toHaveLength(1)
+    expect(calls[0]).toMatchObject({
+      token: 'opaque-imp-url',
+      surface: 'waiting_room',
+      placementId: 'waiting-room-1',
+      clientFamily: 'cli',
+    })
+    expect(calls[0]?.init).toMatchObject({
+      method: 'POST',
+      headers: { Authorization: 'Bearer cli-token' },
+    })
+    expect(telemetry).toHaveLength(1)
+  })
+
+  test('leaves third-party impressions on the legacy path and caller dedupe remains impUrl based', () => {
+    let calls = 0
+    const acknowledge = (() => {
+      calls++
+      return Promise.resolve()
+    }) as typeof import('@codebuff/common/ads/first-party-view-ack').acknowledgeFirstPartyView
+    expect(
+      dispatchFirstPartyViewAcknowledgement(
+        'gravity',
+        request,
+        () => {},
+        acknowledge,
+      ),
+    ).toBe(false)
+    const fired = new Set<string>()
+    expect(claimAdImpression(fired, 'opaque-imp-url')).toBe(true)
+    expect(claimAdImpression(fired, 'opaque-imp-url')).toBe(false)
+    expect(calls).toBe(0)
+  })
+})