fix(client): avoid worktree setup flash after editing first message

apps/mobile/src/features/threads/ThreadRouteScreen.tsx

@@ -859,7 +859,7 @@ function ThreadRouteContent(
       selectedThread?.worktreePath != null ||
       (selectedThreadCreation?.message.creation?.workspaceMode === "worktree" &&
         selectedThreadCreation.outcome == null),
-    turnStarted: setupTurnStartedAt !== null,
+    runs: selectedThreadDetail?.runs ?? [],
     followUpSent:
       composer.selectedThreadFeed.filter(
         (entry) => entry.type === "message" && entry.message.role === "user",

apps/mobile/src/features/threads/use-worktree-setup.ts

@@ -9,7 +9,7 @@ export function useWorktreeSetup(input: {
   environmentId: EnvironmentId | null;
   threadId: ThreadId | null;
   preparing: boolean;
-  turnStarted: boolean;
+  runs: Parameters<typeof resolveVisibleWorktreeSetup>[0]["runs"];
   followUpSent: boolean;
 }) {
   const key = JSON.stringify([input.environmentId, input.threadId]);
@@ -35,7 +35,7 @@ export function useWorktreeSetup(input: {
     visible: resolveVisibleWorktreeSetup({
       live: snapshot,
       recorded: null,
-      turnStarted: input.turnStarted,
+      runs: input.runs,
       followUpSent: input.followUpSent,
     }),
   };

apps/mobile/src/features/threads/worktree-setup-state.test.ts

@@ -1,6 +1,7 @@
 import { ThreadId, type WorktreeSetupSnapshot } from "@t3tools/contracts";
 import { resolveVisibleWorktreeSetup } from "@t3tools/client-runtime/worktree-setup";
 import { describe, expect, it } from "vite-plus/test";
+import * as DateTime from "effect/DateTime";
 import { resolveWorktreeSetupSnapshot } from "./worktree-setup-state";
 
 const threadId = ThreadId.make("setup-thread");
@@ -27,18 +28,25 @@ describe("mobile worktree setup handoff", () => {
       resolveVisibleWorktreeSetup({
         live: held,
         recorded: null,
-        turnStarted: false,
+        runs: [],
         followUpSent: false,
       }),
     ).toBe(done);
     expect(
       resolveVisibleWorktreeSetup({
         live: held,
         recorded: null,
-        turnStarted: true,
+        runs: [{ startedAt: DateTime.makeUnsafe(running.startedAt) }],
         followUpSent: false,
       }),
     ).toBeNull();
+    const afterFirstMessageEdit = {
+      live: held,
+      recorded: null,
+      followUpSent: false,
+      runs: [{ startedAt: DateTime.makeUnsafe(running.startedAt) }, { startedAt: null }],
+    };
+    expect(resolveVisibleWorktreeSetup(afterFirstMessageEdit)).toBeNull();
     expect(resolveWorktreeSetupSnapshot(threadId, undefined, held)).toBe(done);
   });
 
@@ -53,15 +61,15 @@ describe("mobile worktree setup handoff", () => {
         resolveVisibleWorktreeSetup({
           live: held,
           recorded: null,
-          turnStarted: false,
+          runs: [],
           followUpSent: false,
         }),
       ).toBe(settled);
       expect(
         resolveVisibleWorktreeSetup({
           live: held,
           recorded: null,
-          turnStarted: false,
+          runs: [],
           followUpSent: true,
         }),
       ).toBeNull();

apps/web/src/components/chat/useWorktreeSetup.ts

@@ -100,7 +100,7 @@ export function useWorktreeSetup(input: {
   const worktreeSetup = resolveVisibleWorktreeSetup({
     live: liveSnapshot,
     recorded: null,
-    turnStarted: activityRun?.startedAt != null,
+    runs: serverProjection?.runs ?? [],
     followUpSent,
   });
   // After agent handoff, sends queue behind setup without awaiting its scripts.

packages/client-runtime/src/worktreeSetup.ts

@@ -1,9 +1,9 @@
-import type { WorktreeSetupSnapshot } from "@t3tools/contracts";
+import type { OrchestrationV2Run, WorktreeSetupSnapshot } from "@t3tools/contracts";
 
 export function resolveVisibleWorktreeSetup(input: {
   live: WorktreeSetupSnapshot | null;
   recorded: WorktreeSetupSnapshot | null;
-  turnStarted: boolean;
+  runs: ReadonlyArray<Pick<OrchestrationV2Run, "startedAt">>;
   followUpSent: boolean;
 }): WorktreeSetupSnapshot | null {
   const snapshot =
@@ -14,7 +14,7 @@ export function resolveVisibleWorktreeSetup(input: {
   if (snapshot.phase === "running") return snapshot;
   if (input.followUpSent) return null;
   if (snapshot.phase !== "done") return snapshot;
-  if (!input.turnStarted) return snapshot;
+  if (!input.runs.some((run) => run.startedAt !== null)) return snapshot;
   return snapshot.stages.some((stage) => stage.status === "failed") ? snapshot : null;
 }