Regenerate schema and hooks from backend master

Union of the cohort funnel, Shot Lab picker queries, and transient
homography IDs — converges the three divergent submodule pointers
(gql master, railbird master, railbird-mobile master).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

src/index.tsx

@@ -260,6 +260,15 @@ export type ClusterAssignmentInput = {
   userId?: InputMaybe<Scalars["Int"]["input"]>;
 };
 
+export type CohortStatsGql = {
+  __typename?: "CohortStatsGQL";
+  activated7d: Scalars["Int"]["output"];
+  activatedNotPaid7d: Scalars["Int"]["output"];
+  paid7d: Scalars["Int"]["output"];
+  signups: Scalars["Int"]["output"];
+  weekStart: Scalars["Date"]["output"];
+};
+
 export type CommentGql = {
   __typename?: "CommentGQL";
   id: Scalars["Int"]["output"];
@@ -2400,7 +2409,7 @@ export type HomographyInfoGql = {
   crop: BoundingBoxGql;
   destPoints: PocketPointsGql;
   frameIndex: Scalars["Int"]["output"];
-  id: Scalars["Int"]["output"];
+  id?: Maybe<Scalars["Int"]["output"]>;
   pockets: Array<BoundingBoxGql>;
   sourcePoints: PocketPointsGql;
 };
@@ -3080,6 +3089,7 @@ export type Query = {
   getResolvedTier: ResolvedTierGql;
   getRuns: GetRunsResult;
   getShotAnnotationTypes: Array<ShotAnnotationTypeGql>;
+  getShotTableState: ShotTableStateGql;
   getShots: Array<ShotGql>;
   getShotsByIds: Array<ShotGql>;
   getShotsWithMetadata: GetShotsResult;
@@ -3225,6 +3235,10 @@ export type QueryGetShotAnnotationTypesArgs = {
   errorTypes?: InputMaybe<Scalars["Boolean"]["input"]>;
 };
 
+export type QueryGetShotTableStateArgs = {
+  shotId: Scalars["Int"]["input"];
+};
+
 export type QueryGetShotsArgs = {
   countRespectsLimit?: Scalars["Boolean"]["input"];
   filterInput: FilterInput;
@@ -3604,6 +3618,14 @@ export type ShotProjectionGql = {
   trajectories: Array<BallTrajectoryGql>;
 };
 
+export type ShotTableStateGql = {
+  __typename?: "ShotTableStateGQL";
+  frameIndex: Scalars["Int"]["output"];
+  shotId: Scalars["Int"]["output"];
+  tableState: TableStateGql;
+  videoId: Scalars["Int"]["output"];
+};
+
 export type ShotsOrderingComponent =
   | {
       difficulty: FloatOrdering;
@@ -3980,6 +4002,7 @@ export type UsageStatsDailyGql = {
 
 export type UsageStatsGql = {
   __typename?: "UsageStatsGQL";
+  cohorts: Array<CohortStatsGql>;
   daily: Array<UsageStatsDailyGql>;
   funnel: FunnelStatsGql;
   processingLast24h: Array<ProcessingStatusCountGql>;
@@ -6593,6 +6616,79 @@ export type ReactToVideoMutation = {
   reactToVideo: boolean;
 };
 
+export type GetRecordedStreamsQueryVariables = Exact<{
+  limit?: Scalars["Int"]["input"];
+}>;
+
+export type GetRecordedStreamsQuery = {
+  __typename?: "Query";
+  getFeedVideos: {
+    __typename?: "VideoHistoryGQL";
+    videos: Array<{
+      __typename?: "VideoGQL";
+      id: number;
+      name?: string | null;
+      createdAt?: any | null;
+      screenshotUri?: string | null;
+      framesPerSecond: number;
+      totalShots: number;
+      owner?: {
+        __typename?: "UserGQL";
+        id: number;
+        username: string;
+        profileImageUri?: string | null;
+      } | null;
+    }>;
+  };
+};
+
+export type GetRecordedStreamShotsQueryVariables = Exact<{
+  videoId: Scalars["Int"]["input"];
+  limit?: Scalars["Int"]["input"];
+}>;
+
+export type GetRecordedStreamShotsQuery = {
+  __typename?: "Query";
+  getOrderedShots: {
+    __typename?: "GetShotsResult";
+    shots: Array<{
+      __typename?: "ShotGQL";
+      id: number;
+      videoId: number;
+      startFrame: number;
+      endFrame: number;
+      serializedShotPaths?: {
+        __typename?: "SerializedShotPathsGQL";
+        b64EncodedBuffer?: string | null;
+      } | null;
+      cueObjectFeatures?: {
+        __typename?: "CueObjectFeaturesGQL";
+        cueObjectDistance?: number | null;
+        cueObjectAngle?: number | null;
+        cueBallSpeed?: number | null;
+        shotDirection?: ShotDirectionEnum | null;
+        spinType?: SpinTypeEnum | null;
+      } | null;
+      pocketingIntentionFeatures?: {
+        __typename?: "PocketingIntentionFeaturesGQL";
+        make?: boolean | null;
+        targetPocketDistance?: number | null;
+        targetPocketAngle?: number | null;
+        targetPocketAngleDirection?: ShotDirectionEnum | null;
+        marginOfErrorInDegrees?: number | null;
+        intendedPocketType?: PocketEnum | null;
+        difficulty?: number | null;
+      } | null;
+      pocketingIntentionInfo?: {
+        __typename?: "PocketingIntentionInfoGQL";
+        ballId: number;
+        pocketId: PocketIdentifier;
+        pathMetadataIndex: number;
+      } | null;
+    }>;
+  };
+};
+
 export type GetRunsForHighlightsQueryVariables = Exact<{
   filterInput: RunFilterInput;
   runIds?: InputMaybe<Array<Scalars["Int"]["input"]> | Scalars["Int"]["input"]>;
@@ -6824,9 +6920,33 @@ export type GetLiveTableStateQuery = {
         __typename?: "RGBColorGQL";
         hex: string;
       } | null>;
+<<<<<<< HEAD
+    };
+  };
+};
+
+export type GetShotTableStateQueryVariables = Exact<{
+  shotId: Scalars["Int"]["input"];
+}>;
+
+export type GetShotTableStateQuery = {
+  __typename?: "Query";
+  getShotTableState: {
+    __typename?: "ShotTableStateGQL";
+    shotId: number;
+    videoId: number;
+    frameIndex: number;
+    tableState: {
+      __typename?: "TableStateGQL";
+      identifierToPosition: Array<Array<number>>;
+      identifierToColor: Array<{
+        __typename?: "RGBColorGQL";
+        hex: string;
+      } | null>;
+=======
       homography?: {
         __typename?: "HomographyInfoGQL";
-        id: number;
+        id?: number | null;
         frameIndex: number;
         crop: {
           __typename?: "BoundingBoxGQL";
@@ -6852,6 +6972,7 @@ export type GetLiveTableStateQuery = {
           bottomRight: { __typename?: "IntPoint2D"; x: number; y: number };
         };
       } | null;
+>>>>>>> 6d13dc3
     };
   };
 };
@@ -7475,6 +7596,14 @@ export type GetUsageStatsQuery = {
       retentionPrevActive: number;
       retentionReturned: number;
     };
+    cohorts: Array<{
+      __typename?: "CohortStatsGQL";
+      weekStart: any;
+      signups: number;
+      activated7d: number;
+      paid7d: number;
+      activatedNotPaid7d: number;
+    }>;
     windows: Array<{
       __typename?: "UsageStatsWindowGQL";
       label: string;
@@ -7855,7 +7984,7 @@ export type GetStreamMonitoringDetailsQuery = {
     elapsedTime?: number | null;
     currentHomography?: {
       __typename?: "HomographyInfoGQL";
-      id: number;
+      id?: number | null;
       frameIndex: number;
       crop: {
         __typename?: "BoundingBoxGQL";
@@ -8269,7 +8398,7 @@ export type GetVideoQuery = {
     } | null;
     homographyHistory: Array<{
       __typename?: "HomographyInfoGQL";
-      id: number;
+      id?: number | null;
       frameIndex: number;
       crop: {
         __typename?: "BoundingBoxGQL";
@@ -8517,7 +8646,7 @@ export type FindPrerecordTableLayoutMutation = {
   __typename?: "Mutation";
   findPrerecordTableLayout?: {
     __typename?: "HomographyInfoGQL";
-    id: number;
+    id?: number | null;
     frameIndex: number;
     crop: {
       __typename?: "BoundingBoxGQL";
@@ -8547,7 +8676,7 @@ export type FindPrerecordTableLayoutMutation = {
 
 export type HomographyInfoFragment = {
   __typename?: "HomographyInfoGQL";
-  id: number;
+  id?: number | null;
   frameIndex: number;
   crop: {
     __typename?: "BoundingBoxGQL";
@@ -14201,6 +14330,203 @@ export type ReactToVideoMutationOptions = Apollo.BaseMutationOptions<
   ReactToVideoMutation,
   ReactToVideoMutationVariables
 >;
+export const GetRecordedStreamsDocument = gql`
+  query GetRecordedStreams($limit: Int! = 25) {
+    getFeedVideos(
+      limit: $limit
+      filters: { isStreamCompleted: true, excludeVideosWithNoShots: true }
+      includePrivate: MINE
+      feedInput: { allUsers: true }
+    ) {
+      videos {
+        id
+        name
+        createdAt
+        screenshotUri
+        framesPerSecond
+        totalShots
+        owner {
+          id
+          username
+          profileImageUri
+        }
+      }
+    }
+  }
+`;
+
+/**
+ * __useGetRecordedStreamsQuery__
+ *
+ * To run a query within a React component, call `useGetRecordedStreamsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetRecordedStreamsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGetRecordedStreamsQuery({
+ *   variables: {
+ *      limit: // value for 'limit'
+ *   },
+ * });
+ */
+export function useGetRecordedStreamsQuery(
+  baseOptions?: Apollo.QueryHookOptions<
+    GetRecordedStreamsQuery,
+    GetRecordedStreamsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<
+    GetRecordedStreamsQuery,
+    GetRecordedStreamsQueryVariables
+  >(GetRecordedStreamsDocument, options);
+}
+export function useGetRecordedStreamsLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    GetRecordedStreamsQuery,
+    GetRecordedStreamsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<
+    GetRecordedStreamsQuery,
+    GetRecordedStreamsQueryVariables
+  >(GetRecordedStreamsDocument, options);
+}
+export function useGetRecordedStreamsSuspenseQuery(
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetRecordedStreamsQuery,
+    GetRecordedStreamsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useSuspenseQuery<
+    GetRecordedStreamsQuery,
+    GetRecordedStreamsQueryVariables
+  >(GetRecordedStreamsDocument, options);
+}
+export type GetRecordedStreamsQueryHookResult = ReturnType<
+  typeof useGetRecordedStreamsQuery
+>;
+export type GetRecordedStreamsLazyQueryHookResult = ReturnType<
+  typeof useGetRecordedStreamsLazyQuery
+>;
+export type GetRecordedStreamsSuspenseQueryHookResult = ReturnType<
+  typeof useGetRecordedStreamsSuspenseQuery
+>;
+export type GetRecordedStreamsQueryResult = Apollo.QueryResult<
+  GetRecordedStreamsQuery,
+  GetRecordedStreamsQueryVariables
+>;
+export const GetRecordedStreamShotsDocument = gql`
+  query GetRecordedStreamShots($videoId: Int!, $limit: Int! = 200) {
+    getOrderedShots(
+      filterInput: { videoId: [$videoId] }
+      shotsOrdering: { orderings: [{ startFrame: { descending: false } }] }
+      limit: $limit
+    ) {
+      shots {
+        id
+        videoId
+        startFrame
+        endFrame
+        serializedShotPaths {
+          b64EncodedBuffer
+        }
+        cueObjectFeatures {
+          cueObjectDistance
+          cueObjectAngle
+          cueBallSpeed
+          shotDirection
+          spinType
+        }
+        pocketingIntentionFeatures {
+          make
+          targetPocketDistance
+          targetPocketAngle
+          targetPocketAngleDirection
+          marginOfErrorInDegrees
+          intendedPocketType
+          difficulty
+        }
+        pocketingIntentionInfo {
+          ballId
+          pocketId
+          pathMetadataIndex
+        }
+      }
+    }
+  }
+`;
+
+/**
+ * __useGetRecordedStreamShotsQuery__
+ *
+ * To run a query within a React component, call `useGetRecordedStreamShotsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetRecordedStreamShotsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGetRecordedStreamShotsQuery({
+ *   variables: {
+ *      videoId: // value for 'videoId'
+ *      limit: // value for 'limit'
+ *   },
+ * });
+ */
+export function useGetRecordedStreamShotsQuery(
+  baseOptions: Apollo.QueryHookOptions<
+    GetRecordedStreamShotsQuery,
+    GetRecordedStreamShotsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<
+    GetRecordedStreamShotsQuery,
+    GetRecordedStreamShotsQueryVariables
+  >(GetRecordedStreamShotsDocument, options);
+}
+export function useGetRecordedStreamShotsLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    GetRecordedStreamShotsQuery,
+    GetRecordedStreamShotsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<
+    GetRecordedStreamShotsQuery,
+    GetRecordedStreamShotsQueryVariables
+  >(GetRecordedStreamShotsDocument, options);
+}
+export function useGetRecordedStreamShotsSuspenseQuery(
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetRecordedStreamShotsQuery,
+    GetRecordedStreamShotsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useSuspenseQuery<
+    GetRecordedStreamShotsQuery,
+    GetRecordedStreamShotsQueryVariables
+  >(GetRecordedStreamShotsDocument, options);
+}
+export type GetRecordedStreamShotsQueryHookResult = ReturnType<
+  typeof useGetRecordedStreamShotsQuery
+>;
+export type GetRecordedStreamShotsLazyQueryHookResult = ReturnType<
+  typeof useGetRecordedStreamShotsLazyQuery
+>;
+export type GetRecordedStreamShotsSuspenseQueryHookResult = ReturnType<
+  typeof useGetRecordedStreamShotsSuspenseQuery
+>;
+export type GetRecordedStreamShotsQueryResult = Apollo.QueryResult<
+  GetRecordedStreamShotsQuery,
+  GetRecordedStreamShotsQueryVariables
+>;
 export const GetRunsForHighlightsDocument = gql`
   query GetRunsForHighlights(
     $filterInput: RunFilterInput!
@@ -14622,13 +14948,9 @@ export const GetLiveTableStateDocument = gql`
         identifierToColor {
           hex
         }
-        homography {
-          ...HomographyInfo
-        }
       }
     }
   }
-  ${HomographyInfoFragmentDoc}
 `;
 
 /**
@@ -14696,6 +15018,87 @@ export type GetLiveTableStateQueryResult = Apollo.QueryResult<
   GetLiveTableStateQuery,
   GetLiveTableStateQueryVariables
 >;
+export const GetShotTableStateDocument = gql`
+  query GetShotTableState($shotId: Int!) {
+    getShotTableState(shotId: $shotId) {
+      shotId
+      videoId
+      frameIndex
+      tableState {
+        identifierToPosition
+        identifierToColor {
+          hex
+        }
+      }
+    }
+  }
+`;
+
+/**
+ * __useGetShotTableStateQuery__
+ *
+ * To run a query within a React component, call `useGetShotTableStateQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetShotTableStateQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGetShotTableStateQuery({
+ *   variables: {
+ *      shotId: // value for 'shotId'
+ *   },
+ * });
+ */
+export function useGetShotTableStateQuery(
+  baseOptions: Apollo.QueryHookOptions<
+    GetShotTableStateQuery,
+    GetShotTableStateQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<
+    GetShotTableStateQuery,
+    GetShotTableStateQueryVariables
+  >(GetShotTableStateDocument, options);
+}
+export function useGetShotTableStateLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    GetShotTableStateQuery,
+    GetShotTableStateQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<
+    GetShotTableStateQuery,
+    GetShotTableStateQueryVariables
+  >(GetShotTableStateDocument, options);
+}
+export function useGetShotTableStateSuspenseQuery(
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetShotTableStateQuery,
+    GetShotTableStateQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useSuspenseQuery<
+    GetShotTableStateQuery,
+    GetShotTableStateQueryVariables
+  >(GetShotTableStateDocument, options);
+}
+export type GetShotTableStateQueryHookResult = ReturnType<
+  typeof useGetShotTableStateQuery
+>;
+export type GetShotTableStateLazyQueryHookResult = ReturnType<
+  typeof useGetShotTableStateLazyQuery
+>;
+export type GetShotTableStateSuspenseQueryHookResult = ReturnType<
+  typeof useGetShotTableStateSuspenseQuery
+>;
+export type GetShotTableStateQueryResult = Apollo.QueryResult<
+  GetShotTableStateQuery,
+  GetShotTableStateQueryVariables
+>;
 export const SimulateShotDocument = gql`
   query SimulateShot($simulationInput: SimulateShotInputGQL!) {
     simulateShot(simulationInput: $simulationInput) {
@@ -15788,6 +16191,13 @@ export const GetUsageStatsDocument = gql`
         retentionPrevActive
         retentionReturned
       }
+      cohorts {
+        weekStart
+        signups
+        activated7d
+        paid7d
+        activatedNotPaid7d
+      }
       totalUsers
       totalVideos
       totalShots

src/operations/recorded_shots.gql

@@ -0,0 +1,62 @@
+# Lightweight two-step picker data for loading a recorded shot into Shot Lab.
+query GetRecordedStreams($limit: Int! = 25) {
+  getFeedVideos(
+    limit: $limit
+    filters: { isStreamCompleted: true, excludeVideosWithNoShots: true }
+    includePrivate: MINE
+    feedInput: { allUsers: true }
+  ) {
+    videos {
+      id
+      name
+      createdAt
+      screenshotUri
+      framesPerSecond
+      totalShots
+      owner {
+        id
+        username
+        profileImageUri
+      }
+    }
+  }
+}
+
+query GetRecordedStreamShots($videoId: Int!, $limit: Int! = 200) {
+  getOrderedShots(
+    filterInput: { videoId: [$videoId] }
+    shotsOrdering: { orderings: [{ startFrame: { descending: false } }] }
+    limit: $limit
+  ) {
+    shots {
+      id
+      videoId
+      startFrame
+      endFrame
+      serializedShotPaths {
+        b64EncodedBuffer
+      }
+      cueObjectFeatures {
+        cueObjectDistance
+        cueObjectAngle
+        cueBallSpeed
+        shotDirection
+        spinType
+      }
+      pocketingIntentionFeatures {
+        make
+        targetPocketDistance
+        targetPocketAngle
+        targetPocketAngleDirection
+        marginOfErrorInDegrees
+        intendedPocketType
+        difficulty
+      }
+      pocketingIntentionInfo {
+        ballId
+        pocketId
+        pathMetadataIndex
+      }
+    }
+  }
+}

src/operations/shot_simulation.gql

@@ -24,8 +24,19 @@ query GetLiveTableState($videoId: Int!) {
       identifierToColor {
         hex
       }
-      homography {
+    }
-        ...HomographyInfo
+  }
+}
+
+query GetShotTableState($shotId: Int!) {
+  getShotTableState(shotId: $shotId) {
+    shotId
+    videoId
+    frameIndex
+    tableState {
+      identifierToPosition
+      identifierToColor {
+        hex
       }
     }
   }

src/operations/usage_stats.gql

@@ -12,6 +12,13 @@ query getUsageStats($days: Int! = 30) {
       retentionPrevActive
       retentionReturned
     }
+    cohorts {
+      weekStart
+      signups
+      activated7d
+      paid7d
+      activatedNotPaid7d
+    }
     totalUsers
     totalVideos
     totalShots

src/schema.gql

@@ -1,7 +1,5 @@
 type Query {
-  getAggregatedShotMetrics(
+  getAggregatedShotMetrics(aggregateInput: AggregateInputGQL!): [AggregateResultGQL!]!
-    aggregateInput: AggregateInputGQL!
-  ): [AggregateResultGQL!]!
   getBucketSet(keyName: String!): BucketSetGQL
   challenges(includeDismissed: Boolean! = false): [Challenge!]!
   myDismissedChallenges: [Challenge!]!
@@ -13,44 +11,14 @@ type Query {
   myChallengeEntries: [ChallengeEntry!]!
   getDeployedConfig: DeployedConfigGQL!
   waitFor(duration: Float!): Float!
-  getFeedVideos(
+  getFeedVideos(limit: Int! = 5, after: String = null, includePrivate: IncludePrivateEnum! = MINE, includeCallersVideos: Boolean = true, filters: VideoFilterInput = null, feedInput: VideoFeedInputGQL = null): VideoHistoryGQL!
-    limit: Int! = 5
+  getVideoMakePercentageIntervals(videoId: ID!, intervalDuration: Int! = 300): [MakePercentageIntervalGQL!]!
-    after: String = null
+  getLongestRunsLeaderboard(interval: TimeInterval = null, when: DateTime = null, limit: Int! = 50, requiredTags: [String!] = null): RunLeaderboardGQL!
-    includePrivate: IncludePrivateEnum! = MINE
+  getDrillRunLeaderboard(drillTag: String!, interval: TimeInterval = null, limit: Int! = 50, tableSizeMin: Float = null, tableSizeMax: Float = null, pocketSizeMin: Float = null, pocketSizeMax: Float = null): DrillRunLeaderboardGQL!
-    includeCallersVideos: Boolean = true
-    filters: VideoFilterInput = null
-    feedInput: VideoFeedInputGQL = null
-  ): VideoHistoryGQL!
-  getVideoMakePercentageIntervals(
-    videoId: ID!
-    intervalDuration: Int! = 300
-  ): [MakePercentageIntervalGQL!]!
-  getLongestRunsLeaderboard(
-    interval: TimeInterval = null
-    when: DateTime = null
-    limit: Int! = 50
-    requiredTags: [String!] = null
-  ): RunLeaderboardGQL!
-  getDrillRunLeaderboard(
-    drillTag: String!
-    interval: TimeInterval = null
-    limit: Int! = 50
-    tableSizeMin: Float = null
-    tableSizeMax: Float = null
-    pocketSizeMin: Float = null
-    pocketSizeMax: Float = null
-  ): DrillRunLeaderboardGQL!
   getMyDrillRuns(drillTag: String!, limit: Int! = 50): [RunGQL!]!
-  getMakesLeaderboard(
+  getMakesLeaderboard(interval: TimeInterval = null, when: DateTime = null): CountLeaderboardGQL!
-    interval: TimeInterval = null
-    when: DateTime = null
-  ): CountLeaderboardGQL!
   getMedals(scope: MedalScope!, userId: Int = null): RequestedMedalsGQL!
-  notifications(
+  notifications(limit: Int! = 20, offset: Int! = 0, filters: NotificationFilters = null): NotificationConnection!
-    limit: Int! = 20
-    offset: Int! = 0
-    filters: NotificationFilters = null
-  ): NotificationConnection!
   unreadNotificationCount: Int!
   poolHalls: [PoolHall!]!
   claimablePoolHalls: [PoolHall!]!
@@ -58,68 +26,25 @@ type Query {
   claimableCameras(poolHallId: ID!): [PoolHallCamera!]!
   cameraClaimSession(id: ID!): CameraClaimSession
   activeCameraLease: CameraLease
-  getRuns(
+  getRuns(filterInput: RunFilterInput!, runIds: [Int!] = null, runsOrdering: GetRunsOrdering = null, limit: Int! = 500, countRespectsLimit: Boolean! = false): GetRunsResult!
-    filterInput: RunFilterInput!
-    runIds: [Int!] = null
-    runsOrdering: GetRunsOrdering = null
-    limit: Int! = 500
-    countRespectsLimit: Boolean! = false
-  ): GetRunsResult!
   videoPlayerClusters(videoId: Int!): [PlayerClusterGQL!]!
   getShotAnnotationTypes(errorTypes: Boolean = false): [ShotAnnotationTypeGQL!]!
-  getTableState(
+  getTableState(b64Image: String!, tableSize: Float = 100, useHomography: HomographyInputGQL = null): TableStateGQL!
-    b64Image: String!
-    tableSize: Float = 100
-    useHomography: HomographyInputGQL = null
-  ): TableStateGQL!
   getLiveTableState(videoId: Int!): LiveTableStateGQL!
+  getShotTableState(shotId: Int!): ShotTableStateGQL!
   simulateShot(simulationInput: SimulateShotInputGQL!): ShotProjectionGQL!
-  computePotAim(
+  computePotAim(simulationInput: SimulateShotInputGQL!, targetBallId: Int!, pocket: PocketIdentifier!): PotAimGQL!
-    simulationInput: SimulateShotInputGQL!
+  getOrderedShots(filterInput: FilterInput!, ids: [Int!] = null, shotsOrdering: GetShotsOrdering = null, limit: Int! = 500, countRespectsLimit: Boolean! = false): GetShotsResult!
-    targetBallId: Int!
+  getShotsWithMetadata(filterInput: FilterInput!, ids: [Int!] = null, shotsPagination: GetShotsPagination = null, limit: Int! = 500, countRespectsLimit: Boolean! = false): GetShotsResult!
-    pocket: PocketIdentifier!
+  getShots(filterInput: FilterInput!, shotsPagination: GetShotsPagination = null, limit: Int! = 500, countRespectsLimit: Boolean! = false): [ShotGQL!]!
-  ): PotAimGQL!
-  getOrderedShots(
-    filterInput: FilterInput!
-    ids: [Int!] = null
-    shotsOrdering: GetShotsOrdering = null
-    limit: Int! = 500
-    countRespectsLimit: Boolean! = false
-  ): GetShotsResult!
-  getShotsWithMetadata(
-    filterInput: FilterInput!
-    ids: [Int!] = null
-    shotsPagination: GetShotsPagination = null
-    limit: Int! = 500
-    countRespectsLimit: Boolean! = false
-  ): GetShotsResult!
-  getShots(
-    filterInput: FilterInput!
-    shotsPagination: GetShotsPagination = null
-    limit: Int! = 500
-    countRespectsLimit: Boolean! = false
-  ): [ShotGQL!]!
   getShotsByIds(ids: [Int!]!): [ShotGQL!]!
   getUsageStats(days: Int! = 30): UsageStatsGQL!
   getUser(userId: Int!): UserGQL
   doesUsernameExist(candidateUsername: String!): Boolean!
   getLoggedInUser: UserGQL
-  getUsernames(
+  getUsernames(matchString: String = null, limit: Int = null, after: String = null): [String!]!
-    matchString: String = null
+  getUsersMatching(matchString: String = null, limit: Int = null, after: String = null): [UserGQL!]!
-    limit: Int = null
+  getUserRelationshipsMatching(userId: Int!, matchString: String = null, limit: Int = 100, after: String = null): UserRelationshipsResult!
-    after: String = null
-  ): [String!]!
-  getUsersMatching(
-    matchString: String = null
-    limit: Int = null
-    after: String = null
-  ): [UserGQL!]!
-  getUserRelationshipsMatching(
-    userId: Int!
-    matchString: String = null
-    limit: Int = 100
-    after: String = null
-  ): UserRelationshipsResult!
   getAvailableSubscriptionOptions: StripeSubscriptionOptionsGQL!
   getUserSubscriptionStatus: UserSubscriptionStatusGQL!
   getResolvedTier: ResolvedTierGQL!
@@ -127,12 +52,7 @@ type Query {
   getQuotaStatus: QuotaStatusGQL!
   getStorageStatus: StorageStatusGQL
   getPlayTime(userId: Int!, filters: VideoFilterInput = null): UserPlayTimeGQL!
-  getUserVideos(
+  getUserVideos(userId: Int = null, limit: Int! = 5, after: String = null, filters: VideoFilterInput = null): VideoHistoryGQL!
-    userId: Int = null
-    limit: Int! = 5
-    after: String = null
-    filters: VideoFilterInput = null
-  ): VideoHistoryGQL!
   getUserTags(includeRetiredTags: Boolean = false): [TagGQL!]!
   getGameTypeTagMetrics(input: GameTypeTagMetricsInput!): [GameTypeTagMetric!]!
   videoExportJob(jobId: Int!): VideoExportJobGQL
@@ -204,9 +124,7 @@ input DatetimeRangeAggregationInput {
   feature: String! = "created_at"
 }
 
-"""
+"""Date with time (isoformat)"""
-Date with time (isoformat)
-"""
 scalar DateTime
 
 input TimeInterval @oneOf {
@@ -322,9 +240,7 @@ input DateRangeFilter {
   greaterThanInclusive: Boolean! = true
 }
 
-"""
+"""Date (isoformat)"""
-Date (isoformat)
-"""
 scalar Date
 
 type BucketSetGQL {
@@ -609,7 +525,7 @@ type VideoTagClass {
 }
 
 type HomographyInfoGQL {
-  id: Int!
+  id: Int
   frameIndex: Int!
   crop: BoundingBoxGQL!
   pockets: [BoundingBoxGQL!]!
@@ -850,8 +766,7 @@ type MedalGQL {
 
 input MedalScope @oneOf {
   videoId: Int
-  interval: TimeInterval
+  interval: TimeInterval @deprecated(reason: "NO LONGER SUPPORTED, USE DATETIME_RANGE")
-    @deprecated(reason: "NO LONGER SUPPORTED, USE DATETIME_RANGE")
   datetimeRange: DatetimeRangeAggregationInput
 }
 
@@ -1065,6 +980,13 @@ type LiveTableStateGQL {
   tableState: TableStateGQL!
 }
 
+type ShotTableStateGQL {
+  shotId: Int!
+  videoId: Int!
+  frameIndex: Int!
+  tableState: TableStateGQL!
+}
+
 type ShotProjectionGQL {
   trajectories: [BallTrajectoryGQL!]!
   events: [SimulationEventGQL!]!
@@ -1175,6 +1097,7 @@ type UsageStatsGQL {
   totalVideos: Int!
   totalShots: Int!
   totalRuns: Int!
+  cohorts: [CohortStatsGQL!]!
   windows: [UsageStatsWindowGQL!]!
   daily: [UsageStatsDailyGQL!]!
   processingLast24h: [ProcessingStatusCountGQL!]!
@@ -1193,6 +1116,14 @@ type FunnelStatsGQL {
   retentionReturned: Int!
 }
 
+type CohortStatsGQL {
+  weekStart: Date!
+  signups: Int!
+  activated7d: Int!
+  paid7d: Int!
+  activatedNotPaid7d: Int!
+}
+
 type UsageStatsWindowGQL {
   label: String!
   newUsers: Int!
@@ -1354,9 +1285,7 @@ type StorageStatusGQL {
   lastCalculatedAt: DateTime
 }
 
-"""
+"""Integer value that can exceed GraphQL Int's 32-bit range."""
-Integer value that can exceed GraphQL Int's 32-bit range.
-"""
 scalar BigInt
 
 type UserPlayTimeGQL {
@@ -1427,34 +1356,14 @@ enum VideoExportStatusEnum {
 """
 The `JSON` scalar type represents JSON values as specified by [ECMA-404](https://ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf).
 """
-scalar JSON
+scalar JSON @specifiedBy(url: "https://ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf")
-  @specifiedBy(
-    url: "https://ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf"
-  )
 
 type Mutation {
   createBucketSet(params: CreateBucketSetInput!): BucketSetGQL!
   createRuleSet(name: String!, description: String = null): RuleSet!
-  createChallenge(
+  createChallenge(name: String!, ruleSetId: ID!, minimumShots: Int!, startDate: DateTime!, endDate: DateTime!, description: String = null, requiredTableSize: Float = null, requiredPocketSize: Float = null, isPublic: Boolean! = false, maxAttempts: Int = null): Challenge!
-    name: String!
+  inviteUsersToChallenge(challengeId: ID!, userIds: [ID!]!): [ChallengeInvitation!]!
-    ruleSetId: ID!
+  respondToChallengeInvitation(invitationId: ID!, accept: Boolean!): ChallengeInvitation!
-    minimumShots: Int!
-    startDate: DateTime!
-    endDate: DateTime!
-    description: String = null
-    requiredTableSize: Float = null
-    requiredPocketSize: Float = null
-    isPublic: Boolean! = false
-    maxAttempts: Int = null
-  ): Challenge!
-  inviteUsersToChallenge(
-    challengeId: ID!
-    userIds: [ID!]!
-  ): [ChallengeInvitation!]!
-  respondToChallengeInvitation(
-    invitationId: ID!
-    accept: Boolean!
-  ): ChallengeInvitation!
   startChallenge(challengeId: ID!): ChallengeEntry!
   recalculateChallengeEntry(entryId: ID!): ChallengeEntry!
   submitChallengeEntry(entryId: ID!, videoId: ID!): ChallengeEntry!
@@ -1462,61 +1371,30 @@ type Mutation {
   undismissChallenge(challengeId: ID!): Boolean!
   setLoggerLevel(path: String!, level: String!): Boolean!
   reactToVideo(videoId: Int!, reaction: ReactionEnum): Boolean!
-  commentOnVideo(
+  commentOnVideo(videoId: Int!, message: String!, parentCommentId: Int): Boolean!
-    videoId: Int!
-    message: String!
-    parentCommentId: Int
-  ): Boolean!
   editComment(videoId: Int!, commentId: Int!, newMessage: String!): Boolean!
   deleteComment(videoId: Int!, commentId: Int!): Boolean!
   blockContent(videoId: Int!): Boolean!
   blockUser(userId: Int!): Boolean!
-  reportContent(
+  reportContent(videoId: Int!, reason: ReportReasonEnum!, customReason: String = null): Boolean!
-    videoId: Int!
-    reason: ReportReasonEnum!
-    customReason: String = null
-  ): Boolean!
   markNotificationAsRead(notificationId: Int!): Boolean!
   markAllNotificationsAsRead: Boolean!
   markNotificationsAsRead(notificationIds: [Int!]!): Boolean!
   deleteNotification(notificationId: Int!): Boolean!
   createPoolHall(input: CreatePoolHallInput!): PoolHall!
   updatePoolHall(input: UpdatePoolHallInput!): PoolHall!
-  createPoolHallCamera(
+  createPoolHallCamera(input: CreatePoolHallCameraInput!): PoolHallCameraStreamCredentials!
-    input: CreatePoolHallCameraInput!
-  ): PoolHallCameraStreamCredentials!
   updatePoolHallCamera(input: UpdatePoolHallCameraInput!): PoolHallCamera!
   rotatePoolHallCameraStreamKey(cameraId: ID!): PoolHallCameraStreamCredentials!
-  createCameraClaimSession(
+  createCameraClaimSession(cameraId: ID!, durationMinutes: Int = null, videoName: String = null, videoPrivate: Boolean = null, agreedTermsVersion: Int = null, tags: [VideoTagInput!] = null): CameraClaimSession!
-    cameraId: ID!
-    durationMinutes: Int = null
-    videoName: String = null
-    videoPrivate: Boolean = null
-    agreedTermsVersion: Int = null
-    tags: [VideoTagInput!] = null
-  ): CameraClaimSession!
   cancelCameraClaimSession(claimSessionId: ID!): CameraClaimSession!
   endCameraLease(leaseId: ID!): CameraLease!
   extendCameraLease(leaseId: ID!, additionalMinutes: Int! = 60): CameraLease!
-  finalizePlayerAssignments(
+  finalizePlayerAssignments(input: FinalizePlayerAssignmentsInput!): [PlayerClusterGQL!]!
-    input: FinalizePlayerAssignmentsInput!
+  addAnnotationToShot(shotId: Int!, annotationName: String!, notes: String = null): AddShotAnnotationReturn!
-  ): [PlayerClusterGQL!]!
+  updateShotAnnotations(shotId: Int!, annotations: [UpdateAnnotationInputGQL!]!): UpdateShotAnnotationReturn!
-  addAnnotationToShot(
+  editShot(shotId: Int!, fieldsToEdit: EditableShotFieldInputGQL!): EditShotReturn!
-    shotId: Int!
+  getProfileImageUploadLink(fileExt: String = ".png"): GetProfileUploadLinkReturn!
-    annotationName: String!
-    notes: String = null
-  ): AddShotAnnotationReturn!
-  updateShotAnnotations(
-    shotId: Int!
-    annotations: [UpdateAnnotationInputGQL!]!
-  ): UpdateShotAnnotationReturn!
-  editShot(
-    shotId: Int!
-    fieldsToEdit: EditableShotFieldInputGQL!
-  ): EditShotReturn!
-  getProfileImageUploadLink(
-    fileExt: String = ".png"
-  ): GetProfileUploadLinkReturn!
   editProfileImageUri(profileImageUri: String!): UserGQL!
   editUser(input: EditUserInputGQL!): UserGQL!
   followUser(followedUserId: Int!): UserGQL!
@@ -1524,39 +1402,20 @@ type Mutation {
   retireTags(tagIds: [Int!]!): Boolean!
   ensureStripeCustomerExists: UserGQL!
   deleteUser: Boolean!
-  syncAppleSubscription(
+  syncAppleSubscription(input: SyncAppleSubscriptionInputGQL!): SyncAppleSubscriptionResultGQL!
-    input: SyncAppleSubscriptionInputGQL!
-  ): SyncAppleSubscriptionResultGQL!
   createSubscription(priceId: String!): CreateSubscriptionResultGQL!
   createCustomerPortalSession: CreateCustomerPortalSessionResultGQL!
   cancelSubscription: UserSubscriptionStatusGQL!
-  grantManualEntitlement(
+  grantManualEntitlement(userId: Int!, tierName: String! = "pro", startsAt: DateTime = null, endsAt: DateTime = null, reason: String = null): UserSubscriptionStatusGQL!
-    userId: Int!
-    tierName: String! = "pro"
-    startsAt: DateTime = null
-    endsAt: DateTime = null
-    reason: String = null
-  ): UserSubscriptionStatusGQL!
   revokeManualEntitlement(userId: Int!): UserSubscriptionStatusGQL!
-  submitCancellationFeedback(
+  submitCancellationFeedback(reasons: [CancellationReasonEnum!] = null, feedback: String = null, metadata: CancellationFeedbackMetadataInput = null): Boolean!
-    reasons: [CancellationReasonEnum!] = null
-    feedback: String = null
-    metadata: CancellationFeedbackMetadataInput = null
-  ): Boolean!
   requestVideoExport(input: RequestVideoExportInput!): VideoExportJobGQL!
   dismissVideoExport(jobId: Int!): Boolean!
   findPrerecordTableLayout(b64Image: String!, videoId: Int!): HomographyInfoGQL
-  createUploadStream(
+  createUploadStream(videoMetadata: VideoMetadataInput!, expectedDurationSeconds: Float = null): CreateUploadStreamReturn!
-    videoMetadata: VideoMetadataInput!
-    expectedDurationSeconds: Float = null
-  ): CreateUploadStreamReturn!
   getUploadLink(videoId: Int!, segmentIndex: Int!): GetUploadLinkReturn!
   getHlsInitUploadLink(videoId: Int!): GetUploadLinkReturn!
-  setSegmentDuration(
+  setSegmentDuration(videoId: Int!, segmentIndex: Int!, duration: Float!): Boolean!
-    videoId: Int!
-    segmentIndex: Int!
-    duration: Float!
-  ): Boolean!
   editUploadStream(videoId: Int!, videoMetadata: VideoMetadataInput!): Boolean!
   deleteVideo(videoId: Int!): Boolean!
   deleteTags(videoId: Int!, tagsToDelete: [VideoTagInput!]!): Boolean!
@@ -1648,9 +1507,7 @@ type AddShotAnnotationReturn {
   value: SuccessfulAddAddShotAnnotationErrors!
 }
 
-union SuccessfulAddAddShotAnnotationErrors =
+union SuccessfulAddAddShotAnnotationErrors = SuccessfulAdd | AddShotAnnotationErrors
-    SuccessfulAdd
-  | AddShotAnnotationErrors
 
 type SuccessfulAdd {
   value: Boolean!
@@ -1660,9 +1517,7 @@ type AddShotAnnotationErrors {
   error: DoesNotOwnShotErrOtherErrorNeedsNote!
 }
 
-union DoesNotOwnShotErrOtherErrorNeedsNote =
+union DoesNotOwnShotErrOtherErrorNeedsNote = DoesNotOwnShotErr | OtherErrorNeedsNote
-    DoesNotOwnShotErr
-  | OtherErrorNeedsNote
 
 type DoesNotOwnShotErr {
   shotId: Int!
@@ -1703,9 +1558,7 @@ type GetProfileUploadLinkReturn {
   value: UploadLinkGetProfileUploadLinkErrors!
 }
 
-union UploadLinkGetProfileUploadLinkErrors =
+union UploadLinkGetProfileUploadLinkErrors = UploadLink | GetProfileUploadLinkErrors
-    UploadLink
-  | GetProfileUploadLinkErrors
 
 type UploadLink {
   uploadUrl: String!
@@ -1792,12 +1645,9 @@ input VideoMetadataInput {
   videoName: String = null
   startTime: DateTime = null
   endTime: DateTime = null
-  gameType: String = null
+  gameType: String = null @deprecated(reason: "`game_type` is deprecated. Use `tags` instead.")
-    @deprecated(reason: "`game_type` is deprecated. Use `tags` instead.")
 
-  """
+  """A list of tags associated with the video. Replace `game_type`"""
-  A list of tags associated with the video. Replace `game_type`
-  """
   tags: [VideoTagInput!] = null
   tableSize: Float = null
   pocketSize: Float = null
@@ -1826,15 +1676,7 @@ type GetUploadLinkErrors {
   error: MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErrInitUploadAlreadyCompletedErrTooManyInitUploadsErrStorageLimitExceededErr!
 }
 
-union MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErrInitUploadAlreadyCompletedErrTooManyInitUploadsErrStorageLimitExceededErr =
+union MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErrInitUploadAlreadyCompletedErrTooManyInitUploadsErrStorageLimitExceededErr = MustHaveSetForUploadLinkErr | SegmentAlreadyUploadedErr | ProcessingFailedErr | NoInitForChunkedUploadErr | TooManyProfileImageUploadsErr | InitUploadAlreadyCompletedErr | TooManyInitUploadsErr | StorageLimitExceededErr
-    MustHaveSetForUploadLinkErr
-  | SegmentAlreadyUploadedErr
-  | ProcessingFailedErr
-  | NoInitForChunkedUploadErr
-  | TooManyProfileImageUploadsErr
-  | InitUploadAlreadyCompletedErr
-  | TooManyInitUploadsErr
-  | StorageLimitExceededErr
 
 type MustHaveSetForUploadLinkErr {
   resolution: Boolean