@assistant-ui/react 0.4.7 → 0.5.1

package/dist/index.js

@@ -53,11 +53,13 @@ __export(src_exports, {
   ThreadWelcome: () => thread_welcome_default,
   UserActionBar: () => user_action_bar_default,
   UserMessage: () => user_message_default,
+  fromCoreMessage: () => fromCoreMessage,
   fromCoreMessages: () => fromCoreMessages,
   fromLanguageModelMessages: () => fromLanguageModelMessages,
   fromLanguageModelTools: () => fromLanguageModelTools,
   makeAssistantTool: () => makeAssistantTool,
   makeAssistantToolUI: () => makeAssistantToolUI,
+  toCoreMessage: () => toCoreMessage,
   toCoreMessages: () => toCoreMessages,
   toLanguageModelMessages: () => toLanguageModelMessages,
   toLanguageModelTools: () => toLanguageModelTools,
@@ -397,13 +399,17 @@ var ThreadProvider = ({
     (0, import_react4.useCallback)(
       (thread) => {
         const onThreadUpdate = () => {
-          context.useThread.setState(
-            Object.freeze({
-              isRunning: context.useThreadRuntime.getState().isRunning
-            }),
-            true
-          );
-          context.useThreadMessages.setState(thread.messages, true);
+          if (thread.isRunning !== context.useThread.getState().isRunning) {
+            context.useThread.setState(
+              Object.freeze({
+                isRunning: thread.isRunning
+              }),
+              true
+            );
+          }
+          if (thread.messages !== context.useThreadMessages.getState()) {
+            context.useThreadMessages.setState(thread.messages, true);
+          }
         };
         onThreadUpdate();
         return thread.subscribe(onThreadUpdate);
@@ -1256,12 +1262,28 @@ var import_react38 = require("react");
 var import_react34 = require("react");
 var import_zustand10 = require("zustand");
 var import_jsx_runtime13 = require("react/jsx-runtime");
-var DONE_STATUS = { type: "done" };
+var COMPLETE_STATUS = {
+  type: "complete"
+};
+var toContentPartStatus = (message, partIndex, part) => {
+  if (message.role !== "assistant") return COMPLETE_STATUS;
+  const isLastPart = partIndex === message.content.length - 1;
+  if (part.type !== "tool-call") {
+    if ("reason" in message.status && message.status.reason === "tool-calls" && isLastPart)
+      throw new Error(
+        "Encountered unexpected requires-action status. This is likely an internal bug in assistant-ui."
+      );
+    return isLastPart ? message.status : COMPLETE_STATUS;
+  }
+  if (!!part.result) {
+    return COMPLETE_STATUS;
+  }
+  return message.status;
+};
 var syncContentPart = ({ message }, useContentPart, partIndex) => {
   const part = message.content[partIndex];
   if (!part) return;
-  const messageStatus = message.role === "assistant" ? message.status : DONE_STATUS;
-  const status = partIndex === message.content.length - 1 ? messageStatus : DONE_STATUS;
+  const status = toContentPartStatus(message, partIndex, part);
   const currentState = useContentPart.getState();
   if (currentState.part === part && currentState.status === status) return;
   useContentPart.setState(
@@ -1414,7 +1436,7 @@ ContentPartPrimitiveDisplay.displayName = "ContentPartPrimitive.Display";
 // src/primitives/contentPart/ContentPartInProgress.tsx
 var ContentPartPrimitiveInProgress = ({ children }) => {
   const { useContentPart } = useContentPartContext();
-  const isInProgress = useContentPart((c) => c.status.type === "in_progress");
+  const isInProgress = useContentPart((c) => c.status.type === "running");
   return isInProgress ? children : null;
 };
 ContentPartPrimitiveInProgress.displayName = "ContentPartPrimitive.InProgress";
@@ -1453,10 +1475,16 @@ var MessageContentPartComponent = ({
   const type = part.type;
   switch (type) {
     case "text":
+      if (status.type === "requires-action")
+        throw new Error("Encountered unexpected requires-action status");
       return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Text2, { part, status });
     case "image":
+      if (status.type === "requires-action")
+        throw new Error("Encountered unexpected requires-action status");
       return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Image2, { part, status });
     case "ui":
+      if (status.type === "requires-action")
+        throw new Error("Encountered unexpected requires-action status");
       return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(UI, { part, status });
     case "tool-call": {
       const Tool = by_name[part.toolName] || Fallback2;
@@ -2028,6 +2056,182 @@ var generateId = (0, import_non_secure.customAlphabet)(
 var optimisticPrefix = "__optimistic__";
 var generateOptimisticId = () => `${optimisticPrefix}${generateId()}`;
 
+// src/internal.ts
+var internal_exports = {};
+__export(internal_exports, {
+  BaseAssistantRuntime: () => BaseAssistantRuntime,
+  MessageRepository: () => MessageRepository,
+  ProxyConfigProvider: () => ProxyConfigProvider,
+  TooltipIconButton: () => TooltipIconButton,
+  generateId: () => generateId,
+  useSmooth: () => useSmooth
+});
+
+// src/runtimes/core/BaseAssistantRuntime.tsx
+var BaseAssistantRuntime = class {
+  constructor(_thread) {
+    this._thread = _thread;
+    this._thread = _thread;
+  }
+  get thread() {
+    return this._thread;
+  }
+  set thread(thread) {
+    this._thread = thread;
+    this.subscriptionHandler();
+  }
+  _subscriptions = /* @__PURE__ */ new Set();
+  subscribe(callback) {
+    this._subscriptions.add(callback);
+    return () => this._subscriptions.delete(callback);
+  }
+  subscriptionHandler = () => {
+    for (const callback of this._subscriptions) callback();
+  };
+};
+
+// src/ui/base/tooltip-icon-button.tsx
+var import_react52 = require("react");
+
+// src/ui/base/tooltip.tsx
+var TooltipPrimitive = __toESM(require("@radix-ui/react-tooltip"));
+
+// src/ui/utils/withDefaults.tsx
+var import_react50 = require("react");
+var import_classnames = __toESM(require("classnames"));
+var import_jsx_runtime25 = require("react/jsx-runtime");
+var withDefaultProps = ({
+  className,
+  ...defaultProps
+}) => ({ className: classNameProp, ...props }) => {
+  return {
+    className: (0, import_classnames.default)(className, classNameProp),
+    ...defaultProps,
+    ...props
+  };
+};
+var withDefaults = (Component, defaultProps) => {
+  const getProps = withDefaultProps(defaultProps);
+  const WithDefaults = (0, import_react50.forwardRef)(
+    (props, ref) => {
+      const ComponentAsAny = Component;
+      return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(ComponentAsAny, { ...getProps(props), ref });
+    }
+  );
+  WithDefaults.displayName = "withDefaults(" + (typeof Component === "string" ? Component : Component.displayName) + ")";
+  return WithDefaults;
+};
+
+// src/ui/base/tooltip.tsx
+var import_jsx_runtime26 = require("react/jsx-runtime");
+var Tooltip = (props) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(TooltipPrimitive.Provider, { children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(TooltipPrimitive.Root, { ...props }) });
+};
+Tooltip.displayName = "Tooltip";
+var TooltipTrigger = TooltipPrimitive.Trigger;
+var TooltipContent = withDefaults(TooltipPrimitive.Content, {
+  sideOffset: 4,
+  className: "aui-tooltip-content"
+});
+TooltipContent.displayName = "TooltipContent";
+
+// src/ui/base/button.tsx
+var import_class_variance_authority = require("class-variance-authority");
+var import_react_primitive11 = require("@radix-ui/react-primitive");
+var import_react51 = require("react");
+var import_jsx_runtime27 = require("react/jsx-runtime");
+var buttonVariants = (0, import_class_variance_authority.cva)("aui-button", {
+  variants: {
+    variant: {
+      default: "aui-button-primary",
+      outline: "aui-button-outline",
+      ghost: "aui-button-ghost"
+    },
+    size: {
+      default: "aui-button-medium",
+      icon: "aui-button-icon"
+    }
+  },
+  defaultVariants: {
+    variant: "default",
+    size: "default"
+  }
+});
+var Button = (0, import_react51.forwardRef)(
+  ({ className, variant, size, ...props }, ref) => {
+    return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
+      import_react_primitive11.Primitive.button,
+      {
+        className: buttonVariants({ variant, size, className }),
+        ...props,
+        ref
+      }
+    );
+  }
+);
+Button.displayName = "Button";
+
+// src/ui/base/tooltip-icon-button.tsx
+var import_jsx_runtime28 = require("react/jsx-runtime");
+var TooltipIconButton = (0, import_react52.forwardRef)(({ children, tooltip, side = "bottom", ...rest }, ref) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)(Tooltip, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(TooltipTrigger, { asChild: true, children: /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)(Button, { variant: "ghost", size: "icon", ...rest, ref, children: [
+      children,
+      /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("span", { className: "aui-sr-only", children: tooltip })
+    ] }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(TooltipContent, { side, children: tooltip })
+  ] });
+});
+TooltipIconButton.displayName = "TooltipIconButton";
+
+// src/runtimes/edge/converters/fromCoreMessage.ts
+var fromCoreMessages = (message) => {
+  return message.map((message2) => fromCoreMessage(message2));
+};
+var fromCoreMessage = (message, {
+  id = generateId(),
+  status = { type: "complete", reason: "unknown" }
+} = {}) => {
+  const commonProps = {
+    id,
+    createdAt: /* @__PURE__ */ new Date()
+  };
+  const role = message.role;
+  switch (role) {
+    case "assistant":
+      return {
+        ...commonProps,
+        role,
+        content: message.content.map((part) => {
+          if (part.type === "tool-call") {
+            return {
+              ...part,
+              argsText: JSON.stringify(part.args)
+            };
+          }
+          return part;
+        }),
+        status
+      };
+    case "user":
+      return {
+        ...commonProps,
+        role,
+        content: message.content
+      };
+    case "system":
+      return {
+        ...commonProps,
+        role,
+        content: message.content
+      };
+    default: {
+      const unsupportedRole = role;
+      throw new Error(`Unknown message role: ${unsupportedRole}`);
+    }
+  }
+};
+
 // src/runtimes/utils/MessageRepository.tsx
 var findHead = (message) => {
   if (message.next) return findHead(message.next);
@@ -2118,12 +2322,13 @@ var MessageRepository = class {
     do {
       optimisticId = generateOptimisticId();
     } while (this.messages.has(optimisticId));
-    this.addOrUpdateMessage(parentId, {
-      ...message,
-      id: optimisticId,
-      createdAt: /* @__PURE__ */ new Date(),
-      ...message.role === "assistant" ? { status: "in_progress" } : void 0
-    });
+    this.addOrUpdateMessage(
+      parentId,
+      fromCoreMessage(message, {
+        id: optimisticId,
+        status: { type: "running" }
+      })
+    );
     return optimisticId;
   }
   deleteMessage(messageId, replacementId) {
@@ -2190,134 +2395,6 @@ var MessageRepository = class {
   }
 };
 
-// src/runtimes/core/BaseAssistantRuntime.tsx
-var BaseAssistantRuntime = class {
-  constructor(_thread) {
-    this._thread = _thread;
-    this._thread = _thread;
-  }
-  get thread() {
-    return this._thread;
-  }
-  set thread(thread) {
-    this._thread = thread;
-    this.subscriptionHandler();
-  }
-  _subscriptions = /* @__PURE__ */ new Set();
-  subscribe(callback) {
-    this._subscriptions.add(callback);
-    return () => this._subscriptions.delete(callback);
-  }
-  subscriptionHandler = () => {
-    for (const callback of this._subscriptions) callback();
-  };
-};
-
-// src/internal.ts
-var internal_exports = {};
-__export(internal_exports, {
-  BaseAssistantRuntime: () => BaseAssistantRuntime,
-  MessageRepository: () => MessageRepository,
-  ProxyConfigProvider: () => ProxyConfigProvider,
-  TooltipIconButton: () => TooltipIconButton,
-  generateId: () => generateId,
-  useSmooth: () => useSmooth
-});
-
-// src/ui/base/tooltip-icon-button.tsx
-var import_react52 = require("react");
-
-// src/ui/base/tooltip.tsx
-var TooltipPrimitive = __toESM(require("@radix-ui/react-tooltip"));
-
-// src/ui/utils/withDefaults.tsx
-var import_react50 = require("react");
-var import_classnames = __toESM(require("classnames"));
-var import_jsx_runtime25 = require("react/jsx-runtime");
-var withDefaultProps = ({
-  className,
-  ...defaultProps
-}) => ({ className: classNameProp, ...props }) => {
-  return {
-    className: (0, import_classnames.default)(className, classNameProp),
-    ...defaultProps,
-    ...props
-  };
-};
-var withDefaults = (Component, defaultProps) => {
-  const getProps = withDefaultProps(defaultProps);
-  const WithDefaults = (0, import_react50.forwardRef)(
-    (props, ref) => {
-      const ComponentAsAny = Component;
-      return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(ComponentAsAny, { ...getProps(props), ref });
-    }
-  );
-  WithDefaults.displayName = "withDefaults(" + (typeof Component === "string" ? Component : Component.displayName) + ")";
-  return WithDefaults;
-};
-
-// src/ui/base/tooltip.tsx
-var import_jsx_runtime26 = require("react/jsx-runtime");
-var Tooltip = (props) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(TooltipPrimitive.Provider, { children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(TooltipPrimitive.Root, { ...props }) });
-};
-Tooltip.displayName = "Tooltip";
-var TooltipTrigger = TooltipPrimitive.Trigger;
-var TooltipContent = withDefaults(TooltipPrimitive.Content, {
-  sideOffset: 4,
-  className: "aui-tooltip-content"
-});
-TooltipContent.displayName = "TooltipContent";
-
-// src/ui/base/button.tsx
-var import_class_variance_authority = require("class-variance-authority");
-var import_react_primitive11 = require("@radix-ui/react-primitive");
-var import_react51 = require("react");
-var import_jsx_runtime27 = require("react/jsx-runtime");
-var buttonVariants = (0, import_class_variance_authority.cva)("aui-button", {
-  variants: {
-    variant: {
-      default: "aui-button-primary",
-      outline: "aui-button-outline",
-      ghost: "aui-button-ghost"
-    },
-    size: {
-      default: "aui-button-medium",
-      icon: "aui-button-icon"
-    }
-  },
-  defaultVariants: {
-    variant: "default",
-    size: "default"
-  }
-});
-var Button = (0, import_react51.forwardRef)(
-  ({ className, variant, size, ...props }, ref) => {
-    return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
-      import_react_primitive11.Primitive.button,
-      {
-        className: buttonVariants({ variant, size, className }),
-        ...props,
-        ref
-      }
-    );
-  }
-);
-Button.displayName = "Button";
-
-// src/ui/base/tooltip-icon-button.tsx
-var import_jsx_runtime28 = require("react/jsx-runtime");
-var TooltipIconButton = (0, import_react52.forwardRef)(({ children, tooltip, side = "bottom", ...rest }, ref) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)(Tooltip, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(TooltipTrigger, { asChild: true, children: /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)(Button, { variant: "ghost", size: "icon", ...rest, ref, children: [
-      children,
-      /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("span", { className: "aui-sr-only", children: tooltip })
-    ] }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(TooltipContent, { side, children: tooltip })
-  ] });
-});
-TooltipIconButton.displayName = "TooltipIconButton";
-
 // src/runtimes/edge/converters/toLanguageModelMessages.ts
 var assistantMessageSplitter = () => {
   const stash = [];
@@ -2538,35 +2615,43 @@ var fromLanguageModelMessages = (lm, { mergeRoundtrips }) => {
   return messages;
 };
 
-// src/runtimes/edge/converters/fromCoreMessage.ts
-var fromCoreMessages = (message) => {
-  return message.map((message2) => {
-    return {
-      id: generateId(),
-      createdAt: /* @__PURE__ */ new Date(),
-      ...message2.role === "assistant" ? {
-        status: { type: "done" }
-      } : void 0,
-      ...message2
-    };
-  });
-};
-
 // src/runtimes/edge/converters/toCoreMessages.ts
 var toCoreMessages = (message) => {
-  return message.map((message2) => {
-    return {
-      role: message2.role,
-      content: message2.content.map((part) => {
-        if (part.type === "ui") throw new Error("UI parts are not supported");
-        if (part.type === "tool-call") {
-          const { argsText, ...rest } = part;
-          return rest;
-        }
-        return part;
-      })
-    };
-  });
+  return message.map(toCoreMessage);
+};
+var toCoreMessage = (message) => {
+  const role = message.role;
+  switch (role) {
+    case "assistant":
+      return {
+        role,
+        content: message.content.map((part) => {
+          if (part.type === "ui") throw new Error("UI parts are not supported");
+          if (part.type === "tool-call") {
+            const { argsText, ...rest } = part;
+            return rest;
+          }
+          return part;
+        })
+      };
+    case "user":
+      return {
+        role,
+        content: message.content.map((part) => {
+          if (part.type === "ui") throw new Error("UI parts are not supported");
+          return part;
+        })
+      };
+    case "system":
+      return {
+        role,
+        content: message.content
+      };
+    default: {
+      const unsupportedRole = role;
+      throw new Error(`Unknown message role: ${unsupportedRole}`);
+    }
+  }
 };
 
 // src/runtimes/edge/converters/fromLanguageModelTools.ts
@@ -3036,9 +3121,10 @@ var parsePartialJson = (json) => {
 };
 
 // src/runtimes/edge/streams/runResultStream.ts
-function runResultStream(initialContent) {
+function runResultStream() {
   let message = {
-    content: initialContent
+    content: [],
+    status: { type: "running" }
   };
   const currentToolCall = { toolCallId: "", argsText: "" };
   return new TransformStream({
@@ -3086,7 +3172,13 @@ function runResultStream(initialContent) {
           break;
         }
         case "error": {
-          throw chunk.error;
+          if (chunk.error instanceof Error && chunk.error.name === "AbortError") {
+            message = appendOrUpdateCancel(message);
+            controller.enqueue(message);
+            break;
+          } else {
+            throw chunk.error;
+          }
         }
         default: {
           const unhandledType = chunkType;
@@ -3160,11 +3252,42 @@ var appendOrUpdateToolResult = (message, toolCallId, toolName, result) => {
 };
 var appendOrUpdateFinish = (message, chunk) => {
   const { type, ...rest } = chunk;
+  return {
+    ...message,
+    status: getStatus(chunk),
+    roundtrips: [
+      ...message.roundtrips ?? [],
+      {
+        logprobs: rest.logprobs,
+        usage: rest.usage
+      }
+    ]
+  };
+};
+var getStatus = (chunk) => {
+  if (chunk.finishReason === "tool-calls") {
+    return {
+      type: "requires-action",
+      reason: "tool-calls"
+    };
+  } else if (chunk.finishReason === "stop" || chunk.finishReason === "unknown") {
+    return {
+      type: "complete",
+      reason: chunk.finishReason
+    };
+  } else {
+    return {
+      type: "incomplete",
+      reason: chunk.finishReason
+    };
+  }
+};
+var appendOrUpdateCancel = (message) => {
   return {
     ...message,
     status: {
-      type: "done",
-      ...rest
+      type: "incomplete",
+      reason: "cancelled"
     }
   };
 };
@@ -3264,7 +3387,7 @@ var EdgeChatAdapter = class {
   constructor(options) {
     this.options = options;
   }
-  async roundtrip(initialContent, { messages, abortSignal, config, onUpdate }) {
+  async run({ messages, abortSignal, config, onUpdate }) {
     const result = await fetch(this.options.api, {
       method: "POST",
       headers: {
@@ -3284,46 +3407,14 @@ var EdgeChatAdapter = class {
         `Edge runtime returned status ${result.status}: ${await result.text()}`
       );
     }
-    const stream = result.body.pipeThrough(new TextDecoderStream()).pipeThrough(chunkByLineStream()).pipeThrough(assistantDecoderStream()).pipeThrough(toolResultStream(config.tools)).pipeThrough(runResultStream(initialContent));
-    let message;
+    const stream = result.body.pipeThrough(new TextDecoderStream()).pipeThrough(chunkByLineStream()).pipeThrough(assistantDecoderStream()).pipeThrough(toolResultStream(config.tools)).pipeThrough(runResultStream());
     let update;
     for await (update of asAsyncIterable(stream)) {
-      message = onUpdate(update);
+      onUpdate(update);
     }
     if (update === void 0)
       throw new Error("No data received from Edge Runtime");
-    return [message, update];
-  }
-  async run({ messages, abortSignal, config, onUpdate }) {
-    let roundtripAllowance = this.options.maxToolRoundtrips ?? 1;
-    let usage = {
-      promptTokens: 0,
-      completionTokens: 0
-    };
-    let result;
-    let assistantMessage;
-    do {
-      [assistantMessage, result] = await this.roundtrip(result?.content ?? [], {
-        messages: assistantMessage ? [...messages, assistantMessage] : messages,
-        abortSignal,
-        config,
-        onUpdate
-      });
-      if (result.status?.type === "done") {
-        usage.promptTokens += result.status.usage?.promptTokens ?? 0;
-        usage.completionTokens += result.status.usage?.completionTokens ?? 0;
-      }
-    } while (result.status?.type === "done" && result.status.finishReason === "tool-calls" && result.content.every((c) => c.type !== "tool-call" || !!c.result) && roundtripAllowance-- > 0);
-    if (result.status?.type === "done" && usage.promptTokens > 0) {
-      result = {
-        ...result,
-        status: {
-          ...result.status,
-          usage
-        }
-      };
-    }
-    return result;
+    return update;
   }
 };
 
@@ -3337,6 +3428,7 @@ var useEdgeRuntime = ({
 };
 
 // src/runtimes/local/LocalRuntime.tsx
+var shouldContinue = (result) => result.status?.type === "requires-action" && result.status.reason === "tool-calls" && result.content.every((c) => c.type !== "tool-call" || !!c.result);
 var LocalRuntime = class extends BaseAssistantRuntime {
   _proxyConfigProvider;
   constructor(adapter, options) {
@@ -3370,6 +3462,7 @@ var LocalThreadRuntime = class {
   constructor(configProvider, adapter, options) {
     this.configProvider = configProvider;
     this.adapter = adapter;
+    this.options = options;
     if (options?.initialMessages) {
       let parentId = null;
       const messages = fromCoreMessages(options.initialMessages);
@@ -3413,27 +3506,51 @@ var LocalThreadRuntime = class {
   }
   async startRun(parentId) {
     this.repository.resetHead(parentId);
-    const messages = this.repository.getMessages();
+    const id = generateId();
     let message = {
-      id: generateId(),
+      id,
       role: "assistant",
-      status: { type: "in_progress" },
+      status: { type: "running" },
       content: [{ type: "text", text: "" }],
       createdAt: /* @__PURE__ */ new Date()
     };
+    do {
+      message = await this.performRoundtrip(parentId, message);
+    } while (shouldContinue(message));
+  }
+  async performRoundtrip(parentId, message) {
+    const messages = this.repository.getMessages();
     this.abortController?.abort();
     this.abortController = new AbortController();
-    this.repository.addOrUpdateMessage(parentId, { ...message });
-    this.notifySubscribers();
+    const initialContent = message.content;
+    const initialRoundtrips = message.roundtrips;
     const updateMessage = (m) => {
       message = {
         ...message,
-        ...m
+        ...m.content ? { content: [...initialContent, ...m.content ?? []] } : void 0,
+        status: m.status ?? message.status,
+        ...m.roundtrips?.length ? { roundtrips: [...initialRoundtrips ?? [], ...m.roundtrips] } : void 0
       };
       this.repository.addOrUpdateMessage(parentId, message);
       this.notifySubscribers();
-      return message;
     };
+    const maxToolRoundtrips = this.options?.maxToolRoundtrips ?? 1;
+    const toolRoundtrips = message.roundtrips?.length ?? 0;
+    if (toolRoundtrips > maxToolRoundtrips) {
+      updateMessage({
+        status: {
+          type: "incomplete",
+          reason: "tool-calls"
+        }
+      });
+      return message;
+    } else {
+      updateMessage({
+        status: {
+          type: "running"
+        }
+      });
+    }
     try {
       const result = await this.adapter.run({
         messages,
@@ -3441,21 +3558,29 @@ var LocalThreadRuntime = class {
         config: this.configProvider.getModelConfig(),
         onUpdate: updateMessage
       });
-      if (result.status?.type === "in_progress")
+      if (result.status?.type === "running")
         throw new Error(
-          "Unexpected in_progress status returned from ChatModelAdapter"
+          "Unexpected running status returned from ChatModelAdapter"
         );
       this.abortController = null;
-      updateMessage({ status: { type: "done" }, ...result });
-      this.repository.addOrUpdateMessage(parentId, { ...message });
-    } catch (e) {
-      const isAbortError = e instanceof Error && e.name === "AbortError";
-      this.abortController = null;
       updateMessage({
-        status: isAbortError ? { type: "cancelled" } : { type: "error", error: e }
+        status: { type: "complete", reason: "unknown" },
+        ...result
       });
-      if (!isAbortError) throw e;
+    } catch (e) {
+      this.abortController = null;
+      if (e instanceof Error && e.name === "AbortError") {
+        updateMessage({
+          status: { type: "incomplete", reason: "cancelled" }
+        });
+      } else {
+        updateMessage({
+          status: { type: "incomplete", reason: "error", error: e }
+        });
+        throw e;
+      }
     }
+    return message;
   }
   cancelRun() {
     if (!this.abortController) return;
@@ -3470,14 +3595,16 @@ var LocalThreadRuntime = class {
     return () => this._subscriptions.delete(callback);
   }
   addToolResult({ messageId, toolCallId, result }) {
-    const { parentId, message } = this.repository.getMessage(messageId);
+    let { parentId, message } = this.repository.getMessage(messageId);
     if (message.role !== "assistant")
       throw new Error("Tried to add tool result to non-assistant message");
+    let added = false;
     let found = false;
     const newContent = message.content.map((c) => {
       if (c.type !== "tool-call") return c;
       if (c.toolCallId !== toolCallId) return c;
       found = true;
+      if (!c.result) added = true;
       return {
         ...c,
         result
@@ -3485,10 +3612,14 @@ var LocalThreadRuntime = class {
     });
     if (!found)
       throw new Error("Tried to add tool result to non-existing tool call");
-    this.repository.addOrUpdateMessage(parentId, {
+    message = {
       ...message,
       content: newContent
-    });
+    };
+    this.repository.addOrUpdateMessage(parentId, message);
+    if (added && shouldContinue(message)) {
+      this.performRoundtrip(parentId, message);
+    }
   }
 };
 
@@ -3683,7 +3814,7 @@ var Text = ({ status }) => {
     {
       className: (0, import_classnames2.default)(
         "aui-text",
-        status.type === "in_progress" && "aui-text-in-progress"
+        status.type === "running" && "aui-text-in-progress"
       ),
       children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(contentPart_exports.Text, {})
     }
@@ -4210,11 +4341,13 @@ var assistant_modal_default = Object.assign(AssistantModal, exports12);
   ThreadWelcome,
   UserActionBar,
   UserMessage,
+  fromCoreMessage,
   fromCoreMessages,
   fromLanguageModelMessages,
   fromLanguageModelTools,
   makeAssistantTool,
   makeAssistantToolUI,
+  toCoreMessage,
   toCoreMessages,
   toLanguageModelMessages,
   toLanguageModelTools,