@outputai/llm 0.8.2-next.42a0ddf.0 → 0.8.2-next.ad732b1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@outputai/llm",
-  "version": "0.8.2-next.42a0ddf.0",
+  "version": "0.8.2-next.ad732b1.0",
   "description": "Framework abstraction to interact with LLM models",
   "type": "module",
   "main": "src/index.js",
@@ -13,7 +13,7 @@
     "gray-matter": "4.0.3",
     "liquidjs": "10.25.7",
     "undici": "8.1.0",
-    "@outputai/core": "0.8.2-next.42a0ddf.0"
+    "@outputai/core": "0.8.2-next.ad732b1.0"
   },
   "devDependencies": {
     "ai": "6.0.168",

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/index.js

@@ -1,5 +1,5 @@
 import { fetchModelsPricing } from './fetch_models_pricing.js';
-import { Tracing } from '@outputai/core/sdk_activity_integration';
+import { Tracing } from '@outputai/core/sdk/runtime';
 
 /**
  * Calculates the cost of an llm call based on the model and usage.

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 } ) => {

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/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: {