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.
143 lines
5.5 KiB
TypeScript
143 lines
5.5 KiB
TypeScript
import React from 'react';
|
|
import { useI18n } from '@/lib/i18n';
|
|
import { Switch } from '@/components/ui/switch';
|
|
import { useMcpStore } from '@/stores/useMcpStore';
|
|
import { McpIcon } from '@/components/icons/McpIcon';
|
|
import { runBackgroundNetworkTask } from '@/lib/background-network';
|
|
import { toast } from 'sonner';
|
|
import { isVSCodeRuntime } from '@/lib/desktop';
|
|
import { startMcpAuthorization } from '@/components/sections/mcp/startMcpAuthorization';
|
|
import { WorkStatusCollapsibleSection, WorkStatusRow, WorkStatusRowAction } from './WorkStatusPrimitives';
|
|
import { useReportWorkStatusPresence } from './presenceContext';
|
|
|
|
type Props = {
|
|
directory: string | null;
|
|
};
|
|
|
|
/**
|
|
* MCP servers with their connection switches, reusing the dropdown's own
|
|
* connect/disconnect actions.
|
|
*/
|
|
export const WorkStatusMcpSection: React.FC<Props> = ({ directory }) => {
|
|
const { t } = useI18n();
|
|
|
|
const mcpStatus = useMcpStore(
|
|
React.useCallback((state) => state.getStatusForDirectory(directory), [directory]),
|
|
);
|
|
const refreshMcp = useMcpStore((state) => state.refresh);
|
|
const connect = useMcpStore((state) => state.connect);
|
|
const disconnect = useMcpStore((state) => state.disconnect);
|
|
const [busyServer, setBusyServer] = React.useState<string | null>(null);
|
|
|
|
// The panel must not depend on the header dropdown having been mounted or
|
|
// opened to know its MCP servers. Silent and background-gated, so it cannot
|
|
// compete with chat bootstrap traffic for sockets.
|
|
React.useEffect(() => {
|
|
void runBackgroundNetworkTask(() => refreshMcp({ directory, silent: true }));
|
|
}, [directory, refreshMcp]);
|
|
|
|
const mcpServers = React.useMemo(
|
|
() => Object.entries(mcpStatus ?? {}).sort(([left], [right]) => left.localeCompare(right)),
|
|
[mcpStatus],
|
|
);
|
|
const mcpConnected = React.useMemo(
|
|
() => mcpServers.filter(([, entry]) => entry?.status === 'connected').length,
|
|
[mcpServers],
|
|
);
|
|
|
|
// A server waiting on authorization cannot be reconnected into working
|
|
// order: `connect` just repeats the attempt that produced `needs_auth`.
|
|
// Authorising sends the user to the provider instead.
|
|
const handleAuthorize = React.useCallback(async (name: string) => {
|
|
setBusyServer(name);
|
|
try {
|
|
const { opened } = await startMcpAuthorization({
|
|
name,
|
|
directory,
|
|
skipRedirectUriBootstrap: isVSCodeRuntime(),
|
|
});
|
|
if (!opened) {
|
|
toast.error(t('chat.workStatus.mcp.authorizeOpenFailed'));
|
|
}
|
|
} catch (error) {
|
|
toast.error(error instanceof Error ? error.message : t('chat.workStatus.mcp.authorizeFailed'));
|
|
} finally {
|
|
setBusyServer((current) => (current === name ? null : current));
|
|
}
|
|
}, [directory, t]);
|
|
|
|
const handleToggle = React.useCallback(async (name: string, next: boolean) => {
|
|
// Switching on a server that is waiting for sign-in cannot connect: it only
|
|
// repeats the attempt that produced `needs_auth`. Authorization is the real
|
|
// action, and the dropdown already routes the same switch that way — the
|
|
// two surfaces must not disagree about what this control does.
|
|
const status = (mcpStatus ?? {})[name]?.status;
|
|
if (next && (status === 'needs_auth' || status === 'needs_client_registration')) {
|
|
await handleAuthorize(name);
|
|
return;
|
|
}
|
|
|
|
setBusyServer(name);
|
|
try {
|
|
if (next) await connect(name, directory);
|
|
else await disconnect(name, directory);
|
|
} finally {
|
|
setBusyServer((current) => (current === name ? null : current));
|
|
}
|
|
}, [connect, disconnect, directory, handleAuthorize, mcpStatus]);
|
|
|
|
useReportWorkStatusPresence('mcp', mcpServers.length > 0);
|
|
|
|
if (mcpServers.length === 0) return null;
|
|
|
|
return (
|
|
<WorkStatusCollapsibleSection
|
|
id="mcp"
|
|
title={t('chat.workStatus.section.mcp')}
|
|
iconNode={<McpIcon className="size-4 shrink-0 text-muted-foreground" />}
|
|
summary={`${mcpConnected}/${mcpServers.length}`}
|
|
>
|
|
{mcpServers.map(([name, entry]) => {
|
|
const connected = entry?.status === 'connected';
|
|
const needsAuth = entry?.status === 'needs_auth' || entry?.status === 'needs_client_registration';
|
|
const failed = entry?.status === 'failed';
|
|
return (
|
|
<WorkStatusRow
|
|
key={name}
|
|
leading={(
|
|
<Switch
|
|
checked={connected}
|
|
disabled={busyServer === name}
|
|
className="scale-75 data-[checked]:bg-status-info"
|
|
aria-label={t('chat.workStatus.mcp.toggle', { name })}
|
|
onCheckedChange={(checked) => { void handleToggle(name, checked); }}
|
|
/>
|
|
)}
|
|
label={name}
|
|
muted={!connected}
|
|
// A server asking for sign-in or reporting a failure is asking to be
|
|
// acted on; the state is the affordance, so it is the button.
|
|
value={needsAuth ? (
|
|
<WorkStatusRowAction
|
|
tone="warning"
|
|
disabled={busyServer === name}
|
|
onClick={() => { void handleAuthorize(name); }}
|
|
>
|
|
{t('chat.workStatus.mcp.needsAuth')}
|
|
</WorkStatusRowAction>
|
|
) : failed ? (
|
|
<WorkStatusRowAction
|
|
tone="error"
|
|
disabled={busyServer === name}
|
|
onClick={() => { void handleToggle(name, true); }}
|
|
>
|
|
{t('chat.workStatus.mcp.failed')}
|
|
</WorkStatusRowAction>
|
|
) : undefined}
|
|
/>
|
|
);
|
|
})}
|
|
</WorkStatusCollapsibleSection>
|
|
);
|
|
};
|