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>

bin/assert-no-changes.sh

@@ -9,6 +9,7 @@ for proto in $(find ./rbproto -iname '*.proto'); do
 		protoc -I=./rbproto --python_out=./rbproto/python --pyi_out=./rbproto/python ./rbproto/shot.proto
     yarn pbjs ./rbproto/shot.proto --ts ./rbproto/ts/shot.ts
 done
+black rbproto/python
 prettier ./rbproto --write
 
 git ls-files | xargs md5sum > after.txt

flake.nix

@@ -21,7 +21,7 @@
     in
       with pkgs; {
         devShell = mkShell {
-          buildInputs = [nodejs yarn watchman alejandra nodePackages.prettier just protobuf];
+          buildInputs = [nodejs yarn watchman alejandra nodePackages.prettier just protobuf black];
         };
       });
 }

pyproject.toml

@@ -8,7 +8,7 @@ packages = [{include = "rbproto"}]
 
 [tool.poetry.dependencies]
 python = ">=3.10,<=3.13"
-protobuf = "^4.25.3"
+protobuf = ">=4.25.3"
 
 
 [build-system]

rbproto/python/shot_pb2.py

@@ -6,44 +6,49 @@ from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
 from google.protobuf.internal import builder as _builder
+
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
 
 
-
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(
-
+    b'\n\nshot.proto\x12\x0fserialized_shot"?\n\x03\x42ox\x12\x0c\n\x04left\x18\x01 \x01(\x02\x12\x0b\n\x03top\x18\x02 \x01(\x02\x12\r\n\x05width\x18\x03 \x01(\x02\x12\x0e\n\x06height\x18\x04 \x01(\x02"\x1d\n\x05Point\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02"\x7f\n\rBallDetection\x12.\n\x0eplane_position\x18\x01 \x01(\x0b\x32\x16.serialized_shot.Point\x12(\n\nannotation\x18\x02 \x01(\x0b\x32\x14.serialized_shot.Box\x12\x14\n\x0cinterpolated\x18\x03 \x01(\x08"T\n\x10RLEBallDetection\x12\x31\n\tdetection\x18\x01 \x01(\x0b\x32\x1e.serialized_shot.BallDetection\x12\r\n\x05\x63ount\x18\x02 \x01(\r"L\n\x13RLEDetectionHistory\x12\x35\n\ndetections\x18\x01 \x03(\x0b\x32!.serialized_shot.RLEBallDetection"F\n\x10\x44\x65tectionHistory\x12\x32\n\ndetections\x18\x01 \x03(\x0b\x32\x1e.serialized_shot.BallDetection"\xfc\x01\n\rCollisionInfo\x12\x0e\n\x06source\x18\x01 \x01(\r\x12M\n\x10\x62\x61ll_identifiers\x18\x02 \x03(\x0b\x32\x33.serialized_shot.CollisionInfo.BallIdentifiersEntry\x12\x17\n\x0fwall_identifier\x18\x03 \x01(\r\x12\x13\n\x0b\x66rame_index\x18\x04 \x01(\r\x12\x0e\n\x06static\x18\x05 \x01(\x08\x1aN\n\x14\x42\x61llIdentifiersEntry\x12\x0b\n\x03key\x18\x01 \x01(\r\x12%\n\x05value\x18\x02 \x01(\x0b\x32\x16.serialized_shot.Point:\x02\x38\x01"\xcc\x02\n\x04Path\x12\x13\n\x0bstart_frame\x18\x01 \x01(\r\x12\x11\n\tend_frame\x18\x02 \x01(\r\x12\x37\n\ndetections\x18\x03 \x01(\x0b\x32!.serialized_shot.DetectionHistoryH\x00\x12>\n\x0erle_detections\x18\x04 \x01(\x0b\x32$.serialized_shot.RLEDetectionHistoryH\x00\x12\x15\n\x0bnot_present\x18\x05 \x01(\x08H\x00\x12\x11\n\tis_static\x18\x06 \x01(\x08\x12\x32\n\nstart_info\x18\x07 \x01(\x0b\x32\x1e.serialized_shot.CollisionInfo\x12\x30\n\x08\x65nd_info\x18\x08 \x01(\x0b\x32\x1e.serialized_shot.CollisionInfoB\x13\n\x11\x64\x65tection_history"I\n\x0c\x43olorCluster\x12\x11\n\tlightness\x18\x01 \x01(\x02\x12\t\n\x01\x61\x18\x02 \x01(\x02\x12\t\n\x01\x62\x18\x03 \x01(\x02\x12\x10\n\x08\x66raction\x18\x04 \x01(\x02"B\n\x0fTrajectoryColor\x12/\n\x08\x63lusters\x18\x01 \x03(\x0b\x32\x1d.serialized_shot.ColorCluster"\x8e\x01\n\x11IdentifierHistory\x12\x17\n\x0f\x62\x61ll_identifier\x18\x01 \x01(\r\x12$\n\x05paths\x18\x02 \x03(\x0b\x32\x15.serialized_shot.Path\x12:\n\x10trajectory_color\x18\x03 \x01(\x0b\x32 .serialized_shot.TrajectoryColor"\xf4\x01\n\x12KeyBallIdentifiers\x12\x10\n\x08\x63ue_ball\x18\x01 \x01(\r\x12\x13\n\x0bobject_ball\x18\x02 \x01(\r\x12\x13\n\x0btarget_ball\x18\x03 \x01(\r\x12\x18\n\x10\x63ontact_sequence\x18\x04 \x03(\r\x12\x18\n\x0b\x63ue_ball_id\x18\x05 \x01(\rH\x00\x88\x01\x01\x12\x1b\n\x0eobject_ball_id\x18\x06 \x01(\rH\x01\x88\x01\x01\x12\x1b\n\x0etarget_ball_id\x18\x07 \x01(\rH\x02\x88\x01\x01\x42\x0e\n\x0c_cue_ball_idB\x11\n\x0f_object_ball_idB\x11\n\x0f_target_ball_id"\xa8\x01\n\x04Shot\x12@\n\x14identifier_histories\x18\x03 \x03(\x0b\x32".serialized_shot.IdentifierHistory\x12\x36\n\tkey_balls\x18\x04 \x01(\x0b\x32#.serialized_shot.KeyBallIdentifiers\x12\x13\n\x0bstart_index\x18\x05 \x01(\r\x12\x11\n\tend_index\x18\x06 \x01(\rb\x06proto3'
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\nshot.proto\x12\x0fserialized_shot\"?\n\x03\x42ox\x12\x0c\n\x04left\x18\x01 \x01(\x02\x12\x0b\n\x03top\x18\x02 \x01(\x02\x12\r\n\x05width\x18\x03 \x01(\x02\x12\x0e\n\x06height\x18\x04 \x01(\x02\"\x1d\n\x05Point\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02\"\x7f\n\rBallDetection\x12.\n\x0eplane_position\x18\x01 \x01(\x0b\x32\x16.serialized_shot.Point\x12(\n\nannotation\x18\x02 \x01(\x0b\x32\x14.serialized_shot.Box\x12\x14\n\x0cinterpolated\x18\x03 \x01(\x08\"T\n\x10RLEBallDetection\x12\x31\n\tdetection\x18\x01 \x01(\x0b\x32\x1e.serialized_shot.BallDetection\x12\r\n\x05\x63ount\x18\x02 \x01(\r\"L\n\x13RLEDetectionHistory\x12\x35\n\ndetections\x18\x01 \x03(\x0b\x32!.serialized_shot.RLEBallDetection\"F\n\x10\x44\x65tectionHistory\x12\x32\n\ndetections\x18\x01 \x03(\x0b\x32\x1e.serialized_shot.BallDetection\"\xfc\x01\n\rCollisionInfo\x12\x0e\n\x06source\x18\x01 \x01(\r\x12M\n\x10\x62\x61ll_identifiers\x18\x02 \x03(\x0b\x32\x33.serialized_shot.CollisionInfo.BallIdentifiersEntry\x12\x17\n\x0fwall_identifier\x18\x03 \x01(\r\x12\x13\n\x0b\x66rame_index\x18\x04 \x01(\r\x12\x0e\n\x06static\x18\x05 \x01(\x08\x1aN\n\x14\x42\x61llIdentifiersEntry\x12\x0b\n\x03key\x18\x01 \x01(\r\x12%\n\x05value\x18\x02 \x01(\x0b\x32\x16.serialized_shot.Point:\x02\x38\x01\"\xcc\x02\n\x04Path\x12\x13\n\x0bstart_frame\x18\x01 \x01(\r\x12\x11\n\tend_frame\x18\x02 \x01(\r\x12\x37\n\ndetections\x18\x03 \x01(\x0b\x32!.serialized_shot.DetectionHistoryH\x00\x12>\n\x0erle_detections\x18\x04 \x01(\x0b\x32$.serialized_shot.RLEDetectionHistoryH\x00\x12\x15\n\x0bnot_present\x18\x05 \x01(\x08H\x00\x12\x11\n\tis_static\x18\x06 \x01(\x08\x12\x32\n\nstart_info\x18\x07 \x01(\x0b\x32\x1e.serialized_shot.CollisionInfo\x12\x30\n\x08\x65nd_info\x18\x08 \x01(\x0b\x32\x1e.serialized_shot.CollisionInfoB\x13\n\x11\x64\x65tection_history\"R\n\x11IdentifierHistory\x12\x17\n\x0f\x62\x61ll_identifier\x18\x01 \x01(\r\x12$\n\x05paths\x18\x02 \x03(\x0b\x32\x15.serialized_shot.Path\"\xf4\x01\n\x12KeyBallIdentifiers\x12\x10\n\x08\x63ue_ball\x18\x01 \x01(\r\x12\x13\n\x0bobject_ball\x18\x02 \x01(\r\x12\x13\n\x0btarget_ball\x18\x03 \x01(\r\x12\x18\n\x10\x63ontact_sequence\x18\x04 \x03(\r\x12\x18\n\x0b\x63ue_ball_id\x18\x05 \x01(\rH\x00\x88\x01\x01\x12\x1b\n\x0eobject_ball_id\x18\x06 \x01(\rH\x01\x88\x01\x01\x12\x1b\n\x0etarget_ball_id\x18\x07 \x01(\rH\x02\x88\x01\x01\x42\x0e\n\x0c_cue_ball_idB\x11\n\x0f_object_ball_idB\x11\n\x0f_target_ball_id\"\xa8\x01\n\x04Shot\x12@\n\x14identifier_histories\x18\x03 \x03(\x0b\x32\".serialized_shot.IdentifierHistory\x12\x36\n\tkey_balls\x18\x04 \x01(\x0b\x32#.serialized_shot.KeyBallIdentifiers\x12\x13\n\x0bstart_index\x18\x05 \x01(\r\x12\x11\n\tend_index\x18\x06 \x01(\rb\x06proto3')
+)
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'shot_pb2', _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "shot_pb2", _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
-  DESCRIPTOR._options = None
+    DESCRIPTOR._options = None
-  _globals['_COLLISIONINFO_BALLIDENTIFIERSENTRY']._options = None
+    _globals["_COLLISIONINFO_BALLIDENTIFIERSENTRY"]._options = None
-  _globals['_COLLISIONINFO_BALLIDENTIFIERSENTRY']._serialized_options = b'8\001'
+    _globals["_COLLISIONINFO_BALLIDENTIFIERSENTRY"]._serialized_options = b"8\001"
-  _globals['_BOX']._serialized_start=31
+    _globals["_BOX"]._serialized_start = 31
-  _globals['_BOX']._serialized_end=94
+    _globals["_BOX"]._serialized_end = 94
-  _globals['_POINT']._serialized_start=96
+    _globals["_POINT"]._serialized_start = 96
-  _globals['_POINT']._serialized_end=125
+    _globals["_POINT"]._serialized_end = 125
-  _globals['_BALLDETECTION']._serialized_start=127
+    _globals["_BALLDETECTION"]._serialized_start = 127
-  _globals['_BALLDETECTION']._serialized_end=254
+    _globals["_BALLDETECTION"]._serialized_end = 254
-  _globals['_RLEBALLDETECTION']._serialized_start=256
+    _globals["_RLEBALLDETECTION"]._serialized_start = 256
-  _globals['_RLEBALLDETECTION']._serialized_end=340
+    _globals["_RLEBALLDETECTION"]._serialized_end = 340
-  _globals['_RLEDETECTIONHISTORY']._serialized_start=342
+    _globals["_RLEDETECTIONHISTORY"]._serialized_start = 342
-  _globals['_RLEDETECTIONHISTORY']._serialized_end=418
+    _globals["_RLEDETECTIONHISTORY"]._serialized_end = 418
-  _globals['_DETECTIONHISTORY']._serialized_start=420
+    _globals["_DETECTIONHISTORY"]._serialized_start = 420
-  _globals['_DETECTIONHISTORY']._serialized_end=490
+    _globals["_DETECTIONHISTORY"]._serialized_end = 490
-  _globals['_COLLISIONINFO']._serialized_start=493
+    _globals["_COLLISIONINFO"]._serialized_start = 493
-  _globals['_COLLISIONINFO']._serialized_end=745
+    _globals["_COLLISIONINFO"]._serialized_end = 745
-  _globals['_COLLISIONINFO_BALLIDENTIFIERSENTRY']._serialized_start=667
+    _globals["_COLLISIONINFO_BALLIDENTIFIERSENTRY"]._serialized_start = 667
-  _globals['_COLLISIONINFO_BALLIDENTIFIERSENTRY']._serialized_end=745
+    _globals["_COLLISIONINFO_BALLIDENTIFIERSENTRY"]._serialized_end = 745
-  _globals['_PATH']._serialized_start=748
+    _globals["_PATH"]._serialized_start = 748
-  _globals['_PATH']._serialized_end=1080
+    _globals["_PATH"]._serialized_end = 1080
-  _globals['_IDENTIFIERHISTORY']._serialized_start=1082
+    _globals["_COLORCLUSTER"]._serialized_start = 1082
-  _globals['_IDENTIFIERHISTORY']._serialized_end=1164
+    _globals["_COLORCLUSTER"]._serialized_end = 1155
-  _globals['_KEYBALLIDENTIFIERS']._serialized_start=1167
+    _globals["_TRAJECTORYCOLOR"]._serialized_start = 1157
-  _globals['_KEYBALLIDENTIFIERS']._serialized_end=1411
+    _globals["_TRAJECTORYCOLOR"]._serialized_end = 1223
-  _globals['_SHOT']._serialized_start=1414
+    _globals["_IDENTIFIERHISTORY"]._serialized_start = 1226
-  _globals['_SHOT']._serialized_end=1582
+    _globals["_IDENTIFIERHISTORY"]._serialized_end = 1368
+    _globals["_KEYBALLIDENTIFIERS"]._serialized_start = 1371
+    _globals["_KEYBALLIDENTIFIERS"]._serialized_end = 1615
+    _globals["_SHOT"]._serialized_start = 1618
+    _globals["_SHOT"]._serialized_end = 1786
 # @@protoc_insertion_point(module_scope)

rbproto/python/shot_pb2.pyi

@@ -1,7 +1,13 @@
 from google.protobuf.internal import containers as _containers
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
-from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Mapping, Optional as _Optional, Union as _Union
+from typing import (
+    ClassVar as _ClassVar,
+    Iterable as _Iterable,
+    Mapping as _Mapping,
+    Optional as _Optional,
+    Union as _Union,
+)
 
 DESCRIPTOR: _descriptor.FileDescriptor
 
@@ -15,7 +21,13 @@ class Box(_message.Message):
     top: float
     width: float
     height: float
-    def __init__(self, left: _Optional[float] = ..., top: _Optional[float] = ..., width: _Optional[float] = ..., height: _Optional[float] = ...) -> None: ...
+    def __init__(
+        self,
+        left: _Optional[float] = ...,
+        top: _Optional[float] = ...,
+        width: _Optional[float] = ...,
+        height: _Optional[float] = ...,
+    ) -> None: ...
 
 class Point(_message.Message):
     __slots__ = ["x", "y"]
@@ -23,7 +35,9 @@ class Point(_message.Message):
     Y_FIELD_NUMBER: _ClassVar[int]
     x: float
     y: float
-    def __init__(self, x: _Optional[float] = ..., y: _Optional[float] = ...) -> None: ...
+    def __init__(
+        self, x: _Optional[float] = ..., y: _Optional[float] = ...
+    ) -> None: ...
 
 class BallDetection(_message.Message):
     __slots__ = ["plane_position", "annotation", "interpolated"]
@@ -33,7 +47,12 @@ class BallDetection(_message.Message):
     plane_position: Point
     annotation: Box
     interpolated: bool
-    def __init__(self, plane_position: _Optional[_Union[Point, _Mapping]] = ..., annotation: _Optional[_Union[Box, _Mapping]] = ..., interpolated: bool = ...) -> None: ...
+    def __init__(
+        self,
+        plane_position: _Optional[_Union[Point, _Mapping]] = ...,
+        annotation: _Optional[_Union[Box, _Mapping]] = ...,
+        interpolated: bool = ...,
+    ) -> None: ...
 
 class RLEBallDetection(_message.Message):
     __slots__ = ["detection", "count"]
@@ -41,29 +60,48 @@ class RLEBallDetection(_message.Message):
     COUNT_FIELD_NUMBER: _ClassVar[int]
     detection: BallDetection
     count: int
-    def __init__(self, detection: _Optional[_Union[BallDetection, _Mapping]] = ..., count: _Optional[int] = ...) -> None: ...
+    def __init__(
+        self,
+        detection: _Optional[_Union[BallDetection, _Mapping]] = ...,
+        count: _Optional[int] = ...,
+    ) -> None: ...
 
 class RLEDetectionHistory(_message.Message):
     __slots__ = ["detections"]
     DETECTIONS_FIELD_NUMBER: _ClassVar[int]
     detections: _containers.RepeatedCompositeFieldContainer[RLEBallDetection]
-    def __init__(self, detections: _Optional[_Iterable[_Union[RLEBallDetection, _Mapping]]] = ...) -> None: ...
+    def __init__(
+        self, detections: _Optional[_Iterable[_Union[RLEBallDetection, _Mapping]]] = ...
+    ) -> None: ...
 
 class DetectionHistory(_message.Message):
     __slots__ = ["detections"]
     DETECTIONS_FIELD_NUMBER: _ClassVar[int]
     detections: _containers.RepeatedCompositeFieldContainer[BallDetection]
-    def __init__(self, detections: _Optional[_Iterable[_Union[BallDetection, _Mapping]]] = ...) -> None: ...
+    def __init__(
+        self, detections: _Optional[_Iterable[_Union[BallDetection, _Mapping]]] = ...
+    ) -> None: ...
 
 class CollisionInfo(_message.Message):
-    __slots__ = ["source", "ball_identifiers", "wall_identifier", "frame_index", "static"]
+    __slots__ = [
+        "source",
+        "ball_identifiers",
+        "wall_identifier",
+        "frame_index",
+        "static",
+    ]
+
     class BallIdentifiersEntry(_message.Message):
         __slots__ = ["key", "value"]
         KEY_FIELD_NUMBER: _ClassVar[int]
         VALUE_FIELD_NUMBER: _ClassVar[int]
         key: int
         value: Point
-        def __init__(self, key: _Optional[int] = ..., value: _Optional[_Union[Point, _Mapping]] = ...) -> None: ...
+        def __init__(
+            self,
+            key: _Optional[int] = ...,
+            value: _Optional[_Union[Point, _Mapping]] = ...,
+        ) -> None: ...
     SOURCE_FIELD_NUMBER: _ClassVar[int]
     BALL_IDENTIFIERS_FIELD_NUMBER: _ClassVar[int]
     WALL_IDENTIFIER_FIELD_NUMBER: _ClassVar[int]
@@ -74,10 +112,26 @@ class CollisionInfo(_message.Message):
     wall_identifier: int
     frame_index: int
     static: bool
-    def __init__(self, source: _Optional[int] = ..., ball_identifiers: _Optional[_Mapping[int, Point]] = ..., wall_identifier: _Optional[int] = ..., frame_index: _Optional[int] = ..., static: bool = ...) -> None: ...
+    def __init__(
+        self,
+        source: _Optional[int] = ...,
+        ball_identifiers: _Optional[_Mapping[int, Point]] = ...,
+        wall_identifier: _Optional[int] = ...,
+        frame_index: _Optional[int] = ...,
+        static: bool = ...,
+    ) -> None: ...
 
 class Path(_message.Message):
-    __slots__ = ["start_frame", "end_frame", "detections", "rle_detections", "not_present", "is_static", "start_info", "end_info"]
+    __slots__ = [
+        "start_frame",
+        "end_frame",
+        "detections",
+        "rle_detections",
+        "not_present",
+        "is_static",
+        "start_info",
+        "end_info",
+    ]
     START_FRAME_FIELD_NUMBER: _ClassVar[int]
     END_FRAME_FIELD_NUMBER: _ClassVar[int]
     DETECTIONS_FIELD_NUMBER: _ClassVar[int]
@@ -94,18 +148,69 @@ class Path(_message.Message):
     is_static: bool
     start_info: CollisionInfo
     end_info: CollisionInfo
-    def __init__(self, start_frame: _Optional[int] = ..., end_frame: _Optional[int] = ..., detections: _Optional[_Union[DetectionHistory, _Mapping]] = ..., rle_detections: _Optional[_Union[RLEDetectionHistory, _Mapping]] = ..., not_present: bool = ..., is_static: bool = ..., start_info: _Optional[_Union[CollisionInfo, _Mapping]] = ..., end_info: _Optional[_Union[CollisionInfo, _Mapping]] = ...) -> None: ...
+    def __init__(
+        self,
+        start_frame: _Optional[int] = ...,
+        end_frame: _Optional[int] = ...,
+        detections: _Optional[_Union[DetectionHistory, _Mapping]] = ...,
+        rle_detections: _Optional[_Union[RLEDetectionHistory, _Mapping]] = ...,
+        not_present: bool = ...,
+        is_static: bool = ...,
+        start_info: _Optional[_Union[CollisionInfo, _Mapping]] = ...,
+        end_info: _Optional[_Union[CollisionInfo, _Mapping]] = ...,
+    ) -> None: ...
+
+class ColorCluster(_message.Message):
+    __slots__ = ["lightness", "a", "b", "fraction"]
+    LIGHTNESS_FIELD_NUMBER: _ClassVar[int]
+    A_FIELD_NUMBER: _ClassVar[int]
+    B_FIELD_NUMBER: _ClassVar[int]
+    FRACTION_FIELD_NUMBER: _ClassVar[int]
+    lightness: float
+    a: float
+    b: float
+    fraction: float
+    def __init__(
+        self,
+        lightness: _Optional[float] = ...,
+        a: _Optional[float] = ...,
+        b: _Optional[float] = ...,
+        fraction: _Optional[float] = ...,
+    ) -> None: ...
+
+class TrajectoryColor(_message.Message):
+    __slots__ = ["clusters"]
+    CLUSTERS_FIELD_NUMBER: _ClassVar[int]
+    clusters: _containers.RepeatedCompositeFieldContainer[ColorCluster]
+    def __init__(
+        self, clusters: _Optional[_Iterable[_Union[ColorCluster, _Mapping]]] = ...
+    ) -> None: ...
 
 class IdentifierHistory(_message.Message):
-    __slots__ = ["ball_identifier", "paths"]
+    __slots__ = ["ball_identifier", "paths", "trajectory_color"]
     BALL_IDENTIFIER_FIELD_NUMBER: _ClassVar[int]
     PATHS_FIELD_NUMBER: _ClassVar[int]
+    TRAJECTORY_COLOR_FIELD_NUMBER: _ClassVar[int]
     ball_identifier: int
     paths: _containers.RepeatedCompositeFieldContainer[Path]
-    def __init__(self, ball_identifier: _Optional[int] = ..., paths: _Optional[_Iterable[_Union[Path, _Mapping]]] = ...) -> None: ...
+    trajectory_color: TrajectoryColor
+    def __init__(
+        self,
+        ball_identifier: _Optional[int] = ...,
+        paths: _Optional[_Iterable[_Union[Path, _Mapping]]] = ...,
+        trajectory_color: _Optional[_Union[TrajectoryColor, _Mapping]] = ...,
+    ) -> None: ...
 
 class KeyBallIdentifiers(_message.Message):
-    __slots__ = ["cue_ball", "object_ball", "target_ball", "contact_sequence", "cue_ball_id", "object_ball_id", "target_ball_id"]
+    __slots__ = [
+        "cue_ball",
+        "object_ball",
+        "target_ball",
+        "contact_sequence",
+        "cue_ball_id",
+        "object_ball_id",
+        "target_ball_id",
+    ]
     CUE_BALL_FIELD_NUMBER: _ClassVar[int]
     OBJECT_BALL_FIELD_NUMBER: _ClassVar[int]
     TARGET_BALL_FIELD_NUMBER: _ClassVar[int]
@@ -120,7 +225,16 @@ class KeyBallIdentifiers(_message.Message):
     cue_ball_id: int
     object_ball_id: int
     target_ball_id: int
-    def __init__(self, cue_ball: _Optional[int] = ..., object_ball: _Optional[int] = ..., target_ball: _Optional[int] = ..., contact_sequence: _Optional[_Iterable[int]] = ..., cue_ball_id: _Optional[int] = ..., object_ball_id: _Optional[int] = ..., target_ball_id: _Optional[int] = ...) -> None: ...
+    def __init__(
+        self,
+        cue_ball: _Optional[int] = ...,
+        object_ball: _Optional[int] = ...,
+        target_ball: _Optional[int] = ...,
+        contact_sequence: _Optional[_Iterable[int]] = ...,
+        cue_ball_id: _Optional[int] = ...,
+        object_ball_id: _Optional[int] = ...,
+        target_ball_id: _Optional[int] = ...,
+    ) -> None: ...
 
 class Shot(_message.Message):
     __slots__ = ["identifier_histories", "key_balls", "start_index", "end_index"]
@@ -132,4 +246,12 @@ class Shot(_message.Message):
     key_balls: KeyBallIdentifiers
     start_index: int
     end_index: int
-    def __init__(self, identifier_histories: _Optional[_Iterable[_Union[IdentifierHistory, _Mapping]]] = ..., key_balls: _Optional[_Union[KeyBallIdentifiers, _Mapping]] = ..., start_index: _Optional[int] = ..., end_index: _Optional[int] = ...) -> None: ...
+    def __init__(
+        self,
+        identifier_histories: _Optional[
+            _Iterable[_Union[IdentifierHistory, _Mapping]]
+        ] = ...,
+        key_balls: _Optional[_Union[KeyBallIdentifiers, _Mapping]] = ...,
+        start_index: _Optional[int] = ...,
+        end_index: _Optional[int] = ...,
+    ) -> None: ...

rbproto/shot.proto

@@ -50,9 +50,21 @@ message Path {
   CollisionInfo end_info = 8;
 }
 
+message ColorCluster {
+  // LAB in OpenCV's 0-255 uint8 scale (see railbird LABCV2Color).
+  float lightness = 1;
+  float a = 2;
+  float b = 3;
+  // Share of this ball's accumulated color pixels in this cluster (0-1).
+  float fraction = 4;
+}
+
+message TrajectoryColor { repeated ColorCluster clusters = 1; }
+
 message IdentifierHistory {
   uint32 ball_identifier = 1;
   repeated Path paths = 2;
+  TrajectoryColor trajectory_color = 3;
 }
 message KeyBallIdentifiers {
   uint32 cue_ball = 1;

rbproto/ts/shot.ts

@@ -740,9 +740,158 @@ function _decodePath(bb: ByteBuffer): Path {
   return message;
 }
 
+export interface ColorCluster {
+  lightness?: number;
+  a?: number;
+  b?: number;
+  fraction?: number;
+}
+
+export function encodeColorCluster(message: ColorCluster): Uint8Array {
+  let bb = popByteBuffer();
+  _encodeColorCluster(message, bb);
+  return toUint8Array(bb);
+}
+
+function _encodeColorCluster(message: ColorCluster, bb: ByteBuffer): void {
+  // optional float lightness = 1;
+  let $lightness = message.lightness;
+  if ($lightness !== undefined) {
+    writeVarint32(bb, 13);
+    writeFloat(bb, $lightness);
+  }
+
+  // optional float a = 2;
+  let $a = message.a;
+  if ($a !== undefined) {
+    writeVarint32(bb, 21);
+    writeFloat(bb, $a);
+  }
+
+  // optional float b = 3;
+  let $b = message.b;
+  if ($b !== undefined) {
+    writeVarint32(bb, 29);
+    writeFloat(bb, $b);
+  }
+
+  // optional float fraction = 4;
+  let $fraction = message.fraction;
+  if ($fraction !== undefined) {
+    writeVarint32(bb, 37);
+    writeFloat(bb, $fraction);
+  }
+}
+
+export function decodeColorCluster(binary: Uint8Array): ColorCluster {
+  return _decodeColorCluster(wrapByteBuffer(binary));
+}
+
+function _decodeColorCluster(bb: ByteBuffer): ColorCluster {
+  let message: ColorCluster = {} as any;
+
+  end_of_message: while (!isAtEnd(bb)) {
+    let tag = readVarint32(bb);
+
+    switch (tag >>> 3) {
+      case 0:
+        break end_of_message;
+
+      // optional float lightness = 1;
+      case 1: {
+        message.lightness = readFloat(bb);
+        break;
+      }
+
+      // optional float a = 2;
+      case 2: {
+        message.a = readFloat(bb);
+        break;
+      }
+
+      // optional float b = 3;
+      case 3: {
+        message.b = readFloat(bb);
+        break;
+      }
+
+      // optional float fraction = 4;
+      case 4: {
+        message.fraction = readFloat(bb);
+        break;
+      }
+
+      default:
+        skipUnknownField(bb, tag & 7);
+    }
+  }
+
+  return message;
+}
+
+export interface TrajectoryColor {
+  clusters?: ColorCluster[];
+}
+
+export function encodeTrajectoryColor(message: TrajectoryColor): Uint8Array {
+  let bb = popByteBuffer();
+  _encodeTrajectoryColor(message, bb);
+  return toUint8Array(bb);
+}
+
+function _encodeTrajectoryColor(
+  message: TrajectoryColor,
+  bb: ByteBuffer,
+): void {
+  // repeated ColorCluster clusters = 1;
+  let array$clusters = message.clusters;
+  if (array$clusters !== undefined) {
+    for (let value of array$clusters) {
+      writeVarint32(bb, 10);
+      let nested = popByteBuffer();
+      _encodeColorCluster(value, nested);
+      writeVarint32(bb, nested.limit);
+      writeByteBuffer(bb, nested);
+      pushByteBuffer(nested);
+    }
+  }
+}
+
+export function decodeTrajectoryColor(binary: Uint8Array): TrajectoryColor {
+  return _decodeTrajectoryColor(wrapByteBuffer(binary));
+}
+
+function _decodeTrajectoryColor(bb: ByteBuffer): TrajectoryColor {
+  let message: TrajectoryColor = {} as any;
+
+  end_of_message: while (!isAtEnd(bb)) {
+    let tag = readVarint32(bb);
+
+    switch (tag >>> 3) {
+      case 0:
+        break end_of_message;
+
+      // repeated ColorCluster clusters = 1;
+      case 1: {
+        let limit = pushTemporaryLength(bb);
+        let values = message.clusters || (message.clusters = []);
+        values.push(_decodeColorCluster(bb));
+        bb.limit = limit;
+        break;
+      }
+
+      default:
+        skipUnknownField(bb, tag & 7);
+    }
+  }
+
+  return message;
+}
+
 export interface IdentifierHistory {
   ball_identifier?: number;
   paths?: Path[];
+  trajectory_color?: TrajectoryColor;
 }
 
 export function encodeIdentifierHistory(
@@ -776,6 +925,17 @@ function _encodeIdentifierHistory(
       pushByteBuffer(nested);
     }
   }
+
+  // optional TrajectoryColor trajectory_color = 3;
+  let $trajectory_color = message.trajectory_color;
+  if ($trajectory_color !== undefined) {
+    writeVarint32(bb, 26);
+    let nested = popByteBuffer();
+    _encodeTrajectoryColor($trajectory_color, nested);
+    writeVarint32(bb, nested.limit);
+    writeByteBuffer(bb, nested);
+    pushByteBuffer(nested);
+  }
 }
 
 export function decodeIdentifierHistory(binary: Uint8Array): IdentifierHistory {
@@ -807,6 +967,14 @@ function _decodeIdentifierHistory(bb: ByteBuffer): IdentifierHistory {
         break;
       }
 
+      // optional TrajectoryColor trajectory_color = 3;
+      case 3: {
+        let limit = pushTemporaryLength(bb);
+        message.trajectory_color = _decodeTrajectoryColor(bb);
+        bb.limit = limit;
+        break;
+      }
+
       default:
         skipUnknownField(bb, tag & 7);
     }

src/operations/config.gql

@@ -6,6 +6,9 @@ query getDeployedConfig {
     firebase
     minimumAllowedAppVersion
     subscriptionGatingEnabled
+    quotaEnforcementEnabled
+    storageLimitEnforcementEnabled
+    capabilityEnforcementEnabled
     bannerMessages {
       color
       dismissible
@@ -14,5 +17,7 @@ query getDeployedConfig {
       message
       priority
     }
+    defaultAndroidRecordingFormat
+    bucketUrl
   }
 }

src/operations/feed.gql

@@ -31,41 +31,36 @@ fragment VideoCardFields on VideoGQL {
   }
   name
   screenshotUri
-  totalShotsMade
   totalShots
   makePercentage
   averageTimeBetweenShots
   averageDifficulty
-  createdAt
-  updatedAt
   startTime
-  endTime
   private
   elapsedTime
-  screenshotUri
   stream {
     id
     lastIntendedSegmentBound
-    isCompleted
+    uploadCompletionCursor
     streamSegmentType
+    isCompleted
+    lastSegmentUploadedAt
+    clientUploadStatus
   }
   tableSize
   pocketSize
   tags {
+    name
     tagClasses {
       name
     }
-    name
+  }
+  playerSummaries {
+    ...PlayerSummaryFields
   }
   currentProcessing {
     id
-    errors {
-      message
-    }
     status
-    statuses {
-      status
-    }
   }
   reactions {
     videoId
@@ -90,6 +85,47 @@ fragment VideoCardFields on VideoGQL {
   }
 }
 
+# Lightweight version of GetVideoFeed for counting sessions only
+query GetVideoFeedSessionCount(
+  $limit: Int! = 100
+  $filters: VideoFilterInput = null
+  $includePrivate: IncludePrivateEnum = MINE
+  $feedInput: VideoFeedInputGQL = null
+) {
+  getFeedVideos(
+    limit: $limit
+    filters: $filters
+    includePrivate: $includePrivate
+    feedInput: $feedInput
+  ) {
+    videos {
+      id
+      totalShots
+    }
+  }
+}
+
+# Minimal query for the Home recency nudge ("you haven't recorded in N days").
+# Only the most recent session's start time — avoids pulling the full
+# VideoCardFields payload (reactions, comments, player summaries, etc.).
+query GetLastSessionDate(
+  $filters: VideoFilterInput = null
+  $includePrivate: IncludePrivateEnum = MINE
+  $feedInput: VideoFeedInputGQL = null
+) {
+  getFeedVideos(
+    limit: 1
+    filters: $filters
+    includePrivate: $includePrivate
+    feedInput: $feedInput
+  ) {
+    videos {
+      id
+      startTime
+    }
+  }
+}
+
 query GetVideoFeed(
   $limit: Int! = 5
   $after: String = null
@@ -114,5 +150,6 @@ query GetVideoFeed(
       endCursor
     }
     hasFollowing
+    followingCount
   }
 }

src/operations/leaderboards.gql

@@ -30,3 +30,57 @@ query GetRunsLeaderboard($interval: TimeInterval, $when: DateTime) {
     }
   }
 }
+
+query GetDrillRunLeaderboard(
+  $drillTag: String!
+  $interval: TimeInterval
+  $limit: Int = 50
+  $tableSizeMin: Float
+  $tableSizeMax: Float
+  $pocketSizeMin: Float
+  $pocketSizeMax: Float
+) {
+  getDrillRunLeaderboard(
+    drillTag: $drillTag
+    interval: $interval
+    limit: $limit
+    tableSizeMin: $tableSizeMin
+    tableSizeMax: $tableSizeMax
+    pocketSizeMin: $pocketSizeMin
+    pocketSizeMax: $pocketSizeMax
+  ) {
+    entries {
+      id
+      runLength
+      videoId
+      video {
+        tableSize
+        pocketSize
+        createdAt
+      }
+      user {
+        id
+        username
+        profileImageUri
+      }
+    }
+    youRun {
+      id
+      runLength
+      videoId
+    }
+    youRank
+    totalPlayers
+  }
+}
+
+query GetMyDrillRuns($drillTag: String!, $limit: Int = 50) {
+  getMyDrillRuns(drillTag: $drillTag, limit: $limit) {
+    id
+    runLength
+    videoId
+    video {
+      createdAt
+    }
+  }
+}

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/payments.gql

@@ -20,8 +20,15 @@ mutation CreateSubscription($priceId: String!) {
   }
 }
 
+mutation CreateCustomerPortalSession {
+  createCustomerPortalSession {
+    portalUrl
+  }
+}
+
 query GetAvailableSubscriptionOptions {
   getAvailableSubscriptionOptions {
+    trialPeriodDays
     products {
       id
       name
@@ -37,12 +44,34 @@ query GetAvailableSubscriptionOptions {
         active
       }
     }
+    appleIap {
+      enabled
+      proMonthlyProductId
+      productIds
+    }
+    tierOptions {
+      tierName
+      tierDisplayName
+      billingInterval
+      platform
+      isConfigured
+      isAvailable
+      stripeProductId
+      stripePriceId
+      appleProductId
+      currency
+      unitAmount
+      recurringIntervalCount
+    }
   }
 }
 
 query GetSubscriptionStatus {
   getUserSubscriptionStatus {
     hasActiveSubscription
+    entitlementSource
+    entitlementStartsAt
+    entitlementEndsAt
     subscriptionStatus
     currentPeriodStart
     currentPeriodEnd
@@ -52,9 +81,66 @@ query GetSubscriptionStatus {
   }
 }
 
+query GetResolvedTier {
+  getResolvedTier {
+    tierName
+    tierDisplayName
+    hasActiveSubscription
+    entitlementSource
+    entitlementStatus
+    entitlementStartsAt
+    entitlementEndsAt
+    capabilities
+  }
+}
+
+query GetStorageStatus {
+  getStorageStatus {
+    userId
+    tierName
+    retainedStorageUsedBytes
+    retainedStorageLimitBytes
+    isUnlimited
+    policyConfigured
+    remainingStorageBytes
+    storageUsageRatio
+    isNearLimit
+    isOverLimit
+    usageCalculated
+    usageSource
+    lastCalculatedAt
+  }
+}
+
+query GetAppleAppAccountToken {
+  getAppleAppAccountToken
+}
+
+mutation SyncAppleSubscription($signedTransactionInfo: String!) {
+  syncAppleSubscription(
+    input: { signedTransactionInfo: $signedTransactionInfo }
+  ) {
+    ok
+    errorCode
+    errorMessage
+    hasActiveSubscription
+    entitlementSource
+    entitlementStartsAt
+    entitlementEndsAt
+    appleStatus
+    originalTransactionId
+    latestTransactionId
+    productId
+    expiresAt
+  }
+}
+
 mutation CancelSubscription {
   cancelSubscription {
     hasActiveSubscription
+    entitlementSource
+    entitlementStartsAt
+    entitlementEndsAt
     subscriptionStatus
     currentPeriodStart
     currentPeriodEnd
@@ -63,3 +149,14 @@ mutation CancelSubscription {
     stripeSubscriptionId
   }
 }
+mutation SubmitCancellationFeedback(
+  $reasons: [CancellationReasonEnum!]
+  $feedback: String
+  $metadata: CancellationFeedbackMetadataInput
+) {
+  submitCancellationFeedback(
+    reasons: $reasons
+    feedback: $feedback
+    metadata: $metadata
+  )
+}

src/operations/pool_hall.gql

@@ -0,0 +1,187 @@
+fragment PoolHallFields on PoolHall {
+  id
+  name
+  address
+  city
+  state
+  latitude
+  longitude
+  timezone
+  status
+  createdAt
+  updatedAt
+}
+
+fragment PoolHallCameraFields on PoolHallCamera {
+  id
+  poolHallId
+  name
+  tableLabel
+  streamPath
+  status
+  tableSize
+  pocketSize
+  allowsPrivateVideos
+  claimTermsText
+  claimTermsVersion
+  inUse
+  lastPublishedAt
+  lastUnpublishedAt
+  createdAt
+  updatedAt
+}
+
+fragment PoolHallCameraWithHallFields on PoolHallCamera {
+  ...PoolHallCameraFields
+  poolHall {
+    ...PoolHallFields
+  }
+}
+
+fragment PoolHallCameraStreamCredentialsFields on PoolHallCameraStreamCredentials {
+  streamKey
+  rtmpPath
+  camera {
+    ...PoolHallCameraWithHallFields
+  }
+}
+
+fragment CameraClaimSessionFields on CameraClaimSession {
+  id
+  cameraId
+  userId
+  challengeCode
+  status
+  expiresAt
+  detectedAt
+  failedAt
+  failureReason
+  agreedTermsVersion
+  createdAt
+  updatedAt
+  camera {
+    ...PoolHallCameraWithHallFields
+  }
+}
+
+fragment CameraLeaseFields on CameraLease {
+  id
+  cameraId
+  claimSessionId
+  userId
+  videoId
+  status
+  startedAt
+  endedAt
+  expiresAt
+  endReason
+  createdAt
+  updatedAt
+  camera {
+    ...PoolHallCameraWithHallFields
+  }
+}
+
+query GetPoolHalls {
+  poolHalls {
+    ...PoolHallFields
+  }
+}
+
+query GetClaimablePoolHalls {
+  claimablePoolHalls {
+    ...PoolHallFields
+  }
+}
+
+query GetPoolHallCameras($poolHallId: ID!) {
+  poolHallCameras(poolHallId: $poolHallId) {
+    ...PoolHallCameraWithHallFields
+  }
+}
+
+query GetClaimableCameras($poolHallId: ID!) {
+  claimableCameras(poolHallId: $poolHallId) {
+    ...PoolHallCameraWithHallFields
+  }
+}
+
+query GetCameraClaimSession($id: ID!) {
+  cameraClaimSession(id: $id) {
+    ...CameraClaimSessionFields
+  }
+}
+
+query GetActiveCameraLease {
+  activeCameraLease {
+    ...CameraLeaseFields
+  }
+}
+
+mutation CreatePoolHall($input: CreatePoolHallInput!) {
+  createPoolHall(input: $input) {
+    ...PoolHallFields
+  }
+}
+
+mutation UpdatePoolHall($input: UpdatePoolHallInput!) {
+  updatePoolHall(input: $input) {
+    ...PoolHallFields
+  }
+}
+
+mutation CreatePoolHallCamera($input: CreatePoolHallCameraInput!) {
+  createPoolHallCamera(input: $input) {
+    ...PoolHallCameraStreamCredentialsFields
+  }
+}
+
+mutation UpdatePoolHallCamera($input: UpdatePoolHallCameraInput!) {
+  updatePoolHallCamera(input: $input) {
+    ...PoolHallCameraWithHallFields
+  }
+}
+
+mutation RotatePoolHallCameraStreamKey($cameraId: ID!) {
+  rotatePoolHallCameraStreamKey(cameraId: $cameraId) {
+    ...PoolHallCameraStreamCredentialsFields
+  }
+}
+
+mutation CreateCameraClaimSession(
+  $cameraId: ID!
+  $durationMinutes: Int
+  $videoName: String
+  $videoPrivate: Boolean
+  $agreedTermsVersion: Int
+  $tags: [VideoTagInput!]
+) {
+  createCameraClaimSession(
+    cameraId: $cameraId
+    durationMinutes: $durationMinutes
+    videoName: $videoName
+    videoPrivate: $videoPrivate
+    agreedTermsVersion: $agreedTermsVersion
+    tags: $tags
+  ) {
+    ...CameraClaimSessionFields
+  }
+}
+
+mutation CancelCameraClaimSession($claimSessionId: ID!) {
+  cancelCameraClaimSession(claimSessionId: $claimSessionId) {
+    ...CameraClaimSessionFields
+  }
+}
+
+mutation EndCameraLease($leaseId: ID!) {
+  endCameraLease(leaseId: $leaseId) {
+    ...CameraLeaseFields
+  }
+}
+
+mutation ExtendCameraLease($leaseId: ID!, $additionalMinutes: Int! = 60) {
+  extendCameraLease(leaseId: $leaseId, additionalMinutes: $additionalMinutes) {
+    ...CameraLeaseFields
+  }
+}

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/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/shooter.gql

@@ -0,0 +1,58 @@
+fragment PlayerSummaryFields on PlayerSummaryGQL {
+  clusterId
+  userId
+  username
+  profileImageUri
+  representativeFullFrameUrl
+  totalShots
+  totalShotsMade
+  makePercentage
+  score
+  longestRun
+  runLengths
+  spinTypeBreakdown {
+    draw
+    center
+    follow
+  }
+  averageDifficulty
+  averageTimeBetweenShots
+}
+
+fragment PlayerClusterShotFields on PlayerClusterShotGQL {
+  shotId
+  bboxX1
+  bboxY1
+  bboxX2
+  bboxY2
+  confidence
+  isConfirmed
+  cropUrl
+  fullFrameUrl
+}
+
+fragment PlayerClusterFields on PlayerClusterGQL {
+  videoId
+  clusterId
+  nShots
+  userId
+  username
+  profileImageUri
+  confirmed
+  score
+  shots {
+    ...PlayerClusterShotFields
+  }
+}
+
+query VideoPlayerClusters($videoId: Int!) {
+  videoPlayerClusters(videoId: $videoId) {
+    ...PlayerClusterFields
+  }
+}
+
+mutation FinalizePlayerAssignments($input: FinalizePlayerAssignmentsInput!) {
+  finalizePlayerAssignments(input: $input) {
+    ...PlayerClusterFields
+  }
+}

src/operations/shot_simulation.gql

@@ -0,0 +1,87 @@
+query GetTableState(
+  $b64Image: String!
+  $tableSize: Float
+  $useHomography: HomographyInputGQL
+) {
+  getTableState(
+    b64Image: $b64Image
+    tableSize: $tableSize
+    useHomography: $useHomography
+  ) {
+    identifierToPosition
+    identifierToColor {
+      hex
+    }
+  }
+}
+
+query GetLiveTableState($videoId: Int!) {
+  getLiveTableState(videoId: $videoId) {
+    videoId
+    frameIndex
+    tableState {
+      identifierToPosition
+      identifierToColor {
+        hex
+      }
+    }
+  }
+}
+
+query GetShotTableState($shotId: Int!) {
+  getShotTableState(shotId: $shotId) {
+    shotId
+    videoId
+    frameIndex
+    tableState {
+      identifierToPosition
+      identifierToColor {
+        hex
+      }
+    }
+  }
+}
+
+query SimulateShot($simulationInput: SimulateShotInputGQL!) {
+  simulateShot(simulationInput: $simulationInput) {
+    trajectories {
+      ballId
+      points {
+        time
+        position
+      }
+    }
+    events {
+      eventType
+      time
+      ballIds
+      position
+    }
+    finalState {
+      ballId
+      position
+    }
+    pottedBallIds
+  }
+}
+
+query ComputePotAim(
+  $simulationInput: SimulateShotInputGQL!
+  $targetBallId: Int!
+  $pocket: PocketIdentifier!
+) {
+  computePotAim(
+    simulationInput: $simulationInput
+    targetBallId: $targetBallId
+    pocket: $pocket
+  ) {
+    phi
+    geometricPhi
+    cutAngle
+    requiredPrecision
+    feasible
+    potted
+    converged
+    occludingBallIds
+  }
+}

src/operations/shots.gql

@@ -132,6 +132,38 @@ query GetShotsByIds($ids: [Int!]!) {
   }
 }
 
+# Lightweight clip boundaries for condensed session playback. The inline
+# session player only needs each shot's frame/time window to seek between
+# shots — this skips the heavy ShotWithAllFeatures payload (cue/pocketing
+# features, serialized shot paths, annotations, nested video/playlist). The
+# startTime/endTime @client resolvers derive their values from the frame
+# fields + the video (looked up internally), so this is all they require.
+fragment ShotClipRange on ShotGQL {
+  id
+  videoId
+  startFrame
+  endFrame
+  startTime @client
+  endTime @client
+}
+
+query GetShotClipRanges(
+  $filterInput: FilterInput!
+  $shotsOrdering: GetShotsOrdering
+  $limit: Int
+) {
+  getOrderedShots(
+    filterInput: $filterInput
+    shotsOrdering: $shotsOrdering
+    limit: $limit
+  ) {
+    count
+    shots {
+      ...ShotClipRange
+    }
+  }
+}
+
 fragment ShotWithAllFeatures on ShotGQL {
   id
   videoId

src/operations/usage_stats.gql

@@ -0,0 +1,45 @@
+query getUsageStats($days: Int! = 30) {
+  getUsageStats(days: $days) {
+    funnel {
+      freemiumEpoch
+      eraSignups
+      eraPaying
+      activationCohort
+      activationActivated
+      payingUsers
+      newPaid7d
+      newPaid30d
+      retentionPrevActive
+      retentionReturned
+    }
+    cohorts {
+      weekStart
+      signups
+      activated7d
+      paid7d
+      activatedNotPaid7d
+    }
+    totalUsers
+    totalVideos
+    totalShots
+    totalRuns
+    windows {
+      label
+      newUsers
+      activeUsers
+      sessions
+      shots
+    }
+    daily {
+      day
+      newUsers
+      activeUsers
+      sessions
+      shots
+    }
+    processingLast24h {
+      status
+      count
+    }
+  }
+}

src/operations/user.gql

@@ -49,6 +49,39 @@ query GetUserPlayTime($userId: Int!, $filters: VideoFilterInput) {
   }
 }
 
+query GetUploadQuotaStatus {
+  getQuotaStatus {
+    tierName
+    periodStart
+    periodEnd
+    durationUsedSeconds
+    durationLimitSeconds
+    maxVideoDurationSeconds
+    durationRemainingSeconds
+    canUpload
+    importQuotaBuckets {
+      quotaKey
+      appliesToUploadKind
+      periodStart
+      periodEnd
+      durationUsedSeconds
+      durationLimitSeconds
+      durationRemainingSeconds
+      canUpload
+    }
+    recordingQuotaBuckets {
+      quotaKey
+      appliesToUploadKind
+      periodStart
+      periodEnd
+      durationUsedSeconds
+      durationLimitSeconds
+      durationRemainingSeconds
+      canUpload
+    }
+  }
+}
+
 query getUsernames(
   $matchString: String!
   $limit: Int = null
@@ -92,6 +125,17 @@ query GetUserTags {
   }
 }
 
+query GetGameTypeTagMetrics($input: GameTypeTagMetricsInput!) {
+  getGameTypeTagMetrics(input: $input) {
+    tagName
+    tagLabel
+    tableSize
+    shotCount
+    madeShots
+    makeRate
+  }
+}
+
 mutation followUser($followedUserId: Int!) {
   followUser(followedUserId: $followedUserId) {
     id
@@ -133,6 +177,7 @@ mutation editUser(
   $fargoRating: Int
   $videosPrivateByDefault: Boolean
   $agreesToMarketing: Boolean
+  $bio: String
 ) {
   editUser(
     input: {
@@ -140,6 +185,7 @@ mutation editUser(
       fargoRating: $fargoRating
       videosPrivateByDefault: $videosPrivateByDefault
       agreesToMarketing: $agreesToMarketing
+      bio: $bio
     }
   ) {
     id
@@ -149,6 +195,7 @@ mutation editUser(
     updatedAt
     videosPrivateByDefault
     agreesToMarketing
+    bio
   }
 }
 
@@ -162,6 +209,7 @@ fragment UserFragment on UserGQL {
   username
   isAdmin
   profileImageUri
+  bio
   fargoRating
   activeVideoId
   createdAt

src/operations/video.gql

@@ -10,6 +10,7 @@ query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
     stream {
       id
       linksRequested
+      lowestUnuploadedSegmentIndex
       uploadsCompleted
       segmentProcessingCursor
       isCompleted
@@ -82,6 +83,9 @@ query GetVideoDetails($videoId: Int!) {
       }
       name
     }
+    playerSummaries {
+      ...PlayerSummaryFields
+    }
   }
 }
 
@@ -135,6 +139,15 @@ query GetVideoSocialDetailsById($videoId: Int!) {
   }
 }
 
+# Full card payload for a single video — reuses the same VideoCardFields
+# fragment the feed list uses, so the session-detail meta header shares one
+# source of truth (and the normalized Apollo cache) with the feed card.
+query GetVideoCard($videoId: Int!) {
+  getVideo(videoId: $videoId) {
+    ...VideoCardFields
+  }
+}
+
 query GetVideos($videoIds: [Int!]!) {
   getVideos(videoIds: $videoIds) {
     ...VideoStreamMetadata

src/operations/video_export.gql

@@ -0,0 +1,36 @@
+fragment VideoExportJobFields on VideoExportJobGQL {
+  id
+  videoId
+  mode
+  status
+  videoName
+  videoThumbnailUri
+  shotIds
+  runId
+  downloadUrl
+  fileSizeBytes
+  expiresAt
+  createdAt
+}
+
+mutation RequestVideoExport($input: RequestVideoExportInput!) {
+  requestVideoExport(input: $input) {
+    ...VideoExportJobFields
+  }
+}
+
+mutation DismissVideoExport($jobId: Int!) {
+  dismissVideoExport(jobId: $jobId)
+}
+
+query VideoExportJob($jobId: Int!) {
+  videoExportJob(jobId: $jobId) {
+    ...VideoExportJobFields
+  }
+}
+
+query MyVideoExports($limit: Int = 30, $offset: Int = 0) {
+  myVideoExports(limit: $limit, offset: $offset) {
+    ...VideoExportJobFields
+  }
+}

src/operations/video_upload.gql

@@ -1,5 +1,11 @@
-mutation CreateUploadStream($videoMetadataInput: VideoMetadataInput!) {
+mutation CreateUploadStream(
-  createUploadStream(videoMetadata: $videoMetadataInput) {
+  $videoMetadataInput: VideoMetadataInput!
+  $expectedDurationSeconds: Float = null
+) {
+  createUploadStream(
+    videoMetadata: $videoMetadataInput
+    expectedDurationSeconds: $expectedDurationSeconds
+  ) {
     videoId
   }
 }
@@ -31,10 +37,18 @@ mutation GetUploadLink($videoId: Int!, $segmentIndex: Int!) {
               }
             }
           }
+          ... on StorageLimitExceededErr {
+            reason
+            tierName
+            retainedStorageUsedBytes
+            retainedStorageLimitBytes
+            remainingStorageBytes
+          }
         }
       }
     }
     stream {
+      id
       uploadCompletionCursor
     }
   }
@@ -61,6 +75,13 @@ mutation GetHlsInitUploadLink($videoId: Int!) {
           ... on TooManyInitUploadsErr {
             linksRequested
           }
+          ... on StorageLimitExceededErr {
+            reason
+            tierName
+            retainedStorageUsedBytes
+            retainedStorageLimitBytes
+            remainingStorageBytes
+          }
         }
       }
     }
@@ -107,6 +128,7 @@ fragment UploadStreamWithDetails on VideoGQL {
   name
   startTime
   stream {
+    id
     isCompleted
     lastIntendedSegmentBound
     uploadCompletionCursor

src/schema.gql

@@ -28,9 +28,19 @@ type Query {
   getLongestRunsLeaderboard(
     interval: TimeInterval = null
     when: DateTime = null
-    limit: Int! = 100
+    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(
     interval: TimeInterval = null
     when: DateTime = null
@@ -42,6 +52,12 @@ type Query {
     filters: NotificationFilters = null
   ): NotificationConnection!
   unreadNotificationCount: Int!
+  poolHalls: [PoolHall!]!
+  claimablePoolHalls: [PoolHall!]!
+  poolHallCameras(poolHallId: ID!): [PoolHallCamera!]!
+  claimableCameras(poolHallId: ID!): [PoolHallCamera!]!
+  cameraClaimSession(id: ID!): CameraClaimSession
+  activeCameraLease: CameraLease
   getRuns(
     filterInput: RunFilterInput!
     runIds: [Int!] = null
@@ -49,12 +65,22 @@ type Query {
     limit: Int! = 500
     countRespectsLimit: Boolean! = false
   ): GetRunsResult!
+  getSessionCoach(videoId: Int!): SessionCoachGQL!
+  videoPlayerClusters(videoId: Int!): [PlayerClusterGQL!]!
   getShotAnnotationTypes(errorTypes: Boolean = false): [ShotAnnotationTypeGQL!]!
   getTableState(
     b64Image: String!
     tableSize: Float = 100
     useHomography: HomographyInputGQL = null
   ): TableStateGQL!
+  getLiveTableState(videoId: Int!): LiveTableStateGQL!
+  getShotTableState(shotId: Int!): ShotTableStateGQL!
+  simulateShot(simulationInput: SimulateShotInputGQL!): ShotProjectionGQL!
+  computePotAim(
+    simulationInput: SimulateShotInputGQL!
+    targetBallId: Int!
+    pocket: PocketIdentifier!
+  ): PotAimGQL!
   getOrderedShots(
     filterInput: FilterInput!
     ids: [Int!] = null
@@ -76,6 +102,7 @@ type Query {
     countRespectsLimit: Boolean! = false
   ): [ShotGQL!]!
   getShotsByIds(ids: [Int!]!): [ShotGQL!]!
+  getUsageStats(days: Int! = 30): UsageStatsGQL!
   getUser(userId: Int!): UserGQL
   doesUsernameExist(candidateUsername: String!): Boolean!
   getLoggedInUser: UserGQL
@@ -97,6 +124,10 @@ type Query {
   ): UserRelationshipsResult!
   getAvailableSubscriptionOptions: StripeSubscriptionOptionsGQL!
   getUserSubscriptionStatus: UserSubscriptionStatusGQL!
+  getResolvedTier: ResolvedTierGQL!
+  getAppleAppAccountToken: String!
+  getQuotaStatus: QuotaStatusGQL!
+  getStorageStatus: StorageStatusGQL
   getPlayTime(userId: Int!, filters: VideoFilterInput = null): UserPlayTimeGQL!
   getUserVideos(
     userId: Int = null
@@ -105,6 +136,9 @@ type Query {
     filters: VideoFilterInput = null
   ): VideoHistoryGQL!
   getUserTags(includeRetiredTags: Boolean = false): [TagGQL!]!
+  getGameTypeTagMetrics(input: GameTypeTagMetricsInput!): [GameTypeTagMetric!]!
+  videoExportJob(jobId: Int!): VideoExportJobGQL
+  myVideoExports(limit: Int! = 30, offset: Int! = 0): [VideoExportJobGQL!]!
   getVideo(videoId: Int!, debuggingJson: JSON = null): VideoGQL!
   getVideos(videoIds: [Int!]!): [VideoGQL!]!
 }
@@ -342,6 +376,7 @@ type UserGQL {
   activeVideoId: Int
   stripeCustomerId: String
   profileImageUri: String
+  bio: String
   createdAt: DateTime
   updatedAt: DateTime
   videosPrivateByDefault: Boolean
@@ -403,6 +438,7 @@ type VideoGQL {
   currentProcessing: VideoProcessingGQL
   reactions: [ReactionGQL!]!
   comments: [CommentGQL!]!
+  playerSummaries: [PlayerSummaryGQL!]!
 }
 
 type ShotGQL {
@@ -514,6 +550,7 @@ type UploadStreamGQL {
   initPlaylistUploadStatus: InitPlaylistUploadStatusEnum
   lowestUnuploadedSegmentIndex: Int!
   uploadCompletionCursor: Int!
+  lastSegmentUploadedAt: DateTime
   errors: [StreamErrorGQL!]!
   createdAt: DateTime!
   updatedAt: DateTime!
@@ -574,7 +611,7 @@ type VideoTagClass {
 }
 
 type HomographyInfoGQL {
-  id: Int!
+  id: Int
   frameIndex: Int!
   crop: BoundingBoxGQL!
   pockets: [BoundingBoxGQL!]!
@@ -605,6 +642,8 @@ type IntPoint2D {
 
 type VideoProcessingGQL {
   id: Int!
+  parentProcessingId: Int
+  labels: [String!]!
   errors: [VideoProcessingErrorGQL!]!
   status: ProcessingStatusEnum!
   statuses: [VideoProcessingStatusGQL!]!
@@ -660,6 +699,29 @@ type CommentGQL {
   replies: [CommentGQL!]!
 }
 
+type PlayerSummaryGQL {
+  clusterId: Int!
+  userId: Int
+  username: String
+  profileImageUri: String
+  representativeFullFrameUrl: String
+  totalShots: Int!
+  totalShotsMade: Int!
+  makePercentage: Float!
+  score: Int
+  longestRun: Int!
+  runLengths: [Int!]!
+  spinTypeBreakdown: SpinTypeBreakdownGQL!
+  averageDifficulty: Float
+  averageTimeBetweenShots: Float
+}
+
+type SpinTypeBreakdownGQL {
+  draw: Int!
+  center: Int!
+  follow: Int!
+}
+
 type DeployedConfigGQL {
   allowNewUsers: Boolean!
   firebase: Boolean!
@@ -667,7 +729,12 @@ type DeployedConfigGQL {
   environment: String!
   minimumAllowedAppVersion: String!
   subscriptionGatingEnabled: Boolean!
+  quotaEnforcementEnabled: Boolean!
+  storageLimitEnforcementEnabled: Boolean!
+  capabilityEnforcementEnabled: Boolean!
   bannerMessages: [BannerGQL!]!
+  defaultAndroidRecordingFormat: StreamSegmentTypeEnum!
+  bucketUrl: String!
 }
 
 type BannerGQL {
@@ -689,6 +756,7 @@ type VideoHistoryGQL {
   videos: [VideoGQL!]!
   pageInfo: PageInfoGQL!
   hasFollowing: Boolean!
+  followingCount: Int!
 }
 
 type PageInfoGQL {
@@ -725,6 +793,13 @@ type RunLeaderboardGQL {
   entries: [RunGQL!]!
 }
 
+type DrillRunLeaderboardGQL {
+  entries: [RunGQL!]!
+  youRun: RunGQL
+  youRank: Int
+  totalPlayers: Int!
+}
+
 type CountLeaderboardGQL {
   entries: [UserShotCountEntry!]!
 }
@@ -809,6 +884,7 @@ enum NotificationTypeEnum {
   REACTION
   FOLLOW
   CHALLENGE_INVITE
+  EXPORT_READY
 }
 
 input NotificationFilters {
@@ -816,6 +892,72 @@ input NotificationFilters {
   notificationTypes: [NotificationTypeEnum!] = null
 }
 
+type PoolHall {
+  id: ID!
+  name: String!
+  address: String
+  city: String
+  state: String
+  latitude: Float
+  longitude: Float
+  timezone: String
+  status: String!
+  createdAt: DateTime!
+  updatedAt: DateTime!
+}
+
+type PoolHallCamera {
+  id: ID!
+  poolHallId: ID!
+  name: String!
+  tableLabel: String
+  streamPath: String!
+  status: String!
+  tableSize: Float
+  pocketSize: Float
+  allowsPrivateVideos: Boolean!
+  claimTermsText: String
+  claimTermsVersion: Int
+  lastPublishedAt: DateTime
+  lastUnpublishedAt: DateTime
+  createdAt: DateTime!
+  updatedAt: DateTime!
+  inUse: Boolean!
+  poolHall: PoolHall!
+}
+
+type CameraClaimSession {
+  id: ID!
+  cameraId: ID!
+  userId: ID!
+  challengeCode: String!
+  status: String!
+  expiresAt: DateTime!
+  detectedAt: DateTime
+  failedAt: DateTime
+  failureReason: String
+  agreedTermsVersion: Int
+  createdAt: DateTime!
+  updatedAt: DateTime!
+  camera: PoolHallCamera!
+}
+
+type CameraLease {
+  id: ID!
+  cameraId: ID!
+  claimSessionId: ID
+  userId: ID!
+  videoId: ID
+  status: String!
+  startedAt: DateTime!
+  endedAt: DateTime
+  expiresAt: DateTime
+  endReason: String
+  createdAt: DateTime!
+  updatedAt: DateTime!
+  camera: PoolHallCamera!
+}
+
 type GetRunsResult {
   runs: [RunGQL!]!
   count: Int
@@ -854,9 +996,116 @@ 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!
+  nShots: Int!
+  userId: Int
+  username: String
+  profileImageUri: String
+  confirmed: Boolean!
+  score: Int
+  shots: [PlayerClusterShotGQL!]!
+}
+
+type PlayerClusterShotGQL {
+  shotId: Int!
+  bboxX1: Int!
+  bboxY1: Int!
+  bboxX2: Int!
+  bboxY2: Int!
+  confidence: Float!
+  isConfirmed: Boolean!
+  cropUrl: String
+  fullFrameUrl: String
+}
+
 type TableStateGQL {
   identifierToPosition: [[Float!]!]!
   homography: HomographyInfoGQL
+  identifierToColor: [RGBColorGQL]!
+}
+
+type RGBColorGQL {
+  r: Int!
+  g: Int!
+  b: Int!
+  hex: String!
 }
 
 input HomographyInputGQL {
@@ -887,6 +1136,89 @@ input IntPoint2DInput {
   y: Int!
 }
 
+type LiveTableStateGQL {
+  videoId: Int!
+  frameIndex: Int!
+  tableState: TableStateGQL!
+}
+
+type ShotTableStateGQL {
+  shotId: Int!
+  videoId: Int!
+  frameIndex: Int!
+  tableState: TableStateGQL!
+}
+
+type ShotProjectionGQL {
+  trajectories: [BallTrajectoryGQL!]!
+  events: [SimulationEventGQL!]!
+  finalState: [SimulationBallStateGQL!]!
+  pottedBallIds: [Int!]!
+}
+
+type BallTrajectoryGQL {
+  ballId: Int!
+  points: [TrajectoryPointGQL!]!
+}
+
+type TrajectoryPointGQL {
+  time: Float!
+  position: [Float!]!
+}
+
+type SimulationEventGQL {
+  eventType: SimulationEventType!
+  time: Float!
+  ballIds: [Int!]!
+  position: [Float!]
+}
+
+enum SimulationEventType {
+  STICK_BALL
+  BALL_BALL
+  BALL_CUSHION
+  BALL_POCKET
+  BALL_STOP
+}
+
+type SimulationBallStateGQL {
+  ballId: Int!
+  position: [Float!]!
+}
+
+input SimulateShotInputGQL {
+  cueBallId: Int!
+  strike: CueStrikeInputGQL!
+  balls: [SimulationBallStateInputGQL!] = null
+  b64Image: String = null
+  useHomography: HomographyInputGQL = null
+  tableSize: Float = null
+}
+
+input CueStrikeInputGQL {
+  v0: Float!
+  phi: Float!
+  theta: Float! = 0
+  a: Float! = 0
+  b: Float! = 0
+}
+
+input SimulationBallStateInputGQL {
+  ballId: Int!
+  position: [Float!]!
+}
+
+type PotAimGQL {
+  phi: Float!
+  geometricPhi: Float!
+  cutAngle: Float!
+  requiredPrecision: Float!
+  feasible: Boolean!
+  potted: Boolean!
+  converged: Boolean!
+  occludingBallIds: [Int!]!
+}
+
 type GetShotsResult {
   shots: [ShotGQL!]!
   count: Int
@@ -921,6 +1253,60 @@ input CreatedAfter @oneOf {
   createdAt: DateTime
 }
 
+type UsageStatsGQL {
+  funnel: FunnelStatsGQL!
+  totalUsers: Int!
+  totalVideos: Int!
+  totalShots: Int!
+  totalRuns: Int!
+  cohorts: [CohortStatsGQL!]!
+  windows: [UsageStatsWindowGQL!]!
+  daily: [UsageStatsDailyGQL!]!
+  processingLast24h: [ProcessingStatusCountGQL!]!
+}
+
+type FunnelStatsGQL {
+  freemiumEpoch: Date!
+  eraSignups: Int!
+  eraPaying: Int!
+  activationCohort: Int!
+  activationActivated: Int!
+  payingUsers: Int!
+  newPaid7d: Int!
+  newPaid30d: Int!
+  retentionPrevActive: Int!
+  retentionReturned: Int!
+}
+
+type CohortStatsGQL {
+  weekStart: Date!
+  signups: Int!
+  activated7d: Int!
+  paid7d: Int!
+  activatedNotPaid7d: Int!
+}
+
+type UsageStatsWindowGQL {
+  label: String!
+  newUsers: Int!
+  activeUsers: Int!
+  sessions: Int!
+  shots: Int!
+}
+
+type UsageStatsDailyGQL {
+  day: Date!
+  newUsers: Int!
+  activeUsers: Int!
+  sessions: Int!
+  shots: Int!
+}
+
+type ProcessingStatusCountGQL {
+  status: String!
+  count: Int!
+}
+
 type UserRelationshipsResult {
   inquiringUser: UserGQL!
   relationships: [UserRelationship!]!
@@ -934,6 +1320,9 @@ type UserRelationship {
 
 type StripeSubscriptionOptionsGQL {
   products: [StripeProductGQL!]!
+  trialPeriodDays: Int
+  appleIap: AppleIapSubscriptionOptionsGQL!
+  tierOptions: [SubscriptionTierPurchaseOptionGQL!]!
 }
 
 type StripeProductGQL {
@@ -954,8 +1343,32 @@ type StripePriceGQL {
   active: Boolean!
 }
 
+type AppleIapSubscriptionOptionsGQL {
+  enabled: Boolean!
+  proMonthlyProductId: String
+  productIds: [String!]!
+}
+
+type SubscriptionTierPurchaseOptionGQL {
+  tierName: String!
+  tierDisplayName: String!
+  billingInterval: String!
+  platform: String!
+  isConfigured: Boolean!
+  isAvailable: Boolean!
+  stripeProductId: String
+  stripePriceId: String
+  appleProductId: String
+  currency: String
+  unitAmount: Int
+  recurringIntervalCount: Int
+}
+
 type UserSubscriptionStatusGQL {
   hasActiveSubscription: Boolean!
+  entitlementSource: EntitlementSourceTypeEnum
+  entitlementStartsAt: DateTime
+  entitlementEndsAt: DateTime
   subscriptionStatus: StripeSubscriptionStatusEnum
   currentPeriodStart: DateTime
   currentPeriodEnd: DateTime
@@ -964,6 +1377,14 @@ type UserSubscriptionStatusGQL {
   stripeSubscriptionId: String
 }
 
+enum EntitlementSourceTypeEnum {
+  ADMIN
+  MANUAL
+  STRIPE
+  APPLE
+  ALPHA_LEGACY
+}
+
 enum StripeSubscriptionStatusEnum {
   INCOMPLETE
   INCOMPLETE_EXPIRED
@@ -975,6 +1396,62 @@ enum StripeSubscriptionStatusEnum {
   PAUSED
 }
 
+type ResolvedTierGQL {
+  tierName: String!
+  tierDisplayName: String!
+  hasActiveSubscription: Boolean!
+  entitlementSource: EntitlementSourceTypeEnum
+  entitlementStatus: String
+  entitlementStartsAt: DateTime
+  entitlementEndsAt: DateTime
+  capabilities: [String!]!
+}
+
+type QuotaStatusGQL {
+  tierName: String!
+  periodStart: DateTime!
+  periodEnd: DateTime!
+  durationUsedSeconds: Float!
+  durationLimitSeconds: Int
+  maxVideoDurationSeconds: Int
+  importQuotaBuckets: [QuotaBucketStatusGQL!]!
+  recordingQuotaBuckets: [QuotaBucketStatusGQL!]!
+  durationRemainingSeconds: Float
+  canUpload: Boolean!
+}
+
+type QuotaBucketStatusGQL {
+  quotaKey: String!
+  appliesToUploadKind: String!
+  periodStart: DateTime!
+  periodEnd: DateTime!
+  durationUsedSeconds: Float!
+  durationLimitSeconds: Int
+  durationRemainingSeconds: Float
+  canUpload: Boolean!
+}
+
+type StorageStatusGQL {
+  userId: Int!
+  tierName: String!
+  retainedStorageUsedBytes: BigInt!
+  retainedStorageLimitBytes: BigInt
+  isUnlimited: Boolean!
+  policyConfigured: Boolean!
+  remainingStorageBytes: BigInt
+  storageUsageRatio: Float
+  isNearLimit: Boolean!
+  isOverLimit: Boolean!
+  usageCalculated: Boolean!
+  usageSource: String
+  lastCalculatedAt: DateTime
+}
+
+"""
+Integer value that can exceed GraphQL Int's 32-bit range.
+"""
+scalar BigInt
+
 type UserPlayTimeGQL {
   totalSeconds: Float!
 }
@@ -991,6 +1468,55 @@ type TagClassGQL {
   name: String!
 }
 
+type GameTypeTagMetric {
+  tagName: String!
+  tagLabel: String!
+  tableSize: Float
+  shotCount: Int!
+  madeShots: Int!
+  makeRate: Float!
+}
+
+input GameTypeTagMetricsInput {
+  userId: Int!
+  createdAt: DateRangeFilter = null
+  maxTags: Int = null
+  groupByTableSize: Boolean! = true
+  includeUnknown: Boolean! = true
+  tagClass: String = "game_type"
+  includePrivate: IncludePrivateEnum! = MINE
+}
+
+type VideoExportJobGQL {
+  id: Int!
+  videoId: Int!
+  mode: VideoExportModeEnum!
+  status: VideoExportStatusEnum!
+  videoName: String
+  videoThumbnailUri: String
+  shotIds: [Int!]
+  runId: Int
+  downloadUrl: String
+  fileSizeBytes: Int
+  expiresAt: DateTime
+  createdAt: DateTime
+}
+
+enum VideoExportModeEnum {
+  FULL_SESSION
+  SHOTS
+  RUN
+}
+
+enum VideoExportStatusEnum {
+  CREATED
+  QUEUED
+  RUNNING
+  SUCCEEDED
+  FAILED
+  EXPIRED
+}
+
 """
 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).
 """
@@ -1047,6 +1573,27 @@ type Mutation {
   markAllNotificationsAsRead: Boolean!
   markNotificationsAsRead(notificationIds: [Int!]!): Boolean!
   deleteNotification(notificationId: Int!): Boolean!
+  createPoolHall(input: CreatePoolHallInput!): PoolHall!
+  updatePoolHall(input: UpdatePoolHallInput!): PoolHall!
+  createPoolHallCamera(
+    input: CreatePoolHallCameraInput!
+  ): PoolHallCameraStreamCredentials!
+  updatePoolHallCamera(input: UpdatePoolHallCameraInput!): PoolHallCamera!
+  rotatePoolHallCameraStreamKey(cameraId: ID!): PoolHallCameraStreamCredentials!
+  createCameraClaimSession(
+    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(
+    input: FinalizePlayerAssignmentsInput!
+  ): [PlayerClusterGQL!]!
   addAnnotationToShot(
     shotId: Int!
     annotationName: String!
@@ -1070,11 +1617,31 @@ type Mutation {
   retireTags(tagIds: [Int!]!): Boolean!
   ensureStripeCustomerExists: UserGQL!
   deleteUser: Boolean!
+  syncAppleSubscription(
+    input: SyncAppleSubscriptionInputGQL!
+  ): SyncAppleSubscriptionResultGQL!
   createSubscription(priceId: String!): CreateSubscriptionResultGQL!
+  createCustomerPortalSession: CreateCustomerPortalSessionResultGQL!
   cancelSubscription: UserSubscriptionStatusGQL!
+  grantManualEntitlement(
+    userId: Int!
+    tierName: String! = "pro"
+    startsAt: DateTime = null
+    endsAt: DateTime = null
+    reason: String = null
+  ): UserSubscriptionStatusGQL!
+  revokeManualEntitlement(userId: Int!): UserSubscriptionStatusGQL!
+  submitCancellationFeedback(
+    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(
     videoMetadata: VideoMetadataInput!
+    expectedDurationSeconds: Float = null
   ): CreateUploadStreamReturn!
   getUploadLink(videoId: Int!, segmentIndex: Int!): GetUploadLinkReturn!
   getHlsInitUploadLink(videoId: Int!): GetUploadLinkReturn!
@@ -1103,6 +1670,73 @@ enum ReportReasonEnum {
   OTHER
 }
 
+input CreatePoolHallInput {
+  name: String!
+  address: String = null
+  city: String = null
+  state: String = null
+  latitude: Float = null
+  longitude: Float = null
+  timezone: String = null
+}
+
+input UpdatePoolHallInput {
+  id: ID!
+  name: String = null
+  address: String = null
+  city: String = null
+  state: String = null
+  latitude: Float = null
+  longitude: Float = null
+  timezone: String = null
+  status: String = null
+}
+
+type PoolHallCameraStreamCredentials {
+  camera: PoolHallCamera!
+  streamKey: String!
+  rtmpPath: String!
+}
+
+input CreatePoolHallCameraInput {
+  poolHallId: ID!
+  name: String!
+  tableLabel: String = null
+  streamPath: String = null
+  tableSize: Float = null
+  pocketSize: Float = null
+  allowsPrivateVideos: Boolean = null
+  claimTermsText: String = null
+}
+
+input UpdatePoolHallCameraInput {
+  id: ID!
+  name: String = null
+  tableLabel: String = null
+  status: String = null
+  tableSize: Float = null
+  pocketSize: Float = null
+  allowsPrivateVideos: Boolean = null
+  claimTermsText: String = null
+}
+
+input FinalizePlayerAssignmentsInput {
+  videoId: Int!
+  clusterAssignments: [ClusterAssignmentInput!]! = []
+  shotMoves: [ShotMoveInput!]! = []
+}
+
+input ClusterAssignmentInput {
+  clusterId: Int!
+  userId: Int = null
+  score: Int = null
+}
+
+input ShotMoveInput {
+  shotId: Int!
+  newClusterId: Int!
+}
+
 type AddShotAnnotationReturn {
   value: SuccessfulAddAddShotAnnotationErrors!
 }
@@ -1189,6 +1823,27 @@ input EditUserInputGQL {
   fargoRating: Int = null
   videosPrivateByDefault: Boolean = null
   agreesToMarketing: Boolean = null
+  bio: String = null
+}
+
+type SyncAppleSubscriptionResultGQL {
+  ok: Boolean!
+  errorCode: String
+  errorMessage: String
+  hasActiveSubscription: Boolean!
+  entitlementSource: EntitlementSourceTypeEnum
+  entitlementStartsAt: DateTime
+  entitlementEndsAt: DateTime
+  appleStatus: Int
+  originalTransactionId: String
+  latestTransactionId: String
+  productId: String
+  expiresAt: DateTime
+}
+
+input SyncAppleSubscriptionInputGQL {
+  signedTransactionInfo: String!
+  signedRenewalInfo: String = null
 }
 
 type CreateSubscriptionResultGQL {
@@ -1196,6 +1851,32 @@ type CreateSubscriptionResultGQL {
   sessionId: String!
 }
 
+type CreateCustomerPortalSessionResultGQL {
+  portalUrl: String!
+}
+
+enum CancellationReasonEnum {
+  DONT_PLAY_ENOUGH
+  TOO_EXPENSIVE
+  MISSING_FEATURES
+  TECHNICAL_ISSUES
+  DATA_NOT_ACCURATE
+  OTHER
+}
+
+input CancellationFeedbackMetadataInput {
+  appVersion: String = null
+  gitRevision: String = null
+  platform: String = null
+}
+
+input RequestVideoExportInput {
+  videoId: Int!
+  mode: VideoExportModeEnum!
+  shotIds: [Int!] = null
+  runId: Int = null
+}
+
 type CreateUploadStreamReturn {
   videoId: Int!
 }
@@ -1235,10 +1916,10 @@ type GetUploadLinkReturn {
 union UploadLinkGetUploadLinkErrors = UploadLink | GetUploadLinkErrors
 
 type GetUploadLinkErrors {
-  error: MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErrInitUploadAlreadyCompletedErrTooManyInitUploadsErr!
+  error: MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErrInitUploadAlreadyCompletedErrTooManyInitUploadsErrStorageLimitExceededErr!
 }
 
-union MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErrInitUploadAlreadyCompletedErrTooManyInitUploadsErr =
+union MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErrInitUploadAlreadyCompletedErrTooManyInitUploadsErrStorageLimitExceededErr =
     MustHaveSetForUploadLinkErr
   | SegmentAlreadyUploadedErr
   | ProcessingFailedErr
@@ -1246,6 +1927,7 @@ union MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoI
   | TooManyProfileImageUploadsErr
   | InitUploadAlreadyCompletedErr
   | TooManyInitUploadsErr
+  | StorageLimitExceededErr
 
 type MustHaveSetForUploadLinkErr {
   resolution: Boolean
@@ -1271,3 +1953,11 @@ type InitUploadAlreadyCompletedErr {
 type TooManyInitUploadsErr {
   linksRequested: Int!
 }
+
+type StorageLimitExceededErr {
+  reason: String!
+  tierName: String!
+  retainedStorageUsedBytes: BigInt!
+  retainedStorageLimitBytes: BigInt
+  remainingStorageBytes: BigInt
+}