Merge origin/main into referral-one-time

Resolves merge conflicts to integrate both features:
- referral_legacy grant type for legacy recurring monthly referrals
- subscription grant type from main for subscription-based credits

Conflict resolution:
- common/src/types/grant.ts: Added both referral_legacy and subscription to GrantType
- packages/billing: Updated grant-credits.ts to use referral_legacy for monthly bonuses
- web/src/app/profile: Updated UI components to display both grant types correctly
- DB migrations: Renumbered our migration to 0039 to sequence after main (0036-0038)

Author: brandonkachen

.agents/lib/cli-agent-prompts.ts

@@ -1,6 +1,7 @@
-import type { CliAgentConfig } from './cli-agent-types'
 import { CLI_AGENT_MODES } from './cli-agent-types'
 
+import type { CliAgentConfig } from './cli-agent-types'
+
 const TMUX_SESSION_DOCS = `## Session Logs (Paper Trail)
 
 All session data is stored in **YAML format** in \`debug/tmux-sessions/{session-name}/\`:

.agents/lib/create-cli-agent.ts

@@ -1,12 +1,13 @@
-import type { AgentDefinition } from '../types/agent-definition'
-import type { CliAgentConfig } from './cli-agent-types'
-import { CLI_AGENT_MODES } from './cli-agent-types'
-import { outputSchema } from './cli-agent-schemas'
 import {
   getSpawnerPrompt,
   getSystemPrompt,
   getInstructionsPrompt,
 } from './cli-agent-prompts'
+import { outputSchema } from './cli-agent-schemas'
+import { CLI_AGENT_MODES } from './cli-agent-types'
+
+import type { CliAgentConfig } from './cli-agent-types'
+import type { AgentDefinition } from '../types/agent-definition'
 
 export function createCliAgent(config: CliAgentConfig): AgentDefinition {
   // Simple validation for shortName since it's used in file paths

.agents/notion-researcher.ts

@@ -1,6 +1,7 @@
-import type { AgentDefinition } from './types/agent-definition'
 import { publisher } from './constants'
 
+import type { AgentDefinition } from './types/agent-definition'
+
 const definition: AgentDefinition = {
   id: 'notion-researcher',
   publisher,

.env.example

@@ -18,6 +18,9 @@ STRIPE_SECRET_KEY=sk_test_dummy_stripe_secret
 STRIPE_WEBHOOK_SECRET_KEY=whsec_dummy_webhook_secret
 STRIPE_USAGE_PRICE_ID=price_dummy_usage_id
 STRIPE_TEAM_FEE_PRICE_ID=price_dummy_team_fee_id
+STRIPE_SUBSCRIPTION_100_PRICE_ID=price_dummy_subscription_100_id
+STRIPE_SUBSCRIPTION_200_PRICE_ID=price_dummy_subscription_200_id
+STRIPE_SUBSCRIPTION_500_PRICE_ID=price_dummy_subscription_500_id
 
 # External Services
 LINKUP_API_KEY=dummy_linkup_key

.github/workflows/ci.yml

@@ -143,16 +143,23 @@ jobs:
           command: |
             cd ${{ matrix.package }}
             if [ "${{ matrix.package }}" = ".agents" ]; then
-              TEST_FILES=$(find __tests__ -name '*.test.ts' ! -name '*.integration.test.ts' 2>/dev/null | sort)
+              TEST_FILES=$(find __tests__ -name '*.test.ts' ! -name '*.integration.test.ts' 2>/dev/null | sort | tr '\n' ' ')
               if [ -n "$TEST_FILES" ]; then
-                echo "$TEST_FILES" | xargs -I {} bun test {}
+                bun test $TEST_FILES
               else
                 echo "No regular tests found in .agents"
               fi
             elif [ "${{ matrix.package }}" = "web" ]; then
               bun run test --runInBand
             else
-              find src -name '*.test.ts' ! -name '*.integration.test.ts' | sort | xargs -I {} bun test {}
+              # Run all non-integration tests in a single bun test invocation
+              # This avoids xargs exit code issues with orphaned child processes
+              TEST_FILES=$(find src -name '*.test.ts' ! -name '*.integration.test.ts' 2>/dev/null | sort | tr '\n' ' ')
+              if [ -n "$TEST_FILES" ]; then
+                bun test $TEST_FILES
+              else
+                echo "No tests found in ${{ matrix.package }}"
+              fi
             fi
 
       # - name: Open interactive debug shell
@@ -222,9 +229,9 @@ jobs:
           max_attempts: 3
           command: |
             cd ${{ matrix.package }}
-            TEST_FILES=$(find src -name '*.integration.test.ts' 2>/dev/null | sort)
+            TEST_FILES=$(find src -name '*.integration.test.ts' 2>/dev/null | sort | tr '\n' ' ')
             if [ -n "$TEST_FILES" ]; then
-              echo "$TEST_FILES" | xargs -I {} bun test --timeout=60000 {}
+              bun test --timeout=60000 $TEST_FILES
             else
               echo "No integration tests found in ${{ matrix.package }}"
             fi
@@ -310,9 +317,9 @@ jobs:
           max_attempts: 3
           command: |
             cd packages/billing
-            TEST_FILES=$(find src -name '*.integration.test.ts' 2>/dev/null | sort)
+            TEST_FILES=$(find src -name '*.integration.test.ts' 2>/dev/null | sort | tr '\n' ' ')
             if [ -n "$TEST_FILES" ]; then
-              echo "$TEST_FILES" | xargs -I {} bun test --timeout=60000 {}
+              bun test --timeout=60000 $TEST_FILES
             else
               echo "No integration tests found in packages/billing"
             fi
@@ -398,9 +405,9 @@ jobs:
           max_attempts: 3
           command: |
             cd packages/internal
-            TEST_FILES=$(find src -name '*.integration.test.ts' 2>/dev/null | sort)
+            TEST_FILES=$(find src -name '*.integration.test.ts' 2>/dev/null | sort | tr '\n' ' ')
             if [ -n "$TEST_FILES" ]; then
-              echo "$TEST_FILES" | xargs -I {} bun test --timeout=60000 {}
+              bun test --timeout=60000 $TEST_FILES
             else
               echo "No integration tests found in packages/internal"
             fi

.github/workflows/cli-release-prod.yml

@@ -148,12 +148,10 @@ jobs:
       - name: Set up Node.js for npm publishing
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 24
           registry-url: https://registry.npmjs.org/
 
       - name: Publish to npm
         run: |
           cd cli/release
           npm publish --access public
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

agents-graveyard/base/ask.ts

@@ -3,9 +3,10 @@ import { buildArray } from '@codebuff/common/util/array'
 import { closeXml } from '@codebuff/common/util/xml'
 
 import { publisher } from '../constants'
-import type { SecretAgentDefinition } from '../types/secret-agent-definition'
 import { PLACEHOLDER } from '../types/secret-agent-definition'
 
+import type { SecretAgentDefinition } from '../types/secret-agent-definition'
+
 const definition: SecretAgentDefinition = {
   id: 'ask',
   publisher,

agents-graveyard/base/base-factory.ts

@@ -7,7 +7,7 @@ import {
 } from './base-prompts'
 
 import type { SecretAgentDefinition } from '../../agents/types/secret-agent-definition'
-import type { ModelName } from 'types/agent-definition'
+import type { ModelName } from '../../agents/types/agent-definition'
 
 export const base = (
   model: ModelName,

agents-graveyard/base/base-lite-codex.ts

@@ -1,5 +1,5 @@
-import { publisher } from '../../agents/constants.ts'
 import baseLite from './base-lite.ts'
+import { publisher } from '../../agents/constants.ts'
 
 import type { SecretAgentDefinition } from '../../agents/types/secret-agent-definition.ts'
 

agents-graveyard/base/base-lite-grok-4-fast.ts

@@ -1,11 +1,13 @@
+import { buildArray } from '@codebuff/common/util/array'
+import { closeXml } from '@codebuff/common/util/xml'
+
+import baseLite from './base-lite'
 import { publisher } from '../constants'
+
 import {
   PLACEHOLDER,
-  SecretAgentDefinition,
-} from 'types/secret-agent-definition'
-import baseLite from './base-lite'
-import { buildArray } from '@codebuff/common/util/array'
-import { closeXml } from '@codebuff/common/util/xml'
+  type SecretAgentDefinition,
+} from '../../agents/types/secret-agent-definition'
 
 const definition: SecretAgentDefinition = {
   ...baseLite,