@tanstack/ai 0.26.1 → 0.28.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,12 +78,12 @@ export interface TextActivityOptions<TAdapter extends AnyTextAdapter, TSchema ex
     tools?: Array<(AnyRuntimeTool & {
         readonly '~toolKind'?: never;
     }) | ProviderTool<string, TAdapter['~types']['toolCapabilities'][number]>> | undefined;
-    /** Controls the randomness of the output. Higher values make output more random. Range: [0.0, 2.0] */
-    temperature?: TextOptions['temperature'];
-    /** Nucleus sampling parameter. The model considers tokens with topP probability mass. */
-    topP?: TextOptions['topP'];
-    /** The maximum number of tokens to generate in the response. */
-    maxTokens?: TextOptions['maxTokens'];
+    /**
+     * 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,
@@ -297,11 +318,8 @@ class TextEngine {
   }
   beforeRun() {
     this.streamStartTime = Date.now();
-    const { tools, temperature, topP, maxTokens, metadata } = this.params;
+    const { tools, metadata } = this.params;
     const options = {};
-    if (temperature !== void 0) options.temperature = temperature;
-    if (topP !== void 0) options.topP = topP;
-    if (maxTokens !== void 0) options.maxTokens = maxTokens;
     if (metadata !== void 0) options.metadata = metadata;
     this.eventOptions = Object.keys(options).length > 0 ? options : void 0;
     this.eventToolNames = tools?.map((t) => t.name);
@@ -336,7 +354,7 @@ class TextEngine {
     });
   }
   async *streamModelResponse() {
-    const { temperature, topP, maxTokens, metadata, modelOptions } = this.params;
+    const { metadata, modelOptions } = this.params;
     const tools = this.tools;
     const toolsWithJsonSchemas = tools.map((tool) => ({
       ...tool,
@@ -359,9 +377,6 @@ class TextEngine {
       model: this.params.model,
       messages: this.messages,
       tools: toolsWithJsonSchemas,
-      temperature,
-      topP,
-      maxTokens,
       metadata,
       request: this.effectiveRequest,
       modelOptions,
@@ -569,7 +584,8 @@ class TextEngine {
           );
         }
       },
-      this.middlewareCtx.context
+      this.middlewareCtx.context,
+      this.toolAbortSignal
     );
     const executionResult = yield* this.drainToolCallGenerator(generator);
     if (this.isMiddlewareAborted()) {
@@ -700,7 +716,8 @@ class TextEngine {
           );
         }
       },
-      this.middlewareCtx.context
+      this.middlewareCtx.context,
+      this.toolAbortSignal
     );
     const executionResult = yield* this.drainToolCallGenerator(generator);
     this.middlewareCtx.phase = "afterTools";
@@ -1024,9 +1041,6 @@ class TextEngine {
       chatOptions: {
         model: this.params.model,
         messages: this.messages,
-        temperature: postOnConfig.temperature,
-        topP: postOnConfig.topP,
-        maxTokens: postOnConfig.maxTokens,
         metadata: postOnConfig.metadata,
         modelOptions: postOnConfig.modelOptions,
         systemPrompts: postOnConfig.systemPrompts,
@@ -1330,9 +1344,6 @@ class TextEngine {
       messages: this.messages,
       systemPrompts: [...this.systemPrompts],
       tools: [...this.tools],
-      temperature: this.params.temperature,
-      topP: this.params.topP,
-      maxTokens: this.params.maxTokens,
       metadata: this.params.metadata,
       modelOptions: this.params.modelOptions
     };
@@ -1343,9 +1354,6 @@ class TextEngine {
     this.tools = config.tools;
     this.params = {
       ...this.params,
-      temperature: config.temperature,
-      topP: config.topP,
-      maxTokens: config.maxTokens,
       metadata: config.metadata,
       modelOptions: config.modelOptions
     };
@@ -1426,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,
@@ -1438,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) {
@@ -1450,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) {
@@ -1464,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,
@@ -1479,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) {
@@ -1603,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,
@@ -1621,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 {