Skip to content

Commit b40b65f

Browse files
refactor(mobile): each new-task draft route keeps its own flow state
The new-task flow (selected project, draft, submitting, expanded provider) was one set of useState in the provider shared by every draft route. Each draft route reset it in a layout effect on mount and gated its first render on that, and a draft opened by id was bound by an effect that awaited draft hydration and re-ran on every project list change. Flow state now lives in a module atom keyed by the draft route (route key + draft identity) and is pruned from the navigation state change handler when the route leaves the stack. A new route starts fresh by key, so the reset effect and its gate are gone. A route's draftId is resolved in render from the hydrated drafts (new composerDraftsLoadedAtom) and loaded projects; a draft or project that is gone sends the route back to the project picker. Effects: NewTaskDraftRouteScreen 1 -> 0 (reset layout effect), NewTaskDraftScreen 2 removed (selectedProjectRef sync, draft-open retry effect). The provider keeps its draft-creation effect: the draft key must exist before the composer mounts. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 96fc7b9 commit b40b65f

8 files changed

Lines changed: 342 additions & 114 deletions

File tree

‎apps/mobile/src/App.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ import {
7474
linkToRootPath,
7575
rootNavigationRef,
7676
} from "./lib/rootNavigation";
77+
import { pruneNewTaskFlowStates } from "./features/threads/new-task-flow-state";
7778
import { pruneNewTaskBranchCheckouts } from "./features/threads/NewTaskDraftRouteScreen";
7879

7980
import "../global.css";
@@ -132,6 +133,7 @@ function handleNavigationStateChange(state: NavigationState | undefined): void {
132133
if (!state) return;
133134
setAgentNotificationPathname(workspaceLocationFromState(state).pathname);
134135
recordAppShortcutNavigationState(state);
136+
pruneNewTaskFlowStates(state);
135137
pruneNewTaskBranchCheckouts(state);
136138
}
137139

‎apps/mobile/src/Stack.tsx‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ import {
8989
NewTaskThreadSettingsRouteScreen,
9090
} from "./features/threads/ThreadSettingsSheet";
9191
import { NewTaskFlowProvider } from "./features/threads/new-task-flow-provider";
92+
import { newTaskFlowKey } from "./features/threads/new-task-flow-state";
9293
import { NewTaskRouteScreen } from "./features/threads/NewTaskRouteScreen";
9394
import { SettingsNavigationRouteScreen } from "./features/settings/SettingsNavigationRouteScreen";
9495
import { SettingsAppearanceRouteScreen } from "./features/settings/SettingsAppearanceRouteScreen";
@@ -500,7 +501,12 @@ function RootStackLayout(props: {
500501
.slice(0, props.state.index + 1)
501502
.filter((route) => !isWorkspaceOverlayRoute(route.name)),
502503
);
503-
const draftRoute = props.state.routes.findLast((route) => route.name === "Thread");
504+
// The flow follows the draft route even while a pushed Thread covers it, so
505+
// its state lives exactly as long as the route.
506+
const draftRoute = props.state.routes.findLast(isDraftThreadRoute);
507+
const draftRouteOnTop =
508+
draftRoute !== undefined &&
509+
props.state.routes.findLast((route) => route.name === "Thread") === draftRoute;
504510
const draftParams = (
505511
draftRoute?.params as { draft?: { draftId?: string | string[] } } | undefined
506512
)?.draft;
@@ -509,7 +515,11 @@ function RootStackLayout(props: {
509515
: draftParams?.draftId;
510516

511517
return (
512-
<NewTaskFlowProvider active={isDraftThreadRoute(draftRoute)} routeDraftId={routeDraftId}>
518+
<NewTaskFlowProvider
519+
active={draftRouteOnTop}
520+
flowKey={draftRoute === undefined ? undefined : newTaskFlowKey(draftRoute)}
521+
routeDraftId={routeDraftId}
522+
>
513523
<HardwareKeyboardCommandProvider pathname={pathname}>
514524
<ShowcaseCaptureCoordinator pathname={pathname} />
515525
<SettingsEnvironmentFilterProvider open={settingsOpen}>

‎apps/mobile/src/features/threads/NewTaskDraftRouteScreen.tsx‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { useNewTaskFlow } from "./new-task-flow-provider";
21
import * as Dialog from "../../components/ui/Dialog";
32
import {
43
CommonActions,
@@ -7,7 +6,7 @@ import {
76
usePreventRemoveContext,
87
type StaticScreenProps,
98
} from "@react-navigation/native";
10-
import { useEffect, useLayoutEffect, useState } from "react";
9+
import { useEffect, useState } from "react";
1110
import { View } from "react-native";
1211
import { useAtomValue } from "@effect/atom-react";
1312
import {
@@ -91,13 +90,6 @@ const idleBranchCheckoutAtom = Atom.make(AsyncResult.initial<BranchCheckoutResul
9190
export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraftRouteParams>) {
9291
const currentRoute = useRoute();
9392
const params = route.params ?? {};
94-
const { reset } = useNewTaskFlow();
95-
const [initialized, setInitialized] = useState(false);
96-
useLayoutEffect(() => {
97-
reset();
98-
// oxlint-disable-next-line react/set-state-in-effect -- Draft reset runs once before first paint; initialized gates the screen until then.
99-
setInitialized(true);
100-
}, [reset]);
10193
const draftId = Array.isArray(params.draftId) ? params.draftId[0] : params.draftId;
10294
const projects = useProjects();
10395
const { state: catalogState } = useWorkspaceState();
@@ -201,7 +193,6 @@ export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraf
201193
};
202194
const preparingBranch = checkoutPending || (needsPreparation && result?._tag !== "Success");
203195

204-
if (!initialized) return null;
205196
return (
206197
<>
207198
{preparingBranch ? (

‎apps/mobile/src/features/threads/NewTaskDraftScreen.tsx‎

Lines changed: 8 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ import {
6060
updateComposerDraftSettings,
6161
scheduleUnusedComposerAttachmentCleanup,
6262
type ComposerDraft,
63-
waitForComposerDraftsLoaded,
6463
} from "../../state/use-composer-drafts";
6564
import { useEnvironmentServerConfig, useProjects } from "../../state/entities";
6665
import { useProjectClone } from "../../state/projectClones";
@@ -92,6 +91,7 @@ import {
9291
import { useIncomingShare } from "../sharing/IncomingShareProvider";
9392
import { selectIncomingShareAttachmentsForServer } from "../sharing/incoming-share-model";
9493
import { appAtomRegistry } from "../../state/atom-registry";
94+
import { scopedProjectKey } from "../../lib/scopedEntities";
9595
import { serverEnvironment } from "../../state/server";
9696

9797
import { readEnvironmentScope, useEnvironmentScope } from "../../state/session";
@@ -218,10 +218,6 @@ export function NewTaskDraftScreen(props: {
218218
}
219219
};
220220
const deleteProject = useAtomCommand(projectEnvironment.delete, { reportFailure: false });
221-
const selectedProjectRef = useRef(selectedProject);
222-
useEffect(() => {
223-
selectedProjectRef.current = selectedProject;
224-
}, [selectedProject]);
225221
const removeClonedProject = async () => {
226222
if (!selectedProject) return;
227223
const removed = selectedProject;
@@ -237,8 +233,7 @@ export function NewTaskDraftScreen(props: {
237233
);
238234
return;
239235
}
240-
const current = selectedProjectRef.current;
241-
if (current?.id === removed.id && current.environmentId === removed.environmentId) {
236+
if (flow.getSelectedProjectKey() === scopedProjectKey(removed.environmentId, removed.id)) {
242237
navigation.dispatch(StackActions.replace("Home"));
243238
}
244239
};
@@ -294,8 +289,10 @@ export function NewTaskDraftScreen(props: {
294289
project.id === props.initialProjectRef?.projectId,
295290
),
296291
);
292+
// A route naming a draft that is gone, or whose project is gone, also
293+
// returns to the picker.
297294
const isProjectPickerReturnActive =
298-
isReturningToProjectPicker && !requestedInitialProjectAvailable;
295+
(isReturningToProjectPicker && !requestedInitialProjectAvailable) || flow.routeTargetMissing;
299296
const isIncomingShareAwaitingServerConfig = Boolean(
300297
incomingShare?.attachments.some((attachment) => attachment.type === "file") &&
301298
selectedEnvironmentServerConfig === null,
@@ -350,10 +347,10 @@ export function NewTaskDraftScreen(props: {
350347
}
351348
}, [cancelledIncomingShareId, navigation, props.incomingShareId]);
352349
useEffect(() => {
353-
if (!isReturningToProjectPicker) {
350+
if (!isProjectPickerReturnActive) {
354351
return;
355352
}
356-
if (requestedInitialProjectAvailable) {
353+
if (isReturningToProjectPicker && requestedInitialProjectAvailable) {
357354
// oxlint-disable-next-line react/set-state-in-effect -- Ends the return-to-picker flow once the requested project arrives from the catalog.
358355
setIsReturningToProjectPicker(false);
359356
return;
@@ -366,6 +363,7 @@ export function NewTaskDraftScreen(props: {
366363
});
367364
return () => cancelAnimationFrame(frame);
368365
}, [
366+
isProjectPickerReturnActive,
369367
isReturningToProjectPicker,
370368
navigation,
371369
props.incomingShareId,
@@ -384,37 +382,6 @@ export function NewTaskDraftScreen(props: {
384382
};
385383
}, []);
386384

387-
const { openDraft } = flow;
388-
// Cold launches load drafts and projects separately; wait for hydration and retry while shells load.
389-
const attemptedDraftIdRef = useRef<string | null>(null);
390-
useEffect(() => {
391-
if (!props.draftId) {
392-
return;
393-
}
394-
const draftId = props.draftId;
395-
if (attemptedDraftIdRef.current === draftId) {
396-
return;
397-
}
398-
let cancelled = false;
399-
void waitForComposerDraftsLoaded().then(() => {
400-
if (cancelled || attemptedDraftIdRef.current === draftId) {
401-
return;
402-
}
403-
if (openDraft(draftId)) {
404-
attemptedDraftIdRef.current = draftId;
405-
return;
406-
}
407-
if (getComposerDraftSnapshot(draftId).project !== undefined && projects.length === 0) {
408-
return;
409-
}
410-
attemptedDraftIdRef.current = draftId;
411-
navigation.dispatch(CommonActions.navigate("NewTaskProject"));
412-
});
413-
return () => {
414-
cancelled = true;
415-
};
416-
}, [navigation, openDraft, projects, props.draftId]);
417-
418385
const lastInitialProjectRefRef = useRef(props.initialProjectRef);
419386

420387
useEffect(() => {

0 commit comments

Comments
 (0)