@tanstack/ai 0.27.0 → 0.29.0

package/dist/esm/activities/chat/index.d.ts

@@ -5,6 +5,7 @@ import { SystemPrompt } from '../../system-prompts.js';
 import { DebugOption } from '../../logger/types.js';
 import { ProviderTool } from '../../tools/provider-tool.js';
 import { ContextFromMiddleware, ContextFromTool, DefinedContext, MergeContext, UnionToIntersection } from './runtime-context-types.js';
+import { ChatMCPOptions } from './mcp/types.js';
 /** The adapter kind this activity handles */
 export declare const kind: "text";
 type AnyRuntimeTool = AnyTool;
@@ -77,6 +78,12 @@ export interface TextActivityOptions<TAdapter extends AnyTextAdapter, TSchema ex
     tools?: Array<(AnyRuntimeTool & {
         readonly '~toolKind'?: never;
     }) | ProviderTool<string, TAdapter['~types']['toolCapabilities'][number]>> | undefined;
+    /**
+     * Hand MCP clients/pools to chat(): their tools are discovered at run start
+     * and merged into the run; `connection` controls whether chat() closes them
+     * when the run ends. See docs/tools/mcp.md "Managing MCP clients with chat()".
+     */
+    mcp?: ChatMCPOptions;
     /** Additional metadata to attach to the request. */
     metadata?: TextOptions['metadata'];
     /** Model-specific provider options (type comes from adapter) */

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

@@ -9,11 +9,25 @@ import { convertSchemaToJsonSchema, isStandardSchema, parseWithStandardSchema }
 import { maxIterations } from "./agent-loop-strategies.js";
 import { convertMessagesToModelMessages, generateMessageId } from "./messages.js";
 import { MiddlewareRunner } from "./middleware/compose.js";
+import { MCPManager } from "./mcp/manager.js";
 import { EventType } from "@ag-ui/core";
 const kind = "text";
 function createChatOptions(options) {
   return options;
 }
+function combineAbortSignals(a, b) {
+  if (!a) return b;
+  if (!b) return a;
+  if (a.aborted) return a;
+  if (b.aborted) return b;
+  const controller = new AbortController();
+  const onAbort = (source) => () => {
+    controller.abort(source.reason);
+  };
+  a.addEventListener("abort", onAbort(a), { once: true });
+  b.addEventListener("abort", onAbort(b), { once: true });
+  return controller.signal;
+}
 class TextEngine {
   adapter;
   params;
@@ -56,6 +70,9 @@ class TextEngine {
   deferredPromises = [];
   abortReason;
   middlewareAbortController;
+  // Combines the caller's signal with middleware abort() so running tools
+  // observe both cancellation sources via ctx.abortSignal.
+  toolAbortSignal;
   terminalHookCalled = false;
   logger;
   // Structured-output finalization state (populated by runStructuredFinalization)
@@ -111,6 +128,10 @@ class TextEngine {
     ];
     this.middlewareRunner = new MiddlewareRunner(allMiddleware, logger);
     this.middlewareAbortController = new AbortController();
+    this.toolAbortSignal = combineAbortSignals(
+      this.effectiveSignal,
+      this.middlewareAbortController.signal
+    );
     this.middlewareCtx = {
       requestId: this.requestId,
       streamId: this.streamId,
@@ -563,7 +584,8 @@ class TextEngine {
           );
         }
       },
-      this.middlewareCtx.context
+      this.middlewareCtx.context,
+      this.toolAbortSignal
     );
     const executionResult = yield* this.drainToolCallGenerator(generator);
     if (this.isMiddlewareAborted()) {
@@ -694,7 +716,8 @@ class TextEngine {
           );
         }
       },
-      this.middlewareCtx.context
+      this.middlewareCtx.context,
+      this.toolAbortSignal
     );
     const executionResult = yield* this.drainToolCallGenerator(generator);
     this.middlewareCtx.phase = "afterTools";
@@ -873,17 +896,17 @@ class TextEngine {
           delta: args,
           args
         });
+        chunks.push({
+          type: "TOOL_CALL_END",
+          timestamp: Date.now(),
+          model: finishEvent.model,
+          toolCallId: result.toolCallId,
+          toolCallName: result.toolName,
+          toolName: result.toolName,
+          result: wireContent,
+          ...result.state !== void 0 && { state: result.state }
+        });
       }
-      chunks.push({
-        type: "TOOL_CALL_END",
-        timestamp: Date.now(),
-        model: finishEvent.model,
-        toolCallId: result.toolCallId,
-        toolCallName: result.toolName,
-        toolName: result.toolName,
-        result: wireContent,
-        ...result.state !== void 0 && { state: result.state }
-      });
       chunks.push({
         type: "TOOL_CALL_RESULT",
         timestamp: Date.now(),
@@ -1411,9 +1434,14 @@ function chat(options) {
   });
 }
 async function* runStreamingText(options) {
-  const { adapter, middleware, context, debug, ...textOptions } = options;
+  const { adapter, middleware, context, debug, mcp, ...textOptions } = options;
   const model = adapter.model;
   const logger = resolveDebugOption(debug);
+  const mcpManager = MCPManager.from(mcp);
+  const mcpTools = await mcpManager.discover();
+  if (mcpTools.length > 0) {
+    textOptions.tools = [...textOptions.tools ?? [], ...mcpTools];
+  }
   const engine = new TextEngine(
     {
       adapter,
@@ -1423,8 +1451,12 @@ async function* runStreamingText(options) {
     },
     logger
   );
-  for await (const chunk of engine.run()) {
-    yield chunk;
+  try {
+    for await (const chunk of engine.run()) {
+      yield chunk;
+    }
+  } finally {
+    await mcpManager.dispose();
   }
 }
 function runNonStreamingText(options) {
@@ -1435,7 +1467,15 @@ function runNonStreamingText(options) {
   return streamToText(stream);
 }
 async function runAgenticStructuredOutput(options) {
-  const { adapter, outputSchema, middleware, context, debug, ...textOptions } = options;
+  const {
+    adapter,
+    outputSchema,
+    middleware,
+    context,
+    debug,
+    mcp,
+    ...textOptions
+  } = options;
   const model = adapter.model;
   const logger = resolveDebugOption(debug);
   if (!outputSchema) {
@@ -1449,6 +1489,11 @@ async function runAgenticStructuredOutput(options) {
   }
   const validate = isStandardSchema(outputSchema) ? (data) => parseWithStandardSchema(outputSchema, data) : void 0;
   const nativeCombined = adapter.supportsCombinedToolsAndSchema?.(options.modelOptions) === true;
+  const mcpManager = MCPManager.from(mcp);
+  const mcpTools = await mcpManager.discover();
+  if (mcpTools.length > 0) {
+    textOptions.tools = [...textOptions.tools ?? [], ...mcpTools];
+  }
   const engine = new TextEngine(
     {
       adapter,
@@ -1464,7 +1509,11 @@ async function runAgenticStructuredOutput(options) {
     },
     logger
   );
-  for await (const _chunk of engine.run()) {
+  try {
+    for await (const _chunk of engine.run()) {
+    }
+  } finally {
+    await mcpManager.dispose();
   }
   const finalizationError = engine.getFinalizationError();
   if (finalizationError) {
@@ -1588,10 +1637,23 @@ function runStreamingStructuredOutput(options) {
   );
 }
 async function* runStreamingStructuredOutputImpl(options, jsonSchema) {
-  const { adapter, outputSchema, middleware, context, debug, ...textOptions } = options;
+  const {
+    adapter,
+    outputSchema,
+    middleware,
+    context,
+    debug,
+    mcp,
+    ...textOptions
+  } = options;
   const model = adapter.model;
   const logger = resolveDebugOption(debug);
   const nativeCombined = adapter.supportsCombinedToolsAndSchema?.(options.modelOptions) === true;
+  const mcpManager = MCPManager.from(mcp);
+  const mcpTools = await mcpManager.discover();
+  if (mcpTools.length > 0) {
+    textOptions.tools = [...textOptions.tools ?? [], ...mcpTools];
+  }
   const engine = new TextEngine(
     {
       adapter,
@@ -1606,8 +1668,12 @@ async function* runStreamingStructuredOutputImpl(options, jsonSchema) {
     },
     logger
   );
-  for await (const chunk of engine.run()) {
-    yield chunk;
+  try {
+    for await (const chunk of engine.run()) {
+      yield chunk;
+    }
+  } finally {
+    await mcpManager.dispose();
   }
 }
 export {