@@ -1,6 +1,6 @@
 import type { EnvironmentId, ThreadId, WorktreeSetupSnapshot } from "@t3tools/contracts";
 import { resolveVisibleWorktreeSetup } from "@t3tools/client-runtime/worktree-setup";
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { useEnvironmentQuery } from "../../state/query";
 import { vcsEnvironment } from "../../state/vcs";
 import { resolveWorktreeSetupSnapshot } from "./worktree-setup-state";
@@ -26,10 +26,10 @@ export function useWorktreeSetup(input: {
       : null,
   );
   const snapshot = resolveWorktreeSetupSnapshot(input.threadId, query.data, live);
-  useEffect(() => {
-    // oxlint-disable-next-line react/set-state-in-effect -- Holds the last setup snapshot while the live subscription changes over.
-    if (snapshot && snapshot !== live) setHeld({ key, snapshot });
-  }, [key, live, snapshot]);
+  // Hold the newest snapshot so it survives the subscription closing once setup stops running.
+  // Set during render so each emission commits once; the resolver returns `live` by identity
+  // on the next pass, which ends the update.
+  if (snapshot && snapshot !== live) setHeld({ key, snapshot });
   return {
     snapshot,
     visible: resolveVisibleWorktreeSetup({