@outputai/llm 0.6.1-next.fc6a93e.0 → 0.7.1-dev.144d64f.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@outputai/llm",
-  "version": "0.6.1-next.fc6a93e.0",
+  "version": "0.7.1-dev.144d64f.0",
   "description": "Framework abstraction to interact with LLM models",
   "type": "module",
   "main": "src/index.js",
@@ -9,21 +9,29 @@
     "./src"
   ],
   "dependencies": {
-    "@ai-sdk/amazon-bedrock": "4.0.96",
-    "@ai-sdk/anthropic": "3.0.71",
-    "@ai-sdk/azure": "3.0.54",
-    "@ai-sdk/google-vertex": "4.0.112",
-    "@ai-sdk/openai": "3.0.53",
-    "@ai-sdk/perplexity": "3.0.29",
-    "@exalabs/ai-sdk": "2.0.1",
-    "@perplexity-ai/ai-sdk": "0.1.3",
-    "@tavily/ai-sdk": "0.4.1",
-    "ai": "6.0.168",
     "entities": "8.0.0",
     "gray-matter": "4.0.3",
     "liquidjs": "10.25.7",
     "undici": "8.1.0",
-    "@outputai/core": "0.6.1-next.fc6a93e.0"
+    "@outputai/core": "0.7.1-dev.144d64f.0"
+  },
+  "devDependencies": {
+    "ai": "6.0.168",
+    "@ai-sdk/amazon-bedrock": "4.0.111",
+    "@ai-sdk/anthropic": "3.0.81",
+    "@ai-sdk/azure": "3.0.68",
+    "@ai-sdk/google-vertex": "4.0.140",
+    "@ai-sdk/openai": "3.0.67",
+    "@ai-sdk/perplexity": "3.0.33"
+  },
+  "peerDependencies": {
+    "ai": ">=6 <7",
+    "@ai-sdk/amazon-bedrock": ">=4 <5",
+    "@ai-sdk/anthropic": ">=3 <4",
+    "@ai-sdk/azure": ">=3 <4",
+    "@ai-sdk/google-vertex": ">=4 <5",
+    "@ai-sdk/openai": ">=3 <4",
+    "@ai-sdk/perplexity": ">=3 <4"
   },
   "license": "Apache-2.0",
   "publishConfig": {

package/src/agent.js

@@ -5,7 +5,7 @@ import { loadAiSdkTextOptions } from './ai_sdk_options.js';
 import { prepareTextPrompt } from './prompt/prepare_text.js';
 import { startTrace, endTraceWithError } from './utils/trace.js';
 import { wrapTextResponse, wrapStreamOnFinishResponse } from './utils/response_wrappers.js';
-import { ROLE, isRole, getContent } from './utils/message.js';
+import { ROLE, isRole } from './utils/message.js';
 export { skill } from './prompt/skill.js';
 
 export const createMemoryConversationStore = () => {
@@ -47,12 +47,13 @@ export class Agent extends AIToolLoopAgent {
 
     // Extract system messages as `instructions` for the ToolLoopAgent constructor
     // and keep user messages for generate() calls — avoids provider errors
-    // with multiple system messages during multi-step tool loops
-    const systemContent = allMessages.filter( isRole( ROLE.SYSTEM ) ).map( getContent ).join( '\n\n' );
+    // with multiple system messages during multi-step tool loops.
+    // Pass message objects (not a string) so per-message providerOptions are preserved.
+    const systemMessages = allMessages.filter( isRole( ROLE.SYSTEM ) );
 
     super( {
       ...constructorOptions,
-      ...( systemContent ? { instructions: systemContent } : {} ),
+      ...( systemMessages.length > 0 ? { instructions: systemMessages } : {} ),
       ...( tools ? { tools } : {} ),
       stopWhen: stopWhen ?? stepCountIs( maxSteps ),
       ...rest

package/src/agent.spec.js

@@ -86,7 +86,8 @@ vi.mock( './utils/trace.js', () => ( {
 
 vi.mock( './utils/response_wrappers.js', () => ( {
   wrapTextResponse: ( ...args ) => wrapMocks.wrapTextResponse( ...args ),
-  wrapStreamOnFinishResponse: ( ...args ) => wrapMocks.wrapStreamOnFinishResponse( ...args )
+  wrapStreamOnFinishResponse: ( ...args ) =>
+    wrapMocks.wrapStreamOnFinishResponse( ...args )
 } ) );
 
 vi.mock( './prompt/skill.js', () => ( {
@@ -131,7 +132,9 @@ describe( 'Agent', () => {
     aiMocks.superConstructor.mockReset();
     aiMocks.superGenerate.mockReset().mockResolvedValue( aiResponse );
     aiMocks.superStream.mockReset().mockReturnValue( { textStream: 'stream' } );
-    aiMocks.stepCountIs.mockReset().mockImplementation( count => ( { type: 'step-count', count } ) );
+    aiMocks.stepCountIs
+      .mockReset()
+      .mockImplementation( count => ( { type: 'step-count', count } ) );
 
     promptMocks.prepareTextPrompt.mockReset().mockReturnValue( {
       loadedPrompt,
@@ -143,7 +146,9 @@ describe( 'Agent', () => {
     traceMocks.startTrace.mockReset().mockReturnValue( 'trace-id' );
     traceMocks.endTraceWithError.mockReset();
 
-    wrapMocks.wrapTextResponse.mockReset().mockImplementation( async ( { response } ) => response );
+    wrapMocks.wrapTextResponse
+      .mockReset()
+      .mockImplementation( async ( { response } ) => response );
     wrapMocks.wrapStreamOnFinishResponse.mockReset().mockReturnValue( {
       onFinish: vi.fn()
     } );
@@ -175,7 +180,9 @@ describe( 'Agent', () => {
 
   it( 'prepares the prompt using the resolved invocation dir', async () => {
     const { Agent } = await importSut();
-    const skills = [ { name: 'style', description: 'Style', instructions: '# Style' } ];
+    const skills = [
+      { name: 'style', description: 'Style', instructions: '# Style' }
+    ];
     const tools = { search: { description: 'Search' } };
 
     new Agent( {
@@ -199,9 +206,11 @@ describe( 'Agent', () => {
 
     new Agent( { prompt: 'test@v1', promptDir: '/explicit/prompts' } );
 
-    expect( promptMocks.prepareTextPrompt ).toHaveBeenCalledWith( expect.objectContaining( {
-      promptDir: '/explicit/prompts'
-    } ) );
+    expect( promptMocks.prepareTextPrompt ).toHaveBeenCalledWith(
+      expect.objectContaining( {
+        promptDir: '/explicit/prompts'
+      } )
+    );
   } );
 
   it( 'constructs ToolLoopAgent with text options, instructions, tools, and default stopWhen', async () => {
@@ -215,12 +224,33 @@ describe( 'Agent', () => {
       model,
       providerOptions: { test: true },
       temperature: 0.3,
-      instructions: 'You are concise.',
+      instructions: [ { role: 'system', content: 'You are concise.' } ],
       tools: preparedTools,
       stopWhen: { type: 'step-count', count: 10 }
     } );
   } );
 
+  it( 'preserves per-message providerOptions on system messages passed as instructions', async () => {
+    const { Agent } = await importSut();
+    const systemMessage = {
+      role: 'system',
+      content: 'You are concise.',
+      providerOptions: { anthropic: { cacheControl: { type: 'ephemeral' } } }
+    };
+    optionMocks.loadAiSdkTextOptions.mockReturnValueOnce( {
+      model,
+      messages: [ systemMessage, { role: 'user', content: 'Hello' } ]
+    } );
+
+    new Agent( { prompt: 'test@v1' } );
+
+    expect( aiMocks.superConstructor ).toHaveBeenCalledWith(
+      expect.objectContaining( {
+        instructions: [ systemMessage ]
+      } )
+    );
+  } );
+
   it( 'omits tools when prompt preparation returns null tools', async () => {
     const { Agent } = await importSut();
     promptMocks.prepareTextPrompt.mockReturnValueOnce( {
@@ -234,7 +264,7 @@ describe( 'Agent', () => {
       model,
       providerOptions: { test: true },
       temperature: 0.3,
-      instructions: 'You are concise.',
+      instructions: [ { role: 'system', content: 'You are concise.' } ],
       stopWhen: { type: 'step-count', count: 10 }
     } );
   } );
@@ -246,9 +276,11 @@ describe( 'Agent', () => {
     new Agent( { prompt: 'test@v1', stopWhen } );
 
     expect( aiMocks.stepCountIs ).not.toHaveBeenCalled();
-    expect( aiMocks.superConstructor ).toHaveBeenCalledWith( expect.objectContaining( {
-      stopWhen
-    } ) );
+    expect( aiMocks.superConstructor ).toHaveBeenCalledWith(
+      expect.objectContaining( {
+        stopWhen
+      } )
+    );
   } );
 
   it( 'passes custom constructor options through', async () => {
@@ -256,10 +288,12 @@ describe( 'Agent', () => {
 
     new Agent( { prompt: 'test@v1', temperature: 0.8, seed: 42 } );
 
-    expect( aiMocks.superConstructor ).toHaveBeenCalledWith( expect.objectContaining( {
-      temperature: 0.8,
-      seed: 42
-    } ) );
+    expect( aiMocks.superConstructor ).toHaveBeenCalledWith(
+      expect.objectContaining( {
+        temperature: 0.8,
+        seed: 42
+      } )
+    );
   } );
 
   it( 'keeps only user prompt messages as initial generate messages', async () => {
@@ -275,7 +309,9 @@ describe( 'Agent', () => {
 
   it( 'combines initial, stored, and caller messages for generate', async () => {
     const store = {
-      getMessages: vi.fn( () => [ { role: 'assistant', content: 'Stored reply' } ] ),
+      getMessages: vi.fn( () => [
+        { role: 'assistant', content: 'Stored reply' }
+      ] ),
       addMessages: vi.fn()
     };
     const callerMessage = { role: 'user', content: 'New question' };
@@ -336,7 +372,9 @@ describe( 'Agent', () => {
 
   it( 'streams with initial, stored, and caller messages', async () => {
     const store = {
-      getMessages: vi.fn( () => [ { role: 'assistant', content: 'Stored reply' } ] ),
+      getMessages: vi.fn( () => [
+        { role: 'assistant', content: 'Stored reply' }
+      ] ),
       addMessages: vi.fn()
     };
     const onFinish = vi.fn();
@@ -345,7 +383,12 @@ describe( 'Agent', () => {
     const { Agent } = await importSut();
     const agent = new Agent( { prompt: 'test@v1', conversationStore: store } );
 
-    const result = await agent.stream( { messages: [ callerMessage ], onFinish, onError, maxRetries: 1 } );
+    const result = await agent.stream( {
+      messages: [ callerMessage ],
+      onFinish,
+      onError,
+      maxRetries: 1
+    } );
 
     expect( traceMocks.startTrace ).toHaveBeenCalledWith( {
       name: 'Agent.stream',

package/src/ai_model.js

@@ -1,89 +1,5 @@
-import { createAmazonBedrock } from '@ai-sdk/amazon-bedrock';
-import { createAnthropic } from '@ai-sdk/anthropic';
-import { createAzure } from '@ai-sdk/azure';
-import { createVertex } from '@ai-sdk/google-vertex';
-import { createOpenAI } from '@ai-sdk/openai';
-import { createPerplexity } from '@ai-sdk/perplexity';
-import { ValidationError, z } from '@outputai/core';
-import { Agent, fetch } from 'undici';
-
-const dispatcher = new Agent( {
-  headersTimeout: 15 * 60 * 1000, // 15 min
-  bodyTimeout: 15 * 60 * 1000
-} );
-
-const customFetch = ( input, init ) => fetch( input, { dispatcher, ...init } );
-const initProvider = factory => factory( { fetch: customFetch } );
-
-export const builtInProviders = {
-  azure: initProvider( createAzure ),
-  anthropic: initProvider( createAnthropic ),
-  openai: initProvider( createOpenAI ),
-  vertex: initProvider( createVertex ),
-  bedrock: initProvider( createAmazonBedrock ),
-  perplexity: initProvider( createPerplexity )
-};
-
-export const providers = { ...builtInProviders };
-
-const registerProviderSchema = z.object( {
-  name: z.string().min( 1, 'Provider name must be a non-empty string' ),
-  providerFn: z.function()
-} );
-
-const modelPromptSchema = z.object( {
-  config: z.object( {
-    provider: z.string().min( 1 ),
-    model: z.string().min( 1 )
-  } ).loose()
-} ).loose();
-
-const toolsPromptSchema = z.object( {
-  config: z.object( {
-    provider: z.string().min( 1 ),
-    tools: z.record( z.string(), z.record( z.string(), z.unknown() ) ).optional()
-  } ).loose()
-} ).loose();
-
-const toolConfigSchema = z.record( z.string(), z.unknown() );
-
-const parseModelPrompt = prompt => {
-  const result = modelPromptSchema.safeParse( prompt );
-  if ( !result.success ) {
-    throw new ValidationError( `Invalid model prompt config: ${z.prettifyError( result.error )}` );
-  }
-  return result.data.config;
-};
-
-const parseToolsPrompt = prompt => {
-  const result = toolsPromptSchema.safeParse( prompt );
-  if ( !result.success ) {
-    throw new ValidationError( `Invalid tools prompt config: ${z.prettifyError( result.error )}` );
-  }
-  return result.data.config;
-};
-
-/**
- * Register or override an AI SDK provider factory by name.
- *
- * @param {string} name - Provider name used in prompt frontmatter
- * @param {Function} providerFn - Factory function that receives a model id
- * @returns {void}
- */
-export function registerProvider( name, providerFn ) {
-  const result = registerProviderSchema.safeParse( { name, providerFn } );
-  if ( !result.success ) {
-    throw new ValidationError( `Invalid provider registration: ${z.prettifyError( result.error )}` );
-  }
-  providers[name] = providerFn;
-}
-
-/**
- * List all currently registered provider names.
- *
- * @returns {string[]} Provider names
- */
-export const getRegisteredProviders = () => Object.keys( providers );
+import { ValidationError } from '@outputai/core';
+import { getProvider } from './ai_provider.js';
 
 /**
  * Load a text model from a loaded prompt config.
@@ -91,19 +7,7 @@ export const getRegisteredProviders = () => Object.keys( providers );
  * @param {object} prompt - Loaded prompt object with `config.provider` and `config.model`
  * @returns {unknown} AI SDK language model
  */
-export function loadTextModel( prompt ) {
-  const config = parseModelPrompt( prompt );
-  const { provider: providerName, model: modelName } = config;
-
-  const provider = providers[providerName];
-
-  if ( !provider ) {
-    const availableProviders = Object.keys( providers ).join( ', ' );
-    throw new Error( `Invalid provider "${providerName}". Valid providers: ${availableProviders}` );
-  }
-
-  return provider( modelName );
-}
+export const loadTextModel = prompt => getProvider( prompt.config.provider )( prompt.config.model );
 
 /**
  * Load an image model from a loaded prompt config.
@@ -111,24 +15,16 @@ export function loadTextModel( prompt ) {
  * @param {object} prompt - Loaded prompt object with `config.provider` and `config.model`
  * @returns {unknown} AI SDK image model
  */
-export function loadImageModel( prompt ) {
-  const config = parseModelPrompt( prompt );
-  const { provider: providerName, model: modelName } = config;
-
-  const provider = providers[providerName];
-
-  if ( !provider ) {
-    const availableProviders = Object.keys( providers ).join( ', ' );
-    throw new Error( `Invalid provider "${providerName}". Valid providers: ${availableProviders}` );
-  }
+export const loadImageModel = prompt => {
+  const { provider: providerName, model } = prompt.config;
+  const provider = getProvider( prompt.config.provider );
 
   const imageModelFactory = provider.image ?? provider.imageModel;
   if ( typeof imageModelFactory !== 'function' ) {
-    throw new Error( `Provider "${providerName}" does not support image models.` );
+    throw new ValidationError( `Provider "${providerName}" does not support image models.` );
   }
-
-  return imageModelFactory( modelName );
-}
+  return imageModelFactory( model );
+};
 
 /**
  * Load provider-specific tools configured in a prompt.
@@ -136,46 +32,29 @@ export function loadImageModel( prompt ) {
  * @param {object} prompt - Loaded prompt object with `config.provider` and optional `config.tools`
  * @returns {Record<string, unknown> | null} AI SDK tools, or null when none are configured
  */
-export function loadTools( prompt ) {
-  const config = parseToolsPrompt( prompt );
-  const { tools: toolsConfig, provider: providerName } = config;
+export const loadTools = prompt => {
+  const { tools: promptTools, provider: providerName } = prompt.config;
 
-  if ( !toolsConfig || Object.keys( toolsConfig ).length === 0 ) {
+  if ( Object.keys( promptTools ?? {} ).length === 0 ) {
     return null;
   }
 
-  const provider = providers[providerName];
-
-  if ( !provider ) {
-    const availableProviders = Object.keys( providers ).join( ', ' );
-    throw new Error( `Invalid provider "${providerName}". Valid providers: ${availableProviders}` );
-  }
+  const provider = getProvider( providerName );
 
-  if ( !provider.tools || typeof provider.tools !== 'object' ) {
-    throw new Error( `Provider "${providerName}" does not support provider-specific tools.` );
+  if ( !provider.tools ) {
+    throw new ValidationError( `Provider "${providerName}" does not support provider-specific tools.` );
   }
 
-  const tools = {};
+  const supportedTools = Object.keys( provider.tools );
+  const invalidTools = Object.keys( promptTools ).filter( name => !supportedTools.includes( name ) );
 
-  for ( const [ toolName, toolConfig ] of Object.entries( toolsConfig ) ) {
-    const toolFactory = provider.tools[toolName];
-
-    if ( !toolFactory || typeof toolFactory !== 'function' ) {
-      const availableTools = Object.keys( provider.tools )
-        .filter( key => typeof provider.tools[key] === 'function' )
-        .join( ', ' );
-      const toolsMessage = availableTools ? `Available tools: ${availableTools}` : 'No tools are available';
-
-      throw new Error( `Unknown tool "${toolName}" for provider "${providerName}". ${toolsMessage}` );
-    }
-
-    const result = toolConfigSchema.safeParse( toolConfig );
-    if ( !result.success ) {
-      throw new ValidationError( `Invalid config for tool "${toolName}": ${z.prettifyError( result.error )}` );
-    }
-
-    tools[toolName] = toolFactory( toolConfig );
+  if ( invalidTools.length > 0 ) {
+    throw new ValidationError( `Invalid tool(s) ${invalidTools.join( ', ' )} for provider "${providerName}". \
+Available: ${supportedTools.join( ', ' )}.` );
   }
 
-  return tools;
-}
+  // load all tools and return in an object
+  return Object.fromEntries(
+    Object.entries( promptTools ).map( ( [ name, args ] ) => [ name, provider.tools[name]( args ) ] )
+  );
+};