Merge branch 'main' into subscription-client

Author: jahooma

cli/release/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codebuff",
-  "version": "1.0.607",
+  "version": "1.0.609",
   "description": "AI coding agent",
   "license": "MIT",
   "bin": {

cli/src/components/validation-error-popover.tsx

@@ -77,9 +77,10 @@ export const ValidationErrorPopover: React.FC<ValidationErrorPopoverProps> = ({
         </box>
 
         <box style={{ flexDirection: 'column', paddingTop: 1, gap: 0 }}>
-          {errors.slice(0, 3).map((error) => {
-            const agentId = error.id.replace(/_\d+$/, '')
-            const isNetworkError = error.id === NETWORK_ERROR_ID
+          {errors.slice(0, 3).map((error, index) => {
+            const errorId = error.id ?? ''
+            const agentId = errorId.replace(/_\d+$/, '')
+            const isNetworkError = errorId === NETWORK_ERROR_ID
             const agentInfo = loadedAgentsData?.agents.find(
               (a) => a.id === agentId,
             ) as LocalAgentInfo | undefined
@@ -91,7 +92,7 @@ export const ValidationErrorPopover: React.FC<ValidationErrorPopoverProps> = ({
             if (isNetworkError) {
               return (
                 <box
-                  key={error.id}
+                  key={errorId || `error-${index}`}
                   style={{ flexDirection: 'column', paddingTop: 0.5 }}
                 >
                   <text style={{ fg: theme.muted, wrapMode: 'word' }}>
@@ -104,7 +105,7 @@ export const ValidationErrorPopover: React.FC<ValidationErrorPopoverProps> = ({
             if (agentInfo?.filePath) {
               return (
                 <box
-                  key={error.id}
+                  key={errorId || `error-${index}`}
                   style={{ flexDirection: 'column', paddingTop: 0.5 }}
                 >
                   <text style={{ fg: theme.muted, wrapMode: 'word' }}>
@@ -131,11 +132,11 @@ export const ValidationErrorPopover: React.FC<ValidationErrorPopoverProps> = ({
 
             return (
               <box
-                key={error.id}
+                key={errorId || `error-${index}`}
                 style={{ flexDirection: 'column', paddingTop: 0.5 }}
               >
                 <text style={{ fg: theme.muted, wrapMode: 'word' }}>
-                  {`• ${agentId}`}
+                  {`• ${agentId || 'Unknown'}`}
                 </text>
                 <text
                   style={{

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

@@ -83,12 +83,7 @@ export const useMessageQueue = (
       return
     }
 
-    // Log why queue is blocked (only when there are messages waiting)
     if (!canProcessQueue) {
-      logger.debug(
-        { queueLength, canProcessQueue },
-        '[message-queue] Queue blocked: canProcessQueue disabled',
-      )
       return
     }
     if (streamStatus !== 'idle') {

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

@@ -103,7 +103,7 @@ export const useSendMessage = ({
   onBeforeMessageSend,
   mainAgentTimer,
   scrollToLatest,
-  onTimerEvent = () => {},
+  onTimerEvent = () => { },
   isQueuePausedRef,
   isProcessingQueueRef,
   resumeQueue,
@@ -289,12 +289,13 @@ export const useSendMessage = ({
           const errorsToAttach =
             validationResult.errors.length === 0
               ? [
-                  {
-                    id: NETWORK_ERROR_ID,
-                    message:
-                      'Agent validation failed. This may be due to a network issue or temporary server problem. Please try again.',
-                  },
-                ]
+                // Hide this for now, as validate endpoint may be flaky and we don't want to bother users.
+                // {
+                //   id: NETWORK_ERROR_ID,
+                //   message:
+                //     'Agent validation failed. This may be due to a network issue or temporary server problem. Please try again.',
+                // },
+              ]
               : validationResult.errors
 
           setMessages((prev) =>

cli/src/login/plain-login.ts

@@ -1,4 +1,3 @@
-import open from 'open'
 import { cyan, green, red, yellow, bold } from 'picocolors'
 
 import { WEBSITE_URL } from './constants'
@@ -47,15 +46,7 @@ export async function runPlainLogin(): Promise<void> {
   console.log()
   console.log(cyan(loginData.loginUrl))
   console.log()
-
-  // Try to open browser, silently ignore failure (expected on remote servers)
-  try {
-    await open(loginData.loginUrl)
-    console.log(green('Browser opened. Waiting for login...'))
-  } catch {
-    console.log(yellow('Could not open browser — please open the URL above manually.'))
-  }
-
+  console.log(yellow('Please open the URL above manually to complete login.'))
   console.log()
   console.log('Waiting for login...')
 

common/src/constants/grant-priorities.ts

@@ -1,10 +1,12 @@
 import type { GrantType } from '@codebuff/common/types/grant'
 
+// Lower = consumed first
 export const GRANT_PRIORITIES: Record<GrantType, number> = {
   subscription: 10,
   free: 20,
-  referral: 30,
+  referral_legacy: 30, // Legacy recurring referrals (renews monthly, consumed first)
   ad: 40,
+  referral: 50, // One-time referrals (never expires, preserved longer)
   admin: 60,
   organization: 70,
   purchase: 80,

common/src/constants/limits.ts

@@ -5,7 +5,7 @@ export const MAX_DATE = new Date(86399999999999)
 export const BILLING_PERIOD_DAYS = 30
 export const SESSION_MAX_AGE_SECONDS = 30 * 24 * 60 * 60 // 30 days
 export const SESSION_TIME_WINDOW_MS = 30 * 60 * 1000 // 30 minutes - used for matching sessions created around fingerprint creation
-export const CREDITS_REFERRAL_BONUS = 250
+export const CREDITS_REFERRAL_BONUS = 500
 export const AFFILIATE_USER_REFFERAL_LIMIT = 500
 
 // Default number of free credits granted per cycle

common/src/types/grant.ts

@@ -1,6 +1,7 @@
 export type GrantType =
   | 'free'
   | 'referral'
+  | 'referral_legacy'
   | 'subscription'
   | 'purchase'
   | 'admin'
@@ -10,6 +11,7 @@ export type GrantType =
 export const GrantTypeValues = [
   'free',
   'referral',
+  'referral_legacy',
   'subscription',
   'purchase',
   'admin',