:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.
Python ab-testingai-analyticsanalyticscdpdata-warehouseexperimentsfeature-flagsjavascriptproduct-analyticspythonreactsession-replaysurveystypescriptweb-analytics
fix(mcp): keep dollar sequences literal when restoring query json (#113115)
posthog[bot]5ab1a12c3343
diff --git a/services/mcp/src/lib/response.ts b/services/mcp/src/lib/response.tsindex ffbf868d0d5b..5d2e706e87cd 100644--- a/services/mcp/src/lib/response.ts+++ b/services/mcp/src/lib/response.ts@@ -1,6 +1,7 @@import { encode } from '@toon-format/toon'const QUERY_PLACEHOLDER_PREFIX = '__QUERY_PLACEHOLDER_'+const QUERY_PLACEHOLDER_PATTERN = /__QUERY_PLACEHOLDER_\d+__/gfunction preprocessKeys(obj: any, placeholderMap: Map<string, string>, placeholderId = { current: 0 }): any {if (obj === null || obj === undefined) {@@ -51,11 +52,9 @@ export function formatResponse(data: any): string {const placeholderMap = new Map<string, string>()const processed = preprocessKeys(unwrapPaginatedResponse(data), placeholderMap)- let result = encode(processed)+ const result = encode(processed)- for (const [placeholder, jsonValue] of placeholderMap.entries()) {- result = result.replace(`${placeholder}`, jsonValue)- }-- return result+ // Use a replacer function so `$&`, `$'` and similar sequences in query JSON stay literal.+ // One pass means inserted JSON never becomes a target for a later placeholder.+ return result.replace(QUERY_PLACEHOLDER_PATTERN, (placeholder) => placeholderMap.get(placeholder) ?? placeholder)}diff --git a/services/mcp/tests/unit/formatResponse.test.ts b/services/mcp/tests/unit/formatResponse.test.tsindex e91adf939f91..7637c676bbcc 100644--- a/services/mcp/tests/unit/formatResponse.test.ts+++ b/services/mcp/tests/unit/formatResponse.test.ts@@ -54,6 +54,32 @@ describe('formatResponse', () => {expect(result).toContain(expectedJson)})+ it.each([+ ["$'", "SELECT count() FROM events WHERE match(properties.$pathname, '^/pricing$')"],+ ['$&', "SELECT '$&' AS token"],+ ['$`', 'SELECT 1 AS `$`col`'],+ ['$$', "SELECT '$$' AS cost"],+ ])('keeps %s in a query literal', (_sequence, sql) => {+ const data = {+ charts: [+ { name: 'first', query: { kind: 'HogQLQuery', query: sql } },+ {+ name: 'second',+ query: { kind: 'DataVisualizationNode', source: { kind: 'HogQLQuery', query: sql } },+ },+ ],+ metrics: 'trailing-metrics-field',+ prompts: 'trailing-prompts-field',+ }+ const result = formatResponse(data)++ expect(result).toContain(JSON.stringify(data.charts[0]!.query, null, 2))+ expect(result).toContain(JSON.stringify(data.charts[1]!.query, null, 2))+ expect(result.split('trailing-metrics-field')).toHaveLength(2)+ expect(result.split('trailing-prompts-field')).toHaveLength(2)+ expect(result).not.toContain('__QUERY_PLACEHOLDER_')+ })+it('handles arrays', () => {const data = {flags: [