@axlsdk/axl 0.13.5 → 0.13.7

package/README.md

@@ -303,6 +303,8 @@ const result = await runtime.execute('my-workflow', { query: 'Hello' });
 const stream = runtime.stream('my-workflow', { query: 'Hello' });
 for await (const event of stream) {
   if (event.type === 'token') process.stdout.write(event.data);
+  if (event.type === 'error') console.error('Stream error:', event.message);
+  if (event.type === 'done') console.log('Result:', event.data);
 }
 
 // Sessions

package/dist/index.cjs

@@ -2838,7 +2838,7 @@ ${JSON.stringify(jsonSchema, null, 2)}`;
               });
               continue;
             }
-            this.onToolCall?.({ name: toolName, args: toolArgs2 });
+            this.onToolCall?.({ name: toolName, args: toolArgs2, callId: toolCall.id });
             const toolStart2 = Date.now();
             const executeOverride = async () => {
               let toolResult3;
@@ -2871,7 +2871,7 @@ ${JSON.stringify(jsonSchema, null, 2)}`;
               agent: agent2._name,
               tool: toolName,
               duration: Date.now() - toolStart2,
-              data: { args: toolArgs2, result: toolResult2 }
+              data: { args: toolArgs2, result: toolResult2, callId: toolCall.id }
             });
             currentMessages.push({
               role: "tool",
@@ -2902,7 +2902,7 @@ ${JSON.stringify(jsonSchema, null, 2)}`;
             });
             continue;
           }
-          this.onToolCall?.({ name: toolName, args: toolArgs });
+          this.onToolCall?.({ name: toolName, args: toolArgs, callId: toolCall.id });
           const toolStart = Date.now();
           if (tool2 && tool2.requireApproval) {
             const approvalFn = async () => {
@@ -3031,7 +3031,7 @@ ${JSON.stringify(jsonSchema, null, 2)}`;
             agent: agent2._name,
             tool: traceName,
             duration: Date.now() - toolStart,
-            data: { args: toolArgs, result: toolResult }
+            data: { args: toolArgs, result: toolResult, callId: toolCall.id }
           });
           currentMessages.push({
             role: "tool",
@@ -4742,6 +4742,8 @@ var AxlStream = class _AxlStream extends import_node_stream.Readable {
     this.bus.on("__reject", (error) => rejectPromise(error));
     this.bus.on("error", () => {
     });
+    this.promise.catch(() => {
+    });
   }
   static STREAM_EVENTS = /* @__PURE__ */ new Set([
     "token",
@@ -4887,9 +4889,16 @@ var AxlStream = class _AxlStream extends import_node_stream.Readable {
   _error(error) {
     if (this.finished) return;
     this.finished = true;
-    const errorEvent = { type: "error", error };
+    const errorEvent = { type: "error", message: error.message };
     this.bus.emit("error", errorEvent);
+    this.push(errorEvent);
     this.push(null);
+    const waiter = this.waiters.shift();
+    if (waiter) {
+      waiter({ value: errorEvent, done: false });
+    } else {
+      this.eventQueue.push(errorEvent);
+    }
     for (const w of this.waiters) {
       w({ value: void 0, done: true });
     }
@@ -5559,7 +5568,7 @@ var AxlRuntime = class extends import_node_events2.EventEmitter {
     return this.registeredEvals.get(name);
   }
   /** Run a registered eval by name. */
-  async runRegisteredEval(name) {
+  async runRegisteredEval(name, options) {
     const entry = this.registeredEvals.get(name);
     if (!entry) throw new Error(`Eval "${name}" is not registered`);
     let result;
@@ -5574,10 +5583,18 @@ var AxlRuntime = class extends import_node_events2.EventEmitter {
       }
       const originalExecuteFn = entry.executeWorkflow;
       const wrappedExecuteFn = async (input, runtime) => {
-        const { result: result2, cost: trackedCost } = await this.trackCost(async () => {
+        const {
+          result: result2,
+          cost: trackedCost,
+          metadata
+        } = await this.trackExecution(async () => {
           return originalExecuteFn(input, runtime);
         });
-        return { output: result2.output, cost: result2.cost ?? trackedCost };
+        return {
+          output: result2.output,
+          cost: result2.cost ?? trackedCost,
+          metadata: result2.metadata ?? metadata
+        };
       };
       result = await runEvalFn(entry.config, wrappedExecuteFn, this);
     } else {
@@ -5586,6 +5603,12 @@ var AxlRuntime = class extends import_node_events2.EventEmitter {
       );
     }
     const resultObj = result;
+    if (options?.metadata) {
+      resultObj.metadata = {
+        ...resultObj.metadata,
+        ...options.metadata
+      };
+    }
     try {
       await this.saveEvalResult({
         id: resultObj.id ?? (0, import_node_crypto2.randomUUID)(),
@@ -5742,6 +5765,7 @@ var AxlRuntime = class extends import_node_events2.EventEmitter {
           execInfo.status = "completed";
           execInfo.completedAt = Date.now();
           execInfo.duration = execInfo.completedAt - execInfo.startedAt;
+          execInfo.result = output;
           ctx.log("workflow_end", {
             workflow: name,
             status: "completed",
@@ -5854,7 +5878,8 @@ var AxlRuntime = class extends import_node_events2.EventEmitter {
             axlStream._push({
               type: "tool_result",
               name: event.tool ?? "",
-              result: event.data?.result
+              result: event.data?.result,
+              callId: event.data?.callId
             });
           }
           axlStream._push({ type: "step", step: event.step, data: event });
@@ -5863,7 +5888,12 @@ var AxlRuntime = class extends import_node_events2.EventEmitter {
           axlStream._push({ type: "token", data: token });
         },
         onToolCall: (call) => {
-          axlStream._push({ type: "tool_call", name: call.name, args: call.args });
+          axlStream._push({
+            type: "tool_call",
+            name: call.name,
+            args: call.args,
+            callId: call.callId
+          });
         },
         onAgentStart: (info) => {
           axlStream._push({ type: "agent_start", agent: info.agent, model: info.model });
@@ -5897,6 +5927,7 @@ var AxlRuntime = class extends import_node_events2.EventEmitter {
             execInfo.status = "completed";
             execInfo.completedAt = Date.now();
             execInfo.duration = execInfo.completedAt - execInfo.startedAt;
+            execInfo.result = result;
             wfCtx.log("workflow_end", {
               workflow: name,
               status: "completed",
@@ -6113,10 +6144,10 @@ var AxlRuntime = class extends import_node_events2.EventEmitter {
       );
     }
     const executeWorkflow = async (input) => {
-      const { result, cost } = await this.trackCost(async () => {
+      const { result, cost, metadata } = await this.trackExecution(async () => {
         return this.execute(config.workflow, input);
       });
-      return { output: result, cost };
+      return { output: result, cost, metadata };
     };
     return runEvalFn(config, executeWorkflow, this);
   }
@@ -6126,7 +6157,7 @@ var AxlRuntime = class extends import_node_events2.EventEmitter {
    *
    * @see Spec Section 13.6
    */
-  async evalCompare(baseline, candidate) {
+  async evalCompare(baseline, candidate, options) {
     let evalCompareFn;
     try {
       ({ evalCompare: evalCompareFn } = await import("@axlsdk/eval"));
@@ -6135,7 +6166,7 @@ var AxlRuntime = class extends import_node_events2.EventEmitter {
         "axl-eval is required for AxlRuntime.evalCompare(). Install it with: npm install @axlsdk/eval"
       );
     }
-    return evalCompareFn(baseline, candidate);
+    return evalCompareFn(baseline, candidate, options);
   }
   /**
    * Track cost across any runtime operations within the given function.
@@ -6145,24 +6176,58 @@ var AxlRuntime = class extends import_node_events2.EventEmitter {
    * Works with both `createContext()` and `execute()` calls inside `fn`.
    */
   async trackCost(fn) {
+    const { result, cost } = await this.trackExecution(fn);
+    return { result, cost };
+  }
+  /**
+   * Track cost and execution metadata across any runtime operations within the given function.
+   * Uses AsyncLocalStorage to scope attribution to specific execution IDs,
+   * making it correct with concurrent calls.
+   *
+   * Returns cost (same as `trackCost`) plus metadata extracted from trace events:
+   * models (unique URIs), tokens (input/output/reasoning sums), and agent call count.
+   *
+   * Works with both `createContext()` and `execute()` calls inside `fn`.
+   */
+  async trackExecution(fn) {
     const parentScope = costScopeStorage.getStore();
     const scope = {
       totalCost: 0,
       trackedIds: /* @__PURE__ */ new Set(),
       parent: parentScope
     };
-    const costListener = (event) => {
-      if (event.cost && scope.trackedIds.has(event.executionId)) {
-        scope.totalCost += event.cost;
+    const modelCalls = /* @__PURE__ */ new Map();
+    const tokens = { input: 0, output: 0, reasoning: 0 };
+    let agentCalls = 0;
+    const listener = (event) => {
+      if (!scope.trackedIds.has(event.executionId)) return;
+      if (event.cost) scope.totalCost += event.cost;
+      if (event.type === "agent_call") {
+        if (event.model) modelCalls.set(event.model, (modelCalls.get(event.model) ?? 0) + 1);
+        agentCalls++;
+        if (event.tokens) {
+          tokens.input += event.tokens.input ?? 0;
+          tokens.output += event.tokens.output ?? 0;
+          tokens.reasoning += event.tokens.reasoning ?? 0;
+        }
       }
     };
     this.setMaxListeners(this.getMaxListeners() + 1);
-    this.on("trace", costListener);
+    this.on("trace", listener);
     try {
       const result = await costScopeStorage.run(scope, fn);
-      return { result, cost: scope.totalCost };
+      return {
+        result,
+        cost: scope.totalCost,
+        metadata: {
+          models: [...modelCalls.keys()],
+          modelCallCounts: modelCalls.size > 0 ? Object.fromEntries(modelCalls) : void 0,
+          tokens,
+          agentCalls
+        }
+      };
     } finally {
-      this.off("trace", costListener);
+      this.off("trace", listener);
       this.setMaxListeners(this.getMaxListeners() - 1);
     }
   }