diff --git a/apps/web/src/components/chat/ChatComposer.tsx b/apps/web/src/components/chat/ChatComposer.tsx
index 6a5dddfb67cf1..e47e33d5f7bc6 100644
--- a/apps/web/src/components/chat/ChatComposer.tsx
+++ b/apps/web/src/components/chat/ChatComposer.tsx
@@ -298,7 +298,10 @@ import { ComposerModelFilters } from "./ComposerModelFilters";
 import { deriveComposerModelItems } from "./composerModelItems";
 import { attachModelToChat } from "./modelReferences";
 import { useEnvironmentModelPreferences } from "~/hooks/useSettings";
-import { useIssueContextStore } from "~/issueContextStore";
+import { useCheckoutContextRecords } from "~/checkoutContextStore";
+import { useIssueContextRecords, useIssueContextStore } from "~/issueContextStore";
+import { useRepositoryContextRecords } from "~/repositoryContextStore";
+import { useThreadTabContextRecords } from "~/threadTabContextStore";
 import { providerModelKey } from "~/modelOrdering";
 import { ComposerPrimaryActions, type ComposerSendSurface } from "./ComposerPrimaryActions";
 import { useComposerCheckoutItems } from "./useComposerCheckoutItems";
@@ -1942,10 +1945,18 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     updateModelChip: (record: ModelContextRecord) =>
       useIssueContextStore.getState().upsert(routeThreadRef.threadId, record),
   };
+  const composerThreadTabContexts = useThreadTabContextRecords(routeThreadRef.threadId);
+  const composerIssueContexts = useIssueContextRecords(routeThreadRef.threadId);
+  const composerRepositoryContexts = useRepositoryContextRecords(routeThreadRef.threadId);
+  const composerCheckoutContexts = useCheckoutContextRecords(routeThreadRef.threadId);
   const composerContextRecords = composerContextRecordsFromDraft({
     terminalContexts: composerTerminalContexts,
     reviewComments: composerReviewComments,
     previewAnnotations: composerPreviewAnnotations,
+    threadTabs: composerThreadTabContexts,
+    issues: composerIssueContexts,
+    repositories: composerRepositoryContexts,
+    checkouts: composerCheckoutContexts,
     threadContexts: composerThreadContexts,
     images: composerImages,
     files: composerFiles,