fix: address PR review comments

apps/sim/app/api/tools/athena/create-named-query/route.ts

@@ -55,6 +55,12 @@ export async function POST(request: NextRequest) {
       },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to create Athena named query'
     logger.error('CreateNamedQuery failed', { error: errorMessage })

apps/sim/app/api/tools/athena/get-named-query/route.ts

@@ -53,6 +53,12 @@ export async function POST(request: NextRequest) {
       },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage = error instanceof Error ? error.message : 'Failed to get Athena named query'
     logger.error('GetNamedQuery failed', { error: errorMessage })
     return NextResponse.json({ error: errorMessage }, { status: 500 })

apps/sim/app/api/tools/athena/get-query-execution/route.ts

@@ -63,6 +63,12 @@ export async function POST(request: NextRequest) {
       },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to get Athena query execution'
     logger.error('GetQueryExecution failed', { error: errorMessage })

apps/sim/app/api/tools/athena/get-query-results/route.ts

@@ -74,6 +74,12 @@ export async function POST(request: NextRequest) {
       },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to get Athena query results'
     logger.error('GetQueryResults failed', { error: errorMessage })

apps/sim/app/api/tools/athena/list-named-queries/route.ts

@@ -51,6 +51,12 @@ export async function POST(request: NextRequest) {
       },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to list Athena named queries'
     logger.error('ListNamedQueries failed', { error: errorMessage })

apps/sim/app/api/tools/athena/list-query-executions/route.ts

@@ -51,6 +51,12 @@ export async function POST(request: NextRequest) {
       },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to list Athena query executions'
     logger.error('ListQueryExecutions failed', { error: errorMessage })

apps/sim/app/api/tools/athena/start-query/route.ts

@@ -67,6 +67,12 @@ export async function POST(request: NextRequest) {
       },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage = error instanceof Error ? error.message : 'Failed to start Athena query'
     logger.error('StartQuery failed', { error: errorMessage })
     return NextResponse.json({ error: errorMessage }, { status: 500 })

apps/sim/app/api/tools/athena/stop-query/route.ts

@@ -43,6 +43,12 @@ export async function POST(request: NextRequest) {
       },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage = error instanceof Error ? error.message : 'Failed to stop Athena query'
     logger.error('StopQuery failed', { error: errorMessage })
     return NextResponse.json({ error: errorMessage }, { status: 500 })

apps/sim/app/api/tools/cloudformation/describe-stack-drift-detection-status/route.ts

@@ -53,6 +53,12 @@ export async function POST(request: NextRequest) {
       },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to describe stack drift detection status'
     logger.error('DescribeStackDriftDetectionStatus failed', { error: errorMessage })

apps/sim/app/api/tools/cloudformation/describe-stack-events/route.ts

@@ -70,6 +70,12 @@ export async function POST(request: NextRequest) {
       output: { events },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to describe CloudFormation stack events'
     logger.error('DescribeStackEvents failed', { error: errorMessage })

apps/sim/app/api/tools/cloudformation/describe-stacks/route.ts

@@ -78,6 +78,12 @@ export async function POST(request: NextRequest) {
       output: { stacks },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to describe CloudFormation stacks'
     logger.error('DescribeStacks failed', { error: errorMessage })

apps/sim/app/api/tools/cloudformation/detect-stack-drift/route.ts

@@ -48,6 +48,12 @@ export async function POST(request: NextRequest) {
       },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to detect CloudFormation stack drift'
     logger.error('DetectStackDrift failed', { error: errorMessage })

apps/sim/app/api/tools/cloudformation/get-template/route.ts

@@ -45,6 +45,12 @@ export async function POST(request: NextRequest) {
       },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to get CloudFormation template'
     logger.error('GetTemplate failed', { error: errorMessage })

apps/sim/app/api/tools/cloudformation/list-stack-resources/route.ts

@@ -67,6 +67,12 @@ export async function POST(request: NextRequest) {
       output: { resources },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to list CloudFormation stack resources'
     logger.error('ListStackResources failed', { error: errorMessage })

apps/sim/app/api/tools/cloudformation/validate-template/route.ts

@@ -53,6 +53,12 @@ export async function POST(request: NextRequest) {
       },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to validate CloudFormation template'
     logger.error('ValidateTemplate failed', { error: errorMessage })

apps/sim/app/api/tools/cloudwatch/describe-alarms/route.ts

@@ -88,6 +88,12 @@ export async function POST(request: NextRequest) {
       output: { alarms: [...metricAlarms, ...compositeAlarms] },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to describe CloudWatch alarms'
     logger.error('DescribeAlarms failed', { error: errorMessage })

apps/sim/app/api/tools/cloudwatch/describe-log-groups/route.ts

@@ -54,6 +54,12 @@ export async function POST(request: NextRequest) {
       output: { logGroups },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to describe CloudWatch log groups'
     logger.error('DescribeLogGroups failed', { error: errorMessage })

apps/sim/app/api/tools/cloudwatch/describe-log-streams/route.ts

@@ -44,6 +44,12 @@ export async function POST(request: NextRequest) {
       output: { logStreams: result.logStreams },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to describe CloudWatch log streams'
     logger.error('DescribeLogStreams failed', { error: errorMessage })

apps/sim/app/api/tools/cloudwatch/get-log-events/route.ts

@@ -52,6 +52,12 @@ export async function POST(request: NextRequest) {
       output: { events: result.events },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to get CloudWatch log events'
     logger.error('GetLogEvents failed', { error: errorMessage })

apps/sim/app/api/tools/cloudwatch/get-metric-statistics/route.ts

@@ -89,6 +89,12 @@ export async function POST(request: NextRequest) {
       },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to get CloudWatch metric statistics'
     logger.error('GetMetricStatistics failed', { error: errorMessage })

apps/sim/app/api/tools/cloudwatch/list-metrics/route.ts

@@ -62,6 +62,12 @@ export async function POST(request: NextRequest) {
       output: { metrics },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage =
       error instanceof Error ? error.message : 'Failed to list CloudWatch metrics'
     logger.error('ListMetrics failed', { error: errorMessage })

apps/sim/app/api/tools/cloudwatch/query-logs/route.ts

@@ -63,6 +63,12 @@ export async function POST(request: NextRequest) {
       },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage =
       error instanceof Error ? error.message : 'CloudWatch Log Insights query failed'
     logger.error('QueryLogs failed', { error: errorMessage })

apps/sim/app/api/tools/dynamodb/delete/route.ts

@@ -41,6 +41,12 @@ export async function POST(request: NextRequest) {
       message: 'Item deleted successfully',
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage = error instanceof Error ? error.message : 'DynamoDB delete failed'
     return NextResponse.json({ error: errorMessage }, { status: 500 })
   }

apps/sim/app/api/tools/dynamodb/get/route.ts

@@ -48,6 +48,12 @@ export async function POST(request: NextRequest) {
       item: result.item,
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage = error instanceof Error ? error.message : 'DynamoDB get failed'
     return NextResponse.json({ error: errorMessage }, { status: 500 })
   }

apps/sim/app/api/tools/dynamodb/put/route.ts

@@ -36,6 +36,12 @@ export async function POST(request: NextRequest) {
       item: validatedData.item,
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage = error instanceof Error ? error.message : 'DynamoDB put failed'
     return NextResponse.json({ error: errorMessage }, { status: 500 })
   }

apps/sim/app/api/tools/dynamodb/query/route.ts

@@ -51,6 +51,12 @@ export async function POST(request: NextRequest) {
       count: result.count,
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage = error instanceof Error ? error.message : 'DynamoDB query failed'
     return NextResponse.json({ error: errorMessage }, { status: 500 })
   }

apps/sim/app/api/tools/dynamodb/scan/route.ts

@@ -45,6 +45,12 @@ export async function POST(request: NextRequest) {
       count: result.count,
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage = error instanceof Error ? error.message : 'DynamoDB scan failed'
     return NextResponse.json({ error: errorMessage }, { status: 500 })
   }

apps/sim/app/api/tools/dynamodb/update/route.ts

@@ -50,6 +50,12 @@ export async function POST(request: NextRequest) {
       item: result.attributes,
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     const errorMessage = error instanceof Error ? error.message : 'DynamoDB update failed'
     return NextResponse.json({ error: errorMessage }, { status: 500 })
   }

apps/sim/app/api/tools/google_drive/download/route.ts

@@ -240,6 +240,12 @@ export async function POST(request: NextRequest) {
       },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { success: false, error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     logger.error(`[${requestId}] Error downloading Google Drive file:`, error)
     return NextResponse.json(
       {

apps/sim/app/api/tools/onedrive/download/route.ts

@@ -165,6 +165,12 @@ export async function POST(request: NextRequest) {
       },
     })
   } catch (error) {
+    if (error instanceof z.ZodError) {
+      return NextResponse.json(
+        { success: false, error: error.errors[0]?.message ?? 'Invalid request' },
+        { status: 400 }
+      )
+    }
     logger.error(`[${requestId}] Error downloading OneDrive file:`, error)
     return NextResponse.json(
       {