Merge main into subscription-client

Author: brandonkachen

cli/src/components/terminal-command-display.tsx

@@ -20,6 +20,8 @@ interface TerminalCommandDisplayProps {
   cwd?: string
   /** Timeout in seconds for the command */
   timeoutSeconds?: number
+  /** Optional width override for wrapping calculations */
+  availableWidth?: number
 }
 
 /**
@@ -33,10 +35,10 @@ export const TerminalCommandDisplay = ({
   maxVisibleLines,
   isRunning = false,
   timeoutSeconds,
+  availableWidth,
 }: TerminalCommandDisplayProps) => {
   const theme = useTheme()
-  const { contentMaxWidth } = useTerminalDimensions()
-  const padding = 5
+  const { separatorWidth } = useTerminalDimensions()
   const [isExpanded, setIsExpanded] = useState(false)
 
   // Default max lines depends on whether expandable
@@ -77,7 +79,7 @@ export const TerminalCommandDisplay = ({
   }
 
   // With output - calculate visual lines
-  const width = Math.max(10, contentMaxWidth - padding * 2)
+  const width = Math.max(10, availableWidth ?? separatorWidth)
   const allLines = output.split('\n')
 
   // Calculate total visual lines across all output lines

cli/src/components/tools/run-terminal-command.tsx

@@ -49,7 +49,7 @@ export const parseTerminalOutput = (rawOutput: string | undefined): ParsedTermin
 export const RunTerminalCommandComponent = defineToolComponent({
   toolName: 'run_terminal_command',
 
-  render(toolBlock): ToolRenderConfig {
+  render(toolBlock, _theme, options): ToolRenderConfig {
     // Extract command and timeout from input
     const input = toolBlock.input as { command?: string; timeout_seconds?: number } | undefined
     const command = typeof input?.command === 'string' ? input.command.trim() : ''
@@ -67,6 +67,7 @@ export const RunTerminalCommandComponent = defineToolComponent({
         maxVisibleLines={5}
         cwd={startingCwd}
         timeoutSeconds={timeoutSeconds}
+        availableWidth={options.availableWidth}
       />
     )
 

cli/src/components/usage-banner.tsx

@@ -157,7 +157,7 @@ export const UsageBanner = ({ showTime }: { showTime: number }) => {
               )}
             </box>
             {/* See more link */}
-            <text style={{ fg: theme.muted }}>See more on codebuff.com ↗</text>
+            <text style={{ fg: theme.muted }}>See more on {WEBSITE_URL} ↗</text>
           </box>
         </Button>
 

web/src/app/api/stripe/create-subscription/route.ts

@@ -72,6 +72,7 @@ export async function POST(req: NextRequest) {
     const checkoutSession = await stripeServer.checkout.sessions.create({
       customer: user.stripe_customer_id,
       mode: 'subscription',
+      invoice_creation: { enabled: true },
       tax_id_collection: { enabled: true },  // optional (EU B2B)
       customer_update: { name: "auto", address: "auto" },
       line_items: [{ price: priceId, quantity: 1 }],

web/src/app/api/stripe/webhook/__tests__/org-billing-events.test.ts

@@ -38,9 +38,9 @@ const setupMocks = async () => {
   }))
 
   // Import after mocking
-  const webhookModule = await import('../route')
-  isOrgBillingEvent = webhookModule.isOrgBillingEvent
-  isOrgCustomer = webhookModule.isOrgCustomer
+  const helpersModule = await import('../_helpers')
+  isOrgBillingEvent = helpersModule.isOrgBillingEvent
+  isOrgCustomer = helpersModule.isOrgCustomer
 }
 
 // Setup mocks at module load time (following ban-conditions.test.ts pattern)

web/src/app/api/stripe/webhook/_helpers.ts

@@ -0,0 +1,67 @@
+import db from '@codebuff/internal/db'
+import * as schema from '@codebuff/internal/db/schema'
+import { eq } from 'drizzle-orm'
+
+import type Stripe from 'stripe'
+
+import { logger } from '@/util/logger'
+
+/**
+ * Checks whether a Stripe customer ID belongs to an organization.
+ *
+ * Uses `org.stripe_customer_id` which is set at org creation time, making it
+ * reliable regardless of webhook ordering (unlike `stripe_subscription_id`
+ * which may not be populated yet when early invoice events arrive).
+ */
+export async function isOrgCustomer(stripeCustomerId: string): Promise<boolean> {
+  try {
+    const orgs = await db
+      .select({ id: schema.org.id })
+      .from(schema.org)
+      .where(eq(schema.org.stripe_customer_id, stripeCustomerId))
+      .limit(1)
+    return orgs.length > 0
+  } catch (error) {
+    logger.error(
+      { stripeCustomerId, error },
+      'Failed to check if customer is an org - defaulting to false',
+    )
+    return false
+  }
+}
+
+/**
+ * BILLING_DISABLED: Checks if a Stripe event is related to organization billing.
+ * Used to reject org billing events while keeping personal billing working.
+ */
+export async function isOrgBillingEvent(event: Stripe.Event): Promise<boolean> {
+  const eventData = event.data.object as unknown as Record<string, unknown>
+  const metadata = (eventData.metadata || {}) as Record<string, string>
+
+  // Check metadata for organization markers
+  if (metadata.organization_id || metadata.organizationId) {
+    return true
+  }
+  if (metadata.grantType === 'organization_purchase') {
+    return true
+  }
+
+  // For invoice events, check if customer belongs to an org
+  // (metadata.organizationId is already checked above in the generic metadata check)
+  if (event.type.startsWith('invoice.')) {
+    const customerId = eventData.customer
+    if (customerId && typeof customerId === 'string') {
+      return await isOrgCustomer(customerId)
+    }
+  }
+
+  // For subscription events, check if customer is an org
+  if (event.type.startsWith('customer.subscription.')) {
+    const customerId = eventData.customer
+    if (customerId && typeof customerId === 'string') {
+      return await isOrgCustomer(customerId)
+    }
+  }
+
+  return false
+}

web/src/app/api/stripe/webhook/route.ts

@@ -27,66 +27,7 @@ import {
 } from '@/lib/ban-conditions'
 import { ORG_BILLING_ENABLED } from '@/lib/billing-config'
 import { logger } from '@/util/logger'
-
-/**
- * Checks whether a Stripe customer ID belongs to an organization.
- *
- * Uses `org.stripe_customer_id` which is set at org creation time, making it
- * reliable regardless of webhook ordering (unlike `stripe_subscription_id`
- * which may not be populated yet when early invoice events arrive).
- */
-async function isOrgCustomer(stripeCustomerId: string): Promise<boolean> {
-  try {
-    const orgs = await db
-      .select({ id: schema.org.id })
-      .from(schema.org)
-      .where(eq(schema.org.stripe_customer_id, stripeCustomerId))
-      .limit(1)
-    return orgs.length > 0
-  } catch (error) {
-    logger.error(
-      { stripeCustomerId, error },
-      'Failed to check if customer is an org - defaulting to false',
-    )
-    return false
-  }
-}
-
-/**
- * BILLING_DISABLED: Checks if a Stripe event is related to organization billing.
- * Used to reject org billing events while keeping personal billing working.
- */
-async function isOrgBillingEvent(event: Stripe.Event): Promise<boolean> {
-  const eventData = event.data.object as unknown as Record<string, unknown>
-  const metadata = (eventData.metadata || {}) as Record<string, string>
-
-  // Check metadata for organization markers
-  if (metadata.organization_id || metadata.organizationId) {
-    return true
-  }
-  if (metadata.grantType === 'organization_purchase') {
-    return true
-  }
-
-  // For invoice events, check if customer belongs to an org
-  // (metadata.organizationId is already checked above in the generic metadata check)
-  if (event.type.startsWith('invoice.')) {
-    const customerId = eventData.customer
-    if (customerId && typeof customerId === 'string') {
-      return await isOrgCustomer(customerId)
-    }
-  }
-
-  // For subscription events, check if customer is an org
-  if (event.type.startsWith('customer.subscription.')) {
-    const customerId = eventData.customer
-    if (customerId && typeof customerId === 'string') {
-      return await isOrgCustomer(customerId)
-    }
-  }
-
-  return false
-}
+import { isOrgBillingEvent, isOrgCustomer } from './_helpers'
 
 async function handleCheckoutSessionCompleted(
   session: Stripe.Checkout.Session,
@@ -699,6 +640,3 @@ const webhookHandler = async (req: NextRequest): Promise<NextResponse> => {
 }
 
 export { webhookHandler as POST }
-
-// Exported for testing
-export { isOrgBillingEvent, isOrgCustomer }