@friggframework/core 2.0.0--canary.627.33970be.0 → 2.0.0--canary.627.ce32cdc.0

package/database/utils/prisma-runner.js

@@ -405,14 +405,25 @@ async function runPrismaMigrateResolve(migrationName, action = 'applied', verbos
             const [executable, ...executableArgs] = prismaBin.split(' ');
             const fullArgs = [...executableArgs, ...args];
 
+            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 +438,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,7 +31,10 @@ 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');
@@ -262,6 +265,13 @@ router.post(
             });
         }
 
+        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,
@@ -272,8 +282,6 @@ router.post(
         const stage = req.body.stage || process.env.STAGE || 'production';
 
         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,
@@ -283,6 +291,15 @@ router.post(
             res.status(200).json(result);
         } catch (error) {
             console.error('Migration resolve failed:', error);
+            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: 'Failed to resolve migration',

package/handlers/workers/db-migration.js

@@ -188,8 +188,6 @@ 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========================================`);
@@ -204,6 +202,15 @@ exports.handler = async (event, context) => {
                 body: { success: false, error: 'migrationName is required' },
             };
         }
+        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,
@@ -213,6 +220,15 @@ exports.handler = async (event, context) => {
                 },
             };
         }
+        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(

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.627.33970be.0",
+    "version": "2.0.0--canary.627.ce32cdc.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.33970be.0",
-        "@friggframework/prettier-config": "2.0.0--canary.627.33970be.0",
-        "@friggframework/test": "2.0.0--canary.627.33970be.0",
+        "@friggframework/eslint-config": "2.0.0--canary.627.ce32cdc.0",
+        "@friggframework/prettier-config": "2.0.0--canary.627.ce32cdc.0",
+        "@friggframework/test": "2.0.0--canary.627.ce32cdc.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": "33970be6bc4ffa8e60d4c2799d6c24da4409bf5e"
+    "gitHead": "ce32cdc11aca0fa8087180474bb19d6e07fa47b6"
 }