/usage: Don't add to session credits if credits spent are part of subscription

Author: jahooma

cli/src/chat.tsx

@@ -163,6 +163,11 @@ export const Chat = ({
   const { statusMessage } = useClipboard()
   const { ad } = useGravityAd()
 
+  // Fetch subscription data early - needed for session credits tracking
+  const { data: subscriptionData } = useSubscriptionQuery({
+    refetchInterval: 60 * 1000,
+  })
+
   // Set initial mode from CLI flag on mount
   useEffect(() => {
     if (initialMode) {
@@ -427,6 +432,7 @@ export const Chat = ({
     resumeQueue,
     continueChat,
     continueChatId,
+    subscriptionData,
   })
 
   sendMessageRef.current = sendMessage
@@ -1280,11 +1286,6 @@ export const Chat = ({
     refetchInterval: 60 * 1000, // Refetch every 60 seconds
   })
 
-  // Fetch subscription data
-  const { data: subscriptionData } = useSubscriptionQuery({
-    refetchInterval: 60 * 1000,
-  })
-
   // Auto-show subscription limit banner when rate limit becomes active
   const subscriptionLimitShownRef = useRef(false)
   const subscriptionRateLimit = subscriptionData?.hasSubscription ? subscriptionData.rateLimit : undefined

cli/src/components/message-footer.tsx

@@ -7,6 +7,10 @@ import { CopyButton } from './copy-button'
 import { ElapsedTimer } from './elapsed-timer'
 import { FeedbackIconButton } from './feedback-icon-button'
 import { useSubscriptionQuery } from '../hooks/use-subscription-query'
+import {
+  getBlockPercentRemaining,
+  isCoveredBySubscription,
+} from '../utils/subscription'
 import { useTheme } from '../hooks/use-theme'
 import {
   useFeedbackStore,
@@ -221,19 +225,15 @@ const CreditsOrSubscriptionIndicator: React.FC<{ credits: number }> = ({ credits
     pauseWhenIdle: false,
   })
 
-  const activeSubscription = subscriptionData?.hasSubscription ? subscriptionData : null
-  const rateLimit = activeSubscription?.rateLimit
-
-  const blockPercentRemaining = useMemo(() => {
-    if (!rateLimit?.blockLimit || rateLimit.blockUsed == null) return null
-    return Math.round(((rateLimit.blockLimit - rateLimit.blockUsed) / rateLimit.blockLimit) * 100)
-  }, [rateLimit])
+  const blockPercentRemaining = useMemo(
+    () => getBlockPercentRemaining(subscriptionData),
+    [subscriptionData],
+  )
 
-  const showSubscriptionIndicator =
-    activeSubscription && !rateLimit?.limited && blockPercentRemaining != null && blockPercentRemaining > 0
+  const showSubscriptionIndicator = isCoveredBySubscription(subscriptionData)
 
   if (showSubscriptionIndicator) {
-    const label = blockPercentRemaining < 20
+    const label = (blockPercentRemaining ?? 0) < 20
       ? `✓ ${SUBSCRIPTION_DISPLAY_NAME} (${blockPercentRemaining}% left)`
       : `✓ ${SUBSCRIPTION_DISPLAY_NAME}`
     return (

cli/src/hooks/use-send-message.ts

@@ -38,6 +38,9 @@ import type { SendMessageFn } from '../types/contracts/send-message'
 import type { AgentMode } from '../utils/constants'
 import type { SendMessageTimerEvent } from '../utils/send-message-timer'
 import type { AgentDefinition, MessageContent, RunState } from '@codebuff/sdk'
+import { isCoveredBySubscription } from '../utils/subscription'
+
+import type { SubscriptionResponse } from './use-subscription-query'
 
 interface UseSendMessageOptions {
   inputRef: React.MutableRefObject<any>
@@ -59,6 +62,7 @@ interface UseSendMessageOptions {
   resumeQueue?: () => void
   continueChat: boolean
   continueChatId?: string
+  subscriptionData?: SubscriptionResponse | null
 }
 
 // Choose the agent definition by explicit selection or mode-based fallback.
@@ -109,6 +113,7 @@ export const useSendMessage = ({
   resumeQueue,
   continueChat,
   continueChatId,
+  subscriptionData,
 }: UseSendMessageOptions): {
   sendMessage: SendMessageFn
   clearMessages: () => void
@@ -431,7 +436,11 @@ export const useSendMessage = ({
           setIsRetrying,
           onTotalCost: (cost: number) => {
             actualCredits = cost
-            addSessionCredits(cost)
+            // Only add to session credits if not covered by subscription
+            // (subscription credits are shown separately in the UI)
+            if (!isCoveredBySubscription(subscriptionData)) {
+              addSessionCredits(cost)
+            }
           },
         })
 

cli/src/utils/subscription.ts

@@ -0,0 +1,31 @@
+import type { SubscriptionResponse } from '../hooks/use-subscription-query'
+
+/**
+ * Calculates the percentage of subscription block credits remaining.
+ * Returns null if the subscription data is incomplete.
+ */
+export function getBlockPercentRemaining(
+  subscriptionData: SubscriptionResponse | null | undefined,
+): number | null {
+  if (!subscriptionData?.hasSubscription) return null
+  const rateLimit = subscriptionData.rateLimit
+  if (!rateLimit?.blockLimit || rateLimit.blockUsed == null) return null
+  return Math.round(
+    ((rateLimit.blockLimit - rateLimit.blockUsed) / rateLimit.blockLimit) * 100,
+  )
+}
+
+/**
+ * Determines if a request is covered by subscription based on subscription data.
+ * Returns true if the user has an active subscription that's not rate-limited
+ * and has remaining block credits.
+ */
+export function isCoveredBySubscription(
+  subscriptionData: SubscriptionResponse | null | undefined,
+): boolean {
+  if (!subscriptionData?.hasSubscription) return false
+  const rateLimit = subscriptionData.rateLimit
+  if (rateLimit?.limited) return false
+  const blockPercentRemaining = getBlockPercentRemaining(subscriptionData)
+  return blockPercentRemaining != null && blockPercentRemaining > 0
+}