Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -431,15 +431,16 @@ export function NewTaskDraftScreen(props: {
if (appliedInitialProjectKeyRef.current === directProjectKey) {
return;
}
// setProject creates the draft, so it also runs when the fallback already shows this project.
const showsDirectProject =
flow.draftKey !== null &&
selectedProject?.environmentId === directProject.environmentId &&
selectedProject.id === directProject.id;
if (props.initialProjectRef?.branch) {
if (
selectedProject?.environmentId !== directProject.environmentId ||
selectedProject.id !== directProject.id
) {
if (!showsDirectProject || !flow.draftKey) {
setProject(directProject);
return;
}
if (!flow.draftKey) return;
// Checkout completed before mount; local mode reuses it while worktree mode would create another.
updateComposerDraftSettings(flow.draftKey, {
workspaceSelection: {
Expand All @@ -451,12 +452,7 @@ export function NewTaskDraftScreen(props: {
});
}
appliedInitialProjectKeyRef.current = directProjectKey;
if (
selectedProject?.environmentId === directProject.environmentId &&
selectedProject.id === directProject.id
) {
return;
}
if (showsDirectProject) return;
setProject(directProject);
return;
}
Expand Down
27 changes: 23 additions & 4 deletions apps/mobile/src/features/threads/new-task-flow-provider.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import * as Layer from "effect/Layer";
import * as Queue from "effect/Queue";
import * as Stream from "effect/Stream";
import { AsyncResult, Atom, AtomRegistry } from "effect/reactivity";
import { act, useLayoutEffect } from "react";
import { act, useEffect, useLayoutEffect } from "react";
import { createRoot } from "react-dom/client";
import { expect, it, vi } from "vite-plus/test";
import type { ComposerDraft } from "../../state/use-composer-drafts";
Expand Down Expand Up @@ -213,11 +213,16 @@ function setup() {
mocks.writeSettings.mockImplementation(write);
mocks.writeText.mockImplementation((key, text) => write(key, { text }));
let current: ReturnType<typeof useNewTaskFlow>;
function Probe() {
function Probe(props: { readonly pickOnMount?: EnvironmentProject }) {
const value = useNewTaskFlow();
useLayoutEffect(() => {
current = value;
});
// Mirrors the draft screen applying its route project on mount, before the provider's effects run.
useEffect(() => {
if (props.pickOnMount) value.setProject(props.pickOnMount);
// oxlint-disable-next-line react/exhaustive-effect-dependencies -- picks once on mount; setProject changes every render
}, []);
return null;
}
const root = createRoot(document.createElement("div"));
Expand Down Expand Up @@ -245,16 +250,20 @@ function setup() {
get current() {
return current;
},
async render(active: boolean) {
async render(active: boolean, pickOnMount?: EnvironmentProject) {
await act(async () =>
root.render(
<RegistryContext.Provider value={registry}>
<NewTaskFlowProvider active={active} flowKey="test-flow">
<Probe />
<Probe pickOnMount={pickOnMount} />
</NewTaskFlowProvider>
</RegistryContext.Provider>,
),
);
// The draft screen applies a project whenever it shows without a draft.
if (active && current.draftKey === null) {
await act(async () => current.setProject(projects[0]!));
}
},
async emit(cwd: string, branch: string, isRepo = true) {
await act(async () => emitters.get(cwd)!(branch, isRepo));
Expand All @@ -270,6 +279,16 @@ function setup() {
};
}

it("keeps the draft on a project the screen picks as it mounts", async () => {
using screen = setup();
await screen.render(true, screen.projects[2]);
expect(screen.current.selectedProject).toEqual(screen.projects[2]);
expect(screen.snapshot(screen.current.draftKey).project).toEqual({
environmentId: "two",
projectId: "b",
});
});

it("owns a status stream only while the draft is active, retaining draft choices on reopen", async () => {
using screen = setup();
await screen.render(false);
Expand Down
40 changes: 17 additions & 23 deletions apps/mobile/src/features/threads/new-task-flow-provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ActiveNewTaskContext } from "../../state/active-new-task";
import { resolveNewThreadModelSelection } from "@t3tools/shared/usageLimits";
import { useNowMinuteMs } from "../../lib/clock";
import * as Dialog from "../../components/ui/Dialog";
import React, { useEffect, useRef, useState } from "react";
import React, { useRef, useState } from "react";

import type {
EnvironmentId,
Expand Down Expand Up @@ -304,11 +304,23 @@ export function NewTaskFlowProvider(
// binding outlives the draft's project stamp (submit clears it).
const updateFlow = (patch: Partial<NewTaskFlowState>) =>
updateNewTaskFlowState(flowKey, { ...readFlow(), ...patch });
// A draft's project stamp is the selection: picking a project writes it, and uploads and
// the send read it, so the screen cannot show one project while the draft holds another.
const draftStamp = useComposerDraft(activeDraftKey).project;
const stampedProject =
draftStamp === undefined
? undefined
: projects.find(
(project) =>
project.environmentId === draftStamp.environmentId &&
project.id === draftStamp.projectId,
);
const selectedEnvironmentId =
selectedEnvironmentIdOverride !== null &&
stampedProject?.environmentId ??
(selectedEnvironmentIdOverride !== null &&
projects.some((project) => project.environmentId === selectedEnvironmentIdOverride)
? selectedEnvironmentIdOverride
: (projects[0]?.environmentId ?? null);
: (projects[0]?.environmentId ?? null));
const projectsForEnvironment = pipe(
projects,
Arr.filter((project) => project.environmentId === selectedEnvironmentId),
Expand All @@ -319,7 +331,8 @@ export function NewTaskFlowProvider(
const selectedProject =
routeDraftResolution.kind === "pending"
? null
: (projectsForEnvironment.find(
: (stampedProject ??
projectsForEnvironment.find(
(project) => scopedProjectKey(project.environmentId, project.id) === selectedProjectKey,
) ??
projectsForEnvironment[0] ??
Expand All @@ -333,25 +346,6 @@ export function NewTaskFlowProvider(
const serverConfigs = useServerConfigs();
const { connectedEnvironments } = useRemoteConnectionStatus();
const selectedProjectDraftKey = selectedProject ? activeDraftKey : null;
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- creates the persistent draft in the new-task flow store once a project is selected, before the composer mounts
useEffect(() => {
// A route that names a draft binds that draft, or returns to the picker.
if (
props.active === false ||
props.routeDraftId !== undefined ||
activeDraftKey !== null ||
selectedProject === null
) {
return;
}
// Creates the persistent draft once the project selection is ready; the key must exist before the composer mounts.
updateNewTaskFlowState(flowKey, {
draftKey: createNewTaskDraft({
environmentId: selectedProject.environmentId,
projectId: selectedProject.id,
}),
});
}, [activeDraftKey, flowKey, selectedProject, props.active, props.routeDraftId]);
const activePendingKey =
props.active === false
? null
Expand Down
Loading
Loading