@riotprompt/riotprompt 0.0.13 → 0.0.15

package/README.md

@@ -4,10 +4,14 @@ A powerful, flexible prompt building library and CLI tool for AI applications wi
 
 ## Features
 
-- **Structured Prompts**: Treat prompts as code with sections for Persona, Instructions, and Context.
+- **Structured Prompts**: Treat prompts as code with specialized sections for Persona, Instructions, Context, and more.
+- **Advanced Prompt Strategies**: First-class support for **Constraints**, **Tone**, **Few-Shot Examples**, **Reasoning Steps**, **Response Format**, and **Safeguards**.
+- **Model Alignment**: Automatically adapts prompt structure to match the specific expectations of each model provider:
+    - **Anthropic (Claude)**: Places Personas, Roles, Tone, and Constraints into the `system` parameter. Additionally, converts `schema` definitions into forced **Tool Use** calls, extracting structured results to match OpenAI's output format.
+    - **OpenAI**: Maps generic roles to the appropriate `system` or `developer` (for O-series) messages.
+    - **Gemini**: Structurally adapts components into System Instructions and content parts. For structured outputs, it automatically transforms JSON schemas into Gemini's `responseSchema` format, ensuring strict adherence to the defined structure.
 - **CLI Tool**: Scaffold, manage, process, and **execute** prompts directly from the terminal.
 - **Model Agnostic**: Format prompts for different models (GPT-4, Claude, Gemini, etc.) automatically.
-- **Model Families**: Intelligent handling of model-specific quirks (e.g., 'developer' vs 'system' roles for O-series vs GPT-4).
 - **Execution Engine**: Run prompts against OpenAI, Anthropic, or Gemini APIs directly.
 - **Portable**: Serialize prompts to JSON or XML for easy exchange between systems.
 - **Type-Safe**: Full TypeScript support with excellent IntelliSense.
@@ -120,21 +124,19 @@ You can also use RiotPrompt programmatically in your application.
 ```typescript
 import { cook, registerTemplates } from 'riotprompt';
 
-// Simple prompt creation
+// Advanced prompt creation
+import { z } from "zod";
+
 const prompt = await cook({
   basePath: __dirname,
   persona: { content: 'You are a helpful AI assistant' },
-  instructions: [
-    { content: 'Analyze the provided content carefully' },
-    { path: 'instructions/guidelines.md' },
-  ],
-  content: [
-    { content: sourceData, title: 'Source Data', weight: 1.0 },
-    { directories: ['examples/'], weight: 0.5 },
-  ],
-  context: [
-    { content: 'Additional context', title: 'Context' },
-  ],
+  // ...
+  // Structured Output with Zod
+  schema: z.object({
+      summary: z.string(),
+      tags: z.array(z.string()),
+      confidence: z.number().min(0).max(1)
+  })
 });
 
 // Register and use templates
@@ -154,8 +156,9 @@ const analysisPrompt = await cook({
 
 ## Documentation
 
-For more detailed guides on architecture and advanced usage, check the [Guide](guide/index.md).
+Full documentation is available at [https://tobrien.github.io/riotprompt/](https://tobrien.github.io/riotprompt/).
 
+You can also explore the guides in the source:
 - [Core Concepts](docs/public/core-concepts.md)
 - [Recipes System](docs/public/recipes.md)
 - [API Reference](docs/public/api-reference.md)

package/dist/chat.d.ts

@@ -8,6 +8,8 @@ export interface Message {
 export interface Request {
     messages: Message[];
     model: Model;
+    responseFormat?: any;
+    validator?: any;
     addMessage(message: Message): void;
 }
 export declare const getPersonaRole: (model: Model) => Role;

package/dist/chat.js

@@ -8,6 +8,8 @@ const createRequest = (model)=>{
     return {
         model,
         messages,
+        responseFormat: undefined,
+        validator: undefined,
         addMessage: (message)=>{
             messages.push(message);
         }

package/dist/chat.js.map

@@ -1 +1 @@
-{"version":3,"file":"chat.js","sources":["../src/chat.ts"],"sourcesContent":["import { getPersonaRole as getPersonaRoleFromRegistry } from \"./model-config\";\n\nexport type Role = \"user\" | \"assistant\" | \"system\" | \"developer\";\n\n// Model is now a flexible string type\nexport type Model = string;\n\nexport interface Message {\n    role: Role;\n    content: string | string[];\n    name?: string;\n}\n\nexport interface Request {\n    messages: Message[];\n    model: Model;\n\n    addMessage(message: Message): void;\n}\n\nexport const getPersonaRole = (model: Model): Role => {\n    return getPersonaRoleFromRegistry(model);\n}\n\nexport const createRequest = (model: Model): Request => {\n    const messages: Message[] = [];\n\n    return {\n        model,\n        messages,\n        addMessage: (message: Message) => {\n            messages.push(message);\n        }\n    }\n}\n"],"names":["getPersonaRole","model","getPersonaRoleFromRegistry","createRequest","messages","addMessage","message","push"],"mappings":";;AAoBO,MAAMA,iBAAiB,CAACC,KAAAA,GAAAA;AAC3B,IAAA,OAAOC,gBAAAA,CAA2BD,KAAAA,CAAAA;AACtC;AAEO,MAAME,gBAAgB,CAACF,KAAAA,GAAAA;AAC1B,IAAA,MAAMG,WAAsB,EAAE;IAE9B,OAAO;AACHH,QAAAA,KAAAA;AACAG,QAAAA,QAAAA;AACAC,QAAAA,UAAAA,EAAY,CAACC,OAAAA,GAAAA;AACTF,YAAAA,QAAAA,CAASG,IAAI,CAACD,OAAAA,CAAAA;AAClB,QAAA;AACJ,KAAA;AACJ;;;;"}
+{"version":3,"file":"chat.js","sources":["../src/chat.ts"],"sourcesContent":["import { getPersonaRole as getPersonaRoleFromRegistry } from \"./model-config\";\n\nexport type Role = \"user\" | \"assistant\" | \"system\" | \"developer\";\n\n// Model is now a flexible string type\nexport type Model = string;\n\nexport interface Message {\n    role: Role;\n    content: string | string[];\n    name?: string;\n}\n\nexport interface Request {\n    messages: Message[];\n    model: Model;\n    responseFormat?: any; // Generic to support different provider formats (JSON schema, etc.)\n    validator?: any; // Zod schema for validation\n\n    addMessage(message: Message): void;\n}\n\nexport const getPersonaRole = (model: Model): Role => {\n    return getPersonaRoleFromRegistry(model);\n}\n\nexport const createRequest = (model: Model): Request => {\n    const messages: Message[] = [];\n\n    return {\n        model,\n        messages,\n        responseFormat: undefined,\n        validator: undefined,\n        addMessage: (message: Message) => {\n            messages.push(message);\n        }\n    }\n}\n"],"names":["getPersonaRole","model","getPersonaRoleFromRegistry","createRequest","messages","responseFormat","undefined","validator","addMessage","message","push"],"mappings":";;AAsBO,MAAMA,iBAAiB,CAACC,KAAAA,GAAAA;AAC3B,IAAA,OAAOC,gBAAAA,CAA2BD,KAAAA,CAAAA;AACtC;AAEO,MAAME,gBAAgB,CAACF,KAAAA,GAAAA;AAC1B,IAAA,MAAMG,WAAsB,EAAE;IAE9B,OAAO;AACHH,QAAAA,KAAAA;AACAG,QAAAA,QAAAA;QACAC,cAAAA,EAAgBC,SAAAA;QAChBC,SAAAA,EAAWD,SAAAA;AACXE,QAAAA,UAAAA,EAAY,CAACC,OAAAA,GAAAA;AACTL,YAAAA,QAAAA,CAASM,IAAI,CAACD,OAAAA,CAAAA;AAClB,QAAA;AACJ,KAAA;AACJ;;;;"}

package/dist/cli.cjs

@@ -7,6 +7,7 @@ const cardigantime = require("@theunwalked/cardigantime");
 const zod = require("zod");
 const fs$1 = require("fs/promises");
 const path = require("path");
+require("zod-to-json-schema");
 const crypto = require("crypto");
 require("tiktoken");
 const fastXmlParser = require("fast-xml-parser");
@@ -193,13 +194,31 @@ const create$3 = ({
   persona,
   instructions,
   contents,
-  contexts
+  contexts,
+  constraints,
+  tone,
+  examples,
+  reasoning,
+  responseFormat,
+  recap,
+  safeguards,
+  schema,
+  validator
 }) => {
   return {
     persona,
     instructions,
     contents,
-    contexts
+    contexts,
+    constraints,
+    tone,
+    examples,
+    reasoning,
+    responseFormat,
+    recap,
+    safeguards,
+    schema,
+    validator
   };
 };
 const LIBRARY_NAME = "riotprompt";
@@ -415,6 +434,8 @@ const createRequest = (model) => {
   return {
     model,
     messages,
+    responseFormat: void 0,
+    validator: void 0,
     addMessage: (message) => {
       messages.push(message);
     }
@@ -552,22 +573,46 @@ ${formattedItems}`;
   const formatPrompt = (model, prompt) => {
     logger.silly("Formatting prompt");
     const chatRequest = createRequest(model);
-    if (prompt.persona) {
-      [prompt.persona].forEach((persona) => {
-        chatRequest.addMessage(formatPersona(model, persona));
+    const systemSections = [];
+    if (prompt.persona) systemSections.push(prompt.persona);
+    if (prompt.tone) systemSections.push(prompt.tone);
+    if (prompt.constraints) systemSections.push(prompt.constraints);
+    if (prompt.safeguards) systemSections.push(prompt.safeguards);
+    if (prompt.responseFormat) systemSections.push(prompt.responseFormat);
+    if (systemSections.length > 0) {
+      const systemContent = systemSections.map((section) => formatSection(section)).join("\n\n");
+      chatRequest.addMessage({
+        role: getPersonaRole(model),
+        content: systemContent
       });
     }
-    let formattedAreas = formatSection(prompt.instructions) + "\n\n";
-    if (prompt.contents) {
-      formattedAreas += formatSection(prompt.contents) + "\n\n";
+    const userSections = [
+      prompt.contexts,
+      prompt.examples,
+      prompt.instructions,
+      prompt.contents,
+      prompt.reasoning,
+      prompt.recap
+    ];
+    let formattedUserContent = "";
+    for (const section of userSections) {
+      if (section) {
+        formattedUserContent += formatSection(section) + "\n\n";
+      }
     }
-    if (prompt.contexts) {
-      formattedAreas += formatSection(prompt.contexts) + "\n\n";
+    if (formattedUserContent.trim().length > 0 || systemSections.length === 0) {
+      chatRequest.addMessage({
+        role: "user",
+        content: formattedUserContent.trim() || " "
+        // Empty user message if needed (though usually not ideal)
+      });
+    }
+    if (prompt.schema) {
+      chatRequest.responseFormat = prompt.schema;
+    }
+    if (prompt.validator) {
+      chatRequest.validator = prompt.validator;
     }
-    chatRequest.addMessage({
-      role: "user",
-      content: formattedAreas
-    });
     return chatRequest;
   };
   return {
@@ -872,6 +917,16 @@ zod.z.object({
   instructions: zod.z.array(ContentItemSchema).optional().default([]),
   content: zod.z.array(ContentItemSchema).optional().default([]),
   context: zod.z.array(ContentItemSchema).optional().default([]),
+  // Advanced prompting sections
+  constraints: zod.z.array(ContentItemSchema).optional().default([]),
+  tone: zod.z.array(ContentItemSchema).optional().default([]),
+  examples: zod.z.array(ContentItemSchema).optional().default([]),
+  reasoning: zod.z.array(ContentItemSchema).optional().default([]),
+  responseFormat: zod.z.array(ContentItemSchema).optional().default([]),
+  recap: zod.z.array(ContentItemSchema).optional().default([]),
+  safeguards: zod.z.array(ContentItemSchema).optional().default([]),
+  schema: zod.z.any().optional(),
+  // Can be string path, JSON object, or Zod schema
   // Templates and inheritance
   extends: zod.z.string().optional(),
   // Extend another recipe
@@ -1132,7 +1187,8 @@ class OpenAIProvider {
       model,
       messages,
       temperature: options.temperature,
-      max_tokens: options.maxTokens
+      max_tokens: options.maxTokens,
+      response_format: request.responseFormat
     });
     const choice = response.choices[0];
     return {
@@ -1168,11 +1224,26 @@ class AnthropicProvider {
       system: systemPrompt.trim() || void 0,
       messages,
       max_tokens: options.maxTokens || 4096,
-      // Anthropic requires max_tokens
-      temperature: options.temperature
+      temperature: options.temperature,
+      ...request.responseFormat?.type === "json_schema" ? {
+        tools: [{
+          name: request.responseFormat.json_schema.name,
+          description: request.responseFormat.json_schema.description || "Output data in this structured format",
+          input_schema: request.responseFormat.json_schema.schema
+        }],
+        tool_choice: { type: "tool", name: request.responseFormat.json_schema.name }
+      } : {}
     });
-    const contentBlock = response.content[0];
-    const text = contentBlock.type === "text" ? contentBlock.text : "";
+    let text = "";
+    if (request.responseFormat?.type === "json_schema") {
+      const toolUseBlock = response.content.find((block) => block.type === "tool_use");
+      if (toolUseBlock && toolUseBlock.type === "tool_use") {
+        text = JSON.stringify(toolUseBlock.input, null, 2);
+      }
+    } else {
+      const contentBlock = response.content[0];
+      text = contentBlock.type === "text" ? contentBlock.text : "";
+    }
     return {
       content: text,
       model: response.model,
@@ -1189,6 +1260,32 @@ class GeminiProvider {
     if (!apiKey) throw new Error("Gemini API key is required");
     const genAI = new generativeAi.GoogleGenerativeAI(apiKey);
     const modelName = options.model || request.model || "gemini-1.5-pro";
+    const generationConfig = {};
+    if (request.responseFormat?.type === "json_schema") {
+      generationConfig.responseMimeType = "application/json";
+      const openAISchema = request.responseFormat.json_schema.schema;
+      const mapSchema = (s) => {
+        if (!s) return void 0;
+        const newSchema = { ...s };
+        if (newSchema.type) {
+          newSchema.type = typeof newSchema.type === "string" ? newSchema.type.toUpperCase() : newSchema.type;
+        }
+        if (newSchema.properties) {
+          const newProps = {};
+          for (const [key, val] of Object.entries(newSchema.properties)) {
+            newProps[key] = mapSchema(val);
+          }
+          newSchema.properties = newProps;
+        }
+        if (newSchema.items) {
+          newSchema.items = mapSchema(newSchema.items);
+        }
+        delete newSchema.additionalProperties;
+        delete newSchema["$schema"];
+        return newSchema;
+      };
+      generationConfig.responseSchema = mapSchema(openAISchema);
+    }
     let systemInstruction = "";
     for (const msg of request.messages) {
       if (msg.role === "system" || msg.role === "developer") {
@@ -1197,7 +1294,8 @@ class GeminiProvider {
     }
     const configuredModel = genAI.getGenerativeModel({
       model: modelName,
-      systemInstruction: systemInstruction ? systemInstruction.trim() : void 0
+      systemInstruction: systemInstruction ? systemInstruction.trim() : void 0,
+      generationConfig
     });
     const chatHistory = [];
     let lastUserMessage = "";

package/dist/execution/anthropic.js

@@ -2,6 +2,7 @@ import Anthropic from '@anthropic-ai/sdk';
 
 class AnthropicProvider {
     async execute(request, options = {}) {
+        var _request_responseFormat, _request_responseFormat1;
         const apiKey = options.apiKey || process.env.ANTHROPIC_API_KEY;
         if (!apiKey) throw new Error('Anthropic API key is required');
         const client = new Anthropic({
@@ -26,11 +27,34 @@ class AnthropicProvider {
             system: systemPrompt.trim() || undefined,
             messages: messages,
             max_tokens: options.maxTokens || 4096,
-            temperature: options.temperature
+            temperature: options.temperature,
+            ...((_request_responseFormat = request.responseFormat) === null || _request_responseFormat === void 0 ? void 0 : _request_responseFormat.type) === 'json_schema' ? {
+                tools: [
+                    {
+                        name: request.responseFormat.json_schema.name,
+                        description: request.responseFormat.json_schema.description || "Output data in this structured format",
+                        input_schema: request.responseFormat.json_schema.schema
+                    }
+                ],
+                tool_choice: {
+                    type: 'tool',
+                    name: request.responseFormat.json_schema.name
+                }
+            } : {}
         });
         // Handle ContentBlock
-        const contentBlock = response.content[0];
-        const text = contentBlock.type === 'text' ? contentBlock.text : '';
+        // Check for tool_use first if we requested structured output
+        let text = '';
+        if (((_request_responseFormat1 = request.responseFormat) === null || _request_responseFormat1 === void 0 ? void 0 : _request_responseFormat1.type) === 'json_schema') {
+            const toolUseBlock = response.content.find((block)=>block.type === 'tool_use');
+            if (toolUseBlock && toolUseBlock.type === 'tool_use') {
+                // Return the structured data as a JSON string to match OpenAI behavior
+                text = JSON.stringify(toolUseBlock.input, null, 2);
+            }
+        } else {
+            const contentBlock = response.content[0];
+            text = contentBlock.type === 'text' ? contentBlock.text : '';
+        }
         return {
             content: text,
             model: response.model,

package/dist/execution/anthropic.js.map

@@ -1 +1 @@
-{"version":3,"file":"anthropic.js","sources":["../../src/execution/anthropic.ts"],"sourcesContent":["import Anthropic from '@anthropic-ai/sdk';\nimport { Provider, ProviderResponse, ExecutionOptions } from './provider';\nimport { Request } from '../chat';\n\nexport class AnthropicProvider implements Provider {\n    async execute(request: Request, options: ExecutionOptions = {}): Promise<ProviderResponse> {\n        const apiKey = options.apiKey || process.env.ANTHROPIC_API_KEY;\n        if (!apiKey) throw new Error('Anthropic API key is required');\n\n        const client = new Anthropic({ apiKey });\n        \n        const model = options.model || request.model || 'claude-3-opus-20240229';\n\n        // Anthropic separates system prompt from messages\n        let systemPrompt = '';\n        const messages: Anthropic.MessageParam[] = [];\n\n        for (const msg of request.messages) {\n            if (msg.role === 'system' || msg.role === 'developer') {\n                systemPrompt += (typeof msg.content === 'string' ? msg.content : JSON.stringify(msg.content)) + '\\n\\n';\n            } else {\n                messages.push({\n                    role: msg.role as 'user' | 'assistant',\n                    content: typeof msg.content === 'string' ? msg.content : JSON.stringify(msg.content)\n                });\n            }\n        }\n\n        const response = await client.messages.create({\n            model: model,\n            system: systemPrompt.trim() || undefined,\n            messages: messages,\n            max_tokens: options.maxTokens || 4096, // Anthropic requires max_tokens\n            temperature: options.temperature,\n        });\n\n        // Handle ContentBlock\n        const contentBlock = response.content[0];\n        const text = contentBlock.type === 'text' ? contentBlock.text : '';\n\n        return {\n            content: text,\n            model: response.model,\n            usage: {\n                inputTokens: response.usage.input_tokens,\n                outputTokens: response.usage.output_tokens\n            }\n        };\n    }\n}\n\n"],"names":["AnthropicProvider","execute","request","options","apiKey","process","env","ANTHROPIC_API_KEY","Error","client","Anthropic","model","systemPrompt","messages","msg","role","content","JSON","stringify","push","response","create","system","trim","undefined","max_tokens","maxTokens","temperature","contentBlock","text","type","usage","inputTokens","input_tokens","outputTokens","output_tokens"],"mappings":";;AAIO,MAAMA,iBAAAA,CAAAA;AACT,IAAA,MAAMC,QAAQC,OAAgB,EAAEC,OAAAA,GAA4B,EAAE,EAA6B;AACvF,QAAA,MAAMC,SAASD,OAAAA,CAAQC,MAAM,IAAIC,OAAAA,CAAQC,GAAG,CAACC,iBAAiB;AAC9D,QAAA,IAAI,CAACH,MAAAA,EAAQ,MAAM,IAAII,KAAAA,CAAM,+BAAA,CAAA;QAE7B,MAAMC,MAAAA,GAAS,IAAIC,SAAAA,CAAU;AAAEN,YAAAA;AAAO,SAAA,CAAA;AAEtC,QAAA,MAAMO,QAAQR,OAAAA,CAAQQ,KAAK,IAAIT,OAAAA,CAAQS,KAAK,IAAI,wBAAA;;AAGhD,QAAA,IAAIC,YAAAA,GAAe,EAAA;AACnB,QAAA,MAAMC,WAAqC,EAAE;AAE7C,QAAA,KAAK,MAAMC,GAAAA,IAAOZ,OAAAA,CAAQW,QAAQ,CAAE;AAChC,YAAA,IAAIC,IAAIC,IAAI,KAAK,YAAYD,GAAAA,CAAIC,IAAI,KAAK,WAAA,EAAa;AACnDH,gBAAAA,YAAAA,IAAgB,CAAC,OAAOE,GAAAA,CAAIE,OAAO,KAAK,QAAA,GAAWF,GAAAA,CAAIE,OAAO,GAAGC,KAAKC,SAAS,CAACJ,GAAAA,CAAIE,OAAO,CAAA,IAAK,MAAA;YACpG,CAAA,MAAO;AACHH,gBAAAA,QAAAA,CAASM,IAAI,CAAC;AACVJ,oBAAAA,IAAAA,EAAMD,IAAIC,IAAI;AACdC,oBAAAA,OAAAA,EAAS,OAAOF,GAAAA,CAAIE,OAAO,KAAK,QAAA,GAAWF,GAAAA,CAAIE,OAAO,GAAGC,IAAAA,CAAKC,SAAS,CAACJ,GAAAA,CAAIE,OAAO;AACvF,iBAAA,CAAA;AACJ,YAAA;AACJ,QAAA;AAEA,QAAA,MAAMI,WAAW,MAAMX,MAAAA,CAAOI,QAAQ,CAACQ,MAAM,CAAC;YAC1CV,KAAAA,EAAOA,KAAAA;YACPW,MAAAA,EAAQV,YAAAA,CAAaW,IAAI,EAAA,IAAMC,SAAAA;YAC/BX,QAAAA,EAAUA,QAAAA;YACVY,UAAAA,EAAYtB,OAAAA,CAAQuB,SAAS,IAAI,IAAA;AACjCC,YAAAA,WAAAA,EAAaxB,QAAQwB;AACzB,SAAA,CAAA;;AAGA,QAAA,MAAMC,YAAAA,GAAeR,QAAAA,CAASJ,OAAO,CAAC,CAAA,CAAE;AACxC,QAAA,MAAMa,OAAOD,YAAAA,CAAaE,IAAI,KAAK,MAAA,GAASF,YAAAA,CAAaC,IAAI,GAAG,EAAA;QAEhE,OAAO;YACHb,OAAAA,EAASa,IAAAA;AACTlB,YAAAA,KAAAA,EAAOS,SAAST,KAAK;YACrBoB,KAAAA,EAAO;gBACHC,WAAAA,EAAaZ,QAAAA,CAASW,KAAK,CAACE,YAAY;gBACxCC,YAAAA,EAAcd,QAAAA,CAASW,KAAK,CAACI;AACjC;AACJ,SAAA;AACJ,IAAA;AACJ;;;;"}
+{"version":3,"file":"anthropic.js","sources":["../../src/execution/anthropic.ts"],"sourcesContent":["import Anthropic from '@anthropic-ai/sdk';\nimport { Provider, ProviderResponse, ExecutionOptions } from './provider';\nimport { Request } from '../chat';\n\nexport class AnthropicProvider implements Provider {\n    async execute(request: Request, options: ExecutionOptions = {}): Promise<ProviderResponse> {\n        const apiKey = options.apiKey || process.env.ANTHROPIC_API_KEY;\n        if (!apiKey) throw new Error('Anthropic API key is required');\n\n        const client = new Anthropic({ apiKey });\n        \n        const model = options.model || request.model || 'claude-3-opus-20240229';\n\n        // Anthropic separates system prompt from messages\n        let systemPrompt = '';\n        const messages: Anthropic.MessageParam[] = [];\n\n        for (const msg of request.messages) {\n            if (msg.role === 'system' || msg.role === 'developer') {\n                systemPrompt += (typeof msg.content === 'string' ? msg.content : JSON.stringify(msg.content)) + '\\n\\n';\n            } else {\n                messages.push({\n                    role: msg.role as 'user' | 'assistant',\n                    content: typeof msg.content === 'string' ? msg.content : JSON.stringify(msg.content)\n                });\n            }\n        }\n\n        const response = await client.messages.create({\n            model: model,\n            system: systemPrompt.trim() || undefined,\n            messages: messages,\n            max_tokens: options.maxTokens || 4096,\n            temperature: options.temperature,\n            ...(request.responseFormat?.type === 'json_schema' ? {\n                tools: [{\n                    name: request.responseFormat.json_schema.name,\n                    description: request.responseFormat.json_schema.description || \"Output data in this structured format\",\n                    input_schema: request.responseFormat.json_schema.schema\n                }],\n                tool_choice: { type: 'tool', name: request.responseFormat.json_schema.name }\n            } : {})\n        });\n\n        // Handle ContentBlock\n        // Check for tool_use first if we requested structured output\n        let text = '';\n        \n        if (request.responseFormat?.type === 'json_schema') {\n            const toolUseBlock = response.content.find(block => block.type === 'tool_use');\n            if (toolUseBlock && toolUseBlock.type === 'tool_use') {\n                // Return the structured data as a JSON string to match OpenAI behavior\n                text = JSON.stringify(toolUseBlock.input, null, 2);\n            }\n        } else {\n            const contentBlock = response.content[0];\n            text = contentBlock.type === 'text' ? contentBlock.text : '';\n        }\n\n        return {\n            content: text,\n            model: response.model,\n            usage: {\n                inputTokens: response.usage.input_tokens,\n                outputTokens: response.usage.output_tokens\n            }\n        };\n    }\n}\n\n"],"names":["AnthropicProvider","execute","request","options","apiKey","process","env","ANTHROPIC_API_KEY","Error","client","Anthropic","model","systemPrompt","messages","msg","role","content","JSON","stringify","push","response","create","system","trim","undefined","max_tokens","maxTokens","temperature","responseFormat","type","tools","name","json_schema","description","input_schema","schema","tool_choice","text","toolUseBlock","find","block","input","contentBlock","usage","inputTokens","input_tokens","outputTokens","output_tokens"],"mappings":"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"}

package/dist/execution/gemini.js

@@ -2,10 +2,53 @@ import { GoogleGenerativeAI } from '@google/generative-ai';
 
 class GeminiProvider {
     async execute(request, options = {}) {
+        var _request_responseFormat;
         const apiKey = options.apiKey || process.env.GEMINI_API_KEY; // or GOOGLE_API_KEY
         if (!apiKey) throw new Error('Gemini API key is required');
         const genAI = new GoogleGenerativeAI(apiKey);
         const modelName = options.model || request.model || 'gemini-1.5-pro';
+        // Handle generation config for structured output
+        const generationConfig = {};
+        if (((_request_responseFormat = request.responseFormat) === null || _request_responseFormat === void 0 ? void 0 : _request_responseFormat.type) === 'json_schema') {
+            generationConfig.responseMimeType = "application/json";
+            // Map OpenAI JSON schema to Gemini Schema
+            // OpenAI: { name: "...", schema: { type: "object", properties: ... } }
+            // Gemini expects the schema object directly
+            const openAISchema = request.responseFormat.json_schema.schema;
+            // We need to recursively map the types because Gemini uses uppercase enums
+            // SchemaType.OBJECT, SchemaType.STRING, etc.
+            // But the SDK also accepts string types "OBJECT", "STRING" etc.
+            // Let's implement a simple converter or pass it if compatible.
+            // Zod-to-json-schema produces lowercase types ("object", "string").
+            // Google's SDK might need them to be uppercase or mapped.
+            // Helper to clean up schema for Gemini
+            // Removes $schema, strict, and additionalProperties if not supported or formatted differently
+            // And maps 'type' to uppercase.
+            const mapSchema = (s)=>{
+                if (!s) return undefined;
+                const newSchema = {
+                    ...s
+                };
+                if (newSchema.type) {
+                    newSchema.type = typeof newSchema.type === 'string' ? newSchema.type.toUpperCase() : newSchema.type;
+                }
+                if (newSchema.properties) {
+                    const newProps = {};
+                    for (const [key, val] of Object.entries(newSchema.properties)){
+                        newProps[key] = mapSchema(val);
+                    }
+                    newSchema.properties = newProps;
+                }
+                if (newSchema.items) {
+                    newSchema.items = mapSchema(newSchema.items);
+                }
+                // Remove unsupported OpenAI-specific fields if Gemini complains
+                delete newSchema.additionalProperties;
+                delete newSchema['$schema'];
+                return newSchema;
+            };
+            generationConfig.responseSchema = mapSchema(openAISchema);
+        }
         // Gemini format: system instruction is separate, history is separate from last message
         // generateContent accepts a string or parts.
         // We need to construct the prompt.
@@ -22,7 +65,8 @@ class GeminiProvider {
         // Let's try to prepend for compatibility if needed, but 'systemInstruction' param exists in getGenerativeModel config.
         const configuredModel = genAI.getGenerativeModel({
             model: modelName,
-            systemInstruction: systemInstruction ? systemInstruction.trim() : undefined
+            systemInstruction: systemInstruction ? systemInstruction.trim() : undefined,
+            generationConfig
         });
         // Build history/messages
         // Gemini `generateContent` takes the *last* user message.

package/dist/execution/gemini.js.map

@@ -1 +1 @@
-{"version":3,"file":"gemini.js","sources":["../../src/execution/gemini.ts"],"sourcesContent":["import { GoogleGenerativeAI } from '@google/generative-ai';\nimport { Provider, ProviderResponse, ExecutionOptions } from './provider';\nimport { Request } from '../chat';\n\nexport class GeminiProvider implements Provider {\n    async execute(request: Request, options: ExecutionOptions = {}): Promise<ProviderResponse> {\n        const apiKey = options.apiKey || process.env.GEMINI_API_KEY; // or GOOGLE_API_KEY\n        if (!apiKey) throw new Error('Gemini API key is required');\n\n        const genAI = new GoogleGenerativeAI(apiKey);\n        \n        const modelName = options.model || request.model || 'gemini-1.5-pro';\n        \n        // Gemini format: system instruction is separate, history is separate from last message\n        // generateContent accepts a string or parts.\n        \n        // We need to construct the prompt.\n        // Simple approach: Concat system instructions + chat history\n        \n        let systemInstruction = '';\n        \n        // Extract system prompt\n        for (const msg of request.messages) {\n            if (msg.role === 'system' || msg.role === 'developer') {\n                systemInstruction += (typeof msg.content === 'string' ? msg.content : JSON.stringify(msg.content)) + '\\n\\n';\n            }\n        }\n\n        // Configure model with system instruction if available (newer Gemini versions support this)\n        // Or just prepend to first user message.\n        // Let's try to prepend for compatibility if needed, but 'systemInstruction' param exists in getGenerativeModel config.\n        \n        const configuredModel = genAI.getGenerativeModel({ \n            model: modelName,\n            systemInstruction: systemInstruction ? systemInstruction.trim() : undefined\n        });\n\n        // Build history/messages\n        // Gemini `generateContent` takes the *last* user message.\n        // `startChat` takes history.\n        \n        const chatHistory = [];\n        let lastUserMessage = '';\n\n        for (const msg of request.messages) {\n            if (msg.role === 'system' || msg.role === 'developer') continue;\n            \n            const content = typeof msg.content === 'string' ? msg.content : JSON.stringify(msg.content);\n            \n            if (msg.role === 'user') {\n                lastUserMessage = content; // Assuming strictly alternating or we just want the prompt?\n                // If there are multiple messages, we should build a chat.\n            }\n            \n            chatHistory.push({\n                role: msg.role === 'assistant' ? 'model' : 'user',\n                parts: [{ text: content }]\n            });\n        }\n\n        // If we are just running a prompt (single turn), we can use generateContent with the full text.\n        // But let's support multi-turn by using startChat if history > 1.\n        \n        // If it's a typical \"Prompt\" execution, it's usually System + 1 User message.\n        \n        let result;\n        \n        if (chatHistory.length > 1) {\n            // Remove last message from history to send it\n            const lastMsg = chatHistory.pop();\n            const chat = configuredModel.startChat({\n                history: chatHistory\n            });\n            result = await chat.sendMessage(lastMsg?.parts[0].text || '');\n        } else {\n            // Just one message (or none?)\n            result = await configuredModel.generateContent(lastUserMessage || ' ');\n        }\n\n        const response = await result.response;\n        const text = response.text();\n\n        return {\n            content: text,\n            model: modelName,\n            // Gemini usage metadata usageMetadata\n            usage: response.usageMetadata ? {\n                inputTokens: response.usageMetadata.promptTokenCount,\n                outputTokens: response.usageMetadata.candidatesTokenCount\n            } : undefined\n        };\n    }\n}\n\n"],"names":["GeminiProvider","execute","request","options","apiKey","process","env","GEMINI_API_KEY","Error","genAI","GoogleGenerativeAI","modelName","model","systemInstruction","msg","messages","role","content","JSON","stringify","configuredModel","getGenerativeModel","trim","undefined","chatHistory","lastUserMessage","push","parts","text","result","length","lastMsg","pop","chat","startChat","history","sendMessage","generateContent","response","usage","usageMetadata","inputTokens","promptTokenCount","outputTokens","candidatesTokenCount"],"mappings":"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"}
+{"version":3,"file":"gemini.js","sources":["../../src/execution/gemini.ts"],"sourcesContent":["import { GoogleGenerativeAI } from '@google/generative-ai';\nimport { Provider, ProviderResponse, ExecutionOptions } from './provider';\nimport { Request } from '../chat';\n\nexport class GeminiProvider implements Provider {\n    async execute(request: Request, options: ExecutionOptions = {}): Promise<ProviderResponse> {\n        const apiKey = options.apiKey || process.env.GEMINI_API_KEY; // or GOOGLE_API_KEY\n        if (!apiKey) throw new Error('Gemini API key is required');\n\n        const genAI = new GoogleGenerativeAI(apiKey);\n        \n        const modelName = options.model || request.model || 'gemini-1.5-pro';\n        \n        // Handle generation config for structured output\n        const generationConfig: any = {};\n        \n        if (request.responseFormat?.type === 'json_schema') {\n            generationConfig.responseMimeType = \"application/json\";\n            \n            // Map OpenAI JSON schema to Gemini Schema\n            // OpenAI: { name: \"...\", schema: { type: \"object\", properties: ... } }\n            // Gemini expects the schema object directly\n            \n            const openAISchema = request.responseFormat.json_schema.schema;\n            \n            // We need to recursively map the types because Gemini uses uppercase enums\n            // SchemaType.OBJECT, SchemaType.STRING, etc.\n            // But the SDK also accepts string types \"OBJECT\", \"STRING\" etc.\n            // Let's implement a simple converter or pass it if compatible.\n            // Zod-to-json-schema produces lowercase types (\"object\", \"string\").\n            // Google's SDK might need them to be uppercase or mapped.\n            \n            // Helper to clean up schema for Gemini\n            // Removes $schema, strict, and additionalProperties if not supported or formatted differently\n            // And maps 'type' to uppercase.\n            const mapSchema = (s: any): any => {\n                if (!s) return undefined;\n                \n                const newSchema: any = { ...s };\n                \n                if (newSchema.type) {\n                    newSchema.type = (typeof newSchema.type === 'string') \n                        ? (newSchema.type as string).toUpperCase() \n                        : newSchema.type;\n                }\n                \n                if (newSchema.properties) {\n                    const newProps: any = {};\n                    for (const [key, val] of Object.entries(newSchema.properties)) {\n                        newProps[key] = mapSchema(val);\n                    }\n                    newSchema.properties = newProps;\n                }\n                \n                if (newSchema.items) {\n                    newSchema.items = mapSchema(newSchema.items);\n                }\n                \n                // Remove unsupported OpenAI-specific fields if Gemini complains\n                delete newSchema.additionalProperties;\n                delete newSchema['$schema'];\n                \n                return newSchema;\n            };\n            \n            generationConfig.responseSchema = mapSchema(openAISchema);\n        }\n\n        // Gemini format: system instruction is separate, history is separate from last message\n        // generateContent accepts a string or parts.\n        \n        // We need to construct the prompt.\n        // Simple approach: Concat system instructions + chat history\n        \n        let systemInstruction = '';\n        \n        // Extract system prompt\n        for (const msg of request.messages) {\n            if (msg.role === 'system' || msg.role === 'developer') {\n                systemInstruction += (typeof msg.content === 'string' ? msg.content : JSON.stringify(msg.content)) + '\\n\\n';\n            }\n        }\n\n        // Configure model with system instruction if available (newer Gemini versions support this)\n        // Or just prepend to first user message.\n        // Let's try to prepend for compatibility if needed, but 'systemInstruction' param exists in getGenerativeModel config.\n        \n        const configuredModel = genAI.getGenerativeModel({ \n            model: modelName,\n            systemInstruction: systemInstruction ? systemInstruction.trim() : undefined,\n            generationConfig\n        });\n\n        // Build history/messages\n        // Gemini `generateContent` takes the *last* user message.\n        // `startChat` takes history.\n        \n        const chatHistory = [];\n        let lastUserMessage = '';\n\n        for (const msg of request.messages) {\n            if (msg.role === 'system' || msg.role === 'developer') continue;\n            \n            const content = typeof msg.content === 'string' ? msg.content : JSON.stringify(msg.content);\n            \n            if (msg.role === 'user') {\n                lastUserMessage = content; // Assuming strictly alternating or we just want the prompt?\n                // If there are multiple messages, we should build a chat.\n            }\n            \n            chatHistory.push({\n                role: msg.role === 'assistant' ? 'model' : 'user',\n                parts: [{ text: content }]\n            });\n        }\n\n        // If we are just running a prompt (single turn), we can use generateContent with the full text.\n        // But let's support multi-turn by using startChat if history > 1.\n        \n        // If it's a typical \"Prompt\" execution, it's usually System + 1 User message.\n        \n        let result;\n        \n        if (chatHistory.length > 1) {\n            // Remove last message from history to send it\n            const lastMsg = chatHistory.pop();\n            const chat = configuredModel.startChat({\n                history: chatHistory\n            });\n            result = await chat.sendMessage(lastMsg?.parts[0].text || '');\n        } else {\n            // Just one message (or none?)\n            result = await configuredModel.generateContent(lastUserMessage || ' ');\n        }\n\n        const response = await result.response;\n        const text = response.text();\n\n        return {\n            content: text,\n            model: modelName,\n            // Gemini usage metadata usageMetadata\n            usage: response.usageMetadata ? {\n                inputTokens: response.usageMetadata.promptTokenCount,\n                outputTokens: response.usageMetadata.candidatesTokenCount\n            } : undefined\n        };\n    }\n}\n\n"],"names":["GeminiProvider","execute","request","options","apiKey","process","env","GEMINI_API_KEY","Error","genAI","GoogleGenerativeAI","modelName","model","generationConfig","responseFormat","type","responseMimeType","openAISchema","json_schema","schema","mapSchema","s","undefined","newSchema","toUpperCase","properties","newProps","key","val","Object","entries","items","additionalProperties","responseSchema","systemInstruction","msg","messages","role","content","JSON","stringify","configuredModel","getGenerativeModel","trim","chatHistory","lastUserMessage","push","parts","text","result","length","lastMsg","pop","chat","startChat","history","sendMessage","generateContent","response","usage","usageMetadata","inputTokens","promptTokenCount","outputTokens","candidatesTokenCount"],"mappings":"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"}

package/dist/execution/openai.js

@@ -26,7 +26,8 @@ class OpenAIProvider {
             model: model,
             messages: messages,
             temperature: options.temperature,
-            max_tokens: options.maxTokens
+            max_tokens: options.maxTokens,
+            response_format: request.responseFormat
         });
         const choice = response.choices[0];
         return {

package/dist/execution/openai.js.map

@@ -1 +1 @@
-{"version":3,"file":"openai.js","sources":["../../src/execution/openai.ts"],"sourcesContent":["import OpenAI from 'openai';\nimport { Provider, ProviderResponse, ExecutionOptions } from './provider';\nimport { Request } from '../chat';\n\nexport class OpenAIProvider implements Provider {\n    async execute(request: Request, options: ExecutionOptions = {}): Promise<ProviderResponse> {\n        const apiKey = options.apiKey || process.env.OPENAI_API_KEY;\n        if (!apiKey) throw new Error('OpenAI API key is required');\n\n        const client = new OpenAI({ apiKey });\n        \n        const model = options.model || request.model || 'gpt-4';\n\n        // Convert RiotPrompt messages to OpenAI messages\n        const messages = request.messages.map(msg => {\n            const role = msg.role === 'developer' ? 'system' : msg.role; // OpenAI uses system, not developer usually (except o1)\n            // But wait, o1 uses developer. Let's respect what formatter gave us if valid.\n            // OpenAI Node SDK types expect specific roles.\n            // RiotPrompt roles: \"user\" | \"assistant\" | \"system\" | \"developer\"\n            // OpenAI roles: \"system\" | \"user\" | \"assistant\" | \"tool\" | \"function\" | \"developer\" (recent versions)\n            \n            // We'll cast to any to avoid strict type issues with older/newer SDK versions mismatch\n            return {\n                role: role,\n                content: typeof msg.content === 'string' ? msg.content : JSON.stringify(msg.content),\n                name: msg.name\n            } as any;\n        });\n\n        const response = await client.chat.completions.create({\n            model: model,\n            messages: messages,\n            temperature: options.temperature,\n            max_tokens: options.maxTokens,\n        });\n\n        const choice = response.choices[0];\n        \n        return {\n            content: choice.message.content || '',\n            model: response.model,\n            usage: response.usage ? {\n                inputTokens: response.usage.prompt_tokens,\n                outputTokens: response.usage.completion_tokens\n            } : undefined\n        };\n    }\n}\n\n"],"names":["OpenAIProvider","execute","request","options","apiKey","process","env","OPENAI_API_KEY","Error","client","OpenAI","model","messages","map","msg","role","content","JSON","stringify","name","response","chat","completions","create","temperature","max_tokens","maxTokens","choice","choices","message","usage","inputTokens","prompt_tokens","outputTokens","completion_tokens","undefined"],"mappings":";;AAIO,MAAMA,cAAAA,CAAAA;AACT,IAAA,MAAMC,QAAQC,OAAgB,EAAEC,OAAAA,GAA4B,EAAE,EAA6B;AACvF,QAAA,MAAMC,SAASD,OAAAA,CAAQC,MAAM,IAAIC,OAAAA,CAAQC,GAAG,CAACC,cAAc;AAC3D,QAAA,IAAI,CAACH,MAAAA,EAAQ,MAAM,IAAII,KAAAA,CAAM,4BAAA,CAAA;QAE7B,MAAMC,MAAAA,GAAS,IAAIC,MAAAA,CAAO;AAAEN,YAAAA;AAAO,SAAA,CAAA;AAEnC,QAAA,MAAMO,QAAQR,OAAAA,CAAQQ,KAAK,IAAIT,OAAAA,CAAQS,KAAK,IAAI,OAAA;;AAGhD,QAAA,MAAMC,WAAWV,OAAAA,CAAQU,QAAQ,CAACC,GAAG,CAACC,CAAAA,GAAAA,GAAAA;YAClC,MAAMC,IAAAA,GAAOD,IAAIC,IAAI,KAAK,cAAc,QAAA,GAAWD,GAAAA,CAAIC,IAAI,CAAA;;;;;;YAO3D,OAAO;gBACHA,IAAAA,EAAMA,IAAAA;AACNC,gBAAAA,OAAAA,EAAS,OAAOF,GAAAA,CAAIE,OAAO,KAAK,QAAA,GAAWF,GAAAA,CAAIE,OAAO,GAAGC,IAAAA,CAAKC,SAAS,CAACJ,GAAAA,CAAIE,OAAO,CAAA;AACnFG,gBAAAA,IAAAA,EAAML,IAAIK;AACd,aAAA;AACJ,QAAA,CAAA,CAAA;QAEA,MAAMC,QAAAA,GAAW,MAAMX,MAAAA,CAAOY,IAAI,CAACC,WAAW,CAACC,MAAM,CAAC;YAClDZ,KAAAA,EAAOA,KAAAA;YACPC,QAAAA,EAAUA,QAAAA;AACVY,YAAAA,WAAAA,EAAarB,QAAQqB,WAAW;AAChCC,YAAAA,UAAAA,EAAYtB,QAAQuB;AACxB,SAAA,CAAA;AAEA,QAAA,MAAMC,MAAAA,GAASP,QAAAA,CAASQ,OAAO,CAAC,CAAA,CAAE;QAElC,OAAO;AACHZ,YAAAA,OAAAA,EAASW,MAAAA,CAAOE,OAAO,CAACb,OAAO,IAAI,EAAA;AACnCL,YAAAA,KAAAA,EAAOS,SAAST,KAAK;YACrBmB,KAAAA,EAAOV,QAAAA,CAASU,KAAK,GAAG;gBACpBC,WAAAA,EAAaX,QAAAA,CAASU,KAAK,CAACE,aAAa;gBACzCC,YAAAA,EAAcb,QAAAA,CAASU,KAAK,CAACI;aACjC,GAAIC;AACR,SAAA;AACJ,IAAA;AACJ;;;;"}
+{"version":3,"file":"openai.js","sources":["../../src/execution/openai.ts"],"sourcesContent":["import OpenAI from 'openai';\nimport { Provider, ProviderResponse, ExecutionOptions } from './provider';\nimport { Request } from '../chat';\n\nexport class OpenAIProvider implements Provider {\n    async execute(request: Request, options: ExecutionOptions = {}): Promise<ProviderResponse> {\n        const apiKey = options.apiKey || process.env.OPENAI_API_KEY;\n        if (!apiKey) throw new Error('OpenAI API key is required');\n\n        const client = new OpenAI({ apiKey });\n        \n        const model = options.model || request.model || 'gpt-4';\n\n        // Convert RiotPrompt messages to OpenAI messages\n        const messages = request.messages.map(msg => {\n            const role = msg.role === 'developer' ? 'system' : msg.role; // OpenAI uses system, not developer usually (except o1)\n            // But wait, o1 uses developer. Let's respect what formatter gave us if valid.\n            // OpenAI Node SDK types expect specific roles.\n            // RiotPrompt roles: \"user\" | \"assistant\" | \"system\" | \"developer\"\n            // OpenAI roles: \"system\" | \"user\" | \"assistant\" | \"tool\" | \"function\" | \"developer\" (recent versions)\n            \n            // We'll cast to any to avoid strict type issues with older/newer SDK versions mismatch\n            return {\n                role: role,\n                content: typeof msg.content === 'string' ? msg.content : JSON.stringify(msg.content),\n                name: msg.name\n            } as any;\n        });\n\n        const response = await client.chat.completions.create({\n            model: model,\n            messages: messages,\n            temperature: options.temperature,\n            max_tokens: options.maxTokens,\n            response_format: request.responseFormat,\n        });\n\n        const choice = response.choices[0];\n        \n        return {\n            content: choice.message.content || '',\n            model: response.model,\n            usage: response.usage ? {\n                inputTokens: response.usage.prompt_tokens,\n                outputTokens: response.usage.completion_tokens\n            } : undefined\n        };\n    }\n}\n\n"],"names":["OpenAIProvider","execute","request","options","apiKey","process","env","OPENAI_API_KEY","Error","client","OpenAI","model","messages","map","msg","role","content","JSON","stringify","name","response","chat","completions","create","temperature","max_tokens","maxTokens","response_format","responseFormat","choice","choices","message","usage","inputTokens","prompt_tokens","outputTokens","completion_tokens","undefined"],"mappings":";;AAIO,MAAMA,cAAAA,CAAAA;AACT,IAAA,MAAMC,QAAQC,OAAgB,EAAEC,OAAAA,GAA4B,EAAE,EAA6B;AACvF,QAAA,MAAMC,SAASD,OAAAA,CAAQC,MAAM,IAAIC,OAAAA,CAAQC,GAAG,CAACC,cAAc;AAC3D,QAAA,IAAI,CAACH,MAAAA,EAAQ,MAAM,IAAII,KAAAA,CAAM,4BAAA,CAAA;QAE7B,MAAMC,MAAAA,GAAS,IAAIC,MAAAA,CAAO;AAAEN,YAAAA;AAAO,SAAA,CAAA;AAEnC,QAAA,MAAMO,QAAQR,OAAAA,CAAQQ,KAAK,IAAIT,OAAAA,CAAQS,KAAK,IAAI,OAAA;;AAGhD,QAAA,MAAMC,WAAWV,OAAAA,CAAQU,QAAQ,CAACC,GAAG,CAACC,CAAAA,GAAAA,GAAAA;YAClC,MAAMC,IAAAA,GAAOD,IAAIC,IAAI,KAAK,cAAc,QAAA,GAAWD,GAAAA,CAAIC,IAAI,CAAA;;;;;;YAO3D,OAAO;gBACHA,IAAAA,EAAMA,IAAAA;AACNC,gBAAAA,OAAAA,EAAS,OAAOF,GAAAA,CAAIE,OAAO,KAAK,QAAA,GAAWF,GAAAA,CAAIE,OAAO,GAAGC,IAAAA,CAAKC,SAAS,CAACJ,GAAAA,CAAIE,OAAO,CAAA;AACnFG,gBAAAA,IAAAA,EAAML,IAAIK;AACd,aAAA;AACJ,QAAA,CAAA,CAAA;QAEA,MAAMC,QAAAA,GAAW,MAAMX,MAAAA,CAAOY,IAAI,CAACC,WAAW,CAACC,MAAM,CAAC;YAClDZ,KAAAA,EAAOA,KAAAA;YACPC,QAAAA,EAAUA,QAAAA;AACVY,YAAAA,WAAAA,EAAarB,QAAQqB,WAAW;AAChCC,YAAAA,UAAAA,EAAYtB,QAAQuB,SAAS;AAC7BC,YAAAA,eAAAA,EAAiBzB,QAAQ0B;AAC7B,SAAA,CAAA;AAEA,QAAA,MAAMC,MAAAA,GAAST,QAAAA,CAASU,OAAO,CAAC,CAAA,CAAE;QAElC,OAAO;AACHd,YAAAA,OAAAA,EAASa,MAAAA,CAAOE,OAAO,CAACf,OAAO,IAAI,EAAA;AACnCL,YAAAA,KAAAA,EAAOS,SAAST,KAAK;YACrBqB,KAAAA,EAAOZ,QAAAA,CAASY,KAAK,GAAG;gBACpBC,WAAAA,EAAab,QAAAA,CAASY,KAAK,CAACE,aAAa;gBACzCC,YAAAA,EAAcf,QAAAA,CAASY,KAAK,CAACI;aACjC,GAAIC;AACR,SAAA;AACJ,IAAA;AACJ;;;;"}

package/dist/formatter.js

@@ -99,24 +99,52 @@ const create = (formatterOptions)=>{
     const formatPrompt = (model, prompt)=>{
         logger.silly('Formatting prompt');
         const chatRequest = createRequest(model);
-        if (prompt.persona) {
-            [
-                prompt.persona
-            ].forEach((persona)=>{
-                chatRequest.addMessage(formatPersona(model, persona));
+        // --- System/Role Message Construction ---
+        // Collect sections that belong in the system/developer prompt (Persona, Tone, Constraints, etc.)
+        const systemSections = [];
+        if (prompt.persona) systemSections.push(prompt.persona);
+        if (prompt.tone) systemSections.push(prompt.tone);
+        if (prompt.constraints) systemSections.push(prompt.constraints);
+        if (prompt.safeguards) systemSections.push(prompt.safeguards);
+        if (prompt.responseFormat) systemSections.push(prompt.responseFormat);
+        if (systemSections.length > 0) {
+            // Combine all system sections into one system message content
+            const systemContent = systemSections.map((section)=>formatSection(section)).join('\n\n');
+            chatRequest.addMessage({
+                role: getPersonaRole(model),
+                content: systemContent
+            });
+        }
+        // --- User/Task Message Construction ---
+        // Logical flow: Context -> Examples -> Instructions -> Content -> Reasoning -> Recap
+        // This structure guides the model through the context and examples before presenting the core task
+        const userSections = [
+            prompt.contexts,
+            prompt.examples,
+            prompt.instructions,
+            prompt.contents,
+            prompt.reasoning,
+            prompt.recap
+        ];
+        let formattedUserContent = "";
+        for (const section of userSections){
+            if (section) {
+                formattedUserContent += formatSection(section) + '\n\n';
+            }
+        }
+        // Ensure we always have a user message, or if we have content to send
+        if (formattedUserContent.trim().length > 0 || systemSections.length === 0) {
+            chatRequest.addMessage({
+                role: "user",
+                content: formattedUserContent.trim() || " "
             });
         }
-        let formattedAreas = formatSection(prompt.instructions) + '\n\n';
-        if (prompt.contents) {
-            formattedAreas += formatSection(prompt.contents) + '\n\n';
+        if (prompt.schema) {
+            chatRequest.responseFormat = prompt.schema;
         }
-        if (prompt.contexts) {
-            formattedAreas += formatSection(prompt.contexts) + '\n\n';
+        if (prompt.validator) {
+            chatRequest.validator = prompt.validator;
         }
-        chatRequest.addMessage({
-            role: "user",
-            content: formattedAreas
-        });
         return chatRequest;
     };
     return {