# Files changed · PR \#23070 · pingdotgg/t3code [View on GitCafe](https://git.cafe/pingdotgg/t3code/pull/23070/diffs) Repository: [pingdotgg/t3code](https://git.cafe/pingdotgg/t3code) Visibility: public [refactor\(web\): ChatView's pull request checkout lives in usePullRequestDraftThread](https://git.cafe/pingdotgg/t3code/pull/23070.md) Version: 5 Head commit: c8c87afdbfeacdcaaeec94927259a84dd7ba0f48 Base commit: d7052be1584ef4c21e11eed75ae43ddced5989f3 Comparison base: d7052be1584ef4c21e11eed75ae43ddced5989f3 Showing up to 20 entries from this revision. If the pull request changes, reopen the first page before continuing. ## apps/web/src/components/ChatView.tsx Status: modified; +11; −92 ```diff @@ -1,3 +1,4 @@ +import { usePullRequestDraftThread } from "./chat/usePullRequestDraftThread"; import { useComposerSelection } from "./chat/useComposerSelection"; import { useProjectCloneBanner } from "./chat/useProjectCloneBanner"; import { useAttachmentPreviewHandoff } from "./chat/useAttachmentPreviewHandoff"; @@ -183,7 +184,7 @@ import { COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS } from "~/workspaceTitlebar"; import { stackedThreadToast, toastManager } from "./ui/toast"; import { projectScriptIdFromCommand } from "~/projectScripts"; -import { newDraftId, newMessageId, newThreadId } from "~/lib/utils"; +import { newMessageId } from "~/lib/utils"; import { registerFaviconProjectForThread } from "~/browserFaviconStore"; import { applyProviderInstanceSettings, @@ -207,7 +208,6 @@ deriveLogicalProjectKeyFromSettings, selectProjectGroupingSettings, } from "../logicalProject"; -import { buildDraftThreadRouteParams } from "../threadRoutes"; import { isSameSidebarThreadRef, useSidebarPendingFileDropStore, @@ -259,7 +259,6 @@ BranchRestoreConfirmHost, DeviceSetupDialogHost, openBranchRestoreConfirm, - openPullRequestThreadDialog, PullRequestThreadDialogHost, RevertConfirmHost, } from "./chat/ChatOverlayHosts"; @@ -635,13 +634,6 @@ }); const setComposerDraftPrompt = useComposerDraftStore((store) => store.setPrompt); const setDraftThreadContext = useComposerDraftStore((store) => store.setDraftThreadContext); - const getDraftSessionByLogicalProjectKey = useComposerDraftStore( - (store) => store.getDraftSessionByLogicalProjectKey, - ); - const getDraftSession = useComposerDraftStore((store) => store.getDraftSession); - const setLogicalProjectDraftThreadId = useComposerDraftStore( - (store) => store.setLogicalProjectDraftThreadId, - ); const composerImagesRef = useRef([]); const composerFilesRef = useRef([]); const composerTerminalContextsRef = useRef([]); @@ -1198,91 +1190,18 @@ activeEnvironment: activeEnvironmentOption, canPickEnvironment: hasMultipleEnvironments, }); - const openPullRequestDialog = (reference?: string) => { - if (!canCheckoutPullRequestIntoThread) { - return; - } - if (activeThreadKey === null) return; - openPullRequestThreadDialog(activeThreadKey, reference); - }; - const openPullRequestDialogStable = useStableCallback(openPullRequestDialog); - const openOrReuseProjectDraftThread = async (input: { - branch: string; - worktreePath: string | null; - envMode: DraftThreadEnvMode; - }) => { - if (!activeProject) { + const { handlePreparedPullRequestThreadStable, openPullRequestDialogStable } = + usePullRequestDraftThread({ + routeKind, + draftId, - throw new Error("No active project is available for this pull request."); + settings, - } - const activeProjectRef = scopeProjectRef(activeProject.environmentId, activeProject.id); - const logicalProjectKey = deriveLogicalProjectKeyFromSettings( - activeProject, projectGroupingSettings, - ); - const storedDraftSession = getDraftSessionByLogicalProjectKey(logicalProjectKey); - if (storedDraftSession) { + activeProject, + activeThreadKey, + isServerThread, + canCheckoutPullRequestIntoThread, - setDraftThreadContext(storedDraftSession.draftId, input); - setLogicalProjectDraftThreadId( - logicalProjectKey, - activeProjectRef, - storedDraftSession.draftId, - { - threadId: storedDraftSession.threadId, - ...input, - }, - ); - if (routeKind !== "draft" || draftId !== storedDraftSession.draftId) { - await navigate({ - to: "/draft/$draftId", - params: buildDraftThreadRouteParams(storedDraftSession.draftId), - }); - } - return storedDraftSession.threadId; - } - - const activeDraftSession = routeKind === "draft" && draftId ? getDraftSession(draftId) : null; - if (!isServerThread && activeDraftSession?.logicalProjectKey === logicalProjectKey && draftId) { - setDraftThreadContext(draftId, input); - setLogicalProjectDraftThreadId(logicalProjectKey, activeProjectRef, draftId, { - threadId: activeDraftSession.threadId, - createdAt: activeDraftSession.createdAt, - runtimeMode: activeDraftSession.runtimeMode, - interactionMode: activeDraftSession.interactionMode, - ...input, - }); - return activeDraftSession.threadId; - } - - const nextDraftId = newDraftId(); - const nextThreadId = newThreadId(); - setLogicalProjectDraftThreadId(logicalProjectKey, activeProjectRef, nextDraftId, { - threadId: nextThreadId, - createdAt: new Date().toISOString(), - runtimeMode: resolveProjectSettings(settings, activeProject.id, activeProject).settings - .defaultRuntimeMode, - interactionMode: DEFAULT_INTERACTION_MODE, - ...input, }); - await navigate({ - to: "/draft/$draftId", - params: buildDraftThreadRouteParams(nextDraftId), - }); - return nextThreadId; - }; - - const handlePreparedPullRequestThread = async (input: { - branch: string; - worktreePath: string | null; - }) => { - await openOrReuseProjectDraftThread({ - branch: input.branch, - worktreePath: input.worktreePath, - envMode: input.worktreePath ? "worktree" : "local", - }); - }; - const handlePreparedPullRequestThreadStable = useStableCallback(handlePreparedPullRequestThread); - const serverConfig = activeThread ? (activeEnvironment?.serverConfig ?? null) : (primaryEnvironment?.serverConfig ?? null); ``` ## apps/web/src/components/chat/usePullRequestDraftThread.ts Status: added; +140; −0 ```diff @@ -1,0 +1,140 @@ +import type { EnvironmentProject } from "@t3tools/client-runtime/state/shell"; +import type { UnifiedSettings } from "@t3tools/contracts"; +import { useStableCallback } from "../../hooks/useStableCallback"; +import { scopeProjectRef } from "@t3tools/client-runtime/environment"; +import { resolveProjectSettings } from "@t3tools/shared/projectSettings"; +import { useNavigate } from "@tanstack/react-router"; +import { DEFAULT_INTERACTION_MODE } from "../../types"; +import { newDraftId, newThreadId } from "~/lib/utils"; +import { + deriveLogicalProjectKeyFromSettings, + selectProjectGroupingSettings, +} from "../../logicalProject"; +import { buildDraftThreadRouteParams } from "../../threadRoutes"; +import { type DraftThreadEnvMode, useComposerDraftStore, DraftId } from "../../composerDraftStore"; +import { openPullRequestThreadDialog } from "./ChatOverlayHosts"; +interface PullRequestDraftThreadInput { + readonly routeKind: "server" | "draft"; + readonly draftId: DraftId | null; + readonly settings: UnifiedSettings; + readonly projectGroupingSettings: ReturnType; + readonly activeProject: EnvironmentProject | null; + readonly activeThreadKey: string | null; + readonly isServerThread: boolean; + readonly canCheckoutPullRequestIntoThread: boolean; +} + +/** + * Checking out a pull request into a thread: opens the dialog, then puts the prepared branch or + * worktree on the project's draft thread, reusing the one already open when there is one. + */ +export function usePullRequestDraftThread(input: PullRequestDraftThreadInput) { + const { + routeKind, + draftId, + settings, + projectGroupingSettings, + activeProject, + activeThreadKey, + isServerThread, + canCheckoutPullRequestIntoThread, + } = input; + const navigate = useNavigate(); + const setDraftThreadContext = useComposerDraftStore((store) => store.setDraftThreadContext); + const getDraftSessionByLogicalProjectKey = useComposerDraftStore( + (store) => store.getDraftSessionByLogicalProjectKey, + ); + const getDraftSession = useComposerDraftStore((store) => store.getDraftSession); + const setLogicalProjectDraftThreadId = useComposerDraftStore( + (store) => store.setLogicalProjectDraftThreadId, + ); + + const openPullRequestDialog = (reference?: string) => { + if (!canCheckoutPullRequestIntoThread) { + return; + } + if (activeThreadKey === null) return; + openPullRequestThreadDialog(activeThreadKey, reference); + }; + const openPullRequestDialogStable = useStableCallback(openPullRequestDialog); + + const openOrReuseProjectDraftThread = async (input: { + branch: string; + worktreePath: string | null; + envMode: DraftThreadEnvMode; + }) => { + if (!activeProject) { + throw new Error("No active project is available for this pull request."); + } + const activeProjectRef = scopeProjectRef(activeProject.environmentId, activeProject.id); + const logicalProjectKey = deriveLogicalProjectKeyFromSettings( + activeProject, + projectGroupingSettings, + ); + const storedDraftSession = getDraftSessionByLogicalProjectKey(logicalProjectKey); + if (storedDraftSession) { + setDraftThreadContext(storedDraftSession.draftId, input); + setLogicalProjectDraftThreadId( + logicalProjectKey, + activeProjectRef, + storedDraftSession.draftId, + { + threadId: storedDraftSession.threadId, + ...input, + }, + ); + if (routeKind !== "draft" || draftId !== storedDraftSession.draftId) { + await navigate({ + to: "/draft/$draftId", + params: buildDraftThreadRouteParams(storedDraftSession.draftId), + }); + } + return storedDraftSession.threadId; + } + + const activeDraftSession = routeKind === "draft" && draftId ? getDraftSession(draftId) : null; + if (!isServerThread && activeDraftSession?.logicalProjectKey === logicalProjectKey && draftId) { + setDraftThreadContext(draftId, input); + setLogicalProjectDraftThreadId(logicalProjectKey, activeProjectRef, draftId, { + threadId: activeDraftSession.threadId, + createdAt: activeDraftSession.createdAt, + runtimeMode: activeDraftSession.runtimeMode, + interactionMode: activeDraftSession.interactionMode, + ...input, + }); + return activeDraftSession.threadId; + } + + const nextDraftId = newDraftId(); + const nextThreadId = newThreadId(); + setLogicalProjectDraftThreadId(logicalProjectKey, activeProjectRef, nextDraftId, { + threadId: nextThreadId, + createdAt: new Date().toISOString(), + runtimeMode: resolveProjectSettings(settings, activeProject.id, activeProject).settings + .defaultRuntimeMode, + interactionMode: DEFAULT_INTERACTION_MODE, + ...input, + }); + await navigate({ + to: "/draft/$draftId", + params: buildDraftThreadRouteParams(nextDraftId), + }); + return nextThreadId; + }; + + const handlePreparedPullRequestThread = async (input: { + branch: string; + worktreePath: string | null; + }) => { + await openOrReuseProjectDraftThread({ + branch: input.branch, + worktreePath: input.worktreePath, + envMode: input.worktreePath ? "worktree" : "local", + }); + }; + const handlePreparedPullRequestThreadStable = useStableCallback(handlePreparedPullRequestThread); + return { + handlePreparedPullRequestThreadStable, + openPullRequestDialogStable, + }; +} ```