diff --git a/apps/x/apps/renderer/src/components/ai-elements/markdown-code-override.tsx b/apps/x/apps/renderer/src/components/ai-elements/markdown-code-override.tsx index 9e6a3d3e..4c5eca24 100644 --- a/apps/x/apps/renderer/src/components/ai-elements/markdown-code-override.tsx +++ b/apps/x/apps/renderer/src/components/ai-elements/markdown-code-override.tsx @@ -1,6 +1,7 @@ import { isValidElement, type JSX } from 'react' import { FilePathCard } from './file-path-card' import { MermaidRenderer } from '@/components/mermaid-renderer' +import { ChartRenderer } from '@/components/chart-renderer' export function MarkdownPreOverride(props: JSX.IntrinsicElements['pre']) { const { children, ...rest } = props @@ -31,6 +32,17 @@ export function MarkdownPreOverride(props: JSX.IntrinsicElements['pre']) { return } } + if ( + typeof childProps.className === 'string' && + childProps.className.includes('language-chart') + ) { + const text = typeof childProps.children === 'string' + ? childProps.children.trim() + : '' + if (text) { + return + } + } } // Passthrough for all other code blocks - return children directly diff --git a/apps/x/apps/renderer/src/components/chart-renderer.tsx b/apps/x/apps/renderer/src/components/chart-renderer.tsx new file mode 100644 index 00000000..2edb83c1 --- /dev/null +++ b/apps/x/apps/renderer/src/components/chart-renderer.tsx @@ -0,0 +1,147 @@ +import { useMemo } from 'react' +import { BarChart3 } from 'lucide-react' +import { blocks } from '@x/shared' +import { useTheme } from '@/contexts/theme-context' +import { + LineChart, Line, + BarChart, Bar, + PieChart, Pie, Cell, + XAxis, YAxis, CartesianGrid, Tooltip, ResponsiveContainer, Legend, +} from 'recharts' + +// Categorical palettes validated for CVD separation and surface contrast on +// each mode's chart surface (dataviz six-checks validator). Slots are +// assigned to series in fixed order — the dark column is the same hues +// re-stepped for the dark surface, not a different palette. +const SERIES_COLORS_LIGHT = ['#2a78d6', '#008300', '#e87ba4', '#eda100', '#1baf7a', '#eb6834'] +const SERIES_COLORS_DARK = ['#3987e5', '#008300', '#d55181', '#c98500', '#199e70', '#d95926'] + +interface ChartRendererProps { + /** Raw contents of a ```chart fence: ChartBlockSchema JSON. */ + source: string +} + +/** + * Inline chart for chat messages: renders a ```chart fenced block (same + * ChartBlockSchema the notes chart block uses) via recharts. Invalid or + * still-streaming JSON renders as a quiet placeholder rather than an error — + * the fence body arrives token by token while the model writes it. + */ +export function ChartRenderer({ source }: ChartRendererProps) { + const { resolvedTheme } = useTheme() + const colors = resolvedTheme === 'dark' ? SERIES_COLORS_DARK : SERIES_COLORS_LIGHT + const gridStroke = resolvedTheme === 'dark' ? '#3a3a38' : '#e4e4e0' + const textColor = resolvedTheme === 'dark' ? '#c3c2b7' : '#52514e' + + const config = useMemo(() => { + try { + return blocks.ChartBlockSchema.parse(JSON.parse(source)) + } catch { + return null + } + }, [source]) + + if (!config || !config.data || config.data.length === 0) { + return ( +
+ + Preparing chart… +
+ ) + } + + const data = config.data + const series = blocks.chartSeries(config) + const axisProps = { + stroke: textColor, + tick: { fill: textColor, fontSize: 11 }, + tickLine: false, + } + + return ( +
+ {config.title && ( +
{config.title}
+ )} + + {config.chart === 'line' ? ( + + + + + + {series.length > 1 && } + {series.map((key, i) => ( + + ))} + + ) : config.chart === 'bar' ? ( + + + + + + {series.length > 1 && } + {series.map((key, i) => ( + + ))} + + ) : ( + + + + + {data.map((_, i) => ( + + ))} + + + )} + +
+ ) +} diff --git a/apps/x/apps/renderer/src/extensions/chart-block.tsx b/apps/x/apps/renderer/src/extensions/chart-block.tsx index 3377b157..b8454d1c 100644 --- a/apps/x/apps/renderer/src/extensions/chart-block.tsx +++ b/apps/x/apps/renderer/src/extensions/chart-block.tsx @@ -64,6 +64,7 @@ function ChartBlockView({ node, deleteNode }: { node: { attrs: Record{error} if (!data || data.length === 0) return
No data
+ const series = blocks.chartSeries(config!) return ( {config!.chart === 'line' ? ( @@ -73,7 +74,9 @@ function ChartBlockView({ node, deleteNode }: { node: { attrs: Record - + {series.map((key, index) => ( + + ))} ) : config!.chart === 'bar' ? ( @@ -82,13 +85,15 @@ function ChartBlockView({ node, deleteNode }: { node: { attrs: Record - + {series.map((key, index) => ( + + ))} ) : ( - + {data.map((_, index) => ( ))} diff --git a/apps/x/packages/core/src/runtime/assembly/skills/charts/skill.ts b/apps/x/packages/core/src/runtime/assembly/skills/charts/skill.ts new file mode 100644 index 00000000..4e071609 --- /dev/null +++ b/apps/x/packages/core/src/runtime/assembly/skills/charts/skill.ts @@ -0,0 +1,74 @@ +export const skill = String.raw` +# Charts + +Load this skill when the user asks for a chart, graph, plot, trend, comparison, or "visualize" — or when data you've gathered (prices over time, counts per category, proportions) would land better as a picture than a table. + +## How it works + +Emit a fenced code block with language \`chart\` anywhere in your reply. The app renders it as an interactive chart inline (tooltips, legend, light/dark theming are handled for you — never pick colors yourself). Everything outside the fence is normal markdown. + +\`\`\`\` +\`\`\`chart +{ ...JSON config... } +\`\`\` +\`\`\`\` + +## Config schema + +- **\`chart\`** (required): \`"line"\` | \`"bar"\` | \`"pie"\` +- **\`data\`** (required): array of flat objects — the rows to plot. Put REAL values you gathered this turn here; never invent numbers. +- **\`x\`** (required): key of the label/category field in each row +- **\`y\`** (required): key of the value field — a string for one series, or an array of keys for several series on one chart +- **\`title\`** (optional): short heading shown above the chart + +## Picking the form + +- **line** — change over time (prices, counts by date). X is the time field. +- **bar** — compare magnitudes across categories (issues per label, revenue per region). +- **pie** — proportions of a whole; only with ≤ 6 slices, otherwise use a bar. +- Two measures with very different scales (e.g. a $600 stock vs a $5 one): do NOT mix them on one chart — either normalize to % change and say so in the title, or emit two chart blocks. + +## Examples + +Multi-series line (comparison over time, normalized): + +\`\`\`chart +{ + "chart": "line", + "title": "5-Day % Change", + "x": "date", + "y": ["AAPL", "NVDA", "SPY"], + "data": [ + { "date": "Jul 15", "AAPL": 0, "NVDA": 0, "SPY": 0 }, + { "date": "Jul 16", "AAPL": -0.4, "NVDA": 1.2, "SPY": 0.1 }, + { "date": "Jul 17", "AAPL": -1.1, "NVDA": 0.8, "SPY": -0.3 } + ] +} +\`\`\` + +Single-series bar: + +\`\`\`chart +{ + "chart": "bar", + "title": "Open issues by area", + "x": "area", + "y": "count", + "data": [ + { "area": "sync", "count": 14 }, + { "area": "editor", "count": 9 }, + { "area": "billing", "count": 3 } + ] +} +\`\`\` + +## Rules + +- Data must come from what you actually fetched or computed this turn — never fabricate points to make a chart possible. Too little real data? Say so instead of charting. +- Keep it readable: ≤ ~30 rows per chart, ≤ 6 series. Round values sensibly. +- Numbers must be JSON numbers, not strings ("3.1", "5%" won't plot). +- Follow the chart with one sentence of takeaway — what the reader should see in it. +- One chart per distinct question; don't emit several variants of the same data. +`; + +export default skill; diff --git a/apps/x/packages/core/src/runtime/assembly/skills/index.ts b/apps/x/packages/core/src/runtime/assembly/skills/index.ts index ee676fa1..1124ae93 100644 --- a/apps/x/packages/core/src/runtime/assembly/skills/index.ts +++ b/apps/x/packages/core/src/runtime/assembly/skills/index.ts @@ -29,6 +29,7 @@ import backgroundTaskSkill from "./background-task/skill.js"; import notifyUserSkill from "./notify-user/skill.js"; import appsSkill from "./apps/skill.js"; import slackSkill from "./slack/skill.js"; +import chartsSkill from "./charts/skill.js"; const CURRENT_DIR = path.dirname(fileURLToPath(import.meta.url)); const CATALOG_PREFIX = "src/runtime/assembly/skills"; @@ -77,6 +78,12 @@ const definitions: SkillDefinition[] = [ summary: "Prepare for meetings by gathering context about attendees from the knowledge base.", content: meetingPrepSkill, }, + { + id: "charts", + title: "Charts", + summary: "Render interactive charts (line, bar, pie) inline in the chat reply. Use when the user asks for a chart/graph/visualization or when gathered data is clearer as a picture.", + content: chartsSkill, + }, { id: "organize-files", title: "Organize Files", diff --git a/apps/x/packages/shared/src/blocks.ts b/apps/x/packages/shared/src/blocks.ts index 6e6c75c2..f1ee90a7 100644 --- a/apps/x/packages/shared/src/blocks.ts +++ b/apps/x/packages/shared/src/blocks.ts @@ -47,11 +47,18 @@ export const ChartBlockSchema = z.object({ data: z.array(z.record(z.string(), z.unknown())).optional(), source: z.string().optional(), x: z.string(), - y: z.string(), + // One series (string) or several (array of data keys). Pie ignores all + // but the first. + y: z.union([z.string(), z.array(z.string()).min(1)]), }); export type ChartBlock = z.infer; +/** The y series list regardless of which form the block used. */ +export function chartSeries(block: ChartBlock): string[] { + return Array.isArray(block.y) ? block.y : [block.y]; +} + export const TableBlockSchema = z.object({ columns: z.array(z.string()), data: z.array(z.record(z.string(), z.unknown())),