@devries-cameron20 / t3code-1 / commits / e8e7fb7e9a
Fork 0

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

fix(mobile): one Working row after worktree setup, and follow-ups no longer drop a short thread (#37797)

Julius Marminge committed Nov 16, 2026 at 14:39 UTC e8e7fb7e9a6770706d54986fcf3ca9a2d0fe3a3e
6 files changed +34 -70
apps/mobile/src/features/threads/ThreadDetailScreen.tsx
-2
@@ -231,7 +231,6 @@ export interface ThreadDetailScreenProps {
231 readonly interactionLocked: boolean;
232 };
233 readonly worktreeSetup?: WorktreeSetupCardProps | null;
234 - readonly setupWorkingStartedAt?: string | null;
234 readonly canOperateThread: boolean;
235 readonly selectedThread: EnvironmentThreadShell;
236 /** Use this for detail reads; it stays null until queued creation reaches the server. */
@@ -1455,7 +1454,6 @@ function ThreadDetailBody(
1454 pendingHandoff={props.pendingHandoff}
1455 statusLines={statusLines}
1456 worktreeSetup={props.worktreeSetup}
1458 - setupWorkingStartedAt={props.setupWorkingStartedAt}
1457 preparingWorktree={
1458 props.creationState?.kind === "preparing" &&
1459 props.creationState.preparingWorktree &&
apps/mobile/src/features/threads/ThreadFeed.tsx
+1 -9
@@ -38,7 +38,6 @@ import { SecretRequestCard } from "./SecretRequestCard";
38 import { AppActivityIndicator } from "../../components/ui/AppActivityIndicator";
39 import {
40 WorktreePreparingHeader,
41 - WorktreeWorkingHeader,
41 WorktreeSetupCard,
42 type WorktreeSetupCardProps,
43 } from "./worktree-setup-card";
@@ -349,7 +348,6 @@ export interface ThreadFeedHistoryControls {
348 export interface ThreadFeedProps {
349 readonly toolCallVisibility?: ToolCallVisibility;
350 readonly worktreeSetup?: WorktreeSetupCardProps | null;
352 - readonly setupWorkingStartedAt?: string | null;
351 readonly preparingWorktree?: boolean;
352 readonly queuedMessages: ReadonlyArray<QueuedThreadMessage>;
353 readonly dispatchingMessageId: MessageId | null;
@@ -3555,7 +3553,6 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
3553 reduceMotion,
3554 formatMessageTime,
3555 worktreeSetup: props.worktreeSetup,
3558 - setupWorkingStartedAt: props.setupWorkingStartedAt,
3556 preparingWorktree: props.preparingWorktree,
3557 dispatchingMessageId: props.dispatchingMessageId,
3558 unsettledTurnId,
@@ -3670,10 +3667,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
3667 const [groupFeed] = useState(createThreadFeedGrouping);
3668 const groupedFeed = groupFeed(presentedFeed, {
3669 workflowOpeningMessageId: workflowOpening?.messageId,
3673 - setupAnchorIndex:
3674 - props.worktreeSetup || props.setupWorkingStartedAt || props.preparingWorktree
3675 - ? setupAnchorIndex
3676 - : undefined,
3670 + setupAnchorIndex: props.worktreeSetup || props.preparingWorktree ? setupAnchorIndex : undefined,
3671 });
3672 const { contentInsetEndAdjustment } = props;
3673 const attachList = (list: LegendListRef | null) => {
@@ -4048,8 +4042,6 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
4042 })}
4043 {props.worktreeSetup && info.index === setupAnchorIndex ? (
4044 <WorktreeSetupCard key={props.threadId} {...props.worktreeSetup} />
4051 - ) : props.setupWorkingStartedAt && info.index === setupAnchorIndex ? (
4052 - <WorktreeWorkingHeader startedAt={props.setupWorkingStartedAt} />
4045 ) : props.preparingWorktree && info.index === setupAnchorIndex ? (
4046 <WorktreePreparingHeader />
4047 ) : null}
apps/mobile/src/features/threads/ThreadRouteScreen.tsx
+1 -12
@@ -860,7 +860,7 @@ function ThreadRouteContent(
860 );
861 };
862 const setupTurnStartedAt = composer.selectedThreadActivityRun?.startedAt ?? null;
863 - const { snapshot: worktreeSetupSnapshot, visible: worktreeSetup } = useWorktreeSetup({
863 + const { visible: worktreeSetup } = useWorktreeSetup({
864 environmentId: selectedThread?.environmentId ?? null,
865 threadId: selectedThread?.id ?? null,
866 preparing:
@@ -1054,21 +1054,10 @@ function ThreadRouteContent(
1054 extensionStatuses={composer.extensionStatuses}
1055 providerSubagentStatus={composer.providerSubagentStatus}
1056 creationState={creationState}
1057 - setupWorkingStartedAt={
1058 - composer.activeWorkStartedAt !== null &&
1059 - worktreeSetupSnapshot !== null &&
1060 - composer.selectedThreadFeed.filter(
1061 - (entry) => entry.type === "message" && entry.message.role === "user",
1062 - ).length <= 1
1063 - ? composer.activeWorkStartedAt
1064 - : null
1065 - }
1057 worktreeSetup={
1058 worktreeSetup
1059 ? {
1060 snapshot: worktreeSetup,
1070 - turnStartedAt: setupTurnStartedAt,
1071 - working: composer.activeWorkStartedAt !== null,
1061 turnStarted: setupTurnStartedAt !== null,
1062 onCancel: handleCancelWorktreeSetup,
1063 onWorkLocally: setupMessage && selectedThreadProject ? handleWorkLocally : null,
apps/mobile/src/features/threads/thread-feed-scroll-position.test.ts
+12 -9
@@ -65,16 +65,19 @@ describe("resolveThreadFeedSubmissionAnchor", () => {
65 ).toBe("first-message");
66 });
67
68 - it("does not anchor a follow-up after a user message appears", () => {
68 + it("keeps the first message's anchor, not the follow-up's, after a user message appears", () => {
69 + const followUp = {
70 + submittedMessageId: "second-message",
71 + hasStartedTurn: true,
72 + hasUserMessage: true,
73 + deliveryDeferred: false,
74 + queuedMessageCount: 0,
75 + };
76 expect(
70 - resolveThreadFeedSubmissionAnchor({
71 - currentAnchorMessageId: "first-message",
72 - submittedMessageId: "second-message",
73 - hasStartedTurn: false,
74 - hasUserMessage: true,
75 - deliveryDeferred: false,
76 - queuedMessageCount: 0,
77 - }),
77 + resolveThreadFeedSubmissionAnchor({ ...followUp, currentAnchorMessageId: "first-message" }),
78 + ).toBe("first-message");
79 + expect(
80 + resolveThreadFeedSubmissionAnchor({ ...followUp, currentAnchorMessageId: null }),
81 ).toBeNull();
82 });
83
apps/mobile/src/features/threads/thread-feed-scroll-position.ts
+5 -4
@@ -20,13 +20,14 @@ export function resolveThreadFeedSubmissionAnchor<AnchorId>(input: {
20 readonly queuedMessageCount: number;
21 readonly deliveryDeferred: boolean;
22 }): AnchorId | null {
23 - if (input.deliveryDeferred || input.hasStartedTurn || input.hasUserMessage) {
24 - return null;
25 - }
26 -
23 + // Keeping the first message's anchor holds a short thread in place; a follow-up never anchors.
24 if (input.currentAnchorMessageId !== null) {
25 return input.currentAnchorMessageId;
26 }
27
28 + if (input.deliveryDeferred || input.hasStartedTurn || input.hasUserMessage) {
29 + return null;
30 + }
31 +
32 return input.queuedMessageCount > 0 ? null : input.submittedMessageId;
33 }
apps/mobile/src/features/threads/worktree-setup-card.tsx
+15 -34
@@ -20,8 +20,6 @@ import { useVisibleSecondClock } from "./use-visible-second-clock";
20 export interface WorktreeSetupCardProps {
21 snapshot: WorktreeSetupSnapshot;
22 turnStarted: boolean;
23 - turnStartedAt: string | null;
24 - working: boolean;
23 onCancel: () => void;
24 onWorkLocally: (() => void) | null;
25 }
@@ -41,38 +39,32 @@ const icons: Record<WorktreeSetupStage["status"], AppSymbolName> = {
39 };
40
41 export function WorktreeSetupCard(props: WorktreeSetupCardProps) {
44 - const { snapshot, turnStarted, turnStartedAt, working } = props;
42 + const { snapshot, turnStarted } = props;
43 const handedOff = turnStarted && worktreeSetupAgentStarted(snapshot);
44 const running = snapshot.phase === "running";
45 const backgroundSetup = handedOff && running;
46 const scriptName = snapshot.setupScript?.name ?? "Setup script";
47 const [detailsOpen, setDetailsOpen] = useState(false);
50 - const now = useVisibleSecondClock(running || working);
48 + const now = useVisibleSecondClock(running);
49 const failed =
50 snapshot.phase === "failed" || snapshot.stages.some((stage) => stage.status === "failed");
53 - const label =
54 - handedOff && working
55 - ? `Working for ${elapsed(turnStartedAt, null, now) ?? "0s"}`
56 - : running
57 - ? handedOff
58 - ? "Setup continues…"
59 - : "Setting up worktree…"
60 - : snapshot.phase === "cancelled"
61 - ? "Worktree setup cancelled"
62 - : snapshot.phase === "failed"
63 - ? "Worktree setup failed"
64 - : failed
65 - ? "Setup script failed"
66 - : "Worktree ready";
51 + // Once the agent has the turn, its own fold row carries the working timer.
52 + const label = running
53 + ? handedOff
54 + ? "Setup continues…"
55 + : "Setting up worktree…"
56 + : snapshot.phase === "cancelled"
57 + ? "Worktree setup cancelled"
58 + : snapshot.phase === "failed"
59 + ? "Worktree setup failed"
60 + : failed
61 + ? "Setup script failed"
62 + : "Worktree ready";
63
64 return (
65 <View accessibilityLabel="Worktree setup" className="py-1">
66 <View className="min-h-11 flex-row items-center gap-2 border-b border-border px-1">
71 - <HeaderLabel
72 - label={label}
73 - active={(running || working) && !detailsOpen}
74 - failed={failed && !working}
75 - />
67 + <HeaderLabel label={label} active={running && !detailsOpen} failed={failed} />
68 {!handedOff ? (
69 <Text
70 className="text-2xs text-foreground-secondary"
@@ -177,17 +169,6 @@ export function WorktreePreparingHeader() {
169 );
170 }
171
180 -export function WorktreeWorkingHeader({ startedAt }: { startedAt: string }) {
181 - const now = useVisibleSecondClock(true);
182 - return (
183 - <View className="py-1">
184 - <View className="min-h-11 flex-row items-center border-b border-border px-1">
185 - <HeaderLabel label={`Working for ${elapsed(startedAt, null, now) ?? "0s"}`} active />
186 - </View>
187 - </View>
188 - );
189 -}
190 -
172 function HeaderLabel({
173 label,
174 active,