@friggframework/core 2.0.0--canary.627.9cf8622.0 → 2.0.0--canary.627.b5f8805.0

package/database/use-cases/resolve-migration-via-worker-use-case.js

@@ -0,0 +1,49 @@
+/**
+ * Resolve Migration Via Worker Use Case
+ *
+ * Resolves a failed Prisma migration (P3009) by invoking the worker Lambda,
+ * which has the Prisma CLI installed. Keeps the router Lambda lightweight —
+ * same delegation pattern as GetDatabaseStateViaWorkerUseCase.
+ */
+class ResolveMigrationViaWorkerUseCase {
+    /**
+     * @param {Object} dependencies
+     * @param {LambdaInvoker} dependencies.lambdaInvoker - Lambda invocation adapter
+     * @param {string} dependencies.workerFunctionName - Worker Lambda function name
+     */
+    constructor({ lambdaInvoker, workerFunctionName }) {
+        if (!lambdaInvoker) {
+            throw new Error('lambdaInvoker dependency is required');
+        }
+        if (!workerFunctionName) {
+            throw new Error('workerFunctionName is required');
+        }
+        this.lambdaInvoker = lambdaInvoker;
+        this.workerFunctionName = workerFunctionName;
+    }
+
+    /**
+     * @param {Object} params
+     * @param {string} params.migrationName - Migration to resolve
+     * @param {'applied'|'rolled-back'} [params.action] - Resolution mode
+     * @param {string} [params.stage] - Deployment stage
+     * @returns {Promise<Object>} Worker result body
+     */
+    async execute({ migrationName, action = 'applied', stage }) {
+        const dbType = process.env.DB_TYPE || 'postgresql';
+
+        console.log(
+            `Invoking worker Lambda to resolve migration "${migrationName}" as ${action}: ${this.workerFunctionName}`
+        );
+
+        return this.lambdaInvoker.invoke(this.workerFunctionName, {
+            action: 'resolve',
+            migrationName,
+            resolveAction: action,
+            dbType,
+            stage,
+        });
+    }
+}
+
+module.exports = { ResolveMigrationViaWorkerUseCase };

package/database/utils/prisma-runner.js

@@ -405,14 +405,28 @@ async function runPrismaMigrateResolve(migrationName, action = 'applied', verbos
             const [executable, ...executableArgs] = prismaBin.split(' ');
             const fullArgs = [...executableArgs, ...args];
 
+            // Pipe stdout/stderr so Prisma's actual failure reason (e.g. P3011
+            // "migration not found" from a mistyped name) is returned to the
+            // caller — not just left in CloudWatch. Still echo when verbose.
+            let stdout = '';
+            let stderr = '';
             const proc = spawn(executable, fullArgs, {
-                stdio: 'inherit',
+                stdio: ['inherit', 'pipe', 'pipe'],
                 env: {
                     ...process.env,
                     PRISMA_HIDE_UPDATE_MESSAGE: '1'
                 }
             });
 
+            proc.stdout.on('data', (data) => {
+                stdout += data.toString();
+                if (verbose) process.stdout.write(data);
+            });
+            proc.stderr.on('data', (data) => {
+                stderr += data.toString();
+                if (verbose) process.stderr.write(data);
+            });
+
             proc.on('error', (error) => {
                 resolve({
                     success: false,
@@ -427,9 +441,12 @@ async function runPrismaMigrateResolve(migrationName, action = 'applied', verbos
                         output: `Migration ${migrationName} marked as ${action}`
                     });
                 } else {
+                    const detail = (stderr || stdout).trim();
                     resolve({
                         success: false,
-                        error: `Resolve process exited with code ${code}`
+                        error: detail
+                            ? `Prisma migrate resolve failed (exit ${code}): ${detail}`
+                            : `Resolve process exited with code ${code}`
                     });
                 }
             });

package/handlers/routers/db-migration.js

@@ -31,10 +31,16 @@ const {
     ValidationError: GetValidationError,
     NotFoundError,
 } = require('../../database/use-cases/get-migration-status-use-case');
-const { LambdaInvoker } = require('../../database/adapters/lambda-invoker');
+const {
+    LambdaInvoker,
+    LambdaInvocationError,
+} = require('../../database/adapters/lambda-invoker');
 const {
     GetDatabaseStateViaWorkerUseCase,
 } = require('../../database/use-cases/get-database-state-via-worker-use-case');
+const {
+    ResolveMigrationViaWorkerUseCase,
+} = require('../../database/use-cases/resolve-migration-via-worker-use-case');
 
 const router = Router();
 
@@ -58,6 +64,10 @@ const getDatabaseStateUseCase = new GetDatabaseStateViaWorkerUseCase({
     lambdaInvoker,
     workerFunctionName,
 });
+const resolveMigrationUseCase = new ResolveMigrationViaWorkerUseCase({
+    lambdaInvoker,
+    workerFunctionName,
+});
 
 // Apply admin API key validation to all routes (shared middleware)
 router.use(validateAdminApiKey);
@@ -255,6 +265,15 @@ router.post(
             });
         }
 
+        // Prisma migration name shape (<14-digit timestamp>_<name>). Rejects
+        // values that would be parsed as CLI flags (e.g. "--schema").
+        if (!/^\d{14}_[a-z0-9_]+$/i.test(migrationName)) {
+            return res.status(400).json({
+                success: false,
+                error: 'migrationName is not a valid migration identifier'
+            });
+        }
+
         if (!['applied', 'rolled-back'].includes(action)) {
             return res.status(400).json({
                 success: false,
@@ -262,30 +281,34 @@ router.post(
             });
         }
 
-        try {
-            // Import prismaRunner here to avoid circular dependencies
-            const prismaRunner = require('../../database/utils/prisma-runner');
-
-            const result = await prismaRunner.runPrismaMigrateResolve(migrationName, action, true);
+        const stage = req.body.stage || process.env.STAGE || 'production';
 
-            if (!result.success) {
-                return res.status(500).json({
-                    success: false,
-                    error: `Failed to resolve migration: ${result.error}`
-                });
-            }
-
-            res.status(200).json({
-                success: true,
-                message: `Migration ${migrationName} marked as ${action}`,
+        try {
+            // Delegate to the worker Lambda (which has the Prisma CLI); the
+            // router Lambda is packaged without Prisma.
+            const result = await resolveMigrationUseCase.execute({
                 migrationName,
-                action
+                action,
+                stage,
             });
+
+            res.status(200).json(result);
         } catch (error) {
             console.error('Migration resolve failed:', error);
+            // Surface a worker-side 400 (bad input) as a 400, not a generic 500.
+            if (
+                error instanceof LambdaInvocationError &&
+                error.statusCode === 400
+            ) {
+                return res.status(400).json({
+                    success: false,
+                    error: error.message,
+                });
+            }
             return res.status(500).json({
                 success: false,
-                error: error.message
+                error: 'Failed to resolve migration',
+                details: error.message,
             });
         }
     })

package/handlers/workers/db-migration.js

@@ -188,6 +188,85 @@ exports.handler = async (event, context) => {
         }
     }
 
+    // Handle resolve action (P3009 recovery — router delegates here because the
+    // worker has the Prisma CLI; the router does not).
+    if (action === 'resolve') {
+        const { migrationName, resolveAction = 'applied' } = event;
+        console.log(`\n========================================`);
+        console.log(
+            `Action: resolve (migration=${migrationName}, mode=${resolveAction})`
+        );
+        console.log(`========================================`);
+
+        if (!migrationName) {
+            return {
+                statusCode: 400,
+                body: { success: false, error: 'migrationName is required' },
+            };
+        }
+        // Prisma migration name shape (<14-digit timestamp>_<name>). Rejects
+        // values that would be parsed as CLI flags (e.g. "--schema").
+        if (!/^\d{14}_[a-z0-9_]+$/i.test(migrationName)) {
+            return {
+                statusCode: 400,
+                body: {
+                    success: false,
+                    error: 'migrationName is not a valid migration identifier',
+                },
+            };
+        }
+        if (!['applied', 'rolled-back'].includes(resolveAction)) {
+            return {
+                statusCode: 400,
+                body: {
+                    success: false,
+                    error: 'resolveAction must be "applied" or "rolled-back"',
+                },
+            };
+        }
+        if (dbType !== 'postgresql') {
+            return {
+                statusCode: 400,
+                body: {
+                    success: false,
+                    error: `Migration resolve is only supported for postgresql, not "${dbType}"`,
+                },
+            };
+        }
+
+        try {
+            const result = await prismaRunner.runPrismaMigrateResolve(
+                migrationName,
+                resolveAction,
+                true
+            );
+            if (!result.success) {
+                return {
+                    statusCode: 500,
+                    body: {
+                        success: false,
+                        error: sanitizeError(result.error),
+                    },
+                };
+            }
+            return {
+                statusCode: 200,
+                body: {
+                    success: true,
+                    message: `Migration ${migrationName} marked as ${resolveAction}`,
+                    migrationName,
+                    action: resolveAction,
+                },
+            };
+        } catch (error) {
+            console.error('❌ Migration resolve failed:', error.message);
+            return {
+                statusCode: 500,
+                body: { success: false, error: sanitizeError(error.message) },
+            };
+        }
+    }
+
     // Otherwise, handle migration (existing code)
     console.log(`\n========================================`);
     console.log(`Action: migrate (migrationId=${migrationId || 'new'})`);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.627.9cf8622.0",
+    "version": "2.0.0--canary.627.b5f8805.0",
     "dependencies": {
         "@aws-sdk/client-apigatewaymanagementapi": "^3.588.0",
         "@aws-sdk/client-kms": "^3.588.0",
@@ -46,9 +46,9 @@
         }
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.627.9cf8622.0",
-        "@friggframework/prettier-config": "2.0.0--canary.627.9cf8622.0",
-        "@friggframework/test": "2.0.0--canary.627.9cf8622.0",
+        "@friggframework/eslint-config": "2.0.0--canary.627.b5f8805.0",
+        "@friggframework/prettier-config": "2.0.0--canary.627.b5f8805.0",
+        "@friggframework/test": "2.0.0--canary.627.b5f8805.0",
         "@prisma/client": "^6.19.3",
         "@types/lodash": "4.17.15",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
@@ -88,5 +88,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "9cf8622beb42a7a630438459adc973dccbc54c3e"
+    "gitHead": "b5f8805cac1497009ffbc6278e74d1d9d62ca448"
 }