|
| 1 | +import { useComposerSelection } from "./chat/useComposerSelection"; |
1 | 2 | import { useProjectCloneBanner } from "./chat/useProjectCloneBanner"; |
2 | 3 | import { useAttachmentPreviewHandoff } from "./chat/useAttachmentPreviewHandoff"; |
3 | 4 | import { useTimelineRewind } from "./chat/useTimelineRewind"; |
@@ -55,7 +56,6 @@ import { |
55 | 56 | type ModelSelection, |
56 | 57 | type OrchestrationV2ProviderTurn, |
57 | 58 | type PreviewAnnotationPayload, |
58 | | - ProviderInstanceId, |
59 | 59 | type ServerProvider, |
60 | 60 | type ScopedThreadRef, |
61 | 61 | type ThreadId, |
@@ -199,10 +199,8 @@ import { useNowMinute } from "../hooks/useNowMinute"; |
199 | 199 | import { usePanelAnimationSettings, usePanelPresence } from "../panelAnimations"; |
200 | 200 | import { useNewThreadHandler } from "../hooks/useHandleNewThread"; |
201 | 201 | import { useOpenPanelPullRequestUrl } from "../hooks/useOpenPanelPullRequestUrl"; |
202 | | -import { resolveAppModelSelectionForInstance } from "../modelSelection"; |
203 | 202 | import { isPreviewFocused } from "../lib/previewFocus"; |
204 | 203 | import { getTerminalFocusOwner } from "../lib/terminalFocus"; |
205 | | -import { resolveNewDraftStartFromOrigin } from "../lib/chatThreadActions"; |
206 | 204 | import { |
207 | 205 | deriveLogicalProjectKeyFromSettings, |
208 | 206 | selectProjectGroupingSettings, |
@@ -331,7 +329,6 @@ import { |
331 | 329 | dismissBranchMismatchForSession, |
332 | 330 | shouldShowPlanFollowUpPrompt, |
333 | 331 | shouldRenderPreviewMiniPlayer, |
334 | | - getStartedThreadModelChangeBlockReason, |
335 | 332 | deriveLockedProvider, |
336 | 333 | resolveFileAttachmentUrl, |
337 | 334 | resolveComposerInteractionMode, |
@@ -370,7 +367,6 @@ import { draftFanoutSelectionsAtom, draftSendState } from "./chat/chatViewSend"; |
370 | 367 | import { |
371 | 368 | isCompactCommandMessage, |
372 | 369 | type LocalThreadErrorEntry, |
373 | | - makeModelDisabledReason, |
374 | 370 | makeThreadErrorSetter, |
375 | 371 | } from "./ChatView.logic"; |
376 | 372 |
|
@@ -587,9 +583,6 @@ export default function ChatView(props: ChatViewProps) { |
587 | 583 | })(); |
588 | 584 | const settings = useEnvironmentSettings(environmentId); |
589 | 585 | const clientSettingsHydrated = useClientSettingsHydrated(); |
590 | | - const setStickyComposerModelSelection = useComposerDraftStore( |
591 | | - (store) => store.setStickyModelSelection, |
592 | | - ); |
593 | 586 | const timestampFormat = settings.timestampFormat; |
594 | 587 | const navigate = useNavigate(); |
595 | 588 | // Selects primitives: an object here is new on every router store update, which |
@@ -639,11 +632,6 @@ export default function ChatView(props: ChatViewProps) { |
639 | 632 | return draft ? composerDraftHasUserContent({ ...draft, prompt: "" }) : false; |
640 | 633 | }); |
641 | 634 | const setComposerDraftPrompt = useComposerDraftStore((store) => store.setPrompt); |
642 | | - const setComposerDraftModelSelection = useComposerDraftStore((store) => store.setModelSelection); |
643 | | - const setComposerDraftRuntimeMode = useComposerDraftStore((store) => store.setRuntimeMode); |
644 | | - const setComposerDraftInteractionMode = useComposerDraftStore( |
645 | | - (store) => store.setInteractionMode, |
646 | | - ); |
647 | 635 | const setDraftThreadContext = useComposerDraftStore((store) => store.setDraftThreadContext); |
648 | 636 | const getDraftSessionByLogicalProjectKey = useComposerDraftStore( |
649 | 637 | (store) => store.getDraftSessionByLogicalProjectKey, |
@@ -2102,39 +2090,6 @@ export default function ChatView(props: ChatViewProps) { |
2102 | 2090 | scripts: activeProjectScripts, |
2103 | 2091 | settings, |
2104 | 2092 | }); |
2105 | | - |
2106 | | - const handleRuntimeModeChange = (mode: RuntimeMode) => { |
2107 | | - if (mode === runtimeMode) return; |
2108 | | - setComposerDraftRuntimeMode(composerDraftTarget, mode); |
2109 | | - if (isLocalDraftThread) { |
2110 | | - setDraftThreadContext(composerDraftTarget, { runtimeMode: mode }); |
2111 | | - } |
2112 | | - scheduleComposerFocus(); |
2113 | | - }; |
2114 | | - const handleRuntimeModeChangeStable = useStableCallback(handleRuntimeModeChange); |
2115 | | - |
2116 | | - const handleInteractionModeChange = (mode: ProviderInteractionMode) => { |
2117 | | - if (mode === "plan" && !interactionModeEnabled) return; |
2118 | | - if (mode === interactionMode) return; |
2119 | | - setComposerDraftInteractionMode(composerDraftTarget, mode); |
2120 | | - if (isLocalDraftThread) { |
2121 | | - setDraftThreadContext(composerDraftTarget, { interactionMode: mode }); |
2122 | | - } |
2123 | | - scheduleComposerFocus(); |
2124 | | - }; |
2125 | | - const handleInteractionModeChangeStable = useStableCallback(handleInteractionModeChange); |
2126 | | - const toggleInteractionMode = () => { |
2127 | | - if (!interactionModeEnabled) return; |
2128 | | - handleInteractionModeChange(interactionMode === "plan" ? "default" : "plan"); |
2129 | | - }; |
2130 | | - const toggleInteractionModeStable = useStableCallback(toggleInteractionMode); |
2131 | | - const openProviderSetup = (instanceId: ProviderInstanceId) => { |
2132 | | - void navigate({ |
2133 | | - to: "/settings/providers", |
2134 | | - search: { environmentId, instanceId }, |
2135 | | - }); |
2136 | | - }; |
2137 | | - const openProviderSetupStable = useStableCallback(openProviderSetup); |
2138 | 2093 | const canOperatePreview = useEnvironmentScope( |
2139 | 2094 | activeThreadRef?.environmentId ?? null, |
2140 | 2095 | AuthPreviewOperateScope, |
@@ -3173,6 +3128,37 @@ export default function ChatView(props: ChatViewProps) { |
3173 | 3128 | void sendStandaloneCommand("/compact", "Failed to compact context."); |
3174 | 3129 | }; |
3175 | 3130 |
|
| 3131 | + const { |
| 3132 | + getModelDisabledReason, |
| 3133 | + handleInteractionModeChange, |
| 3134 | + handleInteractionModeChangeStable, |
| 3135 | + handleRuntimeModeChangeStable, |
| 3136 | + onEnvModeChangeStable, |
| 3137 | + onProviderModelSelectStable, |
| 3138 | + onStartFromOriginChange, |
| 3139 | + openProviderSetupStable, |
| 3140 | + toggleInteractionModeStable, |
| 3141 | + } = useComposerSelection({ |
| 3142 | + environmentId, |
| 3143 | + composerDraftTarget, |
| 3144 | + draftThread, |
| 3145 | + activeThread, |
| 3146 | + activeRuntime, |
| 3147 | + activeProjectSettings, |
| 3148 | + settings, |
| 3149 | + providerStatuses, |
| 3150 | + lockedProvider, |
| 3151 | + supportsProviderSwitchingViaHandoff, |
| 3152 | + multipleModelSelections, |
| 3153 | + runtimeMode, |
| 3154 | + interactionMode, |
| 3155 | + interactionModeEnabled, |
| 3156 | + isLocalDraftThread, |
| 3157 | + canOverrideServerThreadEnvMode, |
| 3158 | + setPendingServerThreadEnvModeEntry, |
| 3159 | + setPendingServerThreadStartFromOriginByThreadId, |
| 3160 | + scheduleComposerFocus, |
| 3161 | + }); |
3176 | 3162 | const { onSend, onResume, onImplementPlanInNewThread, isResuming } = useComposerSend({ |
3177 | 3163 | environmentId, |
3178 | 3164 | routeThreadKey, |
@@ -3259,120 +3245,6 @@ export default function ChatView(props: ChatViewProps) { |
3259 | 3245 | }); |
3260 | 3246 | const onImplementPlanInNewThreadStable = useStableCallback(onImplementPlanInNewThread); |
3261 | 3247 |
|
3262 | | - // Keyed on the fields it reads: the thread and runtime objects change with |
3263 | | - // every streamed event, and a new function re-renders the whole model picker. |
3264 | | - const hasStartedSession = activeRuntime !== null; |
3265 | | - const runtimeProviderInstanceId = activeRuntime?.providerInstanceId ?? null; |
3266 | | - const currentModelSelection = activeThread?.modelSelection ?? null; |
3267 | | - const getModelDisabledReason = makeModelDisabledReason( |
3268 | | - currentModelSelection |
3269 | | - ? { |
3270 | | - providers: providerStatuses, |
3271 | | - hasStartedSession, |
3272 | | - supportsProviderSwitchingViaHandoff, |
3273 | | - currentModelSelection, |
3274 | | - currentProviderInstanceId: runtimeProviderInstanceId, |
3275 | | - } |
3276 | | - : null, |
3277 | | - ); |
3278 | | - |
3279 | | - const onProviderModelSelect = ( |
3280 | | - instanceId: ProviderInstanceId, |
3281 | | - model: string, |
3282 | | - options?: { focusComposer?: boolean }, |
3283 | | - ) => { |
3284 | | - if (!activeThread) return; |
3285 | | - const entry = providerStatuses.find((snapshot) => snapshot.instanceId === instanceId); |
3286 | | - const resolvedDriverKind = entry?.driver ?? null; |
3287 | | - if ( |
3288 | | - !supportsProviderSwitchingViaHandoff && |
3289 | | - lockedProvider !== null && |
3290 | | - resolvedDriverKind !== null && |
3291 | | - resolvedDriverKind !== lockedProvider |
3292 | | - ) { |
3293 | | - if (options?.focusComposer !== false) scheduleComposerFocus(); |
3294 | | - return; |
3295 | | - } |
3296 | | - if ( |
3297 | | - !supportsProviderSwitchingViaHandoff && |
3298 | | - lockedProvider !== null && |
3299 | | - activeRuntime?.providerInstanceId |
3300 | | - ) { |
3301 | | - const currentEntry = providerStatuses.find( |
3302 | | - (snapshot) => snapshot.instanceId === activeRuntime.providerInstanceId, |
3303 | | - ); |
3304 | | - if ( |
3305 | | - currentEntry?.continuation?.groupKey && |
3306 | | - entry?.continuation?.groupKey && |
3307 | | - currentEntry.continuation.groupKey !== entry.continuation.groupKey |
3308 | | - ) { |
3309 | | - if (options?.focusComposer !== false) scheduleComposerFocus(); |
3310 | | - return; |
3311 | | - } |
3312 | | - } |
3313 | | - const resolvedModel = resolveAppModelSelectionForInstance( |
3314 | | - instanceId, |
3315 | | - settings, |
3316 | | - providerStatuses, |
3317 | | - model, |
3318 | | - ); |
3319 | | - if (!resolvedModel) { |
3320 | | - if (options?.focusComposer !== false) scheduleComposerFocus(); |
3321 | | - return; |
3322 | | - } |
3323 | | - const rememberedOptions = |
3324 | | - useComposerDraftStore.getState().stickyOptionsByModelByProvider[instanceId]?.[resolvedModel]; |
3325 | | - const nextModelSelection: ModelSelection = |
3326 | | - rememberedOptions !== undefined && rememberedOptions.length > 0 |
3327 | | - ? { instanceId, model: resolvedModel, options: [...rememberedOptions] } |
3328 | | - : { instanceId, model: resolvedModel }; |
3329 | | - const modelChangeBlockReason = getStartedThreadModelChangeBlockReason({ |
3330 | | - providers: providerStatuses, |
3331 | | - hasStartedSession: activeRuntime !== null, |
3332 | | - supportsProviderSwitchingViaHandoff, |
3333 | | - currentModelSelection: activeThread.modelSelection, |
3334 | | - currentProviderInstanceId: activeRuntime?.providerInstanceId ?? null, |
3335 | | - nextModelSelection, |
3336 | | - }); |
3337 | | - if (modelChangeBlockReason) { |
3338 | | - toastManager.add({ |
3339 | | - type: "warning", |
3340 | | - title: modelChangeBlockReason.title, |
3341 | | - description: modelChangeBlockReason.description, |
3342 | | - }); |
3343 | | - if (options?.focusComposer !== false) scheduleComposerFocus(); |
3344 | | - return; |
3345 | | - } |
3346 | | - setComposerDraftModelSelection( |
3347 | | - scopeThreadRef(activeThread.environmentId, activeThread.id), |
3348 | | - nextModelSelection, |
3349 | | - { explicit: true, replaceOptions: true }, |
3350 | | - ); |
3351 | | - setStickyComposerModelSelection(nextModelSelection); |
3352 | | - if (options?.focusComposer !== false) scheduleComposerFocus(); |
3353 | | - }; |
3354 | | - const onProviderModelSelectStable = useStableCallback(onProviderModelSelect); |
3355 | | - const onEnvModeChange = (mode: DraftThreadEnvMode) => { |
3356 | | - if (multipleModelSelections !== null) return; |
3357 | | - if (canOverrideServerThreadEnvMode) { |
3358 | | - if (activeThread) setPendingServerThreadEnvModeEntry({ threadId: activeThread.id, mode }); |
3359 | | - scheduleComposerFocus(); |
3360 | | - return; |
3361 | | - } |
3362 | | - if (isLocalDraftThread) { |
3363 | | - setDraftThreadContext(composerDraftTarget, { |
3364 | | - envMode: mode, |
3365 | | - startFromOrigin: resolveNewDraftStartFromOrigin({ |
3366 | | - envMode: mode, |
3367 | | - newWorktreesStartFromOrigin: activeProjectSettings.settings.newWorktreesStartFromOrigin, |
3368 | | - }), |
3369 | | - ...(mode === "worktree" && draftThread?.worktreePath ? { worktreePath: null } : {}), |
3370 | | - }); |
3371 | | - } |
3372 | | - scheduleComposerFocus(); |
3373 | | - }; |
3374 | | - const onEnvModeChangeStable = useStableCallback(onEnvModeChange); |
3375 | | - |
3376 | 3248 | const onWorktreeSetupWorkLocally = () => { |
3377 | 3249 | if (!worktreeSetup || worktreeSetup.phase !== "running" || !draftId) { |
3378 | 3250 | return; |
@@ -3453,22 +3325,6 @@ export default function ChatView(props: ChatViewProps) { |
3453 | 3325 | workLocallyResendReady, |
3454 | 3326 | ]); |
3455 | 3327 |
|
3456 | | - const onStartFromOriginChange = (nextStartFromOrigin: boolean) => { |
3457 | | - if (canOverrideServerThreadEnvMode && activeThread) { |
3458 | | - setPendingServerThreadStartFromOriginByThreadId((current) => |
3459 | | - current[activeThread.id] === nextStartFromOrigin |
3460 | | - ? current |
3461 | | - : { ...current, [activeThread.id]: nextStartFromOrigin }, |
3462 | | - ); |
3463 | | - return; |
3464 | | - } |
3465 | | - if (isLocalDraftThread) { |
3466 | | - setDraftThreadContext(composerDraftTarget, { |
3467 | | - startFromOrigin: nextStartFromOrigin, |
3468 | | - }); |
3469 | | - } |
3470 | | - }; |
3471 | | - |
3472 | 3328 | const onExpandTimelineImage = (preview: ExpandedImagePreview) => { |
3473 | 3329 | openExpandedImagePreview(routeThreadKey, preview); |
3474 | 3330 | }; |
|
0 commit comments