@@ -1,5 +1,7 @@
-import { describe, test, expect } from 'bun:test'
+import { describe, test, expect, mock } from 'bun:test'
 
+import { createStreamController } from '../../hooks/stream-state'
+import { createMessageUpdater } from '../../utils/message-updater'
 import { createRunConfig, isSensitiveFile } from '../../utils/create-run-config'
 
 import type { CreateRunConfigParams } from '../../utils/create-run-config'
@@ -15,6 +17,68 @@ describe('createRunConfig', () => {
       signal: new AbortController().signal,
     } as unknown as CreateRunConfigParams)
 
+  test('analytics observers cannot break SDK callbacks and ignore lost chat ownership', () => {
+    let active = true
+    const observeEvent = mock(() => {
+      throw new Error('capture unavailable')
+    })
+    const observeChunk = mock(() => {
+      throw new Error('capture unavailable')
+    })
+    const run = createRunConfig({
+      agent: 'custom',
+      prompt: 'hi',
+      content: undefined,
+      previousRunState: null,
+      agentDefinitions: [],
+      signal: new AbortController().signal,
+      logger: {
+        info: () => {},
+        debug: () => {},
+        warn: () => {},
+        error: () => {},
+      },
+      eventHandlerState: {
+        isActive: () => active,
+        streaming: {
+          streamRefs: createStreamController(),
+          setStreamingAgents: () => {},
+          setStreamStatus: () => {},
+        },
+        message: {
+          aiMessageId: 'ai-1',
+          updater: createMessageUpdater('ai-1', () => {}),
+          hasReceivedContentRef: { current: false },
+        },
+        subagents: {
+          addActiveSubagent: () => {},
+          removeActiveSubagent: () => {},
+        },
+        mode: { agentMode: 'DEFAULT', setHasReceivedPlanResponse: () => {} },
+        logger: {
+          info: () => {},
+          debug: () => {},
+          warn: () => {},
+          error: () => {},
+        },
+        setIsRetrying: () => {},
+      },
+      observeEvent,
+      observeChunk,
+    })
+    expect(() =>
+      run.handleEvent({ type: 'start', messageHistoryLength: 0 }),
+    ).not.toThrow()
+    expect(() => run.handleStreamChunk('root text')).not.toThrow()
+    expect(observeEvent).toHaveBeenCalledTimes(1)
+    expect(observeChunk).toHaveBeenCalledTimes(1)
+    active = false
+    run.handleEvent({ type: 'start', messageHistoryLength: 0 })
+    run.handleStreamChunk('late text')
+    expect(observeEvent).toHaveBeenCalledTimes(1)
+    expect(observeChunk).toHaveBeenCalledTimes(1)
+  })
+
   test('skips the symbol index only for a base3 root', () => {
     expect(config('base3-free-deepseek-flash').skipSymbolIndex).toBe(true)
     expect(config('base3-fast-free-deepseek-flash').skipSymbolIndex).toBe(true)
 
@@ -27,6 +27,7 @@ import {
 } from '../state/profile-survey-store'
 import { readClipboardText } from '../utils/clipboard-image'
 import { getInputModeConfig } from '../utils/input-modes'
+import { captureCliFunnel, cliFunnelKey } from '../utils/cli-product-funnel'
 import { recordTypedInput } from '../utils/input-profile'
 import { sponsoredRunFor } from '../utils/sponsored-run'
 import { BORDER_CHARS } from '../utils/ui-constants'
@@ -131,6 +132,7 @@ export const ChatInputBar = ({
   onInterruptStream,
 }: ChatInputBarProps) => {
   const inputMode = useChatStore((state) => state.inputMode)
+  const chatSessionId = useChatStore((state) => state.chatSessionId)
   const pendingSkillName = useChatStore((state) => state.pendingSkillName)
 
   const baseModeConfig = getInputModeConfig(inputMode)
@@ -155,6 +157,31 @@ export const ChatInputBar = ({
     (state) => state.snapshot?.account ?? null,
   )
   const hasAnyPreview = hasSuggestionMenu
+  const composerVisible =
+    !sponsoredAccountAsk &&
+    !feedbackMode &&
+    !publishMode &&
+    !askUserState &&
+    !['outOfCredits', 'subscriptionLimit'].includes(inputMode)
+  React.useEffect(() => {
+    if (composerVisible)
+      captureCliFunnel(
+        'composer',
+        'shown',
+        { thread_id: cliFunnelKey(chatSessionId) },
+        chatSessionId,
+      )
+  }, [composerVisible, chatSessionId])
+  const recordComposerTyped = useEvent((text: string) => {
+    recordTypedInput(text)
+    if (text.trim() && (inputMode === 'default' || inputMode === 'skill'))
+      captureCliFunnel(
+        'draft',
+        'started',
+        { thread_id: cliFunnelKey(chatSessionId) },
+        chatSessionId,
+      )
+  })
 
   // In the home directory (or an ancestor) the file tree is only scanned a few
   // levels deep, so tell the user why deeper files don't show up.
@@ -439,7 +466,7 @@ export const ChatInputBar = ({
             onChange={setInputValue}
             onSubmit={handleSubmit}
             onPaste={handleSurveyPaste}
-            onTypedText={recordTypedInput}
+            onTypedText={recordComposerTyped}
             onKeyIntercept={handleKeyIntercept}
             placeholder={effectivePlaceholder}
             focused={inputFocused && !feedbackMode}
@@ -536,7 +563,7 @@ export const ChatInputBar = ({
                 onChange={setInputValue}
                 onSubmit={handleSubmit}
                 onPaste={handleSurveyPaste}
-                onTypedText={recordTypedInput}
+                onTypedText={recordComposerTyped}
                 onKeyIntercept={handleKeyIntercept}
                 placeholder={effectivePlaceholder}
                 focused={inputFocused && !feedbackMode}
 
@@ -23,6 +23,7 @@ import {
   selectFreebuffChatModel,
   requestFreebuffChatAdmission,
 } from '../state/freebuff-chat-store'
+import { captureCliFunnel } from '../utils/cli-product-funnel'
 import { isPlainEnterKey } from '../utils/terminal-enter-detection'
 
 export function FreebuffChatControls() {
@@ -36,11 +37,25 @@ export function FreebuffChatControls() {
   const session = useFreebuffSessionStore((s) => s.session)
   const { clearQueue, queuePaused } = useChatRuntime()
   useEffect(() => {
-    if (pickerOpen) void refreshFreebuffSessionMetadata().catch(() => {})
+    if (pickerOpen) {
+      captureCliFunnel('model_picker', 'shown', { model: nextModel ?? model })
+      void refreshFreebuffSessionMetadata().catch(() => {})
+    }
   }, [pickerOpen])
+  useEffect(() => {
+    if (!admission) return
+    const state =
+      admission.phase === 'failed'
+        ? 'failed'
+        : admission.phase === 'starting'
+          ? 'started'
+          : 'shown'
+    captureCliFunnel('admission', state, { model: admission.model })
+  }, [admission?.phase, admission?.model])
 
   const cancel = useCallback(async () => {
     if (pickerOpen) {
+      captureCliFunnel('model_picker', 'cancelled')
       useFreebuffChatStore.setState({ pickerOpen: false })
       return
     }
@@ -60,6 +75,7 @@ export function FreebuffChatControls() {
         return
       }
     }
+    captureCliFunnel('admission', 'cancelled', { model: current.model })
     const queued = clearQueue()
     const chat = useChatStore.getState()
     const text = [...queued.map((m) => m.content), chat.inputValue]
@@ -81,6 +97,11 @@ export function FreebuffChatControls() {
 
   const confirm = useCallback(() => {
     if (!admission) return
+    if (
+      session?.status === 'takeover_prompt' ||
+      ['confirm', 'failed'].includes(admission.phase)
+    )
+      captureCliFunnel('admission', 'clicked', { model: admission.model })
     if (session?.status === 'takeover_prompt') {
       void takeOverFreebuffSession()
     } else if (admission.phase === 'confirm') {
@@ -117,8 +138,20 @@ export function FreebuffChatControls() {
           maxHeight={Math.max(4, Math.floor(terminalHeight * 0.65) - 2)}
           selectedModelOverride={nextModel ?? model}
           initialView={pickerInitialView}
-          onSelectModel={selectFreebuffChatModel}
-          onCancel={() => useFreebuffChatStore.setState({ pickerOpen: false })}
+          onSelectModel={(selected) => {
+            selectFreebuffChatModel(selected)
+            if (!useFreebuffChatStore.getState().pickerOpen)
+              captureCliFunnel('model_selection', 'selected', {
+                model: selected,
+                previous_model: nextModel ?? model,
+                selection_kind:
+                  selected === (nextModel ?? model) ? 'reselected' : 'changed',
+              })
+          }}
+          onCancel={() => {
+            captureCliFunnel('model_picker', 'cancelled')
+            useFreebuffChatStore.setState({ pickerOpen: false })
+          }}
         />
       </box>
     )
 
@@ -18,6 +18,7 @@ import { useSheenAnimation } from '../hooks/use-sheen-animation'
 import { useTheme } from '../hooks/use-theme'
 import { formatUrl, calculateResponsiveLayout } from '../login/utils'
 import { useLoginStore } from '../state/login-store'
+import { captureCliFunnel } from '../utils/cli-product-funnel'
 import { IS_FREEBUFF } from '../utils/constants'
 import { copyTextToClipboard, isRemoteSession } from '../utils/clipboard'
 import { getFingerprintId } from '../utils/fingerprint'
@@ -36,6 +37,7 @@ export const LoginModal = ({
   hasInvalidCredentials = false,
 }: LoginModalProps) => {
   const renderer = useRenderer()
+  useEffect(() => captureCliFunnel('login', 'shown'), [])
   const theme = useTheme()
 
   // Use zustand store for all state
 
@@ -1,6 +1,6 @@
 import os from 'os'
 
-import React, { useCallback, useMemo, useState } from 'react'
+import React, { useCallback, useEffect, useMemo, useState } from 'react'
 
 import { Button } from './button'
 import { MultilineInput } from './multiline-input'
@@ -13,6 +13,7 @@ import { useSearchableList } from '../hooks/use-searchable-list'
 import { useSheenAnimation } from '../hooks/use-sheen-animation'
 import { useTerminalLayout } from '../hooks/use-terminal-layout'
 import { useTheme } from '../hooks/use-theme'
+import { captureCliFunnel } from '../utils/cli-product-funnel'
 import { exitCliCleanly } from '../utils/exit-cleanly'
 import { formatCwd } from '../utils/path-helpers'
 import { loadRecentProjects } from '../utils/recent-projects'
@@ -62,6 +63,9 @@ export const ProjectPickerScreen: React.FC<ProjectPickerScreenProps> = ({
   initialPath,
 }) => {
   const theme = useTheme()
+  useEffect(() => {
+    captureCliFunnel('context', 'shown', { project_kind: 'folder' })
+  }, [])
   const [sheenPosition, setSheenPosition] = useState(0)
 
   // Directory browsing state and navigation
 
@@ -4,6 +4,7 @@ import { useCallback, useEffect, useState } from 'react'
 import { useAuthQuery, useLogoutMutation } from './use-auth-query'
 import { useChatStore } from '../state/chat-store'
 import { useLoginStore } from '../state/login-store'
+import { captureCliFunnel } from '../utils/cli-product-funnel'
 import { identifyUser, trackEvent } from '../utils/analytics'
 import { getUserCredentials } from '../utils/auth'
 import { resetCodebuffClient } from '../utils/codebuff-client'
@@ -80,6 +81,7 @@ export const useAuthState = ({
         // the login modal, so `cli.login` would otherwise never fire for them —
         // making them look like a login-step drop-off in the funnel even though
         // they're authenticated. Emit it here too, tagged by `via`.
+        captureCliFunnel('login', 'succeeded', { restored: true }, 'restore')
         trackEvent(AnalyticsEvent.LOGIN, {
           userId: authQuery.data.id,
           via: 'session_restore',
@@ -106,6 +108,8 @@ export const useAuthState = ({
         })
       }
 
+      captureCliFunnel('login', 'succeeded', { restored: false })
+
       // Track successful login
       trackEvent(AnalyticsEvent.LOGIN, {
         userId: loggedInUser.id,
 
@@ -4,6 +4,7 @@ import { safeOpen } from '../utils/open-url'
 
 import { LOGIN_WEBSITE_URL } from '../login/constants'
 import { generateLoginUrl } from '../login/login-flow'
+import { captureCliFunnel } from '../utils/cli-product-funnel'
 import { trackEvent } from '../utils/analytics'
 import { logger } from '../utils/logger'
 import { IS_FREEBUFF } from '../utils/constants'
@@ -30,6 +31,7 @@ export function useFetchLoginUrl({
 }: UseFetchLoginUrlParams) {
   const fetchLoginUrlMutation = useMutation({
     mutationFn: async (fingerprintId: string) => {
+      captureCliFunnel('login', 'started')
       return generateLoginUrl(
         {
           logger,
@@ -44,16 +46,19 @@ export function useFetchLoginUrl({
       )
     },
     onSuccess: async (data) => {
+      captureCliFunnel('login', 'ready')
       setLoginUrl(data.loginUrl)
       setFingerprintHash(data.fingerprintHash)
       setExpiresAt(data.expiresAt)
       setIsWaitingForEnter(true)
       setHasOpenedBrowser(true)
 
-      // Open browser after fetching URL
-      await safeOpen(data.loginUrl)
+      // OS handoff cannot confirm the browser loaded the auth page.
+      const opened = await safeOpen(data.loginUrl)
+      captureCliFunnel('browser', opened ? 'opened' : 'failed')
     },
     onError: (err) => {
+      captureCliFunnel('login', 'failed', { reason: 'error' })
       setError(err instanceof Error ? err.message : 'Failed to get login URL')
       logger.error(
         {
 
@@ -2,6 +2,7 @@ import { useEffect, useRef } from 'react'
 
 import { LOGIN_WEBSITE_URL } from '../login/constants'
 import { pollLoginStatus } from '../login/login-flow'
+import { captureCliFunnel } from '../utils/cli-product-funnel'
 import { trackEvent } from '../utils/analytics'
 import { logger } from '../utils/logger'
 
@@ -88,6 +89,7 @@ export function useLoginPolling({
           const user = result.user as User
           onSuccessRef.current(user)
         } else if (result.status === 'timeout') {
+          captureCliFunnel('login', 'failed', { reason: 'timeout' })
           logger.warn('Login polling timed out after configured limit')
           onTimeoutRef.current()
         }