Select stream.id in upload-status operations so the cache stays normalized

UploadStreamWithDetails and the editUploadStream response selected
stream fields without id. Apollo cannot normalize an object with no id
selected, so every upload-service poll rewrote VideoGQL.stream as an
anonymous inline object — clobbering the id that feed/detail queries
select. Their cache reads went partial and useQuery silently fell back
to the last network result, rendered as the home feed collapsing to
the first page (and bouncing the viewport) whenever an upload was
polling.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

src/index.tsx

@@ -2404,11 +2404,6 @@ export type Header = {
   value: Scalars["String"]["output"];
 };
 
-export enum HomographyBackendGql {
-  Classic = "CLASSIC",
-  Tablenet = "TABLENET",
-}
-
 export type HomographyInfoGql = {
   __typename?: "HomographyInfoGQL";
   crop: BoundingBoxGql;
@@ -3195,28 +3190,14 @@ export type QueryGetLiveTableStateArgs = {
 };
 
 export type QueryGetLongestRunsLeaderboardArgs = {
-  excludeDrills?: Scalars["Boolean"]["input"];
-  gameType?: InputMaybe<Scalars["String"]["input"]>;
   interval?: InputMaybe<TimeInterval>;
   limit?: Scalars["Int"]["input"];
-  pocketSizeMax?: InputMaybe<Scalars["Float"]["input"]>;
-  pocketSizeMin?: InputMaybe<Scalars["Float"]["input"]>;
-  rankedOnly?: Scalars["Boolean"]["input"];
   requiredTags?: InputMaybe<Array<Scalars["String"]["input"]>>;
-  tableSizeMax?: InputMaybe<Scalars["Float"]["input"]>;
-  tableSizeMin?: InputMaybe<Scalars["Float"]["input"]>;
   when?: InputMaybe<Scalars["DateTime"]["input"]>;
 };
 
 export type QueryGetMakesLeaderboardArgs = {
-  excludeDrills?: Scalars["Boolean"]["input"];
-  gameType?: InputMaybe<Scalars["String"]["input"]>;
   interval?: InputMaybe<TimeInterval>;
-  pocketSizeMax?: InputMaybe<Scalars["Float"]["input"]>;
-  pocketSizeMin?: InputMaybe<Scalars["Float"]["input"]>;
-  rankedOnly?: Scalars["Boolean"]["input"];
-  tableSizeMax?: InputMaybe<Scalars["Float"]["input"]>;
-  tableSizeMin?: InputMaybe<Scalars["Float"]["input"]>;
   when?: InputMaybe<Scalars["DateTime"]["input"]>;
 };
 
@@ -4297,7 +4278,6 @@ export type VideoMetadataInput = {
   framesPerSecond?: InputMaybe<Scalars["Float"]["input"]>;
   /** @deprecated `game_type` is deprecated. Use `tags` instead. */
   gameType?: InputMaybe<Scalars["String"]["input"]>;
-  homographyBackend?: InputMaybe<HomographyBackendGql>;
   lastIntendedSegmentBound?: InputMaybe<Scalars["Int"]["input"]>;
   pocketSize?: InputMaybe<Scalars["Float"]["input"]>;
   private?: InputMaybe<Scalars["Boolean"]["input"]>;
@@ -5344,6 +5324,43 @@ export type GetMyDrillRunsQuery = {
   }>;
 };
 
+export type GetLiveStreamsQueryVariables = Exact<{
+  limit?: Scalars["Int"]["input"];
+}>;
+
+export type GetLiveStreamsQuery = {
+  __typename?: "Query";
+  getFeedVideos: {
+    __typename?: "VideoHistoryGQL";
+    videos: Array<{
+      __typename?: "VideoGQL";
+      id: number;
+      name?: string | null;
+      startTime?: any | null;
+      createdAt?: any | null;
+      screenshotUri?: string | null;
+      elapsedTime?: number | null;
+      owner?: {
+        __typename?: "UserGQL";
+        id: number;
+        username: string;
+        profileImageUri?: string | null;
+      } | null;
+      stream?: {
+        __typename?: "UploadStreamGQL";
+        id: string;
+        isCompleted: boolean;
+        lastSegmentUploadedAt?: any | null;
+      } | null;
+    }>;
+    pageInfo: {
+      __typename?: "PageInfoGQL";
+      hasNextPage: boolean;
+      endCursor?: string | null;
+    };
+  };
+};
+
 export type GetVideoMakePercentageIntervalsQueryVariables = Exact<{
   videoId: Scalars["ID"]["input"];
   intervalDuration: Scalars["Int"]["input"];
@@ -6685,11 +6702,11 @@ export type ReactToVideoMutation = {
   reactToVideo: boolean;
 };
 
-export type GetShotLabVideosQueryVariables = Exact<{
+export type GetRecordedStreamsQueryVariables = Exact<{
   limit?: Scalars["Int"]["input"];
 }>;
 
-export type GetShotLabVideosQuery = {
+export type GetRecordedStreamsQuery = {
   __typename?: "Query";
   getFeedVideos: {
     __typename?: "VideoHistoryGQL";
@@ -6707,12 +6724,6 @@ export type GetShotLabVideosQuery = {
         username: string;
         profileImageUri?: string | null;
       } | null;
-      stream?: {
-        __typename?: "UploadStreamGQL";
-        id: string;
-        isCompleted: boolean;
-        lastSegmentUploadedAt?: any | null;
-      } | null;
     }>;
   };
 };
@@ -9020,6 +9031,7 @@ export type GetUploadLinkMutation = {
         };
     stream?: {
       __typename?: "UploadStreamGQL";
+      id: string;
       uploadCompletionCursor: number;
     } | null;
   };
@@ -9118,6 +9130,7 @@ export type UploadStreamWithDetailsFragment = {
   startTime?: any | null;
   stream?: {
     __typename?: "UploadStreamGQL";
+    id: string;
     isCompleted: boolean;
     lastIntendedSegmentBound?: number | null;
     uploadCompletionCursor: number;
@@ -9142,6 +9155,7 @@ export type GetUploadStreamsWithDetailsQuery = {
       startTime?: any | null;
       stream?: {
         __typename?: "UploadStreamGQL";
+        id: string;
         isCompleted: boolean;
         lastIntendedSegmentBound?: number | null;
         uploadCompletionCursor: number;
@@ -9681,6 +9695,7 @@ export const UploadStreamWithDetailsFragmentDoc = gql`
     name
     startTime
     stream {
+      id
       isCompleted
       lastIntendedSegmentBound
       uploadCompletionCursor
@@ -12117,6 +12132,105 @@ export type GetMyDrillRunsQueryResult = Apollo.QueryResult<
   GetMyDrillRunsQuery,
   GetMyDrillRunsQueryVariables
 >;
+export const GetLiveStreamsDocument = gql`
+  query GetLiveStreams($limit: Int! = 25) {
+    getFeedVideos(
+      limit: $limit
+      filters: { isStreamCompleted: false, requireCursorCompletion: false }
+      includePrivate: MINE
+      feedInput: { allUsers: true }
+    ) {
+      videos {
+        id
+        name
+        startTime
+        createdAt
+        screenshotUri
+        elapsedTime
+        owner {
+          id
+          username
+          profileImageUri
+        }
+        stream {
+          id
+          isCompleted
+          lastSegmentUploadedAt
+        }
+      }
+      pageInfo {
+        hasNextPage
+        endCursor
+      }
+    }
+  }
+`;
+
+/**
+ * __useGetLiveStreamsQuery__
+ *
+ * To run a query within a React component, call `useGetLiveStreamsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetLiveStreamsQuery` 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 } = useGetLiveStreamsQuery({
+ *   variables: {
+ *      limit: // value for 'limit'
+ *   },
+ * });
+ */
+export function useGetLiveStreamsQuery(
+  baseOptions?: Apollo.QueryHookOptions<
+    GetLiveStreamsQuery,
+    GetLiveStreamsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<GetLiveStreamsQuery, GetLiveStreamsQueryVariables>(
+    GetLiveStreamsDocument,
+    options,
+  );
+}
+export function useGetLiveStreamsLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    GetLiveStreamsQuery,
+    GetLiveStreamsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<GetLiveStreamsQuery, GetLiveStreamsQueryVariables>(
+    GetLiveStreamsDocument,
+    options,
+  );
+}
+export function useGetLiveStreamsSuspenseQuery(
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetLiveStreamsQuery,
+    GetLiveStreamsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useSuspenseQuery<
+    GetLiveStreamsQuery,
+    GetLiveStreamsQueryVariables
+  >(GetLiveStreamsDocument, options);
+}
+export type GetLiveStreamsQueryHookResult = ReturnType<
+  typeof useGetLiveStreamsQuery
+>;
+export type GetLiveStreamsLazyQueryHookResult = ReturnType<
+  typeof useGetLiveStreamsLazyQuery
+>;
+export type GetLiveStreamsSuspenseQueryHookResult = ReturnType<
+  typeof useGetLiveStreamsSuspenseQuery
+>;
+export type GetLiveStreamsQueryResult = Apollo.QueryResult<
+  GetLiveStreamsQuery,
+  GetLiveStreamsQueryVariables
+>;
 export const GetVideoMakePercentageIntervalsDocument = gql`
   query GetVideoMakePercentageIntervals(
     $videoId: ID!
@@ -14415,10 +14529,11 @@ export type ReactToVideoMutationOptions = Apollo.BaseMutationOptions<
   ReactToVideoMutation,
   ReactToVideoMutationVariables
 >;
-export const GetShotLabVideosDocument = gql`
+export const GetRecordedStreamsDocument = gql`
-  query GetShotLabVideos($limit: Int! = 25) {
+  query GetRecordedStreams($limit: Int! = 25) {
     getFeedVideos(
       limit: $limit
+      filters: { isStreamCompleted: true, excludeVideosWithNoShots: true }
       includePrivate: MINE
       feedInput: { allUsers: true }
     ) {
@@ -14434,80 +14549,75 @@ export const GetShotLabVideosDocument = gql`
           username
           profileImageUri
         }
-        stream {
-          id
-          isCompleted
-          lastSegmentUploadedAt
-        }
       }
     }
   }
 `;
 
 /**
- * __useGetShotLabVideosQuery__
+ * __useGetRecordedStreamsQuery__
  *
- * To run a query within a React component, call `useGetShotLabVideosQuery` and pass it any options that fit your needs.
+ * To run a query within a React component, call `useGetRecordedStreamsQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetShotLabVideosQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * 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 } = useGetShotLabVideosQuery({
+ * const { data, loading, error } = useGetRecordedStreamsQuery({
  *   variables: {
  *      limit: // value for 'limit'
  *   },
  * });
  */
-export function useGetShotLabVideosQuery(
+export function useGetRecordedStreamsQuery(
   baseOptions?: Apollo.QueryHookOptions<
-    GetShotLabVideosQuery,
+    GetRecordedStreamsQuery,
-    GetShotLabVideosQueryVariables
+    GetRecordedStreamsQueryVariables
   >,
 ) {
   const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useQuery<GetShotLabVideosQuery, GetShotLabVideosQueryVariables>(
+  return Apollo.useQuery<
-    GetShotLabVideosDocument,
+    GetRecordedStreamsQuery,
-    options,
+    GetRecordedStreamsQueryVariables
-  );
+  >(GetRecordedStreamsDocument, options);
 }
-export function useGetShotLabVideosLazyQuery(
+export function useGetRecordedStreamsLazyQuery(
   baseOptions?: Apollo.LazyQueryHookOptions<
-    GetShotLabVideosQuery,
+    GetRecordedStreamsQuery,
-    GetShotLabVideosQueryVariables
+    GetRecordedStreamsQueryVariables
   >,
 ) {
   const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useLazyQuery<
-    GetShotLabVideosQuery,
+    GetRecordedStreamsQuery,
-    GetShotLabVideosQueryVariables
+    GetRecordedStreamsQueryVariables
-  >(GetShotLabVideosDocument, options);
+  >(GetRecordedStreamsDocument, options);
 }
-export function useGetShotLabVideosSuspenseQuery(
+export function useGetRecordedStreamsSuspenseQuery(
   baseOptions?: Apollo.SuspenseQueryHookOptions<
-    GetShotLabVideosQuery,
+    GetRecordedStreamsQuery,
-    GetShotLabVideosQueryVariables
+    GetRecordedStreamsQueryVariables
   >,
 ) {
   const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
-    GetShotLabVideosQuery,
+    GetRecordedStreamsQuery,
-    GetShotLabVideosQueryVariables
+    GetRecordedStreamsQueryVariables
-  >(GetShotLabVideosDocument, options);
+  >(GetRecordedStreamsDocument, options);
 }
-export type GetShotLabVideosQueryHookResult = ReturnType<
+export type GetRecordedStreamsQueryHookResult = ReturnType<
-  typeof useGetShotLabVideosQuery
+  typeof useGetRecordedStreamsQuery
 >;
-export type GetShotLabVideosLazyQueryHookResult = ReturnType<
+export type GetRecordedStreamsLazyQueryHookResult = ReturnType<
-  typeof useGetShotLabVideosLazyQuery
+  typeof useGetRecordedStreamsLazyQuery
 >;
-export type GetShotLabVideosSuspenseQueryHookResult = ReturnType<
+export type GetRecordedStreamsSuspenseQueryHookResult = ReturnType<
-  typeof useGetShotLabVideosSuspenseQuery
+  typeof useGetRecordedStreamsSuspenseQuery
 >;
-export type GetShotLabVideosQueryResult = Apollo.QueryResult<
+export type GetRecordedStreamsQueryResult = Apollo.QueryResult<
-  GetShotLabVideosQuery,
+  GetRecordedStreamsQuery,
-  GetShotLabVideosQueryVariables
+  GetRecordedStreamsQueryVariables
 >;
 export const GetRecordedStreamShotsDocument = gql`
   query GetRecordedStreamShots($videoId: Int!, $limit: Int! = 200) {
@@ -19369,6 +19479,7 @@ export const GetUploadLinkDocument = gql`
         }
       }
       stream {
+        id
         uploadCompletionCursor
       }
     }

src/operations/live_streams.gql

@@ -0,0 +1,34 @@
+# Lightweight listing of live (in-progress) streams for pickers like the
+# Shot Lab "follow a live stream" flow. Selects only what a picker card
+# needs; intentionally avoids the heavy VideoCardFields fragment.
+query GetLiveStreams($limit: Int! = 25) {
+  getFeedVideos(
+    limit: $limit
+    filters: { isStreamCompleted: false, requireCursorCompletion: false }
+    includePrivate: MINE
+    feedInput: { allUsers: true }
+  ) {
+    videos {
+      id
+      name
+      startTime
+      createdAt
+      screenshotUri
+      elapsedTime
+      owner {
+        id
+        username
+        profileImageUri
+      }
+      stream {
+        id
+        isCompleted
+        lastSegmentUploadedAt
+      }
+    }
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
+  }
+}

src/operations/recorded_shots.gql

@@ -1,10 +1,8 @@
-# Lightweight two-step picker data for Shot Lab's video-first source: recent
+# Lightweight two-step picker data for loading a recorded shot into Shot Lab.
-# videos (completed or still uploading — no completion gate, so an in-progress
+query GetRecordedStreams($limit: Int! = 25) {
-# recording with no shots yet still appears), then that video's shots. The
-# stream fields let the client hint at "actively updating" without gating.
-query GetShotLabVideos($limit: Int! = 25) {
   getFeedVideos(
     limit: $limit
+    filters: { isStreamCompleted: true, excludeVideosWithNoShots: true }
     includePrivate: MINE
     feedInput: { allUsers: true }
   ) {
@@ -20,11 +18,6 @@ query GetShotLabVideos($limit: Int! = 25) {
         username
         profileImageUri
       }
-      stream {
-        id
-        isCompleted
-        lastSegmentUploadedAt
-      }
     }
   }
 }

src/operations/video_upload.gql

@@ -48,6 +48,7 @@ mutation GetUploadLink($videoId: Int!, $segmentIndex: Int!) {
       }
     }
     stream {
+      id
       uploadCompletionCursor
     }
   }
@@ -127,6 +128,7 @@ fragment UploadStreamWithDetails on VideoGQL {
   name
   startTime
   stream {
+    id
     isCompleted
     lastIntendedSegmentBound
     uploadCompletionCursor