fix(athena): keep zero-minute result reuse age, enforce name patterns, declare table parameters output

Claude-Session: https://claude.ai/code/session_01AtPwvDwhkhed2MwcZudrPN

Author: waleedlatif1

apps/docs/content/docs/integrations/athena.mdx

@@ -323,7 +323,7 @@ List tables and their column/partition metadata for an Athena database
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `tables` | array | Table metadata \(name, type, columns, partition keys\) |
+| `tables` | array | Table metadata \(name, type, columns, partition keys, parameters\) |
 |   ↳ `name` | string | Table name |
 |   ↳ `tableType` | string | Table type |
 |   ↳ `createTime` | number | Table creation time \(Unix epoch ms\) |
@@ -336,6 +336,7 @@ List tables and their column/partition metadata for an Athena database
 |     ↳ `name` | string | Partition key name |
 |     ↳ `type` | string | Partition key data type |
 |     ↳ `comment` | string | Partition key comment |
+|   ↳ `parameters` | json | Key/value table properties \(e.g., classification, location\) |
 | `nextToken` | string | Pagination token for next page |
 
 ### Athena Get Query Runtime Statistics

apps/sim/blocks/blocks/athena.ts

@@ -702,9 +702,12 @@ Return ONLY a JSON array of strings — no explanations, no markdown code blocks
         const parsedMaxResults = maxResults ? Number.parseInt(String(maxResults), 10) : undefined
         const connection = { awsRegion, awsAccessKeyId, awsSecretAccessKey }
         const resultReuseEnabled = parseBoolean(rest.resultReuseEnabled)
-        const resultReuseMaxAgeInMinutes = rest.resultReuseMaxAgeInMinutes
-          ? Number.parseInt(String(rest.resultReuseMaxAgeInMinutes), 10)
-          : undefined
+        const resultReuseMaxAgeInMinutes =
+          rest.resultReuseMaxAgeInMinutes !== undefined &&
+          rest.resultReuseMaxAgeInMinutes !== null &&
+          rest.resultReuseMaxAgeInMinutes !== ''
+            ? Number.parseInt(String(rest.resultReuseMaxAgeInMinutes), 10)
+            : undefined
 
         switch (operation) {
           case 'start_query':

apps/sim/lib/api/contracts/tools/aws/athena-shared.ts

@@ -23,6 +23,7 @@ export const athenaWorkGroupSchema = z
   .trim()
   .min(1, 'Workgroup is required')
   .max(128, 'Workgroup must be at most 128 characters')
+  .regex(/^[a-zA-Z0-9._-]+$/, 'Workgroup may only contain letters, digits, ".", "_", and "-"')
 
 /**
  * Optional workgroup; blank strings from unfilled inputs are treated as omitted.
@@ -40,6 +41,10 @@ export const athenaStatementNameSchema = z
   .trim()
   .min(1, 'Statement name is required')
   .max(256, 'Statement name must be at most 256 characters')
+  .regex(
+    /^[a-zA-Z_][a-zA-Z0-9_@:]+$/,
+    'Statement name must start with a letter or underscore and contain only letters, digits, "_", "@", and ":"'
+  )
 
 /**
  * Builds the optional `maxResults` field with Athena's documented bounds for the operation.

apps/sim/lib/internal/athena/execute-tool.test.ts

@@ -226,6 +226,24 @@ describe('executeAthenaTool', () => {
     )
     expect(missingWorkGroup.status).toBe(400)
     expect(mockOperations.executeAthenaListPreparedStatements).not.toHaveBeenCalled()
+
+    const badStatementName = await executeAthenaTool(
+      createRequest({
+        toolId: 'athena_get_prepared_statement',
+        input: { ...PREPARED_WORKGROUP, statementName: '1-bad name' },
+      })
+    )
+    expect(badStatementName.status).toBe(400)
+    expect(mockOperations.executeAthenaGetPreparedStatement).not.toHaveBeenCalled()
+
+    const badWorkGroup = await executeAthenaTool(
+      createRequest({
+        toolId: 'athena_get_work_group',
+        input: { ...CONNECTION, workGroup: 'my wg' },
+      })
+    )
+    expect(badWorkGroup.status).toBe(400)
+    expect(mockOperations.executeAthenaGetWorkGroup).not.toHaveBeenCalled()
   })
 
   it('preserves the provider error envelope', async () => {

apps/sim/tools/athena/list_table_metadata.ts

@@ -102,7 +102,7 @@ export const listTableMetadataTool: InternalToolConfig<
   outputs: {
     tables: {
       type: 'array',
-      description: 'Table metadata (name, type, columns, partition keys)',
+      description: 'Table metadata (name, type, columns, partition keys, parameters)',
       items: {
         type: 'object',
         properties: {
@@ -142,6 +142,10 @@ export const listTableMetadataTool: InternalToolConfig<
               },
             },
           },
+          parameters: {
+            type: 'json',
+            description: 'Key/value table properties (e.g., classification, location)',
+          },
         },
       },
     },