feat(chat): work-status panel, and MCP auth and settings fixes (#2776)
Adds a work-status panel beside the transcript. Context fill, model and cost, todos, running subagents and the permission requests blocking them, branch and working-tree state, MCP servers, pinned messages and context sources were scattered across the header, the composer and the context panel — a blocked subagent was reported nowhere at all. The panel reads them from live channels rather than persisted history, and becomes an overlay where the chat is too narrow to seat a column. It is on by default, including for existing installs. Because it now carries these readouts, the desktop header and composer drop the ones it duplicates: todo and changed-files chips, usage and MCP tabs. VS Code and mobile keep theirs — neither hosts the panel. Fixes MCP authorization, which was broken from the panel, invalidated by a directory switch through a redirect URI that encoded the working directory, and left the desktop app in the background because browsers will not follow a custom-protocol link without a user gesture. The settings page no longer asks the user to understand the MCP spec before adding a server: one field takes the command or the link, with the kind inferred and a visible override, and client-registration fields appear only when a server actually asks for its own credentials. Also: skills load from the panel instead of only when the composer's slash autocomplete opens; the header button names the current instance rather than falling through to the word "Instance" for relay hosts. Three new optional UI settings keys, all migrated. No change to stored MCP server configuration.
This commit is contained in:
@@ -50,6 +50,8 @@ import { usePlanDetection } from '@/hooks/usePlanDetection';
|
||||
import { useI18n } from '@/lib/i18n';
|
||||
import { isMobileSurfaceRuntime } from '@/lib/runtimeSurface';
|
||||
import { isVSCodeRuntime } from '@/lib/desktop';
|
||||
import { WorkStatusPanel } from './work-status/WorkStatusPanel';
|
||||
import { useWorkStatusVisibility } from './work-status/useWorkStatusVisibility';
|
||||
import { getEmbeddedSessionChatOriginSessionId } from '@/components/layout/contextPanelEmbeddedChat';
|
||||
import { isFullySyntheticMessage } from '@/lib/messages/synthetic';
|
||||
import { normalizeUserDisplayParts } from './message/normalizeUserDisplayParts';
|
||||
@@ -694,6 +696,49 @@ export const ChatContainer: React.FC<ChatContainerProps> = ({ active = true, aut
|
||||
// composer enters the same fullscreen-input mode via its drag handle.
|
||||
const isDesktopExpandedInput = isExpandedInput;
|
||||
const useCompactDraftLayout = isMobile || isVSCode || chatSurfaceMode === 'mini-chat';
|
||||
// Work-status panel: a borderless column to the right of the transcript.
|
||||
// It yields to the context panel and to a narrow chat; `rowRef` goes on the
|
||||
// row that holds both columns, so its width never depends on the panel's
|
||||
// own visibility.
|
||||
const { rowRef: workStatusRowRef, visible: workStatusVisible, fits: workStatusFits } = useWorkStatusVisibility({
|
||||
directory: effectiveSessionDirectory,
|
||||
isMobile,
|
||||
isVSCode,
|
||||
});
|
||||
// Session view only. The draft branch returns its own layout before this
|
||||
// one, so the panel has no place there yet.
|
||||
// Surfaces that never host the panel skip it entirely; the rest keep it
|
||||
// mounted so its visibility can animate rather than snap.
|
||||
const workStatusPanelMountable = !isMobile
|
||||
&& !isVSCode
|
||||
&& chatSurfaceMode !== 'mini-chat'
|
||||
&& !isDesktopExpandedInput;
|
||||
const showWorkStatusPanel = workStatusPanelMountable && workStatusVisible;
|
||||
|
||||
// Offered over the chat when there is no room beside it. The panel is still
|
||||
// switched on; only the layout refuses it.
|
||||
const workStatusPanelEnabled = useUIStore((state) => state.workStatusPanelEnabled);
|
||||
const workStatusOverlayOpen = useUIStore((state) => state.workStatusOverlayOpen);
|
||||
const setWorkStatusPanelFits = useUIStore((state) => state.setWorkStatusPanelFits);
|
||||
// Mounted whenever it could be shown, not only while it is: an element
|
||||
// that appears and disappears with the condition has nothing to animate.
|
||||
const workStatusOverlayMountable = workStatusPanelMountable
|
||||
&& workStatusPanelEnabled
|
||||
&& !workStatusFits;
|
||||
const showWorkStatusOverlay = workStatusOverlayMountable && workStatusOverlayOpen;
|
||||
|
||||
React.useEffect(() => {
|
||||
setWorkStatusPanelFits(workStatusPanelMountable && workStatusFits);
|
||||
return () => setWorkStatusPanelFits(false);
|
||||
}, [setWorkStatusPanelFits, workStatusFits, workStatusPanelMountable]);
|
||||
|
||||
// Published so the header can drop the readouts the panel already carries.
|
||||
// Cleared on unmount: a chat that goes away is not showing anything.
|
||||
const setWorkStatusPanelVisible = useUIStore((state) => state.setWorkStatusPanelVisible);
|
||||
React.useEffect(() => {
|
||||
setWorkStatusPanelVisible(showWorkStatusPanel);
|
||||
return () => setWorkStatusPanelVisible(false);
|
||||
}, [setWorkStatusPanelVisible, showWorkStatusPanel]);
|
||||
const messageListRef = React.useRef<MessageListHandle | null>(null);
|
||||
const currentSession = useSession(currentSessionId, effectiveSessionDirectory);
|
||||
const parentSession = useParentSession(currentSessionId, effectiveSessionDirectory);
|
||||
@@ -1152,7 +1197,8 @@ export const ChatContainer: React.FC<ChatContainerProps> = ({ active = true, aut
|
||||
}
|
||||
|
||||
return (
|
||||
<div data-composer-bound className="relative flex flex-col h-full bg-background">
|
||||
<div ref={workStatusRowRef} className="flex h-full min-h-0 bg-background">
|
||||
<div data-composer-bound className="relative flex min-w-0 flex-1 flex-col h-full bg-background">
|
||||
{returnToParentButton}
|
||||
<ChatViewport
|
||||
currentSessionId={currentSessionId}
|
||||
@@ -1205,6 +1251,18 @@ export const ChatContainer: React.FC<ChatContainerProps> = ({ active = true, aut
|
||||
{promptReadOnly ? <ReadOnlyPromptBanner /> : <ChatInput scrollToBottom={scrollToBottomOnSend} />}
|
||||
</div>
|
||||
|
||||
{/* Inside the chat column, not beside it: as a row sibling it took
|
||||
part in the flex layout and pushed the transcript, which is the
|
||||
one thing an overlay must not do. */}
|
||||
{workStatusOverlayMountable ? (
|
||||
<WorkStatusPanel
|
||||
overlay
|
||||
visible={showWorkStatusOverlay}
|
||||
sessionId={currentSessionId ?? null}
|
||||
directory={effectiveSessionDirectory ?? null}
|
||||
/>
|
||||
) : null}
|
||||
|
||||
<TimelineDialog
|
||||
open={isTimelineDialogOpen}
|
||||
onOpenChange={setTimelineDialogOpen}
|
||||
@@ -1216,5 +1274,16 @@ export const ChatContainer: React.FC<ChatContainerProps> = ({ active = true, aut
|
||||
onLoadEarlier={handleLoadOlderClick}
|
||||
/>
|
||||
</div>
|
||||
{/* Kept mounted while it could ever show, so it can animate its own
|
||||
collapse; `visible` drives that. Unmounting on the spot is what made
|
||||
the chat jump wide before easing narrow again. */}
|
||||
{workStatusPanelMountable ? (
|
||||
<WorkStatusPanel
|
||||
visible={showWorkStatusPanel}
|
||||
sessionId={currentSessionId ?? null}
|
||||
directory={effectiveSessionDirectory ?? null}
|
||||
/>
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user