@athenaintel/react 0.10.24 → 0.10.26

package/dist/index.js

@@ -1,5 +1,5 @@
 import { jsx, Fragment as Fragment$1, jsxs } from "react/jsx-runtime";
-import { bindExternalStoreMessage, getExternalStoreMessages, INTERNAL, useAssistantTransportRuntime, useAuiState, useAssistantRuntime, useThread, useThreadList, unstable_useRemoteThreadListRuntime, Tools, useAui, AssistantRuntimeProvider, useComposerRuntime, useScrollLock, ActionBarPrimitive, AuiIf, ActionBarMorePrimitive, MessagePrimitive, ThreadPrimitive, ComposerPrimitive, ErrorPrimitive, ThreadListPrimitive, ThreadListItemPrimitive } from "@assistant-ui/react";
+import { bindExternalStoreMessage, getExternalStoreMessages, INTERNAL, useAssistantTransportRuntime, useAuiState, useAssistantRuntime, useThread, useThreadList, unstable_useRemoteThreadListRuntime, Tools, useAui, AssistantRuntimeProvider, useComposerRuntime, MessagePartPrimitive, MessagePrimitive, useScrollLock, ActionBarPrimitive, AuiIf, ActionBarMorePrimitive, ThreadPrimitive, ComposerPrimitive, ErrorPrimitive, ThreadListPrimitive, ThreadListItemPrimitive } from "@assistant-ui/react";
 import * as React from "react";
 import React__default, { useMemo, useState, useRef, useEffect, useLayoutEffect, useContext, createContext, useCallback, useDebugValue, forwardRef, createRef, memo, createElement, version as version$1, useImperativeHandle } from "react";
 import { A as AthenaAuthContext } from "./AthenaAuthContext-DQsdayH2.js";
@@ -3896,407 +3896,6 @@ function cn(...inputs) {
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-const { fromThreadMessageLike, getAutoStatus } = INTERNAL;
-const joinExternalMessages = (messages) => {
-  var _a2;
-  const assistantMessage = {
-    role: "assistant",
-    content: []
-  };
-  let firstAssistantId;
-  let lastAssistantId;
-  let assistantMessageCount = 0;
-  for (const output of messages) {
-    if (!output || !("role" in output)) {
-      continue;
-    }
-    if (output.role === "tool") {
-      const toolCallIdx = assistantMessage.content.findIndex(
-        (c) => c.type === "tool-call" && c.toolCallId === output.toolCallId
-      );
-      if (toolCallIdx !== -1) {
-        const toolCall = assistantMessage.content[toolCallIdx];
-        if (output.toolName != null) {
-          if (toolCall.toolName !== output.toolName)
-            console.error(
-              Error(
-                `Tool call name ${output.toolCallId} ${output.toolName} does not match existing tool call ${toolCall.toolName}`
-              )
-            );
-        }
-        const { messages: existingMessages, ...toolCallRest } = toolCall;
-        const updatedToolCall = {
-          ...toolCallRest,
-          result: output.result,
-          artifact: output.artifact,
-          isError: output.isError,
-          ...(output.messages ?? existingMessages) !== void 0 && {
-            messages: output.messages ?? existingMessages
-          }
-        };
-        bindExternalStoreMessage(updatedToolCall, [
-          ...getExternalStoreMessages(toolCallRest),
-          output
-        ]);
-        assistantMessage.content[toolCallIdx] = updatedToolCall;
-      } else {
-        console.warn(
-          `Tool call ${output.toolCallId} ${output.toolName} not found in assistant message`
-        );
-      }
-    } else {
-      const role = output.role;
-      const rawContent = typeof output.content === "string" ? [{ type: "text", text: output.content }] : Array.isArray(output.content) ? output.content : [];
-      const content = rawContent.flatMap((c) => {
-        if (!c || typeof c !== "object") {
-          return [];
-        }
-        const mapped = { ...c };
-        bindExternalStoreMessage(mapped, output);
-        return [mapped];
-      });
-      switch (role) {
-        case "system":
-        case "user":
-          return {
-            ...output,
-            content
-          };
-        case "assistant":
-          if (output.id) {
-            lastAssistantId = output.id;
-            assistantMessageCount++;
-          }
-          if (assistantMessage.content.length === 0) {
-            firstAssistantId = output.id;
-            assistantMessage.createdAt ?? (assistantMessage.createdAt = output.createdAt);
-            assistantMessage.status ?? (assistantMessage.status = output.status);
-            if (output.attachments) {
-              assistantMessage.attachments = [
-                ...assistantMessage.attachments ?? [],
-                ...output.attachments
-              ];
-            }
-            if (output.metadata) {
-              assistantMessage.metadata ?? (assistantMessage.metadata = {});
-              if (output.metadata.unstable_state) {
-                assistantMessage.metadata.unstable_state = output.metadata.unstable_state;
-              }
-              if (output.metadata.unstable_annotations) {
-                assistantMessage.metadata.unstable_annotations = [
-                  ...assistantMessage.metadata.unstable_annotations ?? [],
-                  ...output.metadata.unstable_annotations
-                ];
-              }
-              if (output.metadata.unstable_data) {
-                assistantMessage.metadata.unstable_data = [
-                  ...assistantMessage.metadata.unstable_data ?? [],
-                  ...output.metadata.unstable_data
-                ];
-              }
-              if (output.metadata.steps) {
-                assistantMessage.metadata.steps = [
-                  ...assistantMessage.metadata.steps ?? [],
-                  ...output.metadata.steps
-                ];
-              }
-              if (output.metadata.custom) {
-                assistantMessage.metadata.custom = {
-                  ...assistantMessage.metadata.custom ?? {},
-                  ...output.metadata.custom
-                };
-              }
-              if (output.metadata.submittedFeedback) {
-                assistantMessage.metadata.submittedFeedback = output.metadata.submittedFeedback;
-              }
-            }
-          } else {
-            if ((_a2 = output.metadata) == null ? void 0 : _a2.custom) {
-              assistantMessage.metadata ?? (assistantMessage.metadata = {});
-              assistantMessage.metadata.custom = {
-                ...assistantMessage.metadata.custom ?? {},
-                ...output.metadata.custom
-              };
-            }
-          }
-          assistantMessage.content.push(...content);
-          break;
-        default: {
-          const unsupportedRole = role;
-          throw new Error(`Unknown message role: ${unsupportedRole}`);
-        }
-      }
-    }
-  }
-  assistantMessage.id = lastAssistantId ?? firstAssistantId;
-  if (assistantMessageCount > 1) {
-    assistantMessage.metadata ?? (assistantMessage.metadata = {});
-    assistantMessage.metadata.custom = {
-      ...assistantMessage.metadata.custom ?? {},
-      _firstMessageId: firstAssistantId,
-      _lastMessageId: lastAssistantId,
-      _joinedMessageCount: assistantMessageCount
-    };
-  }
-  return assistantMessage;
-};
-const chunkExternalMessages = (callbackResults, _joinStrategy) => {
-  var _a2;
-  const results = [];
-  let isAssistant = false;
-  let pendingNone = false;
-  let inputs = [];
-  let outputs = [];
-  const flush2 = () => {
-    if (outputs.length) {
-      results.push({
-        inputs,
-        outputs
-      });
-    }
-    inputs = [];
-    outputs = [];
-    isAssistant = false;
-    pendingNone = false;
-  };
-  for (const callbackResult of callbackResults) {
-    for (const output of callbackResult.outputs) {
-      if (!output || !("role" in output)) {
-        continue;
-      }
-      if (pendingNone && output.role !== "tool" || !isAssistant || output.role === "user" || output.role === "system") {
-        flush2();
-      }
-      isAssistant = output.role === "assistant" || output.role === "tool";
-      if (inputs.at(-1) !== callbackResult.input) {
-        inputs.push(callbackResult.input);
-      }
-      outputs.push(output);
-      if (output.role === "assistant" && (((_a2 = output.convertConfig) == null ? void 0 : _a2.joinStrategy) === "none" || _joinStrategy === "none")) {
-        pendingNone = true;
-      }
-    }
-  }
-  flush2();
-  return results;
-};
-const convertExternalMessages = (messages, callback, isRunning, metadata) => {
-  const callbackResults = [];
-  for (const message of messages) {
-    const output = callback(message, metadata);
-    const rawOutputs = Array.isArray(output) ? output : [output];
-    const outputs = rawOutputs.filter(
-      (candidate) => candidate != null
-    );
-    if (outputs.length === 0) {
-      continue;
-    }
-    const result = { input: message, outputs };
-    callbackResults.push(result);
-  }
-  const chunks = chunkExternalMessages(callbackResults);
-  return chunks.map((message, idx) => {
-    const isLast = idx === chunks.length - 1;
-    const joined = joinExternalMessages(message.outputs);
-    const hasPendingToolCalls = typeof joined.content === "object" && joined.content.some((c) => c.type === "tool-call" && c.result === void 0);
-    const autoStatus = getAutoStatus(isLast, isRunning, hasPendingToolCalls, hasPendingToolCalls);
-    const newMessage = fromThreadMessageLike(joined, idx.toString(), autoStatus);
-    bindExternalStoreMessage(newMessage, message.inputs);
-    return newMessage;
-  });
-};
-const warnedMessagePartTypes = /* @__PURE__ */ new Set();
-const warnForUnknownMessagePartType = (type) => {
-  if (warnedMessagePartTypes.has(type)) return;
-  warnedMessagePartTypes.add(type);
-  console.warn(`Unknown message part type: ${type}`);
-};
-const contentToParts = (content) => {
-  if (typeof content === "string") return [{ type: "text", text: content }];
-  return content.flatMap((part) => {
-    if (!part || typeof part !== "object" || !("type" in part)) {
-      return [];
-    }
-    const type = part.type;
-    switch (type) {
-      case "text":
-        return [{ type: "text", text: part.text }];
-      case "text_delta":
-        return [{ type: "text", text: part.text }];
-      case "image_url":
-        if (typeof part.image_url === "string") {
-          return [{ type: "image", image: part.image_url }];
-        }
-        return [{
-          type: "image",
-          image: part.image_url.url
-        }];
-      case "thinking":
-        return [{ type: "reasoning", text: part.thinking }];
-      case "reasoning":
-        return [{
-          type: "reasoning",
-          text: part.summary.map((s) => s.text).join("\n\n\n")
-        }];
-      case "tool_use":
-        return [];
-      case "input_json_delta":
-        return [];
-      default:
-        warnForUnknownMessagePartType(type);
-        return [];
-    }
-  });
-};
-const getNumberAtPath = (value, path) => {
-  let current = value;
-  for (const segment of path) {
-    if (!isRecord(current)) {
-      return void 0;
-    }
-    current = current[segment];
-  }
-  return typeof current === "number" && Number.isFinite(current) ? current : void 0;
-};
-const extractReasoningTokens = ({
-  usageMetadata,
-  responseMetadata
-}) => {
-  const rawReasoningTokens = getNumberAtPath(usageMetadata, ["output_token_details", "reasoning"]) ?? getNumberAtPath(usageMetadata, ["output_token_details", "reasoning_tokens"]) ?? getNumberAtPath(usageMetadata, ["reasoning_tokens"]) ?? getNumberAtPath(responseMetadata, ["output_token_details", "reasoning"]) ?? getNumberAtPath(responseMetadata, ["output_token_details", "reasoning_tokens"]) ?? getNumberAtPath(responseMetadata, ["token_usage", "output_token_details", "reasoning"]) ?? getNumberAtPath(responseMetadata, ["token_usage", "output_token_details", "reasoning_tokens"]);
-  return rawReasoningTokens !== void 0 && rawReasoningTokens > 0 ? rawReasoningTokens : void 0;
-};
-const buildCustomMetadata = ({
-  additionalKwargs,
-  usageMetadata,
-  responseMetadata
-}) => {
-  const customMetadata = additionalKwargs ? { ...additionalKwargs } : {};
-  const reasoningTokens = extractReasoningTokens({ usageMetadata, responseMetadata });
-  const existingAthenaMetadata = isRecord(customMetadata._athena) ? customMetadata._athena : void 0;
-  const athenaMetadata = {
-    ...existingAthenaMetadata ?? {}
-  };
-  if (usageMetadata) {
-    athenaMetadata.rawUsageMetadata = usageMetadata;
-  }
-  if (responseMetadata) {
-    athenaMetadata.rawResponseMetadata = responseMetadata;
-  }
-  if (reasoningTokens !== void 0) {
-    athenaMetadata.reasoningTokens = reasoningTokens;
-  }
-  if (Object.keys(athenaMetadata).length > 0) {
-    customMetadata._athena = athenaMetadata;
-  }
-  return Object.keys(customMetadata).length > 0 ? customMetadata : void 0;
-};
-const convertLangChainMessage = (message) => {
-  var _a2, _b, _c;
-  switch (message.type) {
-    case "system": {
-      const customMetadata = buildCustomMetadata({
-        additionalKwargs: message.additional_kwargs
-      });
-      return {
-        role: "system",
-        id: message.id,
-        content: [{ type: "text", text: message.content }],
-        ...customMetadata && {
-          metadata: {
-            custom: customMetadata
-          }
-        }
-      };
-    }
-    case "human": {
-      const customMetadata = buildCustomMetadata({
-        additionalKwargs: message.additional_kwargs
-      });
-      return {
-        role: "user",
-        id: message.id,
-        content: contentToParts(message.content),
-        ...customMetadata && {
-          metadata: {
-            custom: customMetadata
-          }
-        }
-      };
-    }
-    case "ai": {
-      const customMetadata = buildCustomMetadata({
-        additionalKwargs: message.additional_kwargs,
-        usageMetadata: message.usage_metadata,
-        responseMetadata: message.response_metadata
-      });
-      const toolCallParts = ((_a2 = message.tool_calls) == null ? void 0 : _a2.map((chunk) => {
-        var _a3, _b2;
-        let argsText;
-        if (typeof chunk.args === "string") {
-          argsText = chunk.args;
-        } else {
-          const rawString = chunk.partial_json ?? ((_b2 = (_a3 = message.tool_call_chunks) == null ? void 0 : _a3.find((c) => c.id === chunk.id)) == null ? void 0 : _b2.args) ?? JSON.stringify(chunk.args);
-          argsText = rawString;
-        }
-        return {
-          type: "tool-call",
-          toolCallId: chunk.id,
-          toolName: chunk.name,
-          args: typeof chunk.args === "string" ? parsePartialJsonObject(argsText) ?? {} : chunk.args,
-          argsText
-        };
-      })) ?? [];
-      const normalizedContent = typeof message.content === "string" ? [{ type: "text", text: message.content }] : message.content;
-      const allContent = [
-        (_b = message.additional_kwargs) == null ? void 0 : _b.reasoning,
-        ...normalizedContent,
-        ...((_c = message.additional_kwargs) == null ? void 0 : _c.tool_outputs) ?? []
-      ].filter((c) => c != null);
-      return {
-        role: "assistant",
-        id: message.id,
-        content: [...contentToParts(allContent), ...toolCallParts],
-        ...message.status && { status: message.status },
-        ...customMetadata && {
-          metadata: {
-            custom: customMetadata
-          }
-        }
-      };
-    }
-    case "tool": {
-      return {
-        role: "tool",
-        toolName: message.name,
-        toolCallId: message.tool_call_id,
-        result: message.content,
-        artifact: message.artifact,
-        isError: message.status === "error"
-      };
-    }
-    default:
-      return null;
-  }
-};
-const convertLangChainToThreadMessages = (messages, isRunning = false, metadata = {}) => {
-  const validToolCallIds = /* @__PURE__ */ new Set();
-  for (const message of messages) {
-    if (message.type === "ai" && message.tool_calls) {
-      for (const tc of message.tool_calls) {
-        if (tc.id) {
-          validToolCallIds.add(tc.id);
-        }
-      }
-    }
-  }
-  const filteredMessages = messages.filter((message) => {
-    if (message.type === "tool" && message.tool_call_id && !validToolCallIds.has(message.tool_call_id)) {
-      return false;
-    }
-    return true;
-  });
-  return convertExternalMessages(filteredMessages, convertLangChainMessage, isRunning, metadata);
-};
 function $constructor(name, initializer2, params) {
   function init2(inst, def) {
     if (!inst._zod) {
@@ -8464,6 +8063,451 @@ const parseLangGraphState = (state) => {
   }
   return result;
 };
+const { fromThreadMessageLike, getAutoStatus } = INTERNAL;
+const joinExternalMessages = (messages) => {
+  var _a2;
+  const assistantMessage = {
+    role: "assistant",
+    content: []
+  };
+  let firstAssistantId;
+  let lastAssistantId;
+  let assistantMessageCount = 0;
+  for (const output of messages) {
+    if (!output || !("role" in output)) {
+      continue;
+    }
+    if (output.role === "tool") {
+      const toolCallIdx = assistantMessage.content.findIndex(
+        (c) => c.type === "tool-call" && c.toolCallId === output.toolCallId
+      );
+      if (toolCallIdx !== -1) {
+        const toolCall = assistantMessage.content[toolCallIdx];
+        if (output.toolName != null) {
+          if (toolCall.toolName !== output.toolName)
+            console.error(
+              Error(
+                `Tool call name ${output.toolCallId} ${output.toolName} does not match existing tool call ${toolCall.toolName}`
+              )
+            );
+        }
+        const { messages: existingMessages, ...toolCallRest } = toolCall;
+        const updatedToolCall = {
+          ...toolCallRest,
+          result: output.result,
+          artifact: output.artifact,
+          isError: output.isError,
+          ...(output.messages ?? existingMessages) !== void 0 && {
+            messages: output.messages ?? existingMessages
+          }
+        };
+        bindExternalStoreMessage(updatedToolCall, [
+          ...getExternalStoreMessages(toolCallRest),
+          output
+        ]);
+        assistantMessage.content[toolCallIdx] = updatedToolCall;
+      } else {
+        console.warn(
+          `Tool call ${output.toolCallId} ${output.toolName} not found in assistant message`
+        );
+      }
+    } else {
+      const role = output.role;
+      const rawContent = typeof output.content === "string" ? [{ type: "text", text: output.content }] : Array.isArray(output.content) ? output.content : [];
+      const content = rawContent.flatMap((c) => {
+        if (!c || typeof c !== "object") {
+          return [];
+        }
+        const mapped = { ...c };
+        bindExternalStoreMessage(mapped, output);
+        return [mapped];
+      });
+      switch (role) {
+        case "system":
+        case "user":
+          return {
+            ...output,
+            content
+          };
+        case "assistant":
+          if (output.id) {
+            lastAssistantId = output.id;
+            assistantMessageCount++;
+          }
+          if (assistantMessage.content.length === 0) {
+            firstAssistantId = output.id;
+            assistantMessage.createdAt ?? (assistantMessage.createdAt = output.createdAt);
+            assistantMessage.status ?? (assistantMessage.status = output.status);
+            if (output.attachments) {
+              assistantMessage.attachments = [
+                ...assistantMessage.attachments ?? [],
+                ...output.attachments
+              ];
+            }
+            if (output.metadata) {
+              assistantMessage.metadata ?? (assistantMessage.metadata = {});
+              if (output.metadata.unstable_state) {
+                assistantMessage.metadata.unstable_state = output.metadata.unstable_state;
+              }
+              if (output.metadata.unstable_annotations) {
+                assistantMessage.metadata.unstable_annotations = [
+                  ...assistantMessage.metadata.unstable_annotations ?? [],
+                  ...output.metadata.unstable_annotations
+                ];
+              }
+              if (output.metadata.unstable_data) {
+                assistantMessage.metadata.unstable_data = [
+                  ...assistantMessage.metadata.unstable_data ?? [],
+                  ...output.metadata.unstable_data
+                ];
+              }
+              if (output.metadata.steps) {
+                assistantMessage.metadata.steps = [
+                  ...assistantMessage.metadata.steps ?? [],
+                  ...output.metadata.steps
+                ];
+              }
+              if (output.metadata.custom) {
+                assistantMessage.metadata.custom = {
+                  ...assistantMessage.metadata.custom ?? {},
+                  ...output.metadata.custom
+                };
+              }
+              if (output.metadata.submittedFeedback) {
+                assistantMessage.metadata.submittedFeedback = output.metadata.submittedFeedback;
+              }
+            }
+          } else {
+            if ((_a2 = output.metadata) == null ? void 0 : _a2.custom) {
+              assistantMessage.metadata ?? (assistantMessage.metadata = {});
+              assistantMessage.metadata.custom = {
+                ...assistantMessage.metadata.custom ?? {},
+                ...output.metadata.custom
+              };
+            }
+          }
+          assistantMessage.content.push(...content);
+          break;
+        default: {
+          const unsupportedRole = role;
+          throw new Error(`Unknown message role: ${unsupportedRole}`);
+        }
+      }
+    }
+  }
+  assistantMessage.id = lastAssistantId ?? firstAssistantId;
+  if (assistantMessageCount > 1) {
+    assistantMessage.metadata ?? (assistantMessage.metadata = {});
+    assistantMessage.metadata.custom = {
+      ...assistantMessage.metadata.custom ?? {},
+      _firstMessageId: firstAssistantId,
+      _lastMessageId: lastAssistantId,
+      _joinedMessageCount: assistantMessageCount
+    };
+  }
+  return assistantMessage;
+};
+const chunkExternalMessages = (callbackResults, _joinStrategy) => {
+  var _a2;
+  const results = [];
+  let isAssistant = false;
+  let pendingNone = false;
+  let inputs = [];
+  let outputs = [];
+  const flush2 = () => {
+    if (outputs.length) {
+      results.push({
+        inputs,
+        outputs
+      });
+    }
+    inputs = [];
+    outputs = [];
+    isAssistant = false;
+    pendingNone = false;
+  };
+  for (const callbackResult of callbackResults) {
+    for (const output of callbackResult.outputs) {
+      if (!output || !("role" in output)) {
+        continue;
+      }
+      if (pendingNone && output.role !== "tool" || !isAssistant || output.role === "user" || output.role === "system") {
+        flush2();
+      }
+      isAssistant = output.role === "assistant" || output.role === "tool";
+      if (inputs.at(-1) !== callbackResult.input) {
+        inputs.push(callbackResult.input);
+      }
+      outputs.push(output);
+      if (output.role === "assistant" && (((_a2 = output.convertConfig) == null ? void 0 : _a2.joinStrategy) === "none" || _joinStrategy === "none")) {
+        pendingNone = true;
+      }
+    }
+  }
+  flush2();
+  return results;
+};
+const convertExternalMessages = (messages, callback, isRunning, metadata) => {
+  const callbackResults = [];
+  for (const message of messages) {
+    const output = callback(message, metadata);
+    const rawOutputs = Array.isArray(output) ? output : [output];
+    const outputs = rawOutputs.filter(
+      (candidate) => candidate != null
+    );
+    if (outputs.length === 0) {
+      continue;
+    }
+    const result = { input: message, outputs };
+    callbackResults.push(result);
+  }
+  const chunks = chunkExternalMessages(callbackResults);
+  return chunks.map((message, idx) => {
+    const isLast = idx === chunks.length - 1;
+    const joined = joinExternalMessages(message.outputs);
+    const hasPendingToolCalls = typeof joined.content === "object" && joined.content.some((c) => c.type === "tool-call" && c.result === void 0);
+    const autoStatus = getAutoStatus(isLast, isRunning, hasPendingToolCalls, hasPendingToolCalls);
+    const newMessage = fromThreadMessageLike(joined, idx.toString(), autoStatus);
+    bindExternalStoreMessage(newMessage, message.inputs);
+    return newMessage;
+  });
+};
+const PTC_SUBCALL_DID_NOT_COMPLETE_MESSAGE = "Sub-call did not complete before the parent tool returned.";
+const autoCloseInFlightSubgraphMessages = (msgs) => {
+  const beginIds = /* @__PURE__ */ new Set();
+  const endIds = /* @__PURE__ */ new Set();
+  for (const message of msgs) {
+    if (!isRecord(message)) continue;
+    if (message.type === "ai" && Array.isArray(message.tool_calls)) {
+      for (const toolCall of message.tool_calls) {
+        if (!isRecord(toolCall)) continue;
+        const id = toolCall.id;
+        if (typeof id === "string") beginIds.add(id);
+      }
+    } else if (message.type === "tool" && typeof message.tool_call_id === "string") {
+      endIds.add(message.tool_call_id);
+    }
+  }
+  const unmatchedIds = [...beginIds].filter((id) => !endIds.has(id));
+  if (unmatchedIds.length === 0) return [...msgs];
+  return [
+    ...msgs,
+    ...unmatchedIds.map((toolCallId) => ({
+      type: "tool",
+      tool_call_id: toolCallId,
+      content: PTC_SUBCALL_DID_NOT_COMPLETE_MESSAGE,
+      status: "error"
+    }))
+  ];
+};
+const warnedMessagePartTypes = /* @__PURE__ */ new Set();
+const warnForUnknownMessagePartType = (type) => {
+  if (warnedMessagePartTypes.has(type)) return;
+  warnedMessagePartTypes.add(type);
+  console.warn(`Unknown message part type: ${type}`);
+};
+const contentToParts = (content) => {
+  if (typeof content === "string") return [{ type: "text", text: content }];
+  return content.flatMap((part) => {
+    if (!part || typeof part !== "object" || !("type" in part)) {
+      return [];
+    }
+    const type = part.type;
+    switch (type) {
+      case "text":
+        return [{ type: "text", text: part.text }];
+      case "text_delta":
+        return [{ type: "text", text: part.text }];
+      case "image_url":
+        if (typeof part.image_url === "string") {
+          return [{ type: "image", image: part.image_url }];
+        }
+        return [{
+          type: "image",
+          image: part.image_url.url
+        }];
+      case "thinking":
+        return [{ type: "reasoning", text: part.thinking }];
+      case "reasoning":
+        return [{
+          type: "reasoning",
+          text: part.summary.map((s) => s.text).join("\n\n\n")
+        }];
+      case "tool_use":
+        return [];
+      case "input_json_delta":
+        return [];
+      default:
+        warnForUnknownMessagePartType(type);
+        return [];
+    }
+  });
+};
+const getNumberAtPath = (value, path) => {
+  let current = value;
+  for (const segment of path) {
+    if (!isRecord(current)) {
+      return void 0;
+    }
+    current = current[segment];
+  }
+  return typeof current === "number" && Number.isFinite(current) ? current : void 0;
+};
+const extractReasoningTokens = ({
+  usageMetadata,
+  responseMetadata
+}) => {
+  const rawReasoningTokens = getNumberAtPath(usageMetadata, ["output_token_details", "reasoning"]) ?? getNumberAtPath(usageMetadata, ["output_token_details", "reasoning_tokens"]) ?? getNumberAtPath(usageMetadata, ["reasoning_tokens"]) ?? getNumberAtPath(responseMetadata, ["output_token_details", "reasoning"]) ?? getNumberAtPath(responseMetadata, ["output_token_details", "reasoning_tokens"]) ?? getNumberAtPath(responseMetadata, ["token_usage", "output_token_details", "reasoning"]) ?? getNumberAtPath(responseMetadata, ["token_usage", "output_token_details", "reasoning_tokens"]);
+  return rawReasoningTokens !== void 0 && rawReasoningTokens > 0 ? rawReasoningTokens : void 0;
+};
+const buildCustomMetadata = ({
+  additionalKwargs,
+  usageMetadata,
+  responseMetadata
+}) => {
+  const customMetadata = additionalKwargs ? { ...additionalKwargs } : {};
+  const reasoningTokens = extractReasoningTokens({ usageMetadata, responseMetadata });
+  const existingAthenaMetadata = isRecord(customMetadata._athena) ? customMetadata._athena : void 0;
+  const athenaMetadata = {
+    ...existingAthenaMetadata ?? {}
+  };
+  if (usageMetadata) {
+    athenaMetadata.rawUsageMetadata = usageMetadata;
+  }
+  if (responseMetadata) {
+    athenaMetadata.rawResponseMetadata = responseMetadata;
+  }
+  if (reasoningTokens !== void 0) {
+    athenaMetadata.reasoningTokens = reasoningTokens;
+  }
+  if (Object.keys(athenaMetadata).length > 0) {
+    customMetadata._athena = athenaMetadata;
+  }
+  return Object.keys(customMetadata).length > 0 ? customMetadata : void 0;
+};
+const getSubgraphMessages = (artifact) => {
+  if (!isRecord(artifact)) return void 0;
+  const subgraphState = artifact.subgraph_state;
+  if (!isRecord(subgraphState)) return void 0;
+  const messages = subgraphState.messages;
+  return Array.isArray(messages) && messages.length > 0 ? messages : void 0;
+};
+const convertLangChainMessage = (message) => {
+  var _a2, _b, _c;
+  switch (message.type) {
+    case "system": {
+      const customMetadata = buildCustomMetadata({
+        additionalKwargs: message.additional_kwargs
+      });
+      return {
+        role: "system",
+        id: message.id,
+        content: [{ type: "text", text: message.content }],
+        ...customMetadata && {
+          metadata: {
+            custom: customMetadata
+          }
+        }
+      };
+    }
+    case "human": {
+      const customMetadata = buildCustomMetadata({
+        additionalKwargs: message.additional_kwargs
+      });
+      return {
+        role: "user",
+        id: message.id,
+        content: contentToParts(message.content),
+        ...customMetadata && {
+          metadata: {
+            custom: customMetadata
+          }
+        }
+      };
+    }
+    case "ai": {
+      const customMetadata = buildCustomMetadata({
+        additionalKwargs: message.additional_kwargs,
+        usageMetadata: message.usage_metadata,
+        responseMetadata: message.response_metadata
+      });
+      const toolCallParts = ((_a2 = message.tool_calls) == null ? void 0 : _a2.map((chunk) => {
+        var _a3, _b2;
+        let argsText;
+        if (typeof chunk.args === "string") {
+          argsText = chunk.args;
+        } else {
+          const rawString = chunk.partial_json ?? ((_b2 = (_a3 = message.tool_call_chunks) == null ? void 0 : _a3.find((c) => c.id === chunk.id)) == null ? void 0 : _b2.args) ?? JSON.stringify(chunk.args);
+          argsText = rawString;
+        }
+        return {
+          type: "tool-call",
+          toolCallId: chunk.id,
+          toolName: chunk.name,
+          args: typeof chunk.args === "string" ? parsePartialJsonObject(argsText) ?? {} : chunk.args,
+          argsText
+        };
+      })) ?? [];
+      const normalizedContent = typeof message.content === "string" ? [{ type: "text", text: message.content }] : message.content;
+      const allContent = [
+        (_b = message.additional_kwargs) == null ? void 0 : _b.reasoning,
+        ...normalizedContent,
+        ...((_c = message.additional_kwargs) == null ? void 0 : _c.tool_outputs) ?? []
+      ].filter((c) => c != null);
+      return {
+        role: "assistant",
+        id: message.id,
+        content: [...contentToParts(allContent), ...toolCallParts],
+        ...message.status && { status: message.status },
+        ...customMetadata && {
+          metadata: {
+            custom: customMetadata
+          }
+        }
+      };
+    }
+    case "tool": {
+      const subgraphMessages = getSubgraphMessages(message.artifact);
+      const parentEnded = message.content !== void 0 && message.content !== null;
+      const nestedMessages = subgraphMessages !== void 0 ? convertLangChainToThreadMessages(
+        parseMessages(
+          parentEnded ? autoCloseInFlightSubgraphMessages(subgraphMessages) : subgraphMessages
+        ),
+        !parentEnded
+      ) : void 0;
+      return {
+        role: "tool",
+        toolName: message.name,
+        toolCallId: message.tool_call_id,
+        result: message.content,
+        artifact: message.artifact,
+        isError: message.status === "error",
+        ...nestedMessages !== void 0 && { messages: nestedMessages }
+      };
+    }
+    default:
+      return null;
+  }
+};
+const convertLangChainToThreadMessages = (messages, isRunning = false, metadata = {}) => {
+  const validToolCallIds = /* @__PURE__ */ new Set();
+  for (const message of messages) {
+    if (message.type === "ai" && message.tool_calls) {
+      for (const tc of message.tool_calls) {
+        if (tc.id) {
+          validToolCallIds.add(tc.id);
+        }
+      }
+    }
+  }
+  const filteredMessages = messages.filter((message) => {
+    if (message.type === "tool" && message.tool_call_id && !validToolCallIds.has(message.tool_call_id)) {
+      return false;
+    }
+    return true;
+  });
+  return convertExternalMessages(filteredMessages, convertLangChainMessage, isRunning, metadata);
+};
 function getAuthHeaders(auth) {
   if (auth.token) {
     return { Authorization: `Bearer ${auth.token}` };
@@ -8530,20 +8574,59 @@ function deserializeMessage(msg) {
   }
   return msg;
 }
+function getAuthMode(auth) {
+  if (auth.token) {
+    return "bearer";
+  }
+  if (auth.apiKey) {
+    return "api-key";
+  }
+  return "none";
+}
+function getResponseErrorBody(response) {
+  return response.text().catch(() => "");
+}
 async function getThreadState(backendUrl, auth, threadId) {
   const base2 = getAthenaApiBaseUrl(backendUrl);
-  const res = await fetch(`${base2}/api/unstable/threads/${threadId}`, {
-    method: "GET",
-    headers: { ...getAuthHeaders(auth) }
+  const authMode = getAuthMode(auth);
+  const endpoint = `${base2}/api/conversations/threads/get`;
+  console.info("[AthenaSDK] Loading thread state from conversations API:", {
+    threadId,
+    endpoint,
+    authMode,
+    hasToken: Boolean(auth.token),
+    hasApiKey: Boolean(auth.apiKey)
+  });
+  const res = await fetch(endpoint, {
+    method: "POST",
+    headers: { "Content-Type": "application/json", ...getAuthHeaders(auth) },
+    body: JSON.stringify({
+      thread_id: threadId,
+      skip_cache: true
+    })
   });
   if (!res.ok) {
-    throw new Error(`[AthenaSDK] Failed to get thread state: ${res.status}`);
+    const body = await getResponseErrorBody(res);
+    throw new Error(
+      `[AthenaSDK] Failed to get thread state: ${res.status} (${authMode})${body ? `: ${body.slice(0, 300)}` : ""}`
+    );
   }
   const data = await res.json();
-  if (Array.isArray(data.messages)) {
-    data.messages = data.messages.map(deserializeMessage);
+  const thread = data.thread;
+  if (data.thread_found === false || !thread) {
+    return {
+      thread_id: threadId,
+      messages: []
+    };
   }
-  return data;
+  const channelValues = thread.channel_values ?? {};
+  const rawMessages = Array.isArray(channelValues.messages) ? channelValues.messages : Array.isArray(thread.messages) ? thread.messages : [];
+  return {
+    ...channelValues,
+    thread_id: thread.thread_id ?? threadId,
+    messages: rawMessages.map(deserializeMessage),
+    ...thread.state ? { status: thread.state } : {}
+  };
 }
 async function archiveThread(backendUrl, auth, threadId) {
   const base2 = getAthenaApiBaseUrl(backendUrl);
@@ -8938,7 +9021,7 @@ const useAthenaRuntime = (config2) => {
             hasMessages: messageCount > 0
           });
           runtime.thread.importExternalState({
-            messages: state.messages
+            ...state
           });
           console.log(
             "[AthenaSDK] importExternalState completed, runtime messages:",
@@ -46865,7 +46948,12 @@ const ComposerKeybinds = Extension.create({
         if (editor.isActive("bulletList") || editor.isActive("orderedList")) {
           return false;
         }
-        this.options.onSubmit();
+        const submit = this.options.onSubmit;
+        if (typeof window !== "undefined" && typeof window.requestAnimationFrame === "function") {
+          window.requestAnimationFrame(() => submit());
+        } else {
+          submit();
+        }
         return true;
       },
       "Shift-Enter": ({ editor }) => {
@@ -49432,6 +49520,43 @@ function CollapsibleTrigger({ ...props }) {
 function CollapsibleContent({ ...props }) {
   return /* @__PURE__ */ jsx(CollapsibleContent$1, { "data-slot": "collapsible-content", ...props });
 }
+const NestedPtcComponentsContext = createContext(null);
+const NestedPtcComponentsProvider = ({ components, children }) => /* @__PURE__ */ jsx(NestedPtcComponentsContext.Provider, { value: components, children });
+const useNestedPtcComponents = (fallback) => {
+  const components = useContext(NestedPtcComponentsContext);
+  return useMemo(() => {
+    const standardComponents = components && "ChainOfThought" in components && components.ChainOfThought ? void 0 : components;
+    return {
+      ...standardComponents ?? {},
+      tools: {
+        ...(standardComponents == null ? void 0 : standardComponents.tools) ?? {},
+        Fallback: fallback
+      }
+    };
+  }, [components, fallback]);
+};
+const EmptyComponent = () => null;
+const NestedPtcMessages = ({
+  components,
+  messageClassName
+}) => {
+  const propsRef = useRef({ components, messageClassName });
+  propsRef.current = { components, messageClassName };
+  const messageComponents = useMemo(() => {
+    const NestedMessage = () => {
+      const { components: components2, messageClassName: messageClassName2 } = propsRef.current;
+      const parts = /* @__PURE__ */ jsx(
+        MessagePrimitive.Parts,
+        {
+          components: { Empty: EmptyComponent, ...components2 }
+        }
+      );
+      return messageClassName2 ? /* @__PURE__ */ jsx("div", { className: messageClassName2, children: parts }) : parts;
+    };
+    return { Message: NestedMessage };
+  }, []);
+  return /* @__PURE__ */ jsx(MessagePartPrimitive.Messages, { components: messageComponents });
+};
 const ANIMATION_DURATION = 200;
 function truncateLine(text2, max2 = 70) {
   const oneLine = text2.replace(/\s+/g, " ").trim();
@@ -49980,16 +50105,20 @@ const ToolFallbackImpl = ({
   status
 }) => {
   const isCancelled = (status == null ? void 0 : status.type) === "incomplete" && status.reason === "cancelled";
+  const nestedComponents = useNestedPtcComponents(ToolFallback);
   if (isAssetTool(toolName, result)) {
-    return /* @__PURE__ */ jsx(
-      AssetToolCard,
-      {
-        toolName,
-        argsText,
-        result,
-        status
-      }
-    );
+    return /* @__PURE__ */ jsxs(Fragment$1, { children: [
+      /* @__PURE__ */ jsx(
+        AssetToolCard,
+        {
+          toolName,
+          argsText,
+          result,
+          status
+        }
+      ),
+      /* @__PURE__ */ jsx(NestedPtcMessages, { components: nestedComponents })
+    ] });
   }
   const isComplete = (status == null ? void 0 : status.type) === "complete" || !status;
   const resultAssetId = extractAssetId$1(result);
@@ -50014,6 +50143,7 @@ const ToolFallbackImpl = ({
             }
           ),
           !isCancelled && /* @__PURE__ */ jsx(ToolFallbackResult, { result }),
+          /* @__PURE__ */ jsx(NestedPtcMessages, { components: nestedComponents }),
           !isCancelled && /* @__PURE__ */ jsx("div", { className: "flex justify-end px-3 pt-1", children: /* @__PURE__ */ jsx(CopyToolSpec, { toolName, argsText, result }) })
         ] })
       ]
@@ -52906,14 +53036,14 @@ const useAthenaChatDefaultComponents = () => {
   return value;
 };
 const AthenaDefaultAssistantMessage = () => {
-  const { toolUIs, TextComponent, ReasoningComponent, EmptyComponent, ActionBarComponent } = useAthenaChatDefaultComponents();
+  const { toolUIs, TextComponent, ReasoningComponent, EmptyComponent: EmptyComponent2, ActionBarComponent } = useAthenaChatDefaultComponents();
   return /* @__PURE__ */ jsx(
     AthenaAssistantMessage,
     {
       toolUIs,
       TextComponent,
       ReasoningComponent,
-      EmptyComponent,
+      EmptyComponent: EmptyComponent2,
       ActionBarComponent
     }
   );
@@ -52938,6 +53068,16 @@ const getReasoningTokensFromMetadata = (metadata) => {
   return typeof reasoningTokens === "number" && Number.isFinite(reasoningTokens) ? reasoningTokens : void 0;
 };
 const formatReasoningTokens = (reasoningTokens) => `${reasoningTokens.toLocaleString("en-US")} ${reasoningTokens === 1 ? "token" : "tokens"}`;
+const withNestedPtcMessages = (ToolUI) => {
+  const ToolUIWithNestedPtcMessages = (props) => {
+    const nestedComponents = useNestedPtcComponents(ToolFallback);
+    return /* @__PURE__ */ jsxs(Fragment$1, { children: [
+      /* @__PURE__ */ jsx(ToolUI, { ...props }),
+      /* @__PURE__ */ jsx(NestedPtcMessages, { components: nestedComponents })
+    ] });
+  };
+  return ToolUIWithNestedPtcMessages;
+};
 const SuggestionCard = ({
   suggestion,
   index: index2
@@ -53293,10 +53433,29 @@ const AthenaAssistantMessage = ({
   toolUIs,
   TextComponent = TiptapText,
   ReasoningComponent,
-  EmptyComponent = AthenaAssistantMessageEmpty,
+  EmptyComponent: EmptyComponent2 = AthenaAssistantMessageEmpty,
   ActionBarComponent = AthenaAssistantActionBar
 }) => {
   const effectiveReasoningComponent = ReasoningComponent ?? AthenaReasoningPart;
+  const toolUIsWithNestedMessages = useMemo(() => {
+    const wrappedToolUIs = {};
+    for (const [toolName, ToolUI] of Object.entries(toolUIs)) {
+      wrappedToolUIs[toolName] = withNestedPtcMessages(ToolUI);
+    }
+    return wrappedToolUIs;
+  }, [toolUIs]);
+  const partsComponents = useMemo(
+    () => ({
+      Text: TextComponent,
+      Reasoning: effectiveReasoningComponent,
+      tools: {
+        Fallback: ToolFallback,
+        by_name: toolUIsWithNestedMessages
+      },
+      Empty: EmptyComponent2
+    }),
+    [EmptyComponent2, TextComponent, effectiveReasoningComponent, toolUIsWithNestedMessages]
+  );
   return /* @__PURE__ */ jsxs(
     MessagePrimitive.Root,
     {
@@ -53304,20 +53463,7 @@ const AthenaAssistantMessage = ({
       "data-role": "assistant",
       children: [
         /* @__PURE__ */ jsx(AthenaReasoningTextComponentContext.Provider, { value: TextComponent, children: /* @__PURE__ */ jsxs("div", { className: "aui-assistant-message-content wrap-break-word px-2 text-foreground leading-relaxed", children: [
-          /* @__PURE__ */ jsx(
-            MessagePrimitive.Parts,
-            {
-              components: {
-                Text: TextComponent,
-                Reasoning: effectiveReasoningComponent,
-                tools: {
-                  Fallback: ToolFallback,
-                  by_name: toolUIs
-                },
-                Empty: EmptyComponent
-              }
-            }
-          ),
+          /* @__PURE__ */ jsx(NestedPtcComponentsProvider, { components: partsComponents, children: /* @__PURE__ */ jsx(MessagePrimitive.Parts, { components: partsComponents }) }),
           /* @__PURE__ */ jsx(MessageError, {})
         ] }) }),
         /* @__PURE__ */ jsx("div", { className: "aui-assistant-message-footer mt-1 ml-2 flex", children: /* @__PURE__ */ jsx(ActionBarComponent, {}) })
@@ -53825,7 +53971,9 @@ export {
   FileUploadButton,
   GetDatabaseTableSchemaToolUI,
   ListDatabaseTablesToolUI,
+  NestedPtcMessages,
   OpenAssetToolUI,
+  PTC_SUBCALL_DID_NOT_COMPLETE_MESSAGE,
   ReadAssetToolUI,
   RunPythonCodeToolUI,
   RunSqlToolUI,
@@ -53850,9 +53998,11 @@ export {
   UpdateSheetRangeToolUI,
   WebSearchToolUI,
   archiveThread,
+  autoCloseInFlightSubgraphMessages,
   buttonVariants,
   clearAutoOpenedAssets,
   cn,
+  convertLangChainToThreadMessages,
   createAssetToolUI,
   createThread,
   formatToolName,