Merge remote-tracking branch 'origin/main' into fix/paginated-bigquery-schema

# Conflicts:
#	.github/workflows/release.yml
#	README.md
#	src/__tests__/mcpServer.test.ts
#	src/index.ts

Author: kahirokunn

.github/workflows/release.yml

@@ -31,7 +31,7 @@ jobs:
 
       - uses: actions/setup-node@v6
         with:
-          node-version: '20'
+          node-version: '24'
           registry-url: 'https://registry.npmjs.org'
           cache: 'pnpm'
 
@@ -134,6 +134,10 @@ jobs:
           echo "${package_spec} is already published from ${RELEASE_COMMIT}; skipping npm publish."
           echo "published=true" >> "${GITHUB_OUTPUT}"
 
+      - name: Publish to npm
+        if: github.repository == 'suthio/redash-mcp' && steps.npm-status.outputs.published != 'true'
+        run: npm publish --access public
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v4
 
@@ -173,7 +177,3 @@ jobs:
 
       - name: Sign Docker image
         run: cosign sign --yes ghcr.io/${{ github.repository }}@${{ steps.build-and-push.outputs.digest }}
-
-      - name: Publish to npm
-        if: github.repository == 'suthio/redash-mcp' && steps.npm-status.outputs.published != 'true'
-        run: npm publish --access public

src/__tests__/scheduleSchema.test.ts

@@ -0,0 +1,101 @@
+import { scheduleSchema } from '../schedule.js';
+
+describe('scheduleSchema', () => {
+  it('should default day_of_week, time, and until to null when omitted', () => {
+    const result = scheduleSchema.parse({
+      interval: 86400,
+    });
+    expect(result).toEqual({
+      interval: 86400,
+      time: null,
+      until: null,
+      day_of_week: null,
+    });
+  });
+
+  it('should preserve day_of_week when explicitly provided', () => {
+    const result = scheduleSchema.parse({
+      interval: 604800,
+      time: '06:00',
+      day_of_week: 'Monday',
+    });
+    expect(result).toMatchObject({
+      interval: 604800,
+      day_of_week: 'Monday',
+    });
+  });
+
+  it('should accept all valid day_of_week values', () => {
+    const days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
+    for (const day of days) {
+      const result = scheduleSchema.parse({ interval: 604800, day_of_week: day });
+      expect(result).toMatchObject({ day_of_week: day });
+    }
+  });
+
+  it('should reject invalid day_of_week string', () => {
+    expect(() => scheduleSchema.parse({
+      interval: 604800,
+      day_of_week: 'monday',
+    })).toThrow();
+  });
+
+  it('should preserve day_of_week as null when explicitly set to null', () => {
+    const result = scheduleSchema.parse({
+      interval: 86400,
+      day_of_week: null,
+    });
+    expect(result).toMatchObject({
+      interval: 86400,
+      day_of_week: null,
+    });
+  });
+
+  it('should preserve time and until when provided', () => {
+    const result = scheduleSchema.parse({
+      interval: 86400,
+      time: '01:15',
+      until: '2026-08-14',
+    });
+    expect(result).toEqual({
+      interval: 86400,
+      time: '01:15',
+      until: '2026-08-14',
+      day_of_week: null,
+    });
+  });
+
+  it('should return null for null input', () => {
+    const result = scheduleSchema.parse(null);
+    expect(result).toBeNull();
+  });
+
+  it('should return undefined for undefined input', () => {
+    const result = scheduleSchema.parse(undefined);
+    expect(result).toBeUndefined();
+  });
+
+  it('should accept disabled field', () => {
+    const result = scheduleSchema.parse({
+      interval: 86400,
+      disabled: true,
+    });
+    expect(result).toMatchObject({
+      interval: 86400,
+      day_of_week: null,
+      disabled: true,
+    });
+  });
+
+  it('should reject invalid interval type', () => {
+    expect(() => scheduleSchema.parse({
+      interval: 'daily',
+    })).toThrow();
+  });
+
+  it('should require interval', () => {
+    expect(() => scheduleSchema.parse({
+      time: '01:15',
+    })).toThrow();
+  });
+});

src/index.ts

@@ -22,6 +22,7 @@ import { buildParameterizedExecutionParameters, ParameterizedExecutionError } fr
 import { mergeDeep } from "./utils.js";
 import { buildWidgetLayoutOptions, dashboardGridDefaults, summarizeWidgetLayout, widgetLayoutEntrySchema, widgetPositionSchema } from "./widgetLayout.js";
 import { logger } from "./logger.js";
+import { scheduleSchema } from './schedule.js';
 import { TelemetryMcpServer, type McpTelemetryOptions } from "./mcpTelemetry.js";
 import { PACKAGE_VERSION } from "./packageInfo.js";
 
@@ -125,7 +126,7 @@ const createQuerySchema = z.object({
   query: z.string().describe("SQL query text"),
   description: z.string().optional().describe("Description of the query"),
   options: z.record(z.string(), z.any()).optional().describe("Query options"),
-  schedule: z.record(z.string(), z.any()).optional().describe("Query schedule"),
+  schedule: scheduleSchema.describe("Query schedule"),
   tags: z.array(z.string()).optional().describe("Tags for the query")
 });
 
@@ -174,7 +175,7 @@ const updateQuerySchema = z.object({
   query: z.string().optional().describe("SQL query text"),
   description: z.string().optional().describe("Description of the query"),
   options: z.record(z.string(), z.any()).optional().describe("Query options"),
-  schedule: z.record(z.string(), z.any()).optional().describe("Query schedule"),
+  schedule: scheduleSchema.describe("Query schedule"),
   tags: z.array(z.string()).optional().describe("Tags for the query"),
   is_archived: z.boolean().optional().describe("Whether the query is archived"),
   is_draft: z.boolean().optional().describe("Whether the query is a draft")

src/schedule.ts

@@ -0,0 +1,18 @@
+import { z } from 'zod';
+
+const dayOfWeekEnum = z.enum([
+  'Sunday', 'Monday', 'Tuesday', 'Wednesday',
+  'Thursday', 'Friday', 'Saturday',
+]);
+
+// Schedule schema with day_of_week, time, and until defaulting to null.
+// Redash's scheduler indexes these keys directly, so they must always
+// be present in the stored JSON (even as null).
+// interval is in seconds (e.g., 86400 = daily, 604800 = weekly)
+export const scheduleSchema = z.object({
+  interval: z.number(),
+  time: z.string().nullable().default(null),
+  until: z.string().nullable().default(null),
+  day_of_week: dayOfWeekEnum.nullable().default(null),
+  disabled: z.boolean().optional(),
+}).optional().nullable();