@@ -63,6 +63,7 @@ import {
6363 readFileAsDataUrl ,
6464 resolveComposerInteractionMode ,
6565 resolveComposerProviderSelection ,
66+ threadShellHasStarted ,
6667} from "../ChatView.logic" ;
6768import {
6869 dataTransferHasComposerMention ,
@@ -198,10 +199,11 @@ import {
198199 renderProviderTraitsMenuContent ,
199200 renderProviderTraitsPicker ,
200201} from "./composerProviderState" ;
201- import { ContextWindowMeter } from "./ContextWindowMeter" ;
202+ import { ContextWindowMeter , ContextWindowMeterPlaceholder } from "./ContextWindowMeter" ;
202203import {
203204 providerSupportsManualCompaction ,
204205 resolveContextWindowModelDisplayName ,
206+ shouldReserveContextWindowMeter ,
205207} from "./ContextWindowMeter.logic" ;
206208import {
207209 attachVideoThumbnail ,
@@ -866,7 +868,13 @@ import {
866868} from "../../providerInstances" ;
867869import { type AppModelOption , getAppModelOptionsForInstance } from "../../modelSelection" ;
868870import type { UnifiedSettings } from "@t3tools/contracts/settings" ;
869- import { type ChatMessage , type SessionPhase , type Thread , videoMimeType } from "../../types" ;
871+ import {
872+ type ChatMessage ,
873+ type SessionPhase ,
874+ type Thread ,
875+ type ThreadShell ,
876+ videoMimeType ,
877+ } from "../../types" ;
870878import {
871879 buildComposerPromptHistoryEntries ,
872880 stepComposerPromptHistory ,
@@ -1107,6 +1115,7 @@ const ComposerFooterModeControls = memo(function ComposerFooterModeControls(prop
11071115const ComposerFooterPrimaryActions = memo ( function ComposerFooterPrimaryActions ( props : {
11081116 compact : boolean ;
11091117 activeContextWindow : ContextWindowSnapshot | null ;
1118+ reserveContextWindowMeter : boolean ;
11101119 activeThreadModelDisplayName : string | null ;
11111120 isPreparingWorktree : boolean ;
11121121 pendingAction : {
@@ -1143,6 +1152,8 @@ const ComposerFooterPrimaryActions = memo(function ComposerFooterPrimaryActions(
11431152 compactDisabled = { props . compactDisabled }
11441153 compactDisabledReason = { props . compactDisabledReason }
11451154 />
1155+ ) : props . reserveContextWindowMeter ? (
1156+ < ContextWindowMeterPlaceholder />
11461157 ) : null }
11471158 < ComposerPrimaryActions
11481159 compact = { props . compact }
@@ -1242,6 +1253,8 @@ export interface ChatComposerProps {
12421253 activeThreadId : ThreadId | null ;
12431254 activeThreadEnvironmentId : EnvironmentId | undefined ;
12441255 activeThread : Thread | undefined ;
1256+ /** The routed server thread's shell, present before its detail loads. */
1257+ activeThreadShell : ThreadShell | null ;
12451258 /** Timeline messages including optimistic sends, for ArrowUp prompt recall. */
12461259 promptHistoryMessages : ReadonlyArray < ChatMessage > ;
12471260 isServerThread : boolean ;
@@ -1298,6 +1311,8 @@ export interface ChatComposerProps {
12981311 // Provider / model
12991312 lockedProvider : ProviderDriverKind | null ;
13001313 providerStatuses : ServerProvider [ ] ;
1314+ /** False until the environment's server config has arrived at least once. */
1315+ providerCatalogKnown : boolean ;
13011316 activeProjectDefaultModelSelection : ModelSelection | null | undefined ;
13021317 activeThreadModelSelection : ModelSelection | null | undefined ;
13031318
@@ -1416,6 +1431,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
14161431 interactionMode : requestedInteractionMode ,
14171432 lockedProvider,
14181433 providerStatuses,
1434+ providerCatalogKnown,
14191435 activeProjectDefaultModelSelection,
14201436 activeThreadModelSelection,
14211437 activeContextWindow,
@@ -1712,6 +1728,12 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
17121728 const selectedInstanceId =
17131729 selectedProviderEntry ?. instanceId ?? NO_PROVIDER_MODEL_SELECTION . instanceId ;
17141730 const noProviderAvailable = selectedProviderEntry === undefined ;
1731+ // Before the catalog arrives, every thread resolves to "no provider". Send
1732+ // stays blocked either way; only the chrome waits, keeping the picker with
1733+ // the thread's own selection instead of swapping in the setup button and
1734+ // back once the catalog lands.
1735+ const providerCatalogPending = noProviderAvailable && ! providerCatalogKnown ;
1736+ const showProviderUnavailable = noProviderAvailable && ! providerCatalogPending ;
17151737 const providerSetupInstanceId = noProviderAvailable
17161738 ? ( unavailableProviderInstanceId ??
17171739 ( lockedProvider === null
@@ -1887,6 +1909,14 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
18871909 ( ) => resolveContextWindowModelDisplayName ( activeThreadModelSelection , modelOptionsByInstance ) ,
18881910 [ activeThreadModelSelection , modelOptionsByInstance ] ,
18891911 ) ;
1912+ const reserveContextWindowMeter = shouldReserveContextWindowMeter ( {
1913+ meterEnabled : settings . contextWindowMeterEnabled ,
1914+ detailLoading : props . threadSyncPhase === "loading" ,
1915+ threadStarted : threadShellHasStarted ( props . activeThreadShell ) ,
1916+ providerReportsContextWindow : selectedProviderStatus
1917+ ? selectedProviderStatus . reportsContextWindow === true
1918+ : null ,
1919+ } ) ;
18901920
18911921 // ------------------------------------------------------------------
18921922 // Composer-local state
@@ -3843,7 +3873,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
38433873 isStashMenuOpen ||
38443874 isDragOverComposer ||
38453875 isPreparingWorktree ||
3846- noProviderAvailable ||
3876+ showProviderUnavailable ||
38473877 projectSelectionRequired ||
38483878 environmentUnavailable !== null ||
38493879 composerSubmissionError !== null ||
@@ -4088,7 +4118,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
40884118 const hiddenRestingBlockIds = restingBlockDefs
40894119 . slice ( restingBlockDefs . length - restingHiddenBlockCount )
40904120 . map ( ( def ) => def . id ) ;
4091- const composerControls = noProviderAvailable ? (
4121+ const composerControls = showProviderUnavailable ? (
40924122 < Button
40934123 type = "button"
40944124 size = "sm"
@@ -4117,8 +4147,17 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
41174147 < ProviderModelPicker
41184148 isComposerOwned
41194149 compact = { composerControlsCompact }
4120- activeInstanceId = { selectedInstanceId }
4121- model = { selectedModelForPickerWithCustomFallback }
4150+ disabled = { providerCatalogPending }
4151+ activeInstanceId = {
4152+ providerCatalogPending
4153+ ? ( activeThreadModelSelection ?. instanceId ?? selectedInstanceId )
4154+ : selectedInstanceId
4155+ }
4156+ model = {
4157+ providerCatalogPending
4158+ ? ( activeThreadModelSelection ?. model ?? selectedModelForPickerWithCustomFallback )
4159+ : selectedModelForPickerWithCustomFallback
4160+ }
41224161 lockedProvider = { lockedProvider }
41234162 lockedContinuationGroupKey = { lockedContinuationGroupKey }
41244163 instanceEntries = { providerInstanceEntries }
@@ -5172,7 +5211,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
51725211 : activePendingProgress . customAnswer ||
51735212 "Type your own answer, or leave this blank to use the selected option"
51745213 : prompt . trim ( ) ||
5175- ( noProviderAvailable ? "Enable a provider in Settings" : "Ask anything..." ) }
5214+ ( showProviderUnavailable
5215+ ? "Enable a provider in Settings"
5216+ : "Ask anything..." ) }
51765217 </ button >
51775218 { collapsedComposerImagePreviews }
51785219 < button
@@ -5631,7 +5672,8 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
56315672 "relative" ,
56325673 isComposerResting && "flex min-w-0 items-center gap-1" ,
56335674 isComposerResting &&
5634- ( settings . contextWindowMeterEnabled && activeContextWindow
5675+ ( ( settings . contextWindowMeterEnabled && activeContextWindow ) ||
5676+ reserveContextWindowMeter
56355677 ? "pr-28"
56365678 : showComposerAttachAction
56375679 ? "pr-20"
@@ -5685,7 +5727,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
56855727 ? "Add feedback to refine the plan, or leave this blank to implement it"
56865728 : projectSelectionRequired
56875729 ? "Choose a project above to start a thread"
5688- : noProviderAvailable
5730+ : showProviderUnavailable
56895731 ? "Enable a provider in Settings to send a message"
56905732 : phase === "disconnected"
56915733 ? DISCONNECTED_COMPOSER_PLACEHOLDER
@@ -5808,6 +5850,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
58085850 activeContextWindow = {
58095851 settings . contextWindowMeterEnabled ? activeContextWindow : null
58105852 }
5853+ reserveContextWindowMeter = { reserveContextWindowMeter }
58115854 activeThreadModelDisplayName = { activeThreadModelDisplayName }
58125855 pendingAction = { pendingPrimaryAction }
58135856 isRunning = { phase === "running" }
0 commit comments