Fix tests

Author: jahooma

common/src/__tests__/agent-validation.test.ts

@@ -1,4 +1,12 @@
-import { afterAll, beforeAll, beforeEach, describe, expect, it, test } from 'bun:test'
+import {
+  afterAll,
+  beforeAll,
+  beforeEach,
+  describe,
+  expect,
+  it,
+  test,
+} from 'bun:test'
 
 import { validateAgents } from '../templates/agent-validation'
 import { DynamicAgentConfigSchema } from '../types/dynamic-agent-template'
@@ -216,7 +224,7 @@ describe('Agent Validation', () => {
             instructionsPrompt: 'Test user prompt',
             stepPrompt: 'Test step prompt',
             inputSchema: {
-              prompt: null as any, // Invalid - null schema
+              prompt: {} as any, // invalid prompt schema
             },
             outputMode: 'last_message',
             includeMessageHistory: true,
@@ -230,7 +238,7 @@ describe('Agent Validation', () => {
 
       expect(result.validationErrors).toHaveLength(1)
       expect(result.validationErrors[0].message).toContain(
-        'Failed to convert inputSchema.prompt to Zod',
+        'Invalid inputSchema.prompt in invalid-schema-agent.ts',
       )
       expect(result.templates).not.toHaveProperty('invalid_schema_agent')
     })
@@ -538,7 +546,7 @@ describe('Agent Validation', () => {
               instructionsPrompt: 'Test user prompt',
               stepPrompt: 'Test step prompt',
               inputSchema: {
-                prompt: null as any, // Invalid - null schema
+                prompt: 10 as any, // Invalid - number schema
               },
               outputMode: 'last_message',
               includeMessageHistory: true,
@@ -813,8 +821,10 @@ describe('Agent Validation', () => {
       expect(result.templates['test-agent']).toBeDefined()
 
       // Verify the loaded template's handleSteps field matches the original toString
-      expect(result.templates['test-agent'].handleSteps).toBe(expectedStringified)
+      expect(result.templates['test-agent'].handleSteps).toBe(
+        expectedStringified,
+      )
       expect(typeof result.templates['test-agent'].handleSteps).toBe('string')
     })
   })
-})
+})

common/src/templates/agent-validation.ts

@@ -283,8 +283,16 @@ function convertInputSchema(
   const fileContext = filePath ? ` in ${filePath}` : ''
 
   // Handle prompt schema
-  if (inputPromptSchema && Object.keys(inputPromptSchema).length > 0) {
+  if (inputPromptSchema) {
     try {
+      if (
+        typeof inputPromptSchema !== 'object' ||
+        Object.keys(inputPromptSchema).length === 0
+      ) {
+        throw new Error(
+          `Invalid inputSchema.prompt${fileContext}: Schema must be a valid non-empty JSON schema object. Found: ${typeof inputPromptSchema}`,
+        )
+      }
       const promptZodSchema = convertJsonSchemaToZod(inputPromptSchema)
       // Validate that the schema results in string or undefined
       const testResult = promptZodSchema.safeParse('test')
@@ -312,22 +320,30 @@ function convertInputSchema(
         error instanceof Error ? error.message : 'Unknown error'
       throw new Error(
         `Failed to convert inputSchema.prompt to Zod${fileContext}: ${errorMessage}. ` +
-          `Please check that your inputSchema.prompt is a valid JSON schema object.`,
+          `Please check that your inputSchema.prompt is a valid non-empty JSON schema object.`,
       )
     }
   }
 
   // Handle params schema
-  if (paramsSchema && Object.keys(paramsSchema).length > 0) {
+  if (paramsSchema) {
     try {
+      if (
+        typeof paramsSchema !== 'object' ||
+        Object.keys(paramsSchema).length === 0
+      ) {
+        throw new Error(
+          `Invalid inputSchema.params${fileContext}: Schema must be a valid non-empty JSON schema object. Found: ${typeof paramsSchema}`,
+        )
+      }
       const paramsZodSchema = convertJsonSchemaToZod(paramsSchema)
       result.params = paramsZodSchema
     } catch (error) {
       const errorMessage =
         error instanceof Error ? error.message : 'Unknown error'
       throw new Error(
         `Failed to convert inputSchema.params to Zod${fileContext}: ${errorMessage}. ` +
-          `Please check that your inputSchema.params is a valid JSON schema object.`,
+          `Please check that your inputSchema.params is a valid non-empty JSON schema object.`,
       )
     }
   }