diff --git a/genkit-tools/common/src/server/router.ts b/genkit-tools/common/src/server/router.ts
index d38a0ff688..e57acad0a8 100644
--- a/genkit-tools/common/src/server/router.ts
+++ b/genkit-tools/common/src/server/router.ts
@@ -140,6 +140,7 @@ export const TOOLS_SERVER_ROUTER = (runner: Runner) =>
         const frontmatter: PromptFrontmatter = {
           model: input.model,
           config: input.config,
+          tools: input.toolNames,
         };
         return fromMessages(frontmatter, input.messages);
       }),
diff --git a/genkit-tools/common/src/types/apis.ts b/genkit-tools/common/src/types/apis.ts
index 7b6ebfdcd9..b5e8e8bc35 100644
--- a/genkit-tools/common/src/types/apis.ts
+++ b/genkit-tools/common/src/types/apis.ts
@@ -93,6 +93,7 @@ export const CreatePromptRequestSchema = z.object({
   model: z.string(),
   messages: z.array(MessageSchema),
   config: GenerationCommonConfigSchema.passthrough().optional(),
+  toolNames: z.array(z.string()).optional(),
 });
 
 export type CreatePromptRequest = z.infer<typeof CreatePromptRequestSchema>;