Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

Remove Connect waitlist and add GA announcement tooling (#4691)

Julius Marminge60af905e70c9
diff --git a/apps/mobile/src/Stack.tsx b/apps/mobile/src/Stack.tsx
index 4cf787d9c..3aedb4e4e 100644
--- a/apps/mobile/src/Stack.tsx
+++ b/apps/mobile/src/Stack.tsx
@@ -47,7 +47,6 @@ import { SettingsAuthRouteScreen } from "./features/settings/SettingsAuthRouteSc
import { SettingsEnvironmentsRouteScreen } from "./features/settings/SettingsEnvironmentsRouteScreen";
import { SettingsLegalRouteScreen } from "./features/settings/SettingsLegalRouteScreen";
import { SettingsRouteScreen } from "./features/settings/SettingsRouteScreen";
-import { SettingsWaitlistRouteScreen } from "./features/settings/SettingsWaitlistRouteScreen";
import { ShowcaseCaptureCoordinator } from "./features/showcase/ShowcaseCaptureCoordinator";
import {
SettingsLegalDocumentCloseHeaderButton,
@@ -190,10 +189,11 @@ const SettingsSheetStack = createNativeStackNavigator({
},
}),
SettingsWaitlist: createNativeStackScreen({
- screen: SettingsWaitlistRouteScreen,
+ // Keep the old deep link working after the Connect GA launch.
+ screen: SettingsAuthRouteScreen,
linking: "waitlist",
options: {
- title: "Join the waitlist",
+ title: "Sign in",
},
}),
},
diff --git a/apps/mobile/src/features/cloud/CloudWaitlistEnrollment.tsx b/apps/mobile/src/features/cloud/CloudWaitlistEnrollment.tsx
deleted file mode 100644
index 1a7020fd0..000000000
--- a/apps/mobile/src/features/cloud/CloudWaitlistEnrollment.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-import { useWaitlist } from "@clerk/expo";
-import { ActivityIndicator, Pressable, Text, TextInput, View } from "react-native";
-import { useState } from "react";
-
-import { cn } from "../../lib/cn";
-import { CloudWaitlistJoinRejectedError, joinCloudWaitlist } from "./cloudWaitlistJoin";
-
-export function CloudWaitlistEnrollment(props: { readonly onSignIn: () => void }) {
- const { errors, fetchStatus, waitlist } = useWaitlist();
- const [emailAddress, setEmailAddress] = useState("");
- const [requestError, setRequestError] = useState<string | null>(null);
- const isSubmitting = fetchStatus === "fetching";
- const fieldError = errors.fields.emailAddress?.longMessage;
-
- const joinWaitlist = async () => {
- const normalizedEmailAddress = emailAddress.trim();
- if (!normalizedEmailAddress || isSubmitting) {
- return;
- }
-
- setRequestError(null);
- try {
- await joinCloudWaitlist(waitlist, normalizedEmailAddress);
- } catch (error) {
- console.error(error);
- setRequestError(
- error instanceof CloudWaitlistJoinRejectedError
- ? "Could not join the waitlist. Check your email address and try again."
- : "Could not join the waitlist. Check your connection and try again.",
- );
- }
- };
-
- if (waitlist.id) {
- return (
- <View className="gap-[18px]">
- <Text className="text-center font-t3-bold text-xl text-foreground">
- You are on the waitlist
- </Text>
- <Text className="text-center font-sans text-base text-foreground-secondary">
- We will email you when your T3 Connect access is ready.
- </Text>
- <SignInAction onPress={props.onSignIn} />
- </View>
- );
- }
-
- return (
- <View className="gap-[18px]">
- <Text className="font-sans text-base text-foreground-secondary">
- Enter your email and we will let you know when access is ready.
- </Text>
-
- <View className="gap-2">
- <Text className="font-t3-bold text-sm text-foreground-secondary">Email address</Text>
- <TextInput
- accessibilityLabel="Email address"
- autoCapitalize="none"
- autoComplete="email"
- autoCorrect={false}
- className={cn(
- "min-h-[54px] rounded-2xl border border-input-border bg-input px-4 py-3.5 font-sans text-lg text-foreground border-continuous",
- (fieldError || requestError) && "border-danger-foreground",
- )}
- keyboardType="email-address"
- onChangeText={(value) => {
- setEmailAddress(value);
- setRequestError(null);
- }}
- onSubmitEditing={() => void joinWaitlist()}
- placeholder="Enter your email address"
- placeholderTextColorClassName="accent-placeholder"
- returnKeyType="join"
- textContentType="emailAddress"
- value={emailAddress}
- />
- {fieldError || requestError ? (
- <Text
- accessibilityLiveRegion="polite"
- className="font-sans text-sm text-danger-foreground"
- selectable
- >
- {fieldError ?? requestError}
- </Text>
- ) : null}
- </View>
-
- <Pressable
- accessibilityRole="button"
- accessibilityState={{
- busy: isSubmitting,
- disabled: isSubmitting || emailAddress.trim().length === 0,
- }}
- disabled={isSubmitting || emailAddress.trim().length === 0}
- onPress={() => void joinWaitlist()}
- className="min-h-[54px] flex-row items-center justify-center gap-2 rounded-full bg-primary px-5 py-3 disabled:opacity-[0.45]"
- >
- {isSubmitting ? (
- <ActivityIndicator colorClassName="accent-primary-foreground" size="small" />
- ) : null}
- <Text className="font-t3-bold text-base text-primary-foreground">
- {isSubmitting ? "Joining" : "Join the waitlist"}
- </Text>
- </Pressable>
-
- <SignInAction onPress={props.onSignIn} />
- </View>
- );
-}
-
-function SignInAction(props: { readonly onPress: () => void }) {
- return (
- <View className="flex-row items-center justify-center gap-1 pt-1">
- <Text className="font-sans text-base text-foreground-secondary">Already have access?</Text>
- <Pressable accessibilityRole="button" hitSlop={8} onPress={props.onPress}>
- <Text className="font-t3-bold text-base text-foreground">Sign in</Text>
- </Pressable>
- </View>
- );
-}
diff --git a/apps/mobile/src/features/cloud/cloudWaitlistJoin.test.ts b/apps/mobile/src/features/cloud/cloudWaitlistJoin.test.ts
deleted file mode 100644
index 582cb40ff..000000000
--- a/apps/mobile/src/features/cloud/cloudWaitlistJoin.test.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { describe, expect, it, vi } from "vite-plus/test";
-
-import {
- CloudWaitlistJoinRejectedError,
- CloudWaitlistJoinRequestError,
- joinCloudWaitlist,
-} from "./cloudWaitlistJoin";
-
-describe("joinCloudWaitlist", () => {
- it("submits the provided email address", async () => {
- const join = vi.fn().mockResolvedValue({ error: null });
-
- await joinCloudWaitlist({ join }, "[email protected]");
-
- expect(join).toHaveBeenCalledExactlyOnceWith({ emailAddress: "[email protected]" });
- });
-
- it("preserves Clerk rejection details without exposing the email address", async () => {
- const cause = Object.assign(new Error("The enrollment was rejected."), {
- code: "form_identifier_invalid",
- });
- const join = vi.fn().mockResolvedValue({ error: cause });
-
- const failure = await joinCloudWaitlist({ join }, "[email protected]").catch(
- (error: unknown) => error,
- );
-
- expect(failure).toBeInstanceOf(CloudWaitlistJoinRejectedError);
- expect(failure).toMatchObject({
- code: "form_identifier_invalid",
- cause,
- });
- expect(String(failure)).not.toContain("[email protected]");
- });
-
- it("distinguishes request failures from rejected enrollments", async () => {
- const cause = new Error("network unavailable");
- const join = vi.fn().mockRejectedValue(cause);
-
- const failure = await joinCloudWaitlist({ join }, "[email protected]").catch(
- (error: unknown) => error,
- );
-
- expect(failure).toBeInstanceOf(CloudWaitlistJoinRequestError);
- expect(failure).toMatchObject({ cause });
- expect(failure).not.toBeInstanceOf(CloudWaitlistJoinRejectedError);
- });
-});
diff --git a/apps/mobile/src/features/cloud/cloudWaitlistJoin.ts b/apps/mobile/src/features/cloud/cloudWaitlistJoin.ts
deleted file mode 100644
index 4a467a19e..000000000
--- a/apps/mobile/src/features/cloud/cloudWaitlistJoin.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import * as Schema from "effect/Schema";
-
-interface CloudWaitlistJoiner {
- readonly join: (input: { emailAddress: string }) => Promise<{
- readonly error: { readonly code: string } | null;
- }>;
-}
-
-export class CloudWaitlistJoinRejectedError extends Schema.TaggedErrorClass<CloudWaitlistJoinRejectedError>()(
- "CloudWaitlistJoinRejectedError",
- {
- code: Schema.String,
- cause: Schema.Defect(),
- },
-) {
- override get message(): string {
- return `Cloud waitlist enrollment was rejected with code "${this.code}".`;
- }
-}
-
-export class CloudWaitlistJoinRequestError extends Schema.TaggedErrorClass<CloudWaitlistJoinRequestError>()(
- "CloudWaitlistJoinRequestError",
- {
- cause: Schema.Defect(),
- },
-) {
- override get message(): string {
- return "Cloud waitlist enrollment request failed.";
- }
-}
-
-export async function joinCloudWaitlist(
- waitlist: CloudWaitlistJoiner,
- emailAddress: string,
-): Promise<void> {
- const result = await waitlist.join({ emailAddress }).catch((cause) => {
- throw new CloudWaitlistJoinRequestError({ cause });
- });
-
- if (result.error) {
- throw new CloudWaitlistJoinRejectedError({
- code: result.error.code,
- cause: result.error,
- });
- }
-}
diff --git a/apps/mobile/src/features/settings/SettingsRouteScreen.tsx b/apps/mobile/src/features/settings/SettingsRouteScreen.tsx
index d58d47994..4589d28a8 100644
--- a/apps/mobile/src/features/settings/SettingsRouteScreen.tsx
+++ b/apps/mobile/src/features/settings/SettingsRouteScreen.tsx
@@ -273,13 +273,13 @@ function ConfiguredSettingsRouteScreen() {
const promptSignIn = useCallback(() => {
Alert.alert(
- "Request T3 Connect access",
- "Live Activity updates require approved T3 Connect access so relay can deliver updates to this device.",
+ "Sign in to T3 Connect",
+ "Live Activity updates require T3 Connect so relay can deliver updates to this device.",
[
{ text: "Cancel", style: "cancel" },
{
text: "Continue",
- onPress: () => navigation.navigate("SettingsSheet", { screen: "SettingsWaitlist" }),
+ onPress: () => navigation.navigate("SettingsSheet", { screen: "SettingsAuth" }),
},
],
);
@@ -441,7 +441,8 @@ function ConfiguredSettingsRouteScreen() {
const openAccount = useCallback(() => {
if (!isLoaded) return;
if (!isSignedIn) {
- navigation.navigate("SettingsSheet", { screen: "SettingsWaitlist" });
+ expandClerkSheet();
+ navigation.navigate("SettingsSheet", { screen: "SettingsAuth" });
return;
}
expandClerkSheet();
diff --git a/apps/mobile/src/features/settings/SettingsWaitlistRouteScreen.tsx b/apps/mobile/src/features/settings/SettingsWaitlistRouteScreen.tsx
deleted file mode 100644
index f5182307e..000000000
--- a/apps/mobile/src/features/settings/SettingsWaitlistRouteScreen.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import { useAuth } from "@clerk/expo";
-import { StackActions, useFocusEffect, useNavigation } from "@react-navigation/native";
-import { useCallback } from "react";
-import { ScrollView } from "react-native";
-
-import { CloudWaitlistEnrollment } from "../cloud/CloudWaitlistEnrollment";
-import { useClerkSettingsSheetDetent } from "../cloud/ClerkSettingsSheetDetent";
-import { hasCloudPublicConfig } from "../cloud/publicConfig";
-
-export function SettingsWaitlistRouteScreen() {
- const navigation = useNavigation();
-
- useFocusEffect(
- useCallback(() => {
- if (!hasCloudPublicConfig()) {
- navigation.dispatch(StackActions.replace("Settings"));
- }
- }, [navigation]),
- );
-
- return hasCloudPublicConfig() ? <ConfiguredSettingsWaitlistRouteScreen /> : null;
-}
-
-function ConfiguredSettingsWaitlistRouteScreen() {
- const { isLoaded, isSignedIn } = useAuth({ treatPendingAsSignedOut: false });
- const { expand } = useClerkSettingsSheetDetent();
- const navigation = useNavigation();
-
- useFocusEffect(
- useCallback(() => {
- if (isLoaded && isSignedIn) {
- navigation.dispatch(StackActions.replace("Settings"));
- }
- }, [isLoaded, isSignedIn, navigation]),
- );
-
- return (
- <>
- <ScrollView
- automaticallyAdjustKeyboardInsets
- contentContainerStyle={{
- paddingBottom: 32,
- paddingHorizontal: 20,
- paddingTop: 12,
- }}
- contentInsetAdjustmentBehavior="automatic"
- keyboardDismissMode="interactive"
- keyboardShouldPersistTaps="handled"
- showsVerticalScrollIndicator={false}
- >
- <CloudWaitlistEnrollment
- onSignIn={() => {
- expand();
- navigation.navigate("SettingsSheet", { screen: "SettingsAuth" });
- }}
- />
- </ScrollView>
- </>
- );
-}
diff --git a/apps/web/src/components/clerk/useT3ConnectAuthPrompt.tsx b/apps/web/src/components/clerk/useT3ConnectAuthPrompt.tsx
index 05fa8250b..3a62a5a85 100644
--- a/apps/web/src/components/clerk/useT3ConnectAuthPrompt.tsx
+++ b/apps/web/src/components/clerk/useT3ConnectAuthPrompt.tsx
@@ -3,7 +3,7 @@ import { useClerk } from "@clerk/react";
export function useT3ConnectAuthPrompt() {
const clerk = useClerk();
const openAuthPrompt = () => {
- clerk.openWaitlist();
+ clerk.openSignIn({ forceRedirectUrl: window.location.href });
};
return { authPrompt: null, openAuthPrompt };
}
diff --git a/package.json b/package.json
index e2492914d..aebbd8a2f 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,7 @@
"dist:desktop:win:arm64": "node scripts/build-desktop-artifact.ts --platform win --target nsis --arch arm64",
"dist:desktop:win:x64": "node scripts/build-desktop-artifact.ts --platform win --target nsis --arch x64",
"release:smoke": "node scripts/release-smoke.ts",
+ "connect:announce-ga": "node scripts/announce-connect-ga.ts",
"clean": "rm -rf node_modules apps/*/node_modules packages/*/node_modules apps/*/dist apps/*/dist-electron packages/*/dist .vite-plus apps/*/.vite-plus packages/*/.vite-plus",
"sync:repos": "node scripts/sync-reference-repos.ts"
},
diff --git a/scripts/announce-connect-ga.ts b/scripts/announce-connect-ga.ts
new file mode 100644
index 000000000..88a4db56c
--- /dev/null
+++ b/scripts/announce-connect-ga.ts
@@ -0,0 +1,226 @@
+#!/usr/bin/env node
+
+import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import * as Config from "effect/Config";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Logger from "effect/Logger";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
+import { Command, Flag } from "effect/unstable/cli";
+import {
+ FetchHttpClient,
+ HttpClient,
+ HttpClientRequest,
+ HttpClientResponse,
+} from "effect/unstable/http";
+
+const CLERK_API_URL = "https://api.clerk.com/v1";
+const PAGE_SIZE = 500;
+
+export class WaitlistEntry extends Schema.Class<WaitlistEntry>("WaitlistEntry")({
+ id: Schema.String,
+ email_address: Schema.String,
+ status: Schema.Literals(["pending", "invited", "completed", "rejected"]),
+}) {}
+
+const ClerkWaitlistResponse = Schema.Struct({
+ data: Schema.Array(WaitlistEntry),
+ total_count: Schema.Int,
+});
+const PositiveInteger = Schema.Int.check(Schema.isGreaterThan(0));
+const ClerkSecretKey = Config.string("CLERK_SECRET_KEY");
+
+export interface ConnectGaOptions {
+ readonly invite: boolean;
+ readonly limit: number | undefined;
+}
+
+export class ConnectGaRequestError extends Schema.TaggedErrorClass<ConnectGaRequestError>()(
+ "ConnectGaRequestError",
+ {
+ operation: Schema.String,
+ cause: Schema.Defect(),
+ },
+) {
+ override get message(): string {
+ return `Clerk ${this.operation} request failed.`;
+ }
+}
+
+export class ConnectGaResponseError extends Schema.TaggedErrorClass<ConnectGaResponseError>()(
+ "ConnectGaResponseError",
+ {
+ operation: Schema.String,
+ status: Schema.Int,
+ cause: Schema.Defect(),
+ },
+) {
+ override get message(): string {
+ return `Clerk ${this.operation} returned status ${this.status}.`;
+ }
+}
+
+const executeClerkJsonRequest = Effect.fn("executeClerkJsonRequest")(function* <
+ S extends Schema.Top,
+>(request: HttpClientRequest.HttpClientRequest, schema: S, operation: string) {
+ const client = (yield* HttpClient.HttpClient).pipe(
+ HttpClient.retryTransient({
+ retryOn: "errors-and-responses",
+ times: 3,
+ }),
+ );
+ const response = yield* client
+ .execute(request)
+ .pipe(Effect.mapError((cause) => new ConnectGaRequestError({ operation, cause })));
+ const success = yield* HttpClientResponse.filterStatusOk(response).pipe(
+ Effect.mapError(
+ (cause) =>
+ new ConnectGaResponseError({
+ operation,
+ status: response.status,
+ cause,
+ }),
+ ),
+ );
+ return yield* HttpClientResponse.schemaBodyJson(schema)(success).pipe(
+ Effect.mapError(
+ (cause) =>
+ new ConnectGaResponseError({
+ operation,
+ status: response.status,
+ cause,
+ }),
+ ),
+ );
+});
+
+const fetchWaitlistPage = Effect.fn("fetchWaitlistPage")(function* (
+ secretKey: string,
+ offset: number,
+) {
+ const url = new URL(`${CLERK_API_URL}/waitlist_entries`);
+ url.searchParams.set("status", "pending");
+ url.searchParams.set("limit", String(PAGE_SIZE));
+ url.searchParams.set("offset", String(offset));
+ url.searchParams.set("order_by", "+created_at");
+ const request = HttpClientRequest.get(url.href).pipe(
+ HttpClientRequest.bearerToken(secretKey),
+ HttpClientRequest.setHeader("Clerk-API-Version", "2026-05-12"),
+ );
+ return yield* executeClerkJsonRequest(
+ request,
+ ClerkWaitlistResponse,
+ "list pending waitlist entries",
+ );
+});
+
+export const fetchPendingWaitlistEntries = Effect.fn("fetchPendingWaitlistEntries")(function* (
+ secretKey: string,
+ limit?: number,
+) {
+ const entries: Array<WaitlistEntry> = [];
+ while (true) {
+ if (limit !== undefined && entries.length >= limit) break;
+ const page = yield* fetchWaitlistPage(secretKey, entries.length);
+ entries.push(...page.data);
+ if (entries.length >= page.total_count || page.data.length === 0) break;
+ }
+ return limit === undefined ? entries : entries.slice(0, limit);
+});
+
+export const inviteWaitlistEntry = Effect.fn("inviteWaitlistEntry")(function* (
+ secretKey: string,
+ entry: WaitlistEntry,
+) {
+ const request = HttpClientRequest.post(
+ `${CLERK_API_URL}/waitlist_entries/${encodeURIComponent(entry.id)}/invite`,
+ ).pipe(
+ HttpClientRequest.bearerToken(secretKey),
+ HttpClientRequest.setHeader("Clerk-API-Version", "2026-05-12"),
+ );
+ return yield* executeClerkJsonRequest(
+ request,
+ WaitlistEntry,
+ `invite waitlist entry ${entry.id}`,
+ );
+});
+
+export const announceConnectGa = Effect.fn("announceConnectGa")(function* (
+ options: ConnectGaOptions,
+) {
+ const clerkSecretKey = yield* ClerkSecretKey;
+ const entries = yield* fetchPendingWaitlistEntries(clerkSecretKey, options.limit);
+
+ yield* Effect.logInfo(
+ options.invite ? "Connect GA waitlist invitations starting" : "Connect GA dry run",
+ ).pipe(
+ Effect.annotateLogs({
+ pendingEntries: entries.length,
+ }),
+ );
+
+ if (!options.invite) {
+ for (const entry of entries) {
+ yield* Effect.logInfo("pending waitlist entry").pipe(
+ Effect.annotateLogs({
+ waitlistEntryId: entry.id,
+ emailAddress: entry.email_address,
+ }),
+ );
+ }
+ yield* Effect.logInfo("No invitation was sent. Re-run with --invite after reviewing the list.");
+ return;
+ }
+
+ for (const [index, entry] of entries.entries()) {
+ const invited = yield* inviteWaitlistEntry(clerkSecretKey, entry);
+ yield* Effect.logInfo("Clerk waitlist invitation sent").pipe(
+ Effect.annotateLogs({
+ waitlistEntryId: invited.id,
+ completed: index + 1,
+ total: entries.length,
+ }),
+ );
+ }
+});
+
+export const announceConnectGaCommand = Command.make(
+ "announce-connect-ga",
+ {
+ invite: Flag.boolean("invite").pipe(
+ Flag.withDefault(false),
+ Flag.withDescription(
+ "Invite pending entries through Clerk. Without this flag, only print a dry-run list.",
+ ),
+ ),
+ limit: Flag.integer("limit").pipe(
+ Flag.withSchema(PositiveInteger),
+ Flag.optional,
+ Flag.withDescription("Process at most this many pending waitlist entries."),
+ ),
+ },
+ ({ invite, limit }) =>
+ announceConnectGa({
+ invite,
+ limit: Option.getOrUndefined(limit),
+ }),
+).pipe(
+ Command.withDescription(
+ "Invite pending Clerk waitlist members now that T3 Connect is generally available.",
+ ),
+);
+
+if (import.meta.main) {
+ Command.run(announceConnectGaCommand, { version: "0.0.0" }).pipe(
+ Effect.provide(
+ Layer.mergeAll(
+ Logger.layer([Logger.consolePretty()]),
+ NodeServices.layer,
+ FetchHttpClient.layer,
+ ),
+ ),
+ NodeRuntime.runMain,
+ );
+}