fix: subscribe to draft thread data directly to prevent stale activeDraftThread

cursoragent · juliusmarminge · cursoragent · commit 55dbe3f48cca · 2026-03-12T18:27:21.000Z
The hook selected getDraftThread (a stable function reference) from the
composer draft store, then called it at render time to compute
activeDraftThread. Because the selector never changed, the component
didn't re-render when draftThreadsByThreadId was updated, causing stale
closures in handleNewThread and ChatRouteGlobalShortcuts.

Fix by subscribing directly to store.draftThreadsByThreadId[routeThreadId]
so the component re-renders whenever the draft for the active route
thread changes.

Co-authored-by: Julius Marminge &lt;juliusmarminge@users.noreply.github.com&gt;
diff --git a/apps/web/src/hooks/useHandleNewThread.ts b/apps/web/src/hooks/useHandleNewThread.ts
@@ -11,7 +11,6 @@ export function useHandleNewThread() {
   const getDraftThreadByProjectId = useComposerDraftStore(
     (store) => store.getDraftThreadByProjectId,
   );
-  const getDraftThread = useComposerDraftStore((store) => store.getDraftThread);
   const setProjectDraftThreadId = useComposerDraftStore((store) => store.setProjectDraftThreadId);
   const setDraftThreadContext = useComposerDraftStore((store) => store.setDraftThreadContext);
   const clearProjectDraftThreadId = useComposerDraftStore(
@@ -26,7 +25,9 @@ export function useHandleNewThread() {
   const activeThread = routeThreadId
     ? threads.find((thread) => thread.id === routeThreadId)
     : undefined;
-  const activeDraftThread = routeThreadId ? getDraftThread(routeThreadId) : null;
+  const activeDraftThread = useComposerDraftStore((store) =>
+    routeThreadId ? (store.draftThreadsByThreadId[routeThreadId] ?? null) : null,
+  );
 
   const handleNewThread = useCallback(
     (
