Kilo-Org · evanjacobson · Mar 24, 2026 · Mar 24, 2026 · Mar 24, 2026 · Mar 24, 2026
diff --git a/.env.development.local.example b/.env.development.local.example
@@ -1,5 +1,3 @@
-# Email provider: 'customerio' (default) or 'mailgun'
-# EMAIL_PROVIDER=customerio
 # MAILGUN_API_KEY=key-...
 # MAILGUN_DOMAIN=app.kilocode.ai
 

diff --git a/.env.test b/.env.test
@@ -3,7 +3,6 @@ NEXTAUTH_URL=http://localhost:3000
 NEXTAUTH_SECRET=test-only-non-secret
 XAI_API_KEY=invalid-mock-grok-key
 MISTRAL_API_KEY=invalid-mock-mistral-key
-CUSTOMERIO_EMAIL_API_KEY=invalid-mock-customerio-key
 STRIPE_SECRET_KEY=invalid-mock-stripe-key
 POSTGRES_URL="postgres://postgres:postgres@localhost:5432/postgres"
 POSTGRES_CONNECT_TIMEOUT=10000
@@ -84,4 +83,3 @@ STRIPE_KILOCLAW_STANDARD_FIRST_MONTH_COUPON_ID=coupon_test_kiloclaw_standard_fir
 NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=pk_test_invalid_mock_key
 
 CREDIT_CATEGORIES_ENCRYPTION_KEY=
-EMAIL_PROVIDER=customerio
diff --git a/package.json b/package.json
@@ -106,7 +106,6 @@
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
-    "customerio-node": "^4.3.0",
     "date-fns": "^4.1.0",
     "dayjs": "^1.11.20",
     "discord-api-types": "^0.38.42",

diff --git a/packages/trpc/dist/index.d.ts b/packages/trpc/dist/index.d.ts
@@ -10547,46 +10547,26 @@ declare const rootRouter: _trpc_server.TRPCBuiltRouter<{
                 input: void;
                 output: {
                     name: "orgSubscription" | "orgRenewed" | "orgCancelled" | "orgSSOUserJoined" | "orgInvitation" | "magicLink" | "balanceAlert" | "autoTopUpFailed" | "ossInviteNewUser" | "ossInviteExistingUser" | "ossExistingOrgProvisioned" | "deployFailed" | "clawTrialEndingSoon" | "clawTrialExpiresTomorrow" | "clawSuspendedTrial" | "clawSuspendedSubscription" | "clawSuspendedPayment" | "clawDestructionWarning" | "clawInstanceDestroyed" | "clawEarlybirdEndingSoon" | "clawEarlybirdExpiresTomorrow";
-                    subject: string;
+                    subject: "Welcome to Kilo for Teams!" | "Kilo: Your Teams Subscription Renewal" | "Kilo: Your Teams Subscription is Cancelled" | "Kilo: New SSO User Joined Your Organization" | "Kilo: Teams Invitation" | "Sign in to Kilo Code" | "Kilo: Low Balance Alert" | "Kilo: Auto Top-Up Failed" | "Kilo: OSS Sponsorship Offer" | "Kilo: Your Deployment Failed" | "Your KiloClaw Trial Ends in 2 Days" | "Your KiloClaw Trial Expires Tomorrow" | "Your KiloClaw Trial Has Ended" | "Your KiloClaw Subscription Has Ended" | "Action Required: KiloClaw Payment Overdue" | "Your KiloClaw Instance Will Be Deleted in 2 Days" | "Your KiloClaw Instance Has Been Deleted" | "Your KiloClaw Earlybird Access Ends Soon" | "Your KiloClaw Earlybird Access Expires Tomorrow";
                 }[];
                 meta: object;
             }>;
-            getProviders: _trpc_server.TRPCQueryProcedure<{
-                input: void;
-                output: ("customerio" | "mailgun")[];
-                meta: object;
-            }>;
             getPreview: _trpc_server.TRPCQueryProcedure<{
                 input: {
                     template: "orgSubscription" | "orgRenewed" | "orgCancelled" | "orgSSOUserJoined" | "orgInvitation" | "magicLink" | "balanceAlert" | "autoTopUpFailed" | "ossInviteNewUser" | "ossInviteExistingUser" | "ossExistingOrgProvisioned" | "deployFailed" | "clawTrialEndingSoon" | "clawTrialExpiresTomorrow" | "clawSuspendedTrial" | "clawSuspendedSubscription" | "clawSuspendedPayment" | "clawDestructionWarning" | "clawInstanceDestroyed" | "clawEarlybirdEndingSoon" | "clawEarlybirdExpiresTomorrow";
-                    provider: "customerio" | "mailgun";
                 };
                 output: {
-                    type: "mailgun";
-                    subject: string;
+                    subject: "Welcome to Kilo for Teams!" | "Kilo: Your Teams Subscription Renewal" | "Kilo: Your Teams Subscription is Cancelled" | "Kilo: New SSO User Joined Your Organization" | "Kilo: Teams Invitation" | "Sign in to Kilo Code" | "Kilo: Low Balance Alert" | "Kilo: Auto Top-Up Failed" | "Kilo: OSS Sponsorship Offer" | "Kilo: Your Deployment Failed" | "Your KiloClaw Trial Ends in 2 Days" | "Your KiloClaw Trial Expires Tomorrow" | "Your KiloClaw Trial Has Ended" | "Your KiloClaw Subscription Has Ended" | "Action Required: KiloClaw Payment Overdue" | "Your KiloClaw Instance Will Be Deleted in 2 Days" | "Your KiloClaw Instance Has Been Deleted" | "Your KiloClaw Earlybird Access Ends Soon" | "Your KiloClaw Earlybird Access Expires Tomorrow";
                     html: string;
-                    transactional_message_id?: undefined;
-                    message_data?: undefined;
-                } | {
-                    type: "customerio";
-                    transactional_message_id: "6" | "10" | "11" | "12" | "13" | "14" | "16" | "17" | "18" | "19" | "20" | "21" | "22" | "23" | "24" | "25" | "26" | "27" | "28" | "29" | "30";
-                    subject: string;
-                    message_data: Record<string, string>;
-                    html?: undefined;
                 };
                 meta: object;
             }>;
             sendTest: _trpc_server.TRPCMutationProcedure<{
                 input: {
                     template: "orgSubscription" | "orgRenewed" | "orgCancelled" | "orgSSOUserJoined" | "orgInvitation" | "magicLink" | "balanceAlert" | "autoTopUpFailed" | "ossInviteNewUser" | "ossInviteExistingUser" | "ossExistingOrgProvisioned" | "deployFailed" | "clawTrialEndingSoon" | "clawTrialExpiresTomorrow" | "clawSuspendedTrial" | "clawSuspendedSubscription" | "clawSuspendedPayment" | "clawDestructionWarning" | "clawInstanceDestroyed" | "clawEarlybirdEndingSoon" | "clawEarlybirdExpiresTomorrow";
-                    provider: "customerio" | "mailgun";
                     recipient: string;
                 };
                 output: {
-                    provider: "customerio";
-                    recipient: string;
-                } | {
-                    provider: "mailgun";
                     recipient: string;
                 };
                 meta: object;

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/app/admin/email-testing/page.tsx b/src/app/admin/email-testing/page.tsx
@@ -34,11 +34,9 @@ export default function EmailTestingPage() {
   const { data: session } = useSession();
 
   const [selectedTemplate, setSelectedTemplate] = useState<string | null>(null);
-  const [selectedProvider, setSelectedProvider] = useState<string | null>(null);
   const [recipient, setRecipient] = useState<string>('');
 
   const { data: templates } = useQuery(trpc.admin.emailTesting.getTemplates.queryOptions());
-  const { data: providers } = useQuery(trpc.admin.emailTesting.getProviders.queryOptions());
 
   // Pre-fill recipient with logged-in admin's email
   useEffect(() => {
@@ -47,44 +45,36 @@ export default function EmailTestingPage() {
     }
   }, [session?.user?.email, recipient]);
 
-  // Auto-select first template and provider on load
+  // Auto-select first template on load
   useEffect(() => {
     if (templates && templates.length > 0 && !selectedTemplate) {
       setSelectedTemplate(templates[0].name);
     }
   }, [templates, selectedTemplate]);
 
-  useEffect(() => {
-    if (providers && providers.length > 0 && !selectedProvider) {
-      setSelectedProvider(providers[0]);
-    }
-  }, [providers, selectedProvider]);
-
   const previewQuery = useQuery(
     trpc.admin.emailTesting.getPreview.queryOptions(
       {
-        // Values come directly from the server's getTemplates/getProviders responses,
+        // Values come directly from the server's getTemplates response,
         // so the cast is safe — tRPC zod will reject anything invalid at runtime anyway.
         template: (selectedTemplate ?? 'orgSubscription') as TemplateName,
-        provider: (selectedProvider ?? 'customerio') as 'customerio' | 'mailgun',
       },
-      { enabled: selectedTemplate !== null && selectedProvider !== null }
+      { enabled: selectedTemplate !== null }
     )
   );
 
   const sendTestMutation = useMutation(trpc.admin.emailTesting.sendTest.mutationOptions());
 
   const handleSend = () => {
-    if (!selectedTemplate || !selectedProvider || !recipient) return;
+    if (!selectedTemplate || !recipient) return;
     sendTestMutation.mutate(
       {
         template: selectedTemplate as TemplateName,
-        provider: selectedProvider as 'customerio' | 'mailgun',
         recipient,
       },
       {
         onSuccess: result => {
-          toast.success(`Test email sent via ${result?.provider} to ${result?.recipient}`);
+          toast.success(`Test email sent to ${result?.recipient}`);
         },
         onError: error => {
           toast.error(error.message || 'Failed to send test email');
@@ -111,11 +101,11 @@ export default function EmailTestingPage() {
               Test Email Controls
             </CardTitle>
             <CardDescription>
-              Select a template and provider, then send a test email to any address.
+              Select a template, then send a test email to any address.
             </CardDescription>
           </CardHeader>
           <CardContent className="space-y-4">
-            <div className="grid gap-4 sm:grid-cols-3">
+            <div className="grid gap-4 sm:grid-cols-2">
               <div>
                 <Label htmlFor="template">Template</Label>
                 <Select value={selectedTemplate ?? ''} onValueChange={v => setSelectedTemplate(v)}>
@@ -132,22 +122,6 @@ export default function EmailTestingPage() {
                 </Select>
               </div>
 
-              <div>
-                <Label htmlFor="provider">Provider</Label>
-                <Select value={selectedProvider ?? ''} onValueChange={v => setSelectedProvider(v)}>
-                  <SelectTrigger id="provider">
-                    <SelectValue placeholder="Select provider..." />
-                  </SelectTrigger>
-                  <SelectContent>
-                    {providers?.map(p => (
-                      <SelectItem key={p} value={p}>
-                        {p}
-                      </SelectItem>
-                    ))}
-                  </SelectContent>
-                </Select>
-              </div>
-
               <div>
                 <Label htmlFor="recipient">Recipient</Label>
                 <Input
@@ -162,9 +136,7 @@ export default function EmailTestingPage() {
 
             <Button
               onClick={handleSend}
-              disabled={
-                !selectedTemplate || !selectedProvider || !recipient || sendTestMutation.isPending
-              }
+              disabled={!selectedTemplate || !recipient || sendTestMutation.isPending}
             >
               <Send className="mr-2 h-4 w-4" />
               {sendTestMutation.isPending ? 'Sending...' : 'Send Test Email'}
@@ -173,7 +145,7 @@ export default function EmailTestingPage() {
         </Card>
 
         {/* Preview Pane */}
-        {selectedTemplate && selectedProvider && (
+        {selectedTemplate && (
           <Card>
             <CardHeader>
               <CardTitle className="flex items-center gap-2">
@@ -185,49 +157,13 @@ export default function EmailTestingPage() {
                   </span>
                 )}
               </CardTitle>
-              <CardDescription>
-                {selectedProvider === 'customerio'
-                  ? 'Variables that will be sent to the Customer.io API'
-                  : 'Rendered HTML email'}
-              </CardDescription>
+              <CardDescription>Rendered HTML email</CardDescription>
             </CardHeader>
             <CardContent>
               {previewQuery.isPending && (
                 <p className="text-muted-foreground text-sm">Loading preview...</p>
               )}
-              {previewQuery.data?.type === 'customerio' && (
-                <div className="space-y-2">
-                  <p className="text-muted-foreground text-xs">
-                    Template ID:{' '}
-                    <span className="font-mono">{previewQuery.data.transactional_message_id}</span>
-                  </p>
-                  <div className="rounded-lg border">
-                    <table className="w-full text-sm">
-                      <thead>
-                        <tr className="border-b">
-                          <th className="text-muted-foreground px-4 py-2 text-left font-medium">
-                            Variable
-                          </th>
-                          <th className="text-muted-foreground px-4 py-2 text-left font-medium">
-                            Value
-                          </th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                        {Object.entries(previewQuery.data.message_data).map(([key, value]) => (
-                          <tr key={key} className="border-b last:border-0">
-                            <td className="px-4 py-2 font-mono text-xs">{key}</td>
-                            <td className="px-4 py-2 font-mono text-xs break-all">
-                              {String(value)}
-                            </td>
-                          </tr>
-                        ))}
-                      </tbody>
-                    </table>
-                  </div>
-                </div>
-              )}
-              {previewQuery.data?.type === 'mailgun' && (
+              {previewQuery.data && (
                 <iframe
                   srcDoc={previewQuery.data.html}
                   className="h-[600px] w-full rounded-lg border"

diff --git a/src/lib/config.server.ts b/src/lib/config.server.ts
@@ -8,17 +8,8 @@ import 'server-only';
 
 export const IS_IN_AUTOMATED_TEST = !!getEnvVariable('IS_IN_AUTOMATED_TEST');
 export const NEXTAUTH_URL = APP_URL;
-export const CUSTOMERIO_EMAIL_API_KEY = getEnvVariable('CUSTOMERIO_EMAIL_API_KEY');
 export const MAILGUN_API_KEY = getEnvVariable('MAILGUN_API_KEY');
 export const MAILGUN_DOMAIN = getEnvVariable('MAILGUN_DOMAIN');
-// Which email backend to use: 'customerio' (default) or 'mailgun'
-const emailProviderRaw = getEnvVariable('EMAIL_PROVIDER') || 'customerio';
-if (emailProviderRaw !== 'customerio' && emailProviderRaw !== 'mailgun') {
-  throw new Error(
-    `Invalid EMAIL_PROVIDER: '${emailProviderRaw}'. Must be 'customerio' or 'mailgun'`
-  );
-}
-export const EMAIL_PROVIDER = emailProviderRaw;
 export const WORKOS_API_KEY = getEnvVariable('WORKOS_API_KEY');
 export const WORKOS_CLIENT_ID = getEnvVariable('WORKOS_CLIENT_ID');
 export const GOOGLE_CLIENT_ID = getEnvVariable('GOOGLE_CLIENT_ID');

diff --git a/src/lib/email-customerio.ts b/src/lib/email-customerio.ts