diff --git a/mobile/rpc-foundation/goldens/matrix-git.changes-load-git.branchcompare-1.json b/mobile/rpc-foundation/goldens/matrix-git.changes-load-git.branchcompare-1.json
index 1cf8b9ecc75..ecd62d820e2 100644
--- a/mobile/rpc-foundation/goldens/matrix-git.changes-load-git.branchcompare-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-git.changes-load-git.branchcompare-1.json
@@ -163,6 +163,11 @@
         }
       }
     },
+    "2bf960db8adf": {
+      "name": "git.status#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"git.status\",\"params\":{\"worktree\":\"id:repo42::/p\",\"includeLineStats\":false}}"
+    },
     "2cb17031e16a": {
       "branchCompareState": {
         "kind": "error",
@@ -376,62 +381,6 @@
         "startedAt": 0
       }
     },
-    "6a5580a606dc": {
-      "name": "git.status#1",
-      "ordinal": 2,
-      "args": [
-        {
-          "name": "method",
-          "value": "git.status"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:repo42::/p"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "branch": "feature",
-            "entries": [
-              {
-                "added": 4,
-                "area": "unstaged",
-                "path": "src/app.ts",
-                "removed": 1,
-                "status": "modified"
-              },
-              {
-                "area": "staged",
-                "oldPath": "src/older.ts",
-                "path": "src/old.ts",
-                "status": "renamed"
-              }
-            ],
-            "head": "head-oid",
-            "upstreamStatus": {
-              "ahead": 1,
-              "behind": 0,
-              "hasUpstream": true,
-              "upstreamName": "origin/feature"
-            }
-          }
-        }
-      }
-    },
     "6d220bb7b42a": {
       "name": "worktree.show#1",
       "ordinal": 5,
@@ -458,32 +407,6 @@
         "startedAt": 0
       }
     },
-    "72e251ae531b": {
-      "name": "git.status#1",
-      "ordinal": 2,
-      "args": [
-        {
-          "name": "method",
-          "value": "git.status"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:repo42::/p"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 0
-      }
-    },
     "830aa65db9d0": {
       "branchCompareState": {
         "kind": "idle"
@@ -722,11 +645,6 @@
         }
       }
     },
-    "973ac78137f2": {
-      "name": "git.status#1",
-      "ordinal": 4,
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"git.status\",\"params\":{\"worktree\":\"id:repo42::/p\"}}"
-    },
     "9b643a151075": {
       "name": "git.branchCompare#1",
       "ordinal": 11,
@@ -811,11 +729,95 @@
         }
       }
     },
+    "aa8c5813ba8a": {
+      "name": "git.status#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "git.status"
+        },
+        {
+          "name": "params",
+          "value": {
+            "includeLineStats": false,
+            "worktree": "id:repo42::/p"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "branch": "feature",
+            "entries": [
+              {
+                "added": 4,
+                "area": "unstaged",
+                "path": "src/app.ts",
+                "removed": 1,
+                "status": "modified"
+              },
+              {
+                "area": "staged",
+                "oldPath": "src/older.ts",
+                "path": "src/old.ts",
+                "status": "renamed"
+              }
+            ],
+            "head": "head-oid",
+            "upstreamStatus": {
+              "ahead": 1,
+              "behind": 0,
+              "hasUpstream": true,
+              "upstreamName": "origin/feature"
+            }
+          }
+        }
+      }
+    },
     "ad2a2a1df35b": {
       "name": "worktree.show#1",
       "ordinal": 9,
       "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo42::/p\"}}"
     },
+    "ae602a492660": {
+      "name": "git.status#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "git.status"
+        },
+        {
+          "name": "params",
+          "value": {
+            "includeLineStats": false,
+            "worktree": "id:repo42::/p"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
     "c2212473f0c1": {
       "name": "repo.list#1",
       "ordinal": 10,
@@ -985,8 +987,8 @@
       {
         "id": "sc-changes-loaded.prelude:status-pending",
         "observation": {
-          "sender": ["e3973bb12da1", "72e251ae531b"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "ae602a492660"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -997,8 +999,8 @@
       {
         "id": "sc-changes-loaded.prelude:compare-pending",
         "observation": {
-          "sender": ["e3973bb12da1", "6a5580a606dc", "6d220bb7b42a", "587de4c7f7fc"],
-          "payloads": ["f648b042d810", "973ac78137f2", "ad2a2a1df35b", "c2212473f0c1"],
+          "sender": ["e3973bb12da1", "aa8c5813ba8a", "6d220bb7b42a", "587de4c7f7fc"],
+          "payloads": ["f648b042d810", "2bf960db8adf", "ad2a2a1df35b", "c2212473f0c1"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -1011,14 +1013,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "9536c968b88a",
             "35cc9e325d08"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
@@ -1035,14 +1037,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "9536c968b88a",
             "893813584d8b"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
@@ -1059,14 +1061,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "9536c968b88a",
             "55d62e9e07b4"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
@@ -1083,14 +1085,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "9536c968b88a",
             "2b6257fd1172"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
@@ -1107,14 +1109,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "9536c968b88a",
             "1650cbe07807"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
@@ -1131,14 +1133,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "9536c968b88a",
             "a76331b97c21"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
@@ -1155,14 +1157,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "9536c968b88a",
             "967f1b227050"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
@@ -1179,14 +1181,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "9536c968b88a",
             "00fe64c7bc78"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
@@ -1203,14 +1205,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "9536c968b88a",
             "c75999ea5a6c"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
@@ -1227,14 +1229,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "9536c968b88a",
             "47205e8686ad"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
@@ -1251,14 +1253,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "9536c968b88a",
             "9b643a151075"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
diff --git a/mobile/rpc-foundation/goldens/matrix-git.changes-load-git.status-1.json b/mobile/rpc-foundation/goldens/matrix-git.changes-load-git.status-1.json
index 21a989a692d..aade53b10dc 100644
--- a/mobile/rpc-foundation/goldens/matrix-git.changes-load-git.status-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-git.changes-load-git.status-1.json
@@ -4,75 +4,6 @@
   "family": "git.changes-load",
   "namedDeltas": [],
   "values": {
-    "04f6ea51fb83": {
-      "name": "git.status#1",
-      "ordinal": 2,
-      "args": [
-        {
-          "name": "method",
-          "value": "git.status"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:repo42::/p"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "error": "refused"
-          }
-        }
-      }
-    },
-    "0a645f4241a6": {
-      "name": "git.status#1",
-      "ordinal": 2,
-      "args": [
-        {
-          "name": "method",
-          "value": "git.status"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:repo42::/p"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "error": {
-            "code": "method_not_found",
-            "message": "Unknown method"
-          },
-          "id": "frame-2",
-          "ok": false
-        }
-      }
-    },
     "19bb6c737352": {
       "branchCompareState": {
         "kind": "idle"
@@ -134,40 +65,6 @@
         }
       }
     },
-    "200efb648720": {
-      "name": "git.status#1",
-      "ordinal": 2,
-      "args": [
-        {
-          "name": "method",
-          "value": "git.status"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:repo42::/p"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "$rpc": "null"
-          }
-        }
-      }
-    },
     "21ab22282843": {
       "branchCompareState": {
         "kind": "idle"
@@ -186,6 +83,11 @@
         "message": "Update Orca desktop to use Source Control on mobile."
       }
     },
+    "2bf960db8adf": {
+      "name": "git.status#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"git.status\",\"params\":{\"worktree\":\"id:repo42::/p\",\"includeLineStats\":false}}"
+    },
     "35cc9e325d08": {
       "name": "git.branchCompare#1",
       "ordinal": 11,
@@ -246,41 +148,6 @@
         "message": ""
       }
     },
-    "4d11fcc4af02": {
-      "name": "git.status#1",
-      "ordinal": 2,
-      "args": [
-        {
-          "name": "method",
-          "value": "git.status"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:repo42::/p"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "error": {
-            "code": "refused",
-            "message": ""
-          },
-          "id": "frame-2",
-          "ok": false
-        }
-      }
-    },
     "587de4c7f7fc": {
       "name": "repo.list#1",
       "ordinal": 6,
@@ -316,7 +183,7 @@
         "message": "outer refused"
       }
     },
-    "6a5580a606dc": {
+    "60f6e2d48ef7": {
       "name": "git.status#1",
       "ordinal": 2,
       "args": [
@@ -327,6 +194,7 @@
         {
           "name": "params",
           "value": {
+            "includeLineStats": false,
             "worktree": "id:repo42::/p"
           }
         },
@@ -338,37 +206,13 @@
         }
       ],
       "settlement": {
-        "status": "fulfilled",
+        "status": "rejected",
         "startedAt": 0,
         "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "branch": "feature",
-            "entries": [
-              {
-                "added": 4,
-                "area": "unstaged",
-                "path": "src/app.ts",
-                "removed": 1,
-                "status": "modified"
-              },
-              {
-                "area": "staged",
-                "oldPath": "src/older.ts",
-                "path": "src/old.ts",
-                "status": "renamed"
-              }
-            ],
-            "head": "head-oid",
-            "upstreamStatus": {
-              "ahead": 1,
-              "behind": 0,
-              "hasUpstream": true,
-              "upstreamName": "origin/feature"
-            }
-          }
+        "error": {
+          "category": "Error",
+          "message": "transport failure",
+          "isRpcDeliveryUnknown": true
         }
       }
     },
@@ -398,7 +242,16 @@
         "startedAt": 0
       }
     },
-    "72e251ae531b": {
+    "74b7ff5e1818": {
+      "branchCompareState": {
+        "kind": "idle"
+      },
+      "screenState": {
+        "kind": "error",
+        "message": "transport failure"
+      }
+    },
+    "885a150a2ecd": {
       "name": "git.status#1",
       "ordinal": 2,
       "args": [
@@ -409,6 +262,7 @@
         {
           "name": "params",
           "value": {
+            "includeLineStats": false,
             "worktree": "id:repo42::/p"
           }
         },
@@ -420,20 +274,20 @@
         }
       ],
       "settlement": {
-        "status": "pending",
-        "startedAt": 0
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "error": {
+            "code": "method_not_found",
+            "message": "Unknown method"
+          },
+          "id": "frame-2",
+          "ok": false
+        }
       }
     },
-    "74b7ff5e1818": {
-      "branchCompareState": {
-        "kind": "idle"
-      },
-      "screenState": {
-        "kind": "error",
-        "message": "transport failure"
-      }
-    },
-    "7bb6d5b22b62": {
+    "8af3432e9742": {
       "name": "git.status#1",
       "ordinal": 2,
       "args": [
@@ -444,6 +298,7 @@
         {
           "name": "params",
           "value": {
+            "includeLineStats": false,
             "worktree": "id:repo42::/p"
           }
         },
@@ -462,9 +317,7 @@
           "id": "frame-2",
           "ok": true,
           "result": {
-            "error": {
-              "message": "inner refused"
-            },
+            "error": "inner refused",
             "ok": false
           }
         }
@@ -539,37 +392,6 @@
         }
       }
     },
-    "91448c30aa24": {
-      "name": "git.status#1",
-      "ordinal": 2,
-      "args": [
-        {
-          "name": "method",
-          "value": "git.status"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:repo42::/p"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true
-        }
-      }
-    },
     "9536c968b88a": {
       "name": "repo.list#1",
       "ordinal": 6,
@@ -604,12 +426,7 @@
         }
       }
     },
-    "973ac78137f2": {
-      "name": "git.status#1",
-      "ordinal": 4,
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"git.status\",\"params\":{\"worktree\":\"id:repo42::/p\"}}"
-    },
-    "9809f1b5d628": {
+    "9cedf6bac284": {
       "name": "git.status#1",
       "ordinal": 2,
       "args": [
@@ -620,6 +437,7 @@
         {
           "name": "params",
           "value": {
+            "includeLineStats": false,
             "worktree": "id:repo42::/p"
           }
         },
@@ -631,13 +449,16 @@
         }
       ],
       "settlement": {
-        "status": "rejected",
+        "status": "fulfilled",
         "startedAt": 0,
         "settledAt": 0,
-        "error": {
-          "category": "Error",
-          "message": "",
-          "isRpcDeliveryUnknown": true
+        "value": {
+          "error": {
+            "code": "refused",
+            "message": ""
+          },
+          "id": "frame-2",
+          "ok": false
         }
       }
     },
@@ -649,12 +470,7 @@
         "kind": "loading"
       }
     },
-    "a6482f604002": {
-      "name": "source-control.status-load-success",
-      "ordinal": 8,
-      "value": {}
-    },
-    "aae82d534914": {
+    "a0e97f94a377": {
       "name": "git.status#1",
       "ordinal": 2,
       "args": [
@@ -665,6 +481,7 @@
         {
           "name": "params",
           "value": {
+            "includeLineStats": false,
             "worktree": "id:repo42::/p"
           }
         },
@@ -683,18 +500,17 @@
           "id": "frame-2",
           "ok": true,
           "result": {
-            "error": "inner refused",
-            "ok": false
+            "$rpc": "null"
           }
         }
       }
     },
-    "ad2a2a1df35b": {
-      "name": "worktree.show#1",
-      "ordinal": 9,
-      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo42::/p\"}}"
+    "a6482f604002": {
+      "name": "source-control.status-load-success",
+      "ordinal": 8,
+      "value": {}
     },
-    "c212210ceca6": {
+    "aa8c5813ba8a": {
       "name": "git.status#1",
       "ordinal": 2,
       "args": [
@@ -705,6 +521,201 @@
         {
           "name": "params",
           "value": {
+            "includeLineStats": false,
+            "worktree": "id:repo42::/p"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "branch": "feature",
+            "entries": [
+              {
+                "added": 4,
+                "area": "unstaged",
+                "path": "src/app.ts",
+                "removed": 1,
+                "status": "modified"
+              },
+              {
+                "area": "staged",
+                "oldPath": "src/older.ts",
+                "path": "src/old.ts",
+                "status": "renamed"
+              }
+            ],
+            "head": "head-oid",
+            "upstreamStatus": {
+              "ahead": 1,
+              "behind": 0,
+              "hasUpstream": true,
+              "upstreamName": "origin/feature"
+            }
+          }
+        }
+      }
+    },
+    "ad2a2a1df35b": {
+      "name": "worktree.show#1",
+      "ordinal": 9,
+      "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo42::/p\"}}"
+    },
+    "ae602a492660": {
+      "name": "git.status#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "git.status"
+        },
+        {
+          "name": "params",
+          "value": {
+            "includeLineStats": false,
+            "worktree": "id:repo42::/p"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
+    "b0d4cb96a6f3": {
+      "name": "git.status#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "git.status"
+        },
+        {
+          "name": "params",
+          "value": {
+            "includeLineStats": false,
+            "worktree": "id:repo42::/p"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true
+        }
+      }
+    },
+    "b660ecdc7911": {
+      "name": "git.status#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "git.status"
+        },
+        {
+          "name": "params",
+          "value": {
+            "includeLineStats": false,
+            "worktree": "id:repo42::/p"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "error": "refused"
+          }
+        }
+      }
+    },
+    "bbdf2a03af16": {
+      "name": "git.status#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "git.status"
+        },
+        {
+          "name": "params",
+          "value": {
+            "includeLineStats": false,
+            "worktree": "id:repo42::/p"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "error": {
+              "message": "inner refused"
+            },
+            "ok": false
+          }
+        }
+      }
+    },
+    "c1923dfd79bf": {
+      "name": "git.status#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "git.status"
+        },
+        {
+          "name": "params",
+          "value": {
+            "includeLineStats": false,
             "worktree": "id:repo42::/p"
           }
         },
@@ -743,38 +754,6 @@
         }
       }
     },
-    "d858ce00f4f0": {
-      "name": "git.status#1",
-      "ordinal": 2,
-      "args": [
-        {
-          "name": "method",
-          "value": "git.status"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:repo42::/p"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "rejected",
-        "startedAt": 0,
-        "settledAt": 0,
-        "error": {
-          "category": "Error",
-          "message": "transport failure",
-          "isRpcDeliveryUnknown": true
-        }
-      }
-    },
     "e2d7409ece1c": {
       "name": "git.branchCompare#1",
       "ordinal": 12,
@@ -814,6 +793,39 @@
         "$rpc": "undefined"
       }
     },
+    "f5e9af0a8858": {
+      "name": "git.status#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "git.status"
+        },
+        {
+          "name": "params",
+          "value": {
+            "includeLineStats": false,
+            "worktree": "id:repo42::/p"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "rejected",
+        "startedAt": 0,
+        "settledAt": 0,
+        "error": {
+          "category": "Error",
+          "message": "",
+          "isRpcDeliveryUnknown": true
+        }
+      }
+    },
     "f648b042d810": {
       "name": "settings.get#1",
       "ordinal": 3,
@@ -826,8 +838,8 @@
       {
         "id": "sc-changes-loaded.prelude:status-pending",
         "observation": {
-          "sender": ["e3973bb12da1", "72e251ae531b"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "ae602a492660"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -838,8 +850,8 @@
       {
         "id": "sc-changes-loaded.normal:compare-pending",
         "observation": {
-          "sender": ["e3973bb12da1", "6a5580a606dc", "6d220bb7b42a", "587de4c7f7fc"],
-          "payloads": ["f648b042d810", "973ac78137f2", "ad2a2a1df35b", "c2212473f0c1"],
+          "sender": ["e3973bb12da1", "aa8c5813ba8a", "6d220bb7b42a", "587de4c7f7fc"],
+          "payloads": ["f648b042d810", "2bf960db8adf", "ad2a2a1df35b", "c2212473f0c1"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -852,14 +864,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "9536c968b88a",
             "35cc9e325d08"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
@@ -874,8 +886,8 @@
       {
         "id": "sc-changes-loaded.result-absent:compare-pending",
         "observation": {
-          "sender": ["e3973bb12da1", "91448c30aa24"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "b0d4cb96a6f3"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -886,8 +898,8 @@
       {
         "id": "sc-changes-loaded.result-absent:settled",
         "observation": {
-          "sender": ["e3973bb12da1", "91448c30aa24"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "b0d4cb96a6f3"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -898,8 +910,8 @@
       {
         "id": "sc-changes-loaded.result-null:compare-pending",
         "observation": {
-          "sender": ["e3973bb12da1", "200efb648720"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "a0e97f94a377"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -910,8 +922,8 @@
       {
         "id": "sc-changes-loaded.result-null:settled",
         "observation": {
-          "sender": ["e3973bb12da1", "200efb648720"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "a0e97f94a377"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -922,8 +934,8 @@
       {
         "id": "sc-changes-loaded.inner-ok-missing:compare-pending",
         "observation": {
-          "sender": ["e3973bb12da1", "04f6ea51fb83"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "b660ecdc7911"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -934,8 +946,8 @@
       {
         "id": "sc-changes-loaded.inner-ok-missing:settled",
         "observation": {
-          "sender": ["e3973bb12da1", "04f6ea51fb83"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "b660ecdc7911"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -946,8 +958,8 @@
       {
         "id": "sc-changes-loaded.inner-false-string-error:compare-pending",
         "observation": {
-          "sender": ["e3973bb12da1", "aae82d534914"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "8af3432e9742"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -958,8 +970,8 @@
       {
         "id": "sc-changes-loaded.inner-false-string-error:settled",
         "observation": {
-          "sender": ["e3973bb12da1", "aae82d534914"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "8af3432e9742"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -970,8 +982,8 @@
       {
         "id": "sc-changes-loaded.inner-false-object-error:compare-pending",
         "observation": {
-          "sender": ["e3973bb12da1", "7bb6d5b22b62"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "bbdf2a03af16"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -982,8 +994,8 @@
       {
         "id": "sc-changes-loaded.inner-false-object-error:settled",
         "observation": {
-          "sender": ["e3973bb12da1", "7bb6d5b22b62"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "bbdf2a03af16"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -994,8 +1006,8 @@
       {
         "id": "sc-changes-loaded.outer-refused:compare-pending",
         "observation": {
-          "sender": ["e3973bb12da1", "c212210ceca6"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "c1923dfd79bf"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -1006,8 +1018,8 @@
       {
         "id": "sc-changes-loaded.outer-refused:settled",
         "observation": {
-          "sender": ["e3973bb12da1", "c212210ceca6"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "c1923dfd79bf"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -1018,8 +1030,8 @@
       {
         "id": "sc-changes-loaded.outer-refused-no-message:compare-pending",
         "observation": {
-          "sender": ["e3973bb12da1", "4d11fcc4af02"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "9cedf6bac284"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -1030,8 +1042,8 @@
       {
         "id": "sc-changes-loaded.outer-refused-no-message:settled",
         "observation": {
-          "sender": ["e3973bb12da1", "4d11fcc4af02"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "9cedf6bac284"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -1042,8 +1054,8 @@
       {
         "id": "sc-changes-loaded.method-not-found:compare-pending",
         "observation": {
-          "sender": ["e3973bb12da1", "0a645f4241a6"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "885a150a2ecd"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -1054,8 +1066,8 @@
       {
         "id": "sc-changes-loaded.method-not-found:settled",
         "observation": {
-          "sender": ["e3973bb12da1", "0a645f4241a6"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "885a150a2ecd"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -1066,8 +1078,8 @@
       {
         "id": "sc-changes-loaded.transport-rejection:compare-pending",
         "observation": {
-          "sender": ["e3973bb12da1", "d858ce00f4f0"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "60f6e2d48ef7"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -1078,8 +1090,8 @@
       {
         "id": "sc-changes-loaded.transport-rejection:settled",
         "observation": {
-          "sender": ["e3973bb12da1", "d858ce00f4f0"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "60f6e2d48ef7"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -1090,8 +1102,8 @@
       {
         "id": "sc-changes-loaded.transport-rejection-no-message:compare-pending",
         "observation": {
-          "sender": ["e3973bb12da1", "9809f1b5d628"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "f5e9af0a8858"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -1102,8 +1114,8 @@
       {
         "id": "sc-changes-loaded.transport-rejection-no-message:settled",
         "observation": {
-          "sender": ["e3973bb12da1", "9809f1b5d628"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "f5e9af0a8858"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
diff --git a/mobile/rpc-foundation/goldens/matrix-git.changes-load-repo.list-1.json b/mobile/rpc-foundation/goldens/matrix-git.changes-load-repo.list-1.json
index 7bc156d150a..82cc3f5246d 100644
--- a/mobile/rpc-foundation/goldens/matrix-git.changes-load-repo.list-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-git.changes-load-repo.list-1.json
@@ -159,6 +159,11 @@
         }
       }
     },
+    "2bf960db8adf": {
+      "name": "git.status#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"git.status\",\"params\":{\"worktree\":\"id:repo42::/p\",\"includeLineStats\":false}}"
+    },
     "35cc9e325d08": {
       "name": "git.branchCompare#1",
       "ordinal": 11,
@@ -268,62 +273,6 @@
         "startedAt": 0
       }
     },
-    "6a5580a606dc": {
-      "name": "git.status#1",
-      "ordinal": 2,
-      "args": [
-        {
-          "name": "method",
-          "value": "git.status"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:repo42::/p"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "branch": "feature",
-            "entries": [
-              {
-                "added": 4,
-                "area": "unstaged",
-                "path": "src/app.ts",
-                "removed": 1,
-                "status": "modified"
-              },
-              {
-                "area": "staged",
-                "oldPath": "src/older.ts",
-                "path": "src/old.ts",
-                "status": "renamed"
-              }
-            ],
-            "head": "head-oid",
-            "upstreamStatus": {
-              "ahead": 1,
-              "behind": 0,
-              "hasUpstream": true,
-              "upstreamName": "origin/feature"
-            }
-          }
-        }
-      }
-    },
     "6b974d7f9507": {
       "name": "repo.list#1",
       "ordinal": 6,
@@ -422,32 +371,6 @@
         "startedAt": 0
       }
     },
-    "72e251ae531b": {
-      "name": "git.status#1",
-      "ordinal": 2,
-      "args": [
-        {
-          "name": "method",
-          "value": "git.status"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:repo42::/p"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 0
-      }
-    },
     "84280af3ca36": {
       "name": "repo.list#1",
       "ordinal": 6,
@@ -618,11 +541,6 @@
         }
       }
     },
-    "973ac78137f2": {
-      "name": "git.status#1",
-      "ordinal": 4,
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"git.status\",\"params\":{\"worktree\":\"id:repo42::/p\"}}"
-    },
     "a0e527bdf205": {
       "branchCompareState": {
         "kind": "idle"
@@ -636,11 +554,95 @@
       "ordinal": 8,
       "value": {}
     },
+    "aa8c5813ba8a": {
+      "name": "git.status#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "git.status"
+        },
+        {
+          "name": "params",
+          "value": {
+            "includeLineStats": false,
+            "worktree": "id:repo42::/p"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "branch": "feature",
+            "entries": [
+              {
+                "added": 4,
+                "area": "unstaged",
+                "path": "src/app.ts",
+                "removed": 1,
+                "status": "modified"
+              },
+              {
+                "area": "staged",
+                "oldPath": "src/older.ts",
+                "path": "src/old.ts",
+                "status": "renamed"
+              }
+            ],
+            "head": "head-oid",
+            "upstreamStatus": {
+              "ahead": 1,
+              "behind": 0,
+              "hasUpstream": true,
+              "upstreamName": "origin/feature"
+            }
+          }
+        }
+      }
+    },
     "ad2a2a1df35b": {
       "name": "worktree.show#1",
       "ordinal": 9,
       "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo42::/p\"}}"
     },
+    "ae602a492660": {
+      "name": "git.status#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "git.status"
+        },
+        {
+          "name": "params",
+          "value": {
+            "includeLineStats": false,
+            "worktree": "id:repo42::/p"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
     "bc1d0b381f25": {
       "name": "repo.list#1",
       "ordinal": 6,
@@ -772,8 +774,8 @@
       {
         "id": "sc-changes-loaded.prelude:status-pending",
         "observation": {
-          "sender": ["e3973bb12da1", "72e251ae531b"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "ae602a492660"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -784,8 +786,8 @@
       {
         "id": "sc-changes-loaded.prelude:compare-pending",
         "observation": {
-          "sender": ["e3973bb12da1", "6a5580a606dc", "6d220bb7b42a", "587de4c7f7fc"],
-          "payloads": ["f648b042d810", "973ac78137f2", "ad2a2a1df35b", "c2212473f0c1"],
+          "sender": ["e3973bb12da1", "aa8c5813ba8a", "6d220bb7b42a", "587de4c7f7fc"],
+          "payloads": ["f648b042d810", "2bf960db8adf", "ad2a2a1df35b", "c2212473f0c1"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -798,14 +800,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "9536c968b88a",
             "35cc9e325d08"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
@@ -822,14 +824,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "bc1d0b381f25",
             "35cc9e325d08"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
@@ -846,14 +848,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "204b32e0c54e",
             "35cc9e325d08"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
@@ -870,14 +872,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "042d01f3263f",
             "35cc9e325d08"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
@@ -894,14 +896,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "26929519c12a",
             "35cc9e325d08"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
@@ -918,14 +920,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "6b974d7f9507",
             "35cc9e325d08"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
@@ -942,14 +944,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "877dcd616e1f",
             "35cc9e325d08"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
@@ -966,14 +968,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "6b9dc51089ad",
             "35cc9e325d08"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
@@ -990,14 +992,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "c7a8ab38e974",
             "35cc9e325d08"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
@@ -1014,14 +1016,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "84280af3ca36",
             "35cc9e325d08"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
@@ -1038,14 +1040,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "49197a7eac62",
             "35cc9e325d08"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
diff --git a/mobile/rpc-foundation/goldens/matrix-git.changes-load-worktree.show-1.json b/mobile/rpc-foundation/goldens/matrix-git.changes-load-worktree.show-1.json
index 2157784b934..4d4f3b48e14 100644
--- a/mobile/rpc-foundation/goldens/matrix-git.changes-load-worktree.show-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-git.changes-load-worktree.show-1.json
@@ -56,6 +56,11 @@
         }
       }
     },
+    "2bf960db8adf": {
+      "name": "git.status#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"git.status\",\"params\":{\"worktree\":\"id:repo42::/p\",\"includeLineStats\":false}}"
+    },
     "35cc9e325d08": {
       "name": "git.branchCompare#1",
       "ordinal": 11,
@@ -204,62 +209,6 @@
         "startedAt": 0
       }
     },
-    "6a5580a606dc": {
-      "name": "git.status#1",
-      "ordinal": 2,
-      "args": [
-        {
-          "name": "method",
-          "value": "git.status"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:repo42::/p"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "branch": "feature",
-            "entries": [
-              {
-                "added": 4,
-                "area": "unstaged",
-                "path": "src/app.ts",
-                "removed": 1,
-                "status": "modified"
-              },
-              {
-                "area": "staged",
-                "oldPath": "src/older.ts",
-                "path": "src/old.ts",
-                "status": "renamed"
-              }
-            ],
-            "head": "head-oid",
-            "upstreamStatus": {
-              "ahead": 1,
-              "behind": 0,
-              "hasUpstream": true,
-              "upstreamName": "origin/feature"
-            }
-          }
-        }
-      }
-    },
     "6d220bb7b42a": {
       "name": "worktree.show#1",
       "ordinal": 5,
@@ -286,32 +235,6 @@
         "startedAt": 0
       }
     },
-    "72e251ae531b": {
-      "name": "git.status#1",
-      "ordinal": 2,
-      "args": [
-        {
-          "name": "method",
-          "value": "git.status"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:repo42::/p"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 0
-      }
-    },
     "7440046c1348": {
       "name": "worktree.show#1",
       "ordinal": 5,
@@ -518,11 +441,6 @@
         }
       }
     },
-    "973ac78137f2": {
-      "name": "git.status#1",
-      "ordinal": 4,
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"git.status\",\"params\":{\"worktree\":\"id:repo42::/p\"}}"
-    },
     "a0e527bdf205": {
       "branchCompareState": {
         "kind": "idle"
@@ -536,6 +454,63 @@
       "ordinal": 8,
       "value": {}
     },
+    "aa8c5813ba8a": {
+      "name": "git.status#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "git.status"
+        },
+        {
+          "name": "params",
+          "value": {
+            "includeLineStats": false,
+            "worktree": "id:repo42::/p"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "branch": "feature",
+            "entries": [
+              {
+                "added": 4,
+                "area": "unstaged",
+                "path": "src/app.ts",
+                "removed": 1,
+                "status": "modified"
+              },
+              {
+                "area": "staged",
+                "oldPath": "src/older.ts",
+                "path": "src/old.ts",
+                "status": "renamed"
+              }
+            ],
+            "head": "head-oid",
+            "upstreamStatus": {
+              "ahead": 1,
+              "behind": 0,
+              "hasUpstream": true,
+              "upstreamName": "origin/feature"
+            }
+          }
+        }
+      }
+    },
     "ad2a2a1df35b": {
       "name": "worktree.show#1",
       "ordinal": 9,
@@ -576,6 +551,33 @@
         }
       }
     },
+    "ae602a492660": {
+      "name": "git.status#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "git.status"
+        },
+        {
+          "name": "params",
+          "value": {
+            "includeLineStats": false,
+            "worktree": "id:repo42::/p"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
     "b7a249bf3627": {
       "name": "worktree.show#1",
       "ordinal": 5,
@@ -803,8 +805,8 @@
       {
         "id": "sc-changes-loaded.prelude:status-pending",
         "observation": {
-          "sender": ["e3973bb12da1", "72e251ae531b"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "ae602a492660"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -815,8 +817,8 @@
       {
         "id": "sc-changes-loaded.prelude:compare-pending",
         "observation": {
-          "sender": ["e3973bb12da1", "6a5580a606dc", "6d220bb7b42a", "587de4c7f7fc"],
-          "payloads": ["f648b042d810", "973ac78137f2", "ad2a2a1df35b", "c2212473f0c1"],
+          "sender": ["e3973bb12da1", "aa8c5813ba8a", "6d220bb7b42a", "587de4c7f7fc"],
+          "payloads": ["f648b042d810", "2bf960db8adf", "ad2a2a1df35b", "c2212473f0c1"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -829,14 +831,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "9536c968b88a",
             "35cc9e325d08"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
@@ -853,14 +855,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "54cc20e9cfbc",
             "9536c968b88a",
             "f1bc948c977d"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "3ca74b9dc048"
@@ -877,14 +879,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8cf0ca1cc85d",
             "9536c968b88a",
             "f1bc948c977d"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "3ca74b9dc048"
@@ -901,14 +903,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "bb66129d9391",
             "9536c968b88a",
             "f1bc948c977d"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "3ca74b9dc048"
@@ -925,14 +927,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "ecfe4b0cfe19",
             "9536c968b88a",
             "f1bc948c977d"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "3ca74b9dc048"
@@ -949,14 +951,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "7440046c1348",
             "9536c968b88a",
             "f1bc948c977d"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "3ca74b9dc048"
@@ -973,14 +975,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "ae3822726c00",
             "9536c968b88a",
             "f1bc948c977d"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "3ca74b9dc048"
@@ -997,14 +999,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "4fadbf6b1661",
             "9536c968b88a",
             "f1bc948c977d"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "3ca74b9dc048"
@@ -1021,14 +1023,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "b7a249bf3627",
             "9536c968b88a",
             "f1bc948c977d"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "3ca74b9dc048"
@@ -1045,14 +1047,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "d65d39bc05d3",
             "9536c968b88a",
             "f1bc948c977d"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "3ca74b9dc048"
@@ -1069,14 +1071,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "7689d7b4e8e2",
             "9536c968b88a",
             "f1bc948c977d"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "3ca74b9dc048"
diff --git a/mobile/rpc-foundation/goldens/sc-changes-loaded.json b/mobile/rpc-foundation/goldens/sc-changes-loaded.json
index 0e95a43e419..0365526da70 100644
--- a/mobile/rpc-foundation/goldens/sc-changes-loaded.json
+++ b/mobile/rpc-foundation/goldens/sc-changes-loaded.json
@@ -56,6 +56,11 @@
         }
       }
     },
+    "2bf960db8adf": {
+      "name": "git.status#1",
+      "ordinal": 4,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"git.status\",\"params\":{\"worktree\":\"id:repo42::/p\",\"includeLineStats\":false}}"
+    },
     "35cc9e325d08": {
       "name": "git.branchCompare#1",
       "ordinal": 11,
@@ -133,62 +138,6 @@
         "startedAt": 0
       }
     },
-    "6a5580a606dc": {
-      "name": "git.status#1",
-      "ordinal": 2,
-      "args": [
-        {
-          "name": "method",
-          "value": "git.status"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:repo42::/p"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 0,
-        "settledAt": 0,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "branch": "feature",
-            "entries": [
-              {
-                "added": 4,
-                "area": "unstaged",
-                "path": "src/app.ts",
-                "removed": 1,
-                "status": "modified"
-              },
-              {
-                "area": "staged",
-                "oldPath": "src/older.ts",
-                "path": "src/old.ts",
-                "status": "renamed"
-              }
-            ],
-            "head": "head-oid",
-            "upstreamStatus": {
-              "ahead": 1,
-              "behind": 0,
-              "hasUpstream": true,
-              "upstreamName": "origin/feature"
-            }
-          }
-        }
-      }
-    },
     "6d220bb7b42a": {
       "name": "worktree.show#1",
       "ordinal": 5,
@@ -215,32 +164,6 @@
         "startedAt": 0
       }
     },
-    "72e251ae531b": {
-      "name": "git.status#1",
-      "ordinal": 2,
-      "args": [
-        {
-          "name": "method",
-          "value": "git.status"
-        },
-        {
-          "name": "params",
-          "value": {
-            "worktree": "id:repo42::/p"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 0
-      }
-    },
     "8c8e528ca222": {
       "name": "worktree.show#1",
       "ordinal": 5,
@@ -344,11 +267,6 @@
         }
       }
     },
-    "973ac78137f2": {
-      "name": "git.status#1",
-      "ordinal": 4,
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"git.status\",\"params\":{\"worktree\":\"id:repo42::/p\"}}"
-    },
     "a0e527bdf205": {
       "branchCompareState": {
         "kind": "idle"
@@ -362,11 +280,95 @@
       "ordinal": 8,
       "value": {}
     },
+    "aa8c5813ba8a": {
+      "name": "git.status#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "git.status"
+        },
+        {
+          "name": "params",
+          "value": {
+            "includeLineStats": false,
+            "worktree": "id:repo42::/p"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 0,
+        "settledAt": 0,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "branch": "feature",
+            "entries": [
+              {
+                "added": 4,
+                "area": "unstaged",
+                "path": "src/app.ts",
+                "removed": 1,
+                "status": "modified"
+              },
+              {
+                "area": "staged",
+                "oldPath": "src/older.ts",
+                "path": "src/old.ts",
+                "status": "renamed"
+              }
+            ],
+            "head": "head-oid",
+            "upstreamStatus": {
+              "ahead": 1,
+              "behind": 0,
+              "hasUpstream": true,
+              "upstreamName": "origin/feature"
+            }
+          }
+        }
+      }
+    },
     "ad2a2a1df35b": {
       "name": "worktree.show#1",
       "ordinal": 9,
       "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.show\",\"params\":{\"worktree\":\"id:repo42::/p\"}}"
     },
+    "ae602a492660": {
+      "name": "git.status#1",
+      "ordinal": 2,
+      "args": [
+        {
+          "name": "method",
+          "value": "git.status"
+        },
+        {
+          "name": "params",
+          "value": {
+            "includeLineStats": false,
+            "worktree": "id:repo42::/p"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 0
+      }
+    },
     "c2212473f0c1": {
       "name": "repo.list#1",
       "ordinal": 10,
@@ -432,8 +434,8 @@
       {
         "id": "status-pending",
         "observation": {
-          "sender": ["e3973bb12da1", "72e251ae531b"],
-          "payloads": ["f648b042d810", "973ac78137f2"],
+          "sender": ["e3973bb12da1", "ae602a492660"],
+          "payloads": ["f648b042d810", "2bf960db8adf"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -444,8 +446,8 @@
       {
         "id": "compare-pending",
         "observation": {
-          "sender": ["e3973bb12da1", "6a5580a606dc", "6d220bb7b42a", "587de4c7f7fc"],
-          "payloads": ["f648b042d810", "973ac78137f2", "ad2a2a1df35b", "c2212473f0c1"],
+          "sender": ["e3973bb12da1", "aa8c5813ba8a", "6d220bb7b42a", "587de4c7f7fc"],
+          "payloads": ["f648b042d810", "2bf960db8adf", "ad2a2a1df35b", "c2212473f0c1"],
           "settlements": {
             "mount": "eb79a9b3682a"
           },
@@ -458,14 +460,14 @@
         "observation": {
           "sender": [
             "e3973bb12da1",
-            "6a5580a606dc",
+            "aa8c5813ba8a",
             "8c8e528ca222",
             "9536c968b88a",
             "35cc9e325d08"
           ],
           "payloads": [
             "f648b042d810",
-            "973ac78137f2",
+            "2bf960db8adf",
             "ad2a2a1df35b",
             "c2212473f0c1",
             "e2d7409ece1c"
diff --git a/mobile/rpc-foundation/pilot-scenarios.json b/mobile/rpc-foundation/pilot-scenarios.json
index 67d2919bf1e..dfcd2902fd2 100644
--- a/mobile/rpc-foundation/pilot-scenarios.json
+++ b/mobile/rpc-foundation/pilot-scenarios.json
@@ -20740,7 +20740,8 @@
         {
           "complete": "git.status#1",
           "params": {
-            "worktree": "id:repo42::/p"
+            "worktree": "id:repo42::/p",
+            "includeLineStats": false
           },
           "reply": {
             "ok": true,
diff --git a/mobile/src/source-control/use-mobile-source-control-loaders.ts b/mobile/src/source-control/use-mobile-source-control-loaders.ts
index e712c424f95..4a2b821dce9 100644
--- a/mobile/src/source-control/use-mobile-source-control-loaders.ts
+++ b/mobile/src/source-control/use-mobile-source-control-loaders.ts
@@ -186,7 +186,9 @@ export function useMobileSourceControlLoaders(params: Params): MobileSourceContr
         try {
           for (let attempt = 0; attempt <= SELECTOR_RETRY_COUNT; attempt += 1) {
             const reply = await gitStatusHostPayloadRead.request(client, {
-              worktree: `id:${worktreeId}`
+              worktree: `id:${worktreeId}`,
+              // Changes rows never show line counts; older hosts strip the unknown key.
+              includeLineStats: false
             })
             if (!isCurrentLoad()) {
               return false