Skip to content

Commit f00cc6c

Browse files
committed
fix(mobile): wait for creation before reading chat
1 parent c64d856 commit f00cc6c

4 files changed

Lines changed: 168 additions & 33 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1486,6 +1486,7 @@ export const ThreadDetailScreen = function ThreadDetailScreen(props: ThreadDetai
14861486
<ThreadFeed
14871487
environmentId={props.environmentId}
14881488
threadId={props.selectedThread.id}
1489+
selectedThreadDetailRef={props.selectedThreadDetailRef}
14891490
workspaceRoot={props.threadCwd}
14901491
feed={props.selectedThreadFeed}
14911492
pendingHandoff={props.pendingHandoff}

‎apps/mobile/src/features/threads/ThreadFeed.test.tsx‎

Lines changed: 149 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ import { act, createContext, type ComponentProps, type ReactNode } from "react";
22
import { createRoot } from "react-dom/client";
33
import * as NodeModule from "node:module";
44
import { expect, it, vi } from "vite-plus/test";
5-
import { EnvironmentId, ThreadId } from "@t3tools/contracts";
5+
import { EnvironmentId, MessageId, ThreadId, type ScopedThreadRef } from "@t3tools/contracts";
6+
import { RegistryContext } from "@effect/atom-react";
7+
import { AtomRegistry } from "effect/reactivity";
8+
import type { OrchestrationV2ThreadProjection } from "@t3tools/contracts";
69
import { setTemporaryThread } from "@t3tools/client-runtime/temporary-threads";
710

811
const { JSDOM } = NodeModule.createRequire(import.meta.url)("jsdom") as {
@@ -12,6 +15,8 @@ const { JSDOM } = NodeModule.createRequire(import.meta.url)("jsdom") as {
1215
const state = vi.hoisted(() => ({
1316
shell: { temporary: true },
1417
listeners: new Set<() => void>(),
18+
detailReads: vi.fn(),
19+
projections: new Map<string, OrchestrationV2ThreadProjection>(),
1520
}));
1621
vi.mock("react-native", () => ({
1722
Platform: { OS: "android" },
@@ -126,9 +131,9 @@ vi.mock("../../components/FilePreviewGallery", () => ({
126131
vi.mock("../../components/ui/NativePresentation", () => ({
127132
PresentationSource: ({ children }: { children: ReactNode }) => children,
128133
}));
129-
vi.mock("./thread-workflow-opening", () => ({
130-
useWorkflowOpening: () => null,
131-
ThreadWorkflowOpening: () => null,
134+
vi.mock("./SubagentRow", () => ({ SubagentRow: () => null }));
135+
vi.mock("./work-log-layout", () => ({
136+
WorkLogBlock: ({ children }: { children?: ReactNode }) => <div>{children}</div>,
132137
}));
133138
vi.mock("./useFileChipShare", () => ({ useFileChipShare: () => () => {} }));
134139
vi.mock("../../native/useMarkdownImageSource", () => ({
@@ -149,7 +154,28 @@ vi.mock("../../state/session", () => ({
149154
usePreparedConnection: () => null,
150155
}));
151156
vi.mock("../../state/atom-registry", () => ({ appAtomRegistry: {} }));
152-
vi.mock("../../state/threads", () => ({ environmentThreadShells: {}, threadEnvironment: {} }));
157+
vi.mock("../../state/threads", async () => {
158+
const { createEnvironmentThreadDetailAtoms, EMPTY_ENVIRONMENT_THREAD_STATE } =
159+
await import("@t3tools/client-runtime/state/threads");
160+
const { AsyncResult, Atom } = await import("effect/reactivity");
161+
const Option = await import("effect/Option");
162+
const stateAtom = Atom.family((threadId: string) =>
163+
Atom.make(() => {
164+
state.detailReads(threadId);
165+
return AsyncResult.success({
166+
...EMPTY_ENVIRONMENT_THREAD_STATE,
167+
data: Option.fromNullishOr(state.projections.get(threadId)),
168+
});
169+
}),
170+
);
171+
return {
172+
environmentThreadShells: {},
173+
threadEnvironment: {},
174+
environmentThreadDetails: createEnvironmentThreadDetailAtoms((_, threadId) =>
175+
stateAtom(threadId),
176+
),
177+
};
178+
});
153179
vi.mock("../../components/ui/Button", () => ({ Button: () => null }));
154180
vi.mock("../../components/ComposerContextSheet", () => ({ ComposerContextSheet: () => null }));
155181
vi.mock("../../components/ui/AppActivityIndicator", () => ({ AppActivityIndicator: () => null }));
@@ -205,15 +231,20 @@ vi.mock("../../components/ui/AppText", () => ({
205231
AppText: ({ children }: { children?: ReactNode }) => <span>{children}</span>,
206232
}));
207233

234+
import { v2Projection } from "../../../../../packages/client-runtime/src/state/orchestrationV2TestFixtures";
208235
import { ThreadFeed } from "./ThreadFeed";
236+
import { useWorkflowOpening } from "./thread-workflow-opening";
209237

210238
it.each([true, false])(
211-
"opens existing media rows after Keep without a parent render with shell temporary=%s",
239+
"admits detail after launch and opens media after Keep with shell temporary=%s",
212240
async (temporary) => {
213241
const environmentId = EnvironmentId.make("env");
214242
const threadId = ThreadId.make("thread");
215243
state.shell = { temporary };
216244
state.listeners.clear();
245+
state.detailReads.mockClear();
246+
state.projections.clear();
247+
const registry = AtomRegistry.make();
217248
setTemporaryThread(environmentId, threadId, true);
218249
const dom = new JSDOM("<html><body></body></html>");
219250
vi.stubGlobal("window", dom.window);
@@ -237,32 +268,45 @@ it.each([true, false])(
237268
},
238269
{ id: "viewed", type: "activity-group", activities: [], continuesWorkLog: false },
239270
] as unknown as ComponentProps<typeof ThreadFeed>["feed"];
271+
const feedView = (
272+
<ThreadFeed
273+
environmentId={environmentId}
274+
threadId={threadId}
275+
selectedThreadDetailRef={null}
276+
threadTitle="Thread"
277+
feed={feed}
278+
queuedMessages={[]}
279+
dispatchingMessageId={null}
280+
onEditPendingMessage={() => {}}
281+
contentPresentation={{ kind: "ready" }}
282+
agentLabel="Codex"
283+
latestRun={null}
284+
activeWorkStartedAt={null}
285+
listRef={{ current: null }}
286+
freeze={{ value: false } as ComponentProps<typeof ThreadFeed>["freeze"]}
287+
anchorMessageId={null}
288+
submittedMessageId={null}
289+
contentInsetEndAdjustment={
290+
{ value: 0 } as ComponentProps<typeof ThreadFeed>["contentInsetEndAdjustment"]
291+
}
292+
keyboardOffset={0}
293+
/>
294+
);
240295
try {
241296
await act(async () =>
242297
root.render(
243-
<ThreadFeed
244-
environmentId={environmentId}
245-
threadId={threadId}
246-
threadTitle="Thread"
247-
feed={feed}
248-
queuedMessages={[]}
249-
dispatchingMessageId={null}
250-
onEditPendingMessage={() => {}}
251-
contentPresentation={{ kind: "ready" }}
252-
agentLabel="Codex"
253-
latestRun={null}
254-
activeWorkStartedAt={null}
255-
listRef={{ current: null }}
256-
freeze={{ value: false } as ComponentProps<typeof ThreadFeed>["freeze"]}
257-
anchorMessageId={null}
258-
submittedMessageId={null}
259-
contentInsetEndAdjustment={
260-
{ value: 0 } as ComponentProps<typeof ThreadFeed>["contentInsetEndAdjustment"]
261-
}
262-
keyboardOffset={0}
263-
/>,
298+
<RegistryContext.Provider value={registry}>{feedView}</RegistryContext.Provider>,
299+
),
300+
);
301+
expect(state.detailReads).not.toHaveBeenCalled();
302+
await act(async () =>
303+
root.render(
304+
<RegistryContext.Provider value={registry}>
305+
<ThreadFeed {...feedView.props} selectedThreadDetailRef={{ environmentId, threadId }} />
306+
</RegistryContext.Provider>,
264307
),
265308
);
309+
expect(state.detailReads.mock.calls).toEqual([[threadId]]);
266310
expect(container.textContent?.match(/Keep thread to open media/g)).toHaveLength(4);
267311
expect(container.querySelectorAll("img")).toHaveLength(0);
268312
await act(async () => {
@@ -279,9 +323,87 @@ it.each([true, false])(
279323
]);
280324
} finally {
281325
await act(async () => root.unmount());
326+
registry.dispose();
282327
setTemporaryThread(environmentId, threadId, false);
283328
vi.unstubAllGlobals();
284329
dom.window.close();
285330
}
286331
},
287332
);
333+
334+
function WorkflowReader(props: { readonly detailRef: ScopedThreadRef | null }) {
335+
const opening = useWorkflowOpening(props.detailRef);
336+
return <span>{opening?.script}</span>;
337+
}
338+
339+
it("loads the workflow and its parent after detail admission", async () => {
340+
const environmentId = EnvironmentId.make("env");
341+
const threadId = ThreadId.make("workflow");
342+
const parentId = ThreadId.make("parent");
343+
const script = 'export const meta = { name: "probe" };';
344+
state.detailReads.mockClear();
345+
state.projections.clear();
346+
state.projections.set(threadId, {
347+
...v2Projection,
348+
thread: {
349+
...v2Projection.thread,
350+
id: threadId,
351+
creationSource: "provider",
352+
lineage: {
353+
parentThreadId: parentId,
354+
rootThreadId: parentId,
355+
relationshipToParent: "subagent",
356+
},
357+
},
358+
messages: [
359+
{
360+
id: MessageId.make("script"),
361+
threadId,
362+
runId: null,
363+
nodeId: null,
364+
role: "user",
365+
text: script,
366+
workflowScript: true,
367+
attachments: [],
368+
streaming: false,
369+
createdBy: "user",
370+
creationSource: "mobile",
371+
createdAt: v2Projection.updatedAt,
372+
updatedAt: v2Projection.updatedAt,
373+
},
374+
],
375+
});
376+
state.projections.set(parentId, v2Projection);
377+
const registry = AtomRegistry.make();
378+
const dom = new JSDOM("<html><body></body></html>");
379+
vi.stubGlobal("window", dom.window);
380+
vi.stubGlobal("document", dom.window.document);
381+
vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
382+
const container = document.createElement("div");
383+
const root = createRoot(container);
384+
try {
385+
await act(async () =>
386+
root.render(
387+
<RegistryContext.Provider value={registry}>
388+
<WorkflowReader detailRef={null} />
389+
</RegistryContext.Provider>,
390+
),
391+
);
392+
expect(state.detailReads).not.toHaveBeenCalled();
393+
expect(container.textContent).toBe("");
394+
await act(async () =>
395+
root.render(
396+
<RegistryContext.Provider value={registry}>
397+
<WorkflowReader detailRef={{ environmentId, threadId }} />
398+
</RegistryContext.Provider>,
399+
),
400+
);
401+
expect(state.detailReads.mock.calls).toEqual([[threadId], [parentId]]);
402+
expect(container.textContent).toBe(script);
403+
} finally {
404+
await act(async () => root.unmount());
405+
registry.dispose();
406+
vi.unstubAllGlobals();
407+
dom.window.close();
408+
}
409+
});

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ import {
5050
type OrchestrationV2ProjectedTurnItem,
5151
type RunId,
5252
type ScheduledTaskId,
53+
type ScopedThreadRef,
5354
} from "@t3tools/contracts";
5455
import { renderAssistantCitationsAsText } from "@t3tools/shared/assistantCitations";
5556
import { encodeComposerContextFragment } from "@t3tools/shared/composerContextClipboard";
@@ -349,6 +350,7 @@ export interface ThreadFeedProps {
349350
readonly environmentId: EnvironmentId;
350351
readonly threadId: ThreadId;
351352
readonly threadTitle: string;
353+
readonly selectedThreadDetailRef: ScopedThreadRef | null;
352354
readonly workspaceRoot?: string | null;
353355
readonly feed: ReadonlyArray<ThreadFeedEntry>;
354356
readonly pendingHandoff?: HandoffEndpoints | null;
@@ -2089,7 +2091,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
20892091
const temporary =
20902092
useQuietThreadShell(scopeThreadRef(props.environmentId, props.threadId))?.temporary === true ||
20912093
isTemporaryThread(props.environmentId, props.threadId);
2092-
const workflowOpening = useWorkflowOpening(props.environmentId, props.threadId);
2094+
const workflowOpening = useWorkflowOpening(props.selectedThreadDetailRef);
20932095
const deviceType = useDeviceType();
20942096
const duoColumns = useNativeWorkspaceColumnsSupported() && isDuoDevice(deviceType);
20952097
const openPullRequest = useOpenPullRequest();

‎apps/mobile/src/features/threads/thread-workflow-opening.tsx‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
import { useAtomValue } from "@effect/atom-react";
22
import { StackActions, useNavigation } from "@react-navigation/native";
33
import { scopeThreadRef } from "@t3tools/client-runtime/environment";
4+
import type { EnvironmentThread } from "@t3tools/client-runtime/state/shell";
45
import {
56
resolveWorkflowOpening,
67
workflowOpeningHeadline,
78
workflowOpeningParentThreadId,
89
type RuntimeSubagent,
910
} from "@t3tools/client-runtime/state/subagentRuntime";
10-
import type { EnvironmentId, ThreadId } from "@t3tools/contracts";
11+
import type { EnvironmentId, ScopedThreadRef, ThreadId } from "@t3tools/contracts";
12+
import { Atom } from "effect/reactivity";
1113
import { useState } from "react";
1214
import { Pressable, View } from "react-native";
1315

@@ -20,10 +22,14 @@ import { WorkLogBlock } from "./work-log-layout";
2022

2123
// A script longer than this many lines shows its head until opened.
2224
const FOLDED_SCRIPT_LINES = 10;
25+
const EMPTY_THREAD_ATOM = Atom.make<EnvironmentThread | null>(null);
2326

2427
/** The workflow opening for a thread, or null; the parent's detail loads only for a workflow. */
25-
export function useWorkflowOpening(environmentId: EnvironmentId, threadId: ThreadId) {
26-
const threadAtom = environmentThreadDetails.threadAtom(scopeThreadRef(environmentId, threadId));
28+
export function useWorkflowOpening(selectedThreadDetailRef: ScopedThreadRef | null) {
29+
const threadAtom =
30+
selectedThreadDetailRef === null
31+
? EMPTY_THREAD_ATOM
32+
: environmentThreadDetails.threadAtom(selectedThreadDetailRef);
2733
// Selected as a primitive so an ordinary thread's updates never change the result.
2834
const parentId = useAtomValue(threadAtom, (thread) =>
2935
thread === null
@@ -37,8 +43,12 @@ export function useWorkflowOpening(environmentId: EnvironmentId, threadId: Threa
3743
parentId === null ? null : (thread?.projection ?? null),
3844
);
3945
const parentSubagents = useAtomValue(
40-
environmentThreadDetails.threadAtom(scopeThreadRef(environmentId, parentId ?? threadId)),
41-
(parent) => (parentId === null ? null : (parent?.projection.subagents ?? null)),
46+
parentId === null || selectedThreadDetailRef === null
47+
? EMPTY_THREAD_ATOM
48+
: environmentThreadDetails.threadAtom(
49+
scopeThreadRef(selectedThreadDetailRef.environmentId, parentId),
50+
),
51+
(parent) => parent?.projection.subagents ?? null,
4252
);
4353
return projection === null
4454
? null

0 commit comments

Comments
 (0)