@datalayer/agent-runtimes 1.0.2 → 1.0.3

package/lib/hooks/useTools.d.ts

@@ -1,5 +1,5 @@
-import { type ToolCallState } from '../components/chat/store';
-import type { ToolParameter, ToolRenderProps, ToolRenderAndWaitProps, ToolLocation } from '../components/chat/types/tool';
+import { type ToolCallState } from '../stores';
+import type { ToolParameter, ToolRenderProps, ToolRenderAndWaitProps, ToolLocation } from '../types/tools';
 /**
  * Type signature for useFrontendTool hook
  * Compatible with CopilotKit's interface
@@ -69,11 +69,11 @@ export declare function useBackendTool(tool: {
 /**
  * Hook to get registered tools
  */
-export declare function useRegisteredTools(): import("..").ToolDefinition[];
+export declare function useRegisteredTools(): import("../types").ToolDefinition[];
 /**
  * Hook to get a specific tool by name
  */
-export declare function useTool(name: string): import("..").ToolRegistryEntry | undefined;
+export declare function useTool(name: string): import("../types").ToolRegistryEntry | undefined;
 /**
  * Hook to get pending tool calls
  */

package/lib/hooks/useTools.js

@@ -6,10 +6,10 @@
  * React hooks for chat tool registration and usage.
  * Compatible with CopilotKit's useFrontendTool pattern.
  *
- * @module components/chat/hooks/useTools
+ * @module components/hooks/useTools
  */
 import { useEffect, useMemo } from 'react';
-import { useChatStore } from '../components/chat/store';
+import { useChatStore } from '../stores';
 /**
  * Hook to register a frontend tool
  * Compatible with CopilotKit's useFrontendTool

package/lib/hooks/{useVercelChat.d.ts → useVercelAI.d.ts}

@@ -4,7 +4,7 @@ export interface Message {
     role: 'user' | 'assistant' | 'system';
     content: string;
 }
-export interface UseVercelChatOptions {
+export interface UseVercelAIOptions {
     /**
      * Base URL for the Vercel AI endpoint (e.g., 'http://localhost:8000')
      */
@@ -36,10 +36,10 @@ export interface UseVercelChatOptions {
  *
  * Example:
  * ```tsx
- * const { messages, sendMessage, isLoading } = useVercelChat({
+ * const { messages, sendMessage, isLoading } = useVercelAI({
  *   baseUrl: 'http://localhost:8888',
  *   agentId: 'demo-agent',
  * });
  * ```
  */
-export declare function useVercelChat(options?: UseVercelChatOptions): UseChatHelpers<UIMessage>;
+export declare function useVercelAI(options?: UseVercelAIOptions): UseChatHelpers<UIMessage>;

package/lib/hooks/{useVercelChat.js → useVercelAI.js}

@@ -19,13 +19,13 @@ import { DefaultChatTransport } from 'ai';
  *
  * Example:
  * ```tsx
- * const { messages, sendMessage, isLoading } = useVercelChat({
+ * const { messages, sendMessage, isLoading } = useVercelAI({
  *   baseUrl: 'http://localhost:8888',
  *   agentId: 'demo-agent',
  * });
  * ```
  */
-export function useVercelChat(options = {}) {
+export function useVercelAI(options = {}) {
     const { baseUrl = 'http://localhost:8888', agentId = 'demo-agent', onMessageSent, } = options;
     // Construct the chat endpoint URL
     const apiEndpoint = `${baseUrl}/api/v1/vercel-ai/chat`;

package/lib/{components/chat/components → identity}/AgentIdentity.d.ts

@@ -1,4 +1,4 @@
-import type { OAuthProvider, OAuthProviderConfig, Identity } from '../../../identity';
+import type { OAuthProvider, OAuthProviderConfig, Identity } from './types';
 /**
  * Token status information
  */

package/lib/{components/chat/components → identity}/AgentIdentity.js

@@ -7,13 +7,14 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * AgentIdentity component - Shows connected identity providers with token status.
  * Displays expiration details and allows reconnection if token expired.
  *
- * @module components/chat/components/AgentIdentity
+ * @module components/identity/AgentIdentity
  */
 import React, { useCallback, useMemo } from 'react';
 import { Box, Text, Button, Label, Avatar, Flash, Tooltip, } from '@primer/react';
 import { MarkGithubIcon, LinkIcon, UnlinkIcon, CheckCircleFillIcon, AlertIcon, ClockIcon, SyncIcon, KeyIcon, } from '@primer/octicons-react';
-import { useIdentity, IdentityButton } from '../../../identity';
-import { GITHUB_PROVIDER, GOOGLE_PROVIDER, KAGGLE_PROVIDER, } from '../../../identity';
+import { useIdentity } from './useIdentity';
+import { IdentityButton } from './IdentityConnect';
+import { GITHUB_PROVIDER, GOOGLE_PROVIDER, KAGGLE_PROVIDER } from './types';
 const PROVIDER_DISPLAY = {
     github: {
         name: 'GitHub',

package/lib/identity/index.d.ts

@@ -43,4 +43,5 @@ export { discoverAuthorizationServer, supportsDCR, registerClient, updateClientR
 export { useIdentityStore, useConnectedIdentities, useConnectedProviders, useIdentity as useIdentitySelector, useIsProviderConnected, usePendingAuthorization, useIdentityLoading, useIdentityError, configureBuiltinProviders, } from './identityStore';
 export { useIdentity, type UseIdentityOptions, type UseIdentityReturn, } from './useIdentity';
 export { IdentityButton, IdentityConnect, IdentityMenu, type IdentityButtonProps, type IdentityConnectProps, type IdentityMenuProps, } from './IdentityConnect';
+export { AgentIdentity, IdentityCard, getTokenStatus, formatDuration, formatExpirationStatus, type AgentIdentityProps, type IdentityCardProps, type TokenStatus, } from './AgentIdentity';
 export { OAuthCallback, type OAuthCallbackProps } from './OAuthCallback';

package/lib/identity/index.js

@@ -13,5 +13,7 @@ export { useIdentityStore, useConnectedIdentities, useConnectedProviders, useIde
 export { useIdentity, } from './useIdentity';
 // UI Components
 export { IdentityButton, IdentityConnect, IdentityMenu, } from './IdentityConnect';
+// Agent identity status UI
+export { AgentIdentity, IdentityCard, getTokenStatus, formatDuration, formatExpirationStatus, } from './AgentIdentity';
 // OAuth Callback
 export { OAuthCallback } from './OAuthCallback';

package/lib/index.d.ts

@@ -1,7 +1,8 @@
+export * from './chat';
 export * from './components';
-export * from './state';
-export * from './runtime';
+export * from './mcp';
+export * from './stores';
 export * from './identity';
 export * from './config';
 export * from './specs';
-export type { ConversationEntry, MCPServer, AgentSkillSpec, AgentSpec, AIModelRuntime, FrontendConfig, BuiltinTool, MCPServerTool, } from './types/Types';
+export type { AgentRuntimeData, AgentSpec, TeamSpec, GuardrailSpec, EvalSpec, TriggerSpec, OutputSpec, NotificationChannelSpec, MCPServer, SkillSpec, EnvvarSpec, } from './types';

package/lib/index.js

@@ -2,9 +2,10 @@
  * Copyright (c) 2025-2026 Datalayer, Inc.
  * Distributed under the terms of the Modified BSD License.
  */
+export * from './chat';
 export * from './components';
-export * from './state';
-export * from './runtime';
+export * from './mcp';
+export * from './stores';
 export * from './identity';
 export * from './config';
 export * from './specs';

package/lib/{components/chat/inference → inference}/BaseInferenceProvider.d.ts

@@ -1,11 +1,11 @@
 /**
  * Base inference provider class with common functionality.
  *
- * @module components/chat/inference/BaseInferenceProvider
+ * @module inference/BaseInferenceProvider
  */
 import type { InferenceProvider, InferenceProviderConfig, InferenceRequestOptions, InferenceResponse, StreamEventHandler } from '../types';
-import type { ChatMessage } from '../types/message';
-import type { ToolExecutionResult } from '../types/tool';
+import type { ChatMessage } from '../types/messages';
+import type { ToolExecutionResult } from '../types/tools';
 /**
  * Abstract base class for inference providers
  */

package/lib/{components/chat/inference → inference}/DatalayerInferenceProvider.d.ts

@@ -2,11 +2,11 @@
  * Datalayer inference provider implementation.
  * Uses Datalayer's API for LLM inference.
  *
- * @module components/chat/inference/DatalayerInferenceProvider
+ * @module inference/DatalayerInferenceProvider
  */
 import type { InferenceProviderConfig, InferenceRequestOptions, InferenceResponse, StreamEventHandler } from '../types';
-import type { ChatMessage } from '../types/message';
-import type { ToolExecutionResult } from '../types/tool';
+import type { ChatMessage } from '../types/messages';
+import type { ToolExecutionResult } from '../types/tools';
 import { BaseInferenceProvider } from './BaseInferenceProvider';
 /**
  * Finish reason type for inference responses

package/lib/{components/chat/inference → inference}/DatalayerInferenceProvider.js

@@ -2,7 +2,7 @@
  * Copyright (c) 2025-2026 Datalayer, Inc.
  * Distributed under the terms of the Modified BSD License.
  */
-import { generateMessageId, createAssistantMessage } from '../types/message';
+import { generateMessageId, createAssistantMessage } from '../types/messages';
 import { BaseInferenceProvider } from './BaseInferenceProvider';
 /**
  * Datalayer inference provider

package/lib/{components/chat/inference → inference}/SelfHostedInferenceProvider.d.ts

@@ -2,10 +2,10 @@
  * Self-hosted inference provider for custom endpoints.
  * Supports OpenAI-compatible APIs.
  *
- * @module components/chat/inference/SelfHostedInferenceProvider
+ * @module inference/SelfHostedInferenceProvider
  */
 import type { InferenceProviderConfig, InferenceRequestOptions, InferenceResponse, StreamEventHandler } from '../types';
-import type { ChatMessage } from '../types/message';
+import type { ChatMessage } from '../types/messages';
 import { BaseInferenceProvider } from './BaseInferenceProvider';
 /**
  * Self-hosted provider configuration

package/lib/{components/chat/inference → inference}/SelfHostedInferenceProvider.js

@@ -2,7 +2,7 @@
  * Copyright (c) 2025-2026 Datalayer, Inc.
  * Distributed under the terms of the Modified BSD License.
  */
-import { generateMessageId, createAssistantMessage } from '../types/message';
+import { generateMessageId, createAssistantMessage } from '../types/messages';
 import { BaseInferenceProvider } from './BaseInferenceProvider';
 /**
  * Self-hosted inference provider for custom OpenAI-compatible endpoints

package/lib/{components/chat/inference → inference}/index.d.ts

@@ -1,7 +1,7 @@
 /**
  * Inference provider exports for chat component.
  *
- * @module components/chat/inference
+ * @module inference
  */
 export { BaseInferenceProvider } from './BaseInferenceProvider';
 export { DatalayerInferenceProvider, type DatalayerInferenceConfig, } from './DatalayerInferenceProvider';

package/lib/{components/chat/inference → inference}/index.js

@@ -5,7 +5,7 @@
 /**
  * Inference provider exports for chat component.
  *
- * @module components/chat/inference
+ * @module inference
  */
 export { BaseInferenceProvider } from './BaseInferenceProvider';
 export { DatalayerInferenceProvider, } from './DatalayerInferenceProvider';

package/lib/lexical/ChatInlinePlugin.d.ts

@@ -1,5 +1,5 @@
 import { type LexicalCommand } from 'lexical';
-import { type ChatInlineProtocolConfig } from '../components/chat/components/ChatInline';
+import { type ChatInlineProtocolConfig } from '../chat/ChatInline';
 /**
  * Lexical commands for selection preservation
  */

package/lib/lexical/ChatInlinePlugin.js

@@ -41,7 +41,7 @@ import { $getSelection, $isRangeSelection, $createParagraphNode, $createTextNode
 import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext';
 import { autoUpdate, hide, limitShift, offset, shift, size, useFloating, } from '@floating-ui/react-dom';
 import { Box } from '@primer/react';
-import { ChatInline, } from '../components/chat/components/ChatInline';
+import { ChatInline } from '../chat/ChatInline';
 // Margin from editor edges
 const MARGIN_X = 32;
 /**

package/lib/{components → mcp}/McpServerManager.d.ts

@@ -1,5 +1,4 @@
-import type { McpServerSelection } from './chat/types';
-export type { McpServerSelection };
+import type { McpServerSelection } from '../types';
 export interface McpServerManagerProps {
     /** Base URL for the API */
     baseUrl: string;

package/lib/mcp/index.d.ts

@@ -0,0 +1 @@
+export { McpServerManager } from './McpServerManager';

package/lib/{specs/agents/codeai → mcp}/index.js

@@ -2,4 +2,4 @@
  * Copyright (c) 2025-2026 Datalayer, Inc.
  * Distributed under the terms of the Modified BSD License.
  */
-export * from './agents';
+export { McpServerManager } from './McpServerManager';

package/lib/{components/chat/middleware → middleware}/MiddlewarePipeline.d.ts

@@ -2,11 +2,11 @@
  * Middleware pipeline for chat component.
  * Provides hooks for intercepting and modifying chat operations.
  *
- * @module components/chat/middleware/MiddlewarePipeline
+ * @module middleware/MiddlewarePipeline
  */
 import type { ChatMiddleware, MiddlewareContext, BeforeRequestMiddleware, AfterRequestMiddleware, ToolCallMiddleware, ErrorMiddleware } from '../types/middleware';
-import type { ChatMessage } from '../types/message';
-import type { ToolDefinition, ToolCallRequest, ToolExecutionResult } from '../types/tool';
+import type { ChatMessage } from '../types/messages';
+import type { ToolDefinition, ToolCallRequest, ToolExecutionResult } from '../types/tools';
 import type { InferenceRequestOptions, InferenceResponse } from '../types/inference';
 /**
  * Request context for before-request middleware

package/lib/{components/chat/middleware → middleware}/index.d.ts

@@ -1,7 +1,7 @@
 /**
  * Middleware exports for chat component.
  *
- * @module components/chat/middleware
+ * @module middleware
  */
 export { MiddlewarePipeline, createMiddleware, loggingMiddleware, createHITLMiddleware, type RequestContext, type ResponseContext, } from './MiddlewarePipeline';
 export type { ChatMiddleware, MiddlewareContext } from '../types/middleware';

package/lib/{components/chat/middleware → middleware}/index.js

@@ -5,6 +5,6 @@
 /**
  * Middleware exports for chat component.
  *
- * @module components/chat/middleware
+ * @module middleware
  */
 export { MiddlewarePipeline, createMiddleware, loggingMiddleware, createHITLMiddleware, } from './MiddlewarePipeline';

package/lib/{components/chat/protocols → protocols}/A2AAdapter.d.ts

@@ -1,11 +1,11 @@
 /**
  * A2A (Agent-to-Agent) protocol adapter using SSE transport.
  *
- * @module components/chat/protocols/A2AAdapter
+ * @module protocols/A2AAdapter
  */
-import type { ProtocolAdapterConfig, AgentCard } from '../types/protocol';
-import type { ChatMessage } from '../types/message';
-import type { ToolDefinition, ToolExecutionResult } from '../types/tool';
+import type { ChatMessage } from '../types/messages';
+import type { ProtocolAdapterConfig, AgentCard } from '../types';
+import type { ToolDefinition, ToolExecutionResult } from '../types/tools';
 import { BaseProtocolAdapter } from './BaseProtocolAdapter';
 /**
  * A2A specific configuration
@@ -21,8 +21,8 @@ export interface A2AAdapterConfig extends ProtocolAdapterConfig {
  * Uses JSON-RPC 2.0 with SSE streaming for responses
  */
 export declare class A2AAdapter extends BaseProtocolAdapter {
-    readonly type: "a2a";
-    readonly transport: "sse";
+    readonly protocol: "a2a";
+    readonly protocolTransport: "sse";
     private a2aConfig;
     private abortController;
     private agentCard;

package/lib/{components/chat/protocols → protocols}/A2AAdapter.js

@@ -2,15 +2,15 @@
  * Copyright (c) 2025-2026 Datalayer, Inc.
  * Distributed under the terms of the Modified BSD License.
  */
-import { generateMessageId, createAssistantMessage } from '../types/message';
+import { generateMessageId, createAssistantMessage } from '../types/messages';
 import { BaseProtocolAdapter } from './BaseProtocolAdapter';
 /**
  * A2A protocol adapter
  * Uses JSON-RPC 2.0 with SSE streaming for responses
  */
 export class A2AAdapter extends BaseProtocolAdapter {
-    type = 'a2a';
-    transport = 'sse';
+    protocol = 'a2a';
+    protocolTransport = 'sse';
     a2aConfig;
     abortController = null;
     agentCard = null;

package/lib/{components/chat/protocols → protocols}/ACPAdapter.d.ts

@@ -11,12 +11,12 @@
  * - Session updates via session/update notifications
  * - Permission handling via session/request_permission
  *
- * @module components/chat/protocols/ACPAdapter
+ * @module protocols/ACPAdapter
  */
 import { type PermissionOption, type ToolCallUpdate } from '@agentclientprotocol/sdk';
-import type { ProtocolAdapterConfig } from '../types/protocol';
-import type { ChatMessage } from '../types/message';
-import type { ToolDefinition, ToolExecutionResult } from '../types/tool';
+import type { ProtocolAdapterConfig } from '../types';
+import type { ChatMessage } from '../types/messages';
+import type { ToolDefinition, ToolExecutionResult } from '../types/tools';
 import { BaseProtocolAdapter } from './BaseProtocolAdapter';
 /**
  * ACP session tracking
@@ -71,8 +71,8 @@ export interface ACPAdapterConfig extends ProtocolAdapterConfig {
  * Uses WebSocket with JSON-RPC 2.0 for bidirectional communication
  */
 export declare class ACPAdapter extends BaseProtocolAdapter {
-    readonly type: "acp";
-    readonly transport: "websocket";
+    readonly protocol: "acp";
+    readonly protocolTransport: "websocket";
     private acpConfig;
     private ws;
     private session;

package/lib/{components/chat/protocols → protocols}/ACPAdapter.js

@@ -15,18 +15,18 @@
  * - Session updates via session/update notifications
  * - Permission handling via session/request_permission
  *
- * @module components/chat/protocols/ACPAdapter
+ * @module protocols/ACPAdapter
  */
 import { PROTOCOL_VERSION as ACP_PROTOCOL_VERSION, AGENT_METHODS, CLIENT_METHODS, } from '@agentclientprotocol/sdk';
-import { generateMessageId, createAssistantMessage } from '../types/message';
+import { generateMessageId, createAssistantMessage } from '../types/messages';
 import { BaseProtocolAdapter } from './BaseProtocolAdapter';
 /**
  * ACP protocol adapter
  * Uses WebSocket with JSON-RPC 2.0 for bidirectional communication
  */
 export class ACPAdapter extends BaseProtocolAdapter {
-    type = 'acp';
-    transport = 'websocket';
+    protocol = 'acp';
+    protocolTransport = 'websocket';
     acpConfig;
     ws = null;
     session = null;

package/lib/{components/chat/protocols → protocols}/AGUIAdapter.d.ts

@@ -1,11 +1,11 @@
 /**
  * AG-UI protocol adapter using SSE transport.
  *
- * @module components/chat/protocols/AGUIAdapter
+ * @module protocols/AGUIAdapter
  */
-import type { ProtocolAdapterConfig } from '../types/protocol';
-import type { ChatMessage } from '../types/message';
-import type { ToolDefinition, ToolExecutionResult } from '../types/tool';
+import type { ProtocolAdapterConfig } from '../types';
+import type { ChatMessage } from '../types/messages';
+import type { ToolDefinition, ToolExecutionResult } from '../types/tools';
 import { BaseProtocolAdapter } from './BaseProtocolAdapter';
 /**
  * AG-UI specific configuration
@@ -19,8 +19,8 @@ export interface AGUIAdapterConfig extends ProtocolAdapterConfig {
  * Uses HTTP POST with SSE streaming for responses
  */
 export declare class AGUIAdapter extends BaseProtocolAdapter {
-    readonly type: "ag-ui";
-    readonly transport: "sse";
+    readonly protocol: "ag-ui";
+    readonly protocolTransport: "sse";
     private aguiConfig;
     private abortController;
     private currentThreadId;
@@ -31,6 +31,9 @@ export declare class AGUIAdapter extends BaseProtocolAdapter {
     private lastTurnContent;
     private lastTools;
     private isContinuation;
+    private _streamParsingDepth;
+    private _streamDonePromise;
+    private _streamDoneResolve;
     constructor(config: AGUIAdapterConfig);
     /**
      * Connect to AG-UI endpoint (SSE doesn't require persistent connection)
@@ -78,6 +81,11 @@ export declare class AGUIAdapter extends BaseProtocolAdapter {
      * shared state, and duplicate agent responses.
      */
     sendToolResult(toolCallId: string, result: ToolExecutionResult): Promise<void>;
+    /**
+     * Stop generation / abort the in-flight SSE stream without tearing down
+     * the adapter connection.
+     */
+    stopGeneration(): void;
     /**
      * Check feature support
      */

package/lib/{components/chat/protocols → protocols}/AGUIAdapter.js

@@ -2,15 +2,15 @@
  * Copyright (c) 2025-2026 Datalayer, Inc.
  * Distributed under the terms of the Modified BSD License.
  */
-import { generateMessageId, createAssistantMessage } from '../types/message';
+import { generateMessageId, createAssistantMessage } from '../types/messages';
 import { BaseProtocolAdapter } from './BaseProtocolAdapter';
 /**
  * AG-UI protocol adapter
  * Uses HTTP POST with SSE streaming for responses
  */
 export class AGUIAdapter extends BaseProtocolAdapter {
-    type = 'ag-ui';
-    transport = 'sse';
+    protocol = 'ag-ui';
+    protocolTransport = 'sse';
     aguiConfig;
     abortController = null;
     currentThreadId = null;
@@ -34,6 +34,15 @@ export class AGUIAdapter extends BaseProtocolAdapter {
     // Continuation tracking — each continuation creates a new message bubble
     // that appears after the tool calls in the chat display.
     isContinuation = false;
+    // Stream parsing depth counter — prevents premature continuations.
+    // When parseSSEStream is active (depth > 0), the SSE stream may still
+    // emit more tool calls.  A fast tool handler could resolve between
+    // reader.read() yields, causing sendToolResult to see allResolved=true
+    // when only a subset of tool calls have been dispatched.  This counter
+    // lets sendToolResult defer the continuation until parsing finishes.
+    _streamParsingDepth = 0;
+    _streamDonePromise = null;
+    _streamDoneResolve = null;
     constructor(config) {
         super(config);
         // Ensure baseUrl ends with trailing slash (required for mounted Starlette apps)
@@ -243,11 +252,26 @@ export class AGUIAdapter extends BaseProtocolAdapter {
             result,
         });
         // 4. Check whether ALL pending tool calls now have results
-        const allResolved = Array.from(this.pendingToolCalls.keys()).every(id => this.collectedToolResults.has(id));
+        let allResolved = Array.from(this.pendingToolCalls.keys()).every(id => this.collectedToolResults.has(id));
         if (!allResolved) {
             // Other tool calls are still executing — wait for them
             return;
         }
+        // 4b. Guard against premature continuations.  If the SSE stream is
+        //     still being parsed, more TOOL_CALL events may arrive.  A fast
+        //     tool handler can resolve between reader.read() yields, causing
+        //     allResolved=true when only a subset of tool calls have been
+        //     dispatched.  We wait for the current stream to finish, then
+        //     re-check — by then all tool calls from this stream are in
+        //     pendingToolCalls.
+        if (this._streamParsingDepth > 0 && this._streamDonePromise) {
+            await this._streamDonePromise;
+            // Re-check: the stream may have emitted additional tool calls
+            allResolved = Array.from(this.pendingToolCalls.keys()).every(id => this.collectedToolResults.has(id));
+            if (!allResolved) {
+                return;
+            }
+        }
         // ── All tool results collected — build ONE combined continuation ──
         // 5. Build a single assistant message containing ALL tool calls
         const toolCalls = Array.from(this.collectedToolResults.values()).map(tr => ({
@@ -317,6 +341,14 @@ export class AGUIAdapter extends BaseProtocolAdapter {
             threadId: this.currentThreadId || undefined,
         });
     }
+    /**
+     * Stop generation / abort the in-flight SSE stream without tearing down
+     * the adapter connection.
+     */
+    stopGeneration() {
+        this.abortController?.abort();
+        this.abortController = null;
+    }
     /**
      * Check feature support
      */
@@ -351,6 +383,14 @@ export class AGUIAdapter extends BaseProtocolAdapter {
         let currentTurnContent = '';
         // Consume the flag — it was set by sendToolResult for this call only
         this.isContinuation = false;
+        // Track stream parsing depth so that sendToolResult can defer
+        // premature continuations while the stream is still emitting events.
+        if (this._streamParsingDepth === 0) {
+            this._streamDonePromise = new Promise(resolve => {
+                this._streamDoneResolve = resolve;
+            });
+        }
+        this._streamParsingDepth++;
         try {
             while (true) {
                 const { done, value } = await reader.read();
@@ -397,6 +437,15 @@ export class AGUIAdapter extends BaseProtocolAdapter {
         }
         finally {
             reader.releaseLock();
+            this._streamParsingDepth--;
+            if (this._streamParsingDepth === 0) {
+                // All stream parsing is done — wake up any sendToolResult callers
+                // that deferred their continuation because the stream was still active.
+                const resolve = this._streamDoneResolve;
+                this._streamDonePromise = null;
+                this._streamDoneResolve = null;
+                resolve?.();
+            }
         }
     }
     /**
@@ -422,12 +471,15 @@ export class AGUIAdapter extends BaseProtocolAdapter {
                 break;
             case 'TEXT_MESSAGE_START': {
                 const messageId = event.messageId;
-                if (!context.getCurrentMessageId()) {
-                    context.setCurrentMessageId(messageId || generateMessageId());
-                }
-                if (!context.getCurrentContent()) {
-                    context.resetContent();
-                }
+                // Always generate a fresh message ID and reset content for each
+                // TEXT_MESSAGE_START.  When backend tools execute, the entire flow
+                // (pre-tool text → tool call → post-tool text) happens in a single
+                // SSE stream.  Without resetting here, the post-tool text would
+                // reuse the same message ID and update IN PLACE at the original
+                // position BEFORE the tool call indicators, instead of appearing
+                // as a new message AFTER them.
+                context.setCurrentMessageId(messageId || generateMessageId());
+                context.resetContent();
                 break;
             }
             case 'TEXT_MESSAGE_CONTENT': {
@@ -621,6 +673,16 @@ export class AGUIAdapter extends BaseProtocolAdapter {
                         timestamp: new Date(),
                     });
                 }
+                // Signal that this run is done.  If there are pending frontend
+                // tool calls the continuation triggered by sendToolResult will
+                // start a new run — the 'done' event will be emitted at the end
+                // of that final run instead.
+                if (this.pendingToolCalls.size === 0) {
+                    this.emit({
+                        type: 'done',
+                        timestamp: new Date(),
+                    });
+                }
                 break;
             }
             case 'RUN_ERROR': {

package/lib/{components/chat/protocols → protocols}/BaseProtocolAdapter.d.ts

@@ -1,17 +1,17 @@
 /**
  * Base protocol adapter class with common functionality.
  *
- * @module components/chat/protocols/BaseProtocolAdapter
+ * @module protocols/BaseProtocolAdapter
  */
-import type { ProtocolAdapter, ProtocolAdapterConfig, TransportType, ProtocolTransport, ProtocolConnectionState, ProtocolEvent, ProtocolEventHandler, AgentCard } from '../types/protocol';
-import type { ChatMessage } from '../types/message';
-import type { ToolDefinition, ToolExecutionResult } from '../types/tool';
+import type { ProtocolAdapter, ProtocolAdapterConfig, Protocol, ProtocolTransport, ProtocolConnectionState, ProtocolEvent, ProtocolEventHandler, AgentCard } from '../types';
+import type { ChatMessage } from '../types/messages';
+import type { ToolDefinition, ToolExecutionResult } from '../types/tools';
 /**
  * Abstract base class for protocol adapters
  */
 export declare abstract class BaseProtocolAdapter implements ProtocolAdapter {
-    abstract readonly type: TransportType;
-    abstract readonly transport: ProtocolTransport;
+    abstract readonly protocol: Protocol;
+    abstract readonly protocolTransport: ProtocolTransport;
     protected config: ProtocolAdapterConfig;
     protected _connectionState: ProtocolConnectionState;
     protected eventHandlers: Set<ProtocolEventHandler>;

package/lib/{components/chat/protocols → protocols}/BaseProtocolAdapter.js

@@ -53,7 +53,7 @@ export class BaseProtocolAdapter {
                 handler(event);
             }
             catch (error) {
-                console.error(`[${this.type}] Error in event handler:`, error);
+                console.error(`[${this.protocol}] Error in event handler:`, error);
             }
         }
     }