@devries-cameron20 / t3code Mirror · read-only / commits / 56c365cc29
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 22, 19:30 UTC

fix(web): new threads no longer hang when a project's machine is offline (#23967)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

Theo Browne committed Oct 22, 2026 at 23:53 UTC 56c365cc29de58746d9888567aed1a71f07d9370
2 files changed +42 -4
apps/web/src/hooks/useHandleNewThread.test.ts
+34 -3
@@ -5,8 +5,9 @@ const testState = vi.hoisted(() => {
5 let completeProjectFileRead: (value: null) => void = () => undefined;
6 let projectFileRead = Promise.resolve<null>(null);
7 let projectRemoved = false;
8 + let connectedEnvironmentIds = ["environment-primary", "environment-ssh"];
9 let targetSettings = {
9 - defaultThreadEnvMode: "local" as "local" | "worktree",
10 + defaultThreadEnvMode: "local" as "local" | "worktree" | null,
11 newWorktreesStartFromOrigin: false,
12 defaultModelSelection: null,
13 defaultRuntimeMode: "full-access" as RuntimeMode,
@@ -46,6 +47,12 @@ const testState = vi.hoisted(() => {
47 get projectRemoved() {
48 return projectRemoved;
49 },
50 + get connectedEnvironmentIds() {
51 + return connectedEnvironmentIds;
52 + },
53 + disconnect(environmentId: string) {
54 + connectedEnvironmentIds = connectedEnvironmentIds.filter((id) => id !== environmentId);
55 + },
56 removeProject() {
57 projectRemoved = true;
58 },
@@ -55,12 +62,13 @@ const testState = vi.hoisted(() => {
62 reset(
63 nextStoredDraft: typeof storedDraft,
64 workspaceDefaults = {
58 - envMode: "local" as "local" | "worktree",
65 + envMode: "local" as "local" | "worktree" | null,
66 startFromOrigin: false,
67 },
68 ) {
69 storedDraft = nextStoredDraft;
70 projectRemoved = false;
71 + connectedEnvironmentIds = ["environment-primary", "environment-ssh"];
72 targetSettings = {
73 defaultThreadEnvMode: workspaceDefaults.envMode,
74 newWorktreesStartFromOrigin: workspaceDefaults.startFromOrigin,
@@ -94,7 +102,12 @@ const testServerConfigs = () =>
102 ]);
103
104 vi.mock("../rpc/atomRegistry", () => ({
97 - appAtomRegistry: { get: () => testServerConfigs() },
105 + appAtomRegistry: {
106 + get: (atom: unknown) =>
107 + atom === "connected-environment-ids"
108 + ? testState.connectedEnvironmentIds
109 + : testServerConfigs(),
110 + },
111 }));
112
113 vi.mock("@effect/atom-react", () => ({
@@ -187,6 +200,9 @@ vi.mock("../state/entities", () => {
200 useThread: () => null,
201 };
202 });
203 +vi.mock("../state/presentation", () => ({
204 + environmentSummaries: { connectedEnvironmentIdsAtom: "connected-environment-ids" },
205 +}));
206 vi.mock("../state/server", () => ({
207 environmentServerConfigsAtom: {},
208 primaryServerSettingsAtom: "primary-settings",
@@ -244,3 +260,18 @@ describe.each([
260 expect(testState.draftStore.setLogicalProjectDraftThreadId).not.toHaveBeenCalled();
261 });
262 });
263 +
264 +describe("useNewThreadHandler", () => {
265 + it("opens the draft without waiting on a project file from an offline machine", async () => {
266 + testState.reset(null, { envMode: null, startFromOrigin: false });
267 + testState.disconnect("environment-ssh");
268 +
269 + const opened = await useNewThreadHandler()({
270 + environmentId: "environment-ssh",
271 + projectId: "project-remote",
272 + } as never);
273 +
274 + expect(opened).toEqual({ draftId: "draft-delayed", threadId: "thread-delayed" });
275 + expect(testState.router.navigate).toHaveBeenCalledOnce();
276 + });
277 +});
apps/web/src/hooks/useHandleNewThread.ts
+8 -1
@@ -36,6 +36,7 @@ import {
36 } from "../lib/chatThreadActions";
37 import { readT3ProjectFile } from "../lib/t3ProjectFileDefaults";
38 import { appAtomRegistry } from "../rpc/atomRegistry";
39 +import { environmentSummaries } from "../state/presentation";
40 import { environmentServerConfigsAtom } from "../state/server";
41 import { resolveThreadRouteTarget } from "../threadRoutes";
42 import { legacyProjectCwdPreferenceKey, useUiStateStore } from "../uiStateStore";
@@ -139,8 +140,14 @@ export function useNewThreadHandler() {
140 destinationDraftId,
141 });
142 const resolveDefaultEnvMode = async (): Promise<DraftThreadEnvMode> => {
143 + // Environment queries wait for a connection, so reading the project file on an
144 + // offline machine would never settle and the draft would never open.
145 const consultProjectFile =
143 - project !== undefined && projectSettings.settings.defaultThreadEnvMode === null;
146 + project !== undefined &&
147 + projectSettings.settings.defaultThreadEnvMode === null &&
148 + appAtomRegistry
149 + .get(environmentSummaries.connectedEnvironmentIdsAtom)
150 + .includes(project.environmentId);
151 const projectFile = consultProjectFile
152 ? await readT3ProjectFile(project.environmentId, project.workspaceRoot)
153 : null;