-
- ) : null
- }
- bannerItems={composerBannerItems}
- // With attachments or contexts aboard the pick just inserts the
- // text, so it sends as a prompt like the typed path would.
- onUsageLimitsCommand={
- usageLimitsOffered &&
- usageLimitsKey !== null &&
- !composerHasNonPromptContent
- ? openUsageLimits
- : undefined
- }
- environmentUnavailable={activeEnvironmentUnavailableState}
- activePendingApproval={activePendingApproval}
- pendingApprovals={pendingApprovals}
- pendingUserInputs={pendingUserInputs}
- activePendingProgress={activePendingProgress}
- activePendingResolvedAnswers={activePendingResolvedAnswers}
- activePendingIsResponding={activePendingIsResponding}
- activePendingDraftAnswers={activePendingDraftAnswers}
- activePendingQuestionIndex={activePendingQuestionIndex}
- respondingRequestIds={respondingRequestIds}
- showPlanFollowUpPrompt={showPlanFollowUpPrompt}
- activeProposedPlan={activeProposedPlan}
- threadSyncPhase={activeEnvironmentUnavailable ? null : threadSyncPhase}
- runtimeMode={runtimeMode}
- interactionMode={interactionMode}
- lockedProvider={modelPickerLockedProvider}
- providerStatuses={providerStatuses as ServerProvider[]}
- providerCatalogKnown={serverConfig !== null}
- activeProjectDefaultModelSelection={activeProjectDefaultModelSelection}
- activeThreadModelSelection={activeThread?.modelSelection}
- activeContextWindow={activeContextWindow}
- activeTasksProgress={activeComposerTasksProgress}
- activeTaskSteps={activeComposerTaskSteps}
- compactThreadUnavailable={compactThreadUnavailable}
- compactDisabled={compactDisabled}
- compactDisabledReason={compactDisabledReason}
- resolvedTheme={resolvedTheme}
- settings={settings}
- keybindings={keybindings}
- terminalOpen={Boolean(terminalUiState.terminalOpen)}
- gitCwd={gitCwd}
- pullRequestProjectId={
- supportsPullRequests ? (activeProject?.id ?? null) : null
- }
- pullRequestRepository={
- supportsPullRequests ? activeProjectRepository : null
- }
- restingControlsHost={restingComposerControlsHost}
- restingControlsHaveLeadingContext={
- mountComposerContextStrip &&
- (isGitRepo || showComposerEnvironmentIndicator)
- }
- onRestingControlsVisibilityChange={setRestingComposerControlsVisible}
- getTimelineScrollableNode={getTimelineScrollableNode}
- isTimelineAtLogicalEnd={isTimelineAtLogicalEnd}
- timelineOverflows={timelineOverflows}
- onComposerOverlayHeightChange={publishComposerOverlayHeight}
- onRestingChange={onComposerRestingChange}
- promptRef={promptRef}
- composerImagesRef={composerImagesRef}
- composerFilesRef={composerFilesRef}
- composerTerminalContextsRef={composerTerminalContextsRef}
- onPageScrollKeyDown={onComposerPageScrollKeyDown}
- onPageScrollKeyUp={onComposerPageScrollKeyUp}
- onPageScrollRelease={onComposerPageScrollRelease}
- onCompactContext={onCompactContext}
- onSend={onSend}
- onInterrupt={onInterrupt}
- onImplementPlanInNewThread={onImplementPlanInNewThread}
- onRespondToApproval={onRespondToApproval}
- onSelectActivePendingUserInputOption={
- onSelectActivePendingUserInputOption
- }
- onAdvanceActivePendingUserInput={onAdvanceActivePendingUserInput}
- onDismissActivePendingUserInput={onDismissUserInput}
- onPreviousActivePendingUserInputQuestion={
- onPreviousActivePendingUserInputQuestion
- }
- onChangeActivePendingUserInputCustomAnswer={
- onChangeActivePendingUserInputCustomAnswer
- }
- onProviderModelSelect={onProviderModelSelect}
- onOpenProviderSetup={openProviderSetup}
- getModelDisabledReason={getModelDisabledReason}
- toggleInteractionMode={toggleInteractionMode}
- handleRuntimeModeChange={handleRuntimeModeChange}
- handleInteractionModeChange={handleInteractionModeChange}
- focusComposer={focusComposer}
- scheduleComposerFocus={scheduleComposerFocus}
- setThreadError={setThreadError}
- onExpandImage={onExpandTimelineImage}
- onFileOpen={openFileAttachment}
- editingQueuedAttachments={composerEditingQueuedAttachments}
- onRemoveEditingQueuedAttachment={removeEditingQueuedAttachment}
- />
+ {showProviderSubagentBar ? (
+
onOpenRelatedThread(parentThreadLink.threadId)
+ : null
+ }
+ />
+ ) : null}
+ {!composerMounted ? null : (
+
+ ) : null
+ }
+ bannerItems={composerBannerItems}
+ // With attachments or contexts aboard the pick just inserts the
+ // text, so it sends as a prompt like the typed path would.
+ onUsageLimitsCommand={
+ usageLimitsOffered &&
+ usageLimitsKey !== null &&
+ !composerHasNonPromptContent
+ ? openUsageLimits
+ : undefined
+ }
+ environmentUnavailable={activeEnvironmentUnavailableState}
+ activePendingApproval={activePendingApproval}
+ pendingApprovals={pendingApprovals}
+ pendingUserInputs={pendingUserInputs}
+ activePendingProgress={activePendingProgress}
+ activePendingResolvedAnswers={activePendingResolvedAnswers}
+ activePendingIsResponding={activePendingIsResponding}
+ activePendingDraftAnswers={activePendingDraftAnswers}
+ activePendingQuestionIndex={activePendingQuestionIndex}
+ respondingRequestIds={respondingRequestIds}
+ showPlanFollowUpPrompt={showPlanFollowUpPrompt}
+ activeProposedPlan={activeProposedPlan}
+ threadSyncPhase={
+ activeEnvironmentUnavailable ? null : threadSyncPhase
+ }
+ runtimeMode={runtimeMode}
+ interactionMode={interactionMode}
+ lockedProvider={modelPickerLockedProvider}
+ providerStatuses={providerStatuses as ServerProvider[]}
+ providerCatalogKnown={serverConfig !== null}
+ activeProjectDefaultModelSelection={
+ activeProjectDefaultModelSelection
+ }
+ activeThreadModelSelection={activeThread?.modelSelection}
+ activeContextWindow={activeContextWindow}
+ activeTasksProgress={activeComposerTasksProgress}
+ activeTaskSteps={activeComposerTaskSteps}
+ compactThreadUnavailable={compactThreadUnavailable}
+ compactDisabled={compactDisabled}
+ compactDisabledReason={compactDisabledReason}
+ resolvedTheme={resolvedTheme}
+ settings={settings}
+ keybindings={keybindings}
+ terminalOpen={Boolean(terminalUiState.terminalOpen)}
+ gitCwd={gitCwd}
+ pullRequestProjectId={
+ supportsPullRequests ? (activeProject?.id ?? null) : null
+ }
+ pullRequestRepository={
+ supportsPullRequests ? activeProjectRepository : null
+ }
+ restingControlsHost={restingComposerControlsHost}
+ restingControlsHaveLeadingContext={
+ mountComposerContextStrip &&
+ (isGitRepo || showComposerEnvironmentIndicator)
+ }
+ onRestingControlsVisibilityChange={setRestingComposerControlsVisible}
+ getTimelineScrollableNode={getTimelineScrollableNode}
+ isTimelineAtLogicalEnd={isTimelineAtLogicalEnd}
+ timelineOverflows={timelineOverflows}
+ onComposerOverlayHeightChange={publishComposerOverlayHeight}
+ onRestingChange={onComposerRestingChange}
+ promptRef={promptRef}
+ composerImagesRef={composerImagesRef}
+ composerFilesRef={composerFilesRef}
+ composerTerminalContextsRef={composerTerminalContextsRef}
+ onPageScrollKeyDown={onComposerPageScrollKeyDown}
+ onPageScrollKeyUp={onComposerPageScrollKeyUp}
+ onPageScrollRelease={onComposerPageScrollRelease}
+ onCompactContext={onCompactContext}
+ onSend={onSend}
+ onInterrupt={onInterrupt}
+ onImplementPlanInNewThread={onImplementPlanInNewThread}
+ onRespondToApproval={onRespondToApproval}
+ onSelectActivePendingUserInputOption={
+ onSelectActivePendingUserInputOption
+ }
+ onAdvanceActivePendingUserInput={onAdvanceActivePendingUserInput}
+ onDismissActivePendingUserInput={onDismissUserInput}
+ onPreviousActivePendingUserInputQuestion={
+ onPreviousActivePendingUserInputQuestion
+ }
+ onChangeActivePendingUserInputCustomAnswer={
+ onChangeActivePendingUserInputCustomAnswer
+ }
+ onProviderModelSelect={onProviderModelSelect}
+ onOpenProviderSetup={openProviderSetup}
+ getModelDisabledReason={getModelDisabledReason}
+ toggleInteractionMode={toggleInteractionMode}
+ handleRuntimeModeChange={handleRuntimeModeChange}
+ handleInteractionModeChange={handleInteractionModeChange}
+ focusComposer={focusComposer}
+ scheduleComposerFocus={scheduleComposerFocus}
+ setThreadError={setThreadError}
+ onExpandImage={onExpandTimelineImage}
+ onFileOpen={openFileAttachment}
+ editingQueuedAttachments={composerEditingQueuedAttachments}
+ onRemoveEditingQueuedAttachment={removeEditingQueuedAttachment}
+ />
+ )}
diff --git a/apps/web/src/components/chat/ChatComposer.tsx b/apps/web/src/components/chat/ChatComposer.tsx
index aac01d291c9c..ffb36fdfd08f 100644
--- a/apps/web/src/components/chat/ChatComposer.tsx
+++ b/apps/web/src/components/chat/ChatComposer.tsx
@@ -188,6 +188,7 @@ import {
import { useComposerPathSearch } from "../../lib/composerPathSearchState";
import { replaceComposerContextReferences } from "@t3tools/shared/composerContextReferences";
import {
+ composerModelPickerCanStayOpen,
getRestingComposerImagePreviewCounts,
resolveRestingComposerControlsLayout,
shouldAnimateComposerRestingTransition,
@@ -1511,6 +1512,11 @@ export interface ChatComposerProps {
isLocalDraftThread: boolean;
forceExpandedOnMobile: boolean;
projectSelectionRequired: boolean;
+ /**
+ * The thread's model, effort, and access belong to its provider (a native
+ * subagent answering a question): hide those pickers and attachments.
+ */
+ hideThreadSettings?: boolean;
// Session phase
phase: SessionPhase;
@@ -1685,6 +1691,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
isLocalDraftThread: _isLocalDraftThread,
forceExpandedOnMobile,
projectSelectionRequired,
+ hideThreadSettings = false,
phase,
isConnecting,
isSendBusy,
@@ -2754,6 +2761,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
const showCollapsedMobilePromptRow =
isComposerCollapsedMobile && !isComposerApprovalState && pendingUserInputs.length === 0;
const showComposerAttachAction =
+ !hideThreadSettings &&
fileStagingLimit !== null &&
(!activePendingProgress ||
(supportsQuestionAttachments &&
@@ -5058,7 +5066,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
const composerControlsVisibleInStrip =
composerControlsCollapsed && restingControlsHost !== null && restingControlsVisible;
const composerControlsHidden = composerControlsCollapsed && !restingControlsVisible;
- if (composerControlsHidden && isComposerModelPickerOpen) {
+ if (
+ isComposerModelPickerOpen &&
+ !composerModelPickerCanStayOpen({
+ controlsHidden: composerControlsHidden,
+ threadSettingsHidden: hideThreadSettings,
+ })
+ ) {
setIsComposerModelPickerOpen(false);
}
useLayoutEffect(() => {
@@ -5304,7 +5318,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
const hiddenRestingBlockIds = restingBlockDefs
.slice(restingBlockDefs.length - restingHiddenBlockCount)
.map((def) => def.id);
- const composerControls = showProviderUnavailable ? (
+ const composerControls = hideThreadSettings ? null : showProviderUnavailable ? (
void) | null;
+}) {
+ const statusRef = useRef(null);
+ const { status } = props;
+ const live = status !== null && isOrchestrationV2WorkActive(status.status);
+ const modelDescription =
+ props.effortLabel === null ? props.modelLabel : `${props.modelLabel}, ${props.effortLabel}`;
+ // Announced once per transition; the ticking label below is not.
+ const announcement = formatProviderSubagentStatus(
+ status === null ? null : { ...status, startedAt: null },
+ 0,
+ );
+
+ // The label is written from an effect, and live bars tick through DOM
+ // writes, so a running timer never re-renders the chat view.
+ useLayoutEffect(() => {
+ const update = () => {
+ if (statusRef.current) {
+ statusRef.current.textContent = formatProviderSubagentStatus(status, Date.now());
+ }
+ };
+ update();
+ if (!live) return;
+ const id = setInterval(update, 1_000);
+ return () => clearInterval(id);
+ }, [live, status]);
+
+ return (
+
+
+ {props.provider ? (
+
+ ) : null}
+ {props.modelLabel}
+ {props.effortLabel === null ? null : (
+ {props.effortLabel}
+ )}
+
+
+
+ {`${modelDescription} subagent: ${announcement}`}
+
+
Runs on its own
+ {props.onOpenParent ? (
+
+ ) : null}
+