Merge pull request #517 from decocms/revert-ga-475

Revert "fix(google-analytics): fix input validation and align output schemas with other Google MCPs (#475)"

Author: yuriassuncx

google-analytics/server/lib/schemas.ts

@@ -30,7 +30,6 @@ export const PropertySummarySchema = z.object({
   propertyType: z.string().optional(),
   /** Parent resource name, e.g. "accounts/123456". */
   parent: z.string().optional(),
-  canEdit: z.boolean().optional(),
 });
 
 export const AccountSummarySchema = z.object({
@@ -42,8 +41,10 @@ export const AccountSummarySchema = z.object({
   propertySummaries: z.array(PropertySummarySchema).optional(),
 });
 
-export const AccountSummariesOutputSchema = z.object({
-  accountSummaries: z.array(AccountSummarySchema).optional(),
+export const AccountSummariesResponseSchema = z.object({
+  response: z.object({
+    accountSummaries: z.array(AccountSummarySchema).optional(),
+  }),
 });
 
 // ── Admin API — Property ─────────────────────────────────────────────────────
@@ -68,6 +69,10 @@ export const PropertySchema = z.object({
   expireTime: Timestamp.optional(),
 });
 
+export const PropertyResponseSchema = z.object({
+  response: PropertySchema,
+});
+
 // ── Admin API — Custom Dimensions & Metrics ──────────────────────────────────
 
 export const CustomDimensionSchema = z.object({
@@ -96,11 +101,21 @@ export const CustomMetricSchema = z.object({
   restrictedMetricType: z.array(z.string()).optional(),
 });
 
-export const CustomDimensionsAndMetricsOutputSchema = z.object({
+export const CustomDimensionsListSchema = z.object({
   customDimensions: z.array(CustomDimensionSchema).optional(),
+});
+
+export const CustomMetricsListSchema = z.object({
   customMetrics: z.array(CustomMetricSchema).optional(),
 });
 
+export const CustomDimensionsAndMetricsResponseSchema = z.object({
+  /** Result of listCustomDimensions — `{ customDimensions: [...] }` */
+  dimensions: CustomDimensionsListSchema,
+  /** Result of listCustomMetrics — `{ customMetrics: [...] }` */
+  metrics: CustomMetricsListSchema,
+});
+
 // ── Admin API — Google Ads Links ─────────────────────────────────────────────
 
 export const GoogleAdsLinkSchema = z.object({
@@ -115,8 +130,10 @@ export const GoogleAdsLinkSchema = z.object({
   updateTime: Timestamp.optional(),
 });
 
-export const GoogleAdsLinksOutputSchema = z.object({
-  googleAdsLinks: z.array(GoogleAdsLinkSchema).optional(),
+export const GoogleAdsLinksResponseSchema = z.object({
+  response: z.object({
+    googleAdsLinks: z.array(GoogleAdsLinkSchema).optional(),
+  }),
 });
 
 // ── Admin API — Property Annotations ─────────────────────────────────────────
@@ -125,21 +142,17 @@ export const ReportingDataAnnotationSchema = z.object({
   /** Resource name. */
   name: z.string().optional(),
   annotationDate: DateSchema.optional(),
-  annotationDateRange: z
-    .object({
-      startDate: DateSchema.optional(),
-      endDate: DateSchema.optional(),
-    })
-    .optional(),
   title: z.string().optional(),
   description: z.string().optional(),
   systemGenerated: z.boolean().optional(),
   /** "RED" | "ORANGE" | "YELLOW" | "GREEN" | "BLUE" | "PURPLE" | "PINK" */
   color: z.string().optional(),
 });
 
-export const PropertyAnnotationsOutputSchema = z.object({
-  reportingDataAnnotations: z.array(ReportingDataAnnotationSchema).optional(),
+export const PropertyAnnotationsResponseSchema = z.object({
+  response: z.object({
+    reportingDataAnnotations: z.array(ReportingDataAnnotationSchema).optional(),
+  }),
 });
 
 // ── Data API — shared building blocks ────────────────────────────────────────
@@ -168,11 +181,9 @@ export const RowSchema = z.object({
 });
 
 export const ResponseMetaDataSchema = z.object({
-  dataLossFromOtherRow: z.boolean().optional(),
-  schemaRestrictionResponse: z.unknown().optional(),
   currencyCode: z.string().optional(),
   timeZone: z.string().optional(),
-  emptyReason: z.string().optional(),
+  schemaRestrictionResponse: z.unknown().optional(),
   subjectToThresholding: z.boolean().optional(),
   samplingMetadatas: z.array(z.unknown()).optional(),
 });
@@ -195,15 +206,15 @@ export const PropertyQuotaSchema = z
     potentiallyThresholdedRequestsPerHour: z
       .object({ consumed: z.number(), remaining: z.number() })
       .optional(),
-    tokensPerProjectPerHour: z
+    tokensPerProjectPerDay: z
       .object({ consumed: z.number(), remaining: z.number() })
       .optional(),
   })
   .optional();
 
 // ── Data API — runReport ──────────────────────────────────────────────────────
 
-export const RunReportOutputSchema = z.object({
+export const RunReportResponseSchema = z.object({
   dimensionHeaders: z.array(DimensionHeaderSchema).optional(),
   metricHeaders: z.array(MetricHeaderSchema).optional(),
   rows: z.array(RowSchema).optional(),
@@ -217,9 +228,13 @@ export const RunReportOutputSchema = z.object({
   kind: z.string().optional(),
 });
 
+export const RunReportOutputSchema = z.object({
+  response: RunReportResponseSchema,
+});
+
 // ── Data API — runRealtimeReport ─────────────────────────────────────────────
 
-export const RunRealtimeReportOutputSchema = z.object({
+export const RunRealtimeReportResponseSchema = z.object({
   dimensionHeaders: z.array(DimensionHeaderSchema).optional(),
   metricHeaders: z.array(MetricHeaderSchema).optional(),
   rows: z.array(RowSchema).optional(),
@@ -232,9 +247,13 @@ export const RunRealtimeReportOutputSchema = z.object({
   kind: z.string().optional(),
 });
 
+export const RunRealtimeReportOutputSchema = z.object({
+  response: RunRealtimeReportResponseSchema,
+});
+
 // ── Data API — runFunnelReport ────────────────────────────────────────────────
 
-const FunnelResponseMetaDataSchema = z.object({
+export const FunnelResponseMetaDataSchema = z.object({
   samplingMetadatas: z.array(z.unknown()).optional(),
   schemaRestrictionResponse: z.unknown().optional(),
 });
@@ -243,7 +262,7 @@ const FunnelResponseMetaDataSchema = z.object({
  * Funnel response rows share the same Row structure (dimensionValues +
  * metricValues), grouped in funnelTable and funnelVisualization sub-objects.
  */
-const FunnelSubReportSchema = z.object({
+export const FunnelSubReportSchema = z.object({
   dimensionHeaders: z.array(DimensionHeaderSchema).optional(),
   metricHeaders: z.array(MetricHeaderSchema).optional(),
   rows: z.array(RowSchema).optional(),
@@ -254,10 +273,14 @@ const FunnelSubReportSchema = z.object({
   metadata: FunnelResponseMetaDataSchema.optional(),
 });
 
-export const RunFunnelReportOutputSchema = z.object({
+export const RunFunnelReportResponseSchema = z.object({
   funnelTable: FunnelSubReportSchema.optional(),
   funnelVisualization: FunnelSubReportSchema.optional(),
   propertyQuota: PropertyQuotaSchema.optional(),
   /** Always "analyticsData#runFunnelReport". */
   kind: z.string().optional(),
 });
+
+export const RunFunnelReportOutputSchema = z.object({
+  response: RunFunnelReportResponseSchema,
+});

google-analytics/server/tools/accounts.ts

@@ -2,20 +2,21 @@ import { z } from "zod";
 import { createPrivateTool } from "@decocms/runtime/tools";
 import type { Env } from "../../shared/deco.gen.ts";
 import { GaClient } from "../lib/ga-client.ts";
-import { AccountSummariesOutputSchema } from "../lib/schemas.ts";
+import { AccountSummariesResponseSchema } from "../lib/schemas.ts";
 
 export const getAccountSummariesTool = (env: Env) =>
   createPrivateTool({
     id: "get-account-summaries",
     description:
       "Retrieves information about the user's Google Analytics accounts and properties.",
     inputSchema: z.object({}),
-    outputSchema: AccountSummariesOutputSchema,
+    outputSchema: AccountSummariesResponseSchema,
     execute: async () => {
       const client = GaClient.fromEnv(env);
+
       try {
         const result = await client.listAccountSummaries();
-        return AccountSummariesOutputSchema.parse(result);
+        return AccountSummariesResponseSchema.parse({ response: result });
       } catch (error) {
         throw new Error(
           `Failed to retrieve account summaries: ${error instanceof Error ? error.message : String(error)}`,

google-analytics/server/tools/ads.ts

@@ -3,11 +3,14 @@ import { createPrivateTool } from "@decocms/runtime/tools";
 import type { Env } from "../../shared/deco.gen.ts";
 import { GaClient } from "../lib/ga-client.ts";
 import { resolveProperty } from "../lib/env.ts";
-import { GoogleAdsLinksOutputSchema } from "../lib/schemas.ts";
+import { GoogleAdsLinksResponseSchema } from "../lib/schemas.ts";
 
 const propertySchema = z
+
   .string()
+
   .optional()
+
   .describe(
     "GA4 Property identifier — 'properties/1234567' or just '1234567'. Falls back to the default propertyId configured for this integration when omitted.",
   );
@@ -18,14 +21,14 @@ export const listGoogleAdsLinksTool = (env: Env) =>
     description:
       "Returns a list of links to Google Ads accounts for a GA4 property.",
     inputSchema: z.object({ property: propertySchema }),
-    outputSchema: GoogleAdsLinksOutputSchema,
+    outputSchema: GoogleAdsLinksResponseSchema,
     execute: async ({ context: args }) => {
       const client = GaClient.fromEnv(env);
       try {
         const result = await client.listGoogleAdsLinks(
           resolveProperty(env, args.property),
         );
-        return GoogleAdsLinksOutputSchema.parse(result);
+        return GoogleAdsLinksResponseSchema.parse({ response: result });
       } catch (error) {
         throw new Error(
           `Failed to retrieve Google Ads links: ${error instanceof Error ? error.message : String(error)}`,

google-analytics/server/tools/annotations.ts

@@ -3,11 +3,14 @@ import { createPrivateTool } from "@decocms/runtime/tools";
 import type { Env } from "../../shared/deco.gen.ts";
 import { GaClient } from "../lib/ga-client.ts";
 import { resolveProperty } from "../lib/env.ts";
-import { PropertyAnnotationsOutputSchema } from "../lib/schemas.ts";
+import { PropertyAnnotationsResponseSchema } from "../lib/schemas.ts";
 
 const propertySchema = z
+
   .string()
+
   .optional()
+
   .describe(
     "GA4 Property identifier — 'properties/1234567' or just '1234567'. Falls back to the default propertyId configured for this integration when omitted.",
   );
@@ -18,14 +21,14 @@ export const listPropertyAnnotationsTool = (env: Env) =>
     description:
       "Returns timestamped annotations for a GA4 property — useful for correlating traffic changes with events like campaign launches, site releases, or data collection changes.",
     inputSchema: z.object({ property: propertySchema }),
-    outputSchema: PropertyAnnotationsOutputSchema,
+    outputSchema: PropertyAnnotationsResponseSchema,
     execute: async ({ context: args }) => {
       const client = GaClient.fromEnv(env);
       try {
         const result = await client.listPropertyAnnotations(
           resolveProperty(env, args.property),
         );
-        return PropertyAnnotationsOutputSchema.parse(result);
+        return PropertyAnnotationsResponseSchema.parse({ response: result });
       } catch (error) {
         throw new Error(
           `Failed to retrieve property annotations: ${error instanceof Error ? error.message : String(error)}`,

google-analytics/server/tools/properties.ts

@@ -4,13 +4,16 @@ import type { Env } from "../../shared/deco.gen.ts";
 import { GaClient } from "../lib/ga-client.ts";
 import { resolveProperty } from "../lib/env.ts";
 import {
-  PropertySchema,
-  CustomDimensionsAndMetricsOutputSchema,
+  PropertyResponseSchema,
+  CustomDimensionsAndMetricsResponseSchema,
 } from "../lib/schemas.ts";
 
 const propertySchema = z
+
   .string()
+
   .optional()
+
   .describe(
     "GA4 Property identifier — 'properties/1234567' or just '1234567'. Falls back to the default propertyId configured for this integration when omitted.",
   );
@@ -21,14 +24,14 @@ export const getPropertyDetailsTool = (env: Env) =>
     description:
       "Returns metadata and configuration details about a GA4 property.",
     inputSchema: z.object({ property: propertySchema }),
-    outputSchema: PropertySchema,
+    outputSchema: PropertyResponseSchema,
     execute: async ({ context: args }) => {
       const client = GaClient.fromEnv(env);
       try {
         const result = await client.getProperty(
           resolveProperty(env, args.property),
         );
-        return PropertySchema.parse(result);
+        return PropertyResponseSchema.parse({ response: result });
       } catch (error) {
         throw new Error(
           `Failed to retrieve property details: ${error instanceof Error ? error.message : String(error)}`,
@@ -43,19 +46,20 @@ export const getCustomDimensionsAndMetricsTool = (env: Env) =>
     description:
       "Retrieves the custom dimensions and custom metrics configured for a GA4 property.",
     inputSchema: z.object({ property: propertySchema }),
-    outputSchema: CustomDimensionsAndMetricsOutputSchema,
+    outputSchema: CustomDimensionsAndMetricsResponseSchema,
     execute: async ({ context: args }) => {
       const client = GaClient.fromEnv(env);
       try {
         const property = resolveProperty(env, args.property);
         // Both calls are independent — run in parallel to halve latency.
-        const [dimensionsResult, metricsResult] = await Promise.all([
+        const [dimensions, metrics] = await Promise.all([
           client.listCustomDimensions(property),
           client.listCustomMetrics(property),
         ]);
-        return CustomDimensionsAndMetricsOutputSchema.parse({
-          ...(dimensionsResult as object),
-          ...(metricsResult as object),
+
+        return CustomDimensionsAndMetricsResponseSchema.parse({
+          dimensions,
+          metrics,
         });
       } catch (error) {
         throw new Error(