@outputai/llm 0.11.0 → 0.11.1-next.2223fa5.0

package/src/ai_provider.js

@@ -53,7 +53,7 @@ const registerProviderSchema = z.object( {
  * @param {Function} providerFn - Factory function that receives a model id
  * @returns {void}
  */
-export function registerProvider( name, providerFn ) {
+export const registerProvider = ( name, providerFn ) => {
   const result = registerProviderSchema.safeParse( { name, providerFn } );
   if ( !result.success ) {
     throw new ValidationError( `Invalid provider registration: ${z.prettifyError( result.error )}` );
@@ -65,7 +65,7 @@ export function registerProvider( name, providerFn ) {
     );
   }
   registeredProviders[name] = providerFn;
-}
+};
 
 /**
  * Return a provider by its name.

package/src/ai_sdk_options.js

@@ -1,72 +1,126 @@
-import { loadImageModel, loadTextModel, loadTools } from './ai_model.js';
-import { resolveMessageProviderOptions } from './prompt/block_options.js';
-import { ROLE, isRole } from './utils/message.js';
+import { loadImageModel, loadTextModel } from './utils/models.js';
+import { buildLoadSkillTool, loadPromptTools } from './utils/tools.js';
+import { Role } from './consts.js';
 import { FatalError } from '@outputai/core';
+import { stepCountIs } from 'ai';
+
+const buildSkillsMessageContent = skills =>
+  'Available skills (use load_skill to get full instructions):\n' +
+  skills.map( s => `- ${s.name}: ${s.description}` ).join( '\n' );
+
+const textPromptConfigKeys = [
+  'frequencyPenalty',
+  'maxOutputTokens',
+  'presencePenalty',
+  'providerOptions',
+  'seed',
+  'stopSequences',
+  'temperature',
+  'topK',
+  'topP'
+];
+
+const imagePromptConfigKeys = [
+  'aspectRatio',
+  'maxImagesPerCall',
+  'n',
+  'providerOptions',
+  'seed',
+  'size'
+];
+
+const select = ( keys, target ) =>
+  Object.fromEntries( Object.entries( target ).filter( ( [ k, v ] ) => keys.includes( k ) && v !== undefined ) );
 
 /**
- * Convert a loaded prompt into AI SDK text generation options.
+ * Build options for AI SDK text generation.
  *
- * System blocks are routed to the `system` option (as `SystemModelMessage[]`, so
- * per-message providerOptions like `cacheControl` are preserved) rather than left
- * in `messages` — the AI SDK flags system roles inside `messages` as a prompt
- * injection risk, and `system` is the provider-recommended slot.
+ * Splits system vs chat messages, applies prompt generation config, and merges tools
+ * with a step limit when any tools are present. Always sets `maxRetries` to 0.
  *
- * @param {object} prompt - Loaded prompt object
- * @returns {object} Options for AI SDK text calls
+ * @param {object} args
+ * @param {object} args.prompt - Loaded prompt object
+ * @param {object} [args.tools] - Caller tools
+ * @param {Skill[]} args.skills - Resolved skills
+ * @param {unknown} [args.stopWhen] - Caller stop condition; otherwise prompt `maxSteps` when tools exist
+ * @param {unknown} [args.output] - Structured output spec
+ * @param {unknown} [args.toolChoice] - Tool choice, set only when tools exist
+ * @param {AbortSignal} [args.abortSignal] - Abort signal for the request
+ * @returns {object} AI SDK text options
  */
-export const loadAiSdkTextOptions = prompt => {
+export const loadAiSdkTextOptions = ( { prompt, tools, skills, stopWhen, output, toolChoice, abortSignal } ) => {
   if ( prompt.messages.length === 0 ) {
     throw new FatalError( `Prompt "${prompt.name}" has no chat-style messages. Add role-tagged blocks like <system> or <user>.` );
   }
-  const isSystem = isRole( ROLE.SYSTEM );
-  const resolvedMessages = resolveMessageProviderOptions( prompt );
 
-  const options = {
-    model: loadTextModel( prompt ),
-    system: resolvedMessages.filter( isSystem ),
-    messages: resolvedMessages.filter( message => !isSystem( message ) ),
-    providerOptions: prompt.config.providerOptions
-  };
+  const systemMessages = prompt.messages.filter( m => m.role === Role.SYSTEM );
+  const allMessages = prompt.messages.filter( m => m.role !== Role.SYSTEM );
 
-  if ( Number.isFinite( prompt.config.temperature ) ) {
-    options.temperature = prompt.config.temperature;
+  if ( skills.length > 0 ) {
+    const skillsMessageContent = buildSkillsMessageContent( skills );
+    if ( systemMessages.length > 0 ) {
+      systemMessages[0] = { ...systemMessages[0], content: `${systemMessages[0].content}\n\n${skillsMessageContent}` };
+    } else {
+      systemMessages.push( { role: Role.SYSTEM, content: skillsMessageContent } );
+    }
   }
 
-  if ( prompt.config.maxTokens ) {
-    options.maxOutputTokens = prompt.config.maxTokens;
-  }
+  const options = {
+    allowSystemInMessages: true,
+    maxRetries: 0,
+    model: loadTextModel( prompt ),
+    system: systemMessages,
+    messages: allMessages,
+    ...( output && { output } ),
+    ...( abortSignal && { abortSignal } ),
+    ...( stopWhen && { stopWhen } ),
+    ...select( textPromptConfigKeys, prompt.config )
+  };
 
-  const tools = loadTools( prompt );
-  if ( tools ) {
-    options.tools = tools;
+  // Tools parsing
+  const promptTools = loadPromptTools( prompt );
+  const skillsTools = skills.length > 0 ? { load_skill: buildLoadSkillTool( skills ) } : {};
+  const mergedTools = { ...promptTools, ...tools, ...skillsTools };
+  if ( Object.keys( mergedTools ).length > 0 ) {
+    options.tools = mergedTools;
+    if ( toolChoice ) {
+      options.toolChoice = toolChoice;
+    }
+    if ( !options.stopWhen ) {
+      options.stopWhen = stepCountIs( prompt.config.maxSteps );
+    }
   }
 
   return options;
 };
 
 /**
- * Convert a loaded prompt into AI SDK image generation options.
+ * Build options for AI SDK image generation.
+ *
+ * Uses prompt instructions (with optional source images and mask) and prompt-owned
+ * image config (`n`, `size`, `aspectRatio`, `seed`, `maxImagesPerCall`, `providerOptions`).
+ * Always sets `maxRetries` to 0.
  *
- * @param {object} prompt - Loaded prompt object
- * @returns {object} Options for AI SDK image calls
+ * @param {object} args
+ * @param {object} args.prompt - Loaded prompt object
+ * @param {unknown} [args.images] - Source images for image-to-image
+ * @param {unknown} [args.mask] - Inpainting mask
+ * @param {AbortSignal} [args.abortSignal] - Abort signal for the request
+ * @returns {object} AI SDK image options
  */
-export const loadAiSdkImageOptions = ( { prompt, images, mask } ) => {
+export const loadAiSdkImageOptions = ( { prompt, images, mask, abortSignal } ) => {
   if ( !prompt.instructions ) {
     throw new FatalError( `Prompt "${prompt.name}" has no instructions. Image prompts must use plain instructions.` );
   }
-  const options = {
+  return {
+    maxRetries: 0,
     model: loadImageModel( prompt ),
     prompt: ( images || mask ) ? {
       text: prompt.instructions,
       ...( images && { images } ),
       ...( mask && { mask } )
     } : prompt.instructions,
-    providerOptions: prompt.config.providerOptions
+    ...( abortSignal && { abortSignal } ),
+    ...select( imagePromptConfigKeys, prompt.config )
   };
-  for ( const key of [ 'n', 'maxImagesPerCall', 'size', 'aspectRatio', 'seed' ] ) {
-    if ( prompt.config[key] !== undefined ) {
-      options[key] = prompt.config[key];
-    }
-  }
-  return options;
 };