@gammatech/aijsx 0.4.0-beta.6 → 0.4.0-beta.8

package/dist/{createElement-M3MXUt8O.d.mts → createElement-VpIrgHrz.d.mts}

@@ -202,12 +202,12 @@ type Logger = {
     info: (...msg: Loggable[]) => void;
     debug: (...msg: Loggable[]) => void;
     logException: (exception: unknown) => void;
-    chainStart(payload: LogChainStart): void;
-    chainComplete(payload: LogChainComplete): void;
-    chainError(payload: LogChainError): void;
-    promptStart(payload: LogPromptStart): void;
-    promptComplete(payload: LogPromptComplete): void;
-    promptError(payload: LogPromptError): void;
+    chainStart(chain: FunctionChain | StreamChain, payload: LogChainStart): void;
+    chainComplete(chain: FunctionChain | StreamChain, payload: LogChainComplete): void;
+    chainError(chain: FunctionChain | StreamChain, payload: LogChainError): void;
+    promptStart(prompt: Prompt, payload: LogPromptStart): void;
+    promptComplete(prompt: Prompt, payload: LogPromptComplete): void;
+    promptError(prompt: Prompt, payload: LogPromptError): void;
     chatCompletionRequest: <K extends keyof ChatCompletionRequestPayloads>(provider: K, payload: LogChatCompletionRequest<ChatCompletionRequestPayloads[K]>) => void;
     chatCompletionResponse: <K extends keyof ChatCompletionRequestPayloads>(provider: K, payload: LogChatCompletionResponse<ChatCompletionRequestPayloads[K]>) => void;
 };
@@ -223,12 +223,12 @@ declare abstract class LogImplementation {
      * Logs exceptions thrown during an element's render.
      */
     logException(ctx: RenderTraceInfo, exception: unknown): void;
-    chainStart(_ctx: RenderTraceInfo, _payload: LogChainStart): void;
-    chainComplete(_ctx: RenderTraceInfo, _payload: LogChainComplete): void;
-    chainError(_ctx: RenderTraceInfo, _payload: LogChainError): void;
-    promptStart(_ctx: RenderTraceInfo, _payload: LogPromptStart): void;
-    promptComplete(_ctx: RenderTraceInfo, _payload: LogPromptComplete): void;
-    promptError(_ctx: RenderTraceInfo, _payload: LogPromptError): void;
+    chainStart(_ctx: RenderTraceInfo, _chain: FunctionChain | StreamChain, _payload: LogChainStart): void;
+    chainComplete(_ctx: RenderTraceInfo, _chain: FunctionChain | StreamChain, _payload: LogChainComplete): void;
+    chainError(_ctx: RenderTraceInfo, _chain: FunctionChain | StreamChain, _payload: LogChainError): void;
+    promptStart(_ctx: RenderTraceInfo, _prompt: Prompt, _payload: LogPromptStart): void;
+    promptComplete(_ctx: RenderTraceInfo, _prompt: Prompt, _payload: LogPromptComplete): void;
+    promptError(_ctx: RenderTraceInfo, _prompt: Prompt, _payload: LogPromptError): void;
     chatCompletionRequest<K extends keyof ChatCompletionRequestPayloads>(_ctx: RenderTraceInfo, _provider: K, _payload: LogChatCompletionRequest<ChatCompletionRequestPayloads[K]>): void;
     chatCompletionResponse<K extends keyof ChatCompletionRequestPayloads>(_ctx: RenderTraceInfo, _provider: K, _payload: LogChatCompletionResponse<ChatCompletionRequestPayloads[K]>): void;
 }
@@ -236,12 +236,12 @@ declare class BoundLogger implements Logger {
     private readonly impl;
     private readonly ctx;
     constructor(impl: LogImplementation, ctx: RenderTraceInfo);
-    chainStart(payload: LogChainStart): void;
-    chainComplete(payload: LogChainComplete): void;
-    chainError(payload: LogChainError): void;
-    promptStart(payload: LogPromptStart): void;
-    promptComplete(payload: LogPromptComplete): void;
-    promptError(payload: LogPromptError): void;
+    chainStart(chain: FunctionChain | StreamChain, payload: LogChainStart): void;
+    chainComplete(chain: FunctionChain | StreamChain, payload: LogChainComplete): void;
+    chainError(chain: FunctionChain | StreamChain, payload: LogChainError): void;
+    promptStart(prompt: Prompt, payload: LogPromptStart): void;
+    promptComplete(prompt: Prompt, payload: LogPromptComplete): void;
+    promptError(prompt: Prompt, payload: LogPromptError): void;
     private formatMessage;
     error: (...msgs: Loggable[]) => void;
     warn: (...msgs: Loggable[]) => void;

package/dist/{createElement-M3MXUt8O.d.ts → createElement-VpIrgHrz.d.ts}

@@ -202,12 +202,12 @@ type Logger = {
     info: (...msg: Loggable[]) => void;
     debug: (...msg: Loggable[]) => void;
     logException: (exception: unknown) => void;
-    chainStart(payload: LogChainStart): void;
-    chainComplete(payload: LogChainComplete): void;
-    chainError(payload: LogChainError): void;
-    promptStart(payload: LogPromptStart): void;
-    promptComplete(payload: LogPromptComplete): void;
-    promptError(payload: LogPromptError): void;
+    chainStart(chain: FunctionChain | StreamChain, payload: LogChainStart): void;
+    chainComplete(chain: FunctionChain | StreamChain, payload: LogChainComplete): void;
+    chainError(chain: FunctionChain | StreamChain, payload: LogChainError): void;
+    promptStart(prompt: Prompt, payload: LogPromptStart): void;
+    promptComplete(prompt: Prompt, payload: LogPromptComplete): void;
+    promptError(prompt: Prompt, payload: LogPromptError): void;
     chatCompletionRequest: <K extends keyof ChatCompletionRequestPayloads>(provider: K, payload: LogChatCompletionRequest<ChatCompletionRequestPayloads[K]>) => void;
     chatCompletionResponse: <K extends keyof ChatCompletionRequestPayloads>(provider: K, payload: LogChatCompletionResponse<ChatCompletionRequestPayloads[K]>) => void;
 };
@@ -223,12 +223,12 @@ declare abstract class LogImplementation {
      * Logs exceptions thrown during an element's render.
      */
     logException(ctx: RenderTraceInfo, exception: unknown): void;
-    chainStart(_ctx: RenderTraceInfo, _payload: LogChainStart): void;
-    chainComplete(_ctx: RenderTraceInfo, _payload: LogChainComplete): void;
-    chainError(_ctx: RenderTraceInfo, _payload: LogChainError): void;
-    promptStart(_ctx: RenderTraceInfo, _payload: LogPromptStart): void;
-    promptComplete(_ctx: RenderTraceInfo, _payload: LogPromptComplete): void;
-    promptError(_ctx: RenderTraceInfo, _payload: LogPromptError): void;
+    chainStart(_ctx: RenderTraceInfo, _chain: FunctionChain | StreamChain, _payload: LogChainStart): void;
+    chainComplete(_ctx: RenderTraceInfo, _chain: FunctionChain | StreamChain, _payload: LogChainComplete): void;
+    chainError(_ctx: RenderTraceInfo, _chain: FunctionChain | StreamChain, _payload: LogChainError): void;
+    promptStart(_ctx: RenderTraceInfo, _prompt: Prompt, _payload: LogPromptStart): void;
+    promptComplete(_ctx: RenderTraceInfo, _prompt: Prompt, _payload: LogPromptComplete): void;
+    promptError(_ctx: RenderTraceInfo, _prompt: Prompt, _payload: LogPromptError): void;
     chatCompletionRequest<K extends keyof ChatCompletionRequestPayloads>(_ctx: RenderTraceInfo, _provider: K, _payload: LogChatCompletionRequest<ChatCompletionRequestPayloads[K]>): void;
     chatCompletionResponse<K extends keyof ChatCompletionRequestPayloads>(_ctx: RenderTraceInfo, _provider: K, _payload: LogChatCompletionResponse<ChatCompletionRequestPayloads[K]>): void;
 }
@@ -236,12 +236,12 @@ declare class BoundLogger implements Logger {
     private readonly impl;
     private readonly ctx;
     constructor(impl: LogImplementation, ctx: RenderTraceInfo);
-    chainStart(payload: LogChainStart): void;
-    chainComplete(payload: LogChainComplete): void;
-    chainError(payload: LogChainError): void;
-    promptStart(payload: LogPromptStart): void;
-    promptComplete(payload: LogPromptComplete): void;
-    promptError(payload: LogPromptError): void;
+    chainStart(chain: FunctionChain | StreamChain, payload: LogChainStart): void;
+    chainComplete(chain: FunctionChain | StreamChain, payload: LogChainComplete): void;
+    chainError(chain: FunctionChain | StreamChain, payload: LogChainError): void;
+    promptStart(prompt: Prompt, payload: LogPromptStart): void;
+    promptComplete(prompt: Prompt, payload: LogPromptComplete): void;
+    promptError(prompt: Prompt, payload: LogPromptError): void;
     private formatMessage;
     error: (...msgs: Loggable[]) => void;
     warn: (...msgs: Loggable[]) => void;

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { R as RenderContext, L as LogImplementation, C as ContextValues, A as AIComponent, E as EvaluatorFn, P as PromptParsed, a as Prompt, N as NotAsyncGenerator, F as FunctionChain, S as StreamChain, b as EvaluatorResult, c as Context, d as AINode } from './createElement-M3MXUt8O.mjs';
-export { Q as AIElement, f as AIFragment, l as AssistantMessage, D as BoundLogger, o as ChatCompletionError, v as ChatCompletionRequestPayloads, j as ChatCompletionRole, I as CombinedLogger, H as ConsoleLogger, J as Literal, q as LogChainComplete, r as LogChainError, p as LogChainStart, w as LogChatCompletionRequest, x as LogChatCompletionResponse, z as LogContext, y as LogLevel, t as LogPromptComplete, u as LogPromptError, s as LogPromptStart, B as Logger, g as LoggerContext, G as NoopLogImplementation, W as OutputParser, X as PromptRenderResult, V as PropsOfAIComponent, M as RenderResult, i as RenderTraceInfo, T as Renderable, K as RenderableStream, m as RenderedConversationMessage, k as SystemMessage, U as UserMessage, O as attachedContextSymbol, n as computeUsage, e as createAIElement, h as createContext } from './createElement-M3MXUt8O.mjs';
+import { R as RenderContext, L as LogImplementation, C as ContextValues, A as AIComponent, E as EvaluatorFn, P as PromptParsed, a as Prompt, N as NotAsyncGenerator, F as FunctionChain, S as StreamChain, b as EvaluatorResult, c as Context, d as AINode } from './createElement-VpIrgHrz.mjs';
+export { Q as AIElement, f as AIFragment, l as AssistantMessage, D as BoundLogger, o as ChatCompletionError, v as ChatCompletionRequestPayloads, j as ChatCompletionRole, I as CombinedLogger, H as ConsoleLogger, J as Literal, q as LogChainComplete, r as LogChainError, p as LogChainStart, w as LogChatCompletionRequest, x as LogChatCompletionResponse, z as LogContext, y as LogLevel, t as LogPromptComplete, u as LogPromptError, s as LogPromptStart, B as Logger, g as LoggerContext, G as NoopLogImplementation, W as OutputParser, X as PromptRenderResult, V as PropsOfAIComponent, M as RenderResult, i as RenderTraceInfo, T as Renderable, K as RenderableStream, m as RenderedConversationMessage, k as SystemMessage, U as UserMessage, O as attachedContextSymbol, n as computeUsage, e as createAIElement, h as createContext } from './createElement-VpIrgHrz.mjs';
 import { ZodObject, ZodRawShape, ZodTypeAny, ZodString, z } from 'zod';
 import { OpenAI } from 'openai';
 export { OpenAI as OpenAIClient } from 'openai';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { R as RenderContext, L as LogImplementation, C as ContextValues, A as AIComponent, E as EvaluatorFn, P as PromptParsed, a as Prompt, N as NotAsyncGenerator, F as FunctionChain, S as StreamChain, b as EvaluatorResult, c as Context, d as AINode } from './createElement-M3MXUt8O.js';
-export { Q as AIElement, f as AIFragment, l as AssistantMessage, D as BoundLogger, o as ChatCompletionError, v as ChatCompletionRequestPayloads, j as ChatCompletionRole, I as CombinedLogger, H as ConsoleLogger, J as Literal, q as LogChainComplete, r as LogChainError, p as LogChainStart, w as LogChatCompletionRequest, x as LogChatCompletionResponse, z as LogContext, y as LogLevel, t as LogPromptComplete, u as LogPromptError, s as LogPromptStart, B as Logger, g as LoggerContext, G as NoopLogImplementation, W as OutputParser, X as PromptRenderResult, V as PropsOfAIComponent, M as RenderResult, i as RenderTraceInfo, T as Renderable, K as RenderableStream, m as RenderedConversationMessage, k as SystemMessage, U as UserMessage, O as attachedContextSymbol, n as computeUsage, e as createAIElement, h as createContext } from './createElement-M3MXUt8O.js';
+import { R as RenderContext, L as LogImplementation, C as ContextValues, A as AIComponent, E as EvaluatorFn, P as PromptParsed, a as Prompt, N as NotAsyncGenerator, F as FunctionChain, S as StreamChain, b as EvaluatorResult, c as Context, d as AINode } from './createElement-VpIrgHrz.js';
+export { Q as AIElement, f as AIFragment, l as AssistantMessage, D as BoundLogger, o as ChatCompletionError, v as ChatCompletionRequestPayloads, j as ChatCompletionRole, I as CombinedLogger, H as ConsoleLogger, J as Literal, q as LogChainComplete, r as LogChainError, p as LogChainStart, w as LogChatCompletionRequest, x as LogChatCompletionResponse, z as LogContext, y as LogLevel, t as LogPromptComplete, u as LogPromptError, s as LogPromptStart, B as Logger, g as LoggerContext, G as NoopLogImplementation, W as OutputParser, X as PromptRenderResult, V as PropsOfAIComponent, M as RenderResult, i as RenderTraceInfo, T as Renderable, K as RenderableStream, m as RenderedConversationMessage, k as SystemMessage, U as UserMessage, O as attachedContextSymbol, n as computeUsage, e as createAIElement, h as createContext } from './createElement-VpIrgHrz.js';
 import { ZodObject, ZodRawShape, ZodTypeAny, ZodString, z } from 'zod';
 import { OpenAI } from 'openai';
 export { OpenAI as OpenAIClient } from 'openai';

package/dist/index.js

@@ -321,17 +321,17 @@ var LogImplementation = class {
       `Rendering ${ctx.renderType} ${displayKey} failed with exception: ${exception}`
     );
   }
-  chainStart(_ctx, _payload) {
+  chainStart(_ctx, _chain, _payload) {
   }
-  chainComplete(_ctx, _payload) {
+  chainComplete(_ctx, _chain, _payload) {
   }
-  chainError(_ctx, _payload) {
+  chainError(_ctx, _chain, _payload) {
   }
-  promptStart(_ctx, _payload) {
+  promptStart(_ctx, _prompt, _payload) {
   }
-  promptComplete(_ctx, _payload) {
+  promptComplete(_ctx, _prompt, _payload) {
   }
-  promptError(_ctx, _payload) {
+  promptError(_ctx, _prompt, _payload) {
   }
   chatCompletionRequest(_ctx, _provider, _payload) {
   }
@@ -343,23 +343,23 @@ var BoundLogger = class {
     this.impl = impl;
     this.ctx = ctx;
   }
-  chainStart(payload) {
-    this.impl.chainStart(this.ctx, payload);
+  chainStart(chain, payload) {
+    this.impl.chainStart(this.ctx, chain, payload);
   }
-  chainComplete(payload) {
-    this.impl.chainComplete(this.ctx, payload);
+  chainComplete(chain, payload) {
+    this.impl.chainComplete(this.ctx, chain, payload);
   }
-  chainError(payload) {
-    this.impl.chainError(this.ctx, payload);
+  chainError(chain, payload) {
+    this.impl.chainError(this.ctx, chain, payload);
   }
-  promptStart(payload) {
-    this.impl.promptStart(this.ctx, payload);
+  promptStart(prompt, payload) {
+    this.impl.promptStart(this.ctx, prompt, payload);
   }
-  promptComplete(payload) {
-    this.impl.promptComplete(this.ctx, payload);
+  promptComplete(prompt, payload) {
+    this.impl.promptComplete(this.ctx, prompt, payload);
   }
-  promptError(payload) {
-    this.impl.promptError(this.ctx, payload);
+  promptError(prompt, payload) {
+    this.impl.promptError(this.ctx, prompt, payload);
   }
   formatMessage = (...msgs) => msgs.map((m) => {
     if (typeof m === "string") {
@@ -543,7 +543,7 @@ var GeneratorRenderResult = class {
   }
   then(onFulfilled, onRejected) {
     if (!this.accumPromise) {
-      this.accumPromise = accumResults(this.generator);
+      this.accumPromise = accumResults(this);
     }
     return this.accumPromise.then(onFulfilled, onRejected);
   }
@@ -556,7 +556,14 @@ var AccumulatedRenderResult = class extends GeneratorRenderResult {
   }
   accumulated = "";
   async next(...args) {
-    const { value, done } = await this.generator.next(...args);
+    let ret;
+    try {
+      ret = await this.generator.next(...args);
+    } catch (e) {
+      this.cbs.onError(e);
+      throw e;
+    }
+    const { done, value } = ret;
     if (done) {
       this.cbs.onDone(this.accumulated);
     }
@@ -806,7 +813,7 @@ var StreamRenderContext = class _StreamRenderContext {
   renderPrompt(prompt, variables) {
     const startTime = (/* @__PURE__ */ new Date()).toISOString();
     const startTimestamp = performance.now();
-    this.logger.promptStart({
+    this.logger.promptStart(prompt, {
       promptKey: prompt.key,
       startTime,
       variables
@@ -815,7 +822,7 @@ var StreamRenderContext = class _StreamRenderContext {
     const parsedVariables = parseVariables(schema, variables);
     if (!parsedVariables.success) {
       const error = new ParseVariablesError(parsedVariables.errors);
-      this.logger.promptError({
+      this.logger.promptError(prompt, {
         promptKey: prompt.key,
         variables,
         endTime: (/* @__PURE__ */ new Date()).toISOString(),
@@ -827,7 +834,7 @@ var StreamRenderContext = class _StreamRenderContext {
     }
     const varsToUse = parsedVariables.result;
     const logComplete = (output) => {
-      this.logger.promptComplete({
+      this.logger.promptComplete(prompt, {
         promptKey: prompt.key,
         variables,
         endTime: (/* @__PURE__ */ new Date()).toISOString(),
@@ -838,7 +845,7 @@ var StreamRenderContext = class _StreamRenderContext {
       return output;
     };
     const logError = (error) => {
-      this.logger.promptError({
+      this.logger.promptError(prompt, {
         promptKey: prompt.key,
         variables,
         endTime: (/* @__PURE__ */ new Date()).toISOString(),
@@ -861,7 +868,7 @@ var StreamRenderContext = class _StreamRenderContext {
     const { validateOutput } = options;
     const startTime = (/* @__PURE__ */ new Date()).toISOString();
     const startTimestamp = performance.now();
-    this.logger.promptStart({
+    this.logger.promptStart(prompt, {
       promptKey: prompt.key,
       startTime,
       variables
@@ -870,7 +877,7 @@ var StreamRenderContext = class _StreamRenderContext {
     const parsedVariables = parseVariables(schema, variables);
     if (!parsedVariables.success) {
       const error = new ParseVariablesError(parsedVariables.errors);
-      this.logger.promptError({
+      this.logger.promptError(prompt, {
         promptKey: prompt.key,
         variables,
         endTime: (/* @__PURE__ */ new Date()).toISOString(),
@@ -898,7 +905,7 @@ var StreamRenderContext = class _StreamRenderContext {
           throw new PromptInvalidOutputError("Invalid output: " + errors);
         }
       }
-      this.logger.promptComplete({
+      this.logger.promptComplete(prompt, {
         promptKey: prompt.key,
         variables,
         endTime: (/* @__PURE__ */ new Date()).toISOString(),
@@ -908,7 +915,7 @@ var StreamRenderContext = class _StreamRenderContext {
       });
       return parsedOutput;
     } catch (error) {
-      this.logger.promptError({
+      this.logger.promptError(prompt, {
         promptKey: prompt.key,
         variables,
         endTime: (/* @__PURE__ */ new Date()).toISOString(),
@@ -922,7 +929,7 @@ var StreamRenderContext = class _StreamRenderContext {
   runChain(chain, variables) {
     const startTime = (/* @__PURE__ */ new Date()).toISOString();
     const startTimestamp = performance.now();
-    this.logger.chainStart({
+    this.logger.chainStart(chain, {
       chainKey: chain.key,
       chainType: chain.chainType,
       startTime,
@@ -932,7 +939,7 @@ var StreamRenderContext = class _StreamRenderContext {
     const parsedVariables = parseVariables(schema, variables);
     if (!parsedVariables.success) {
       const error = new ParseVariablesError(parsedVariables.errors);
-      this.logger.chainError({
+      this.logger.chainError(chain, {
         chainKey: chain.key,
         chainType: chain.chainType,
         variables,
@@ -945,7 +952,7 @@ var StreamRenderContext = class _StreamRenderContext {
     }
     if (chain.chainType === "function") {
       const onChainComplete = (output) => {
-        this.logger.chainComplete({
+        this.logger.chainComplete(chain, {
           chainKey: chain.key,
           chainType: chain.chainType,
           variables,
@@ -956,7 +963,7 @@ var StreamRenderContext = class _StreamRenderContext {
         });
       };
       const onChainError = (error) => {
-        this.logger.chainError({
+        this.logger.chainError(chain, {
           chainKey: chain.key,
           chainType: chain.chainType,
           variables,
@@ -985,7 +992,7 @@ var StreamRenderContext = class _StreamRenderContext {
         const stream = chain.run(parsedVariables.result, this);
         return stream;
       } catch (error) {
-        this.logger.chainError({
+        this.logger.chainError(chain, {
           chainKey: chain.key,
           chainType: chain.chainType,
           variables,

package/dist/index.mjs

@@ -231,17 +231,17 @@ var LogImplementation = class {
       `Rendering ${ctx.renderType} ${displayKey} failed with exception: ${exception}`
     );
   }
-  chainStart(_ctx, _payload) {
+  chainStart(_ctx, _chain, _payload) {
   }
-  chainComplete(_ctx, _payload) {
+  chainComplete(_ctx, _chain, _payload) {
   }
-  chainError(_ctx, _payload) {
+  chainError(_ctx, _chain, _payload) {
   }
-  promptStart(_ctx, _payload) {
+  promptStart(_ctx, _prompt, _payload) {
   }
-  promptComplete(_ctx, _payload) {
+  promptComplete(_ctx, _prompt, _payload) {
   }
-  promptError(_ctx, _payload) {
+  promptError(_ctx, _prompt, _payload) {
   }
   chatCompletionRequest(_ctx, _provider, _payload) {
   }
@@ -253,23 +253,23 @@ var BoundLogger = class {
     this.impl = impl;
     this.ctx = ctx;
   }
-  chainStart(payload) {
-    this.impl.chainStart(this.ctx, payload);
+  chainStart(chain, payload) {
+    this.impl.chainStart(this.ctx, chain, payload);
   }
-  chainComplete(payload) {
-    this.impl.chainComplete(this.ctx, payload);
+  chainComplete(chain, payload) {
+    this.impl.chainComplete(this.ctx, chain, payload);
   }
-  chainError(payload) {
-    this.impl.chainError(this.ctx, payload);
+  chainError(chain, payload) {
+    this.impl.chainError(this.ctx, chain, payload);
   }
-  promptStart(payload) {
-    this.impl.promptStart(this.ctx, payload);
+  promptStart(prompt, payload) {
+    this.impl.promptStart(this.ctx, prompt, payload);
   }
-  promptComplete(payload) {
-    this.impl.promptComplete(this.ctx, payload);
+  promptComplete(prompt, payload) {
+    this.impl.promptComplete(this.ctx, prompt, payload);
   }
-  promptError(payload) {
-    this.impl.promptError(this.ctx, payload);
+  promptError(prompt, payload) {
+    this.impl.promptError(this.ctx, prompt, payload);
   }
   formatMessage = (...msgs) => msgs.map((m) => {
     if (typeof m === "string") {
@@ -453,7 +453,7 @@ var GeneratorRenderResult = class {
   }
   then(onFulfilled, onRejected) {
     if (!this.accumPromise) {
-      this.accumPromise = accumResults(this.generator);
+      this.accumPromise = accumResults(this);
     }
     return this.accumPromise.then(onFulfilled, onRejected);
   }
@@ -466,7 +466,14 @@ var AccumulatedRenderResult = class extends GeneratorRenderResult {
   }
   accumulated = "";
   async next(...args) {
-    const { value, done } = await this.generator.next(...args);
+    let ret;
+    try {
+      ret = await this.generator.next(...args);
+    } catch (e) {
+      this.cbs.onError(e);
+      throw e;
+    }
+    const { done, value } = ret;
     if (done) {
       this.cbs.onDone(this.accumulated);
     }
@@ -709,7 +716,7 @@ var StreamRenderContext = class _StreamRenderContext {
   renderPrompt(prompt, variables) {
     const startTime = (/* @__PURE__ */ new Date()).toISOString();
     const startTimestamp = performance.now();
-    this.logger.promptStart({
+    this.logger.promptStart(prompt, {
       promptKey: prompt.key,
       startTime,
       variables
@@ -718,7 +725,7 @@ var StreamRenderContext = class _StreamRenderContext {
     const parsedVariables = parseVariables(schema, variables);
     if (!parsedVariables.success) {
       const error = new ParseVariablesError(parsedVariables.errors);
-      this.logger.promptError({
+      this.logger.promptError(prompt, {
         promptKey: prompt.key,
         variables,
         endTime: (/* @__PURE__ */ new Date()).toISOString(),
@@ -730,7 +737,7 @@ var StreamRenderContext = class _StreamRenderContext {
     }
     const varsToUse = parsedVariables.result;
     const logComplete = (output) => {
-      this.logger.promptComplete({
+      this.logger.promptComplete(prompt, {
         promptKey: prompt.key,
         variables,
         endTime: (/* @__PURE__ */ new Date()).toISOString(),
@@ -741,7 +748,7 @@ var StreamRenderContext = class _StreamRenderContext {
       return output;
     };
     const logError = (error) => {
-      this.logger.promptError({
+      this.logger.promptError(prompt, {
         promptKey: prompt.key,
         variables,
         endTime: (/* @__PURE__ */ new Date()).toISOString(),
@@ -764,7 +771,7 @@ var StreamRenderContext = class _StreamRenderContext {
     const { validateOutput } = options;
     const startTime = (/* @__PURE__ */ new Date()).toISOString();
     const startTimestamp = performance.now();
-    this.logger.promptStart({
+    this.logger.promptStart(prompt, {
       promptKey: prompt.key,
       startTime,
       variables
@@ -773,7 +780,7 @@ var StreamRenderContext = class _StreamRenderContext {
     const parsedVariables = parseVariables(schema, variables);
     if (!parsedVariables.success) {
       const error = new ParseVariablesError(parsedVariables.errors);
-      this.logger.promptError({
+      this.logger.promptError(prompt, {
         promptKey: prompt.key,
         variables,
         endTime: (/* @__PURE__ */ new Date()).toISOString(),
@@ -801,7 +808,7 @@ var StreamRenderContext = class _StreamRenderContext {
           throw new PromptInvalidOutputError("Invalid output: " + errors);
         }
       }
-      this.logger.promptComplete({
+      this.logger.promptComplete(prompt, {
         promptKey: prompt.key,
         variables,
         endTime: (/* @__PURE__ */ new Date()).toISOString(),
@@ -811,7 +818,7 @@ var StreamRenderContext = class _StreamRenderContext {
       });
       return parsedOutput;
     } catch (error) {
-      this.logger.promptError({
+      this.logger.promptError(prompt, {
         promptKey: prompt.key,
         variables,
         endTime: (/* @__PURE__ */ new Date()).toISOString(),
@@ -825,7 +832,7 @@ var StreamRenderContext = class _StreamRenderContext {
   runChain(chain, variables) {
     const startTime = (/* @__PURE__ */ new Date()).toISOString();
     const startTimestamp = performance.now();
-    this.logger.chainStart({
+    this.logger.chainStart(chain, {
       chainKey: chain.key,
       chainType: chain.chainType,
       startTime,
@@ -835,7 +842,7 @@ var StreamRenderContext = class _StreamRenderContext {
     const parsedVariables = parseVariables(schema, variables);
     if (!parsedVariables.success) {
       const error = new ParseVariablesError(parsedVariables.errors);
-      this.logger.chainError({
+      this.logger.chainError(chain, {
         chainKey: chain.key,
         chainType: chain.chainType,
         variables,
@@ -848,7 +855,7 @@ var StreamRenderContext = class _StreamRenderContext {
     }
     if (chain.chainType === "function") {
       const onChainComplete = (output) => {
-        this.logger.chainComplete({
+        this.logger.chainComplete(chain, {
           chainKey: chain.key,
           chainType: chain.chainType,
           variables,
@@ -859,7 +866,7 @@ var StreamRenderContext = class _StreamRenderContext {
         });
       };
       const onChainError = (error) => {
-        this.logger.chainError({
+        this.logger.chainError(chain, {
           chainKey: chain.key,
           chainType: chain.chainType,
           variables,
@@ -888,7 +895,7 @@ var StreamRenderContext = class _StreamRenderContext {
         const stream = chain.run(parsedVariables.result, this);
         return stream;
       } catch (error) {
-        this.logger.chainError({
+        this.logger.chainError(chain, {
           chainKey: chain.key,
           chainType: chain.chainType,
           variables,

package/dist/jsx-dev-runtime.d.mts

@@ -1,3 +1,3 @@
 export { Fragment, JSX, jsx, jsxDEV, jsxs } from './jsx-runtime.mjs';
-import './createElement-M3MXUt8O.mjs';
+import './createElement-VpIrgHrz.mjs';
 import 'zod';

package/dist/jsx-dev-runtime.d.ts

@@ -1,3 +1,3 @@
 export { Fragment, JSX, jsx, jsxDEV, jsxs } from './jsx-runtime.js';
-import './createElement-M3MXUt8O.js';
+import './createElement-VpIrgHrz.js';
 import 'zod';

package/dist/jsx-runtime.d.mts

@@ -1,4 +1,4 @@
-import { A as AIComponent, Q as AIElement, f as AIFragment } from './createElement-M3MXUt8O.mjs';
+import { A as AIComponent, Q as AIElement, f as AIFragment } from './createElement-VpIrgHrz.mjs';
 import 'zod';
 
 /**

package/dist/jsx-runtime.d.ts

@@ -1,4 +1,4 @@
-import { A as AIComponent, Q as AIElement, f as AIFragment } from './createElement-M3MXUt8O.js';
+import { A as AIComponent, Q as AIElement, f as AIFragment } from './createElement-VpIrgHrz.js';
 import 'zod';
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gammatech/aijsx",
-  "version": "0.4.0-beta.6",
+  "version": "0.4.0-beta.8",
   "description": "Rewrite of aijsx",
   "author": "Jordan Garcia",
   "license": "MIT",