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

@@ -393,16 +393,6 @@ export type DoesNotOwnShotErrOtherErrorNeedsNote =
   | DoesNotOwnShotErr
   | OtherErrorNeedsNote;
 
-export type DrillResultGql = {
-  __typename?: "DrillResultGQL";
-  attemptCount: Scalars["Int"]["output"];
-  drillTag: Scalars["String"]["output"];
-  isPersonalBest: Scalars["Boolean"]["output"];
-  longestRun: Scalars["Int"]["output"];
-  longestRunId?: Maybe<Scalars["Int"]["output"]>;
-  prRank: Scalars["Int"]["output"];
-};
-
 export type DrillRunLeaderboardGql = {
   __typename?: "DrillRunLeaderboardGQL";
   entries: Array<RunGql>;
@@ -3098,6 +3088,7 @@ export type Query = {
   getQuotaStatus: QuotaStatusGql;
   getResolvedTier: ResolvedTierGql;
   getRuns: GetRunsResult;
+  getSessionCoach: SessionCoachGql;
   getShotAnnotationTypes: Array<ShotAnnotationTypeGql>;
   getShotTableState: ShotTableStateGql;
   getShots: Array<ShotGql>;
@@ -3241,6 +3232,10 @@ export type QueryGetRunsArgs = {
   runsOrdering?: InputMaybe<GetRunsOrdering>;
 };
 
+export type QueryGetSessionCoachArgs = {
+  videoId: Scalars["Int"]["input"];
+};
+
 export type QueryGetShotAnnotationTypesArgs = {
   errorTypes?: InputMaybe<Scalars["Boolean"]["input"]>;
 };
@@ -3556,6 +3551,84 @@ export type SerializedShotPathsGql = {
   b64EncodedBuffer?: Maybe<Scalars["String"]["output"]>;
 };
 
+export enum SessionCoachCandidateFamilyEnum {
+  Aiming = "AIMING",
+  BackCut = "BACK_CUT",
+  CueToObjectDistance = "CUE_TO_OBJECT_DISTANCE",
+  CutAngle = "CUT_ANGLE",
+  ObjectToPocketDistance = "OBJECT_TO_POCKET_DISTANCE",
+  Spin = "SPIN",
+}
+
+export type SessionCoachCandidateGql = {
+  __typename?: "SessionCoachCandidateGQL";
+  action: Scalars["String"]["output"];
+  body: Scalars["String"]["output"];
+  drillId?: Maybe<Scalars["String"]["output"]>;
+  evidence: SessionCoachEvidenceGql;
+  family: SessionCoachCandidateFamilyEnum;
+  id: Scalars["ID"]["output"];
+  kind: SessionCoachCandidateKindEnum;
+  limitations: Array<Scalars["String"]["output"]>;
+  rank: Scalars["Int"]["output"];
+  supportingShotIds: Array<Scalars["Int"]["output"]>;
+  title: Scalars["String"]["output"];
+};
+
+export enum SessionCoachCandidateKindEnum {
+  DirectionalMiss = "DIRECTIONAL_MISS",
+  OutcomePattern = "OUTCOME_PATTERN",
+  UsagePattern = "USAGE_PATTERN",
+}
+
+export type SessionCoachEvidenceGql = {
+  __typename?: "SessionCoachEvidenceGQL";
+  attemptCount: Scalars["Int"]["output"];
+  bucketKey: Scalars["String"]["output"];
+  bucketLabel: Scalars["String"]["output"];
+  comparisonAttemptCount: Scalars["Int"]["output"];
+  comparisonMadeCount: Scalars["Int"]["output"];
+  comparisonMakePercentage?: Maybe<Scalars["Float"]["output"]>;
+  madeCount: Scalars["Int"]["output"];
+  makePercentage: Scalars["Float"]["output"];
+  missedCount: Scalars["Int"]["output"];
+  patternShotCount: Scalars["Int"]["output"];
+  rankReason: Scalars["String"]["output"];
+  score: Scalars["Float"]["output"];
+};
+
+export type SessionCoachGql = {
+  __typename?: "SessionCoachGQL";
+  analysisVersion: Scalars["String"]["output"];
+  analyzedShotCount: Scalars["Int"]["output"];
+  candidates: Array<SessionCoachCandidateGql>;
+  generatedAt: Scalars["DateTime"]["output"];
+  ineligibilityReason?: Maybe<SessionCoachIneligibilityReasonEnum>;
+  madeCount: Scalars["Int"]["output"];
+  makePercentage?: Maybe<Scalars["Float"]["output"]>;
+  missedCount: Scalars["Int"]["output"];
+  primaryCandidate?: Maybe<SessionCoachCandidateGql>;
+  processingId?: Maybe<Scalars["Int"]["output"]>;
+  processingStatus?: Maybe<Scalars["String"]["output"]>;
+  shotCount: Scalars["Int"]["output"];
+  state: SessionCoachStateEnum;
+  summary?: Maybe<Scalars["String"]["output"]>;
+  unknownOutcomeCount: Scalars["Int"]["output"];
+  videoId: Scalars["Int"]["output"];
+};
+
+export enum SessionCoachIneligibilityReasonEnum {
+  Multiplayer = "MULTIPLAYER",
+}
+
+export enum SessionCoachStateEnum {
+  Failed = "FAILED",
+  Ineligible = "INELIGIBLE",
+  NoTrackedShots = "NO_TRACKED_SHOTS",
+  Processing = "PROCESSING",
+  Ready = "READY",
+}
+
 export type ShotAnnotationGql = {
   __typename?: "ShotAnnotationGQL";
   createdAt?: Maybe<Scalars["DateTime"]["output"]>;
@@ -4165,7 +4238,6 @@ export type VideoGql = {
   createdAt?: Maybe<Scalars["DateTime"]["output"]>;
   currentHomography?: Maybe<HomographyInfoGql>;
   currentProcessing?: Maybe<VideoProcessingGql>;
-  drillResult?: Maybe<DrillResultGql>;
   elapsedTime?: Maybe<Scalars["Float"]["output"]>;
   endTime?: Maybe<Scalars["DateTime"]["output"]>;
   framesPerSecond: Scalars["Float"]["output"];
@@ -4806,15 +4878,6 @@ export type GetFeedQuery = {
         name: string;
         tagClasses: Array<{ __typename?: "VideoTagClass"; name: string }>;
       }>;
-      drillResult?: {
-        __typename?: "DrillResultGQL";
-        drillTag: string;
-        longestRun: number;
-        longestRunId?: number | null;
-        prRank: number;
-        isPersonalBest: boolean;
-        attemptCount: number;
-      } | null;
       playerSummaries: Array<{
         __typename?: "PlayerSummaryGQL";
         clusterId: number;
@@ -4930,15 +4993,6 @@ export type VideoCardFieldsFragment = {
     name: string;
     tagClasses: Array<{ __typename?: "VideoTagClass"; name: string }>;
   }>;
-  drillResult?: {
-    __typename?: "DrillResultGQL";
-    drillTag: string;
-    longestRun: number;
-    longestRunId?: number | null;
-    prRank: number;
-    isPersonalBest: boolean;
-    attemptCount: number;
-  } | null;
   playerSummaries: Array<{
     __typename?: "PlayerSummaryGQL";
     clusterId: number;
@@ -5087,15 +5141,6 @@ export type GetVideoFeedQuery = {
         name: string;
         tagClasses: Array<{ __typename?: "VideoTagClass"; name: string }>;
       }>;
-      drillResult?: {
-        __typename?: "DrillResultGQL";
-        drillTag: string;
-        longestRun: number;
-        longestRunId?: number | null;
-        prRank: number;
-        isPersonalBest: boolean;
-        attemptCount: number;
-      } | null;
       playerSummaries: Array<{
         __typename?: "PlayerSummaryGQL";
         clusterId: number;
@@ -6804,6 +6849,116 @@ export type GetRunsWithTimestampsQuery = {
   };
 };
 
+export type GetSessionCoachQueryVariables = Exact<{
+  videoId: Scalars["Int"]["input"];
+}>;
+
+export type GetSessionCoachQuery = {
+  __typename?: "Query";
+  getSessionCoach: {
+    __typename?: "SessionCoachGQL";
+    videoId: number;
+    processingId?: number | null;
+    analysisVersion: string;
+    state: SessionCoachStateEnum;
+    generatedAt: any;
+    processingStatus?: string | null;
+    ineligibilityReason?: SessionCoachIneligibilityReasonEnum | null;
+    summary?: string | null;
+    shotCount: number;
+    madeCount: number;
+    missedCount: number;
+    unknownOutcomeCount: number;
+    analyzedShotCount: number;
+    makePercentage?: number | null;
+    primaryCandidate?: {
+      __typename?: "SessionCoachCandidateGQL";
+      id: string;
+      rank: number;
+      family: SessionCoachCandidateFamilyEnum;
+      kind: SessionCoachCandidateKindEnum;
+      title: string;
+      body: string;
+      action: string;
+      supportingShotIds: Array<number>;
+      drillId?: string | null;
+      limitations: Array<string>;
+      evidence: {
+        __typename?: "SessionCoachEvidenceGQL";
+        bucketKey: string;
+        bucketLabel: string;
+        attemptCount: number;
+        madeCount: number;
+        missedCount: number;
+        makePercentage: number;
+        comparisonAttemptCount: number;
+        comparisonMadeCount: number;
+        comparisonMakePercentage?: number | null;
+        patternShotCount: number;
+        score: number;
+        rankReason: string;
+      };
+    } | null;
+    candidates: Array<{
+      __typename?: "SessionCoachCandidateGQL";
+      id: string;
+      rank: number;
+      family: SessionCoachCandidateFamilyEnum;
+      kind: SessionCoachCandidateKindEnum;
+      title: string;
+      body: string;
+      action: string;
+      supportingShotIds: Array<number>;
+      drillId?: string | null;
+      limitations: Array<string>;
+      evidence: {
+        __typename?: "SessionCoachEvidenceGQL";
+        bucketKey: string;
+        bucketLabel: string;
+        attemptCount: number;
+        madeCount: number;
+        missedCount: number;
+        makePercentage: number;
+        comparisonAttemptCount: number;
+        comparisonMadeCount: number;
+        comparisonMakePercentage?: number | null;
+        patternShotCount: number;
+        score: number;
+        rankReason: string;
+      };
+    }>;
+  };
+};
+
+export type SessionCoachCandidateFieldsFragment = {
+  __typename?: "SessionCoachCandidateGQL";
+  id: string;
+  rank: number;
+  family: SessionCoachCandidateFamilyEnum;
+  kind: SessionCoachCandidateKindEnum;
+  title: string;
+  body: string;
+  action: string;
+  supportingShotIds: Array<number>;
+  drillId?: string | null;
+  limitations: Array<string>;
+  evidence: {
+    __typename?: "SessionCoachEvidenceGQL";
+    bucketKey: string;
+    bucketLabel: string;
+    attemptCount: number;
+    madeCount: number;
+    missedCount: number;
+    makePercentage: number;
+    comparisonAttemptCount: number;
+    comparisonMadeCount: number;
+    comparisonMakePercentage?: number | null;
+    patternShotCount: number;
+    score: number;
+    rankReason: string;
+  };
+};
+
 export type PlayerSummaryFieldsFragment = {
   __typename?: "PlayerSummaryGQL";
   clusterId: number;
@@ -8245,15 +8400,6 @@ export type GetVideoCardQuery = {
       name: string;
       tagClasses: Array<{ __typename?: "VideoTagClass"; name: string }>;
     }>;
-    drillResult?: {
-      __typename?: "DrillResultGQL";
-      drillTag: string;
-      longestRun: number;
-      longestRunId?: number | null;
-      prRank: number;
-      isPersonalBest: boolean;
-      attemptCount: number;
-    } | null;
     playerSummaries: Array<{
       __typename?: "PlayerSummaryGQL";
       clusterId: number;
@@ -8885,6 +9031,7 @@ export type GetUploadLinkMutation = {
         };
     stream?: {
       __typename?: "UploadStreamGQL";
+      id: string;
       uploadCompletionCursor: number;
     } | null;
   };
@@ -8983,6 +9130,7 @@ export type UploadStreamWithDetailsFragment = {
   startTime?: any | null;
   stream?: {
     __typename?: "UploadStreamGQL";
+    id: string;
     isCompleted: boolean;
     lastIntendedSegmentBound?: number | null;
     uploadCompletionCursor: number;
@@ -9007,6 +9155,7 @@ export type GetUploadStreamsWithDetailsQuery = {
       startTime?: any | null;
       stream?: {
         __typename?: "UploadStreamGQL";
+        id: string;
         isCompleted: boolean;
         lastIntendedSegmentBound?: number | null;
         uploadCompletionCursor: number;
@@ -9085,14 +9234,6 @@ export const VideoCardFieldsFragmentDoc = gql`
         name
       }
     }
-    drillResult {
-      drillTag
-      longestRun
-      longestRunId
-      prRank
-      isPersonalBest
-      attemptCount
-    }
     playerSummaries {
       ...PlayerSummaryFields
     }
@@ -9267,6 +9408,34 @@ export const PocketingIntentionFragmentFragmentDoc = gql`
     difficulty
   }
 `;
+export const SessionCoachCandidateFieldsFragmentDoc = gql`
+  fragment SessionCoachCandidateFields on SessionCoachCandidateGQL {
+    id
+    rank
+    family
+    kind
+    title
+    body
+    action
+    supportingShotIds
+    drillId
+    limitations
+    evidence {
+      bucketKey
+      bucketLabel
+      attemptCount
+      madeCount
+      missedCount
+      makePercentage
+      comparisonAttemptCount
+      comparisonMadeCount
+      comparisonMakePercentage
+      patternShotCount
+      score
+      rankReason
+    }
+  }
+`;
 export const PlayerClusterShotFieldsFragmentDoc = gql`
   fragment PlayerClusterShotFields on PlayerClusterShotGQL {
     shotId
@@ -9526,6 +9695,7 @@ export const UploadStreamWithDetailsFragmentDoc = gql`
     name
     startTime
     stream {
+      id
       isCompleted
       lastIntendedSegmentBound
       uploadCompletionCursor
@@ -14755,6 +14925,99 @@ export type GetRunsWithTimestampsQueryResult = Apollo.QueryResult<
   GetRunsWithTimestampsQuery,
   GetRunsWithTimestampsQueryVariables
 >;
+export const GetSessionCoachDocument = gql`
+  query GetSessionCoach($videoId: Int!) {
+    getSessionCoach(videoId: $videoId) {
+      videoId
+      processingId
+      analysisVersion
+      state
+      generatedAt
+      processingStatus
+      ineligibilityReason
+      summary
+      shotCount
+      madeCount
+      missedCount
+      unknownOutcomeCount
+      analyzedShotCount
+      makePercentage
+      primaryCandidate {
+        ...SessionCoachCandidateFields
+      }
+      candidates {
+        ...SessionCoachCandidateFields
+      }
+    }
+  }
+  ${SessionCoachCandidateFieldsFragmentDoc}
+`;
+
+/**
+ * __useGetSessionCoachQuery__
+ *
+ * To run a query within a React component, call `useGetSessionCoachQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetSessionCoachQuery` 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 } = useGetSessionCoachQuery({
+ *   variables: {
+ *      videoId: // value for 'videoId'
+ *   },
+ * });
+ */
+export function useGetSessionCoachQuery(
+  baseOptions: Apollo.QueryHookOptions<
+    GetSessionCoachQuery,
+    GetSessionCoachQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<GetSessionCoachQuery, GetSessionCoachQueryVariables>(
+    GetSessionCoachDocument,
+    options,
+  );
+}
+export function useGetSessionCoachLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    GetSessionCoachQuery,
+    GetSessionCoachQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<
+    GetSessionCoachQuery,
+    GetSessionCoachQueryVariables
+  >(GetSessionCoachDocument, options);
+}
+export function useGetSessionCoachSuspenseQuery(
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetSessionCoachQuery,
+    GetSessionCoachQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useSuspenseQuery<
+    GetSessionCoachQuery,
+    GetSessionCoachQueryVariables
+  >(GetSessionCoachDocument, options);
+}
+export type GetSessionCoachQueryHookResult = ReturnType<
+  typeof useGetSessionCoachQuery
+>;
+export type GetSessionCoachLazyQueryHookResult = ReturnType<
+  typeof useGetSessionCoachLazyQuery
+>;
+export type GetSessionCoachSuspenseQueryHookResult = ReturnType<
+  typeof useGetSessionCoachSuspenseQuery
+>;
+export type GetSessionCoachQueryResult = Apollo.QueryResult<
+  GetSessionCoachQuery,
+  GetSessionCoachQueryVariables
+>;
 export const VideoPlayerClustersDocument = gql`
   query VideoPlayerClusters($videoId: Int!) {
     videoPlayerClusters(videoId: $videoId) {
@@ -19216,6 +19479,7 @@ export const GetUploadLinkDocument = gql`
         }
       }
       stream {
+        id
         uploadCompletionCursor
       }
     }

src/operations/feed.gql

@@ -55,14 +55,6 @@ fragment VideoCardFields on VideoGQL {
       name
     }
   }
-  drillResult {
-    drillTag
-    longestRun
-    longestRunId
-    prRank
-    isPersonalBest
-    attemptCount
-  }
   playerSummaries {
     ...PlayerSummaryFields
   }

src/operations/session-coach.gql

@@ -0,0 +1,51 @@
+query GetSessionCoach($videoId: Int!) {
+  getSessionCoach(videoId: $videoId) {
+    videoId
+    processingId
+    analysisVersion
+    state
+    generatedAt
+    processingStatus
+    ineligibilityReason
+    summary
+    shotCount
+    madeCount
+    missedCount
+    unknownOutcomeCount
+    analyzedShotCount
+    makePercentage
+    primaryCandidate {
+      ...SessionCoachCandidateFields
+    }
+    candidates {
+      ...SessionCoachCandidateFields
+    }
+  }
+}
+
+fragment SessionCoachCandidateFields on SessionCoachCandidateGQL {
+  id
+  rank
+  family
+  kind
+  title
+  body
+  action
+  supportingShotIds
+  drillId
+  limitations
+  evidence {
+    bucketKey
+    bucketLabel
+    attemptCount
+    madeCount
+    missedCount
+    makePercentage
+    comparisonAttemptCount
+    comparisonMadeCount
+    comparisonMakePercentage
+    patternShotCount
+    score
+    rankReason
+  }
+}

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

src/schema.gql

@@ -65,6 +65,7 @@ type Query {
     limit: Int! = 500
     countRespectsLimit: Boolean! = false
   ): GetRunsResult!
+  getSessionCoach(videoId: Int!): SessionCoachGQL!
   videoPlayerClusters(videoId: Int!): [PlayerClusterGQL!]!
   getShotAnnotationTypes(errorTypes: Boolean = false): [ShotAnnotationTypeGQL!]!
   getTableState(
@@ -438,7 +439,6 @@ type VideoGQL {
   reactions: [ReactionGQL!]!
   comments: [CommentGQL!]!
   playerSummaries: [PlayerSummaryGQL!]!
-  drillResult: DrillResultGQL
 }
 
 type ShotGQL {
@@ -722,15 +722,6 @@ type SpinTypeBreakdownGQL {
   follow: Int!
 }
 
-type DrillResultGQL {
-  drillTag: String!
-  longestRun: Int!
-  longestRunId: Int
-  prRank: Int!
-  isPersonalBest: Boolean!
-  attemptCount: Int!
-}
-
 type DeployedConfigGQL {
   allowNewUsers: Boolean!
   firebase: Boolean!
@@ -1005,6 +996,81 @@ input DatetimeOrdering {
   startingAt: DateTime = null
 }
 
+type SessionCoachGQL {
+  videoId: Int!
+  processingId: Int
+  analysisVersion: String!
+  state: SessionCoachStateEnum!
+  generatedAt: DateTime!
+  processingStatus: String
+  ineligibilityReason: SessionCoachIneligibilityReasonEnum
+  summary: String
+  shotCount: Int!
+  madeCount: Int!
+  missedCount: Int!
+  unknownOutcomeCount: Int!
+  analyzedShotCount: Int!
+  makePercentage: Float
+  primaryCandidate: SessionCoachCandidateGQL
+  candidates: [SessionCoachCandidateGQL!]!
+}
+
+enum SessionCoachStateEnum {
+  PROCESSING
+  READY
+  NO_TRACKED_SHOTS
+  INELIGIBLE
+  FAILED
+}
+
+enum SessionCoachIneligibilityReasonEnum {
+  MULTIPLAYER
+}
+
+type SessionCoachCandidateGQL {
+  id: ID!
+  rank: Int!
+  family: SessionCoachCandidateFamilyEnum!
+  kind: SessionCoachCandidateKindEnum!
+  title: String!
+  body: String!
+  action: String!
+  supportingShotIds: [Int!]!
+  drillId: String
+  evidence: SessionCoachEvidenceGQL!
+  limitations: [String!]!
+}
+
+enum SessionCoachCandidateFamilyEnum {
+  AIMING
+  CUT_ANGLE
+  SPIN
+  OBJECT_TO_POCKET_DISTANCE
+  CUE_TO_OBJECT_DISTANCE
+  BACK_CUT
+}
+
+enum SessionCoachCandidateKindEnum {
+  DIRECTIONAL_MISS
+  OUTCOME_PATTERN
+  USAGE_PATTERN
+}
+
+type SessionCoachEvidenceGQL {
+  bucketKey: String!
+  bucketLabel: String!
+  attemptCount: Int!
+  madeCount: Int!
+  missedCount: Int!
+  makePercentage: Float!
+  comparisonAttemptCount: Int!
+  comparisonMadeCount: Int!
+  comparisonMakePercentage: Float
+  patternShotCount: Int!
+  score: Float!
+  rankReason: String!
+}
+
 type PlayerClusterGQL {
   videoId: Int!
   clusterId: Int!