From d0e87f5081fb235a53bc26dccd4ec2bc50489e6b Mon Sep 17 00:00:00 2001
From: Harshith Mullapudi <harshithmullapudi@gmail.com>
Date: Sat, 18 Jul 2026 21:30:07 +0530
Subject: [PATCH 1/2] fix(billing): correct Pro plan credits display to 10k/mo

The Pro plan card in settings.billing showed "Credits: 15k/mo" which
did not match the actual plan grant.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 apps/webapp/app/routes/settings.billing.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/webapp/app/routes/settings.billing.tsx b/apps/webapp/app/routes/settings.billing.tsx
index c287ec94..80f39c53 100644
--- a/apps/webapp/app/routes/settings.billing.tsx
+++ b/apps/webapp/app/routes/settings.billing.tsx
@@ -665,7 +665,7 @@ export default function BillingSettings() {
               </div>
               <ul className="mb-6 space-y-2 text-sm">
                 <li className="flex items-start gap-2">
-                  <span>Credits: 15k/mo</span>
+                  <span>Credits: 10k/mo</span>
                 </li>
                 <li className="flex items-start gap-2">
                   <span>Top up any time · credits never expire</span>

From 2359eb79179c581a65f325885d6def89b1e71765 Mon Sep 17 00:00:00 2001
From: Harshith Mullapudi <harshithmullapudi@gmail.com>
Date: Sat, 18 Jul 2026 21:34:46 +0530
Subject: [PATCH 2/2] chore(logs): log root cause on /api/v1/add and google
 OAuth callback 500s

Both routes were returning 500 without any actionable log line:
- /api/v1/add relied on the apiBuilder catch, which logs the error
  but has no request context (userId, workspaceId, source).
- /auth/google/callback had no try/catch at all, so the failure
  bubbled up silently.

Wrap the handlers, log with request context, then re-throw so the
response status is unchanged.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 apps/webapp/app/routes/api.v1.add.tsx         | 23 ++++++++-
 .../app/routes/auth.google.callback.tsx       | 51 +++++++++++++------
 2 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/apps/webapp/app/routes/api.v1.add.tsx b/apps/webapp/app/routes/api.v1.add.tsx
index 481625fd..b8767c2a 100644
--- a/apps/webapp/app/routes/api.v1.add.tsx
+++ b/apps/webapp/app/routes/api.v1.add.tsx
@@ -2,6 +2,7 @@ import { json } from "@remix-run/node";
 
 import { createHybridActionApiRoute } from "~/services/routeBuilders/apiBuilder.server";
 import { addToQueue } from "~/lib/ingest.server";
+import { logger } from "~/services/logger.service";
 import { IngestBodyRequest } from "~/trigger/ingest/ingest";
 
 const { action, loader } = createHybridActionApiRoute(
@@ -14,8 +15,26 @@ const { action, loader } = createHybridActionApiRoute(
     corsStrategy: "all",
   },
   async ({ body, authentication }) => {
-    const response = await addToQueue(body, authentication.userId, authentication?.workspaceId as string);
-    return json({ success: true, id: response.id });
+    try {
+      const response = await addToQueue(
+        body,
+        authentication.userId,
+        authentication?.workspaceId as string,
+      );
+      return json({ success: true, id: response.id });
+    } catch (error) {
+      logger.error("api.v1.add addToQueue failed", {
+        userId: authentication.userId,
+        workspaceId: authentication?.workspaceId,
+        source: (body as { source?: unknown })?.source,
+        episodeBodyKeys: body ? Object.keys(body as Record<string, unknown>) : [],
+        error:
+          error instanceof Error
+            ? { name: error.name, message: error.message, stack: error.stack }
+            : String(error),
+      });
+      throw error;
+    }
   },
 );
 
diff --git a/apps/webapp/app/routes/auth.google.callback.tsx b/apps/webapp/app/routes/auth.google.callback.tsx
index fc8f96d6..6d980750 100644
--- a/apps/webapp/app/routes/auth.google.callback.tsx
+++ b/apps/webapp/app/routes/auth.google.callback.tsx
@@ -15,23 +15,42 @@ export let loader: LoaderFunction = async ({ request }) => {
     redirectTo,
   });
 
-  const authuser = await authenticator.authenticate("google", request);
-  const headers = await saveSession(request, authuser);
+  try {
+    const authuser = await authenticator.authenticate("google", request);
+    const headers = await saveSession(request, authuser);
 
-  logger.debug("auth.google.callback authuser", {
-    authuser,
-  });
+    logger.debug("auth.google.callback authuser", {
+      authuser,
+    });
 
-  const user = await getUserById(authuser.userId);
-  if (user && !user.onboardingComplete && !redirectTo.startsWith("/onboarding")) {
-    const onboardingUrl =
-      redirectTo && redirectTo !== "/"
-        ? `/onboarding?redirectTo=${encodeURIComponent(redirectTo)}`
-        : "/onboarding";
-    return redirect(onboardingUrl, { headers });
-  }
+    const user = await getUserById(authuser.userId);
+    if (
+      user &&
+      !user.onboardingComplete &&
+      !redirectTo.startsWith("/onboarding")
+    ) {
+      const onboardingUrl =
+        redirectTo && redirectTo !== "/"
+          ? `/onboarding?redirectTo=${encodeURIComponent(redirectTo)}`
+          : "/onboarding";
+      return redirect(onboardingUrl, { headers });
+    }
 
-  return redirect(redirectTo, {
-    headers,
-  });
+    return redirect(redirectTo, {
+      headers,
+    });
+  } catch (error) {
+    const url = new URL(request.url);
+    logger.error("auth.google.callback failed", {
+      redirectTo,
+      hasCode: url.searchParams.has("code"),
+      hasState: url.searchParams.has("state"),
+      scope: url.searchParams.get("scope"),
+      error:
+        error instanceof Error
+          ? { name: error.name, message: error.message, stack: error.stack }
+          : String(error),
+    });
+    throw error;
+  }
 };