@outputai/llm 0.11.1-next.da26845.0 → 0.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@outputai/llm",
-  "version": "0.11.1-next.da26845.0",
+  "version": "0.12.0",
   "description": "Framework abstraction to interact with LLM models",
   "type": "module",
   "main": "src/index.js",
@@ -9,7 +9,11 @@
     "node": ">=24.15.0"
   },
   "files": [
-    "./src"
+    "./src/!(*.spec).js",
+    "./src/index.d.ts",
+    "./src/prompt/!(*.spec).js",
+    "./src/prompt/markup/!(*.spec).js",
+    "./src/utils/!(*.spec).js"
   ],
   "dependencies": {
     "decimal.js": "10.6.0",
@@ -17,7 +21,7 @@
     "gray-matter": "4.0.3",
     "liquidjs": "10.27.2",
     "undici": "8.9.0",
-    "@outputai/core": "0.11.1-next.da26845.0"
+    "@outputai/core": "0.12.0"
   },
   "devDependencies": {
     "@ai-sdk/amazon-bedrock": "5.0.57",

package/src/agent.js

@@ -58,7 +58,9 @@ export class Agent {
           ...( abortSignal && { abortSignal } ),
           ...( toolChoice && { toolChoice } )
         } );
-        await this.#storeMessages( messages.concat( response.responseMessages ?? [] ) );
+        if ( response.finishReason !== 'error' ) {
+          await this.#storeMessages( messages.concat( response.responseMessages ?? [] ) );
+        }
         return response;
       }
     } );
@@ -95,7 +97,9 @@ export class Agent {
         }
 
         state.response.output = await stream.output;
-        await this.#storeMessages( messages.concat( state.response.responseMessages ?? [] ) );
+        if ( state.response.finishReason !== 'error' ) {
+          await this.#storeMessages( messages.concat( state.response.responseMessages ?? [] ) );
+        }
 
         return state.response;
       }
@@ -109,6 +113,7 @@ export class Agent {
     return wrapStream( {
       name: 'Agent.stream',
       prompt: this.#prompt,
+      abortSignal,
       fn: ( { onEndHook, onErrorHook } ) => this.#agent.stream( {
         messages: combinedMessages,
         allowSystemInMessages: true,

package/src/generate.js

@@ -26,6 +26,7 @@ export const streamText = args => {
   return wrapStream( {
     name: 'streamText',
     prompt,
+    abortSignal: aiOptions.abortSignal,
     fn: ( { onEndHook, onErrorHook } ) => AI.streamText( {
       ...loadAiSdkTextOptions( { prompt, skills, ...aiOptions } ),
       ...( onChunk && { onChunk } ),

package/src/index.d.ts

@@ -281,12 +281,20 @@ export type GenerateImageInput =
     mediaType?: string;
   };
 
+type GenerateImageInputs =
+  | {
+    /** Runtime image inputs for image-to-image generation */
+    images: GenerateImageInput[];
+    /** Optional mask for image editing */
+    mask?: GenerateImageInput;
+  } |
+  {
+    images?: undefined;
+    mask?: never;
+  };
+
 /** Parameters accepted by {@link generateImage}. */
-export type GenerateImageParameters = PromptCallOptions & {
-  /** Runtime image inputs for image-to-image generation */
-  images?: GenerateImageInput[];
-  /** Optional mask for image editing; requires `images` */
-  mask?: GenerateImageInput;
+export type GenerateImageParameters = PromptCallOptions & GenerateImageInputs & {
   /** Abort signal for the request */
   abortSignal?: AbortSignal;
 };
@@ -493,7 +501,7 @@ export function getProviderNames(): string[];
  * Use an LLM model to generate text.
  *
  * This function is a wrapper over the AI SDK's `generateText`.
- * The prompt sets `model`, `messages`, `temperature`, `maxTokens`, `maxSteps`, `skills`, and
+ * The prompt sets `model`, `messages`, generation settings, `maxSteps`, `skills`, and
  * `providerOptions`. Pass either a prompt filename with optional `promptDir` / `variables`, or a
  * loaded or custom {@link Prompt} object. Other call arguments are `tools`, `output`, `toolChoice`,
  * `stopWhen`, and `abortSignal`.

package/src/utils/wrap.js

@@ -7,6 +7,7 @@ import { mapAiError } from './error_handler.js';
 import { isPromise } from 'node:util/types';
 import { Logger } from '@outputai/core';
 import { convertCostToLegacy } from './legacy_cost_attribute.js';
+import { randomBytes } from 'node:crypto';
 
 /** Creates a proxy of the AI SDK response and attach virtual getters to it based on an object map */
 const createResponseProxy = ( { response, properties } ) => new Proxy( response, {
@@ -17,7 +18,7 @@ const createResponseProxy = ( { response, properties } ) => new Proxy( response,
 
 /** Generate a trace id, starts the tracing and return the id */
 const startTrace = ( { name, prompt } ) => {
-  const traceId = `${name}-${Date.now()}`;
+  const traceId = `${name}-${Date.now()}-${randomBytes( 4 ).toString( 'hex' )}`;
   Tracing.addEventStart( { kind: 'llm', id: traceId, name, details: { prompt } } );
   return traceId;
 };
@@ -105,20 +106,48 @@ export const wrapGeneration = async ( { name, prompt, fn } ) => {
  *
  * A throw or rejected Promise from `fn` (stream creation / Agent setup) is mapped and recorded
  * on the LLM trace. A non-Promise return (the `streamText` stream) is returned immediately.
+ * When `abortSignal` aborts, its reason is recorded as an LLM trace error. The listener is removed
+ * when the stream ends, reports an error, or fails during setup.
  *
  * @param {object} args
  * @param {string} args.name - Trace event name
  * @param {object} args.prompt - Loaded prompt (`config.provider` / `config.model` used for cost)
+ * @param {AbortSignal} [args.abortSignal] - Optional signal used to trace stream cancellation
  * @param {(hooks: { onEndHook: Function, onErrorHook: Function }) => object | Promise<object>} args.fn -
  *   Return the SDK stream, or a Promise of that stream (`Agent.stream`); wire the hooks into SDK
  *   `onEnd` / `onError`
  * @returns {object | Promise<object>} Value returned by `fn`; a rejected Promise is remapped
  */
-export const wrapStream = ( { name, prompt, fn } ) => {
+export const wrapStream = ( { name, prompt, abortSignal, fn } ) => {
   const traceId = startTrace( { name, prompt } );
 
+  const onAbortHook = reason =>
+    handleError( {
+      traceId,
+      error: reason instanceof Error ? reason : new Error( 'Streaming aborted.', { cause: reason } )
+    } );
+
+  const handleAbort = () => {
+    if ( !abortSignal ) {
+      return () => {};
+    }
+
+    if ( abortSignal.aborted ) {
+      onAbortHook( abortSignal.reason );
+      return () => {};
+    }
+
+    const listener = () => onAbortHook( abortSignal.reason );
+    abortSignal.addEventListener( 'abort', listener, { once: true } );
+
+    return () => abortSignal.removeEventListener( 'abort', listener );
+  };
+
+  const removeAbortListener = handleAbort();
+
   const onEndHook = async ( response, callback ) => {
     const state = { proxyResponse: null };
+    removeAbortListener();
     try {
       const { text: result, finalStep, usage } = response;
       const { providerMetadata } = finalStep;
@@ -127,6 +156,7 @@ export const wrapStream = ( { name, prompt, fn } ) => {
       Tracing.addEventEnd( { id: traceId, details: { result, usage, providerMetadata, sources } } );
       state.proxyResponse = createResponseProxy( { response, properties: { cost, sources, result } } );
     } catch ( error ) {
+      Logger.error( 'Stream onEnd() handler failed', { namespace: 'LLM', error: error?.message ?? String( error ) } );
       throw handleError( { traceId, error } );
     }
 
@@ -143,6 +173,7 @@ export const wrapStream = ( { name, prompt, fn } ) => {
 
   const onErrorHook = async ( event, callback ) => {
     const error = handleError( { traceId, error: event.error } );
+    removeAbortListener();
     try {
       await callback?.( error );
     } catch ( callbackError ) {
@@ -157,9 +188,11 @@ export const wrapStream = ( { name, prompt, fn } ) => {
   try {
     const stream = fn( { onEndHook, onErrorHook } );
     return isPromise( stream ) ? stream.catch( error => {
+      removeAbortListener();
       throw handleError( { traceId, error } );
     } ) : stream;
   } catch ( error ) {
+    removeAbortListener();
     throw handleError( { traceId, error } );
   }
 };