Skip to content

fix(ui): restore tool selection feedback in onboarding and render selected tool names in review #1633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
whtssub wants to merge 3 commits into
base: main
Choose a base branch
from
+33 −9
Open

fix(ui): restore tool selection feedback in onboarding and render selected tool names in review #1633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3da8c69
fix(ui): restore tool selection feedback in onboarding and render sel…
whtssub Apr 6, 2026
c71e91b
Merge branch 'main' into fix/ui
whtssub Apr 6, 2026
378d75f
Merge branch 'main' into fix/ui
peterj Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 28 additions & 6 deletions ui/src/components/onboarding/steps/ReviewStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,34 @@ export function ReviewStep({ onboardingData, isLoading, onBack, onSubmit }: Revi
{onboardingData.selectedTools && onboardingData.selectedTools.length > 0 ? (
<ScrollArea className="h-[100px] w-full rounded-md border p-3 bg-muted/50">
<div className="flex flex-wrap gap-2">
{onboardingData.selectedTools.map(tool => (
<Badge variant="secondary" key={tool.mcpServer?.name} className="flex items-center gap-1">
<FunctionSquare className="h-3 w-3" />
{tool.mcpServer?.name}
</Badge>
))}
{onboardingData.selectedTools.flatMap((tool, toolIndex) => {
const serverName = tool.mcpServer?.name || "unknown-server";
const toolNames = tool.mcpServer?.toolNames || [];

if (toolNames.length === 0) {
return (
<Badge
variant="secondary"
key={`${serverName}-${toolIndex}-no-tool-name`}
className="flex items-center gap-1"
>
<FunctionSquare className="h-3 w-3" />
{serverName}
</Badge>
);
}

return toolNames.map((toolName) => (
<Badge
variant="secondary"
key={`${serverName}-${toolName}-${toolIndex}`}
className="flex items-center gap-1"
>
<FunctionSquare className="h-3 w-3" />
{toolName}
</Badge>
));
})}
</div>
</ScrollArea>
) : (
Expand Down
8 changes: 5 additions & 3 deletions ui/src/components/onboarding/steps/ToolSelectionStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
import { Info, ChevronDown, ChevronRight, FunctionSquare, Search } from 'lucide-react';
import { LoadingState } from "@/components/LoadingState";
import { ErrorState } from "@/components/ErrorState";
import { getToolResponseDisplayName, getToolResponseDescription, getToolResponseIdentifier, getToolResponseCategory, toolResponseToAgentTool } from "@/lib/toolUtils";
import { getToolResponseDisplayName, getToolResponseDescription, getToolResponseIdentifier, getToolResponseCategory, toolResponseToAgentTool, serverNamesMatch } from "@/lib/toolUtils";
import type { Tool, ToolsResponse } from "@/types";
import { Input } from "@/components/ui/input";

Expand Down Expand Up @@ -39,8 +39,10 @@ export function ToolSelectionStep({
if (tool.type === "Agent" && tool.agent) {
return false; // Agents don't match ToolResponse objects
} else if (tool.type === "McpServer" && tool.mcpServer) {
return tool.mcpServer.name === toolResponse.server_name &&
tool.mcpServer.toolNames.includes(toolResponse.id);
// server_name may be "namespace/name" while saved name can be just "name"
// (or vice versa), so normalize before comparing.
return serverNamesMatch(tool.mcpServer.name, toolResponse.server_name) &&
tool.mcpServer.toolNames.includes(toolResponse.id);
}
return false;
};
Expand Down