The best way to control Claude Code, Codex and more from any computer or phone
fix(mobile): worktree setup shows in the chat from the first moment (#37084)
Julius Marminge committed
Nov 14, 2026 at 23:33 UTC
93f8563a95e08279cd770beb7aa6ff9791791049
3 files changed
+29
-6
apps/mobile/src/features/threads/ThreadDetailScreen.tsx
+8
-5
@@ -788,11 +788,9 @@ function ThreadDetailBody(
788
return null;
789
}
790
if (props.creationState?.kind === "preparing") {
791
- if (props.worktreeSetup) return null;
792
- return {
793
- kind: "preparing",
794
- label: props.creationState.preparingWorktree ? "Setting up worktree…" : "Starting…",
795
- };
791
+ // The feed shows worktree setup in place, so only a plain start needs the pill.
792
+ if (props.worktreeSetup || props.creationState.preparingWorktree) return null;
793
+ return { kind: "preparing", label: "Starting…" };
794
}
795
if (props.creationState?.kind === "failed") {
796
return null;
@@ -1474,6 +1472,11 @@ function ThreadDetailBody(
1472
pendingHandoff={props.pendingHandoff}
1473
worktreeSetup={props.worktreeSetup}
1474
setupWorkingStartedAt={props.setupWorkingStartedAt}
1475
+ preparingWorktree={
1476
+ props.creationState?.kind === "preparing" &&
1477
+ props.creationState.preparingWorktree &&
1478
+ !props.worktreeSetup
1479
+ }
1480
queuedMessages={props.queuedMessages}
1481
dispatchingMessageId={props.dispatchingMessageId}
1482
// A native subagent has no composer to edit a pending message in;
apps/mobile/src/features/threads/ThreadFeed.tsx
+10
-1
@@ -26,6 +26,7 @@ import { LinkRequestCard } from "./LinkRequestCard";
26
import { SecretRequestCard } from "./SecretRequestCard";
27
import { AppActivityIndicator } from "../../components/ui/AppActivityIndicator";
28
import {
29
+ WorktreePreparingHeader,
30
WorktreeWorkingHeader,
31
WorktreeSetupCard,
32
type WorktreeSetupCardProps,
@@ -321,6 +322,7 @@ export interface ThreadFeedProps {
322
readonly toolCallVisibility?: ToolCallVisibility;
323
readonly worktreeSetup?: WorktreeSetupCardProps | null;
324
readonly setupWorkingStartedAt?: string | null;
325
+ readonly preparingWorktree?: boolean;
326
readonly queuedMessages: ReadonlyArray<QueuedThreadMessage>;
327
readonly dispatchingMessageId: MessageId | null;
328
readonly onEditPendingMessage: ((message: QueuedThreadMessage) => void) | null;
@@ -3346,6 +3348,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
3348
formatMessageTime,
3349
worktreeSetup: props.worktreeSetup,
3350
setupWorkingStartedAt: props.setupWorkingStartedAt,
3351
+ preparingWorktree: props.preparingWorktree,
3352
dispatchingMessageId: props.dispatchingMessageId,
3353
unsettledTurnId,
3354
copiedRowId,
@@ -3430,7 +3433,9 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
3433
const groupedFeed = groupFeed(presentedFeed, {
3434
workflowOpeningMessageId: workflowOpening?.messageId,
3435
setupAnchorIndex:
3433
- props.worktreeSetup || props.setupWorkingStartedAt ? setupAnchorIndex : undefined,
3436
+ props.worktreeSetup || props.setupWorkingStartedAt || props.preparingWorktree
3437
+ ? setupAnchorIndex
3438
+ : undefined,
3439
});
3440
const { contentInsetEndAdjustment } = props;
3441
const attachList = (list: LegendListRef | null) => {
@@ -3800,6 +3805,8 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
3805
<WorktreeSetupCard key={props.threadId} {...props.worktreeSetup} />
3806
) : props.setupWorkingStartedAt && info.index === setupAnchorIndex ? (
3807
<WorktreeWorkingHeader startedAt={props.setupWorkingStartedAt} />
3808
+ ) : props.preparingWorktree && info.index === setupAnchorIndex ? (
3809
+ <WorktreePreparingHeader />
3810
) : null}
3811
</ThreadMediaVisibility>
3812
</MessageImageGalleryScope>
@@ -3896,6 +3903,8 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
3903
{usesNativeAutomaticInsets ? null : <View style={{ height: topContentInset }} />}
3904
{setupAnchorIndex < 0 && props.worktreeSetup ? (
3905
<WorktreeSetupCard key={props.threadId} {...props.worktreeSetup} />
3906
+ ) : setupAnchorIndex < 0 && props.preparingWorktree ? (
3907
+ <WorktreePreparingHeader />
3908
) : null}
3909
{props.historyControls ? (
3910
<ThreadFeedLoadEarlierControl {...props.historyControls} />
apps/mobile/src/features/threads/worktree-setup-card.tsx
+11
@@ -147,6 +147,17 @@ export function WorktreeSetupCard(props: WorktreeSetupCardProps) {
147
);
148
}
149
150
+/** Holds the card's place until the server publishes the first setup snapshot. */
151
+export function WorktreePreparingHeader() {
152
+ return (
153
+ <View className="py-1">
154
+ <View className="min-h-11 flex-row items-center border-b border-border px-1">
155
+ <HeaderLabel label="Setting up worktree…" active />
156
+ </View>
157
+ </View>
158
+ );
159
+}
160
+
161
export function WorktreeWorkingHeader({ startedAt }: { startedAt: string }) {
162
const now = useVisibleSecondClock(true);
163
return (