@assistant-ui/react 0.14.26 → 0.14.28

package/dist/utils/getSelectionMessageId.js.map

@@ -1 +1 @@
-{"version":3,"file":"getSelectionMessageId.js","names":["findMessageId","node","Node","el","HTMLElement","parentElement","id","getAttribute","getSelectionMessageId","selection","Selection","anchorNode","focusNode","anchorId","focusId"],"sources":["../../src/utils/getSelectionMessageId.ts"],"sourcesContent":["const findMessageId = (node: Node | null): string | null => {\n  let el = node instanceof HTMLElement ? node : (node?.parentElement ?? null);\n  while (el) {\n    const id = el.getAttribute(\"data-message-id\");\n    if (id) return id;\n    el = el.parentElement;\n  }\n  return null;\n};\n\nexport const getSelectionMessageId = (selection: Selection): string | null => {\n  const { anchorNode, focusNode } = selection;\n  if (!anchorNode || !focusNode) return null;\n\n  const anchorId = findMessageId(anchorNode);\n  const focusId = findMessageId(focusNode);\n\n  if (!anchorId || anchorId !== focusId) return null;\n  return anchorId;\n};\n"],"mappings":";AAAA,MAAMA,iBAAiBC,SAAqC;CAC1D,IAAIE,KAAKF,gBAAgBG,cAAcH,OAAQA,MAAMI,iBAAiB;CACtE,OAAOF,IAAI;EACT,MAAMG,KAAKH,GAAGI,aAAa,iBAAiB;EAC5C,IAAID,IAAI,OAAOA;EACfH,KAAKA,GAAGE;CACV;CACA,OAAO;AACT;AAEA,MAAaG,yBAAyBC,cAAwC;CAC5E,MAAM,EAAEE,YAAYC,cAAcH;CAClC,IAAI,CAACE,cAAc,CAACC,WAAW,OAAO;CAEtC,MAAMC,WAAWb,cAAcW,UAAU;CACzC,MAAMG,UAAUd,cAAcY,SAAS;CAEvC,IAAI,CAACC,YAAYA,aAAaC,SAAS,OAAO;CAC9C,OAAOD;AACT"}
+{"version":3,"file":"getSelectionMessageId.js","names":["QUOTE_SELECTABLE_SELECTOR","getElement","node","Node","HTMLElement","parentElement","findMessageElement","el","id","getAttribute","isExcluded","marker","Element","hasQuoteSelectableRegion","messageElement","matches","querySelectorAll","findQuoteMarker","closest","contains","getSelectionMessageId","selection","Selection","anchorNode","focusNode","anchorMessageElement","focusMessageElement","messageId","anchorMarker","focusMarker"],"sources":["../../src/utils/getSelectionMessageId.ts"],"sourcesContent":["const QUOTE_SELECTABLE_SELECTOR = \"[data-aui-quote-selectable]\";\n\nconst getElement = (node: Node | null): HTMLElement | null => {\n  return node instanceof HTMLElement ? node : (node?.parentElement ?? null);\n};\n\nconst findMessageElement = (node: Node | null): HTMLElement | null => {\n  let el = node instanceof HTMLElement ? node : (node?.parentElement ?? null);\n  while (el) {\n    const id = el.getAttribute(\"data-message-id\");\n    if (id) return el;\n    el = el.parentElement;\n  }\n  return null;\n};\n\nconst isExcluded = (marker: Element): boolean => {\n  return marker.getAttribute(\"data-aui-quote-selectable\") === \"false\";\n};\n\nconst hasQuoteSelectableRegion = (messageElement: HTMLElement) => {\n  if (\n    messageElement.matches(QUOTE_SELECTABLE_SELECTOR) &&\n    !isExcluded(messageElement)\n  ) {\n    return true;\n  }\n  for (const marker of messageElement.querySelectorAll(\n    QUOTE_SELECTABLE_SELECTOR,\n  )) {\n    if (!isExcluded(marker)) return true;\n  }\n  return false;\n};\n\nconst findQuoteMarker = (\n  node: Node | null,\n  messageElement: HTMLElement,\n): HTMLElement | null => {\n  const marker = getElement(node)?.closest(QUOTE_SELECTABLE_SELECTOR);\n  if (!(marker instanceof HTMLElement)) return null;\n  if (!messageElement.contains(marker)) return null;\n  return marker;\n};\n\nexport const getSelectionMessageId = (selection: Selection): string | null => {\n  const { anchorNode, focusNode } = selection;\n  if (!anchorNode || !focusNode) return null;\n\n  const anchorMessageElement = findMessageElement(anchorNode);\n  const focusMessageElement = findMessageElement(focusNode);\n\n  if (!anchorMessageElement || anchorMessageElement !== focusMessageElement) {\n    return null;\n  }\n\n  const messageId = anchorMessageElement.getAttribute(\"data-message-id\");\n  if (!messageId) return null;\n\n  const anchorMarker = findQuoteMarker(anchorNode, anchorMessageElement);\n  const focusMarker = findQuoteMarker(focusNode, anchorMessageElement);\n\n  if (anchorMarker && isExcluded(anchorMarker)) return null;\n  if (focusMarker && isExcluded(focusMarker)) return null;\n\n  if (!hasQuoteSelectableRegion(anchorMessageElement)) return messageId;\n\n  if (!anchorMarker || anchorMarker !== focusMarker) return null;\n\n  return messageId;\n};\n"],"mappings":";AAAA,MAAMA,4BAA4B;AAElC,MAAMC,cAAcC,SAA0C;CAC5D,OAAOA,gBAAgBE,cAAcF,OAAQA,MAAMG,iBAAiB;AACtE;AAEA,MAAMC,sBAAsBJ,SAA0C;CACpE,IAAIK,KAAKL,gBAAgBE,cAAcF,OAAQA,MAAMG,iBAAiB;CACtE,OAAOE,IAAI;EAET,IADWA,GAAGE,aAAa,iBACvBD,GAAI,OAAOD;EACfA,KAAKA,GAAGF;CACV;CACA,OAAO;AACT;AAEA,MAAMK,cAAcC,WAA6B;CAC/C,OAAOA,OAAOF,aAAa,2BAA2B,MAAM;AAC9D;AAEA,MAAMI,4BAA4BC,mBAAgC;CAChE,IACEA,eAAeC,QAAQf,yBAAyB,KAChD,CAACU,WAAWI,cAAc,GAE1B,OAAO;CAET,KAAK,MAAMH,UAAUG,eAAeE,iBAClChB,yBACF,GACE,IAAI,CAACU,WAAWC,MAAM,GAAG,OAAO;CAElC,OAAO;AACT;AAEA,MAAMM,mBACJf,MACAY,mBACuB;CACvB,MAAMH,SAASV,WAAWC,IAAI,CAAC,EAAEgB,QAAQlB,yBAAyB;CAClE,IAAI,EAAEW,kBAAkBP,cAAc,OAAO;CAC7C,IAAI,CAACU,eAAeK,SAASR,MAAM,GAAG,OAAO;CAC7C,OAAOA;AACT;AAEA,MAAaS,yBAAyBC,cAAwC;CAC5E,MAAM,EAAEE,YAAYC,cAAcH;CAClC,IAAI,CAACE,cAAc,CAACC,WAAW,OAAO;CAEtC,MAAMC,uBAAuBnB,mBAAmBiB,UAAU;CAC1D,MAAMG,sBAAsBpB,mBAAmBkB,SAAS;CAExD,IAAI,CAACC,wBAAwBA,yBAAyBC,qBACpD,OAAO;CAGT,MAAMC,YAAYF,qBAAqBhB,aAAa,iBAAiB;CACrE,IAAI,CAACkB,WAAW,OAAO;CAEvB,MAAMC,eAAeX,gBAAgBM,YAAYE,oBAAoB;CACrE,MAAMI,cAAcZ,gBAAgBO,WAAWC,oBAAoB;CAEnE,IAAIG,gBAAgBlB,WAAWkB,YAAY,GAAG,OAAO;CACrD,IAAIC,eAAenB,WAAWmB,WAAW,GAAG,OAAO;CAEnD,IAAI,CAAChB,yBAAyBY,oBAAoB,GAAG,OAAOE;CAE5D,IAAI,CAACC,gBAAgBA,iBAAiBC,aAAa,OAAO;CAE1D,OAAOF;AACT"}

package/dist/utils/hooks/useManagedRef.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useManagedRef.d.ts","names":[],"sources":["../../../src/utils/hooks/useManagedRef.ts"],"mappings":";cAEa,aAAA,UACX,QAAA,GAAW,IAAA,EAAM,KAAA,mCAAkC,EAAA,EAK5C,KAAK"}
+{"version":3,"file":"useManagedRef.d.ts","names":[],"sources":["../../../src/utils/hooks/useManagedRef.ts"],"mappings":";cAEa,gBAAiB,OAC5B,WAAW,MAAM,wCAAkC,IAK5C"}

package/dist/utils/hooks/useMediaQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useMediaQuery.d.ts","names":[],"sources":["../../../src/utils/hooks/useMediaQuery.ts"],"mappings":";cAOa,aAAA,GAAiB,KAAoB"}
+{"version":3,"file":"useMediaQuery.d.ts","names":[],"sources":["../../../src/utils/hooks/useMediaQuery.ts"],"mappings":";cAOa,gBAAiB"}

package/dist/utils/hooks/useOnResizeContent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useOnResizeContent.d.ts","names":[],"sources":["../../../src/utils/hooks/useOnResizeContent.ts"],"mappings":";cAIa,kBAAA,GAAsB,QAAA,kBAAoB,EAAA,EAAA,WAAA"}
+{"version":3,"file":"useOnResizeContent.d.ts","names":[],"sources":["../../../src/utils/hooks/useOnResizeContent.ts"],"mappings":";cAIa,qBAAsB,0BAAoB,IAAA"}

package/dist/utils/hooks/useOnScrollToBottom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useOnScrollToBottom.d.ts","names":[],"sources":["../../../src/utils/hooks/useOnScrollToBottom.ts"],"mappings":";cAMa,mBAAA,GACX,QAAA,GAAW,MAAA;EAAU,QAAA,EAAU,cAAc;AAAA"}
+{"version":3,"file":"useOnScrollToBottom.d.ts","names":[],"sources":["../../../src/utils/hooks/useOnScrollToBottom.ts"],"mappings":";cAMa,sBACX,WAAW;EAAU,UAAU"}

package/dist/utils/hooks/useSizeHandle.d.ts

@@ -1,5 +1,4 @@
 import { SizeHandle } from "../../context/stores/ThreadViewport.js";
-
 //#region src/utils/hooks/useSizeHandle.d.ts
 /**
  * Hook that creates a ref for tracking element size via a SizeHandle.

package/dist/utils/hooks/useSizeHandle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSizeHandle.d.ts","names":[],"sources":["../../../src/utils/hooks/useSizeHandle.ts"],"mappings":";;;;;AAcA;;;;;;cAAa,aAAA,GACX,QAAA,SAAiB,UAAA,sBACjB,SAAA,IAAa,EAAA,EAAI,WAAA,iBAAsB,EAAA,EAAA,WAAA"}
+{"version":3,"file":"useSizeHandle.d.ts","names":[],"sources":["../../../src/utils/hooks/useSizeHandle.ts"],"mappings":";;;;;;;;;;cAca,gBACX,iBAAiB,gCACjB,aAAa,IAAI,4BAAsB,IAAA"}

package/dist/utils/smooth/SmoothContext.d.ts

@@ -1,79 +1,50 @@
 import { ReadonlyStore } from "../../context/ReadonlyStore.js";
 import { ComponentType, FC, PropsWithChildren } from "react";
-
 //#region src/utils/smooth/SmoothContext.d.ts
 declare const SmoothContextProvider: FC<PropsWithChildren>;
 declare const withSmoothContextProvider: <C extends ComponentType<any>>(Component: C) => C;
 declare const useSmoothStatus: {
-    (): {
-      readonly type: "running";
-    } | {
-      readonly type: "complete";
-    } | {
-      readonly type: "incomplete";
-      readonly reason: "cancelled" | "length" | "content-filter" | "other" | "error";
-      readonly error?: unknown;
-    } | {
-      readonly type: "requires-action";
-      readonly reason: "interrupt";
-    };
-    <TSelected>(selector: (state: {
-      readonly type: "running";
-    } | {
-      readonly type: "complete";
-    } | {
-      readonly type: "incomplete";
-      readonly reason: "cancelled" | "length" | "content-filter" | "other" | "error";
-      readonly error?: unknown;
-    } | {
-      readonly type: "requires-action";
-      readonly reason: "interrupt";
-    }) => TSelected): TSelected;
-    (options: {
-      optional: true;
-    }): {
-      readonly type: "running";
-    } | {
-      readonly type: "complete";
-    } | {
-      readonly type: "incomplete";
-      readonly reason: "cancelled" | "length" | "content-filter" | "other" | "error";
-      readonly error?: unknown;
-    } | {
-      readonly type: "requires-action";
-      readonly reason: "interrupt";
-    } | null;
-    <TSelected>(options: {
-      optional: true;
-      selector?: (state: {
-        readonly type: "running";
-      } | {
-        readonly type: "complete";
-      } | {
-        readonly type: "incomplete";
-        readonly reason: "cancelled" | "length" | "content-filter" | "other" | "error";
-        readonly error?: unknown;
-      } | {
-        readonly type: "requires-action";
-        readonly reason: "interrupt";
-      }) => TSelected;
-    }): TSelected | null;
-  }, useSmoothStatusStore: {
-    (): ReadonlyStore<{
-      readonly type: "running";
-    } | {
-      readonly type: "complete";
-    } | {
-      readonly type: "incomplete";
-      readonly reason: "cancelled" | "length" | "content-filter" | "other" | "error";
-      readonly error?: unknown;
-    } | {
-      readonly type: "requires-action";
-      readonly reason: "interrupt";
-    }>;
-    (options: {
-      optional: true;
-    }): ReadonlyStore<{
+  (): {
+    readonly type: "running";
+  } | {
+    readonly type: "complete";
+  } | {
+    readonly type: "incomplete";
+    readonly reason: "cancelled" | "length" | "content-filter" | "other" | "error";
+    readonly error?: unknown;
+  } | {
+    readonly type: "requires-action";
+    readonly reason: "interrupt";
+  };
+  <TSelected>(selector: (state: {
+    readonly type: "running";
+  } | {
+    readonly type: "complete";
+  } | {
+    readonly type: "incomplete";
+    readonly reason: "cancelled" | "length" | "content-filter" | "other" | "error";
+    readonly error?: unknown;
+  } | {
+    readonly type: "requires-action";
+    readonly reason: "interrupt";
+  }) => TSelected): TSelected;
+  (options: {
+    optional: true;
+  }): {
+    readonly type: "running";
+  } | {
+    readonly type: "complete";
+  } | {
+    readonly type: "incomplete";
+    readonly reason: "cancelled" | "length" | "content-filter" | "other" | "error";
+    readonly error?: unknown;
+  } | {
+    readonly type: "requires-action";
+    readonly reason: "interrupt";
+  } | null;
+  <TSelected>(options: {
+    optional: true;
+    selector?: (state: {
       readonly type: "running";
     } | {
       readonly type: "complete";
@@ -84,8 +55,36 @@ declare const useSmoothStatus: {
     } | {
       readonly type: "requires-action";
       readonly reason: "interrupt";
-    }> | null;
-  };
+    }) => TSelected;
+  }): TSelected | null;
+}, useSmoothStatusStore: {
+  (): ReadonlyStore<{
+    readonly type: "running";
+  } | {
+    readonly type: "complete";
+  } | {
+    readonly type: "incomplete";
+    readonly reason: "cancelled" | "length" | "content-filter" | "other" | "error";
+    readonly error?: unknown;
+  } | {
+    readonly type: "requires-action";
+    readonly reason: "interrupt";
+  }>;
+  (options: {
+    optional: true;
+  }): ReadonlyStore<{
+    readonly type: "running";
+  } | {
+    readonly type: "complete";
+  } | {
+    readonly type: "incomplete";
+    readonly reason: "cancelled" | "length" | "content-filter" | "other" | "error";
+    readonly error?: unknown;
+  } | {
+    readonly type: "requires-action";
+    readonly reason: "interrupt";
+  }> | null;
+};
 //#endregion
 export { SmoothContextProvider, useSmoothStatus, useSmoothStatusStore, withSmoothContextProvider };
 //# sourceMappingURL=SmoothContext.d.ts.map

package/dist/utils/smooth/SmoothContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SmoothContext.d.ts","names":[],"sources":["../../../src/utils/smooth/SmoothContext.tsx"],"mappings":";;;;cAmCa,qBAAA,EAAuB,EAAE,CAAC,iBAAA;AAAA,cAgB1B,yBAAA,aAAuC,aAAA,OAClD,SAAA,EAAW,CAAA,KACV,CAAA;AAAA,cA2BY,eAAA;IAAA;MAAA"}
+{"version":3,"file":"SmoothContext.d.ts","names":[],"sources":["../../../src/utils/smooth/SmoothContext.tsx"],"mappings":";;;cAmCa,uBAAuB,GAAG;cAgB1B,4BAA6B,UAAU,oBAClD,WAAW,MACV;cA2BY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAAiB"}

package/dist/utils/smooth/useSmooth.d.ts

@@ -1,5 +1,4 @@
 import { MessagePartState, ReasoningMessagePart, TextMessagePart } from "@assistant-ui/core";
-
 //#region src/utils/smooth/useSmooth.d.ts
 /**
  * Tuning options for the smooth text streaming animation.

package/dist/utils/smooth/useSmooth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSmooth.d.ts","names":[],"sources":["../../../src/utils/smooth/useSmooth.ts"],"mappings":";;;;;AAkBA;KAAY,aAAA;;;;;;EAMV,OAAA;EAmBW;AAAA;AA0Gb;;;EAvHE,iBAAA;EAwH2B;;;;EAnH3B,gBAAA;EAqHuC;;;;;;;EA7GvC,WAAA;AAAA;;;;;AA6G2D;;;;;;;;;;;;;;;;cAHhD,SAAA,GACX,KAAA,EAAO,gBAAA,IAAoB,eAAA,GAAkB,oBAAA,GAC7C,MAAA,aAAkB,aAAA,KACjB,gBAAA,IAAoB,eAAA,GAAkB,oBAAA"}
+{"version":3,"file":"useSmooth.d.ts","names":[],"sources":["../../../src/utils/smooth/useSmooth.ts"],"mappings":";;;;;KAkBY;;;;;;EAMV;;;;;;EAMA;;;;;EAKA;;;;;;;;EAQA;;;;;;;;;;;;;;;;;;;;;;cA0GW,YACX,OAAO,oBAAoB,kBAAkB,uBAC7C,mBAAkB,kBACjB,oBAAoB,kBAAkB"}

package/dist/utils/useToolArgsFieldStatus.d.ts

@@ -1,7 +1,5 @@
 //#region src/utils/useToolArgsFieldStatus.d.ts
 declare const useToolArgsFieldStatus: (fieldPath: (string | number)[]) => {
-  type: string;
-} | {
   readonly type: "running";
 } | {
   readonly type: "complete";
@@ -9,6 +7,8 @@ declare const useToolArgsFieldStatus: (fieldPath: (string | number)[]) => {
   readonly type: "incomplete";
   readonly reason: "cancelled" | "length" | "content-filter" | "other" | "error";
   readonly error?: unknown;
+} | {
+  type: string;
 };
 //#endregion
 export { useToolArgsFieldStatus };

package/dist/utils/useToolArgsFieldStatus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useToolArgsFieldStatus.d.ts","names":[],"sources":["../../src/utils/useToolArgsFieldStatus.ts"],"mappings":";cAKa,sBAAA,GAA0B,SAAA"}
+{"version":3,"file":"useToolArgsFieldStatus.d.ts","names":[],"sources":["../../src/utils/useToolArgsFieldStatus.ts"],"mappings":";cAKa,yBAA0B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/react",
-  "version": "0.14.26",
+  "version": "0.14.28",
   "description": "Open-source TypeScript/React library for building production-grade AI chat experiences",
   "keywords": [
     "ai",
@@ -55,23 +55,23 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@assistant-ui/core": "^0.2.20",
-    "@assistant-ui/store": "^0.2.19",
-    "@assistant-ui/tap": "^0.9.3",
-    "@radix-ui/primitive": "^1.1.4",
-    "@radix-ui/react-collection": "^1.1.10",
-    "@radix-ui/react-compose-refs": "^1.1.3",
-    "@radix-ui/react-context": "^1.1.4",
-    "@radix-ui/react-primitive": "^2.1.6",
-    "@radix-ui/react-use-callback-ref": "^1.1.2",
-    "@radix-ui/react-use-controllable-state": "^1.2.3",
-    "@radix-ui/react-use-escape-keydown": "^1.1.2",
-    "assistant-cloud": "^0.1.34",
-    "assistant-stream": "^0.3.25",
-    "nanoid": "^5.1.15",
-    "radix-ui": "^1.6.0",
+    "@assistant-ui/core": "^0.2.22",
+    "@assistant-ui/store": "^0.2.21",
+    "@assistant-ui/tap": "^0.9.5",
+    "@radix-ui/primitive": "^1.1.7",
+    "@radix-ui/react-collection": "^1.1.15",
+    "@radix-ui/react-compose-refs": "^1.1.5",
+    "@radix-ui/react-context": "^1.2.2",
+    "@radix-ui/react-primitive": "^2.1.10",
+    "@radix-ui/react-use-callback-ref": "^1.1.4",
+    "@radix-ui/react-use-controllable-state": "^1.2.6",
+    "@radix-ui/react-use-escape-keydown": "^1.1.5",
+    "assistant-cloud": "^0.1.36",
+    "assistant-stream": "^0.3.27",
+    "nanoid": "^6.0.0",
+    "radix-ui": "^1.6.7",
     "react-textarea-autosize": "^8.5.9",
-    "safe-content-frame": "^0.0.22",
+    "safe-content-frame": "^0.0.24",
     "zod": "^4.4.3",
     "zustand": "^5.0.14"
   },
@@ -92,15 +92,15 @@
   "devDependencies": {
     "@testing-library/react": "^16.3.2",
     "@types/json-schema": "^7.0.15",
-    "@types/node": "^26.0.0",
+    "@types/node": "^26.1.1",
     "@types/react": "^19.2.17",
     "@types/react-dom": "^19.2.3",
     "jsdom": "^29.1.1",
-    "react": "^19.2.7",
-    "react-dom": "^19.2.7",
-    "vitest": "^4.1.9",
-    "@assistant-ui/vite": "0.0.8",
-    "@assistant-ui/x-buildutils": "0.0.17"
+    "react": "^19.2.8",
+    "react-dom": "^19.2.8",
+    "vitest": "^4.1.10",
+    "@assistant-ui/vite": "0.0.10",
+    "@assistant-ui/x-buildutils": "0.0.19"
   },
   "publishConfig": {
     "access": "public",

package/src/client/ExternalThread.ts

@@ -24,6 +24,7 @@ import type { QueueItemState } from "@assistant-ui/core/store";
 import type { ComposerSendOptions } from "@assistant-ui/core/store";
 import {
   getThreadMessageText,
+  isCreateAttachment,
   resolveToolApprovalResponse,
 } from "@assistant-ui/core/internal";
 import { ModelContext, Suggestions } from "@assistant-ui/core/store";
@@ -422,7 +423,7 @@ const useComposerClientResource = ({
     setRole,
     setRunConfig,
     addAttachment: async (fileOrAttachment: File | CreateAttachment) => {
-      if (fileOrAttachment instanceof File) {
+      if (!isCreateAttachment(fileOrAttachment)) {
         const newAttachment: Attachment = {
           id: Math.random().toString(36).substring(7),
           type: "file",

package/src/index.ts

@@ -209,7 +209,9 @@ export {
   providerTool,
   type ProviderToolConfig,
   defineMcpToolkit,
+  type McpToolkitEntry,
   type McpToolkitDefinition,
+  type McpToolkitToolConfig,
   Tools,
   DataRenderers,
   Interactables,
@@ -337,6 +339,7 @@ export type {
   AppendMessage,
   TextMessagePart,
   ReasoningMessagePart,
+  PartProviderMetadata,
   SourceProviderMetadata,
   SourceMessagePart,
   ImageMessagePart,

package/src/legacy-runtime/cloud/auiV0.ts

@@ -1,11 +1,17 @@
 import type {
+  CompleteAttachment,
+  DataMessagePart,
+  FileMessagePart,
+  ImageMessagePart,
   MessageStatus,
   SourceProviderMetadata,
   ThreadMessage,
+  TextMessagePart,
+  Unstable_AudioMessagePart,
 } from "@assistant-ui/core";
 import { fromThreadMessageLike } from "../runtime-cores/external-store/ThreadMessageLike";
 import type { CloudMessage } from "assistant-cloud";
-import { isJSONValue } from "../../utils/json/is-json";
+import { isJSONValue } from "@assistant-ui/core/internal";
 import type {
   ReadonlyJSONObject,
   ReadonlyJSONValue,
@@ -65,10 +71,27 @@ type AuiV0MessagePart =
       readonly filename?: string;
     };
 
+type AuiV0AttachmentPart =
+  | TextMessagePart
+  | ImageMessagePart
+  | FileMessagePart
+  | Unstable_AudioMessagePart
+  | DataMessagePart<ReadonlyJSONValue>;
+
+type AuiV0Attachment = {
+  readonly id: string;
+  readonly type: CompleteAttachment["type"];
+  readonly name: string;
+  readonly contentType?: string;
+  readonly status: CompleteAttachment["status"];
+  readonly content: readonly AuiV0AttachmentPart[];
+};
+
 type AuiV0Message = {
   readonly role: "assistant" | "user" | "system";
   readonly status?: MessageStatus;
   readonly content: readonly AuiV0MessagePart[];
+  readonly attachments?: readonly AuiV0Attachment[];
   readonly metadata: {
     readonly unstable_state?: ReadonlyJSONValue;
     readonly unstable_annotations: readonly ReadonlyJSONValue[];
@@ -83,14 +106,59 @@ type AuiV0Message = {
   };
 };
 
+const encodeAttachmentPart = (
+  part: CompleteAttachment["content"][number],
+): AuiV0AttachmentPart => {
+  const type = part.type;
+  switch (type) {
+    case "text":
+    case "image":
+    case "file":
+    case "audio":
+      return part;
+
+    case "data": {
+      if (!isJSONValue(part.data)) {
+        console.warn(`attachment data is not JSON! ${JSON.stringify(part)}`);
+      }
+      return { ...part, data: part.data as ReadonlyJSONValue };
+    }
+
+    default: {
+      const unhandledType: never = type;
+      throw new Error(
+        `Attachment part type not supported by aui/v0: ${unhandledType}`,
+      );
+    }
+  }
+};
+
+const encodeAttachments = (
+  message: ThreadMessage,
+): readonly AuiV0Attachment[] | undefined => {
+  if (message.role !== "user" || message.attachments.length === 0) {
+    return undefined;
+  }
+
+  return message.attachments.map(
+    ({ id, type, name, contentType, status, content }) => ({
+      id,
+      type,
+      name,
+      status,
+      ...(contentType != null ? { contentType } : undefined),
+      content: content.map(encodeAttachmentPart),
+    }),
+  );
+};
+
 export function auiV0Encode(message: ThreadMessage): AuiV0Message {
-  // TODO attachments are currently intentionally ignored
   // info: ID and createdAt are ignored (we use the server value instead)
-
   const status: MessageStatus | undefined =
     message.status?.type === "running"
       ? { type: "incomplete", reason: "cancelled" }
       : message.status;
+  const attachments = encodeAttachments(message);
 
   return {
     role: message.role,
@@ -172,6 +240,7 @@ export function auiV0Encode(message: ThreadMessage): AuiV0Message {
     }),
     metadata: message.metadata as AuiV0Message["metadata"],
     ...(status ? { status } : undefined),
+    ...(attachments ? { attachments } : undefined),
   };
 }
 

package/src/mcp-apps/McpAppRenderer.test.tsx

@@ -0,0 +1,141 @@
+// @vitest-environment jsdom
+import { render, waitFor } from "@testing-library/react";
+import { resource, useResource } from "@assistant-ui/tap";
+import type { ToolCallMessagePartProps } from "@assistant-ui/core/react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { McpAppBridgeHandlers, McpAppsHost } from "./types";
+
+const { framePropsMock } = vi.hoisted(() => ({ framePropsMock: vi.fn() }));
+
+vi.mock("@assistant-ui/store", async (importOriginal) => ({
+  ...(await importOriginal()),
+  useAui: () => ({
+    thread: () => ({ append: vi.fn() }),
+  }),
+}));
+
+vi.mock("./app-frame", () => ({
+  McpAppFrame: (props: unknown) => {
+    framePropsMock(props);
+    return null;
+  },
+}));
+
+import { McpAppRenderer } from "./McpAppRenderer";
+
+const useHost = ({ host }: { host: McpAppsHost }) => host;
+const Host = resource(useHost);
+
+const createPart = (serverId?: string): ToolCallMessagePartProps => ({
+  type: "tool-call",
+  toolCallId: "call-1",
+  toolName: "search",
+  args: {},
+  argsText: "{}",
+  status: { type: "complete" },
+  mcp: {
+    app: {
+      resourceUri: "ui://example/search",
+      ...(serverId !== undefined ? { serverId } : {}),
+    },
+  },
+  addResult: vi.fn(),
+  resume: vi.fn(),
+  respondToApproval: vi.fn(),
+});
+
+function Harness({ host, serverId }: { host: McpAppsHost; serverId?: string }) {
+  const renderer = useResource(
+    McpAppRenderer({
+      host: Host({ host }),
+    }),
+  );
+  const Renderer = renderer.render;
+  return <Renderer {...createPart(serverId)} />;
+}
+
+describe("McpAppRenderer", () => {
+  beforeEach(() => {
+    framePropsMock.mockReset();
+  });
+
+  it("injects serverId into loadResource and reloads when it changes", async () => {
+    const loadResource = vi.fn(async ({ uri }: { uri: string }) => ({
+      uri,
+      mimeType: "text/html;profile=mcp-app" as const,
+      html: "",
+    }));
+    const host: McpAppsHost = {
+      loadResource,
+      callTool: vi.fn(),
+      readResource: vi.fn(),
+      listResources: vi.fn(),
+    };
+
+    const view = render(<Harness host={host} serverId="server-a" />);
+    await waitFor(() =>
+      expect(loadResource).toHaveBeenCalledWith({
+        uri: "ui://example/search",
+        serverId: "server-a",
+      }),
+    );
+
+    view.rerender(<Harness host={host} serverId="server-b" />);
+    await waitFor(() => expect(loadResource).toHaveBeenCalledTimes(2));
+    expect(loadResource).toHaveBeenLastCalledWith({
+      uri: "ui://example/search",
+      serverId: "server-b",
+    });
+  });
+
+  it("gives the renderer serverId precedence in listResources", async () => {
+    const listResources = vi.fn();
+    const host: McpAppsHost = {
+      loadResource: vi.fn(async ({ uri }) => ({
+        uri,
+        mimeType: "text/html;profile=mcp-app" as const,
+        html: "",
+      })),
+      callTool: vi.fn(),
+      readResource: vi.fn(),
+      listResources,
+    };
+
+    render(<Harness host={host} serverId="host-server" />);
+    await waitFor(() => expect(framePropsMock).toHaveBeenCalled());
+    const handlers = framePropsMock.mock.lastCall?.[0]
+      .handlers as McpAppBridgeHandlers;
+
+    await handlers.listResources?.({
+      cursor: "next",
+      serverId: "widget-server",
+    });
+    expect(listResources).toHaveBeenCalledWith({
+      cursor: "next",
+      serverId: "host-server",
+    });
+  });
+
+  it("passes listResources params through unchanged without serverId", async () => {
+    const listResources = vi.fn();
+    const host: McpAppsHost = {
+      loadResource: vi.fn(async ({ uri }) => ({
+        uri,
+        mimeType: "text/html;profile=mcp-app" as const,
+        html: "",
+      })),
+      callTool: vi.fn(),
+      readResource: vi.fn(),
+      listResources,
+    };
+    const params = { cursor: "next" };
+
+    render(<Harness host={host} />);
+    await waitFor(() => expect(framePropsMock).toHaveBeenCalled());
+    const handlers = framePropsMock.mock.lastCall?.[0]
+      .handlers as McpAppBridgeHandlers;
+
+    await handlers.listResources?.(params);
+    expect(listResources).toHaveBeenCalledWith(params);
+  });
+});