The best way to control Claude Code, Codex and more from any computer or phone
fix(mobile): Reconnect and Retry now on a switched-off environment switch it back on (#28628)
Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Victor committed
Nov 14, 2026 at 08:00 UTC
9441a7285c5f3466e743d6fa1489fbefed9043f1
8 files changed
+134
-14
apps/mobile/src/features/connection/useConnectionController.ts
-4
@@ -38,7 +38,6 @@ export function useConnectionController() {
38
const updateBearer = useAtomCommand(updateBearerConnection, { reportFailure: false });
39
const registerEnvironment = useAtomCommand(environmentCatalog.register, "environment register");
40
const removeEnvironmentMutation = useAtomCommand(environmentCatalog.remove, "environment remove");
41
- const retryEnvironmentMutation = useAtomCommand(environmentCatalog.retryNow, "environment retry");
41
const setEnvironmentEnabledMutation = useAtomCommand(
42
environmentCatalog.setEnabled,
43
"environment toggle",
@@ -84,8 +83,6 @@ export function useConnectionController() {
83
);
84
const removeEnvironment = (environmentId: EnvironmentId) =>
85
removeEnvironmentMutation(environmentId);
87
- const retryEnvironment = (environmentId: EnvironmentId) =>
88
- retryEnvironmentMutation(environmentId);
86
const setEnvironmentEnabled = (environmentId: EnvironmentId, enabled: boolean) =>
87
setEnvironmentEnabledMutation({ environmentId, enabled });
88
const updateEnvironment = (
@@ -111,7 +108,6 @@ export function useConnectionController() {
108
connectPairingUrl,
109
connectRelayEnvironment,
110
removeEnvironment,
114
- retryEnvironment,
111
setEnvironmentEnabled,
112
updateEnvironment,
113
refreshRelayEnvironments,
apps/mobile/src/features/connection/useRetryEnvironment.test.tsx
new
+108
@@ -0,0 +1,108 @@
1
+import { RegistryContext } from "@effect/atom-react";
2
+import { EnvironmentId } from "@t3tools/contracts";
3
+import {
4
+ EnvironmentRegistry,
5
+ PrimaryConnectionTarget,
6
+ type ConnectionCatalogEntry,
7
+} from "@t3tools/client-runtime/connection";
8
+import * as Effect from "effect/Effect";
9
+import * as Option from "effect/Option";
10
+import * as SubscriptionRef from "effect/SubscriptionRef";
11
+import { AtomRegistry } from "effect/reactivity";
12
+import { act, useLayoutEffect } from "react";
13
+import { createRoot } from "react-dom/client";
14
+import { describe, expect, it } from "@effect/vitest";
15
+import { vi } from "vite-plus/test";
16
+
17
+const fixture = vi.hoisted(() => ({
18
+ environment: undefined as
19
+ | Pick<
20
+ EnvironmentRegistry.EnvironmentRegistry["Service"],
21
+ "entries" | "retryNow" | "setEnabled"
22
+ >
23
+ | undefined,
24
+}));
25
+
26
+vi.mock("../../connection/runtime", async () => {
27
+ const { Atom } = await import("effect/reactivity");
28
+ const Layer = await import("effect/Layer");
29
+ const { EnvironmentRegistry } = await import("@t3tools/client-runtime/connection");
30
+ return {
31
+ connectionAtomRuntime: Atom.runtime(
32
+ Layer.suspend(() =>
33
+ Layer.succeed(
34
+ EnvironmentRegistry.EnvironmentRegistry,
35
+ fixture.environment as unknown as EnvironmentRegistry.EnvironmentRegistry["Service"],
36
+ ),
37
+ ),
38
+ ),
39
+ };
40
+});
41
+
42
+import { useRetryEnvironment } from "./useRetryEnvironment";
43
+
44
+const environmentId = EnvironmentId.make("retry-environment");
45
+
46
+describe("useRetryEnvironment", () => {
47
+ it.effect.each([
48
+ { enabled: false, retries: 0 },
49
+ { enabled: true, retries: 1 },
50
+ ])("Retry now with the environment enabled: $enabled", ({ enabled, retries }) =>
51
+ Effect.gen(function* () {
52
+ (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;
53
+ const target = new PrimaryConnectionTarget({
54
+ environmentId,
55
+ label: "Retry",
56
+ httpBaseUrl: "https://retry.test",
57
+ wsBaseUrl: "wss://retry.test",
58
+ });
59
+ const entries = yield* SubscriptionRef.make<
60
+ ReadonlyMap<EnvironmentId, ConnectionCatalogEntry>
61
+ >(new Map([[environmentId, { target, profile: Option.none(), enabled }]]));
62
+ let retryCount = 0;
63
+ fixture.environment = {
64
+ entries,
65
+ retryNow: () =>
66
+ Effect.sync(() => {
67
+ retryCount += 1;
68
+ }),
69
+ setEnabled: (id, next) =>
70
+ SubscriptionRef.update(entries, (current) =>
71
+ new Map(current).set(id, { ...current.get(id)!, enabled: next }),
72
+ ),
73
+ };
74
+
75
+ const registry = AtomRegistry.make();
76
+ const root = createRoot(document.createElement("div"));
77
+ using _mounted = {
78
+ [Symbol.dispose]() {
79
+ act(() => root.unmount());
80
+ registry.dispose();
81
+ },
82
+ };
83
+ let retryEnvironment!: ReturnType<typeof useRetryEnvironment>;
84
+ function Probe() {
85
+ const value = useRetryEnvironment();
86
+ useLayoutEffect(() => {
87
+ retryEnvironment = value;
88
+ });
89
+ return null;
90
+ }
91
+ yield* Effect.promise(async () => {
92
+ await act(async () =>
93
+ root.render(
94
+ <RegistryContext value={registry}>
95
+ <Probe />
96
+ </RegistryContext>,
97
+ ),
98
+ );
99
+ await act(async () => {
100
+ await retryEnvironment(environmentId);
101
+ });
102
+ });
103
+
104
+ const entry = (yield* SubscriptionRef.get(entries)).get(environmentId);
105
+ expect({ enabled: entry?.enabled, retries: retryCount }).toEqual({ enabled: true, retries });
106
+ }),
107
+ );
108
+});
apps/mobile/src/features/connection/useRetryEnvironment.ts
new
+17
@@ -0,0 +1,17 @@
1
+import { useAtomValue } from "@effect/atom-react";
2
+import type { EnvironmentId } from "@t3tools/contracts";
3
+
4
+import { environmentCatalog } from "../../connection/catalog";
5
+import { useAtomCommand } from "../../state/use-atom-command";
6
+
7
+export function useRetryEnvironment() {
8
+ const catalog = useAtomValue(environmentCatalog.catalogValueAtom);
9
+ const retryNow = useAtomCommand(environmentCatalog.retryNow, "environment retry");
10
+ const setEnabled = useAtomCommand(environmentCatalog.setEnabled, "environment toggle");
11
+
12
+ return (environmentId: EnvironmentId) =>
13
+ // A retry does nothing while the environment is switched off.
14
+ catalog.entries.get(environmentId)?.enabled === false
15
+ ? setEnabled({ environmentId, enabled: true })
16
+ : retryNow(environmentId);
17
+}
apps/mobile/src/features/files/WorkspaceFilePreviewError.tsx
+2
-3
@@ -2,11 +2,10 @@ import type { EnvironmentId } from "@t3tools/contracts";
2
import { View } from "react-native";
3
4
import { EmptyState } from "../../components/ui/EmptyState";
5
-import { environmentCatalog } from "../../connection/catalog";
5
import type { AssetUrlFailureReason } from "../../state/asset-url-state";
7
-import { useAtomCommand } from "../../state/use-atom-command";
6
import { useEnvironmentPresentation } from "../../state/presentation";
7
import { EnvironmentConnectionNotice } from "../connection/EnvironmentConnectionNotice";
8
+import { useRetryEnvironment } from "../connection/useRetryEnvironment";
9
10
export function WorkspaceFilePreviewError(props: {
11
readonly environmentId: EnvironmentId | null;
@@ -15,7 +14,7 @@ export function WorkspaceFilePreviewError(props: {
14
}) {
15
const { environmentId, onRetry } = props;
16
const environment = useEnvironmentPresentation(environmentId);
18
- const retryEnvironment = useAtomCommand(environmentCatalog.retryNow, "environment retry");
17
+ const retryEnvironment = useRetryEnvironment();
18
const retryConnection = () => {
19
if (environmentId !== null) void retryEnvironment(environmentId);
20
onRetry();
apps/mobile/src/features/review/ReviewSheet.tsx
+2
-3
@@ -26,11 +26,10 @@ import {
26
import { PaneListItem } from "../../components/ui/PaneListItem";
27
import { ScreenContent } from "../../components/ui/ScreenContent";
28
import { SheetPane } from "../../components/ui/SheetPane";
29
-import { environmentCatalog } from "../../connection/catalog";
29
import { useEnvironmentPresentation } from "../../state/presentation";
31
-import { useAtomCommand } from "../../state/use-atom-command";
30
import { useThreadDraftForThread } from "../../state/use-thread-composer-state";
31
import { EnvironmentConnectionNotice } from "../connection/EnvironmentConnectionNotice";
32
+import { useRetryEnvironment } from "../connection/useRetryEnvironment";
33
import { useAppearancePreferences } from "../settings/appearance/AppearancePreferencesProvider";
34
import {
35
Inspector,
@@ -351,7 +350,7 @@ export function ReviewSheet(props: ReviewSheetProps) {
350
const { themeAppearance: selectedTheme } = useAppearancePreferences();
351
const { environmentId, threadId } = props.route.params;
352
const environment = useEnvironmentPresentation(environmentId);
354
- const retryEnvironment = useAtomCommand(environmentCatalog.retryNow, "environment retry");
353
+ const retryEnvironment = useRetryEnvironment();
354
const isEnvironmentReady = environment.presentation?.connection.phase === "connected";
355
const { draftMessage, draftContext } = useThreadDraftForThread({ environmentId, threadId });
356
const reviewCache = useReviewCacheForThread({ environmentId, threadId });
apps/mobile/src/features/terminal/ThreadTerminalRouteScreen.tsx
+2
-2
@@ -40,7 +40,6 @@ import { LoadingScreen } from "../../components/LoadingScreen";
40
import { ScreenContent } from "../../components/ui/ScreenContent";
41
import { Button } from "../../components/ui/Button";
42
import { IconButton } from "../../components/ui/IconButton";
43
-import { environmentCatalog } from "../../connection/catalog";
43
import { useEnvironmentPresentation } from "../../state/presentation";
44
import { terminalEnvironment } from "../../state/terminal";
45
import { environmentSession, readEnvironmentScope } from "../../state/session";
@@ -64,6 +63,7 @@ import {
63
import { useThreadSelection } from "../../state/use-thread-selection";
64
import { useSelectedThreadProjection } from "../../state/use-thread-detail";
65
import { EnvironmentConnectionNotice } from "../connection/EnvironmentConnectionNotice";
66
+import { useRetryEnvironment } from "../connection/useRetryEnvironment";
67
import { TerminalSurface, type TerminalSurfaceHandle } from "./NativeTerminalSurface";
68
import { getMobileTerminalTheme } from "./terminalTheme";
69
import { useTerminalExitNavigation } from "./useTerminalExitNavigation";
@@ -381,7 +381,7 @@ function ThreadTerminal(props: {
381
const navigation = useNavigation();
382
const writeTerminal = useAtomCommand(terminalEnvironment.write, "terminal write");
383
const clearTerminal = useAtomCommand(terminalEnvironment.clear, "terminal clear");
384
- const retryEnvironment = useAtomCommand(environmentCatalog.retryNow, "environment retry");
384
+ const retryEnvironment = useRetryEnvironment();
385
const selectedThreadDetail = useSelectedThreadProjection();
386
const selectedThreadDetailWorktreePath =
387
selectedThreadDetail?.projection.thread.worktreePath ?? null;
apps/mobile/src/state/use-remote-environment-registry.ts
+2
-2
@@ -9,6 +9,7 @@ import { runAtomCommand } from "@t3tools/client-runtime/state/runtime";
9
10
import { hasCloudPublicConfig } from "../features/cloud/publicConfig";
11
import { useConnectionController } from "../features/connection/useConnectionController";
12
+import { useRetryEnvironment } from "../features/connection/useRetryEnvironment";
13
import { environmentPresentations } from "./presentation";
14
import { useWorkspaceConnectionState, useWorkspaceEnvironments } from "./workspace";
15
import type { SavedRemoteConnection } from "../lib/connection";
@@ -166,8 +167,7 @@ export function useRemoteConnections() {
167
const onConnectPress = (pairingUrl?: string, expectedEnvironmentId?: EnvironmentId) =>
168
pairEnvironment(pairingUrl ?? connectionPairingUrl, expectedEnvironmentId);
169
169
- const onReconnectEnvironment = (environmentId: EnvironmentId) =>
170
- controller.retryEnvironment(environmentId);
170
+ const onReconnectEnvironment = useRetryEnvironment();
171
const onSetEnvironmentEnabled = (environmentId: EnvironmentId, enabled: boolean) =>
172
controller.setEnvironmentEnabled(environmentId, enabled);
173
const onUpdateEnvironment = (
apps/mobile/vite.config.ts
+1
@@ -46,6 +46,7 @@ const reactTests = [
46
"src/features/home/home-list-options.test.tsx",
47
"src/features/home/home-route-visibility.test.tsx",
48
"src/features/layout/workspace/useSearchScrollRestoration.test.tsx",
49
+ "src/features/connection/useRetryEnvironment.test.tsx",
50
"src/features/connection/ConnectionsNewRouteScreen.test.tsx",
51
"src/features/connection/LinkedEnvironmentsSection.test.tsx",
52
"src/features/devices/device-stream.browser.test.ts",