diff --git a/mobile/rpc-foundation/goldens/matrix-git.history-read-git.history-1.json b/mobile/rpc-foundation/goldens/matrix-git.history-read-git.history-1.json
index 52d16cd7a0f..966cd1db162 100644
--- a/mobile/rpc-foundation/goldens/matrix-git.history-read-git.history-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-git.history-read-git.history-1.json
@@ -13,16 +13,6 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "155f61ed496f": {
-      "status": "rejected",
-      "startedAt": 0,
-      "settledAt": 0,
-      "error": {
-        "category": "TypeError",
-        "message": "Cannot read properties of null (reading 'items')",
-        "isRpcDeliveryUnknown": false
-      }
-    },
     "17bc1e177fe1": {
       "name": "git.history#1",
       "args": [
@@ -290,16 +280,6 @@
       "status": "pending",
       "startedAt": 0
     },
-    "93e7019b0698": {
-      "status": "rejected",
-      "startedAt": 0,
-      "settledAt": 0,
-      "error": {
-        "category": "TypeError",
-        "message": "Cannot read properties of undefined (reading 'map')",
-        "isRpcDeliveryUnknown": false
-      }
-    },
     "a947768bc0ed": {
       "status": "rejected",
       "startedAt": 0,
@@ -558,13 +538,13 @@
     "ef169a494b41": {
       "rows": "unloaded"
     },
-    "f51f34589c7a": {
+    "f97f98d47494": {
       "status": "rejected",
       "startedAt": 0,
       "settledAt": 0,
       "error": {
-        "category": "TypeError",
-        "message": "Cannot read properties of undefined (reading 'items')",
+        "category": "Error",
+        "message": "incompatible_reply: git.history-page (git.history)",
         "isRpcDeliveryUnknown": false
       }
     }
@@ -602,7 +582,7 @@
           "sender": ["8bf6ec174c09"],
           "payloads": ["d2ac5468a6f5"],
           "settlements": {
-            "load": "f51f34589c7a"
+            "load": "f97f98d47494"
           },
           "state": "ef169a494b41",
           "effects": []
@@ -614,7 +594,7 @@
           "sender": ["dfb377a66ab7"],
           "payloads": ["d2ac5468a6f5"],
           "settlements": {
-            "load": "155f61ed496f"
+            "load": "f97f98d47494"
           },
           "state": "ef169a494b41",
           "effects": []
@@ -626,7 +606,7 @@
           "sender": ["52b4fb4742f7"],
           "payloads": ["d2ac5468a6f5"],
           "settlements": {
-            "load": "93e7019b0698"
+            "load": "f97f98d47494"
           },
           "state": "ef169a494b41",
           "effects": []
@@ -638,7 +618,7 @@
           "sender": ["ba8b415f2807"],
           "payloads": ["d2ac5468a6f5"],
           "settlements": {
-            "load": "93e7019b0698"
+            "load": "f97f98d47494"
           },
           "state": "ef169a494b41",
           "effects": []
@@ -650,7 +630,7 @@
           "sender": ["acda0899d438"],
           "payloads": ["d2ac5468a6f5"],
           "settlements": {
-            "load": "93e7019b0698"
+            "load": "f97f98d47494"
           },
           "state": "ef169a494b41",
           "effects": []
diff --git a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-chain-hostedreview.create-1.json b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-chain-hostedreview.create-1.json
index bc8d08acc61..1bf535e51f9 100644
--- a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-chain-hostedreview.create-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-chain-hostedreview.create-1.json
@@ -58,12 +58,6 @@
         }
       }
     },
-    "1843823ecb97": {
-      "outcome": {
-        "error": "Cannot read properties of undefined (reading 'ok')",
-        "ok": false
-      }
-    },
     "1b2778bf67a2": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -154,27 +148,12 @@
         }
       }
     },
-    "3a952f7d5dc7": {
-      "outcome": {
-        "error": "result.error.replace is not a function",
-        "ok": false
-      }
-    },
     "3c6a5a164e8a": {
       "outcome": {
         "error": "",
         "ok": false
       }
     },
-    "3d869a96636a": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "error": "result.error.replace is not a function",
-        "ok": false
-      }
-    },
     "3f946ad0279c": {
       "outcome": "uncreated"
     },
@@ -428,12 +407,6 @@
         }
       }
     },
-    "7f2deeb332e4": {
-      "outcome": {
-        "error": "Cannot read properties of null (reading 'ok')",
-        "ok": false
-      }
-    },
     "859f9a1daf06": {
       "name": "hostedReview.create#1",
       "args": [
@@ -477,15 +450,6 @@
         }
       }
     },
-    "8a78c581fc05": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "error": "Push succeeded, but PR creation failed: refused",
-        "ok": false
-      }
-    },
     "9270aeb7d9c6": {
       "status": "pending",
       "startedAt": 0
@@ -542,6 +506,15 @@
         "startedAt": 0
       }
     },
+    "a380c262a9cb": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "error": "incompatible_reply: hostedReview.create (hostedReview.create)",
+        "ok": false
+      }
+    },
     "a942a97a5d17": {
       "name": "worktree.set#1",
       "args": [
@@ -657,24 +630,6 @@
         "ok": false
       }
     },
-    "da16a2c8f57e": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "error": "Cannot read properties of null (reading 'ok')",
-        "ok": false
-      }
-    },
-    "de2020b72add": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "error": "Cannot read properties of undefined (reading 'ok')",
-        "ok": false
-      }
-    },
     "e12183bfd2c3": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -690,12 +645,6 @@
         "ok": false
       }
     },
-    "e892f90f62a0": {
-      "outcome": {
-        "error": "Push succeeded, but PR creation failed: refused",
-        "ok": false
-      }
-    },
     "f2a1b4ba33a3": {
       "name": "hostedReview.create#1",
       "args": [
@@ -742,6 +691,12 @@
         "ok": false
       }
     },
+    "f87f9230df87": {
+      "outcome": {
+        "error": "incompatible_reply: hostedReview.create (hostedReview.create)",
+        "ok": false
+      }
+    },
     "f9869252c305": {
       "name": "git.push#1",
       "args": [
@@ -851,9 +806,9 @@
           "sender": ["f9869252c305", "1259beb067fd"],
           "payloads": ["95b1f2f379aa", "06a94a810e5f"],
           "settlements": {
-            "create": "de2020b72add"
+            "create": "a380c262a9cb"
           },
-          "state": "1843823ecb97",
+          "state": "f87f9230df87",
           "effects": []
         }
       },
@@ -863,9 +818,9 @@
           "sender": ["f9869252c305", "1259beb067fd"],
           "payloads": ["95b1f2f379aa", "06a94a810e5f"],
           "settlements": {
-            "create": "de2020b72add"
+            "create": "a380c262a9cb"
           },
-          "state": "1843823ecb97",
+          "state": "f87f9230df87",
           "effects": []
         }
       },
@@ -875,9 +830,9 @@
           "sender": ["f9869252c305", "23b9cc94ff6c"],
           "payloads": ["95b1f2f379aa", "06a94a810e5f"],
           "settlements": {
-            "create": "da16a2c8f57e"
+            "create": "a380c262a9cb"
           },
-          "state": "7f2deeb332e4",
+          "state": "f87f9230df87",
           "effects": []
         }
       },
@@ -887,9 +842,9 @@
           "sender": ["f9869252c305", "23b9cc94ff6c"],
           "payloads": ["95b1f2f379aa", "06a94a810e5f"],
           "settlements": {
-            "create": "da16a2c8f57e"
+            "create": "a380c262a9cb"
           },
-          "state": "7f2deeb332e4",
+          "state": "f87f9230df87",
           "effects": []
         }
       },
@@ -899,9 +854,9 @@
           "sender": ["f9869252c305", "f2a1b4ba33a3"],
           "payloads": ["95b1f2f379aa", "06a94a810e5f"],
           "settlements": {
-            "create": "8a78c581fc05"
+            "create": "a380c262a9cb"
           },
-          "state": "e892f90f62a0",
+          "state": "f87f9230df87",
           "effects": []
         }
       },
@@ -911,9 +866,9 @@
           "sender": ["f9869252c305", "f2a1b4ba33a3"],
           "payloads": ["95b1f2f379aa", "06a94a810e5f"],
           "settlements": {
-            "create": "8a78c581fc05"
+            "create": "a380c262a9cb"
           },
-          "state": "e892f90f62a0",
+          "state": "f87f9230df87",
           "effects": []
         }
       },
@@ -947,9 +902,9 @@
           "sender": ["f9869252c305", "859f9a1daf06"],
           "payloads": ["95b1f2f379aa", "06a94a810e5f"],
           "settlements": {
-            "create": "3d869a96636a"
+            "create": "a380c262a9cb"
           },
-          "state": "3a952f7d5dc7",
+          "state": "f87f9230df87",
           "effects": []
         }
       },
@@ -959,9 +914,9 @@
           "sender": ["f9869252c305", "859f9a1daf06"],
           "payloads": ["95b1f2f379aa", "06a94a810e5f"],
           "settlements": {
-            "create": "3d869a96636a"
+            "create": "a380c262a9cb"
           },
-          "state": "3a952f7d5dc7",
+          "state": "f87f9230df87",
           "effects": []
         }
       },
diff --git a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.create-1.json b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.create-1.json
index ff6d2dceb5f..7bd736a58ed 100644
--- a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.create-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.create-1.json
@@ -13,33 +13,6 @@
   "projectionVersion": 2,
   "goldenFormatVersion": 5,
   "values": {
-    "000efa3053f3": {
-      "outcome": {
-        "committed": true,
-        "error": "Cannot read properties of null (reading 'ok')",
-        "ok": false,
-        "status": {
-          "branch": "feature",
-          "conflictOperation": "unknown",
-          "entries": [],
-          "head": "def5678",
-          "upstreamStatus": {
-            "ahead": 0,
-            "behind": 0,
-            "behindCommitsArePatchEquivalent": {
-              "$rpc": "undefined"
-            },
-            "hasConfiguredPushTarget": {
-              "$rpc": "undefined"
-            },
-            "hasUpstream": true,
-            "upstreamName": {
-              "$rpc": "undefined"
-            }
-          }
-        }
-      }
-    },
     "0215b92c4449": {
       "outcome": {
         "committed": true,
@@ -504,38 +477,6 @@
         }
       }
     },
-    "4a4639fa3798": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "committed": true,
-        "error": {
-          "message": "inner refused"
-        },
-        "ok": false,
-        "status": {
-          "branch": "feature",
-          "conflictOperation": "unknown",
-          "entries": [],
-          "head": "def5678",
-          "upstreamStatus": {
-            "ahead": 0,
-            "behind": 0,
-            "behindCommitsArePatchEquivalent": {
-              "$rpc": "undefined"
-            },
-            "hasConfiguredPushTarget": {
-              "$rpc": "undefined"
-            },
-            "hasUpstream": true,
-            "upstreamName": {
-              "$rpc": "undefined"
-            }
-          }
-        }
-      }
-    },
     "4b12390e509a": {
       "name": "hostedReview.create#1",
       "args": [
@@ -657,6 +598,33 @@
       "name": "git.status#1",
       "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"git.status\",\"params\":{\"worktree\":\"id:repo42::/p\"}}"
     },
+    "620ca79ead87": {
+      "outcome": {
+        "committed": true,
+        "error": "incompatible_reply: hostedReview.create (hostedReview.create)",
+        "ok": false,
+        "status": {
+          "branch": "feature",
+          "conflictOperation": "unknown",
+          "entries": [],
+          "head": "def5678",
+          "upstreamStatus": {
+            "ahead": 0,
+            "behind": 0,
+            "behindCommitsArePatchEquivalent": {
+              "$rpc": "undefined"
+            },
+            "hasConfiguredPushTarget": {
+              "$rpc": "undefined"
+            },
+            "hasUpstream": true,
+            "upstreamName": {
+              "$rpc": "undefined"
+            }
+          }
+        }
+      }
+    },
     "658bb4ca2398": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -728,33 +696,6 @@
         }
       }
     },
-    "6d9570b41a8b": {
-      "outcome": {
-        "committed": true,
-        "error": "Cannot read properties of undefined (reading 'ok')",
-        "ok": false,
-        "status": {
-          "branch": "feature",
-          "conflictOperation": "unknown",
-          "entries": [],
-          "head": "def5678",
-          "upstreamStatus": {
-            "ahead": 0,
-            "behind": 0,
-            "behindCommitsArePatchEquivalent": {
-              "$rpc": "undefined"
-            },
-            "hasConfiguredPushTarget": {
-              "$rpc": "undefined"
-            },
-            "hasUpstream": true,
-            "upstreamName": {
-              "$rpc": "undefined"
-            }
-          }
-        }
-      }
-    },
     "6df8e4961ee3": {
       "name": "git.generateCommitMessage#1",
       "args": [
@@ -1371,13 +1312,13 @@
         }
       }
     },
-    "b2814f99b696": {
+    "b0c6e557c96f": {
       "status": "fulfilled",
       "startedAt": 0,
       "settledAt": 0,
       "value": {
         "committed": true,
-        "error": "refused",
+        "error": "incompatible_reply: hostedReview.create (hostedReview.create)",
         "ok": false,
         "status": {
           "branch": "feature",
@@ -1533,35 +1474,6 @@
         }
       }
     },
-    "c955a0980eb4": {
-      "outcome": {
-        "committed": true,
-        "error": {
-          "message": "inner refused"
-        },
-        "ok": false,
-        "status": {
-          "branch": "feature",
-          "conflictOperation": "unknown",
-          "entries": [],
-          "head": "def5678",
-          "upstreamStatus": {
-            "ahead": 0,
-            "behind": 0,
-            "behindCommitsArePatchEquivalent": {
-              "$rpc": "undefined"
-            },
-            "hasConfiguredPushTarget": {
-              "$rpc": "undefined"
-            },
-            "hasUpstream": true,
-            "upstreamName": {
-              "$rpc": "undefined"
-            }
-          }
-        }
-      }
-    },
     "c997e6a2a82a": {
       "name": "hostedReview.getCreationEligibility#1",
       "json": "{\"id\":\"frame-7\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.getCreationEligibility\",\"params\":{\"repo\":\"id:repo42\",\"worktree\":\"id:repo42::/p\",\"branch\":\"feature\",\"base\":null,\"hasUncommittedChanges\":false,\"hasUpstream\":true,\"ahead\":1,\"behind\":0,\"linkedGitHubPR\":null,\"linkedGitLabMR\":null}}"
@@ -1744,33 +1656,6 @@
         "startedAt": 0
       }
     },
-    "e19dc901cb36": {
-      "outcome": {
-        "committed": true,
-        "error": "refused",
-        "ok": false,
-        "status": {
-          "branch": "feature",
-          "conflictOperation": "unknown",
-          "entries": [],
-          "head": "def5678",
-          "upstreamStatus": {
-            "ahead": 0,
-            "behind": 0,
-            "behindCommitsArePatchEquivalent": {
-              "$rpc": "undefined"
-            },
-            "hasConfiguredPushTarget": {
-              "$rpc": "undefined"
-            },
-            "hasUpstream": true,
-            "upstreamName": {
-              "$rpc": "undefined"
-            }
-          }
-        }
-      }
-    },
     "e6d858bcb05d": {
       "outcome": {
         "committed": true,
@@ -1801,66 +1686,6 @@
     "eab004af0939": {
       "name": "hostedReview.getCreationEligibility#2",
       "json": "{\"id\":\"frame-10\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.getCreationEligibility\",\"params\":{\"repo\":\"id:repo42\",\"worktree\":\"id:repo42::/p\",\"branch\":\"feature\",\"base\":null,\"hasUncommittedChanges\":false,\"hasUpstream\":true,\"ahead\":0,\"behind\":0,\"linkedGitHubPR\":null,\"linkedGitLabMR\":null}}"
-    },
-    "f2d31538d6f8": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "committed": true,
-        "error": "Cannot read properties of undefined (reading 'ok')",
-        "ok": false,
-        "status": {
-          "branch": "feature",
-          "conflictOperation": "unknown",
-          "entries": [],
-          "head": "def5678",
-          "upstreamStatus": {
-            "ahead": 0,
-            "behind": 0,
-            "behindCommitsArePatchEquivalent": {
-              "$rpc": "undefined"
-            },
-            "hasConfiguredPushTarget": {
-              "$rpc": "undefined"
-            },
-            "hasUpstream": true,
-            "upstreamName": {
-              "$rpc": "undefined"
-            }
-          }
-        }
-      }
-    },
-    "f7a1885f58b2": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "committed": true,
-        "error": "Cannot read properties of null (reading 'ok')",
-        "ok": false,
-        "status": {
-          "branch": "feature",
-          "conflictOperation": "unknown",
-          "entries": [],
-          "head": "def5678",
-          "upstreamStatus": {
-            "ahead": 0,
-            "behind": 0,
-            "behindCommitsArePatchEquivalent": {
-              "$rpc": "undefined"
-            },
-            "hasConfiguredPushTarget": {
-              "$rpc": "undefined"
-            },
-            "hasUpstream": true,
-            "upstreamName": {
-              "$rpc": "undefined"
-            }
-          }
-        }
-      }
     }
   },
   "recording": {
@@ -2100,9 +1925,9 @@
             "0a191e58baef"
           ],
           "settlements": {
-            "run": "f2d31538d6f8"
+            "run": "b0c6e557c96f"
           },
-          "state": "6d9570b41a8b",
+          "state": "620ca79ead87",
           "effects": [
             "3a3a688f828b",
             "0b80f2766914",
@@ -2142,9 +1967,9 @@
             "0a191e58baef"
           ],
           "settlements": {
-            "run": "f7a1885f58b2"
+            "run": "b0c6e557c96f"
           },
-          "state": "000efa3053f3",
+          "state": "620ca79ead87",
           "effects": [
             "3a3a688f828b",
             "0b80f2766914",
@@ -2184,9 +2009,9 @@
             "0a191e58baef"
           ],
           "settlements": {
-            "run": "b2814f99b696"
+            "run": "b0c6e557c96f"
           },
-          "state": "e19dc901cb36",
+          "state": "620ca79ead87",
           "effects": [
             "3a3a688f828b",
             "0b80f2766914",
@@ -2268,9 +2093,9 @@
             "0a191e58baef"
           ],
           "settlements": {
-            "run": "4a4639fa3798"
+            "run": "b0c6e557c96f"
           },
-          "state": "c955a0980eb4",
+          "state": "620ca79ead87",
           "effects": [
             "3a3a688f828b",
             "0b80f2766914",
diff --git a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.getcreationeligibility-1.json b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.getcreationeligibility-1.json
index 11c301a7eaa..a4db355c28b 100644
--- a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.getcreationeligibility-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.getcreationeligibility-1.json
@@ -823,36 +823,6 @@
       "name": "git.status#2",
       "json": "{\"id\":\"frame-3\",\"deviceToken\":\"recording-device\",\"method\":\"git.status\",\"params\":{\"worktree\":\"id:repo42::/p\"}}"
     },
-    "83e80c98d259": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "committed": true,
-        "error": "Orca could not confirm whether this branch already has a pull request. Try again in a moment.",
-        "ok": false,
-        "status": {
-          "branch": "feature",
-          "conflictOperation": "unknown",
-          "entries": [],
-          "head": "def5678",
-          "upstreamStatus": {
-            "ahead": 1,
-            "behind": 0,
-            "behindCommitsArePatchEquivalent": {
-              "$rpc": "undefined"
-            },
-            "hasConfiguredPushTarget": {
-              "$rpc": "undefined"
-            },
-            "hasUpstream": true,
-            "upstreamName": {
-              "$rpc": "undefined"
-            }
-          }
-        }
-      }
-    },
     "8b784bb9dff5": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -1285,33 +1255,6 @@
       "name": "hostedReview.getCreationEligibility#1",
       "json": "{\"id\":\"frame-7\",\"deviceToken\":\"recording-device\",\"method\":\"hostedReview.getCreationEligibility\",\"params\":{\"repo\":\"id:repo42\",\"worktree\":\"id:repo42::/p\",\"branch\":\"feature\",\"base\":null,\"hasUncommittedChanges\":false,\"hasUpstream\":true,\"ahead\":1,\"behind\":0,\"linkedGitHubPR\":null,\"linkedGitLabMR\":null}}"
     },
-    "dd5d9b4070b7": {
-      "outcome": {
-        "committed": true,
-        "error": "Orca could not confirm whether this branch already has a pull request. Try again in a moment.",
-        "ok": false,
-        "status": {
-          "branch": "feature",
-          "conflictOperation": "unknown",
-          "entries": [],
-          "head": "def5678",
-          "upstreamStatus": {
-            "ahead": 1,
-            "behind": 0,
-            "behindCommitsArePatchEquivalent": {
-              "$rpc": "undefined"
-            },
-            "hasConfiguredPushTarget": {
-              "$rpc": "undefined"
-            },
-            "hasUpstream": true,
-            "upstreamName": {
-              "$rpc": "undefined"
-            }
-          }
-        }
-      }
-    },
     "de647ad73f93": {
       "name": "hostedReview.getCreationEligibility#1",
       "args": [
@@ -1880,9 +1823,9 @@
             "c997e6a2a82a"
           ],
           "settlements": {
-            "run": "83e80c98d259"
+            "run": "e6f94c399ee4"
           },
-          "state": "dd5d9b4070b7",
+          "state": "1bfbb544c337",
           "effects": ["3a3a688f828b", "0b80f2766914", "7349acf3d5b8"]
         }
       },
@@ -1908,9 +1851,9 @@
             "c997e6a2a82a"
           ],
           "settlements": {
-            "run": "83e80c98d259"
+            "run": "e6f94c399ee4"
           },
-          "state": "dd5d9b4070b7",
+          "state": "1bfbb544c337",
           "effects": ["3a3a688f828b", "0b80f2766914", "7349acf3d5b8"]
         }
       },
@@ -1936,9 +1879,9 @@
             "c997e6a2a82a"
           ],
           "settlements": {
-            "run": "83e80c98d259"
+            "run": "e6f94c399ee4"
           },
-          "state": "dd5d9b4070b7",
+          "state": "1bfbb544c337",
           "effects": ["3a3a688f828b", "0b80f2766914", "7349acf3d5b8"]
         }
       },
@@ -1964,9 +1907,9 @@
             "c997e6a2a82a"
           ],
           "settlements": {
-            "run": "83e80c98d259"
+            "run": "e6f94c399ee4"
           },
-          "state": "dd5d9b4070b7",
+          "state": "1bfbb544c337",
           "effects": ["3a3a688f828b", "0b80f2766914", "7349acf3d5b8"]
         }
       },
@@ -1992,9 +1935,9 @@
             "c997e6a2a82a"
           ],
           "settlements": {
-            "run": "83e80c98d259"
+            "run": "e6f94c399ee4"
           },
-          "state": "dd5d9b4070b7",
+          "state": "1bfbb544c337",
           "effects": ["3a3a688f828b", "0b80f2766914", "7349acf3d5b8"]
         }
       },
@@ -2020,9 +1963,9 @@
             "c997e6a2a82a"
           ],
           "settlements": {
-            "run": "83e80c98d259"
+            "run": "e6f94c399ee4"
           },
-          "state": "dd5d9b4070b7",
+          "state": "1bfbb544c337",
           "effects": ["3a3a688f828b", "0b80f2766914", "7349acf3d5b8"]
         }
       },
@@ -2048,9 +1991,9 @@
             "c997e6a2a82a"
           ],
           "settlements": {
-            "run": "83e80c98d259"
+            "run": "e6f94c399ee4"
           },
-          "state": "dd5d9b4070b7",
+          "state": "1bfbb544c337",
           "effects": ["3a3a688f828b", "0b80f2766914", "7349acf3d5b8"]
         }
       },
@@ -2076,9 +2019,9 @@
             "c997e6a2a82a"
           ],
           "settlements": {
-            "run": "83e80c98d259"
+            "run": "e6f94c399ee4"
           },
-          "state": "dd5d9b4070b7",
+          "state": "1bfbb544c337",
           "effects": ["3a3a688f828b", "0b80f2766914", "7349acf3d5b8"]
         }
       },
@@ -2104,9 +2047,9 @@
             "c997e6a2a82a"
           ],
           "settlements": {
-            "run": "83e80c98d259"
+            "run": "e6f94c399ee4"
           },
-          "state": "dd5d9b4070b7",
+          "state": "1bfbb544c337",
           "effects": ["3a3a688f828b", "0b80f2766914", "7349acf3d5b8"]
         }
       },
diff --git a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.getcreationeligibility-2.json b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.getcreationeligibility-2.json
index ca1f9dd78fd..ae9f8513112 100644
--- a/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.getcreationeligibility-2.json
+++ b/mobile/rpc-foundation/goldens/matrix-hostedreview.create-intent-hostedreview.getcreationeligibility-2.json
@@ -657,33 +657,6 @@
         }
       }
     },
-    "5a0d2dca259b": {
-      "outcome": {
-        "committed": true,
-        "error": "Orca could not confirm whether this branch already has a pull request. Try again in a moment.",
-        "ok": false,
-        "status": {
-          "branch": "feature",
-          "conflictOperation": "unknown",
-          "entries": [],
-          "head": "def5678",
-          "upstreamStatus": {
-            "ahead": 0,
-            "behind": 0,
-            "behindCommitsArePatchEquivalent": {
-              "$rpc": "undefined"
-            },
-            "hasConfiguredPushTarget": {
-              "$rpc": "undefined"
-            },
-            "hasUpstream": true,
-            "upstreamName": {
-              "$rpc": "undefined"
-            }
-          }
-        }
-      }
-    },
     "5b46f52533a0": {
       "name": "hostedReview.create#1",
       "args": [
@@ -1224,36 +1197,6 @@
       "value": "creating_review",
       "sent": 10
     },
-    "bf0e050653a2": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "committed": true,
-        "error": "Orca could not confirm whether this branch already has a pull request. Try again in a moment.",
-        "ok": false,
-        "status": {
-          "branch": "feature",
-          "conflictOperation": "unknown",
-          "entries": [],
-          "head": "def5678",
-          "upstreamStatus": {
-            "ahead": 0,
-            "behind": 0,
-            "behindCommitsArePatchEquivalent": {
-              "$rpc": "undefined"
-            },
-            "hasConfiguredPushTarget": {
-              "$rpc": "undefined"
-            },
-            "hasUpstream": true,
-            "upstreamName": {
-              "$rpc": "undefined"
-            }
-          }
-        }
-      }
-    },
     "c444aeacec59": {
       "name": "git.status#3",
       "json": "{\"id\":\"frame-6\",\"deviceToken\":\"recording-device\",\"method\":\"git.status\",\"params\":{\"worktree\":\"id:repo42::/p\"}}"
@@ -1854,9 +1797,9 @@
             "eab004af0939"
           ],
           "settlements": {
-            "run": "bf0e050653a2"
+            "run": "3baf33626add"
           },
-          "state": "5a0d2dca259b",
+          "state": "6bdfb4167cc6",
           "effects": ["3a3a688f828b", "0b80f2766914", "7349acf3d5b8", "0d7681dfb908"]
         }
       },
@@ -1888,9 +1831,9 @@
             "eab004af0939"
           ],
           "settlements": {
-            "run": "bf0e050653a2"
+            "run": "3baf33626add"
           },
-          "state": "5a0d2dca259b",
+          "state": "6bdfb4167cc6",
           "effects": ["3a3a688f828b", "0b80f2766914", "7349acf3d5b8", "0d7681dfb908"]
         }
       },
@@ -1922,9 +1865,9 @@
             "eab004af0939"
           ],
           "settlements": {
-            "run": "bf0e050653a2"
+            "run": "3baf33626add"
           },
-          "state": "5a0d2dca259b",
+          "state": "6bdfb4167cc6",
           "effects": ["3a3a688f828b", "0b80f2766914", "7349acf3d5b8", "0d7681dfb908"]
         }
       },
@@ -1956,9 +1899,9 @@
             "eab004af0939"
           ],
           "settlements": {
-            "run": "bf0e050653a2"
+            "run": "3baf33626add"
           },
-          "state": "5a0d2dca259b",
+          "state": "6bdfb4167cc6",
           "effects": ["3a3a688f828b", "0b80f2766914", "7349acf3d5b8", "0d7681dfb908"]
         }
       },
@@ -1990,9 +1933,9 @@
             "eab004af0939"
           ],
           "settlements": {
-            "run": "bf0e050653a2"
+            "run": "3baf33626add"
           },
-          "state": "5a0d2dca259b",
+          "state": "6bdfb4167cc6",
           "effects": ["3a3a688f828b", "0b80f2766914", "7349acf3d5b8", "0d7681dfb908"]
         }
       },
@@ -2024,9 +1967,9 @@
             "eab004af0939"
           ],
           "settlements": {
-            "run": "bf0e050653a2"
+            "run": "3baf33626add"
           },
-          "state": "5a0d2dca259b",
+          "state": "6bdfb4167cc6",
           "effects": ["3a3a688f828b", "0b80f2766914", "7349acf3d5b8", "0d7681dfb908"]
         }
       },
diff --git a/mobile/rpc-foundation/goldens/matrix-hostedreview.eligibility-hostedreview.getcreationeligibility-1.json b/mobile/rpc-foundation/goldens/matrix-hostedreview.eligibility-hostedreview.getcreationeligibility-1.json
index 0f6521987e7..9881d4fe328 100644
--- a/mobile/rpc-foundation/goldens/matrix-hostedreview.eligibility-hostedreview.getcreationeligibility-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-hostedreview.eligibility-hostedreview.getcreationeligibility-1.json
@@ -224,12 +224,14 @@
       },
       "prefill": "unresolved"
     },
-    "301151228fa3": {
-      "status": "fulfilled",
+    "3ae28402dc87": {
+      "status": "rejected",
       "startedAt": 0,
       "settledAt": 0,
-      "value": {
-        "error": "refused"
+      "error": {
+        "category": "RpcIncompatibleReplyError",
+        "message": "incompatible_reply: hostedReview.creation-eligibility-or-skip (hostedReview.getCreationEligibility)",
+        "isRpcDeliveryUnknown": false
       }
     },
     "485a0942bda3": {
@@ -242,13 +244,6 @@
       },
       "prefill": "unresolved"
     },
-    "5f12cd4867ce": {
-      "eligibility": {
-        "error": "inner refused",
-        "ok": false
-      },
-      "prefill": "unresolved"
-    },
     "6506a6ec7ac3": {
       "name": "hostedReview.getCreationEligibility#1",
       "args": [
@@ -381,12 +376,6 @@
         }
       }
     },
-    "7bf63f31c702": {
-      "eligibility": {
-        "$rpc": "undefined"
-      },
-      "prefill": "unresolved"
-    },
     "7fb1231fd64d": {
       "name": "hostedReview.getCreationEligibility#1",
       "args": [
@@ -429,15 +418,6 @@
         }
       }
     },
-    "87a2ebdbec89": {
-      "eligibility": {
-        "error": {
-          "message": "inner refused"
-        },
-        "ok": false
-      },
-      "prefill": "unresolved"
-    },
     "899a024357b9": {
       "name": "hostedReview.getCreationEligibility#1",
       "args": [
@@ -541,15 +521,6 @@
       "status": "pending",
       "startedAt": 0
     },
-    "9f00dd54ba64": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "error": "inner refused",
-        "ok": false
-      }
-    },
     "a947768bc0ed": {
       "status": "rejected",
       "startedAt": 0,
@@ -560,23 +531,6 @@
         "isRpcDeliveryUnknown": true
       }
     },
-    "ad8a954e879d": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "error": {
-          "message": "inner refused"
-        },
-        "ok": false
-      }
-    },
-    "b925156655c6": {
-      "eligibility": {
-        "error": "refused"
-      },
-      "prefill": "unresolved"
-    },
     "c7584e82c72f": {
       "status": "rejected",
       "startedAt": 0,
@@ -627,14 +581,6 @@
         "startedAt": 0
       }
     },
-    "eb79a9b3682a": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "$rpc": "undefined"
-      }
-    },
     "ee20a1dc39e7": {
       "status": "fulfilled",
       "startedAt": 0,
@@ -724,9 +670,9 @@
           "sender": ["099a55e691ed"],
           "payloads": ["cc09b6142ccb"],
           "settlements": {
-            "fetch": "eb79a9b3682a"
+            "fetch": "3ae28402dc87"
           },
-          "state": "7bf63f31c702",
+          "state": "485a0942bda3",
           "effects": []
         }
       },
@@ -736,9 +682,9 @@
           "sender": ["1c4e890f9aaf"],
           "payloads": ["cc09b6142ccb"],
           "settlements": {
-            "fetch": "ee20a1dc39e7"
+            "fetch": "3ae28402dc87"
           },
-          "state": "4dfe4f2ad75c",
+          "state": "485a0942bda3",
           "effects": []
         }
       },
@@ -748,9 +694,9 @@
           "sender": ["8cef4aaa067c"],
           "payloads": ["cc09b6142ccb"],
           "settlements": {
-            "fetch": "301151228fa3"
+            "fetch": "3ae28402dc87"
           },
-          "state": "b925156655c6",
+          "state": "485a0942bda3",
           "effects": []
         }
       },
@@ -760,9 +706,9 @@
           "sender": ["6c52d90237b7"],
           "payloads": ["cc09b6142ccb"],
           "settlements": {
-            "fetch": "9f00dd54ba64"
+            "fetch": "3ae28402dc87"
           },
-          "state": "5f12cd4867ce",
+          "state": "485a0942bda3",
           "effects": []
         }
       },
@@ -772,9 +718,9 @@
           "sender": ["fed21873c57f"],
           "payloads": ["cc09b6142ccb"],
           "settlements": {
-            "fetch": "ad8a954e879d"
+            "fetch": "3ae28402dc87"
           },
-          "state": "87a2ebdbec89",
+          "state": "485a0942bda3",
           "effects": []
         }
       },