diff --git a/mobile/rpc-foundation/goldens/matrix-session.startup-worktree.activate-1.json b/mobile/rpc-foundation/goldens/matrix-session.startup-worktree.activate-1.json
index 0276396db60..6d9cc9b62f5 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.startup-worktree.activate-1.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.startup-worktree.activate-1.json
@@ -4,6 +4,11 @@
   "family": "session.startup",
   "namedDeltas": [],
   "values": {
+    "04cec5da2df1": {
+      "name": "clear-delayed-action-timers",
+      "ordinal": 22,
+      "value": {}
+    },
     "04f9f79493f1": {
       "name": "fetch-terminals",
       "ordinal": 13,
@@ -47,33 +52,14 @@
         }
       }
     },
-    "0fa12ed6e56f": {
-      "name": "ensure-session-tabs",
-      "ordinal": 20,
-      "value": {}
-    },
-    "10d2eaddd748": {
-      "name": "clear-pending-live-input-commit",
-      "ordinal": 26,
-      "value": {}
-    },
-    "139fb501de9f": {
-      "name": "fetch-terminals",
-      "ordinal": 25,
+    "1c425a4c02bb": {
+      "name": "toast",
+      "ordinal": 18,
       "value": {
-        "allowEmptyLoaded": true
+        "durationMs": 3000,
+        "message": "Open Orca on the host to wake sleeping agents."
       }
     },
-    "14cc324e5867": {
-      "name": "ensure-session-tabs",
-      "ordinal": 21,
-      "value": {}
-    },
-    "1ac55581a0b6": {
-      "name": "clear-delayed-action-timers",
-      "ordinal": 27,
-      "value": {}
-    },
     "1dc36306d55b": {
       "name": "worktree.activate#1",
       "ordinal": 9,
@@ -108,18 +94,13 @@
         }
       }
     },
-    "1e39202de11e": {
-      "name": "clear-pending-live-input-commit",
-      "ordinal": 18,
-      "value": {}
+    "1dca7912e0fe": {
+      "name": "worktree.activate#2",
+      "ordinal": 15,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.activate\",\"params\":{\"worktree\":\"id:wt-1\",\"notifyClients\":false,\"navigation\":\"caller\"}}"
     },
-    "2532b032374f": {
-      "name": "clear-delayed-action-timers",
-      "ordinal": 28,
-      "value": {}
-    },
-    "2fb68a322aaa": {
-      "name": "clear-terminal-cache",
+    "30f5e556f9c1": {
+      "name": "ensure-session-tabs",
       "ordinal": 15,
       "value": {}
     },
@@ -136,32 +117,11 @@
       "ordinal": 5,
       "value": {}
     },
-    "3dccd1e0bdab": {
-      "name": "worktree.activate#2",
-      "ordinal": 19,
-      "args": [
-        {
-          "name": "method",
-          "value": "worktree.activate"
-        },
-        {
-          "name": "params",
-          "value": {
-            "navigation": "caller",
-            "notifyClients": false,
-            "worktree": "id:wt-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 2550
+    "39ed117c65f2": {
+      "name": "fetch-terminals",
+      "ordinal": 17,
+      "value": {
+        "allowEmptyLoaded": false
       }
     },
     "3eb6c5c71f4d": {
@@ -208,6 +168,42 @@
         "allowEmptyLoaded": false
       }
     },
+    "4e82c0d6a331": {
+      "name": "worktree.activate#2",
+      "ordinal": 14,
+      "args": [
+        {
+          "name": "method",
+          "value": "worktree.activate"
+        },
+        {
+          "name": "params",
+          "value": {
+            "navigation": "caller",
+            "notifyClients": false,
+            "worktree": "id:wt-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 2550,
+        "settledAt": 2550,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "sleepingAgentWake": "unsupported-headless"
+          }
+        }
+      }
+    },
     "51ae204eb34b": {
       "status": "fulfilled",
       "startedAt": 2550,
@@ -252,14 +248,17 @@
         }
       }
     },
-    "5543ee241dbb": {
-      "name": "clear-pending-live-input-commit",
-      "ordinal": 27,
-      "value": {}
+    "5a31de3465c1": {
+      "name": "toast",
+      "ordinal": 17,
+      "value": {
+        "durationMs": 3000,
+        "message": "Open Orca on the host to wake sleeping agents."
+      }
     },
-    "5b9abe0c7d97": {
+    "629aee3fec6c": {
       "name": "worktree.activate#2",
-      "ordinal": 21,
+      "ordinal": 16,
       "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.activate\",\"params\":{\"worktree\":\"id:wt-1\",\"notifyClients\":false,\"navigation\":\"caller\"}}"
     },
     "6419a011f13b": {
@@ -267,11 +266,6 @@
       "ordinal": 1,
       "value": {}
     },
-    "650e3aedd38c": {
-      "name": "clear-pending-live-input-commit",
-      "ordinal": 17,
-      "value": {}
-    },
     "6ccf19951eca": {
       "name": "worktree.activate#1",
       "ordinal": 9,
@@ -339,16 +333,6 @@
         }
       }
     },
-    "70715317cc92": {
-      "name": "diagnostics-reset-route",
-      "ordinal": 17,
-      "value": {}
-    },
-    "791c598994de": {
-      "name": "clear-delayed-action-timers",
-      "ordinal": 19,
-      "value": {}
-    },
     "7953dfb08a13": {
       "name": "fetch-terminals",
       "ordinal": 8,
@@ -356,16 +340,62 @@
         "allowEmptyLoaded": true
       }
     },
-    "8144489ae5a9": {
-      "name": "diagnostics-reset-route",
-      "ordinal": 16,
-      "value": {}
-    },
     "817acfcc1646": {
       "name": "clear-delayed-action-timers",
       "ordinal": 12,
       "value": {}
     },
+    "84c0839eccca": {
+      "name": "fetch-terminals",
+      "ordinal": 20,
+      "value": {
+        "allowEmptyLoaded": true
+      }
+    },
+    "854cb236952a": {
+      "actionSheetRequestSeq": 1,
+      "activeHandle": {
+        "$rpc": "null"
+      },
+      "appliedSnapshotMarker": {
+        "epoch": {
+          "$rpc": "null"
+        },
+        "version": -1
+      },
+      "closedTabTombstones": 0,
+      "initializedHandles": [],
+      "sessionTabs": [],
+      "terminalsLoaded": false
+    },
+    "8ac1a3109c04": {
+      "name": "worktree.activate#2",
+      "ordinal": 14,
+      "args": [
+        {
+          "name": "method",
+          "value": "worktree.activate"
+        },
+        {
+          "name": "params",
+          "value": {
+            "navigation": "caller",
+            "notifyClients": false,
+            "worktree": "id:wt-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 2550
+      }
+    },
     "8d7e5d1a39ca": {
       "name": "worktree.activate#1",
       "ordinal": 9,
@@ -403,41 +433,10 @@
         }
       }
     },
-    "92e7422b7481": {
-      "name": "worktree.activate#2",
+    "91a08e4c9723": {
+      "name": "clear-pending-live-input-commit",
       "ordinal": 20,
-      "args": [
-        {
-          "name": "method",
-          "value": "worktree.activate"
-        },
-        {
-          "name": "params",
-          "value": {
-            "navigation": "caller",
-            "notifyClients": false,
-            "worktree": "id:wt-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 2550,
-        "settledAt": 2550,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "sleepingAgentWake": "unsupported-headless"
-          }
-        }
-      }
+      "value": {}
     },
     "9440e16e975c": {
       "name": "worktree.activate#1",
@@ -511,6 +510,18 @@
       "ordinal": 4,
       "value": {}
     },
+    "98136c40e776": {
+      "name": "fetch-terminals",
+      "ordinal": 18,
+      "value": {
+        "allowEmptyLoaded": false
+      }
+    },
+    "98a0728539f1": {
+      "name": "ensure-session-tabs",
+      "ordinal": 14,
+      "value": {}
+    },
     "9a7554993438": {
       "name": "worktree.activate#1",
       "ordinal": 9,
@@ -562,16 +573,9 @@
         "allowEmptyLoaded": true
       }
     },
-    "a5cccb82aa18": {
-      "name": "fetch-terminals",
-      "ordinal": 24,
-      "value": {
-        "allowEmptyLoaded": false
-      }
-    },
-    "a64fb4d065f5": {
+    "a81c5cfd8561": {
       "name": "worktree.activate#2",
-      "ordinal": 20,
+      "ordinal": 13,
       "args": [
         {
           "name": "method",
@@ -593,54 +597,23 @@
         }
       ],
       "settlement": {
-        "status": "pending",
-        "startedAt": 2550
+        "status": "fulfilled",
+        "startedAt": 2550,
+        "settledAt": 2550,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "sleepingAgentWake": "unsupported-headless"
+          }
+        }
       }
     },
-    "a7a4537b3b5c": {
-      "name": "worktree.activate#2",
-      "ordinal": 22,
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.activate\",\"params\":{\"worktree\":\"id:wt-1\",\"notifyClients\":false,\"navigation\":\"caller\"}}"
-    },
     "aab012c297bd": {
       "name": "diagnostics-reset-route",
       "ordinal": 2,
       "value": {}
     },
-    "acf0370bfacc": {
-      "actionSheetRequestSeq": 1,
-      "activeHandle": {
-        "$rpc": "null"
-      },
-      "appliedSnapshotMarker": {
-        "epoch": {
-          "$rpc": "null"
-        },
-        "version": -1
-      },
-      "closedTabTombstones": 0,
-      "initializedHandles": [],
-      "terminalsLoaded": false
-    },
-    "ad31ee4e38f7": {
-      "name": "fetch-terminals",
-      "ordinal": 23,
-      "value": {
-        "allowEmptyLoaded": false
-      }
-    },
-    "b86ad4df402e": {
-      "name": "clear-delayed-action-timers",
-      "ordinal": 18,
-      "value": {}
-    },
-    "c03aaed85eb1": {
-      "name": "fetch-terminals",
-      "ordinal": 25,
-      "value": {
-        "allowEmptyLoaded": false
-      }
-    },
     "c59295cf1c69": {
       "name": "worktree.activate#1",
       "ordinal": 10,
@@ -683,79 +656,6 @@
         }
       }
     },
-    "d000b4c837b7": {
-      "name": "clear-pending-live-input-commit",
-      "ordinal": 13,
-      "value": {}
-    },
-    "d002ac5f4bf4": {
-      "name": "clear-terminal-cache",
-      "ordinal": 16,
-      "value": {}
-    },
-    "d2a0170e903b": {
-      "name": "toast",
-      "ordinal": 24,
-      "value": {
-        "durationMs": 3000,
-        "message": "Open Orca on the host to wake sleeping agents."
-      }
-    },
-    "d4bedafff7b3": {
-      "name": "clear-pending-live-input-commit",
-      "ordinal": 14,
-      "value": {}
-    },
-    "d5099139e4c2": {
-      "name": "fetch-terminals",
-      "ordinal": 26,
-      "value": {
-        "allowEmptyLoaded": true
-      }
-    },
-    "d8111b1f5ee4": {
-      "name": "worktree.activate#2",
-      "ordinal": 19,
-      "args": [
-        {
-          "name": "method",
-          "value": "worktree.activate"
-        },
-        {
-          "name": "params",
-          "value": {
-            "navigation": "caller",
-            "notifyClients": false,
-            "worktree": "id:wt-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 2550,
-        "settledAt": 2550,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "sleepingAgentWake": "unsupported-headless"
-          }
-        }
-      }
-    },
-    "da5b4754e480": {
-      "name": "fetch-terminals",
-      "ordinal": 22,
-      "value": {
-        "allowEmptyLoaded": false
-      }
-    },
     "da6deb44ce71": {
       "name": "fetch-terminals",
       "ordinal": 12,
@@ -763,6 +663,13 @@
         "allowEmptyLoaded": true
       }
     },
+    "dc4910b3e253": {
+      "name": "fetch-terminals",
+      "ordinal": 16,
+      "value": {
+        "allowEmptyLoaded": false
+      }
+    },
     "dd5d1677b700": {
       "name": "worktree.activate#1",
       "ordinal": 9,
@@ -797,6 +704,39 @@
         }
       }
     },
+    "dd8ef9816fe4": {
+      "name": "worktree.activate#2",
+      "ordinal": 13,
+      "args": [
+        {
+          "name": "method",
+          "value": "worktree.activate"
+        },
+        {
+          "name": "params",
+          "value": {
+            "navigation": "caller",
+            "notifyClients": false,
+            "worktree": "id:wt-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 2550
+      }
+    },
+    "debef2539fa3": {
+      "name": "clear-delayed-action-timers",
+      "ordinal": 21,
+      "value": {}
+    },
     "defd9bef9981": {
       "name": "worktree.activate#1",
       "ordinal": 9,
@@ -833,21 +773,6 @@
         }
       }
     },
-    "e2a7de11a524": {
-      "actionSheetRequestSeq": 3,
-      "activeHandle": {
-        "$rpc": "null"
-      },
-      "appliedSnapshotMarker": {
-        "epoch": {
-          "$rpc": "null"
-        },
-        "version": -1
-      },
-      "closedTabTombstones": 0,
-      "initializedHandles": [],
-      "terminalsLoaded": false
-    },
     "e927128e41fc": {
       "name": "clear-pending-live-input-commit",
       "ordinal": 3,
@@ -861,28 +786,29 @@
         "$rpc": "undefined"
       }
     },
-    "ecd3c359932c": {
-      "name": "toast",
-      "ordinal": 23,
-      "value": {
-        "durationMs": 3000,
-        "message": "Open Orca on the host to wake sleeping agents."
-      }
-    },
     "ef975183a3b7": {
       "name": "clear-pending-live-input-commit",
       "ordinal": 11,
       "value": {}
     },
-    "f3cfad7c767c": {
-      "name": "clear-delayed-action-timers",
-      "ordinal": 15,
+    "f7e803082fc4": {
+      "name": "fetch-terminals",
+      "ordinal": 19,
+      "value": {
+        "allowEmptyLoaded": false
+      }
+    },
+    "f97fb55d23d2": {
+      "name": "clear-pending-live-input-commit",
+      "ordinal": 21,
       "value": {}
     },
-    "fde92e0a066b": {
-      "name": "clear-delayed-action-timers",
-      "ordinal": 14,
-      "value": {}
+    "fe2b23188be8": {
+      "name": "fetch-terminals",
+      "ordinal": 19,
+      "value": {
+        "allowEmptyLoaded": true
+      }
     }
   },
   "recording": {
@@ -896,7 +822,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -915,7 +841,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -936,7 +862,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -959,7 +885,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -982,7 +908,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1001,13 +927,13 @@
       {
         "id": "session-startup-both-activation-sites.normal:activating",
         "observation": {
-          "sender": ["defd9bef9981", "a64fb4d065f5"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "8ac1a3109c04"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1020,27 +946,21 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7"
+            "30f5e556f9c1",
+            "39ed117c65f2"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.normal:activated",
         "observation": {
-          "sender": ["defd9bef9981", "92e7422b7481"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "4e82c0d6a331"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1053,28 +973,22 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "d2a0170e903b"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "1c425a4c02bb"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.normal:reloaded",
         "observation": {
-          "sender": ["defd9bef9981", "92e7422b7481"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "4e82c0d6a331"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1087,30 +1001,24 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "d2a0170e903b",
-            "c03aaed85eb1",
-            "d5099139e4c2"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "1c425a4c02bb",
+            "f7e803082fc4",
+            "84c0839eccca"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.normal:cleanup",
         "observation": {
-          "sender": ["defd9bef9981", "92e7422b7481"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "4e82c0d6a331"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1123,19 +1031,13 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "d2a0170e903b",
-            "c03aaed85eb1",
-            "d5099139e4c2",
-            "5543ee241dbb",
-            "2532b032374f"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "1c425a4c02bb",
+            "f7e803082fc4",
+            "84c0839eccca",
+            "f97fb55d23d2",
+            "04cec5da2df1"
           ]
         }
       },
@@ -1147,7 +1049,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1169,7 +1071,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1187,13 +1089,13 @@
       {
         "id": "session-startup-both-activation-sites.result-absent:activating",
         "observation": {
-          "sender": ["6e1b6bed64f3", "3dccd1e0bdab"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["6e1b6bed64f3", "dd8ef9816fe4"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1205,27 +1107,21 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480"
+            "98a0728539f1",
+            "dc4910b3e253"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.result-absent:activated",
         "observation": {
-          "sender": ["6e1b6bed64f3", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["6e1b6bed64f3", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1237,28 +1133,22 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.result-absent:reloaded",
         "observation": {
-          "sender": ["6e1b6bed64f3", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["6e1b6bed64f3", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1270,30 +1160,24 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c",
-            "a5cccb82aa18",
-            "139fb501de9f"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1",
+            "98136c40e776",
+            "fe2b23188be8"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.result-absent:cleanup",
         "observation": {
-          "sender": ["6e1b6bed64f3", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["6e1b6bed64f3", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1305,19 +1189,13 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c",
-            "a5cccb82aa18",
-            "139fb501de9f",
-            "10d2eaddd748",
-            "1ac55581a0b6"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1",
+            "98136c40e776",
+            "fe2b23188be8",
+            "91a08e4c9723",
+            "debef2539fa3"
           ]
         }
       },
@@ -1329,7 +1207,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1351,7 +1229,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1369,13 +1247,13 @@
       {
         "id": "session-startup-both-activation-sites.result-null:activating",
         "observation": {
-          "sender": ["0cff72d1051a", "3dccd1e0bdab"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["0cff72d1051a", "dd8ef9816fe4"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1387,27 +1265,21 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480"
+            "98a0728539f1",
+            "dc4910b3e253"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.result-null:activated",
         "observation": {
-          "sender": ["0cff72d1051a", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["0cff72d1051a", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1419,28 +1291,22 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.result-null:reloaded",
         "observation": {
-          "sender": ["0cff72d1051a", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["0cff72d1051a", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1452,30 +1318,24 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c",
-            "a5cccb82aa18",
-            "139fb501de9f"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1",
+            "98136c40e776",
+            "fe2b23188be8"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.result-null:cleanup",
         "observation": {
-          "sender": ["0cff72d1051a", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["0cff72d1051a", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1487,19 +1347,13 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c",
-            "a5cccb82aa18",
-            "139fb501de9f",
-            "10d2eaddd748",
-            "1ac55581a0b6"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1",
+            "98136c40e776",
+            "fe2b23188be8",
+            "91a08e4c9723",
+            "debef2539fa3"
           ]
         }
       },
@@ -1511,7 +1365,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1533,7 +1387,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1551,13 +1405,13 @@
       {
         "id": "session-startup-both-activation-sites.inner-ok-missing:activating",
         "observation": {
-          "sender": ["530cf016ec24", "3dccd1e0bdab"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["530cf016ec24", "dd8ef9816fe4"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1569,27 +1423,21 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480"
+            "98a0728539f1",
+            "dc4910b3e253"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.inner-ok-missing:activated",
         "observation": {
-          "sender": ["530cf016ec24", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["530cf016ec24", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1601,28 +1449,22 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.inner-ok-missing:reloaded",
         "observation": {
-          "sender": ["530cf016ec24", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["530cf016ec24", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1634,30 +1476,24 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c",
-            "a5cccb82aa18",
-            "139fb501de9f"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1",
+            "98136c40e776",
+            "fe2b23188be8"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.inner-ok-missing:cleanup",
         "observation": {
-          "sender": ["530cf016ec24", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["530cf016ec24", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1669,19 +1505,13 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c",
-            "a5cccb82aa18",
-            "139fb501de9f",
-            "10d2eaddd748",
-            "1ac55581a0b6"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1",
+            "98136c40e776",
+            "fe2b23188be8",
+            "91a08e4c9723",
+            "debef2539fa3"
           ]
         }
       },
@@ -1693,7 +1523,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1715,7 +1545,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1733,13 +1563,13 @@
       {
         "id": "session-startup-both-activation-sites.inner-false-string-error:activating",
         "observation": {
-          "sender": ["8d7e5d1a39ca", "3dccd1e0bdab"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["8d7e5d1a39ca", "dd8ef9816fe4"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1751,27 +1581,21 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480"
+            "98a0728539f1",
+            "dc4910b3e253"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.inner-false-string-error:activated",
         "observation": {
-          "sender": ["8d7e5d1a39ca", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["8d7e5d1a39ca", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1783,28 +1607,22 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.inner-false-string-error:reloaded",
         "observation": {
-          "sender": ["8d7e5d1a39ca", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["8d7e5d1a39ca", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1816,30 +1634,24 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c",
-            "a5cccb82aa18",
-            "139fb501de9f"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1",
+            "98136c40e776",
+            "fe2b23188be8"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.inner-false-string-error:cleanup",
         "observation": {
-          "sender": ["8d7e5d1a39ca", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["8d7e5d1a39ca", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1851,19 +1663,13 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c",
-            "a5cccb82aa18",
-            "139fb501de9f",
-            "10d2eaddd748",
-            "1ac55581a0b6"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1",
+            "98136c40e776",
+            "fe2b23188be8",
+            "91a08e4c9723",
+            "debef2539fa3"
           ]
         }
       },
@@ -1875,7 +1681,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1897,7 +1703,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1915,13 +1721,13 @@
       {
         "id": "session-startup-both-activation-sites.inner-false-object-error:activating",
         "observation": {
-          "sender": ["956df62b6a7f", "3dccd1e0bdab"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["956df62b6a7f", "dd8ef9816fe4"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1933,27 +1739,21 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480"
+            "98a0728539f1",
+            "dc4910b3e253"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.inner-false-object-error:activated",
         "observation": {
-          "sender": ["956df62b6a7f", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["956df62b6a7f", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1965,28 +1765,22 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.inner-false-object-error:reloaded",
         "observation": {
-          "sender": ["956df62b6a7f", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["956df62b6a7f", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1998,30 +1792,24 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c",
-            "a5cccb82aa18",
-            "139fb501de9f"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1",
+            "98136c40e776",
+            "fe2b23188be8"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.inner-false-object-error:cleanup",
         "observation": {
-          "sender": ["956df62b6a7f", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["956df62b6a7f", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2033,19 +1821,13 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c",
-            "a5cccb82aa18",
-            "139fb501de9f",
-            "10d2eaddd748",
-            "1ac55581a0b6"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1",
+            "98136c40e776",
+            "fe2b23188be8",
+            "91a08e4c9723",
+            "debef2539fa3"
           ]
         }
       },
@@ -2057,7 +1839,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2079,7 +1861,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2097,13 +1879,13 @@
       {
         "id": "session-startup-both-activation-sites.outer-refused:activating",
         "observation": {
-          "sender": ["9a7554993438", "3dccd1e0bdab"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["9a7554993438", "dd8ef9816fe4"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2115,27 +1897,21 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480"
+            "98a0728539f1",
+            "dc4910b3e253"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.outer-refused:activated",
         "observation": {
-          "sender": ["9a7554993438", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["9a7554993438", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2147,28 +1923,22 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.outer-refused:reloaded",
         "observation": {
-          "sender": ["9a7554993438", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["9a7554993438", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2180,30 +1950,24 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c",
-            "a5cccb82aa18",
-            "139fb501de9f"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1",
+            "98136c40e776",
+            "fe2b23188be8"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.outer-refused:cleanup",
         "observation": {
-          "sender": ["9a7554993438", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["9a7554993438", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2215,19 +1979,13 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c",
-            "a5cccb82aa18",
-            "139fb501de9f",
-            "10d2eaddd748",
-            "1ac55581a0b6"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1",
+            "98136c40e776",
+            "fe2b23188be8",
+            "91a08e4c9723",
+            "debef2539fa3"
           ]
         }
       },
@@ -2239,7 +1997,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2261,7 +2019,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2279,13 +2037,13 @@
       {
         "id": "session-startup-both-activation-sites.outer-refused-no-message:activating",
         "observation": {
-          "sender": ["3eb6c5c71f4d", "3dccd1e0bdab"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["3eb6c5c71f4d", "dd8ef9816fe4"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2297,27 +2055,21 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480"
+            "98a0728539f1",
+            "dc4910b3e253"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.outer-refused-no-message:activated",
         "observation": {
-          "sender": ["3eb6c5c71f4d", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["3eb6c5c71f4d", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2329,28 +2081,22 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.outer-refused-no-message:reloaded",
         "observation": {
-          "sender": ["3eb6c5c71f4d", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["3eb6c5c71f4d", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2362,30 +2108,24 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c",
-            "a5cccb82aa18",
-            "139fb501de9f"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1",
+            "98136c40e776",
+            "fe2b23188be8"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.outer-refused-no-message:cleanup",
         "observation": {
-          "sender": ["3eb6c5c71f4d", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["3eb6c5c71f4d", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2397,19 +2137,13 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c",
-            "a5cccb82aa18",
-            "139fb501de9f",
-            "10d2eaddd748",
-            "1ac55581a0b6"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1",
+            "98136c40e776",
+            "fe2b23188be8",
+            "91a08e4c9723",
+            "debef2539fa3"
           ]
         }
       },
@@ -2421,7 +2155,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2443,7 +2177,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2461,13 +2195,13 @@
       {
         "id": "session-startup-both-activation-sites.method-not-found:activating",
         "observation": {
-          "sender": ["ce2c901bc679", "3dccd1e0bdab"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["ce2c901bc679", "dd8ef9816fe4"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2479,27 +2213,21 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480"
+            "98a0728539f1",
+            "dc4910b3e253"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.method-not-found:activated",
         "observation": {
-          "sender": ["ce2c901bc679", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["ce2c901bc679", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2511,28 +2239,22 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.method-not-found:reloaded",
         "observation": {
-          "sender": ["ce2c901bc679", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["ce2c901bc679", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2544,30 +2266,24 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c",
-            "a5cccb82aa18",
-            "139fb501de9f"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1",
+            "98136c40e776",
+            "fe2b23188be8"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.method-not-found:cleanup",
         "observation": {
-          "sender": ["ce2c901bc679", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["ce2c901bc679", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2579,19 +2295,13 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c",
-            "a5cccb82aa18",
-            "139fb501de9f",
-            "10d2eaddd748",
-            "1ac55581a0b6"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1",
+            "98136c40e776",
+            "fe2b23188be8",
+            "91a08e4c9723",
+            "debef2539fa3"
           ]
         }
       },
@@ -2603,7 +2313,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2625,7 +2335,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2643,13 +2353,13 @@
       {
         "id": "session-startup-both-activation-sites.transport-rejection:activating",
         "observation": {
-          "sender": ["dd5d1677b700", "3dccd1e0bdab"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["dd5d1677b700", "dd8ef9816fe4"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2661,27 +2371,21 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480"
+            "98a0728539f1",
+            "dc4910b3e253"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.transport-rejection:activated",
         "observation": {
-          "sender": ["dd5d1677b700", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["dd5d1677b700", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2693,28 +2397,22 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.transport-rejection:reloaded",
         "observation": {
-          "sender": ["dd5d1677b700", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["dd5d1677b700", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2726,30 +2424,24 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c",
-            "a5cccb82aa18",
-            "139fb501de9f"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1",
+            "98136c40e776",
+            "fe2b23188be8"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.transport-rejection:cleanup",
         "observation": {
-          "sender": ["dd5d1677b700", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["dd5d1677b700", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2761,19 +2453,13 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c",
-            "a5cccb82aa18",
-            "139fb501de9f",
-            "10d2eaddd748",
-            "1ac55581a0b6"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1",
+            "98136c40e776",
+            "fe2b23188be8",
+            "91a08e4c9723",
+            "debef2539fa3"
           ]
         }
       },
@@ -2785,7 +2471,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2807,7 +2493,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2825,13 +2511,13 @@
       {
         "id": "session-startup-both-activation-sites.transport-rejection-no-message:activating",
         "observation": {
-          "sender": ["1dc36306d55b", "3dccd1e0bdab"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["1dc36306d55b", "dd8ef9816fe4"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2843,27 +2529,21 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480"
+            "98a0728539f1",
+            "dc4910b3e253"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.transport-rejection-no-message:activated",
         "observation": {
-          "sender": ["1dc36306d55b", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["1dc36306d55b", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2875,28 +2555,22 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.transport-rejection-no-message:reloaded",
         "observation": {
-          "sender": ["1dc36306d55b", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["1dc36306d55b", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2908,30 +2582,24 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c",
-            "a5cccb82aa18",
-            "139fb501de9f"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1",
+            "98136c40e776",
+            "fe2b23188be8"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.transport-rejection-no-message:cleanup",
         "observation": {
-          "sender": ["1dc36306d55b", "d8111b1f5ee4"],
-          "payloads": ["c59295cf1c69", "5b9abe0c7d97"],
+          "sender": ["1dc36306d55b", "a81c5cfd8561"],
+          "payloads": ["c59295cf1c69", "1dca7912e0fe"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2943,19 +2611,13 @@
             "7953dfb08a13",
             "a509dd4610b2",
             "da6deb44ce71",
-            "d000b4c837b7",
-            "fde92e0a066b",
-            "2fb68a322aaa",
-            "8144489ae5a9",
-            "650e3aedd38c",
-            "b86ad4df402e",
-            "0fa12ed6e56f",
-            "da5b4754e480",
-            "ecd3c359932c",
-            "a5cccb82aa18",
-            "139fb501de9f",
-            "10d2eaddd748",
-            "1ac55581a0b6"
+            "98a0728539f1",
+            "dc4910b3e253",
+            "5a31de3465c1",
+            "98136c40e776",
+            "fe2b23188be8",
+            "91a08e4c9723",
+            "debef2539fa3"
           ]
         }
       }
diff --git a/mobile/rpc-foundation/goldens/matrix-session.startup-worktree.activate-2.json b/mobile/rpc-foundation/goldens/matrix-session.startup-worktree.activate-2.json
index a2edf65f22b..f17ab0689dc 100644
--- a/mobile/rpc-foundation/goldens/matrix-session.startup-worktree.activate-2.json
+++ b/mobile/rpc-foundation/goldens/matrix-session.startup-worktree.activate-2.json
@@ -4,9 +4,9 @@
   "family": "session.startup",
   "namedDeltas": [],
   "values": {
-    "02c6f926e61e": {
-      "name": "clear-pending-live-input-commit",
-      "ordinal": 24,
+    "04cec5da2df1": {
+      "name": "clear-delayed-action-timers",
+      "ordinal": 22,
       "value": {}
     },
     "04f9f79493f1": {
@@ -16,26 +16,9 @@
         "allowEmptyLoaded": true
       }
     },
-    "10d2eaddd748": {
-      "name": "clear-pending-live-input-commit",
-      "ordinal": 26,
-      "value": {}
-    },
-    "139fb501de9f": {
-      "name": "fetch-terminals",
-      "ordinal": 25,
-      "value": {
-        "allowEmptyLoaded": true
-      }
-    },
-    "14cc324e5867": {
-      "name": "ensure-session-tabs",
-      "ordinal": 21,
-      "value": {}
-    },
-    "1591a1c2516b": {
+    "14cfe68dba8c": {
       "name": "worktree.activate#2",
-      "ordinal": 20,
+      "ordinal": 14,
       "args": [
         {
           "name": "method",
@@ -70,19 +53,22 @@
         }
       }
     },
-    "1ac55581a0b6": {
-      "name": "clear-delayed-action-timers",
-      "ordinal": 27,
-      "value": {}
+    "1c425a4c02bb": {
+      "name": "toast",
+      "ordinal": 18,
+      "value": {
+        "durationMs": 3000,
+        "message": "Open Orca on the host to wake sleeping agents."
+      }
     },
     "1e39202de11e": {
       "name": "clear-pending-live-input-commit",
       "ordinal": 18,
       "value": {}
     },
-    "2532b032374f": {
-      "name": "clear-delayed-action-timers",
-      "ordinal": 28,
+    "30f5e556f9c1": {
+      "name": "ensure-session-tabs",
+      "ordinal": 15,
       "value": {}
     },
     "343bb26c2588": {
@@ -98,9 +84,101 @@
       "ordinal": 5,
       "value": {}
     },
-    "3d3a5c176e1b": {
+    "39ed117c65f2": {
+      "name": "fetch-terminals",
+      "ordinal": 17,
+      "value": {
+        "allowEmptyLoaded": false
+      }
+    },
+    "3de666a10195": {
       "name": "worktree.activate#2",
-      "ordinal": 20,
+      "ordinal": 14,
+      "args": [
+        {
+          "name": "method",
+          "value": "worktree.activate"
+        },
+        {
+          "name": "params",
+          "value": {
+            "navigation": "caller",
+            "notifyClients": false,
+            "worktree": "id:wt-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "rejected",
+        "startedAt": 2550,
+        "settledAt": 2550,
+        "error": {
+          "category": "Error",
+          "message": "",
+          "isRpcDeliveryUnknown": true
+        }
+      }
+    },
+    "4669e4d646e8": {
+      "name": "fetch-terminals",
+      "ordinal": 6,
+      "value": {
+        "allowEmptyLoaded": false
+      }
+    },
+    "4e82c0d6a331": {
+      "name": "worktree.activate#2",
+      "ordinal": 14,
+      "args": [
+        {
+          "name": "method",
+          "value": "worktree.activate"
+        },
+        {
+          "name": "params",
+          "value": {
+            "navigation": "caller",
+            "notifyClients": false,
+            "worktree": "id:wt-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 2550,
+        "settledAt": 2550,
+        "value": {
+          "id": "frame-2",
+          "ok": true,
+          "result": {
+            "sleepingAgentWake": "unsupported-headless"
+          }
+        }
+      }
+    },
+    "51ae204eb34b": {
+      "status": "fulfilled",
+      "startedAt": 2550,
+      "settledAt": 2550,
+      "value": {
+        "$rpc": "undefined"
+      }
+    },
+    "5d78f561245c": {
+      "name": "worktree.activate#2",
+      "ordinal": 14,
       "args": [
         {
           "name": "method",
@@ -135,266 +213,19 @@
         }
       }
     },
-    "4550d6000766": {
+    "629aee3fec6c": {
       "name": "worktree.activate#2",
-      "ordinal": 20,
-      "args": [
-        {
-          "name": "method",
-          "value": "worktree.activate"
-        },
-        {
-          "name": "params",
-          "value": {
-            "navigation": "caller",
-            "notifyClients": false,
-            "worktree": "id:wt-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 2550,
-        "settledAt": 2550,
-        "value": {
-          "id": "frame-2",
-          "ok": true
-        }
-      }
-    },
-    "4669e4d646e8": {
-      "name": "fetch-terminals",
-      "ordinal": 6,
-      "value": {
-        "allowEmptyLoaded": false
-      }
-    },
-    "51ae204eb34b": {
-      "status": "fulfilled",
-      "startedAt": 2550,
-      "settledAt": 2550,
-      "value": {
-        "$rpc": "undefined"
-      }
-    },
-    "5543ee241dbb": {
-      "name": "clear-pending-live-input-commit",
-      "ordinal": 27,
-      "value": {}
+      "ordinal": 16,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.activate\",\"params\":{\"worktree\":\"id:wt-1\",\"notifyClients\":false,\"navigation\":\"caller\"}}"
     },
     "6419a011f13b": {
       "name": "clear-terminal-cache",
       "ordinal": 1,
       "value": {}
     },
-    "70715317cc92": {
-      "name": "diagnostics-reset-route",
-      "ordinal": 17,
-      "value": {}
-    },
-    "7406bc82189b": {
+    "6b72d716929d": {
       "name": "worktree.activate#2",
-      "ordinal": 20,
-      "args": [
-        {
-          "name": "method",
-          "value": "worktree.activate"
-        },
-        {
-          "name": "params",
-          "value": {
-            "navigation": "caller",
-            "notifyClients": false,
-            "worktree": "id:wt-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 2550,
-        "settledAt": 2550,
-        "value": {
-          "error": {
-            "code": "refused",
-            "message": ""
-          },
-          "id": "frame-2",
-          "ok": false
-        }
-      }
-    },
-    "791c598994de": {
-      "name": "clear-delayed-action-timers",
-      "ordinal": 19,
-      "value": {}
-    },
-    "7953dfb08a13": {
-      "name": "fetch-terminals",
-      "ordinal": 8,
-      "value": {
-        "allowEmptyLoaded": true
-      }
-    },
-    "92e7422b7481": {
-      "name": "worktree.activate#2",
-      "ordinal": 20,
-      "args": [
-        {
-          "name": "method",
-          "value": "worktree.activate"
-        },
-        {
-          "name": "params",
-          "value": {
-            "navigation": "caller",
-            "notifyClients": false,
-            "worktree": "id:wt-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "fulfilled",
-        "startedAt": 2550,
-        "settledAt": 2550,
-        "value": {
-          "id": "frame-2",
-          "ok": true,
-          "result": {
-            "sleepingAgentWake": "unsupported-headless"
-          }
-        }
-      }
-    },
-    "9440e16e975c": {
-      "name": "worktree.activate#1",
-      "ordinal": 9,
-      "args": [
-        {
-          "name": "method",
-          "value": "worktree.activate"
-        },
-        {
-          "name": "params",
-          "value": {
-            "navigation": "caller",
-            "notifyClients": false,
-            "worktree": "id:wt-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 1800
-      }
-    },
-    "95c8385db422": {
-      "name": "clear-delayed-action-timers",
-      "ordinal": 4,
-      "value": {}
-    },
-    "a193ad4304cb": {
-      "name": "fetch-terminals",
-      "ordinal": 7,
-      "value": {
-        "allowEmptyLoaded": false
-      }
-    },
-    "a5cccb82aa18": {
-      "name": "fetch-terminals",
-      "ordinal": 24,
-      "value": {
-        "allowEmptyLoaded": false
-      }
-    },
-    "a62233766069": {
-      "name": "worktree.activate#2",
-      "ordinal": 20,
-      "args": [
-        {
-          "name": "method",
-          "value": "worktree.activate"
-        },
-        {
-          "name": "params",
-          "value": {
-            "navigation": "caller",
-            "notifyClients": false,
-            "worktree": "id:wt-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "rejected",
-        "startedAt": 2550,
-        "settledAt": 2550,
-        "error": {
-          "category": "Error",
-          "message": "Connection closed",
-          "isRpcDeliveryUnknown": true
-        }
-      }
-    },
-    "a64fb4d065f5": {
-      "name": "worktree.activate#2",
-      "ordinal": 20,
-      "args": [
-        {
-          "name": "method",
-          "value": "worktree.activate"
-        },
-        {
-          "name": "params",
-          "value": {
-            "navigation": "caller",
-            "notifyClients": false,
-            "worktree": "id:wt-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 2550
-      }
-    },
-    "a6c533deb249": {
-      "name": "worktree.activate#2",
-      "ordinal": 20,
+      "ordinal": 14,
       "args": [
         {
           "name": "method",
@@ -428,14 +259,72 @@
         }
       }
     },
-    "a7a4537b3b5c": {
-      "name": "worktree.activate#2",
-      "ordinal": 22,
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.activate\",\"params\":{\"worktree\":\"id:wt-1\",\"notifyClients\":false,\"navigation\":\"caller\"}}"
+    "791c598994de": {
+      "name": "clear-delayed-action-timers",
+      "ordinal": 19,
+      "value": {}
     },
-    "a87d55218008": {
-      "name": "worktree.activate#2",
+    "7953dfb08a13": {
+      "name": "fetch-terminals",
+      "ordinal": 8,
+      "value": {
+        "allowEmptyLoaded": true
+      }
+    },
+    "84c0839eccca": {
+      "name": "fetch-terminals",
       "ordinal": 20,
+      "value": {
+        "allowEmptyLoaded": true
+      }
+    },
+    "854cb236952a": {
+      "actionSheetRequestSeq": 1,
+      "activeHandle": {
+        "$rpc": "null"
+      },
+      "appliedSnapshotMarker": {
+        "epoch": {
+          "$rpc": "null"
+        },
+        "version": -1
+      },
+      "closedTabTombstones": 0,
+      "initializedHandles": [],
+      "sessionTabs": [],
+      "terminalsLoaded": false
+    },
+    "8ac1a3109c04": {
+      "name": "worktree.activate#2",
+      "ordinal": 14,
+      "args": [
+        {
+          "name": "method",
+          "value": "worktree.activate"
+        },
+        {
+          "name": "params",
+          "value": {
+            "navigation": "caller",
+            "notifyClients": false,
+            "worktree": "id:wt-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 2550
+      }
+    },
+    "904f00da7283": {
+      "name": "worktree.activate#2",
+      "ordinal": 14,
       "args": [
         {
           "name": "method",
@@ -470,36 +359,66 @@
         }
       }
     },
+    "91a08e4c9723": {
+      "name": "clear-pending-live-input-commit",
+      "ordinal": 20,
+      "value": {}
+    },
+    "9440e16e975c": {
+      "name": "worktree.activate#1",
+      "ordinal": 9,
+      "args": [
+        {
+          "name": "method",
+          "value": "worktree.activate"
+        },
+        {
+          "name": "params",
+          "value": {
+            "navigation": "caller",
+            "notifyClients": false,
+            "worktree": "id:wt-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 1800
+      }
+    },
+    "95c8385db422": {
+      "name": "clear-delayed-action-timers",
+      "ordinal": 4,
+      "value": {}
+    },
+    "98136c40e776": {
+      "name": "fetch-terminals",
+      "ordinal": 18,
+      "value": {
+        "allowEmptyLoaded": false
+      }
+    },
+    "a193ad4304cb": {
+      "name": "fetch-terminals",
+      "ordinal": 7,
+      "value": {
+        "allowEmptyLoaded": false
+      }
+    },
     "aab012c297bd": {
       "name": "diagnostics-reset-route",
       "ordinal": 2,
       "value": {}
     },
-    "acf0370bfacc": {
-      "actionSheetRequestSeq": 1,
-      "activeHandle": {
-        "$rpc": "null"
-      },
-      "appliedSnapshotMarker": {
-        "epoch": {
-          "$rpc": "null"
-        },
-        "version": -1
-      },
-      "closedTabTombstones": 0,
-      "initializedHandles": [],
-      "terminalsLoaded": false
-    },
-    "ad31ee4e38f7": {
-      "name": "fetch-terminals",
-      "ordinal": 23,
-      "value": {
-        "allowEmptyLoaded": false
-      }
-    },
-    "b573a35af0e4": {
+    "b37eaa0b1825": {
       "name": "worktree.activate#2",
-      "ordinal": 20,
+      "ordinal": 14,
       "args": [
         {
           "name": "method",
@@ -531,46 +450,9 @@
         }
       }
     },
-    "c03aaed85eb1": {
-      "name": "fetch-terminals",
-      "ordinal": 25,
-      "value": {
-        "allowEmptyLoaded": false
-      }
-    },
-    "c59295cf1c69": {
-      "name": "worktree.activate#1",
-      "ordinal": 10,
-      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.activate\",\"params\":{\"worktree\":\"id:wt-1\",\"notifyClients\":false,\"navigation\":\"caller\"}}"
-    },
-    "d002ac5f4bf4": {
-      "name": "clear-terminal-cache",
-      "ordinal": 16,
-      "value": {}
-    },
-    "d2a0170e903b": {
-      "name": "toast",
-      "ordinal": 24,
-      "value": {
-        "durationMs": 3000,
-        "message": "Open Orca on the host to wake sleeping agents."
-      }
-    },
-    "d4bedafff7b3": {
-      "name": "clear-pending-live-input-commit",
-      "ordinal": 14,
-      "value": {}
-    },
-    "d5099139e4c2": {
-      "name": "fetch-terminals",
-      "ordinal": 26,
-      "value": {
-        "allowEmptyLoaded": true
-      }
-    },
-    "d529add4f57c": {
+    "c034bde334e5": {
       "name": "worktree.activate#2",
-      "ordinal": 20,
+      "ordinal": 14,
       "args": [
         {
           "name": "method",
@@ -592,20 +474,19 @@
         }
       ],
       "settlement": {
-        "status": "rejected",
+        "status": "fulfilled",
         "startedAt": 2550,
         "settledAt": 2550,
-        "error": {
-          "category": "Error",
-          "message": "",
-          "isRpcDeliveryUnknown": true
+        "value": {
+          "id": "frame-2",
+          "ok": true
         }
       }
     },
-    "d86bf02a4342": {
-      "name": "clear-delayed-action-timers",
-      "ordinal": 25,
-      "value": {}
+    "c59295cf1c69": {
+      "name": "worktree.activate#1",
+      "ordinal": 10,
+      "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.activate\",\"params\":{\"worktree\":\"id:wt-1\",\"notifyClients\":false,\"navigation\":\"caller\"}}"
     },
     "da6deb44ce71": {
       "name": "fetch-terminals",
@@ -614,6 +495,11 @@
         "allowEmptyLoaded": true
       }
     },
+    "debef2539fa3": {
+      "name": "clear-delayed-action-timers",
+      "ordinal": 21,
+      "value": {}
+    },
     "defd9bef9981": {
       "name": "worktree.activate#1",
       "ordinal": 9,
@@ -650,37 +536,9 @@
         }
       }
     },
-    "e2a7de11a524": {
-      "actionSheetRequestSeq": 3,
-      "activeHandle": {
-        "$rpc": "null"
-      },
-      "appliedSnapshotMarker": {
-        "epoch": {
-          "$rpc": "null"
-        },
-        "version": -1
-      },
-      "closedTabTombstones": 0,
-      "initializedHandles": [],
-      "terminalsLoaded": false
-    },
-    "e927128e41fc": {
-      "name": "clear-pending-live-input-commit",
-      "ordinal": 3,
-      "value": {}
-    },
-    "eb79a9b3682a": {
-      "status": "fulfilled",
-      "startedAt": 0,
-      "settledAt": 0,
-      "value": {
-        "$rpc": "undefined"
-      }
-    },
-    "ed2244ba223c": {
+    "e3f7d4da74aa": {
       "name": "worktree.activate#2",
-      "ordinal": 20,
+      "ordinal": 14,
       "args": [
         {
           "name": "method",
@@ -714,14 +572,9 @@
         }
       }
     },
-    "f3cfad7c767c": {
-      "name": "clear-delayed-action-timers",
-      "ordinal": 15,
-      "value": {}
-    },
-    "feb04bed80c9": {
+    "e81ef2ce6da3": {
       "name": "worktree.activate#2",
-      "ordinal": 20,
+      "ordinal": 14,
       "args": [
         {
           "name": "method",
@@ -757,6 +610,109 @@
           }
         }
       }
+    },
+    "e927128e41fc": {
+      "name": "clear-pending-live-input-commit",
+      "ordinal": 3,
+      "value": {}
+    },
+    "eb79a9b3682a": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "$rpc": "undefined"
+      }
+    },
+    "f6c64f462f7a": {
+      "name": "worktree.activate#2",
+      "ordinal": 14,
+      "args": [
+        {
+          "name": "method",
+          "value": "worktree.activate"
+        },
+        {
+          "name": "params",
+          "value": {
+            "navigation": "caller",
+            "notifyClients": false,
+            "worktree": "id:wt-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "fulfilled",
+        "startedAt": 2550,
+        "settledAt": 2550,
+        "value": {
+          "error": {
+            "code": "refused",
+            "message": ""
+          },
+          "id": "frame-2",
+          "ok": false
+        }
+      }
+    },
+    "f77e7493bbe3": {
+      "name": "worktree.activate#2",
+      "ordinal": 14,
+      "args": [
+        {
+          "name": "method",
+          "value": "worktree.activate"
+        },
+        {
+          "name": "params",
+          "value": {
+            "navigation": "caller",
+            "notifyClients": false,
+            "worktree": "id:wt-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "rejected",
+        "startedAt": 2550,
+        "settledAt": 2550,
+        "error": {
+          "category": "Error",
+          "message": "Connection closed",
+          "isRpcDeliveryUnknown": true
+        }
+      }
+    },
+    "f7e803082fc4": {
+      "name": "fetch-terminals",
+      "ordinal": 19,
+      "value": {
+        "allowEmptyLoaded": false
+      }
+    },
+    "f97fb55d23d2": {
+      "name": "clear-pending-live-input-commit",
+      "ordinal": 21,
+      "value": {}
+    },
+    "fe2b23188be8": {
+      "name": "fetch-terminals",
+      "ordinal": 19,
+      "value": {
+        "allowEmptyLoaded": true
+      }
     }
   },
   "recording": {
@@ -770,7 +726,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -789,7 +745,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -810,7 +766,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -833,7 +789,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -852,13 +808,13 @@
       {
         "id": "session-startup-both-activation-sites.prelude:activating",
         "observation": {
-          "sender": ["defd9bef9981", "a64fb4d065f5"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "8ac1a3109c04"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -871,27 +827,21 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7"
+            "30f5e556f9c1",
+            "39ed117c65f2"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.prelude:cleanup",
         "observation": {
-          "sender": ["defd9bef9981", "a62233766069"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "f77e7493bbe3"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -904,29 +854,23 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
+            "30f5e556f9c1",
+            "39ed117c65f2",
             "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "02c6f926e61e",
-            "d86bf02a4342"
+            "791c598994de"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.normal:activated",
         "observation": {
-          "sender": ["defd9bef9981", "92e7422b7481"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "4e82c0d6a331"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -939,28 +883,22 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "d2a0170e903b"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "1c425a4c02bb"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.normal:reloaded",
         "observation": {
-          "sender": ["defd9bef9981", "92e7422b7481"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "4e82c0d6a331"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -973,30 +911,24 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "d2a0170e903b",
-            "c03aaed85eb1",
-            "d5099139e4c2"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "1c425a4c02bb",
+            "f7e803082fc4",
+            "84c0839eccca"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.normal:cleanup",
         "observation": {
-          "sender": ["defd9bef9981", "92e7422b7481"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "4e82c0d6a331"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1009,32 +941,26 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "d2a0170e903b",
-            "c03aaed85eb1",
-            "d5099139e4c2",
-            "5543ee241dbb",
-            "2532b032374f"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "1c425a4c02bb",
+            "f7e803082fc4",
+            "84c0839eccca",
+            "f97fb55d23d2",
+            "04cec5da2df1"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.result-absent:activated",
         "observation": {
-          "sender": ["defd9bef9981", "4550d6000766"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "c034bde334e5"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1047,27 +973,21 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7"
+            "30f5e556f9c1",
+            "39ed117c65f2"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.result-absent:reloaded",
         "observation": {
-          "sender": ["defd9bef9981", "4550d6000766"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "c034bde334e5"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1080,29 +1000,23 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "a5cccb82aa18",
-            "139fb501de9f"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "98136c40e776",
+            "fe2b23188be8"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.result-absent:cleanup",
         "observation": {
-          "sender": ["defd9bef9981", "4550d6000766"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "c034bde334e5"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1115,31 +1029,25 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "a5cccb82aa18",
-            "139fb501de9f",
-            "10d2eaddd748",
-            "1ac55581a0b6"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "98136c40e776",
+            "fe2b23188be8",
+            "91a08e4c9723",
+            "debef2539fa3"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.result-null:activated",
         "observation": {
-          "sender": ["defd9bef9981", "a6c533deb249"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "6b72d716929d"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1152,27 +1060,21 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7"
+            "30f5e556f9c1",
+            "39ed117c65f2"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.result-null:reloaded",
         "observation": {
-          "sender": ["defd9bef9981", "a6c533deb249"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "6b72d716929d"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1185,29 +1087,23 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "a5cccb82aa18",
-            "139fb501de9f"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "98136c40e776",
+            "fe2b23188be8"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.result-null:cleanup",
         "observation": {
-          "sender": ["defd9bef9981", "a6c533deb249"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "6b72d716929d"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1220,31 +1116,25 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "a5cccb82aa18",
-            "139fb501de9f",
-            "10d2eaddd748",
-            "1ac55581a0b6"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "98136c40e776",
+            "fe2b23188be8",
+            "91a08e4c9723",
+            "debef2539fa3"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.inner-ok-missing:activated",
         "observation": {
-          "sender": ["defd9bef9981", "ed2244ba223c"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "e3f7d4da74aa"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1257,27 +1147,21 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7"
+            "30f5e556f9c1",
+            "39ed117c65f2"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.inner-ok-missing:reloaded",
         "observation": {
-          "sender": ["defd9bef9981", "ed2244ba223c"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "e3f7d4da74aa"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1290,29 +1174,23 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "a5cccb82aa18",
-            "139fb501de9f"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "98136c40e776",
+            "fe2b23188be8"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.inner-ok-missing:cleanup",
         "observation": {
-          "sender": ["defd9bef9981", "ed2244ba223c"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "e3f7d4da74aa"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1325,31 +1203,25 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "a5cccb82aa18",
-            "139fb501de9f",
-            "10d2eaddd748",
-            "1ac55581a0b6"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "98136c40e776",
+            "fe2b23188be8",
+            "91a08e4c9723",
+            "debef2539fa3"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.inner-false-string-error:activated",
         "observation": {
-          "sender": ["defd9bef9981", "3d3a5c176e1b"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "5d78f561245c"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1362,27 +1234,21 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7"
+            "30f5e556f9c1",
+            "39ed117c65f2"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.inner-false-string-error:reloaded",
         "observation": {
-          "sender": ["defd9bef9981", "3d3a5c176e1b"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "5d78f561245c"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1395,29 +1261,23 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "a5cccb82aa18",
-            "139fb501de9f"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "98136c40e776",
+            "fe2b23188be8"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.inner-false-string-error:cleanup",
         "observation": {
-          "sender": ["defd9bef9981", "3d3a5c176e1b"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "5d78f561245c"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1430,31 +1290,25 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "a5cccb82aa18",
-            "139fb501de9f",
-            "10d2eaddd748",
-            "1ac55581a0b6"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "98136c40e776",
+            "fe2b23188be8",
+            "91a08e4c9723",
+            "debef2539fa3"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.inner-false-object-error:activated",
         "observation": {
-          "sender": ["defd9bef9981", "feb04bed80c9"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "e81ef2ce6da3"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1467,27 +1321,21 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7"
+            "30f5e556f9c1",
+            "39ed117c65f2"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.inner-false-object-error:reloaded",
         "observation": {
-          "sender": ["defd9bef9981", "feb04bed80c9"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "e81ef2ce6da3"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1500,29 +1348,23 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "a5cccb82aa18",
-            "139fb501de9f"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "98136c40e776",
+            "fe2b23188be8"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.inner-false-object-error:cleanup",
         "observation": {
-          "sender": ["defd9bef9981", "feb04bed80c9"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "e81ef2ce6da3"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1535,31 +1377,25 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "a5cccb82aa18",
-            "139fb501de9f",
-            "10d2eaddd748",
-            "1ac55581a0b6"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "98136c40e776",
+            "fe2b23188be8",
+            "91a08e4c9723",
+            "debef2539fa3"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.outer-refused:activated",
         "observation": {
-          "sender": ["defd9bef9981", "1591a1c2516b"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "14cfe68dba8c"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1572,27 +1408,21 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7"
+            "30f5e556f9c1",
+            "39ed117c65f2"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.outer-refused:reloaded",
         "observation": {
-          "sender": ["defd9bef9981", "1591a1c2516b"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "14cfe68dba8c"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1605,29 +1435,23 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "a5cccb82aa18",
-            "139fb501de9f"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "98136c40e776",
+            "fe2b23188be8"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.outer-refused:cleanup",
         "observation": {
-          "sender": ["defd9bef9981", "1591a1c2516b"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "14cfe68dba8c"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1640,31 +1464,25 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "a5cccb82aa18",
-            "139fb501de9f",
-            "10d2eaddd748",
-            "1ac55581a0b6"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "98136c40e776",
+            "fe2b23188be8",
+            "91a08e4c9723",
+            "debef2539fa3"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.outer-refused-no-message:activated",
         "observation": {
-          "sender": ["defd9bef9981", "7406bc82189b"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "f6c64f462f7a"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1677,27 +1495,21 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7"
+            "30f5e556f9c1",
+            "39ed117c65f2"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.outer-refused-no-message:reloaded",
         "observation": {
-          "sender": ["defd9bef9981", "7406bc82189b"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "f6c64f462f7a"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1710,29 +1522,23 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "a5cccb82aa18",
-            "139fb501de9f"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "98136c40e776",
+            "fe2b23188be8"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.outer-refused-no-message:cleanup",
         "observation": {
-          "sender": ["defd9bef9981", "7406bc82189b"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "f6c64f462f7a"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1745,31 +1551,25 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "a5cccb82aa18",
-            "139fb501de9f",
-            "10d2eaddd748",
-            "1ac55581a0b6"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "98136c40e776",
+            "fe2b23188be8",
+            "91a08e4c9723",
+            "debef2539fa3"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.method-not-found:activated",
         "observation": {
-          "sender": ["defd9bef9981", "a87d55218008"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "904f00da7283"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1782,27 +1582,21 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7"
+            "30f5e556f9c1",
+            "39ed117c65f2"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.method-not-found:reloaded",
         "observation": {
-          "sender": ["defd9bef9981", "a87d55218008"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "904f00da7283"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1815,29 +1609,23 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "a5cccb82aa18",
-            "139fb501de9f"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "98136c40e776",
+            "fe2b23188be8"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.method-not-found:cleanup",
         "observation": {
-          "sender": ["defd9bef9981", "a87d55218008"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "904f00da7283"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1850,31 +1638,25 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "a5cccb82aa18",
-            "139fb501de9f",
-            "10d2eaddd748",
-            "1ac55581a0b6"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "98136c40e776",
+            "fe2b23188be8",
+            "91a08e4c9723",
+            "debef2539fa3"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.transport-rejection:activated",
         "observation": {
-          "sender": ["defd9bef9981", "b573a35af0e4"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "b37eaa0b1825"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1887,27 +1669,21 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7"
+            "30f5e556f9c1",
+            "39ed117c65f2"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.transport-rejection:reloaded",
         "observation": {
-          "sender": ["defd9bef9981", "b573a35af0e4"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "b37eaa0b1825"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1920,29 +1696,23 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "a5cccb82aa18",
-            "139fb501de9f"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "98136c40e776",
+            "fe2b23188be8"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.transport-rejection:cleanup",
         "observation": {
-          "sender": ["defd9bef9981", "b573a35af0e4"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "b37eaa0b1825"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1955,31 +1725,25 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "a5cccb82aa18",
-            "139fb501de9f",
-            "10d2eaddd748",
-            "1ac55581a0b6"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "98136c40e776",
+            "fe2b23188be8",
+            "91a08e4c9723",
+            "debef2539fa3"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.transport-rejection-no-message:activated",
         "observation": {
-          "sender": ["defd9bef9981", "d529add4f57c"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "3de666a10195"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -1992,27 +1756,21 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7"
+            "30f5e556f9c1",
+            "39ed117c65f2"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.transport-rejection-no-message:reloaded",
         "observation": {
-          "sender": ["defd9bef9981", "d529add4f57c"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "3de666a10195"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2025,29 +1783,23 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "a5cccb82aa18",
-            "139fb501de9f"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "98136c40e776",
+            "fe2b23188be8"
           ]
         }
       },
       {
         "id": "session-startup-both-activation-sites.transport-rejection-no-message:cleanup",
         "observation": {
-          "sender": ["defd9bef9981", "d529add4f57c"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "3de666a10195"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -2060,18 +1812,12 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "a5cccb82aa18",
-            "139fb501de9f",
-            "10d2eaddd748",
-            "1ac55581a0b6"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "98136c40e776",
+            "fe2b23188be8",
+            "91a08e4c9723",
+            "debef2539fa3"
           ]
         }
       }
diff --git a/mobile/rpc-foundation/goldens/session-startup-both-activation-sites.json b/mobile/rpc-foundation/goldens/session-startup-both-activation-sites.json
index d827d16e253..0944abdf9dd 100644
--- a/mobile/rpc-foundation/goldens/session-startup-both-activation-sites.json
+++ b/mobile/rpc-foundation/goldens/session-startup-both-activation-sites.json
@@ -4,6 +4,11 @@
   "family": "session.startup",
   "namedDeltas": [],
   "values": {
+    "04cec5da2df1": {
+      "name": "clear-delayed-action-timers",
+      "ordinal": 22,
+      "value": {}
+    },
     "04f9f79493f1": {
       "name": "fetch-terminals",
       "ordinal": 13,
@@ -11,19 +16,17 @@
         "allowEmptyLoaded": true
       }
     },
-    "14cc324e5867": {
-      "name": "ensure-session-tabs",
-      "ordinal": 21,
-      "value": {}
-    },
-    "1e39202de11e": {
-      "name": "clear-pending-live-input-commit",
+    "1c425a4c02bb": {
+      "name": "toast",
       "ordinal": 18,
-      "value": {}
+      "value": {
+        "durationMs": 3000,
+        "message": "Open Orca on the host to wake sleeping agents."
+      }
     },
-    "2532b032374f": {
-      "name": "clear-delayed-action-timers",
-      "ordinal": 28,
+    "30f5e556f9c1": {
+      "name": "ensure-session-tabs",
+      "ordinal": 15,
       "value": {}
     },
     "343bb26c2588": {
@@ -39,6 +42,13 @@
       "ordinal": 5,
       "value": {}
     },
+    "39ed117c65f2": {
+      "name": "fetch-terminals",
+      "ordinal": 17,
+      "value": {
+        "allowEmptyLoaded": false
+      }
+    },
     "4669e4d646e8": {
       "name": "fetch-terminals",
       "ordinal": 6,
@@ -46,44 +56,9 @@
         "allowEmptyLoaded": false
       }
     },
-    "51ae204eb34b": {
-      "status": "fulfilled",
-      "startedAt": 2550,
-      "settledAt": 2550,
-      "value": {
-        "$rpc": "undefined"
-      }
-    },
-    "5543ee241dbb": {
-      "name": "clear-pending-live-input-commit",
-      "ordinal": 27,
-      "value": {}
-    },
-    "6419a011f13b": {
-      "name": "clear-terminal-cache",
-      "ordinal": 1,
-      "value": {}
-    },
-    "70715317cc92": {
-      "name": "diagnostics-reset-route",
-      "ordinal": 17,
-      "value": {}
-    },
-    "791c598994de": {
-      "name": "clear-delayed-action-timers",
-      "ordinal": 19,
-      "value": {}
-    },
-    "7953dfb08a13": {
-      "name": "fetch-terminals",
-      "ordinal": 8,
-      "value": {
-        "allowEmptyLoaded": true
-      }
-    },
-    "92e7422b7481": {
+    "4e82c0d6a331": {
       "name": "worktree.activate#2",
-      "ordinal": 20,
+      "ordinal": 14,
       "args": [
         {
           "name": "method",
@@ -117,6 +92,82 @@
         }
       }
     },
+    "51ae204eb34b": {
+      "status": "fulfilled",
+      "startedAt": 2550,
+      "settledAt": 2550,
+      "value": {
+        "$rpc": "undefined"
+      }
+    },
+    "629aee3fec6c": {
+      "name": "worktree.activate#2",
+      "ordinal": 16,
+      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.activate\",\"params\":{\"worktree\":\"id:wt-1\",\"notifyClients\":false,\"navigation\":\"caller\"}}"
+    },
+    "6419a011f13b": {
+      "name": "clear-terminal-cache",
+      "ordinal": 1,
+      "value": {}
+    },
+    "7953dfb08a13": {
+      "name": "fetch-terminals",
+      "ordinal": 8,
+      "value": {
+        "allowEmptyLoaded": true
+      }
+    },
+    "84c0839eccca": {
+      "name": "fetch-terminals",
+      "ordinal": 20,
+      "value": {
+        "allowEmptyLoaded": true
+      }
+    },
+    "854cb236952a": {
+      "actionSheetRequestSeq": 1,
+      "activeHandle": {
+        "$rpc": "null"
+      },
+      "appliedSnapshotMarker": {
+        "epoch": {
+          "$rpc": "null"
+        },
+        "version": -1
+      },
+      "closedTabTombstones": 0,
+      "initializedHandles": [],
+      "sessionTabs": [],
+      "terminalsLoaded": false
+    },
+    "8ac1a3109c04": {
+      "name": "worktree.activate#2",
+      "ordinal": 14,
+      "args": [
+        {
+          "name": "method",
+          "value": "worktree.activate"
+        },
+        {
+          "name": "params",
+          "value": {
+            "navigation": "caller",
+            "notifyClients": false,
+            "worktree": "id:wt-1"
+          }
+        },
+        {
+          "name": "options",
+          "value": {
+            "$rpc": "absent"
+          }
+        }
+      ],
+      "settlement": {
+        "status": "pending",
+        "startedAt": 2550
+      }
+    },
     "9440e16e975c": {
       "name": "worktree.activate#1",
       "ordinal": 9,
@@ -157,103 +208,16 @@
         "allowEmptyLoaded": false
       }
     },
-    "a64fb4d065f5": {
-      "name": "worktree.activate#2",
-      "ordinal": 20,
-      "args": [
-        {
-          "name": "method",
-          "value": "worktree.activate"
-        },
-        {
-          "name": "params",
-          "value": {
-            "navigation": "caller",
-            "notifyClients": false,
-            "worktree": "id:wt-1"
-          }
-        },
-        {
-          "name": "options",
-          "value": {
-            "$rpc": "absent"
-          }
-        }
-      ],
-      "settlement": {
-        "status": "pending",
-        "startedAt": 2550
-      }
-    },
-    "a7a4537b3b5c": {
-      "name": "worktree.activate#2",
-      "ordinal": 22,
-      "json": "{\"id\":\"frame-2\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.activate\",\"params\":{\"worktree\":\"id:wt-1\",\"notifyClients\":false,\"navigation\":\"caller\"}}"
-    },
     "aab012c297bd": {
       "name": "diagnostics-reset-route",
       "ordinal": 2,
       "value": {}
     },
-    "acf0370bfacc": {
-      "actionSheetRequestSeq": 1,
-      "activeHandle": {
-        "$rpc": "null"
-      },
-      "appliedSnapshotMarker": {
-        "epoch": {
-          "$rpc": "null"
-        },
-        "version": -1
-      },
-      "closedTabTombstones": 0,
-      "initializedHandles": [],
-      "terminalsLoaded": false
-    },
-    "ad31ee4e38f7": {
-      "name": "fetch-terminals",
-      "ordinal": 23,
-      "value": {
-        "allowEmptyLoaded": false
-      }
-    },
-    "c03aaed85eb1": {
-      "name": "fetch-terminals",
-      "ordinal": 25,
-      "value": {
-        "allowEmptyLoaded": false
-      }
-    },
     "c59295cf1c69": {
       "name": "worktree.activate#1",
       "ordinal": 10,
       "json": "{\"id\":\"frame-1\",\"deviceToken\":\"recording-device\",\"method\":\"worktree.activate\",\"params\":{\"worktree\":\"id:wt-1\",\"notifyClients\":false,\"navigation\":\"caller\"}}"
     },
-    "d002ac5f4bf4": {
-      "name": "clear-terminal-cache",
-      "ordinal": 16,
-      "value": {}
-    },
-    "d2a0170e903b": {
-      "name": "toast",
-      "ordinal": 24,
-      "value": {
-        "durationMs": 3000,
-        "message": "Open Orca on the host to wake sleeping agents."
-      }
-    },
-    "d4bedafff7b3": {
-      "name": "clear-pending-live-input-commit",
-      "ordinal": 14,
-      "value": {}
-    },
-    "d5099139e4c2": {
-      "name": "fetch-terminals",
-      "ordinal": 26,
-      "value": {
-        "allowEmptyLoaded": true
-      }
-    },
     "da6deb44ce71": {
       "name": "fetch-terminals",
       "ordinal": 12,
@@ -297,21 +261,6 @@
         }
       }
     },
-    "e2a7de11a524": {
-      "actionSheetRequestSeq": 3,
-      "activeHandle": {
-        "$rpc": "null"
-      },
-      "appliedSnapshotMarker": {
-        "epoch": {
-          "$rpc": "null"
-        },
-        "version": -1
-      },
-      "closedTabTombstones": 0,
-      "initializedHandles": [],
-      "terminalsLoaded": false
-    },
     "e927128e41fc": {
       "name": "clear-pending-live-input-commit",
       "ordinal": 3,
@@ -325,9 +274,16 @@
         "$rpc": "undefined"
       }
     },
-    "f3cfad7c767c": {
-      "name": "clear-delayed-action-timers",
-      "ordinal": 15,
+    "f7e803082fc4": {
+      "name": "fetch-terminals",
+      "ordinal": 19,
+      "value": {
+        "allowEmptyLoaded": false
+      }
+    },
+    "f97fb55d23d2": {
+      "name": "clear-pending-live-input-commit",
+      "ordinal": 21,
       "value": {}
     }
   },
@@ -342,7 +298,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -361,7 +317,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -382,7 +338,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -405,7 +361,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -424,13 +380,13 @@
       {
         "id": "activating",
         "observation": {
-          "sender": ["defd9bef9981", "a64fb4d065f5"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "8ac1a3109c04"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -443,27 +399,21 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7"
+            "30f5e556f9c1",
+            "39ed117c65f2"
           ]
         }
       },
       {
         "id": "activated",
         "observation": {
-          "sender": ["defd9bef9981", "92e7422b7481"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "4e82c0d6a331"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -476,28 +426,22 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "d2a0170e903b"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "1c425a4c02bb"
           ]
         }
       },
       {
         "id": "reloaded",
         "observation": {
-          "sender": ["defd9bef9981", "92e7422b7481"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "4e82c0d6a331"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -510,30 +454,24 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "d2a0170e903b",
-            "c03aaed85eb1",
-            "d5099139e4c2"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "1c425a4c02bb",
+            "f7e803082fc4",
+            "84c0839eccca"
           ]
         }
       },
       {
         "id": "cleanup",
         "observation": {
-          "sender": ["defd9bef9981", "92e7422b7481"],
-          "payloads": ["c59295cf1c69", "a7a4537b3b5c"],
+          "sender": ["defd9bef9981", "4e82c0d6a331"],
+          "payloads": ["c59295cf1c69", "629aee3fec6c"],
           "settlements": {
             "mount": "eb79a9b3682a",
             "consume-route": "51ae204eb34b"
           },
-          "state": "e2a7de11a524",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -546,19 +484,13 @@
             "343bb26c2588",
             "da6deb44ce71",
             "04f9f79493f1",
-            "d4bedafff7b3",
-            "f3cfad7c767c",
-            "d002ac5f4bf4",
-            "70715317cc92",
-            "1e39202de11e",
-            "791c598994de",
-            "14cc324e5867",
-            "ad31ee4e38f7",
-            "d2a0170e903b",
-            "c03aaed85eb1",
-            "d5099139e4c2",
-            "5543ee241dbb",
-            "2532b032374f"
+            "30f5e556f9c1",
+            "39ed117c65f2",
+            "1c425a4c02bb",
+            "f7e803082fc4",
+            "84c0839eccca",
+            "f97fb55d23d2",
+            "04cec5da2df1"
           ]
         }
       }
diff --git a/mobile/rpc-foundation/goldens/session-startup-floating-route-skips-activation.json b/mobile/rpc-foundation/goldens/session-startup-floating-route-skips-activation.json
index ba206a75305..36570aac7eb 100644
--- a/mobile/rpc-foundation/goldens/session-startup-floating-route-skips-activation.json
+++ b/mobile/rpc-foundation/goldens/session-startup-floating-route-skips-activation.json
@@ -28,6 +28,22 @@
         "allowEmptyLoaded": true
       }
     },
+    "854cb236952a": {
+      "actionSheetRequestSeq": 1,
+      "activeHandle": {
+        "$rpc": "null"
+      },
+      "appliedSnapshotMarker": {
+        "epoch": {
+          "$rpc": "null"
+        },
+        "version": -1
+      },
+      "closedTabTombstones": 0,
+      "initializedHandles": [],
+      "sessionTabs": [],
+      "terminalsLoaded": false
+    },
     "95c8385db422": {
       "name": "clear-delayed-action-timers",
       "ordinal": 4,
@@ -50,21 +66,6 @@
       "ordinal": 2,
       "value": {}
     },
-    "acf0370bfacc": {
-      "actionSheetRequestSeq": 1,
-      "activeHandle": {
-        "$rpc": "null"
-      },
-      "appliedSnapshotMarker": {
-        "epoch": {
-          "$rpc": "null"
-        },
-        "version": -1
-      },
-      "closedTabTombstones": 0,
-      "initializedHandles": [],
-      "terminalsLoaded": false
-    },
     "bc94d6f00eeb": {
       "name": "clear-pending-live-input-commit",
       "ordinal": 9,
@@ -95,7 +96,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -114,7 +115,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -135,7 +136,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
diff --git a/mobile/rpc-foundation/goldens/session-startup-keeps-terminals-visible-on-reconnect.json b/mobile/rpc-foundation/goldens/session-startup-keeps-terminals-visible-on-reconnect.json
index 00e47295b9b..1261f62e1a7 100644
--- a/mobile/rpc-foundation/goldens/session-startup-keeps-terminals-visible-on-reconnect.json
+++ b/mobile/rpc-foundation/goldens/session-startup-keeps-terminals-visible-on-reconnect.json
@@ -49,21 +49,6 @@
       "ordinal": 12,
       "value": {}
     },
-    "83ed906e3d41": {
-      "actionSheetRequestSeq": 1,
-      "activeHandle": {
-        "$rpc": "null"
-      },
-      "appliedSnapshotMarker": {
-        "epoch": {
-          "$rpc": "null"
-        },
-        "version": -1
-      },
-      "closedTabTombstones": 0,
-      "initializedHandles": [],
-      "terminalsLoaded": true
-    },
     "8c990409ac55": {
       "name": "worktree.activate#1",
       "ordinal": 5,
@@ -115,6 +100,22 @@
         "allowEmptyLoaded": false
       }
     },
+    "a98356c9153c": {
+      "actionSheetRequestSeq": 2,
+      "activeHandle": {
+        "$rpc": "null"
+      },
+      "appliedSnapshotMarker": {
+        "epoch": {
+          "$rpc": "null"
+        },
+        "version": -1
+      },
+      "closedTabTombstones": 0,
+      "initializedHandles": [],
+      "sessionTabs": [],
+      "terminalsLoaded": true
+    },
     "aa6511b23729": {
       "status": "fulfilled",
       "startedAt": 1500,
@@ -135,8 +136,8 @@
         "allowEmptyLoaded": true
       }
     },
-    "c7e9a0eef4ce": {
-      "actionSheetRequestSeq": 2,
+    "e022e11065b3": {
+      "actionSheetRequestSeq": 1,
       "activeHandle": {
         "$rpc": "null"
       },
@@ -148,6 +149,7 @@
       },
       "closedTabTombstones": 0,
       "initializedHandles": [],
+      "sessionTabs": [],
       "terminalsLoaded": true
     },
     "e927128e41fc": {
@@ -185,7 +187,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "83ed906e3d41",
+          "state": "e022e11065b3",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -204,7 +206,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "83ed906e3d41",
+          "state": "e022e11065b3",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -226,7 +228,7 @@
             "mount": "eb79a9b3682a",
             "unmount": "aa6511b23729"
           },
-          "state": "c7e9a0eef4ce",
+          "state": "a98356c9153c",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
diff --git a/mobile/rpc-foundation/goldens/session-startup-refused-tab-load-still-loads-terminals.json b/mobile/rpc-foundation/goldens/session-startup-refused-tab-load-still-loads-terminals.json
index 8d85674e827..dba5fa573cf 100644
--- a/mobile/rpc-foundation/goldens/session-startup-refused-tab-load-still-loads-terminals.json
+++ b/mobile/rpc-foundation/goldens/session-startup-refused-tab-load-still-loads-terminals.json
@@ -49,6 +49,22 @@
       "ordinal": 12,
       "value": {}
     },
+    "854cb236952a": {
+      "actionSheetRequestSeq": 1,
+      "activeHandle": {
+        "$rpc": "null"
+      },
+      "appliedSnapshotMarker": {
+        "epoch": {
+          "$rpc": "null"
+        },
+        "version": -1
+      },
+      "closedTabTombstones": 0,
+      "initializedHandles": [],
+      "sessionTabs": [],
+      "terminalsLoaded": false
+    },
     "8c990409ac55": {
       "name": "worktree.activate#1",
       "ordinal": 5,
@@ -105,21 +121,6 @@
       "ordinal": 2,
       "value": {}
     },
-    "acf0370bfacc": {
-      "actionSheetRequestSeq": 1,
-      "activeHandle": {
-        "$rpc": "null"
-      },
-      "appliedSnapshotMarker": {
-        "epoch": {
-          "$rpc": "null"
-        },
-        "version": -1
-      },
-      "closedTabTombstones": 0,
-      "initializedHandles": [],
-      "terminalsLoaded": false
-    },
     "ba45b883b259": {
       "name": "fetch-terminals",
       "ordinal": 10,
@@ -162,7 +163,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -181,7 +182,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
@@ -202,7 +203,7 @@
           "settlements": {
             "mount": "eb79a9b3682a"
           },
-          "state": "acf0370bfacc",
+          "state": "854cb236952a",
           "effects": [
             "6419a011f13b",
             "aab012c297bd",
diff --git a/mobile/rpc-foundation/goldens/session-startup-reopens-with-last-strip.json b/mobile/rpc-foundation/goldens/session-startup-reopens-with-last-strip.json
new file mode 100644
index 00000000000..267ca030fc8
--- /dev/null
+++ b/mobile/rpc-foundation/goldens/session-startup-reopens-with-last-strip.json
@@ -0,0 +1,593 @@
+{
+  "goldenFormatVersion": 6,
+  "operation": "session.startup",
+  "family": "session.startup",
+  "namedDeltas": [],
+  "values": {
+    "0808af971d7f": {
+      "name": "diagnostics-reset-route",
+      "ordinal": 22,
+      "value": {}
+    },
+    "0c745b7b3cbc": {
+      "name": "clear-pending-live-input-commit",
+      "ordinal": 35,
+      "value": {}
+    },
+    "169deb3ae6af": {
+      "actionSheetRequestSeq": 1,
+      "activeHandle": {
+        "$rpc": "null"
+      },
+      "appliedSnapshotMarker": {
+        "epoch": {
+          "$rpc": "null"
+        },
+        "version": -1
+      },
+      "closedTabTombstones": 0,
+      "initializedHandles": [],
+      "sessionTabs": ["tab-a", "tab-b", "tab-x"],
+      "terminalsLoaded": false
+    },
+    "1e3a1c95aa65": {
+      "name": "clear-pending-live-input-commit",
+      "ordinal": 31,
+      "value": {}
+    },
+    "1eb7c62d5c7f": {
+      "actionSheetRequestSeq": 3,
+      "activeHandle": {
+        "$rpc": "null"
+      },
+      "appliedSnapshotMarker": {
+        "epoch": {
+          "$rpc": "null"
+        },
+        "version": -1
+      },
+      "closedTabTombstones": 0,
+      "initializedHandles": [],
+      "sessionTabs": ["tab-a", "tab-b"],
+      "terminalsLoaded": false
+    },
+    "2071fa4023ba": {
+      "actionSheetRequestSeq": 9,
+      "activeHandle": {
+        "$rpc": "null"
+      },
+      "appliedSnapshotMarker": {
+        "epoch": {
+          "$rpc": "null"
+        },
+        "version": -1
+      },
+      "closedTabTombstones": 0,
+      "initializedHandles": [],
+      "sessionTabs": [],
+      "terminalsLoaded": false
+    },
+    "2196d8ddca7b": {
+      "name": "clear-delayed-action-timers",
+      "ordinal": 24,
+      "value": {}
+    },
+    "234a43e6bd65": {
+      "name": "ensure-session-tabs",
+      "ordinal": 41,
+      "value": {}
+    },
+    "2532b032374f": {
+      "name": "clear-delayed-action-timers",
+      "ordinal": 28,
+      "value": {}
+    },
+    "30f5e556f9c1": {
+      "name": "ensure-session-tabs",
+      "ordinal": 15,
+      "value": {}
+    },
+    "38b377793c34": {
+      "name": "ensure-session-tabs",
+      "ordinal": 5,
+      "value": {}
+    },
+    "40d47c7b9e56": {
+      "name": "ensure-session-tabs",
+      "ordinal": 25,
+      "value": {}
+    },
+    "414746be507d": {
+      "name": "diagnostics-reset-route",
+      "ordinal": 12,
+      "value": {}
+    },
+    "42f2550e7540": {
+      "name": "clear-delayed-action-timers",
+      "ordinal": 40,
+      "value": {}
+    },
+    "4669e4d646e8": {
+      "name": "fetch-terminals",
+      "ordinal": 6,
+      "value": {
+        "allowEmptyLoaded": false
+      }
+    },
+    "48aab64376df": {
+      "name": "clear-delayed-action-timers",
+      "ordinal": 32,
+      "value": {}
+    },
+    "4ab868ee910c": {
+      "name": "diagnostics-reset-route",
+      "ordinal": 30,
+      "value": {}
+    },
+    "4e668f2777e4": {
+      "name": "diagnostics-reset-route",
+      "ordinal": 38,
+      "value": {}
+    },
+    "4fb364aab7f9": {
+      "name": "clear-terminal-cache",
+      "ordinal": 29,
+      "value": {}
+    },
+    "51245db218dd": {
+      "name": "clear-terminal-cache",
+      "ordinal": 37,
+      "value": {}
+    },
+    "5543ee241dbb": {
+      "name": "clear-pending-live-input-commit",
+      "ordinal": 27,
+      "value": {}
+    },
+    "5bd54a356841": {
+      "name": "fetch-terminals",
+      "ordinal": 8,
+      "value": {
+        "allowEmptyLoaded": false
+      }
+    },
+    "5c6699f9b431": {
+      "name": "ensure-session-tabs",
+      "ordinal": 7,
+      "value": {}
+    },
+    "5d381bbc8fd2": {
+      "name": "clear-pending-live-input-commit",
+      "ordinal": 19,
+      "value": {}
+    },
+    "5dbd71a7b565": {
+      "name": "fetch-terminals",
+      "ordinal": 26,
+      "value": {
+        "allowEmptyLoaded": false
+      }
+    },
+    "6419a011f13b": {
+      "name": "clear-terminal-cache",
+      "ordinal": 1,
+      "value": {}
+    },
+    "7cf846aa3529": {
+      "name": "clear-terminal-cache",
+      "ordinal": 21,
+      "value": {}
+    },
+    "95c8385db422": {
+      "name": "clear-delayed-action-timers",
+      "ordinal": 4,
+      "value": {}
+    },
+    "968d084a5a35": {
+      "name": "clear-delayed-action-timers",
+      "ordinal": 10,
+      "value": {}
+    },
+    "98136c40e776": {
+      "name": "fetch-terminals",
+      "ordinal": 18,
+      "value": {
+        "allowEmptyLoaded": false
+      }
+    },
+    "9c976031a154": {
+      "name": "ensure-session-tabs",
+      "ordinal": 33,
+      "value": {}
+    },
+    "a80c93135833": {
+      "name": "clear-delayed-action-timers",
+      "ordinal": 20,
+      "value": {}
+    },
+    "aab012c297bd": {
+      "name": "diagnostics-reset-route",
+      "ordinal": 2,
+      "value": {}
+    },
+    "b2e323ccc369": {
+      "actionSheetRequestSeq": 7,
+      "activeHandle": {
+        "$rpc": "null"
+      },
+      "appliedSnapshotMarker": {
+        "epoch": {
+          "$rpc": "null"
+        },
+        "version": -1
+      },
+      "closedTabTombstones": 0,
+      "initializedHandles": [],
+      "sessionTabs": [],
+      "terminalsLoaded": false
+    },
+    "b6770e9b4df2": {
+      "name": "fetch-terminals",
+      "ordinal": 34,
+      "value": {
+        "allowEmptyLoaded": false
+      }
+    },
+    "bc94d6f00eeb": {
+      "name": "clear-pending-live-input-commit",
+      "ordinal": 9,
+      "value": {}
+    },
+    "c5b498aff2c9": {
+      "name": "clear-terminal-cache",
+      "ordinal": 11,
+      "value": {}
+    },
+    "c63b05cb8b5c": {
+      "actionSheetRequestSeq": 5,
+      "activeHandle": {
+        "$rpc": "null"
+      },
+      "appliedSnapshotMarker": {
+        "epoch": {
+          "$rpc": "null"
+        },
+        "version": -1
+      },
+      "closedTabTombstones": 0,
+      "initializedHandles": [],
+      "sessionTabs": ["tab-a", "tab-b"],
+      "terminalsLoaded": false
+    },
+    "cc01cec0da32": {
+      "name": "fetch-terminals",
+      "ordinal": 42,
+      "value": {
+        "allowEmptyLoaded": false
+      }
+    },
+    "cc93e616e745": {
+      "name": "clear-delayed-action-timers",
+      "ordinal": 36,
+      "value": {}
+    },
+    "d000b4c837b7": {
+      "name": "clear-pending-live-input-commit",
+      "ordinal": 13,
+      "value": {}
+    },
+    "d0f2ffb3342b": {
+      "name": "clear-pending-live-input-commit",
+      "ordinal": 39,
+      "value": {}
+    },
+    "d42d15a1b559": {
+      "name": "clear-pending-live-input-commit",
+      "ordinal": 23,
+      "value": {}
+    },
+    "dc4910b3e253": {
+      "name": "fetch-terminals",
+      "ordinal": 16,
+      "value": {
+        "allowEmptyLoaded": false
+      }
+    },
+    "e6ba1c0e09a4": {
+      "actionSheetRequestSeq": 3,
+      "activeHandle": {
+        "$rpc": "null"
+      },
+      "appliedSnapshotMarker": {
+        "epoch": {
+          "$rpc": "null"
+        },
+        "version": -1
+      },
+      "closedTabTombstones": 0,
+      "initializedHandles": [],
+      "sessionTabs": ["tab-a", "tab-b", "tab-x"],
+      "terminalsLoaded": false
+    },
+    "e927128e41fc": {
+      "name": "clear-pending-live-input-commit",
+      "ordinal": 3,
+      "value": {}
+    },
+    "eb79a9b3682a": {
+      "status": "fulfilled",
+      "startedAt": 0,
+      "settledAt": 0,
+      "value": {
+        "$rpc": "undefined"
+      }
+    },
+    "f0f3f352c679": {
+      "name": "ensure-session-tabs",
+      "ordinal": 17,
+      "value": {}
+    },
+    "fde92e0a066b": {
+      "name": "clear-delayed-action-timers",
+      "ordinal": 14,
+      "value": {}
+    }
+  },
+  "recording": {
+    "scenario": "session-startup-reopens-with-last-strip",
+    "checkpoints": [
+      {
+        "id": "live",
+        "observation": {
+          "sender": [],
+          "payloads": [],
+          "settlements": {
+            "mount": "eb79a9b3682a",
+            "host-lists-three": "eb79a9b3682a"
+          },
+          "state": "169deb3ae6af",
+          "effects": [
+            "6419a011f13b",
+            "aab012c297bd",
+            "e927128e41fc",
+            "95c8385db422",
+            "38b377793c34",
+            "4669e4d646e8",
+            "5c6699f9b431",
+            "5bd54a356841"
+          ]
+        }
+      },
+      {
+        "id": "reopened-with-last-strip",
+        "observation": {
+          "sender": [],
+          "payloads": [],
+          "settlements": {
+            "mount": "eb79a9b3682a",
+            "host-lists-three": "eb79a9b3682a",
+            "leave": "eb79a9b3682a",
+            "reopen": "eb79a9b3682a"
+          },
+          "state": "e6ba1c0e09a4",
+          "effects": [
+            "6419a011f13b",
+            "aab012c297bd",
+            "e927128e41fc",
+            "95c8385db422",
+            "38b377793c34",
+            "4669e4d646e8",
+            "5c6699f9b431",
+            "5bd54a356841",
+            "bc94d6f00eeb",
+            "968d084a5a35",
+            "c5b498aff2c9",
+            "414746be507d",
+            "d000b4c837b7",
+            "fde92e0a066b",
+            "30f5e556f9c1",
+            "dc4910b3e253"
+          ]
+        }
+      },
+      {
+        "id": "snapshot-replaced-strip",
+        "observation": {
+          "sender": [],
+          "payloads": [],
+          "settlements": {
+            "mount": "eb79a9b3682a",
+            "host-lists-three": "eb79a9b3682a",
+            "leave": "eb79a9b3682a",
+            "reopen": "eb79a9b3682a",
+            "host-closed-x": "eb79a9b3682a"
+          },
+          "state": "1eb7c62d5c7f",
+          "effects": [
+            "6419a011f13b",
+            "aab012c297bd",
+            "e927128e41fc",
+            "95c8385db422",
+            "38b377793c34",
+            "4669e4d646e8",
+            "5c6699f9b431",
+            "5bd54a356841",
+            "bc94d6f00eeb",
+            "968d084a5a35",
+            "c5b498aff2c9",
+            "414746be507d",
+            "d000b4c837b7",
+            "fde92e0a066b",
+            "30f5e556f9c1",
+            "dc4910b3e253",
+            "f0f3f352c679",
+            "98136c40e776"
+          ]
+        }
+      },
+      {
+        "id": "closed-tab-stays-gone",
+        "observation": {
+          "sender": [],
+          "payloads": [],
+          "settlements": {
+            "mount": "eb79a9b3682a",
+            "host-lists-three": "eb79a9b3682a",
+            "leave": "eb79a9b3682a",
+            "reopen": "eb79a9b3682a",
+            "host-closed-x": "eb79a9b3682a",
+            "leave-again": "eb79a9b3682a",
+            "reopen-again": "eb79a9b3682a"
+          },
+          "state": "c63b05cb8b5c",
+          "effects": [
+            "6419a011f13b",
+            "aab012c297bd",
+            "e927128e41fc",
+            "95c8385db422",
+            "38b377793c34",
+            "4669e4d646e8",
+            "5c6699f9b431",
+            "5bd54a356841",
+            "bc94d6f00eeb",
+            "968d084a5a35",
+            "c5b498aff2c9",
+            "414746be507d",
+            "d000b4c837b7",
+            "fde92e0a066b",
+            "30f5e556f9c1",
+            "dc4910b3e253",
+            "f0f3f352c679",
+            "98136c40e776",
+            "5d381bbc8fd2",
+            "a80c93135833",
+            "7cf846aa3529",
+            "0808af971d7f",
+            "d42d15a1b559",
+            "2196d8ddca7b",
+            "40d47c7b9e56",
+            "5dbd71a7b565"
+          ]
+        }
+      },
+      {
+        "id": "next-worktree-starts-empty",
+        "observation": {
+          "sender": [],
+          "payloads": [],
+          "settlements": {
+            "mount": "eb79a9b3682a",
+            "host-lists-three": "eb79a9b3682a",
+            "leave": "eb79a9b3682a",
+            "reopen": "eb79a9b3682a",
+            "host-closed-x": "eb79a9b3682a",
+            "leave-again": "eb79a9b3682a",
+            "reopen-again": "eb79a9b3682a",
+            "switch-to-wt-2": "eb79a9b3682a"
+          },
+          "state": "b2e323ccc369",
+          "effects": [
+            "6419a011f13b",
+            "aab012c297bd",
+            "e927128e41fc",
+            "95c8385db422",
+            "38b377793c34",
+            "4669e4d646e8",
+            "5c6699f9b431",
+            "5bd54a356841",
+            "bc94d6f00eeb",
+            "968d084a5a35",
+            "c5b498aff2c9",
+            "414746be507d",
+            "d000b4c837b7",
+            "fde92e0a066b",
+            "30f5e556f9c1",
+            "dc4910b3e253",
+            "f0f3f352c679",
+            "98136c40e776",
+            "5d381bbc8fd2",
+            "a80c93135833",
+            "7cf846aa3529",
+            "0808af971d7f",
+            "d42d15a1b559",
+            "2196d8ddca7b",
+            "40d47c7b9e56",
+            "5dbd71a7b565",
+            "5543ee241dbb",
+            "2532b032374f",
+            "4fb364aab7f9",
+            "4ab868ee910c",
+            "1e3a1c95aa65",
+            "48aab64376df",
+            "9c976031a154",
+            "b6770e9b4df2"
+          ]
+        }
+      },
+      {
+        "id": "next-worktree-never-took-the-last-strip",
+        "observation": {
+          "sender": [],
+          "payloads": [],
+          "settlements": {
+            "mount": "eb79a9b3682a",
+            "host-lists-three": "eb79a9b3682a",
+            "leave": "eb79a9b3682a",
+            "reopen": "eb79a9b3682a",
+            "host-closed-x": "eb79a9b3682a",
+            "leave-again": "eb79a9b3682a",
+            "reopen-again": "eb79a9b3682a",
+            "switch-to-wt-2": "eb79a9b3682a",
+            "leave-wt-2": "eb79a9b3682a",
+            "reopen-wt-2": "eb79a9b3682a"
+          },
+          "state": "2071fa4023ba",
+          "effects": [
+            "6419a011f13b",
+            "aab012c297bd",
+            "e927128e41fc",
+            "95c8385db422",
+            "38b377793c34",
+            "4669e4d646e8",
+            "5c6699f9b431",
+            "5bd54a356841",
+            "bc94d6f00eeb",
+            "968d084a5a35",
+            "c5b498aff2c9",
+            "414746be507d",
+            "d000b4c837b7",
+            "fde92e0a066b",
+            "30f5e556f9c1",
+            "dc4910b3e253",
+            "f0f3f352c679",
+            "98136c40e776",
+            "5d381bbc8fd2",
+            "a80c93135833",
+            "7cf846aa3529",
+            "0808af971d7f",
+            "d42d15a1b559",
+            "2196d8ddca7b",
+            "40d47c7b9e56",
+            "5dbd71a7b565",
+            "5543ee241dbb",
+            "2532b032374f",
+            "4fb364aab7f9",
+            "4ab868ee910c",
+            "1e3a1c95aa65",
+            "48aab64376df",
+            "9c976031a154",
+            "b6770e9b4df2",
+            "0c745b7b3cbc",
+            "cc93e616e745",
+            "51245db218dd",
+            "4e668f2777e4",
+            "d0f2ffb3342b",
+            "42f2550e7540",
+            "234a43e6bd65",
+            "cc01cec0da32"
+          ]
+        }
+      }
+    ]
+  }
+}
diff --git a/mobile/rpc-foundation/pilot-scenarios.json b/mobile/rpc-foundation/pilot-scenarios.json
index de261f2bd13..a9141e767c8 100644
--- a/mobile/rpc-foundation/pilot-scenarios.json
+++ b/mobile/rpc-foundation/pilot-scenarios.json
@@ -21887,6 +21887,98 @@
         }
       ]
     },
+    {
+      "id": "session-startup-reopens-with-last-strip",
+      "operation": "session.startup",
+      "family": "session.startup",
+      "sites": ["mobile/src/session/use-mobile-session-startup.ts"],
+      "schedules": [],
+      "steps": [
+        {
+          "action": "mount",
+          "id": "mount",
+          "args": {
+            "floating": true
+          }
+        },
+        {
+          "action": "host-tabs",
+          "id": "host-lists-three",
+          "args": {
+            "tabs": ["tab-a", "tab-b", "tab-x"]
+          }
+        },
+        {
+          "checkpoint": "live"
+        },
+        {
+          "action": "leave",
+          "id": "leave"
+        },
+        {
+          "action": "mount",
+          "id": "reopen",
+          "args": {
+            "floating": true
+          }
+        },
+        {
+          "checkpoint": "reopened-with-last-strip"
+        },
+        {
+          "action": "host-tabs",
+          "id": "host-closed-x",
+          "args": {
+            "tabs": ["tab-a", "tab-b"]
+          }
+        },
+        {
+          "checkpoint": "snapshot-replaced-strip"
+        },
+        {
+          "action": "leave",
+          "id": "leave-again"
+        },
+        {
+          "action": "mount",
+          "id": "reopen-again",
+          "args": {
+            "floating": true
+          }
+        },
+        {
+          "checkpoint": "closed-tab-stays-gone"
+        },
+        {
+          "action": "switch-worktree",
+          "id": "switch-to-wt-2",
+          "args": {
+            "worktree": "wt-2"
+          }
+        },
+        {
+          "checkpoint": "next-worktree-starts-empty"
+        },
+        {
+          "action": "leave",
+          "id": "leave-wt-2"
+        },
+        {
+          "action": "mount",
+          "id": "reopen-wt-2",
+          "args": {
+            "floating": true
+          }
+        },
+        {
+          "checkpoint": "next-worktree-never-took-the-last-strip"
+        },
+        {
+          "action": "unmount",
+          "id": "unmount"
+        }
+      ]
+    },
     {
       "id": "session-startup-keeps-terminals-visible-on-reconnect",
       "operation": "session.startup",
diff --git a/mobile/src/session/use-mobile-session-startup.ts b/mobile/src/session/use-mobile-session-startup.ts
index 95198089c94..a816f9173b6 100644
--- a/mobile/src/session/use-mobile-session-startup.ts
+++ b/mobile/src/session/use-mobile-session-startup.ts
@@ -1,11 +1,18 @@
-import { useEffect } from 'react'
+import { useEffect, useMemo, useRef } from 'react'
+import { skipToken, useQuery, useQueryClient } from '@tanstack/react-query'
 import { translate } from '../i18n/mobile-i18n'
+import { useWorkspaceExecutionHost } from '../navigation/workspace-execution-host'
+import { hostQueryKey } from '../query/host-query-key'
 import { worktreeActivate } from '../host-screen/host-screen-operations'
 import { headlessActivationNeedsHostRenderer } from '../worktree/worktree-activation-result'
 import { createInitialSessionAutoCreateState } from './use-initial-session-terminal-autocreate'
 import type { MobileSessionKeyboardStateModel } from './use-mobile-session-keyboard-state'
+import type { MobileSessionTab } from './mobile-session-route-types'
+import { withoutSessionTabHostOwnership } from './mobile-session-tab-status-clock'
 import type { RpcResponse } from '../transport/types'
 
+const LAST_TABS_META = { streamBacked: true }
+
 export function useMobileSessionStartup(scope: MobileSessionKeyboardStateModel) {
   const {
     hostId,
@@ -16,8 +23,10 @@ export function useMobileSessionStartup(scope: MobileSessionKeyboardStateModel)
     client,
     setTerminals,
     terminalsRef,
+    sessionTabs,
     setSessionTabs,
     appliedSnapshotMarkerRef,
+    appliedSessionTabsRevisionRef,
     closedTabTombstonesRef,
     setTerminalsLoaded,
     setActiveHandle,
@@ -46,6 +55,20 @@ export function useMobileSessionStartup(scope: MobileSessionKeyboardStateModel)
     fetchTerminals,
     ensureSessionTabs
   } = scope
+  const queryClient = useQueryClient()
+  const exec = useWorkspaceExecutionHost() ?? 'local'
+  const lastTabsKey = useMemo(
+    () => hostQueryKey(hostId, 'session.tabs', { exec, worktree: worktreeId }, {}),
+    [hostId, exec, worktreeId]
+  )
+  // Never fetched: this hook writes the entry, and observing it holds it until 10 min after leaving.
+  useQuery({
+    queryKey: lastTabsKey,
+    queryFn: skipToken,
+    meta: LAST_TABS_META,
+    notifyOnChangeProps: []
+  })
+  const seedRevisionRef = useRef(0)
   useEffect(() => {
     // Reset reused-route state so the next workspace cannot inherit stale UI or snapshot gates.
     sessionTabActionSheetRequestSeqRef.current += 1
@@ -74,7 +97,13 @@ export function useMobileSessionStartup(scope: MobileSessionKeyboardStateModel)
     setActiveHandle(null)
     setTerminals([])
     terminalsRef.current = []
-    setSessionTabs([])
+    // Paint the last strip until the host's snapshot replaces it (which treats it as the previous strip); offline keeps the empty-state body.
+    const lastTabs =
+      connState === 'connected'
+        ? queryClient.getQueryData<MobileSessionTab[]>(lastTabsKey)
+        : undefined
+    seedRevisionRef.current = appliedSessionTabsRevisionRef.current
+    setSessionTabs(lastTabs ? withoutSessionTabHostOwnership(lastTabs) : [])
     setActiveSessionTabId(null)
     clearPendingLiveInputCommit()
     setMarkdownDocs(new Map())
@@ -92,10 +121,16 @@ export function useMobileSessionStartup(scope: MobileSessionKeyboardStateModel)
     clearTerminalCache,
     setSplitTerminalHandles,
     terminalPaneViewportsRef,
-    hostId,
-    worktreeId
+    lastTabsKey
   ])
 
+  useEffect(() => {
+    // Only strips this visit took from the host; writing back the seed would pass it off as fresh.
+    if (appliedSessionTabsRevisionRef.current > seedRevisionRef.current) {
+      queryClient.setQueryData(lastTabsKey, sessionTabs)
+    }
+  }, [queryClient, lastTabsKey, sessionTabs])
+
   // Every setTimeout goes through addTimer into `timers`, which the returned cleanup clears.
   // react-doctor-disable-next-line react-doctor/effect-needs-cleanup
   useEffect(() => {
diff --git a/mobile/src/test-support/bridged-parity/divergence-classes.ts b/mobile/src/test-support/bridged-parity/divergence-classes.ts
index 687a64d2621..67cb8efaba1 100644
--- a/mobile/src/test-support/bridged-parity/divergence-classes.ts
+++ b/mobile/src/test-support/bridged-parity/divergence-classes.ts
@@ -116,7 +116,7 @@ export const BRIDGED_PARITY_EXCLUSIONS: Readonly<Partial<Record<BridgedParityCla
 
 // Pin strict History verdicts and unchanged legacy counts in both directions.
 export const BRIDGED_PARITY_BASELINE: Readonly<Record<BridgedParityClass | 'identical', number>> = {
-  identical: 384,
+  identical: 385,
   'reply-meta-required': 0,
   'result-absent-settlement': 330,
   'result-absent-observation': 3,
diff --git a/mobile/src/test-support/rpc-recording/adapters/session-startup-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/session-startup-mount-adapters.ts
index ee4bfd213ce..1b82011d620 100644
--- a/mobile/src/test-support/rpc-recording/adapters/session-startup-mount-adapters.ts
+++ b/mobile/src/test-support/rpc-recording/adapters/session-startup-mount-adapters.ts
@@ -1,13 +1,14 @@
 import { hookMount } from '../hook-mount'
 import { mountFixture } from '../recorder-fixture-shape'
+import type { MobileSessionTab } from '../../../session/mobile-session-route-types'
 import type { operationModuleLoader } from '../operation-module-loader'
 import type { MountAdapter } from '../recording-scenario'
 
-const WORKTREE_ID = 'wt-1'
 const HOST_ID = 'host-1'
 
 // Record callback effects and flags; scenario-declared tab-load rejection tests whether later terminal loads survive.
 // Consume created on the same mount to reach both mutually exclusive activation sites through the real effect rerun.
+// `host-tabs` stands in for an accepted host snapshot (revision bump, then the strip); `leave` keeps the document's cache for a reopen.
 export function sessionStartupMountAdapters(
   modules: ReturnType<typeof operationModuleLoader>
 ): Record<string, MountAdapter> {
@@ -18,6 +19,7 @@ export function sessionStartupMountAdapters(
       ).useMobileSessionStartup
 
       let created: string | undefined
+      let worktreeId = 'wt-1'
       let isFloatingWorkspaceRoute = false
       let tabLoadRejects = false
       let terminalsLoaded = true
@@ -29,19 +31,34 @@ export function sessionStartupMountAdapters(
       const terminalGestureInputQueuesRef = { current: new Map<string, never>() }
       const terminalGestureInputInFlightRef = { current: new Set<string>() }
       const sessionTabActionSheetRequestSeqRef = { current: 0 }
+      let sessionTabs: MobileSessionTab[] = []
+      const appliedSessionTabsRevisionRef = { current: 0 }
+      // Stable like the screen's own callbacks, so an update reruns the route reset only when the route changes.
+      const routeResetDeps = {
+        setSplitTerminalHandles: () => {},
+        terminalPaneViewportsRef: { current: new Map() },
+        clearPendingLiveInputCommit: () => effect('clear-pending-live-input-commit', {}),
+        clearDelayedActionTimers: () => effect('clear-delayed-action-timers', {}),
+        clearTerminalCache: () => effect('clear-terminal-cache', {})
+      }
 
       const hook = hookMount(() => {
         useStartup(
           mountFixture<Parameters<typeof useStartup>[0]>({
+            ...routeResetDeps,
             hostId: HOST_ID,
-            worktreeId: WORKTREE_ID,
+            worktreeId,
             created,
             isFloatingWorkspaceRoute,
             connState: 'connected',
             client,
             setTerminals: () => {},
             terminalsRef: { current: [] },
-            setSessionTabs: () => {},
+            sessionTabs,
+            setSessionTabs: (update) => {
+              sessionTabs = typeof update === 'function' ? update(sessionTabs) : update
+            },
+            appliedSessionTabsRevisionRef,
             appliedSnapshotMarkerRef,
             closedTabTombstonesRef,
             setTerminalsLoaded: (value: boolean) => {
@@ -51,8 +68,6 @@ export function sessionStartupMountAdapters(
               activeHandle = typeof update === 'function' ? update(activeHandle) : update
             },
             setActiveSessionTabId: () => {},
-            setSplitTerminalHandles: () => {},
-            terminalPaneViewportsRef: { current: new Map() },
             setMarkdownDocs: () => {},
             setFileDocs: () => {},
             terminalGestureInputQueuesRef,
@@ -70,11 +85,8 @@ export function sessionStartupMountAdapters(
             pendingBrowserFocusPageIdRef: { current: null },
             pendingTerminalActivationAttemptRef: { current: null },
             initialSessionAutoCreateRef: { current: null },
-            clearPendingLiveInputCommit: () => effect('clear-pending-live-input-commit', {}),
-            clearDelayedActionTimers: () => effect('clear-delayed-action-timers', {}),
             showToast: (message: string, durationMs?: number) =>
               effect('toast', { message, durationMs: durationMs ?? null }),
-            clearTerminalCache: () => effect('clear-terminal-cache', {}),
             fetchTerminals: async (options) => {
               effect('fetch-terminals', { allowEmptyLoaded: options?.allowEmptyLoaded ?? null })
               return true
@@ -105,12 +117,34 @@ export function sessionStartupMountAdapters(
             created = undefined
             return hook.update()
           }
+          if (name === 'host-tabs') {
+            const ids = Array.isArray(args.tabs) ? args.tabs.map(String) : []
+            appliedSessionTabsRevisionRef.current += 1
+            sessionTabs = ids.map((id) =>
+              mountFixture<Extract<MobileSessionTab, { type: 'terminal' }>>({
+                id,
+                type: 'terminal',
+                title: id,
+                terminal: id
+              })
+            )
+            return hook.update()
+          }
+          if (name === 'switch-worktree') {
+            // A reused route: same screen, next workspace.
+            worktreeId = String(args.worktree)
+            return hook.update()
+          }
+          if (name === 'leave') {
+            return hook.leave()
+          }
           if (name === 'unmount') {
             return hook.unmount()
           }
           throw new Error(`Unknown session startup action: ${name}`)
         },
         state: () => ({
+          sessionTabs: sessionTabs.map((tab) => tab.id),
           terminalsLoaded,
           activeHandle,
           initializedHandles: [...initializedHandlesRef.current].sort(),