@outputai/llm 0.8.2-next.e1cd79b.0 → 0.8.2-next.ec4c07d.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@outputai/llm",
-  "version": "0.8.2-next.e1cd79b.0",
+  "version": "0.8.2-next.ec4c07d.0",
   "description": "Framework abstraction to interact with LLM models",
   "type": "module",
   "main": "src/index.js",
@@ -12,26 +12,26 @@
     "entities": "8.0.0",
     "gray-matter": "4.0.3",
     "liquidjs": "10.25.7",
-    "undici": "8.1.0",
-    "@outputai/core": "0.8.2-next.e1cd79b.0"
+    "undici": "8.5.0",
+    "@outputai/core": "0.8.2-next.ec4c07d.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"
+    "@ai-sdk/perplexity": "3.0.33",
+    "ai": "6.0.168"
   },
   "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"
+    "@ai-sdk/perplexity": ">=3 <4",
+    "ai": ">=6 <7"
   },
   "license": "Apache-2.0",
   "publishConfig": {

package/src/agent.js

@@ -1,5 +1,5 @@
 import { ValidationError } from '@outputai/core';
-import { resolveInvocationDir } from '@outputai/core/sdk_utils';
+import { Path } from '@outputai/core/sdk/helpers';
 import { ToolLoopAgent as AIToolLoopAgent, stepCountIs } from 'ai';
 import { loadAiSdkTextOptions } from './ai_sdk_options.js';
 import { prepareTextPrompt } from './prompt/prepare_text.js';
@@ -38,8 +38,8 @@ export class Agent extends AIToolLoopAgent {
     }
 
     // Must be captured synchronously — Temporal async activity execution
-    // breaks the call stack, so resolveInvocationDir() fails if called lazily.
-    const resolvedPromptDir = promptDir ?? resolveInvocationDir();
+    // breaks the call stack, so Path.resolveInvocationDir() fails if called lazily.
+    const resolvedPromptDir = promptDir ?? Path.resolveInvocationDir();
 
     const { loadedPrompt, tools } = prepareTextPrompt( { prompt, variables, promptDir: resolvedPromptDir, skills, tools: toolsArg } );
 

package/src/agent.spec.js

@@ -46,8 +46,10 @@ vi.mock( '@outputai/core', () => ( {
   ValidationError: coreMocks.ValidationError
 } ) );
 
-vi.mock( '@outputai/core/sdk_utils', () => ( {
-  resolveInvocationDir: () => state.invocationDir
+vi.mock( '@outputai/core/sdk/helpers', () => ( {
+  Path: {
+    resolveInvocationDir: () => state.invocationDir
+  }
 } ) );
 
 vi.mock( 'ai', () => {

package/src/cost/fetch_models_pricing.js

@@ -1,3 +1,5 @@
+import { Logger } from '@outputai/core';
+
 const costTableUrl = 'https://models.dev/api.json';
 const cacheTTL = 1000 * 60 * 60 * 24; // 1 day
 
@@ -26,10 +28,10 @@ export const fetchModelsPricing = async () => {
   const res = await fetch( costTableUrl );
   if ( !res.ok ) {
     if ( cache.content ) {
-      console.warn( `Error ${res.status} when fetching models pricing at ${costTableUrl}, falling back to stale cache` );
+      Logger.warn( `Error ${res.status} when fetching models pricing at ${costTableUrl}, falling back to stale cache`, { namespace: 'LLM' } );
       return cache.content;
     }
-    console.error( `Error ${res.status} when fetching models pricing at ${costTableUrl}` );
+    Logger.error( `Error ${res.status} when fetching models pricing at ${costTableUrl}`, { namespace: 'LLM' } );
     return null;
   }
   cache.content = buildModelMap( await res.json() );

package/src/cost/fetch_models_pricing.spec.js

@@ -9,24 +9,29 @@ const fixturePath = join( __dirname, 'fixtures', 'models_api_light.json' );
 const fixture = JSON.parse( readFileSync( fixturePath, 'utf8' ) );
 
 const costTableUrl = 'https://models.dev/api.json';
-const errNoCache = status => `Error ${status} when fetching models pricing at ${costTableUrl}`;
-const warnStaleCache = status => `Error ${status} when fetching models pricing at ${costTableUrl}, falling back to stale cache`;
+const okResponse = data => ( {
+  ok: true,
+  json: () => Promise.resolve( data )
+} );
+const stubFetch = response => {
+  const fetchMock = vi.fn().mockResolvedValue( response );
+  vi.stubGlobal( 'fetch', fetchMock );
+  return fetchMock;
+};
 
 describe( 'fetchModelsPricing', () => {
   beforeEach( () => {
     cache.content = null;
     cache.expiresAt = 0;
-    vi.restoreAllMocks();
+    vi.unstubAllGlobals();
   } );
 
   it( 'returns a Map of model costs when fetch succeeds', async () => {
-    vi.stubGlobal( 'fetch', vi.fn().mockResolvedValue( {
-      ok: true,
-      json: () => Promise.resolve( fixture )
-    } ) );
+    const fetchMock = stubFetch( okResponse( fixture ) );
 
     const result = await fetchModelsPricing();
 
+    expect( fetchMock ).toHaveBeenCalledWith( costTableUrl );
     expect( result ).toBeInstanceOf( Map );
     expect( result.size ).toBeGreaterThan( 0 );
     const firstModel = Object.values( fixture )[0];
@@ -37,10 +42,7 @@ describe( 'fetchModelsPricing', () => {
   } );
 
   it( 'includes main providers from fixture (openai, anthropic, google, nvidia, perplexity)', async () => {
-    vi.stubGlobal( 'fetch', vi.fn().mockResolvedValue( {
-      ok: true,
-      json: () => Promise.resolve( fixture )
-    } ) );
+    stubFetch( okResponse( fixture ) );
 
     const result = await fetchModelsPricing();
 
@@ -55,47 +57,35 @@ describe( 'fetchModelsPricing', () => {
 
   it( 'returns null when response is not ok and no cache', async () => {
     const status = 500;
-    const err = vi.spyOn( console, 'error' ).mockImplementation( () => {} );
-    vi.stubGlobal( 'fetch', vi.fn().mockResolvedValue( { ok: false, status } ) );
+    stubFetch( { ok: false, status } );
 
     const result = await fetchModelsPricing();
 
     expect( result ).toBeNull();
-    expect( err ).toHaveBeenCalledWith( errNoCache( status ) );
-    err.mockRestore();
   } );
 
   it( 'returns stale cache when response is not ok but cache exists', async () => {
-    vi.stubGlobal( 'fetch', vi.fn().mockResolvedValue( {
-      ok: true,
-      json: () => Promise.resolve( fixture )
-    } ) );
+    stubFetch( okResponse( fixture ) );
     await fetchModelsPricing();
     cache.expiresAt = 0; // force refetch so we hit the !res.ok path
 
     const status = 404;
-    const warn = vi.spyOn( console, 'warn' ).mockImplementation( () => {} );
-    vi.stubGlobal( 'fetch', vi.fn().mockResolvedValue( { ok: false, status } ) );
+    stubFetch( { ok: false, status } );
 
     const result = await fetchModelsPricing();
 
     expect( result ).toBeInstanceOf( Map );
     expect( result.size ).toBeGreaterThan( 0 );
-    expect( warn ).toHaveBeenCalledWith( warnStaleCache( status ) );
-    warn.mockRestore();
   } );
 
   it( 'returns cached Map when cache is still valid', async () => {
-    vi.stubGlobal( 'fetch', vi.fn().mockResolvedValue( {
-      ok: true,
-      json: () => Promise.resolve( fixture )
-    } ) );
+    const fetchMock = stubFetch( okResponse( fixture ) );
 
     const first = await fetchModelsPricing();
     const second = await fetchModelsPricing();
 
     expect( first ).toBe( second );
-    expect( fetch ).toHaveBeenCalledTimes( 1 );
+    expect( fetchMock ).toHaveBeenCalledTimes( 1 );
   } );
 
   it( 'only stores models that have a cost object', async () => {
@@ -108,10 +98,7 @@ describe( 'fetchModelsPricing', () => {
         }
       }
     };
-    vi.stubGlobal( 'fetch', vi.fn().mockResolvedValue( {
-      ok: true,
-      json: () => Promise.resolve( dataWithMissingCost )
-    } ) );
+    stubFetch( okResponse( dataWithMissingCost ) );
 
     const result = await fetchModelsPricing();
 

package/src/cost/index.js

@@ -1,5 +1,6 @@
 import { fetchModelsPricing } from './fetch_models_pricing.js';
-import { Tracing } from '@outputai/core/sdk_activity_integration';
+import { Tracing } from '@outputai/core/sdk/runtime';
+import { Logger } from '@outputai/core';
 
 /**
  * Calculates the cost of an llm call based on the model and usage.
@@ -13,13 +14,13 @@ export const calculateLLMCallCost = async ( { modelId, usage } ) => {
     const models = await fetchModelsPricing();
 
     if ( !models ) {
-      console.warn( 'Failed to fetch models pricing' );
+      Logger.warn( 'Failed to fetch models pricing', { namespace: 'LLM' } );
       return null;
     }
 
     const pricing = models.get( modelId );
     if ( !pricing ) {
-      console.warn( 'Missing cost reference for model' );
+      Logger.warn( 'Missing cost reference for model', { namespace: 'LLM' } );
       return null;
     }
 
@@ -50,7 +51,7 @@ export const calculateLLMCallCost = async ( { modelId, usage } ) => {
 
     return llmUsage;
   } catch ( error ) {
-    console.error( 'Error calculating LLM call costs', error );
+    Logger.error( 'Error calculating LLM call costs', { error: error.message, namespace: 'LLM' } );
     return null;
   }
 };

package/src/cost/index.spec.js

@@ -6,7 +6,7 @@ vi.mock( './fetch_models_pricing.js', () => ( {
   fetchModelsPricing: ( ...args ) => mockFetchModelsPricing( ...args )
 } ) );
 
-vi.mock( '@outputai/core/sdk_activity_integration', () => {
+vi.mock( '@outputai/core/sdk/runtime', () => {
   class LLMUsage {
     static TYPE = 'llm:usage';
     type = LLMUsage.TYPE;
@@ -44,7 +44,7 @@ vi.mock( '@outputai/core/sdk_activity_integration', () => {
   };
 } );
 
-import { Tracing } from '@outputai/core/sdk_activity_integration';
+import { Tracing } from '@outputai/core/sdk/runtime';
 import { calculateLLMCallCost } from './index.js';
 
 const expectLLMUsage = ( result, { modelId, usage, total, tokensUsed } ) => {
@@ -61,8 +61,6 @@ const expectLLMUsage = ( result, { modelId, usage, total, tokensUsed } ) => {
 describe( 'calculateLLMCallCost', () => {
   beforeEach( () => {
     vi.clearAllMocks();
-    vi.spyOn( console, 'warn' ).mockImplementation( () => {} );
-    vi.spyOn( console, 'error' ).mockImplementation( () => {} );
   } );
 
   afterEach( () => {
@@ -78,7 +76,6 @@ describe( 'calculateLLMCallCost', () => {
     } );
 
     expect( result ).toBeNull();
-    expect( console.warn ).toHaveBeenCalledWith( 'Failed to fetch models pricing' );
   } );
 
   it( 'returns null when model is missing from cost table', async () => {
@@ -90,7 +87,6 @@ describe( 'calculateLLMCallCost', () => {
     } );
 
     expect( result ).toBeNull();
-    expect( console.warn ).toHaveBeenCalledWith( 'Missing cost reference for model' );
   } );
 
   it( 'calculates input and output usage from model pricing', async () => {
@@ -283,6 +279,5 @@ describe( 'calculateLLMCallCost', () => {
     } );
 
     expect( result ).toBeNull();
-    expect( console.error ).toHaveBeenCalledWith( 'Error calculating LLM call costs', error );
   } );
 } );

package/src/prompt/escape.js

@@ -1,5 +1,5 @@
 import { encodeXML, decodeXML } from 'entities';
-import { isPlainObject } from '@outputai/core/sdk_utils';
+import { Objects } from '@outputai/core/sdk/helpers';
 
 const VAR_SAFE_FILTER = '__var_safe';
 
@@ -56,7 +56,7 @@ export const decode = value => {
   if ( Array.isArray( value ) ) {
     return value.map( decode );
   }
-  if ( isPlainObject( value ) ) {
+  if ( Objects.isPlainObject( value ) ) {
     return Object.fromEntries(
       Object.entries( value ).map( ( [ k, v ] ) => [ k, decode( v ) ] )
     );

package/src/prompt/load_content.js

@@ -1,6 +1,6 @@
 import { join } from 'path';
 import { readdirSync, readFileSync } from 'node:fs';
-import { resolveInvocationDir } from '@outputai/core/sdk_utils';
+import { Path } from '@outputai/core/sdk/helpers';
 import { FatalError } from '@outputai/core';
 
 const scanDir = dir => {
@@ -41,5 +41,5 @@ const findContent = ( name, dir ) => {
  * @param {string} [dir] - Directory to search, defaults to invocation directory
  * @returns {{ content: string, dir: string } | null}
  */
-export const loadContent = ( name, dir = resolveInvocationDir() ) =>
+export const loadContent = ( name, dir = Path.resolveInvocationDir() ) =>
   findContent( name, dir ) ?? null;

package/src/prompt/load_content.spec.js

@@ -6,9 +6,11 @@ import { tmpdir } from 'node:os';
 // Hoisted state so mocks can read dynamic values set in tests
 const state = vi.hoisted( () => ( { dir: '', entries: {} } ) );
 
-// Mock core utils to control resolveInvocationDir
-vi.mock( '@outputai/core/sdk_utils', () => ( {
-  resolveInvocationDir: () => state.dir
+// Mock SDK helpers to control resolveInvocationDir
+vi.mock( '@outputai/core/sdk/helpers', () => ( {
+  Path: {
+    resolveInvocationDir: () => state.dir
+  }
 } ) );
 
 // Mock node:fs.readFileSync for directory scans while delegating file reads

package/src/prompt/validations.js

@@ -1,4 +1,4 @@
-import { ValidationError, z } from '@outputai/core';
+import { Logger, ValidationError, z } from '@outputai/core';
 import { attributesSchema } from './block_options.js';
 
 const toolConfigSchema = z.record( z.string(), z.unknown() );
@@ -70,12 +70,12 @@ const SNAKE_CASE_WARNINGS = {
 function warnSnakeCaseFields( config ) {
   for ( const [ snake, camel ] of Object.entries( SNAKE_CASE_WARNINGS ) ) {
     if ( Object.hasOwn( config, snake ) ) {
-      console.warn( `[output-llm] "${snake}" found in prompt config. Did you mean "${camel}"?` );
+      Logger.warn( `[output-llm] "${snake}" found in prompt config. Did you mean "${camel}"?`, { namespace: 'LLM' } );
     }
   }
   const thinking = config.providerOptions?.thinking;
   if ( thinking && Object.hasOwn( thinking, 'budget_tokens' ) ) {
-    console.warn( '[output-llm] "budget_tokens" found in providerOptions.thinking. Did you mean "budgetTokens"?' );
+    Logger.warn( '[output-llm] "budget_tokens" found in providerOptions.thinking. Did you mean "budgetTokens"?', { namespace: 'LLM' } );
   }
 }
 

package/src/prompt/validations.spec.js

@@ -1,4 +1,4 @@
-import { describe, it, expect, vi } from 'vitest';
+import { describe, it, expect } from 'vitest';
 import { ValidationError } from '@outputai/core';
 import { validatePrompt } from './validations.js';
 
@@ -548,8 +548,6 @@ describe( 'validatePrompt', () => {
   } );
 
   it( 'should pass through budget_tokens in thinking and warn about snake_case', () => {
-    const warnSpy = vi.spyOn( console, 'warn' ).mockImplementation( () => {} );
-
     const promptWithBudgetTokensSnake = {
       name: 'thinking-budget-snake',
       config: {
@@ -571,11 +569,6 @@ describe( 'validatePrompt', () => {
     };
 
     expect( () => validatePrompt( promptWithBudgetTokensSnake ) ).not.toThrow();
-    expect( warnSpy ).toHaveBeenCalledWith(
-      '[output-llm] "budget_tokens" found in providerOptions.thinking. Did you mean "budgetTokens"?'
-    );
-
-    warnSpy.mockRestore();
   } );
 
   it( 'should allow snake_case fields in config via passthrough (no longer strict)', () => {

package/src/utils/trace.js

@@ -1,4 +1,4 @@
-import { Tracing, emitEvent } from '@outputai/core/sdk_activity_integration';
+import { Tracing, Event } from '@outputai/core/sdk/runtime';
 
 export const startTrace = ( { name, ...details } ) => {
   const traceId = `${name}-${Date.now()}`;
@@ -13,7 +13,7 @@ export const endTraceWithError = ( { traceId, error } ) => {
 export const endTraceWithSuccess = ( { traceId, result, cost, ...extra } ) => {
   if ( cost ) {
     Tracing.addEventAttribute( { eventId: traceId, attribute: cost } );
-    emitEvent( 'cost:llm:request', cost );
+    Event.emit( 'cost:llm:request', cost );
   }
   Tracing.addEventEnd( { id: traceId, details: { result, ...extra } } );
 };

package/src/utils/trace.spec.js

@@ -1,19 +1,22 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 
-vi.mock( '@outputai/core/sdk_activity_integration', () => ( {
+vi.mock( '@outputai/core/sdk/runtime', () => ( {
   Tracing: {
     addEventStart: vi.fn(),
     addEventError: vi.fn(),
     addEventAttribute: vi.fn(),
     addEventEnd: vi.fn()
   },
-  emitEvent: vi.fn()
+  Event: {
+    emit: vi.fn()
+  }
 } ) );
 
-import { Tracing, emitEvent } from '@outputai/core/sdk_activity_integration';
+import { Tracing, Event } from '@outputai/core/sdk/runtime';
 import { startTrace, endTraceWithError, endTraceWithSuccess } from './trace.js';
 
 const tracing = vi.mocked( Tracing, true );
+const event = vi.mocked( Event, true );
 
 describe( 'trace utils', () => {
   beforeEach( () => {
@@ -69,7 +72,7 @@ describe( 'trace utils', () => {
         eventId: 'trace-a',
         attribute: cost
       } );
-      expect( emitEvent ).toHaveBeenCalledWith( 'cost:llm:request', cost );
+      expect( event.emit ).toHaveBeenCalledWith( 'cost:llm:request', cost );
       expect( tracing.addEventEnd ).toHaveBeenCalledWith( {
         id: 'trace-a',
         details: {
@@ -94,7 +97,7 @@ describe( 'trace utils', () => {
       } );
 
       expect( tracing.addEventAttribute ).not.toHaveBeenCalled();
-      expect( emitEvent ).not.toHaveBeenCalled();
+      expect( event.emit ).not.toHaveBeenCalled();
       expect( tracing.addEventEnd ).toHaveBeenCalledWith( {
         id: 'trace-no-cost',
         details: {