@agent-native/core 0.84.17 → 0.84.20

package/corpus/templates/calendar/app/components/calendar/GoogleSetupWizard.tsx

@@ -5,6 +5,7 @@ import {
 } from "@agent-native/core/client";
 import {
   IconExternalLink,
+  IconAlertTriangle,
   IconCheck,
   IconCircle,
   IconLoader2,
@@ -15,6 +16,7 @@ import { useState, useEffect, useCallback, useRef } from "react";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
+import { shouldOfferGoogleOAuthSetup } from "@/lib/google-oauth-setup";
 
 interface EnvKeyStatus {
   key: string;
@@ -92,6 +94,26 @@ export function GoogleSetupWizard() {
   const allConfigured =
     envStatus.length > 0 && envStatus.every((k) => k.configured);
 
+  if (!shouldOfferGoogleOAuthSetup()) {
+    return (
+      <div className="rounded-lg border border-amber-500/25 bg-amber-500/[0.07] p-4 text-start">
+        <div className="flex items-start gap-3">
+          <div className="mt-0.5 flex h-7 w-7 shrink-0 items-center justify-center rounded-md bg-amber-500/15 text-amber-300">
+            <IconAlertTriangle className="h-4 w-4" />
+          </div>
+          <div>
+            <p className="text-sm font-medium text-foreground">
+              {t("googleConnect.managedCredentialsUnavailable")}
+            </p>
+            <p className="mt-1 text-xs leading-relaxed text-muted-foreground">
+              {t("googleConnect.managedCredentialsUnavailableDescription")}
+            </p>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
   async function handleJsonUpload(file: File) {
     setSaving(true);
     setError(null);

package/corpus/templates/calendar/app/hooks/use-bookings.ts

@@ -30,7 +30,9 @@ export function useAvailableSlots(
       const res = await fetch(
         appApiPath(`/api/bookings/available-slots?${params}`),
       );
-      if (!res.ok) throw new Error("Failed to fetch available slots");
+      if (!res.ok) {
+        throw new Error(await readErrorMessage(res, "Failed to fetch slots"));
+      }
       const data = await res.json();
       return Array.isArray(data) ? data : (data.slots ?? []);
     },
@@ -57,7 +59,9 @@ export function useAvailableDays(
       const res = await fetch(
         appApiPath(`/api/bookings/available-slots?${params}`),
       );
-      if (!res.ok) throw new Error("Failed to fetch available days");
+      if (!res.ok) {
+        throw new Error(await readErrorMessage(res, "Failed to fetch days"));
+      }
       const data = await res.json();
       return Array.isArray(data?.dates) ? data.dates : [];
     },

package/corpus/templates/calendar/app/i18n/zh-TW.ts

@@ -375,6 +375,9 @@ const messages = {
     googleWarningAfterUnsafe: "完成連線。",
     accountConnectedElsewhere: "該帳戶已連線到另一個登入帳戶",
     googleConnectionFailed: "Google 連線失敗",
+    managedCredentialsUnavailable: "Google Calendar 暫時無法使用",
+    managedCredentialsUnavailableDescription:
+      "此部署尚未設定 Calendar 的 Google 連線。請稍後再試。",
     thatGoogleAccount: "那個 Google 帳戶",
     signOutThenSignIn: "登出，然後使用 {{account}} 登入。",
     signOut: "登出",
@@ -427,6 +430,7 @@ const messages = {
     availabilityDescription: "設定你的預約可用時間。",
     availabilitySaved: "已儲存可用性",
     availabilitySaveFailed: "無法儲存可用性",
+    availabilityUnavailable: "目前無法檢查此主辦人的行事曆可用性。請稍後再試。",
     availableTimes: "可用時間",
     allCount: "全部（{{count}}）",
     back: "返回",

package/corpus/templates/calendar/app/i18n-data.ts

@@ -398,6 +398,9 @@ const enUS = {
     googleWarningAfterUnsafe: "to finish connecting.",
     accountConnectedElsewhere: "This account is connected to another login",
     googleConnectionFailed: "Google connection failed",
+    managedCredentialsUnavailable: "Google Calendar is unavailable",
+    managedCredentialsUnavailableDescription:
+      "Calendar's Google connection is not configured for this deployment. Please try again later.",
     thatGoogleAccount: "that Google account",
     signOutThenSignIn: "Sign out, then sign in with {{account}}.",
     signOut: "Sign out",
@@ -452,6 +455,8 @@ const enUS = {
     availabilityDescription: "Set your available hours for bookings.",
     availabilitySaved: "Availability saved",
     availabilitySaveFailed: "Failed to save availability",
+    availabilityUnavailable:
+      "This host's calendar availability can't be checked right now. Please try again later.",
     availableTimes: "Available Times",
     allCount: "All ({{count}})",
     back: "Back",
@@ -9233,6 +9238,107 @@ const translatedCalendarRawBurnDown = {
   },
 } satisfies Partial<Record<LocaleCode, PartialMessages>>;
 
+const translatedCalendarAvailabilityFix = {
+  "zh-CN": {
+    googleConnect: {
+      managedCredentialsUnavailable: "Google Calendar 暂不可用",
+      managedCredentialsUnavailableDescription:
+        "此部署尚未配置 Calendar 的 Google 连接。请稍后再试。",
+    },
+    bookingLinks: {
+      availabilityUnavailable: "目前无法检查此主办人的日历可用性。请稍后再试。",
+    },
+  },
+  "es-ES": {
+    googleConnect: {
+      managedCredentialsUnavailable: "Google Calendar no está disponible",
+      managedCredentialsUnavailableDescription:
+        "La conexión de Google de Calendar no está configurada para este despliegue. Inténtalo de nuevo más tarde.",
+    },
+    bookingLinks: {
+      availabilityUnavailable:
+        "No se puede comprobar ahora la disponibilidad del calendario de este anfitrión. Inténtalo de nuevo más tarde.",
+    },
+  },
+  "fr-FR": {
+    googleConnect: {
+      managedCredentialsUnavailable: "Google Calendar est indisponible",
+      managedCredentialsUnavailableDescription:
+        "La connexion Google de Calendar n'est pas configurée pour ce déploiement. Réessayez plus tard.",
+    },
+    bookingLinks: {
+      availabilityUnavailable:
+        "La disponibilité du calendrier de cet hôte ne peut pas être vérifiée pour le moment. Réessayez plus tard.",
+    },
+  },
+  "de-DE": {
+    googleConnect: {
+      managedCredentialsUnavailable: "Google Calendar ist nicht verfügbar",
+      managedCredentialsUnavailableDescription:
+        "Die Google-Verbindung von Calendar ist für diese Bereitstellung nicht konfiguriert. Bitte versuche es später erneut.",
+    },
+    bookingLinks: {
+      availabilityUnavailable:
+        "Die Kalenderverfügbarkeit dieses Gastgebers kann derzeit nicht geprüft werden. Bitte versuche es später erneut.",
+    },
+  },
+  "ja-JP": {
+    googleConnect: {
+      managedCredentialsUnavailable: "Google Calendar を利用できません",
+      managedCredentialsUnavailableDescription:
+        "このデプロイでは Calendar の Google 接続が設定されていません。後でもう一度お試しください。",
+    },
+    bookingLinks: {
+      availabilityUnavailable:
+        "この主催者のカレンダーの空き状況を現在確認できません。後でもう一度お試しください。",
+    },
+  },
+  "ko-KR": {
+    googleConnect: {
+      managedCredentialsUnavailable: "Google Calendar를 사용할 수 없습니다",
+      managedCredentialsUnavailableDescription:
+        "이 배포에는 Calendar의 Google 연결이 구성되어 있지 않습니다. 나중에 다시 시도하세요.",
+    },
+    bookingLinks: {
+      availabilityUnavailable:
+        "현재 이 주최자의 캘린더 가능 시간을 확인할 수 없습니다. 나중에 다시 시도하세요.",
+    },
+  },
+  "pt-BR": {
+    googleConnect: {
+      managedCredentialsUnavailable: "Google Calendar indisponível",
+      managedCredentialsUnavailableDescription:
+        "A conexão do Calendar com o Google não está configurada para esta implantação. Tente novamente mais tarde.",
+    },
+    bookingLinks: {
+      availabilityUnavailable:
+        "Não é possível verificar a disponibilidade do calendário deste anfitrião agora. Tente novamente mais tarde.",
+    },
+  },
+  "hi-IN": {
+    googleConnect: {
+      managedCredentialsUnavailable: "Google Calendar उपलब्ध नहीं है",
+      managedCredentialsUnavailableDescription:
+        "इस deployment के लिए Calendar का Google connection configured नहीं है। कृपया बाद में फिर कोशिश करें।",
+    },
+    bookingLinks: {
+      availabilityUnavailable:
+        "इस host की calendar availability अभी check नहीं की जा सकती। कृपया बाद में फिर कोशिश करें।",
+    },
+  },
+  "ar-SA": {
+    googleConnect: {
+      managedCredentialsUnavailable: "Google Calendar غير متاح",
+      managedCredentialsUnavailableDescription:
+        "اتصال Google في Calendar غير مهيأ لهذا النشر. يُرجى المحاولة لاحقًا.",
+    },
+    bookingLinks: {
+      availabilityUnavailable:
+        "لا يمكن التحقق من توفر تقويم هذا المضيف الآن. يُرجى المحاولة لاحقًا.",
+    },
+  },
+} satisfies Partial<Record<LocaleCode, PartialMessages>>;
+
 function applyTranslatedCalendarOverrides(
   translationSet: Partial<Record<LocaleCode, PartialMessages>>,
 ) {
@@ -9282,3 +9388,4 @@ applyTranslatedCalendarOverrides(translatedCalendarDebtTranslations);
 applyTranslatedCalendarOverrides(translatedCalendarRemainingRaw);
 applyTranslatedCalendarOverrides(translatedCalendarRawBurnDown);
 applyTranslatedCalendarOverrides(translatedCalendarExactCleanup);
+applyTranslatedCalendarOverrides(translatedCalendarAvailabilityFix);

package/corpus/templates/calendar/app/lib/google-oauth-setup.ts

@@ -0,0 +1,17 @@
+function localHostname(hostname: string): boolean {
+  return (
+    hostname === "localhost" ||
+    hostname === "127.0.0.1" ||
+    hostname === "::1" ||
+    hostname.endsWith(".localhost") ||
+    hostname.endsWith(".local")
+  );
+}
+
+export function shouldOfferGoogleOAuthSetup(): boolean {
+  const env = (import.meta.env ?? {}) as Record<string, unknown>;
+  if (env.DEV === true) return true;
+  if (env.VITE_ENABLE_GOOGLE_OAUTH_SETUP === "true") return true;
+  if (typeof window === "undefined") return false;
+  return localHostname(window.location.hostname.toLowerCase());
+}

package/corpus/templates/calendar/app/pages/BookingLinksPage.tsx

@@ -135,6 +135,7 @@ const BRAND_ICON_LINK_CLASS =
 const BRAND_PILL_LINK_CLASS =
   "border-[#00B5FF]/35 bg-[#00B5FF]/10 font-semibold text-[#00B5FF] hover:border-[#00B5FF]/55 hover:bg-[#00B5FF]/15 hover:text-[#33C4FF]";
 const EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+const BOOKING_SLOT_STEP_MINUTES = 30;
 
 type DraftLink = {
   id?: string;
@@ -1993,7 +1994,14 @@ function BookingPreview({
     const startMin = startH * 60 + startM;
     const endMin = endH * 60 + endM;
     const slots: string[] = [];
-    for (let m = startMin; m + dur <= endMin; m += dur) {
+    const firstStart =
+      Math.ceil(startMin / BOOKING_SLOT_STEP_MINUTES) *
+      BOOKING_SLOT_STEP_MINUTES;
+    for (
+      let m = firstStart;
+      m + dur <= endMin;
+      m += BOOKING_SLOT_STEP_MINUTES
+    ) {
       const h = Math.floor(m / 60);
       const mm = m % 60;
       const ampm = h >= 12 ? "PM" : "AM";

package/corpus/templates/calendar/app/pages/BookingPage.tsx

@@ -5,7 +5,7 @@ import {
   useT,
 } from "@agent-native/core/client";
 import type { Booking } from "@shared/api";
-import { IconCalendar } from "@tabler/icons-react";
+import { IconAlertTriangle, IconCalendar } from "@tabler/icons-react";
 import {
   addMinutes,
   endOfMonth,
@@ -122,23 +122,26 @@ export default function BookingPage() {
     availability?.slotDurationMinutes ??
     settings?.defaultEventDuration ??
     30;
-  const { data: slots = [], isLoading: slotsLoading } = useAvailableSlots(
-    dateStr,
+  const {
+    data: slots = [],
+    isLoading: slotsLoading,
+    error: slotsError,
+  } = useAvailableSlots(dateStr, duration, slug);
+  const monthStart = format(startOfMonth(viewMonth), "yyyy-MM-dd");
+  const monthEnd = format(endOfMonth(viewMonth), "yyyy-MM-dd");
+  const {
+    data: availableDates = [],
+    isLoading: availableDatesLoading,
+    error: availableDatesError,
+  } = useAvailableDays(
+    monthStart,
+    monthEnd,
     duration,
     slug,
+    step === "date" &&
+      !!availability &&
+      (!hasDurationChoice || selectedDuration !== null),
   );
-  const monthStart = format(startOfMonth(viewMonth), "yyyy-MM-dd");
-  const monthEnd = format(endOfMonth(viewMonth), "yyyy-MM-dd");
-  const { data: availableDates = [], isLoading: availableDatesLoading } =
-    useAvailableDays(
-      monthStart,
-      monthEnd,
-      duration,
-      slug,
-      step === "date" &&
-        !!availability &&
-        (!hasDurationChoice || selectedDuration !== null),
-    );
   const createBooking = useCreateBooking();
   const selectedSlotRange = selectedSlot
     ? {
@@ -236,6 +239,7 @@ export default function BookingPage() {
   const pageTitle = bookingLink?.title || title;
   const pageDescription = bookingLink?.description || description;
   const requiredHostCount = (bookingLink?.hosts?.length ?? 0) + 1;
+  const availabilityErrorMessage = t("bookingLinks.availabilityUnavailable");
 
   useEffect(() => {
     if (hasDurationChoice && step === "date" && selectedDuration === null) {
@@ -404,17 +408,26 @@ export default function BookingPage() {
               <h3 className="mb-4 text-sm font-medium text-center">
                 {t("bookingLinks.selectDate")}
               </h3>
-              <div className="flex justify-center">
-                <DatePicker
-                  selectedDate={selectedDate}
-                  onSelect={handleDateSelect}
-                  availability={availability}
-                  availableDates={availableDates}
-                  availabilityLoading={availableDatesLoading}
-                  viewMonth={viewMonth}
-                  onViewMonthChange={setViewMonth}
-                />
-              </div>
+              {availableDatesError ? (
+                <div className="rounded-lg border border-destructive/30 bg-destructive/[0.06] px-3 py-3 text-sm text-destructive">
+                  <div className="flex items-start gap-2">
+                    <IconAlertTriangle className="mt-0.5 h-4 w-4 shrink-0" />
+                    <p>{availabilityErrorMessage}</p>
+                  </div>
+                </div>
+              ) : (
+                <div className="flex justify-center">
+                  <DatePicker
+                    selectedDate={selectedDate}
+                    onSelect={handleDateSelect}
+                    availability={availability}
+                    availableDates={availableDates}
+                    availabilityLoading={availableDatesLoading}
+                    viewMonth={viewMonth}
+                    onViewMonthChange={setViewMonth}
+                  />
+                </div>
+              )}
             </div>
           )}
 
@@ -443,6 +456,7 @@ export default function BookingPage() {
                 selectedSlot={selectedSlot}
                 onSelect={handleSlotSelect}
                 loading={slotsLoading}
+                errorMessage={slotsError ? availabilityErrorMessage : undefined}
               />
             </div>
           )}

package/corpus/templates/calendar/app/pages/Settings.tsx

@@ -47,6 +47,7 @@ import {
   useDisconnectZoom,
   useZoomStatus,
 } from "@/hooks/use-zoom-auth";
+import { shouldOfferGoogleOAuthSetup } from "@/lib/google-oauth-setup";
 
 import changelog from "../../CHANGELOG.md?raw";
 
@@ -70,6 +71,7 @@ export default function Settings() {
   const disconnectZoom = useDisconnectZoom();
   const [wantAuthUrl, setWantAuthUrl] = useState(false);
   const authUrl = useGoogleAuthUrl(wantAuthUrl);
+  const canOfferGoogleOAuthSetup = shouldOfferGoogleOAuthSetup();
 
   const [timezone, setTimezone] = useState("");
   const [bookingTitle, setBookingTitle] = useState("");
@@ -333,7 +335,7 @@ export default function Settings() {
           </Card>
 
           {/* Google Setup Wizard */}
-          {!googleStatus.data?.connected && (
+          {!googleStatus.data?.connected && canOfferGoogleOAuthSetup && (
             <Card>
               <CardHeader>
                 <CardTitle className="text-lg">

package/corpus/templates/calendar/changelog/2026-07-01-booking-links-now-show-an-error-when-calendar-availability-c.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-01
+---
+
+Booking links now show an error when calendar availability cannot be checked and use 30-minute start intervals.

package/corpus/templates/calendar/server/handlers/bookings.ts

@@ -163,6 +163,7 @@ type ConflictItem = { start: string; end: string };
 type ConflictResult = { items: ConflictItem[]; unavailableReason?: string };
 type BookingLinkRow = typeof schema.bookingLinks.$inferSelect;
 type ConflictDb = Pick<ReturnType<typeof getDb>, "select">;
+const BOOKING_SLOT_STEP_MINUTES = 30;
 
 type LocalDateTimeParts = {
   year: number;
@@ -341,6 +342,27 @@ function dateEndIso(date: string, timezone: string): string {
   ).toISOString();
 }
 
+function formatAvailabilityUnavailableReason(email?: string): string {
+  return email
+    ? `Calendar availability unavailable for ${email}`
+    : "Calendar availability unavailable";
+}
+
+function unavailableAvailabilityResponse(event: H3Event) {
+  setResponseStatus(event, 503);
+  return {
+    error:
+      "The host's calendar availability could not be checked. Please try again later.",
+    code: "calendar_availability_unavailable",
+  };
+}
+
+function formatLocalTime(totalMinutes: number): string {
+  const hour = Math.floor(totalMinutes / 60);
+  const minute = totalMinutes % 60;
+  return `${String(hour).padStart(2, "0")}:${String(minute).padStart(2, "0")}`;
+}
+
 async function resolveAvailabilityContext({
   slug,
   db = getDb(),
@@ -397,7 +419,7 @@ async function resolveAvailabilityContext({
   };
 }
 
-async function getConflictItems({
+export async function getConflictItems({
   db = getDb(),
   ownerEmail,
   hostEmails,
@@ -424,7 +446,18 @@ async function getConflictItems({
   );
   const freeBusyResolvedHosts = new Set<string>();
 
-  if (await googleCalendar.isConnected(ownerEmail)) {
+  const ownerConnected = ownerEmail
+    ? await googleCalendar.isConnected(ownerEmail)
+    : false;
+
+  if (ownerEmail && !ownerConnected) {
+    return {
+      items: [],
+      unavailableReason: formatAvailabilityUnavailableReason(ownerEmail),
+    };
+  }
+
+  if (ownerConnected) {
     try {
       if (requiredHosts.length > 0) {
         const freeBusy = await googleCalendar.getFreeBusy(
@@ -434,6 +467,14 @@ async function getConflictItems({
           ownerEmail,
           timezone,
         );
+        if (freeBusy.errors.length > 0) {
+          return {
+            items: [],
+            unavailableReason: formatAvailabilityUnavailableReason(
+              freeBusy.errors[0]?.email || ownerEmail,
+            ),
+          };
+        }
         for (const [email, calendar] of Object.entries(freeBusy.calendars)) {
           const normalizedEmail = email.toLowerCase();
           if (!calendar.errors || calendar.errors.length === 0) {
@@ -448,11 +489,16 @@ async function getConflictItems({
         }
       }
 
-      const { events: googleEvents } = await googleCalendar.listEvents(
-        rangeStartIso,
-        rangeEndIso,
-        ownerEmail,
-      );
+      const { events: googleEvents, errors: googleEventErrors } =
+        await googleCalendar.listEvents(rangeStartIso, rangeEndIso, ownerEmail);
+      if (googleEventErrors.length > 0) {
+        return {
+          items: [],
+          unavailableReason: formatAvailabilityUnavailableReason(
+            googleEventErrors[0]?.email || ownerEmail,
+          ),
+        };
+      }
       conflictItems.push(
         ...googleEvents.filter(eventBlocksAvailability).map((event) => ({
           start: event.start,
@@ -460,7 +506,10 @@ async function getConflictItems({
         })),
       );
     } catch {
-      // Continue without Google events if API fails
+      return {
+        items: [],
+        unavailableReason: formatAvailabilityUnavailableReason(ownerEmail),
+      };
     }
   }
 
@@ -501,7 +550,7 @@ async function getConflictItems({
   return { items: conflictItems };
 }
 
-function generateAvailableSlotsForDate({
+export function generateAvailableSlotsForDate({
   date,
   duration,
   config,
@@ -571,7 +620,17 @@ function generateAvailableSlotsForDate({
     const slotEnd = zonedTimeToUtc(date, scheduleSlot.end, timezone);
     if (slotEnd <= slotStart) continue;
 
-    let current = new Date(slotStart);
+    const scheduleStartMinutes = startHour * 60 + startMin;
+    const firstSlotStartMinutes =
+      Math.ceil(scheduleStartMinutes / BOOKING_SLOT_STEP_MINUTES) *
+      BOOKING_SLOT_STEP_MINUTES;
+    if (firstSlotStartMinutes >= 24 * 60) continue;
+
+    let current = zonedTimeToUtc(
+      date,
+      formatLocalTime(firstSlotStartMinutes),
+      timezone,
+    );
 
     while (current.getTime() + slotDuration * 60 * 1000 <= slotEnd.getTime()) {
       const candidateStart = new Date(current);
@@ -598,7 +657,9 @@ function generateAvailableSlotsForDate({
         });
       }
 
-      current = new Date(current.getTime() + slotDuration * 60 * 1000);
+      current = new Date(
+        current.getTime() + BOOKING_SLOT_STEP_MINUTES * 60 * 1000,
+      );
     }
   }
 
@@ -1147,7 +1208,9 @@ export const getAvailableSlots = defineEventHandler(async (event: H3Event) => {
         rangeEndIso: dateEndIso(rangeEnd, timezone),
         timezone,
       });
-      if (conflictResult.unavailableReason) return { dates: [] };
+      if (conflictResult.unavailableReason) {
+        return unavailableAvailabilityResponse(event);
+      }
       const dates: string[] = [];
       for (
         let cursor = new Date(from!);
@@ -1177,7 +1240,9 @@ export const getAvailableSlots = defineEventHandler(async (event: H3Event) => {
       rangeEndIso: dateEndIso(date, timezone),
       timezone,
     });
-    if (conflictResult.unavailableReason) return { slots: [] };
+    if (conflictResult.unavailableReason) {
+      return unavailableAvailabilityResponse(event);
+    }
     const availableSlots = generateAvailableSlotsForDate({
       date,
       duration,

package/corpus/templates/calendar/server/handlers/google-auth.ts

@@ -5,6 +5,7 @@ import {
   isElectron,
   getAppUrl,
   resolveGoogleSignInCredentials,
+  resolveGoogleProviderCredentials,
   resolveOAuthRedirectUri,
   encodeOAuthState,
   decodeOAuthState,
@@ -74,8 +75,8 @@ async function resolveCalendarOAuthCredentials(event: H3Event) {
       clientSecret: await resolveSecret("GOOGLE_CLIENT_SECRET"),
     }),
   );
-  if (!clientId || !clientSecret) return null;
-  return { clientId, clientSecret };
+  if (clientId && clientSecret) return { clientId, clientSecret };
+  return resolveGoogleProviderCredentials();
 }
 
 function isCalendarConnectRequest(

package/corpus/templates/calendar/server/lib/google-calendar.ts

@@ -10,6 +10,8 @@ import {
   getRequestOrgId,
   resolveSecret,
   runWithRequestContext,
+  resolveGoogleProviderCredentials,
+  resolveGoogleLegacyProviderCredentials,
 } from "@agent-native/core/server";
 
 import type {
@@ -95,8 +97,20 @@ async function readCredentialPair(
     resolveSecret(clientIdKey),
     resolveSecret(clientSecretKey),
   ]);
-  if (!clientId || !clientSecret) return null;
-  return { clientId, clientSecret };
+  if (clientId && clientSecret) return { clientId, clientSecret };
+  if (
+    clientIdKey === "GOOGLE_CLIENT_ID" &&
+    clientSecretKey === "GOOGLE_CLIENT_SECRET"
+  ) {
+    return resolveGoogleProviderCredentials();
+  }
+  if (
+    clientIdKey === "GOOGLE_LEGACY_CLIENT_ID" &&
+    clientSecretKey === "GOOGLE_LEGACY_CLIENT_SECRET"
+  ) {
+    return resolveGoogleLegacyProviderCredentials();
+  }
+  return null;
 }
 
 async function resolveGoogleProviderCredentialCandidates(

package/corpus/templates/clips/changelog/2026-07-01-chrome-recording-uploads-now-serialize-chunks-to-avoid-resum.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-01
+---
+
+Chrome recording uploads now serialize chunks to avoid resumable upload offset races.

package/corpus/templates/clips/chrome-extension/public/manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "Agent-Native Clips",
   "short_name": "Clips",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Start Clips recordings from Chrome, capture optional diagnostics, and preview Clips links on GitHub.",
   "minimum_chrome_version": "116",
   "action": {