@tanstack/ai 0.31.0 → 0.33.0

package/dist/esm/activities/chat/index.js

@@ -155,6 +155,7 @@ class TextEngine {
         this.deferredPromises.push(promise);
       },
       // Provider / adapter info
+      activity: "chat",
       provider: config.adapter.name,
       model: config.params.model,
       source: "server",
@@ -525,6 +526,20 @@ class TextEngine {
       this.currentThinkingSignature = chunk.signature;
     }
   }
+  /**
+   * Tools available for execution this turn. The discovery tool is dropped
+   * from the advertised set (`this.tools`) once every lazy tool is discovered,
+   * but a model may still re-request discovery; this widens execution lookup
+   * to include it so such calls don't fail with "Unknown tool". Centralised so
+   * both execution sites (`processToolCalls` and `checkForPendingToolCalls`)
+   * stay in sync.
+   */
+  resolveExecutableTools(toolCalls) {
+    return this.lazyToolManager.getExecutableTools(
+      this.tools,
+      toolCalls.map((tc) => tc.function.name)
+    );
+  }
   async *checkForPendingToolCalls() {
     const pendingToolCalls = this.getPendingToolCallsFromMessages();
     if (pendingToolCalls.length === 0) {
@@ -562,7 +577,7 @@ class TextEngine {
     const { approvals, clientToolResults } = this.collectClientState();
     const generator = executeToolCalls(
       executablePendingCalls,
-      this.tools,
+      this.resolveExecutableTools(executablePendingCalls),
       approvals,
       clientToolResults,
       (eventName, data) => this.createCustomEventChunk(eventName, data),
@@ -694,7 +709,7 @@ class TextEngine {
     const { approvals, clientToolResults } = this.collectClientState();
     const generator = executeToolCalls(
       executableToolCalls,
-      this.tools,
+      this.resolveExecutableTools(executableToolCalls),
       approvals,
       clientToolResults,
       (eventName, data) => this.createCustomEventChunk(eventName, data),
@@ -1629,7 +1644,13 @@ async function* fallbackStructuredOutputStream(adapter, options, onAdapterError)
     threadId,
     model,
     timestamp,
-    finishReason: "stop"
+    finishReason: "stop",
+    // Forward adapter-reported token usage so consumers reading
+    // `RUN_FINISHED.usage` (and the engine's `runOnUsage` middleware hook) see
+    // it on the fallback path, mirroring the native streaming path. The
+    // conditional spread avoids emitting `usage: undefined` for adapters that
+    // don't report it. See #758.
+    ...result.usage ? { usage: result.usage } : {}
   };
 }
 function runStreamingStructuredOutput(options) {