Skip to content

fix(ui): render MCP tool output in GenericTool fallback #22035

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
Femumme wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(ui): render MCP tool output in GenericTool fallback #22035

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 40 additions & 2 deletions packages/ui/src/components/basic-tool.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import { createEffect, For, Match, on, onCleanup, Show, Switch, type JSX } from "solid-js"
import { createEffect, createSignal, For, Match, on, onCleanup, Show, Switch, type JSX } from "solid-js"
import { animate, type AnimationPlaybackControls } from "motion"
import { useI18n } from "../context/i18n"
import { createStore } from "solid-js/store"
import { Collapsible } from "./collapsible"
import type { IconProps } from "./icon"
import { IconButton } from "./icon-button"
import { TextShimmer } from "./text-shimmer"
import { Tooltip } from "./tooltip"
import { Markdown } from "./markdown"

export type TriggerTitle = {
title: string
Expand Down Expand Up @@ -265,8 +268,17 @@ export function GenericTool(props: {
status?: string
hideDetails?: boolean
input?: Record<string, unknown>
output?: string
}) {
const i18n = useI18n()
const [copied, setCopied] = createSignal(false)

const handleCopy = async () => {
if (!props.output) return
await navigator.clipboard.writeText(props.output)
setCopied(true)
setTimeout(() => setCopied(false), 2000)
}

return (
<BasicTool
Expand All @@ -278,6 +290,32 @@ export function GenericTool(props: {
args: args(props.input),
}}
hideDetails={props.hideDetails}
/>
>
<Show when={props.output}>
<div data-component="bash-output">
<div data-slot="bash-copy">
<Tooltip
value={copied() ? i18n.t("ui.message.copied") : i18n.t("ui.message.copy")}
placement="top"
gutter={4}
>
<IconButton
icon={copied() ? "check" : "copy"}
size="small"
variant="secondary"
onMouseDown={(e) => e.preventDefault()}
onClick={handleCopy}
aria-label={copied() ? i18n.t("ui.message.copied") : i18n.t("ui.message.copy")}
/>
</Tooltip>
</div>
<div data-slot="bash-scroll" data-scrollable>
<pre data-slot="bash-pre">
<code>{props.output}</code>
</pre>
</div>
</div>
</Show>
</BasicTool>
)
}
Loading