Merge pull request #101 from ssdeanx/develop

Develop

Author: Sam

convex.json

@@ -1,6 +1,6 @@
 {
   "node": {
-    "nodeVersion": "24"
+    "nodeVersion": "20"
   },
   "$schema": "./node_modules/convex/schemas/convex.schema.json"
 }

convex/_generated/api.d.ts

@@ -1,4 +1,4 @@
-
+/* eslint-disable */
 /**
  * Generated `api` utility.
  *
@@ -8,8 +8,42 @@
  * @module
  */
 
-import type { AnyApi, AnyComponents } from "convex/server";
+import type * as mastra_storage from "../mastra/storage.js";
+
+import type {
+  ApiFromModules,
+  FilterApi,
+  FunctionReference,
+} from "convex/server";
+
+declare const fullApi: ApiFromModules<{
+  "mastra/storage": typeof mastra_storage;
+}>;
+
+/**
+ * A utility for referencing Convex functions in your app's public API.
+ *
+ * Usage:
+ * ```js
+ * const myFunctionReference = api.myModule.myFunction;
+ * ```
+ */
+export declare const api: FilterApi<
+  typeof fullApi,
+  FunctionReference<any, "public">
+>;
+
+/**
+ * A utility for referencing Convex functions in your app's internal API.
+ *
+ * Usage:
+ * ```js
+ * const myFunctionReference = internal.myModule.myFunction;
+ * ```
+ */
+export declare const internal: FilterApi<
+  typeof fullApi,
+  FunctionReference<any, "internal">
+>;
 
-export declare const api: AnyApi;
-export declare const internal: AnyApi;
-export declare const components: AnyComponents;
+export declare const components: {};

convex/mastra/storage.ts

@@ -1,3 +1,3 @@
-import { mastraStorage } from '@mastra/convex/server'
+import { mastraStorage } from '@mastra/convex/server';
 
-export const handle = mastraStorage
+export const handle = mastraStorage;

convex/schema.ts

@@ -1,14 +1,27 @@
+import { defineSchema, defineTable } from 'convex/server';
+import { v } from 'convex/values';
 import {
-  mastraDocumentsTable,
+  mastraThreadsTable,
   mastraMessagesTable,
   mastraResourcesTable,
   mastraScoresTable,
-  mastraThreadsTable,
   mastraVectorIndexesTable,
   mastraVectorsTable,
-  mastraWorkflowSnapshotsTable,
-} from '@mastra/convex'
-import { defineSchema } from 'convex/server'
+  mastraDocumentsTable,
+} from '@mastra/convex/schema';
+
+// Explicitly define mastra_workflow_snapshots to ensure the `id` field exists
+// (some downstream Convex schema variants omit `id` which causes an invalid
+// index declaration during Convex schema push).
+const mastraWorkflowSnapshotsTable = defineTable({
+  id: v.string(),
+  workflow_name: v.string(),
+  run_id: v.string(),
+  resourceId: v.optional(v.string()),
+  snapshot: v.any(),
+  createdAt: v.string(),
+  updatedAt: v.string(),
+}).index('by_record_id', ['id']).index('by_workflow_run', ['workflow_name', 'run_id']).index('by_workflow', ['workflow_name']).index('by_resource', ['resourceId']).index('by_created', ['createdAt']);
 
 export default defineSchema({
   mastra_threads: mastraThreadsTable,
@@ -19,4 +32,4 @@ export default defineSchema({
   mastra_vector_indexes: mastraVectorIndexesTable,
   mastra_vectors: mastraVectorsTable,
   mastra_documents: mastraDocumentsTable,
-})
+});

mdx-components.tsx

@@ -1,4 +1,5 @@
 import type { MDXComponents } from 'mdx/types'
+import type { ReactNode } from 'react'
 import Link from 'next/link'
 
 // Custom components that work with MDX plugins
@@ -47,7 +48,7 @@ export function useMDXComponents(components: MDXComponents): MDXComponents {
         // Links with hover effects
         a: ({ href, children }) => (
             <Link
-                href={href ?? '#'}
+                href={typeof href === 'string' ? href : '#'}
                 className="font-medium text-primary underline underline-offset-4 hover:text-primary/80 transition-colors"
             >
                 {children}
@@ -75,8 +76,8 @@ export function useMDXComponents(components: MDXComponents): MDXComponents {
         ),
 
         // Code blocks and inline code - these work with rehype-highlight
-        code: ({ children, className }) => {
-            const isInline = !className?.includes('language-')
+        code: ({ children, className }: { children?: ReactNode; className?: string }) => {
+            const isInline = typeof className !== 'string' || !className.includes('language-')
             return isInline ? (
                 <code className="relative rounded bg-muted px-1.5 py-0.5 font-mono text-sm text-foreground">
                     {children}
@@ -116,9 +117,9 @@ export function useMDXComponents(components: MDXComponents): MDXComponents {
         ),
 
         // Images with responsive design
-        img: ({ src, alt, title }) => (
+        img: ({ src, alt, title }: { src?: string; alt?: string; title?: string }) => (
             <img
-                src={src}
+                src={src ?? undefined}
                 alt={alt ?? ''}
                 title={title}
                 className="my-4 rounded-lg border border-border"

next.config.ts

@@ -1,6 +1,7 @@
 import createMDX from '@next/mdx'
 import MonacoWebpackPlugin from 'monaco-editor-webpack-plugin'
 import type { NextConfig } from 'next'
+import type { Configuration } from 'webpack'
 
 const nextConfig: NextConfig = {
     pageExtensions: ['js', 'jsx', 'md', 'mdx', 'ts', 'tsx'],
@@ -38,7 +39,7 @@ const nextConfig: NextConfig = {
     typedRoutes: false,
     reactStrictMode: true,
     distDir: '.next',
-    webpack: (config, { isServer }) => {
+    webpack: (config: Configuration, { isServer }) => {
         if (!isServer) {
             config.plugins = config.plugins ?? []
             config.plugins.push(
@@ -52,10 +53,55 @@ const nextConfig: NextConfig = {
                     ],
                 })
             )
+
+            // Sanitize resolve.alias so values are serializable for Turbopack/worker cloning
+            // Ensure resolve exists and normalize alias values to strings/arrays of strings
+            const existingResolve = config.resolve ?? {}
+            const aliasObj = (existingResolve as unknown as Record<string, unknown>).alias ?? {}
+            if (typeof aliasObj === 'object' && aliasObj !== null) {
+                const normalized: Record<string, string | string[]> = {}
+                for (const [k, v] of Object.entries(aliasObj as Record<string, unknown>)) {
+                    if (Array.isArray(v)) {
+                        normalized[k] = v.map((x) => String(x))
+                    } else if (typeof v === 'object' && v !== null) {
+                        // For objects, stringify to avoid '[object Object]' implicit string coercion
+                        try {
+                            normalized[k] = JSON.stringify(v)
+                        } catch {
+                            normalized[k] = ''
+                        }
+                    } else if (typeof v === 'function') {
+                        // For functions, prefer the function name to avoid serializing the entire function
+                        // Narrow to an object with an optional name property to avoid using the broad Function type
+                        const fnName = (v as { name?: string })?.name ?? ''
+                        normalized[k] = fnName
+                    } else if (v === null || v === undefined) {
+                        // Keep null/undefined normalized to an empty string
+                        normalized[k] = ''
+                    } else {
+                        // At this point, expect primitives (string/number/boolean/symbol/bigint).
+                        // Guard against objects to avoid default Object stringification '[object Object]'.
+                        const t = typeof v
+                        if (t === 'string' || t === 'number' || t === 'boolean' || t === 'symbol' || t === 'bigint') {
+                            // Narrow the type for the linter to avoid base-to-string coercion warnings
+                            normalized[k] = String(v as string | number | boolean | symbol | bigint)
+                        } else {
+                            // Fallback for unexpected non-serializable values
+                            try {
+                                normalized[k] = JSON.stringify(v)
+                            } catch {
+                                normalized[k] = ''
+                            }
+                        }
+                    }
+                }
+                config.resolve = { ...existingResolve, alias: normalized } as Configuration['resolve']
+            }
         }
 
         return config
     },
+
     typescript: {
         ignoreBuildErrors: true,
         tsconfigPath: './tsconfig.json',
@@ -92,7 +138,7 @@ const nextConfig: NextConfig = {
         //    optimizeCss: true,
         esmExternals: true,
         scrollRestoration: true,
-//        cpus: 16,
+        //        cpus: 16,
         //    cssChunking: true,
         //   craCompat: true,
         //    validateRSCRequestHeaders: true,