@assistant-ui/react 0.15.22 → 0.15.23

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 AgentbaseAI Inc.
+Copyright (c) 2026 AgentbaseAI Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/primitives/message/MessageIf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MessageIf.d.ts","sourceRoot":"","sources":["../../../src/primitives/message/MessageIf.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAEnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,yCAAsC;AAEvE,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,OAAO,GAAG,SAAS,CAAC;IAC1B,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/B,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B,WAAW,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B,WAAW,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,IAAI,EAAE,OAAO,GAAG,SAAS,CAAC;IAC1B,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAC;IAC9B,cAAc,EAAE,OAAO,GAAG,SAAS,CAAC;IACpC,UAAU,EAAE,OAAO,GAAG,SAAS,CAAC;IAChC,iBAAiB,EAAE,UAAU,GAAG,UAAU,GAAG,IAAI,GAAG,SAAS,CAAC;CAC/D,CAAC;AACF,KAAK,iBAAiB,GAAG,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;AAwD7D,yBAAiB,kBAAkB,CAAC;IAClC,KAAY,KAAK,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;CAC1D;AAED;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,CAM3D,CAAC"}
+{"version":3,"file":"MessageIf.d.ts","sourceRoot":"","sources":["../../../src/primitives/message/MessageIf.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAEnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,yCAAsC;AAEvE,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,OAAO,GAAG,SAAS,CAAC;IAC1B,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/B,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B,WAAW,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B,WAAW,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,IAAI,EAAE,OAAO,GAAG,SAAS,CAAC;IAC1B,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAC;IAC9B,cAAc,EAAE,OAAO,GAAG,SAAS,CAAC;IACpC,UAAU,EAAE,OAAO,GAAG,SAAS,CAAC;IAChC,iBAAiB,EAAE,UAAU,GAAG,UAAU,GAAG,IAAI,GAAG,SAAS,CAAC;CAC/D,CAAC;AACF,KAAK,iBAAiB,GAAG,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;AA6D7D,yBAAiB,kBAAkB,CAAC;IAClC,KAAY,KAAK,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;CAC1D;AAED;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,CAM3D,CAAC"}

package/dist/primitives/message/MessageIf.js

@@ -9,9 +9,12 @@ const useMessageIf = (props) => {
 		t0 = (s) => {
 			const { role, attachments, parts, branchCount, isLast, speech, isCopied, isHovering } = s.message;
 			if (props.hasBranches === true && branchCount < 2) return false;
-			if (props.user && role !== "user") return false;
-			if (props.assistant && role !== "assistant") return false;
-			if (props.system && role !== "system") return false;
+			if (props.user === true && role !== "user") return false;
+			if (props.user === false && role === "user") return false;
+			if (props.assistant === true && role !== "assistant") return false;
+			if (props.assistant === false && role === "assistant") return false;
+			if (props.system === true && role !== "system") return false;
+			if (props.system === false && role === "system") return false;
 			if (props.lastOrHover === true && !isHovering && !isLast) return false;
 			if (props.last !== void 0 && props.last !== isLast) return false;
 			if (props.copied === true && !isCopied) return false;

package/dist/primitives/message/MessageIf.js.map

@@ -1 +1 @@
-{"version":3,"file":"MessageIf.js","names":["c","_c","FC","PropsWithChildren","useAuiState","RequireAtLeastOne","MessageIfFilters","user","assistant","system","hasBranches","copied","lastOrHover","last","speaking","hasAttachments","hasContent","submittedFeedback","UseMessageIfProps","useMessageIf","props","$","t0","s","role","attachments","parts","branchCount","isLast","speech","isCopied","isHovering","message","undefined","length","metadata","type","MessagePrimitiveIf","Props","children","query","result","displayName"],"sources":["../../../src/primitives/message/MessageIf.ts"],"sourcesContent":["\"use client\";\n\nimport type { FC, PropsWithChildren } from \"react\";\nimport { useAuiState } from \"@assistant-ui/store\";\nimport type { RequireAtLeastOne } from \"../../utils/RequireAtLeastOne\";\n\ntype MessageIfFilters = {\n  user: boolean | undefined;\n  assistant: boolean | undefined;\n  system: boolean | undefined;\n  hasBranches: boolean | undefined;\n  copied: boolean | undefined;\n  lastOrHover: boolean | undefined;\n  last: boolean | undefined;\n  speaking: boolean | undefined;\n  hasAttachments: boolean | undefined;\n  hasContent: boolean | undefined;\n  submittedFeedback: \"positive\" | \"negative\" | null | undefined;\n};\ntype UseMessageIfProps = RequireAtLeastOne<MessageIfFilters>;\n\nconst useMessageIf = (props: UseMessageIfProps) => {\n  return useAuiState((s) => {\n    const {\n      role,\n      attachments,\n      parts,\n      branchCount,\n      isLast,\n      speech,\n      isCopied,\n      isHovering,\n    } = s.message;\n\n    if (props.hasBranches === true && branchCount < 2) return false;\n\n    if (props.user && role !== \"user\") return false;\n    if (props.assistant && role !== \"assistant\") return false;\n    if (props.system && role !== \"system\") return false;\n\n    if (props.lastOrHover === true && !isHovering && !isLast) return false;\n    if (props.last !== undefined && props.last !== isLast) return false;\n\n    if (props.copied === true && !isCopied) return false;\n    if (props.copied === false && isCopied) return false;\n\n    if (props.speaking === true && speech == null) return false;\n    if (props.speaking === false && speech != null) return false;\n\n    if (\n      props.hasAttachments === true &&\n      (role !== \"user\" || !attachments?.length)\n    )\n      return false;\n    if (\n      props.hasAttachments === false &&\n      role === \"user\" &&\n      attachments?.length\n    )\n      return false;\n\n    if (props.hasContent === true && parts.length === 0) return false;\n    if (props.hasContent === false && parts.length > 0) return false;\n\n    if (\n      props.submittedFeedback !== undefined &&\n      (s.message.metadata.submittedFeedback?.type ?? null) !==\n        props.submittedFeedback\n    )\n      return false;\n\n    return true;\n  });\n};\n\nexport namespace MessagePrimitiveIf {\n  export type Props = PropsWithChildren<UseMessageIfProps>;\n}\n\n/**\n * @deprecated Use `<AuiIf condition={(s) => s.message...} />` instead.\n */\nexport const MessagePrimitiveIf: FC<MessagePrimitiveIf.Props> = ({\n  children,\n  ...query\n}) => {\n  const result = useMessageIf(query);\n  return result ? children : null;\n};\n\nMessagePrimitiveIf.displayName = \"MessagePrimitive.If\";\n"],"mappings":";;;;AAqBA,MAAMmB,gBAAeC,UAAA;CAAA,MAAAC,IAAApB,EAAA,EAAA;CAAA,IAAAqB;CAAA,IAAAD,EAAA,OAAAD,MAAAZ,aAAAa,EAAA,OAAAD,MAAAT,UAAAU,EAAA,OAAAD,MAAAL,kBAAAM,EAAA,OAAAD,MAAAV,eAAAW,EAAA,OAAAD,MAAAJ,cAAAK,EAAA,OAAAD,MAAAP,QAAAQ,EAAA,OAAAD,MAAAR,eAAAS,EAAA,OAAAD,MAAAN,YAAAO,EAAA,OAAAD,MAAAH,qBAAAI,EAAA,OAAAD,MAAAX,UAAAY,EAAA,QAAAD,MAAAb,MAAA;EACAe,MAAAC,MAAA;GACjB,MAAA,EAAAC,MAAAC,aAAAC,OAAAC,aAAAC,QAAAC,QAAAC,UAAAC,eASIR,EAACS;GAEL,IAAIZ,MAAKV,gBAAiB,QAAQiB,cAAc,GAAC,OAAS;GAE1D,IAAIP,MAAKb,QAASiB,SAAS,QAAM,OAAS;GAC1C,IAAIJ,MAAKZ,aAAcgB,SAAS,aAAW,OAAS;GACpD,IAAIJ,MAAKX,UAAWe,SAAS,UAAQ,OAAS;GAE9C,IAAIJ,MAAKR,gBAAiB,QAAtB,CAA+BmB,cAA/B,CAA8CH,QAAM,OAAS;GACjE,IAAIR,MAAKP,SAAUoB,KAAAA,KAAab,MAAKP,SAAUe,QAAM,OAAS;GAE9D,IAAIR,MAAKT,WAAY,QAAjB,CAA0BmB,UAAQ,OAAS;GAC/C,IAAIV,MAAKT,WAAY,SAAjBmB,UAAkC,OAAS;GAE/C,IAAIV,MAAKN,aAAc,QAAQe,UAAU,MAAI,OAAS;GACtD,IAAIT,MAAKN,aAAc,SAASe,UAAU,MAAI,OAAS;GAEvD,IACET,MAAKL,mBAAoB,SACxBS,SAAS,UAAT,CAAoBC,aAAWS,SAAS,OAElC;GACT,IACEd,MAAKL,mBAAoB,SACzBS,SAAS,UACTC,aAAWS,QAAQ,OAEZ;GAET,IAAId,MAAKJ,eAAgB,QAAQU,MAAKQ,WAAY,GAAC,OAAS;GAC5D,IAAId,MAAKJ,eAAgB,SAASU,MAAKQ,SAAU,GAAC,OAAS;GAE3D,IACEd,MAAKH,sBAAuBgB,KAAAA,MAC3BV,EAACS,QAAQG,SAASlB,mBAAwBmB,QAA1C,UACChB,MAAKH,mBAAkB,OAElB;GAAM,OAER;EAAI;EACZI,EAAA,KAAAD,MAAAZ;EAAAa,EAAA,KAAAD,MAAAT;EAAAU,EAAA,KAAAD,MAAAL;EAAAM,EAAA,KAAAD,MAAAV;EAAAW,EAAA,KAAAD,MAAAJ;EAAAK,EAAA,KAAAD,MAAAP;EAAAQ,EAAA,KAAAD,MAAAR;EAAAS,EAAA,KAAAD,MAAAN;EAAAO,EAAA,KAAAD,MAAAH;EAAAI,EAAA,KAAAD,MAAAX;EAAAY,EAAA,MAAAD,MAAAb;EAAAc,EAAA,MAAAC;CAAA,OAAAA,KAAAD,EAAA;CAAA,OAlDMjB,YAAYkB,EAkDlB;AAAC;;;;AAUJ,MAAae,sBAAmDf,OAAA;CAAA,MAAAD,IAAApB,EAAA,CAAA;CAAA,IAAAsC;CAAA,IAAAC;CAAA,IAAAnB,EAAA,OAAAC,IAAA;EAAC,CAAA,CAAAiB,UAAA,GAAAC,SAAAlB;EAGhED,EAAA,KAAAC;EAAAD,EAAA,KAAAkB;EAAAlB,EAAA,KAAAmB;CAAA,OAAA;EAAAD,WAAAlB,EAAA;EAAAmB,QAAAnB,EAAA;CAAA;CACoC,OAApBF,aAAaqB,KACrBC,IAAAF,WAAA;AAAwB;AAGjCF,mBAAmBK,cAAc"}
+{"version":3,"file":"MessageIf.js","names":["c","_c","FC","PropsWithChildren","useAuiState","RequireAtLeastOne","MessageIfFilters","user","assistant","system","hasBranches","copied","lastOrHover","last","speaking","hasAttachments","hasContent","submittedFeedback","UseMessageIfProps","useMessageIf","props","$","t0","s","role","attachments","parts","branchCount","isLast","speech","isCopied","isHovering","message","undefined","length","metadata","type","MessagePrimitiveIf","Props","children","query","result","displayName"],"sources":["../../../src/primitives/message/MessageIf.ts"],"sourcesContent":["\"use client\";\n\nimport type { FC, PropsWithChildren } from \"react\";\nimport { useAuiState } from \"@assistant-ui/store\";\nimport type { RequireAtLeastOne } from \"../../utils/RequireAtLeastOne\";\n\ntype MessageIfFilters = {\n  user: boolean | undefined;\n  assistant: boolean | undefined;\n  system: boolean | undefined;\n  hasBranches: boolean | undefined;\n  copied: boolean | undefined;\n  lastOrHover: boolean | undefined;\n  last: boolean | undefined;\n  speaking: boolean | undefined;\n  hasAttachments: boolean | undefined;\n  hasContent: boolean | undefined;\n  submittedFeedback: \"positive\" | \"negative\" | null | undefined;\n};\ntype UseMessageIfProps = RequireAtLeastOne<MessageIfFilters>;\n\nconst useMessageIf = (props: UseMessageIfProps) => {\n  return useAuiState((s) => {\n    const {\n      role,\n      attachments,\n      parts,\n      branchCount,\n      isLast,\n      speech,\n      isCopied,\n      isHovering,\n    } = s.message;\n\n    if (props.hasBranches === true && branchCount < 2) return false;\n\n    if (props.user === true && role !== \"user\") return false;\n    if (props.user === false && role === \"user\") return false;\n\n    if (props.assistant === true && role !== \"assistant\") return false;\n    if (props.assistant === false && role === \"assistant\") return false;\n\n    if (props.system === true && role !== \"system\") return false;\n    if (props.system === false && role === \"system\") return false;\n\n    if (props.lastOrHover === true && !isHovering && !isLast) return false;\n    if (props.last !== undefined && props.last !== isLast) return false;\n\n    if (props.copied === true && !isCopied) return false;\n    if (props.copied === false && isCopied) return false;\n\n    if (props.speaking === true && speech == null) return false;\n    if (props.speaking === false && speech != null) return false;\n\n    if (\n      props.hasAttachments === true &&\n      (role !== \"user\" || !attachments?.length)\n    )\n      return false;\n    if (\n      props.hasAttachments === false &&\n      role === \"user\" &&\n      attachments?.length\n    )\n      return false;\n\n    if (props.hasContent === true && parts.length === 0) return false;\n    if (props.hasContent === false && parts.length > 0) return false;\n\n    if (\n      props.submittedFeedback !== undefined &&\n      (s.message.metadata.submittedFeedback?.type ?? null) !==\n        props.submittedFeedback\n    )\n      return false;\n\n    return true;\n  });\n};\n\nexport namespace MessagePrimitiveIf {\n  export type Props = PropsWithChildren<UseMessageIfProps>;\n}\n\n/**\n * @deprecated Use `<AuiIf condition={(s) => s.message...} />` instead.\n */\nexport const MessagePrimitiveIf: FC<MessagePrimitiveIf.Props> = ({\n  children,\n  ...query\n}) => {\n  const result = useMessageIf(query);\n  return result ? children : null;\n};\n\nMessagePrimitiveIf.displayName = \"MessagePrimitive.If\";\n"],"mappings":";;;;AAqBA,MAAMmB,gBAAeC,UAAA;CAAA,MAAAC,IAAApB,EAAA,EAAA;CAAA,IAAAqB;CAAA,IAAAD,EAAA,OAAAD,MAAAZ,aAAAa,EAAA,OAAAD,MAAAT,UAAAU,EAAA,OAAAD,MAAAL,kBAAAM,EAAA,OAAAD,MAAAV,eAAAW,EAAA,OAAAD,MAAAJ,cAAAK,EAAA,OAAAD,MAAAP,QAAAQ,EAAA,OAAAD,MAAAR,eAAAS,EAAA,OAAAD,MAAAN,YAAAO,EAAA,OAAAD,MAAAH,qBAAAI,EAAA,OAAAD,MAAAX,UAAAY,EAAA,QAAAD,MAAAb,MAAA;EACAe,MAAAC,MAAA;GACjB,MAAA,EAAAC,MAAAC,aAAAC,OAAAC,aAAAC,QAAAC,QAAAC,UAAAC,eASIR,EAACS;GAEL,IAAIZ,MAAKV,gBAAiB,QAAQiB,cAAc,GAAC,OAAS;GAE1D,IAAIP,MAAKb,SAAU,QAAQiB,SAAS,QAAM,OAAS;GACnD,IAAIJ,MAAKb,SAAU,SAASiB,SAAS,QAAM,OAAS;GAEpD,IAAIJ,MAAKZ,cAAe,QAAQgB,SAAS,aAAW,OAAS;GAC7D,IAAIJ,MAAKZ,cAAe,SAASgB,SAAS,aAAW,OAAS;GAE9D,IAAIJ,MAAKX,WAAY,QAAQe,SAAS,UAAQ,OAAS;GACvD,IAAIJ,MAAKX,WAAY,SAASe,SAAS,UAAQ,OAAS;GAExD,IAAIJ,MAAKR,gBAAiB,QAAtB,CAA+BmB,cAA/B,CAA8CH,QAAM,OAAS;GACjE,IAAIR,MAAKP,SAAUoB,KAAAA,KAAab,MAAKP,SAAUe,QAAM,OAAS;GAE9D,IAAIR,MAAKT,WAAY,QAAjB,CAA0BmB,UAAQ,OAAS;GAC/C,IAAIV,MAAKT,WAAY,SAAjBmB,UAAkC,OAAS;GAE/C,IAAIV,MAAKN,aAAc,QAAQe,UAAU,MAAI,OAAS;GACtD,IAAIT,MAAKN,aAAc,SAASe,UAAU,MAAI,OAAS;GAEvD,IACET,MAAKL,mBAAoB,SACxBS,SAAS,UAAT,CAAoBC,aAAWS,SAAS,OAElC;GACT,IACEd,MAAKL,mBAAoB,SACzBS,SAAS,UACTC,aAAWS,QAAQ,OAEZ;GAET,IAAId,MAAKJ,eAAgB,QAAQU,MAAKQ,WAAY,GAAC,OAAS;GAC5D,IAAId,MAAKJ,eAAgB,SAASU,MAAKQ,SAAU,GAAC,OAAS;GAE3D,IACEd,MAAKH,sBAAuBgB,KAAAA,MAC3BV,EAACS,QAAQG,SAASlB,mBAAwBmB,QAA1C,UACChB,MAAKH,mBAAkB,OAElB;GAAM,OAER;EAAI;EACZI,EAAA,KAAAD,MAAAZ;EAAAa,EAAA,KAAAD,MAAAT;EAAAU,EAAA,KAAAD,MAAAL;EAAAM,EAAA,KAAAD,MAAAV;EAAAW,EAAA,KAAAD,MAAAJ;EAAAK,EAAA,KAAAD,MAAAP;EAAAQ,EAAA,KAAAD,MAAAR;EAAAS,EAAA,KAAAD,MAAAN;EAAAO,EAAA,KAAAD,MAAAH;EAAAI,EAAA,KAAAD,MAAAX;EAAAY,EAAA,MAAAD,MAAAb;EAAAc,EAAA,MAAAC;CAAA,OAAAA,KAAAD,EAAA;CAAA,OAvDMjB,YAAYkB,EAuDlB;AAAC;;;;AAUJ,MAAae,sBAAmDf,OAAA;CAAA,MAAAD,IAAApB,EAAA,CAAA;CAAA,IAAAsC;CAAA,IAAAC;CAAA,IAAAnB,EAAA,OAAAC,IAAA;EAAC,CAAA,CAAAiB,UAAA,GAAAC,SAAAlB;EAGhED,EAAA,KAAAC;EAAAD,EAAA,KAAAkB;EAAAlB,EAAA,KAAAmB;CAAA,OAAA;EAAAD,WAAAlB,EAAA;EAAAmB,QAAAnB,EAAA;CAAA;CACoC,OAApBF,aAAaqB,KACrBC,IAAAF,WAAA;AAAwB;AAGjCF,mBAAmBK,cAAc"}

package/dist/primitives/thread/ThreadRoot.d.ts

@@ -14,8 +14,9 @@ export declare namespace ThreadPrimitiveRoot {
  * This component serves as the foundational wrapper for all thread-related components.
  * It provides the basic structure and context needed for thread functionality.
  *
- * While this component is mounted, an unhandled Escape keydown stops active speech, even if
- * the action bar that started it is no longer mounted.
+ * While this component is mounted, an unhandled Escape keydown inside this thread stops its
+ * active speech, even if the action bar that started it is no longer mounted. Escape outside
+ * every thread retains the document-level fallback.
  *
  * @example
  * ```tsx

package/dist/primitives/thread/ThreadRoot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ThreadRoot.d.ts","sourceRoot":"","sources":["../../../src/primitives/thread/ThreadRoot.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,iCAA8B;AAClD,OAAO,EACL,KAAK,YAAY,EAEjB,KAAK,wBAAwB,EAG9B,MAAM,OAAO,CAAC;AAKf,yBAAiB,mBAAmB,CAAC;IACnC,KAAY,OAAO,GAAG,YAAY,CAAC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;IACzD;;;OAGG;IACH,KAAY,KAAK,GAAG,wBAAwB,CAAC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;CACpE;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,mBAAmB;;;;0GAuC9B,CAAC"}
+{"version":3,"file":"ThreadRoot.d.ts","sourceRoot":"","sources":["../../../src/primitives/thread/ThreadRoot.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,iCAA8B;AAClD,OAAO,EACL,KAAK,YAAY,EAEjB,KAAK,wBAAwB,EAI9B,MAAM,OAAO,CAAC;AAOf,yBAAiB,mBAAmB,CAAC;IACnC,KAAY,OAAO,GAAG,YAAY,CAAC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;IACzD;;;OAGG;IACH,KAAY,KAAK,GAAG,wBAAwB,CAAC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;CACpE;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,mBAAmB;;;;0GA8D9B,CAAC"}

package/dist/primitives/thread/ThreadRoot.js

@@ -7,14 +7,16 @@ import { useAui } from "@assistant-ui/store";
 import { jsx } from "react/jsx-runtime";
 import { useComposedRefs } from "radix-ui/internal";
 //#region src/primitives/thread/ThreadRoot.tsx
+const escapeEventThreadRoots = /* @__PURE__ */ new WeakMap();
 /**
 * The root container component for a thread.
 *
 * This component serves as the foundational wrapper for all thread-related components.
 * It provides the basic structure and context needed for thread functionality.
 *
-* While this component is mounted, an unhandled Escape keydown stops active speech, even if
-* the action bar that started it is no longer mounted.
+* While this component is mounted, an unhandled Escape keydown inside this thread stops its
+* active speech, even if the action bar that started it is no longer mounted. Escape outside
+* every thread retains the document-level fallback.
 *
 * @example
 * ```tsx
@@ -28,23 +30,35 @@ import { useComposedRefs } from "radix-ui/internal";
 * ```
 */
 const ThreadPrimitiveRoot = forwardRef((props, ref) => {
-	const $ = c(6);
+	const $ = c(9);
 	const aui = useAui();
 	const rootRef = useRef(null);
 	const composedRef = useComposedRefs(ref, rootRef);
 	let t0;
+	if ($[0] !== props) {
+		t0 = (event) => {
+			if (event.key === "Escape" && rootRef.current) escapeEventThreadRoots.set(event.nativeEvent, rootRef.current);
+			props.onKeyDown?.(event);
+		};
+		$[0] = props;
+		$[1] = t0;
+	} else t0 = $[1];
+	const handleRootKeyDown = t0;
 	let t1;
-	if ($[0] !== aui) {
-		t0 = () => {
-			const handleKeyDown = (event) => {
-				if (event.key !== "Escape") return;
-				if (event.defaultPrevented || aui.thread.source === null) return;
+	let t2;
+	if ($[2] !== aui) {
+		t1 = () => {
+			const handleKeyDown = (event_0) => {
+				if (event_0.key !== "Escape") return;
+				if (event_0.defaultPrevented || aui.thread.source === null) return;
+				const eventThreadRoot = escapeEventThreadRoots.get(event_0) ?? event_0.composedPath().find(_temp);
+				if (eventThreadRoot && eventThreadRoot !== rootRef.current) return;
 				if (aui.thread.getState().speech == null) return;
-				event.preventDefault();
+				event_0.preventDefault();
 				try {
 					aui.thread.stopSpeaking();
-				} catch (t2) {
-					const error = t2;
+				} catch (t3) {
+					const error = t3;
 					if (!(error instanceof Error) || error.message !== "No message is being spoken") throw error;
 				}
 			};
@@ -53,31 +67,37 @@ const ThreadPrimitiveRoot = forwardRef((props, ref) => {
 				document.removeEventListener("keydown", handleKeyDown);
 			};
 		};
-		t1 = [aui];
-		$[0] = aui;
-		$[1] = t0;
-		$[2] = t1;
+		t2 = [aui];
+		$[2] = aui;
+		$[3] = t1;
+		$[4] = t2;
 	} else {
-		t0 = $[1];
-		t1 = $[2];
+		t1 = $[3];
+		t2 = $[4];
 	}
-	useEffect(t0, t1);
-	let t2;
-	if ($[3] !== composedRef || $[4] !== props) {
-		t2 = /* @__PURE__ */ jsx(ThreadRootElementContext.Provider, {
+	useEffect(t1, t2);
+	let t3;
+	if ($[5] !== composedRef || $[6] !== handleRootKeyDown || $[7] !== props) {
+		t3 = /* @__PURE__ */ jsx(ThreadRootElementContext.Provider, {
 			value: rootRef,
 			children: /* @__PURE__ */ jsx(Primitive$1.div, {
 				...props,
-				ref: composedRef
+				"data-aui-thread-root": "",
+				ref: composedRef,
+				onKeyDown: handleRootKeyDown
 			})
 		});
-		$[3] = composedRef;
-		$[4] = props;
-		$[5] = t2;
-	} else t2 = $[5];
-	return t2;
+		$[5] = composedRef;
+		$[6] = handleRootKeyDown;
+		$[7] = props;
+		$[8] = t3;
+	} else t3 = $[8];
+	return t3;
 });
 ThreadPrimitiveRoot.displayName = "ThreadPrimitive.Root";
+function _temp(target) {
+	return target instanceof Element && target.hasAttribute("data-aui-thread-root");
+}
 //#endregion
 export { ThreadPrimitiveRoot };
 

package/dist/primitives/thread/ThreadRoot.js.map

@@ -1 +1 @@
-{"version":3,"file":"ThreadRoot.js","names":["c","_c","Primitive","ComponentRef","forwardRef","ComponentPropsWithoutRef","useEffect","useRef","useAui","useComposedRefs","ThreadRootElementContext","ThreadPrimitiveRoot","Element","div","Props","props","ref","$","aui","rootRef","composedRef","t0","t1","handleKeyDown","event","key","defaultPrevented","thread","source","getState","speech","preventDefault","stopSpeaking","t2","error","Error","message","document","addEventListener","removeEventListener","displayName"],"sources":["../../../src/primitives/thread/ThreadRoot.tsx"],"sourcesContent":["\"use client\";\n\nimport { Primitive } from \"../../utils/Primitive\";\nimport {\n  type ComponentRef,\n  forwardRef,\n  type ComponentPropsWithoutRef,\n  useEffect,\n  useRef,\n} from \"react\";\nimport { useAui } from \"@assistant-ui/store\";\nimport { useComposedRefs } from \"radix-ui/internal\";\nimport { ThreadRootElementContext } from \"./ThreadRootElementContext\";\n\nexport namespace ThreadPrimitiveRoot {\n  export type Element = ComponentRef<typeof Primitive.div>;\n  /**\n   * Props for the ThreadPrimitive.Root component.\n   * Accepts all standard div element props.\n   */\n  export type Props = ComponentPropsWithoutRef<typeof Primitive.div>;\n}\n\n/**\n * The root container component for a thread.\n *\n * This component serves as the foundational wrapper for all thread-related components.\n * It provides the basic structure and context needed for thread functionality.\n *\n * While this component is mounted, an unhandled Escape keydown stops active speech, even if\n * the action bar that started it is no longer mounted.\n *\n * @example\n * ```tsx\n * <ThreadPrimitive.Root>\n *   <ThreadPrimitive.Viewport>\n *     <ThreadPrimitive.Messages>\n *       {() => <MyMessage />}\n *     </ThreadPrimitive.Messages>\n *   </ThreadPrimitive.Viewport>\n * </ThreadPrimitive.Root>\n * ```\n */\nexport const ThreadPrimitiveRoot = forwardRef<\n  ThreadPrimitiveRoot.Element,\n  ThreadPrimitiveRoot.Props\n>((props, ref) => {\n  const aui = useAui();\n  const rootRef = useRef<ThreadPrimitiveRoot.Element>(null);\n  const composedRef = useComposedRefs(ref, rootRef);\n\n  useEffect(() => {\n    const handleKeyDown = (event: KeyboardEvent) => {\n      if (event.key !== \"Escape\") return;\n      if (event.defaultPrevented || aui.thread.source === null) return;\n      if (aui.thread.getState().speech == null) return;\n      event.preventDefault();\n      try {\n        aui.thread.stopSpeaking();\n      } catch (error) {\n        // getState() is the last rendered snapshot, so speech can finish before this call.\n        if (\n          !(error instanceof Error) ||\n          error.message !== \"No message is being spoken\"\n        ) {\n          throw error;\n        }\n      }\n    };\n\n    // Bubble phase lets capture-phase Escape handlers consume the event first.\n    document.addEventListener(\"keydown\", handleKeyDown);\n    return () => {\n      document.removeEventListener(\"keydown\", handleKeyDown);\n    };\n  }, [aui]);\n\n  return (\n    <ThreadRootElementContext.Provider value={rootRef}>\n      <Primitive.div {...props} ref={composedRef} />\n    </ThreadRootElementContext.Provider>\n  );\n});\n\nThreadPrimitiveRoot.displayName = \"ThreadPrimitive.Root\";\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2CA,MAAaW,sBAAsBP,YAGjCW,OAAAC,QAAA;CAAA,MAAAC,IAAAhB,EAAA,CAAA;CACA,MAAAiB,MAAYV,OAAO;CACnB,MAAAW,UAAgBZ,OAAoC,IAAI;CACxD,MAAAa,cAAoBX,gBAAgBO,KAAKG,OAAO;CAAE,IAAAE;CAAA,IAAAC;CAAA,IAAAL,EAAA,OAAAC,KAAA;EAExCG,WAAA;GACR,MAAAE,iBAAsBC,UAAA;IACpB,IAAIA,MAAKC,QAAS,UAAQ;IAC1B,IAAID,MAAKE,oBAAqBR,IAAGS,OAAOC,WAAY,MAAI;IACxD,IAAIV,IAAGS,OAAOE,SAAU,CAAC,CAAAC,UAAW,MAAI;IACxCN,MAAKO,eAAgB;IACrB,IAAA;KACEb,IAAGS,OAAOK,aAAc;IAAC,SAAAC,IAAA;KAClBC,MAAAA,QAAAA;KAEP,IACE,EAAEA,iBAAiBC,UACnBD,MAAKE,YAAa,8BAElB,MAAMF;IACP;GACF;GAIHG,SAAQC,iBAAkB,WAAWf,aAAa;GAAC,aAC5C;IACLc,SAAQE,oBAAqB,WAAWhB,aAAa;GAAC;EACvD;EACAD,KAAA,CAACJ,GAAG;EAACD,EAAA,KAAAC;EAAAD,EAAA,KAAAI;EAAAJ,EAAA,KAAAK;CAAA,OAAA;EAAAD,KAAAJ,EAAA;EAAAK,KAAAL,EAAA;CAAA;CAxBRX,UAAUe,IAwBPC,EAAK;CAAC,IAAAW;CAAA,IAAAhB,EAAA,OAAAG,eAAAH,EAAA,OAAAF,OAAA;EAGPkB,KAAA,oBAAA,yBAAA,UAAA;GAA0Cd,OAAAA;GACxC,UAAA,oBAAA,YAAA,KAAA;IAAA,GAAmBJ;IAAYK,KAAAA;GAAW,CAAA;EAC5C,CAAA;EAAoCH,EAAA,KAAAG;EAAAH,EAAA,KAAAF;EAAAE,EAAA,KAAAgB;CAAA,OAAAA,KAAAhB,EAAA;CAAA,OAFpCgB;AAEoC,CAEvC;AAEDtB,oBAAoB6B,cAAc"}
+{"version":3,"file":"ThreadRoot.js","names":["c","_c","Primitive","ComponentRef","forwardRef","ComponentPropsWithoutRef","KeyboardEventHandler","useEffect","useRef","useAui","useComposedRefs","ThreadRootElementContext","escapeEventThreadRoots","WeakMap","KeyboardEvent","Element","ThreadPrimitiveRoot","div","Props","props","ref","$","aui","rootRef","composedRef","t0","event","key","current","set","nativeEvent","onKeyDown","handleRootKeyDown","t1","t2","handleKeyDown","event_0","defaultPrevented","thread","source","eventThreadRoot","get","composedPath","find","_temp","getState","speech","preventDefault","stopSpeaking","t3","error","Error","message","document","addEventListener","removeEventListener","displayName","target","hasAttribute"],"sources":["../../../src/primitives/thread/ThreadRoot.tsx"],"sourcesContent":["\"use client\";\n\nimport { Primitive } from \"../../utils/Primitive\";\nimport {\n  type ComponentRef,\n  forwardRef,\n  type ComponentPropsWithoutRef,\n  type KeyboardEventHandler,\n  useEffect,\n  useRef,\n} from \"react\";\nimport { useAui } from \"@assistant-ui/store\";\nimport { useComposedRefs } from \"radix-ui/internal\";\nimport { ThreadRootElementContext } from \"./ThreadRootElementContext\";\n\nconst escapeEventThreadRoots = new WeakMap<KeyboardEvent, Element>();\n\nexport namespace ThreadPrimitiveRoot {\n  export type Element = ComponentRef<typeof Primitive.div>;\n  /**\n   * Props for the ThreadPrimitive.Root component.\n   * Accepts all standard div element props.\n   */\n  export type Props = ComponentPropsWithoutRef<typeof Primitive.div>;\n}\n\n/**\n * The root container component for a thread.\n *\n * This component serves as the foundational wrapper for all thread-related components.\n * It provides the basic structure and context needed for thread functionality.\n *\n * While this component is mounted, an unhandled Escape keydown inside this thread stops its\n * active speech, even if the action bar that started it is no longer mounted. Escape outside\n * every thread retains the document-level fallback.\n *\n * @example\n * ```tsx\n * <ThreadPrimitive.Root>\n *   <ThreadPrimitive.Viewport>\n *     <ThreadPrimitive.Messages>\n *       {() => <MyMessage />}\n *     </ThreadPrimitive.Messages>\n *   </ThreadPrimitive.Viewport>\n * </ThreadPrimitive.Root>\n * ```\n */\nexport const ThreadPrimitiveRoot = forwardRef<\n  ThreadPrimitiveRoot.Element,\n  ThreadPrimitiveRoot.Props\n>((props, ref) => {\n  const aui = useAui();\n  const rootRef = useRef<ThreadPrimitiveRoot.Element>(null);\n  const composedRef = useComposedRefs(ref, rootRef);\n  const handleRootKeyDown: KeyboardEventHandler<ThreadPrimitiveRoot.Element> = (\n    event,\n  ) => {\n    if (event.key === \"Escape\" && rootRef.current) {\n      escapeEventThreadRoots.set(event.nativeEvent, rootRef.current);\n    }\n    props.onKeyDown?.(event);\n  };\n\n  useEffect(() => {\n    const handleKeyDown = (event: KeyboardEvent) => {\n      if (event.key !== \"Escape\") return;\n      if (event.defaultPrevented || aui.thread.source === null) return;\n      const eventThreadRoot =\n        escapeEventThreadRoots.get(event) ??\n        event\n          .composedPath()\n          .find(\n            (target) =>\n              target instanceof Element &&\n              target.hasAttribute(\"data-aui-thread-root\"),\n          );\n      if (eventThreadRoot && eventThreadRoot !== rootRef.current) return;\n      if (aui.thread.getState().speech == null) return;\n      event.preventDefault();\n      try {\n        aui.thread.stopSpeaking();\n      } catch (error) {\n        // getState() is the last rendered snapshot, so speech can finish before this call.\n        if (\n          !(error instanceof Error) ||\n          error.message !== \"No message is being spoken\"\n        ) {\n          throw error;\n        }\n      }\n    };\n\n    // Bubble phase lets capture-phase Escape handlers consume the event first.\n    document.addEventListener(\"keydown\", handleKeyDown);\n    return () => {\n      document.removeEventListener(\"keydown\", handleKeyDown);\n    };\n  }, [aui]);\n\n  return (\n    <ThreadRootElementContext.Provider value={rootRef}>\n      <Primitive.div\n        {...props}\n        data-aui-thread-root=\"\"\n        ref={composedRef}\n        onKeyDown={handleRootKeyDown}\n      />\n    </ThreadRootElementContext.Provider>\n  );\n});\n\nThreadPrimitiveRoot.displayName = \"ThreadPrimitive.Root\";\n"],"mappings":";;;;;;;;;AAeA,MAAMY,yCAAyB,IAAIC,QAAgC;;;;;;;;;;;;;;;;;;;;;;AAgCnE,MAAaG,sBAAsBZ,YAGjCe,OAAAC,QAAA;CAAA,MAAAC,IAAApB,EAAA,CAAA;CACA,MAAAqB,MAAYb,OAAO;CACnB,MAAAc,UAAgBf,OAAoC,IAAI;CACxD,MAAAgB,cAAoBd,gBAAgBU,KAAKG,OAAO;CAAE,IAAAE;CAAA,IAAAJ,EAAA,OAAAF,OAAA;EAC2BM,MAAAC,UAAA;GAG3E,IAAIA,MAAKC,QAAS,YAAYJ,QAAOK,SACnChB,uBAAsBiB,IAAKH,MAAKI,aAAcP,QAAOK,OAAQ;GAE/DT,MAAKY,YAAaL,KAAK;EAAC;EACzBL,EAAA,KAAAF;EAAAE,EAAA,KAAAI;CAAA,OAAAA,KAAAJ,EAAA;CAPD,MAAAW,oBAA6EP;CAO3E,IAAAQ;CAAA,IAAAC;CAAA,IAAAb,EAAA,OAAAC,KAAA;EAEQW,WAAA;GACR,MAAAE,iBAAsBC,YAAA;IACpB,IAAIV,QAAKC,QAAS,UAAQ;IAC1B,IAAID,QAAKW,oBAAqBf,IAAGgB,OAAOC,WAAY,MAAI;IACxD,MAAAC,kBACE5B,uBAAsB6B,IAAKf,OAOzB,KANFA,QAAKgB,aACW,CAAC,CAAAC,KAEbC,KAGF;IACJ,IAAIJ,mBAAmBA,oBAAoBjB,QAAOK,SAAQ;IAC1D,IAAIN,IAAGgB,OAAOO,SAAU,CAAC,CAAAC,UAAW,MAAI;IACxCpB,QAAKqB,eAAgB;IACrB,IAAA;KACEzB,IAAGgB,OAAOU,aAAc;IAAC,SAAAC,IAAA;KAClBC,MAAAA,QAAAA;KAEP,IACE,EAAEA,iBAAiBC,UACnBD,MAAKE,YAAa,8BAElB,MAAMF;IACP;GACF;GAIHG,SAAQC,iBAAkB,WAAWnB,aAAa;GAAC,aAC5C;IACLkB,SAAQE,oBAAqB,WAAWpB,aAAa;GAAC;EACvD;EACAD,KAAA,CAACZ,GAAG;EAACD,EAAA,KAAAC;EAAAD,EAAA,KAAAY;EAAAZ,EAAA,KAAAa;CAAA,OAAA;EAAAD,KAAAZ,EAAA;EAAAa,KAAAb,EAAA;CAAA;CAlCRd,UAAU0B,IAkCPC,EAAK;CAAC,IAAAe;CAAA,IAAA5B,EAAA,OAAAG,eAAAH,EAAA,OAAAW,qBAAAX,EAAA,OAAAF,OAAA;EAGP8B,KAAA,oBAAA,yBAAA,UAAA;GAA0C1B,OAAAA;GACxC,UAAA,oBAAA,YAAA,KAAA;IAAA,GACMJ;IACiB,wBAAA;IAChBK,KAAAA;IACMQ,WAAAA;GAAiB,CAAA;EAEhC,CAAA;EAAoCX,EAAA,KAAAG;EAAAH,EAAA,KAAAW;EAAAX,EAAA,KAAAF;EAAAE,EAAA,KAAA4B;CAAA,OAAAA,KAAA5B,EAAA;CAAA,OAPpC4B;AAOoC,CAEvC;AAEDjC,oBAAoBwC,cAAc;AA7DhC,SAAAZ,MAAAa,QAAA;CAAA,OAuBYA,kBAAkB1C,WAClB0C,OAAMC,aAAc,sBAAsB;AAAC"}

package/dist/primitives/threadListItem/ThreadListItemRoot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ThreadListItemRoot.d.ts","sourceRoot":"","sources":["../../../src/primitives/threadListItem/ThreadListItemRoot.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,iCAA8B;AAClD,OAAO,EACL,KAAK,YAAY,EAEjB,KAAK,wBAAwB,EAI9B,MAAM,OAAO,CAAC;AASf,KAAK,iBAAiB,GAAG,wBAAwB,CAAC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;AAExE,yBAAiB,2BAA2B,CAAC;IAC3C,KAAY,OAAO,GAAG,YAAY,CAAC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;IACzD,KAAY,KAAK,GAAG,iBAAiB,CAAC;CACvC;AAED,eAAO,MAAM,2BAA2B;;;;0GAsDtC,CAAC"}
+{"version":3,"file":"ThreadListItemRoot.d.ts","sourceRoot":"","sources":["../../../src/primitives/threadListItem/ThreadListItemRoot.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,iCAA8B;AAClD,OAAO,EACL,KAAK,YAAY,EAEjB,KAAK,wBAAwB,EAI9B,MAAM,OAAO,CAAC;AASf,KAAK,iBAAiB,GAAG,wBAAwB,CAAC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;AAExE,yBAAiB,2BAA2B,CAAC;IAC3C,KAAY,OAAO,GAAG,YAAY,CAAC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;IACzD,KAAY,KAAK,GAAG,iBAAiB,CAAC;CACvC;AAED,eAAO,MAAM,2BAA2B;;;;0GAwDtC,CAAC"}

package/dist/primitives/threadListItem/ThreadListItemRoot.js

@@ -18,6 +18,7 @@ const ThreadListItemPrimitiveRoot = forwardRef((props, ref) => {
 	const getItems = useThreadListCollection(void 0);
 	const direction = Direction.useDirection();
 	const onKeyDown = (event) => {
+		if (event.altKey || event.ctrlKey || event.metaKey || event.shiftKey) return;
 		const forwardKey = direction === "rtl" ? "ArrowLeft" : "ArrowRight";
 		const backKey = direction === "rtl" ? "ArrowRight" : "ArrowLeft";
 		const trigger = triggerRef.current;

package/dist/primitives/threadListItem/ThreadListItemRoot.js.map

@@ -1 +1 @@
-{"version":3,"file":"ThreadListItemRoot.js","names":["Primitive","ComponentRef","forwardRef","ComponentPropsWithoutRef","KeyboardEvent","useMemo","useRef","useAuiState","composeEventHandlers","Direction","ThreadListItemFocusProvider","useThreadListCollection","PrimitiveDivProps","div","ThreadListItemPrimitiveRoot","Element","Props","props","ref","isMain","s","threads","mainThreadId","threadListItem","id","triggerRef","HTMLButtonElement","moreRef","focus","getItems","undefined","direction","useDirection","onKeyDown","event","HTMLDivElement","forwardKey","backKey","trigger","current","more","target","key","triggers","map","item","filter","node","next","indexOf","preventDefault","displayName"],"sources":["../../../src/primitives/threadListItem/ThreadListItemRoot.tsx"],"sourcesContent":["\"use client\";\n\nimport { Primitive } from \"../../utils/Primitive\";\nimport {\n  type ComponentRef,\n  forwardRef,\n  type ComponentPropsWithoutRef,\n  type KeyboardEvent,\n  useMemo,\n  useRef,\n} from \"react\";\nimport { useAuiState } from \"@assistant-ui/store\";\nimport { composeEventHandlers } from \"radix-ui/internal\";\nimport { Direction } from \"radix-ui\";\nimport {\n  ThreadListItemFocusProvider,\n  useThreadListCollection,\n} from \"../threadListFocusGroup\";\n\ntype PrimitiveDivProps = ComponentPropsWithoutRef<typeof Primitive.div>;\n\nexport namespace ThreadListItemPrimitiveRoot {\n  export type Element = ComponentRef<typeof Primitive.div>;\n  export type Props = PrimitiveDivProps;\n}\n\nexport const ThreadListItemPrimitiveRoot = forwardRef<\n  ThreadListItemPrimitiveRoot.Element,\n  ThreadListItemPrimitiveRoot.Props\n>((props, ref) => {\n  const isMain = useAuiState(\n    (s) => s.threads.mainThreadId === s.threadListItem.id,\n  );\n\n  const triggerRef = useRef<HTMLButtonElement | null>(null);\n  const moreRef = useRef<HTMLButtonElement | null>(null);\n  const focus = useMemo(() => ({ triggerRef, moreRef }), []);\n\n  const getItems = useThreadListCollection(undefined);\n  const direction = Direction.useDirection();\n\n  const onKeyDown = (event: KeyboardEvent<HTMLDivElement>) => {\n    const forwardKey = direction === \"rtl\" ? \"ArrowLeft\" : \"ArrowRight\";\n    const backKey = direction === \"rtl\" ? \"ArrowRight\" : \"ArrowLeft\";\n    const trigger = triggerRef.current;\n    const more = moreRef.current;\n\n    if (trigger && event.target === trigger) {\n      if (event.key === \"ArrowDown\" || event.key === \"ArrowUp\") {\n        const triggers = getItems()\n          .map((item) => item.ref.current)\n          .filter((node): node is HTMLButtonElement => node !== null);\n        const next =\n          triggers[\n            triggers.indexOf(trigger) + (event.key === \"ArrowDown\" ? 1 : -1)\n          ];\n        if (next) {\n          next.focus();\n          event.preventDefault();\n        }\n      } else if (event.key === forwardKey && more) {\n        more.focus();\n        event.preventDefault();\n      }\n    } else if (more && event.target === more && event.key === backKey) {\n      trigger?.focus();\n      event.preventDefault();\n    }\n  };\n\n  return (\n    <ThreadListItemFocusProvider value={focus}>\n      <Primitive.div\n        {...(isMain ? { \"data-active\": \"true\", \"aria-current\": \"true\" } : null)}\n        {...props}\n        onKeyDown={composeEventHandlers(props.onKeyDown, onKeyDown)}\n        ref={ref}\n      />\n    </ThreadListItemFocusProvider>\n  );\n});\n\nThreadListItemPrimitiveRoot.displayName = \"ThreadListItemPrimitive.Root\";\n"],"mappings":";;;;;;;;;AA0BA,MAAac,8BAA8BZ,YAGxCe,OAAOC,QAAQ;CAChB,MAAMC,SAASZ,aACZa,MAAMA,EAAEC,QAAQC,iBAAiBF,EAAEG,eAAeC,EACrD;CAEA,MAAMC,aAAanB,OAAiC,IAAI;CACxD,MAAMqB,UAAUrB,OAAiC,IAAI;CACrD,MAAMsB,QAAQvB,eAAe;EAAEoB;EAAYE;CAAQ,IAAI,CAAA,CAAE;CAEzD,MAAME,WAAWlB,wBAAwBmB,KAAAA,CAAS;CAClD,MAAMC,YAAYtB,UAAUuB,aAAa;CAEzC,MAAMC,aAAaC,UAAyC;EAC1D,MAAME,aAAaL,cAAc,QAAQ,cAAc;EACvD,MAAMM,UAAUN,cAAc,QAAQ,eAAe;EACrD,MAAMO,UAAUb,WAAWc;EAC3B,MAAMC,OAAOb,QAAQY;EAErB,IAAID,WAAWJ,MAAMO,WAAWH,SAAS;GACvC,IAAIJ,MAAMQ,QAAQ,eAAeR,MAAMQ,QAAQ,WAAW;IACxD,MAAMC,WAAWd,SAAS,CAAC,CACxBe,KAAKC,SAASA,KAAK3B,IAAIqB,OAAO,CAAC,CAC/BO,QAAQC,SAAoCA,SAAS,IAAI;IAC5D,MAAMC,OACJL,SACEA,SAASM,QAAQX,OAAO,KAAKJ,MAAMQ,QAAQ,cAAc,IAAI;IAEjE,IAAIM,MAAM;KACRA,KAAKpB,MAAM;KACXM,MAAMgB,eAAe;IACvB;GACF,OAAO,IAAIhB,MAAMQ,QAAQN,cAAcI,MAAM;IAC3CA,KAAKZ,MAAM;IACXM,MAAMgB,eAAe;GACvB;EACF,OAAO,IAAIV,QAAQN,MAAMO,WAAWD,QAAQN,MAAMQ,QAAQL,SAAS;GACjEC,SAASV,MAAM;GACfM,MAAMgB,eAAe;EACvB;CACF;CAEA,OACE,oBAAC,6BAAD;EAA6B,OAAOtB;EAClC,UAAA,oBAAC,YAAU,KAAX;GACE,GAAKT,SAAS;IAAE,eAAe;IAAQ,gBAAgB;GAAO,IAAI;GAClE,GAAIF;GACJ,WAAWT,qBAAqBS,MAAMgB,WAAWA,SAAS;GACrDf;EAAI,CAAA;CAEgB,CAAA;AAEjC,CAAC;AAEDJ,4BAA4BqC,cAAc"}
+{"version":3,"file":"ThreadListItemRoot.js","names":["Primitive","ComponentRef","forwardRef","ComponentPropsWithoutRef","KeyboardEvent","useMemo","useRef","useAuiState","composeEventHandlers","Direction","ThreadListItemFocusProvider","useThreadListCollection","PrimitiveDivProps","div","ThreadListItemPrimitiveRoot","Element","Props","props","ref","isMain","s","threads","mainThreadId","threadListItem","id","triggerRef","HTMLButtonElement","moreRef","focus","getItems","undefined","direction","useDirection","onKeyDown","event","HTMLDivElement","altKey","ctrlKey","metaKey","shiftKey","forwardKey","backKey","trigger","current","more","target","key","triggers","map","item","filter","node","next","indexOf","preventDefault","displayName"],"sources":["../../../src/primitives/threadListItem/ThreadListItemRoot.tsx"],"sourcesContent":["\"use client\";\n\nimport { Primitive } from \"../../utils/Primitive\";\nimport {\n  type ComponentRef,\n  forwardRef,\n  type ComponentPropsWithoutRef,\n  type KeyboardEvent,\n  useMemo,\n  useRef,\n} from \"react\";\nimport { useAuiState } from \"@assistant-ui/store\";\nimport { composeEventHandlers } from \"radix-ui/internal\";\nimport { Direction } from \"radix-ui\";\nimport {\n  ThreadListItemFocusProvider,\n  useThreadListCollection,\n} from \"../threadListFocusGroup\";\n\ntype PrimitiveDivProps = ComponentPropsWithoutRef<typeof Primitive.div>;\n\nexport namespace ThreadListItemPrimitiveRoot {\n  export type Element = ComponentRef<typeof Primitive.div>;\n  export type Props = PrimitiveDivProps;\n}\n\nexport const ThreadListItemPrimitiveRoot = forwardRef<\n  ThreadListItemPrimitiveRoot.Element,\n  ThreadListItemPrimitiveRoot.Props\n>((props, ref) => {\n  const isMain = useAuiState(\n    (s) => s.threads.mainThreadId === s.threadListItem.id,\n  );\n\n  const triggerRef = useRef<HTMLButtonElement | null>(null);\n  const moreRef = useRef<HTMLButtonElement | null>(null);\n  const focus = useMemo(() => ({ triggerRef, moreRef }), []);\n\n  const getItems = useThreadListCollection(undefined);\n  const direction = Direction.useDirection();\n\n  const onKeyDown = (event: KeyboardEvent<HTMLDivElement>) => {\n    if (event.altKey || event.ctrlKey || event.metaKey || event.shiftKey)\n      return;\n    const forwardKey = direction === \"rtl\" ? \"ArrowLeft\" : \"ArrowRight\";\n    const backKey = direction === \"rtl\" ? \"ArrowRight\" : \"ArrowLeft\";\n    const trigger = triggerRef.current;\n    const more = moreRef.current;\n\n    if (trigger && event.target === trigger) {\n      if (event.key === \"ArrowDown\" || event.key === \"ArrowUp\") {\n        const triggers = getItems()\n          .map((item) => item.ref.current)\n          .filter((node): node is HTMLButtonElement => node !== null);\n        const next =\n          triggers[\n            triggers.indexOf(trigger) + (event.key === \"ArrowDown\" ? 1 : -1)\n          ];\n        if (next) {\n          next.focus();\n          event.preventDefault();\n        }\n      } else if (event.key === forwardKey && more) {\n        more.focus();\n        event.preventDefault();\n      }\n    } else if (more && event.target === more && event.key === backKey) {\n      trigger?.focus();\n      event.preventDefault();\n    }\n  };\n\n  return (\n    <ThreadListItemFocusProvider value={focus}>\n      <Primitive.div\n        {...(isMain ? { \"data-active\": \"true\", \"aria-current\": \"true\" } : null)}\n        {...props}\n        onKeyDown={composeEventHandlers(props.onKeyDown, onKeyDown)}\n        ref={ref}\n      />\n    </ThreadListItemFocusProvider>\n  );\n});\n\nThreadListItemPrimitiveRoot.displayName = \"ThreadListItemPrimitive.Root\";\n"],"mappings":";;;;;;;;;AA0BA,MAAac,8BAA8BZ,YAGxCe,OAAOC,QAAQ;CAChB,MAAMC,SAASZ,aACZa,MAAMA,EAAEC,QAAQC,iBAAiBF,EAAEG,eAAeC,EACrD;CAEA,MAAMC,aAAanB,OAAiC,IAAI;CACxD,MAAMqB,UAAUrB,OAAiC,IAAI;CACrD,MAAMsB,QAAQvB,eAAe;EAAEoB;EAAYE;CAAQ,IAAI,CAAA,CAAE;CAEzD,MAAME,WAAWlB,wBAAwBmB,KAAAA,CAAS;CAClD,MAAMC,YAAYtB,UAAUuB,aAAa;CAEzC,MAAMC,aAAaC,UAAyC;EAC1D,IAAIA,MAAME,UAAUF,MAAMG,WAAWH,MAAMI,WAAWJ,MAAMK,UAC1D;EACF,MAAMC,aAAaT,cAAc,QAAQ,cAAc;EACvD,MAAMU,UAAUV,cAAc,QAAQ,eAAe;EACrD,MAAMW,UAAUjB,WAAWkB;EAC3B,MAAMC,OAAOjB,QAAQgB;EAErB,IAAID,WAAWR,MAAMW,WAAWH,SAAS;GACvC,IAAIR,MAAMY,QAAQ,eAAeZ,MAAMY,QAAQ,WAAW;IACxD,MAAMC,WAAWlB,SAAS,CAAC,CACxBmB,KAAKC,SAASA,KAAK/B,IAAIyB,OAAO,CAAC,CAC/BO,QAAQC,SAAoCA,SAAS,IAAI;IAC5D,MAAMC,OACJL,SACEA,SAASM,QAAQX,OAAO,KAAKR,MAAMY,QAAQ,cAAc,IAAI;IAEjE,IAAIM,MAAM;KACRA,KAAKxB,MAAM;KACXM,MAAMoB,eAAe;IACvB;GACF,OAAO,IAAIpB,MAAMY,QAAQN,cAAcI,MAAM;IAC3CA,KAAKhB,MAAM;IACXM,MAAMoB,eAAe;GACvB;EACF,OAAO,IAAIV,QAAQV,MAAMW,WAAWD,QAAQV,MAAMY,QAAQL,SAAS;GACjEC,SAASd,MAAM;GACfM,MAAMoB,eAAe;EACvB;CACF;CAEA,OACE,oBAAC,6BAAD;EAA6B,OAAO1B;EAClC,UAAA,oBAAC,YAAU,KAAX;GACE,GAAKT,SAAS;IAAE,eAAe;IAAQ,gBAAgB;GAAO,IAAI;GAClE,GAAIF;GACJ,WAAWT,qBAAqBS,MAAMgB,WAAWA,SAAS;GACrDf;EAAI,CAAA;CAEgB,CAAA;AAEjC,CAAC;AAEDJ,4BAA4ByC,cAAc"}

package/dist/primitives/threadListItemMore/ThreadListItemMoreContent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ThreadListItemMoreContent.d.ts","sourceRoot":"","sources":["../../../src/primitives/threadListItemMore/ThreadListItemMoreContent.tsx"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,YAAY,EAElB,MAAM,OAAO,CAAC;AACf,OAAO,EAAa,YAAY,IAAI,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAE5E,OAAO,KAAK,EAAE,mBAAmB,EAAE,iCAA8B;AASjE,yBAAiB,kCAAkC,CAAC;IAClD,KAAY,OAAO,GAAG,YAAY,CAAC,OAAO,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACzE,KAAY,KAAK,GAAG,mBAAmB,CACrC,OAAO,qBAAqB,CAAC,OAAO,CACrC,GAAG;QACF,WAAW,CAAC,EACR,wBAAwB,CAAC,OAAO,qBAAqB,CAAC,MAAM,CAAC,GAC7D,SAAS,CAAC;KACf,CAAC;CACH;AAED,eAAO,MAAM,kCAAkC;;;kBALvC,wBAAwB,CAAC,OAAO,qBAAqB,CAAC,MAAM,CAAC,GAC7D,SAAS;kDA6ChB,CAAC"}
+{"version":3,"file":"ThreadListItemMoreContent.d.ts","sourceRoot":"","sources":["../../../src/primitives/threadListItemMore/ThreadListItemMoreContent.tsx"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,YAAY,EAElB,MAAM,OAAO,CAAC;AACf,OAAO,EAAa,YAAY,IAAI,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAE5E,OAAO,KAAK,EAAE,mBAAmB,EAAE,iCAA8B;AASjE,yBAAiB,kCAAkC,CAAC;IAClD,KAAY,OAAO,GAAG,YAAY,CAAC,OAAO,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACzE,KAAY,KAAK,GAAG,mBAAmB,CACrC,OAAO,qBAAqB,CAAC,OAAO,CACrC,GAAG;QACF,WAAW,CAAC,EACR,wBAAwB,CAAC,OAAO,qBAAqB,CAAC,MAAM,CAAC,GAC7D,SAAS,CAAC;KACf,CAAC;CACH;AAED,eAAO,MAAM,kCAAkC;;;kBALvC,wBAAwB,CAAC,OAAO,qBAAqB,CAAC,MAAM,CAAC,GAC7D,SAAS;kDAoDhB,CAAC"}

package/dist/primitives/threadListItemMore/ThreadListItemMoreContent.js

@@ -24,6 +24,7 @@ const ThreadListItemMorePrimitiveContent = forwardRef((t0, forwardedRef) => {
 	if ($[0] !== closeKey || $[1] !== focus?.moreRef || $[2] !== setOpen || $[3] !== sharedFocusGroup) {
 		t3 = (event) => {
 			if (!sharedFocusGroup || event.key !== closeKey) return;
+			if (event.altKey || event.ctrlKey || event.metaKey || event.shiftKey) return;
 			event.preventDefault();
 			setOpen(false);
 			focus?.moreRef.current?.focus();

package/dist/primitives/threadListItemMore/ThreadListItemMoreContent.js.map

@@ -1 +1 @@
-{"version":3,"file":"ThreadListItemMoreContent.js","names":["c","_c","ComponentPropsWithoutRef","ComponentRef","forwardRef","Direction","DropdownMenu","DropdownMenuPrimitive","composeEventHandlers","WithRenderPropProps","DropdownMenuRenderContent","useThreadListItemFocus","useThreadListItemMoreSharedFocusGroup","useThreadListItemMoreSetOpen","ScopedProps","useDropdownMenuScope","ThreadListItemMorePrimitiveContent","Element","Content","Props","portalProps","Portal","t0","forwardedRef","$","__scopeThreadListItemMore","sideOffset","t1","props","undefined","scope","setOpen","focus","sharedFocusGroup","direction","useDirection","closeKey","t2","T0","t3","moreRef","event","key","preventDefault","current","t4","onKeyDown","t5","t6","onEscapeKeyDown","t7","t8","displayName"],"sources":["../../../src/primitives/threadListItemMore/ThreadListItemMoreContent.tsx"],"sourcesContent":["\"use client\";\n\nimport {\n  type ComponentPropsWithoutRef,\n  type ComponentRef,\n  forwardRef,\n} from \"react\";\nimport { Direction, DropdownMenu as DropdownMenuPrimitive } from \"radix-ui\";\nimport { composeEventHandlers } from \"radix-ui/internal\";\nimport type { WithRenderPropProps } from \"../../utils/Primitive\";\nimport { DropdownMenuRenderContent } from \"../dropdownMenuRenderPrimitives\";\nimport { useThreadListItemFocus } from \"../threadListFocusGroup\";\nimport {\n  useThreadListItemMoreSharedFocusGroup,\n  useThreadListItemMoreSetOpen,\n} from \"./ThreadListItemMoreRoot\";\nimport { type ScopedProps, useDropdownMenuScope } from \"./scope\";\n\nexport namespace ThreadListItemMorePrimitiveContent {\n  export type Element = ComponentRef<typeof DropdownMenuPrimitive.Content>;\n  export type Props = WithRenderPropProps<\n    typeof DropdownMenuPrimitive.Content\n  > & {\n    portalProps?:\n      | ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Portal>\n      | undefined;\n  };\n}\n\nexport const ThreadListItemMorePrimitiveContent = forwardRef<\n  ThreadListItemMorePrimitiveContent.Element,\n  ThreadListItemMorePrimitiveContent.Props\n>(\n  (\n    {\n      __scopeThreadListItemMore,\n      portalProps,\n      sideOffset = 4,\n      ...props\n    }: ScopedProps<ThreadListItemMorePrimitiveContent.Props>,\n    forwardedRef,\n  ) => {\n    const scope = useDropdownMenuScope(__scopeThreadListItemMore);\n    const setOpen = useThreadListItemMoreSetOpen();\n    const focus = useThreadListItemFocus();\n    const sharedFocusGroup = useThreadListItemMoreSharedFocusGroup();\n    const direction = Direction.useDirection();\n    const closeKey = direction === \"rtl\" ? \"ArrowRight\" : \"ArrowLeft\";\n\n    return (\n      <DropdownMenuPrimitive.Portal {...scope} {...portalProps}>\n        <DropdownMenuRenderContent\n          {...scope}\n          {...props}\n          onKeyDown={composeEventHandlers(props.onKeyDown, (event) => {\n            if (!sharedFocusGroup || event.key !== closeKey) return;\n            event.preventDefault();\n            setOpen(false);\n            focus?.moreRef.current?.focus();\n          })}\n          onEscapeKeyDown={composeEventHandlers(props.onEscapeKeyDown, () => {\n            if (!sharedFocusGroup) return;\n            focus?.moreRef.current?.focus();\n          })}\n          ref={forwardedRef}\n          sideOffset={sideOffset}\n        />\n      </DropdownMenuPrimitive.Portal>\n    );\n  },\n);\n\nThreadListItemMorePrimitiveContent.displayName =\n  \"ThreadListItemMorePrimitive.Content\";\n"],"mappings":";;;;;;;;;;;AA6BA,MAAagB,qCAAqCZ,YAIhDkB,IAAAC,iBAAA;CAAA,MAAAC,IAAAvB,EAAA,EAAA;CACE,MAAA,EAAAwB,2BAAAL,aAAAM,YAAAC,IAAA,GAAAC,UAAAN;CAGE,MAAAI,aAAAC,OAAAE,KAAAA,IAAA,IAAAF;CAKF,MAAAG,QAAcf,qBAAqBU,yBAAyB;CAC5D,MAAAM,UAAgBlB,6BAA6B;CAC7C,MAAAmB,QAAcrB,uBAAuB;CACrC,MAAAsB,mBAAyBrB,sCAAsC;CAE/D,MAAAwB,WADkB/B,UAAS8B,aACVD,MAAc,QAAd,eAAA;CAGd,MAAAG,KAAA9B;CACE,MAAA+B,KAAA5B;CAAyB,IAAA6B;CAAA,IAAAf,EAAA,OAAAY,YAAAZ,EAAA,OAAAQ,OAAAQ,WAAAhB,EAAA,OAAAO,WAAAP,EAAA,OAAAS,kBAAA;EAGyBM,MAAAE,UAAA;GAC/C,IAAI,CAACR,oBAAoBQ,MAAKC,QAASN,UAAQ;GAC/CK,MAAKE,eAAgB;GACrBZ,QAAQ,KAAK;GACbC,OAAKQ,QAAiBI,SAAOZ,MAAC;EAAC;EAChCR,EAAA,KAAAY;EAAAZ,EAAA,KAAAQ,OAAAQ;EAAAhB,EAAA,KAAAO;EAAAP,EAAA,KAAAS;EAAAT,EAAA,KAAAe;CAAA,OAAAA,KAAAf,EAAA;CALU,MAAAqB,KAAArC,qBAAqBoB,MAAKkB,WAAYP,EAKhD;CAAC,IAAAQ;CAAA,IAAAvB,EAAA,OAAAQ,OAAAQ,WAAAhB,EAAA,OAAAS,kBAAA;EAC2Dc,WAAA;GAC3D,IAAI,CAACd,kBAAgB;GACrBD,OAAKQ,QAAiBI,SAAOZ,MAAC;EAAC;EAChCR,EAAA,KAAAQ,OAAAQ;EAAAhB,EAAA,KAAAS;EAAAT,EAAA,KAAAuB;CAAA,OAAAA,KAAAvB,EAAA;CAHgB,MAAAwB,KAAAxC,qBAAqBoB,MAAKqB,iBAAkBF,EAG5D;CAAC,IAAAG;CAAA,IAAA1B,EAAA,OAAAc,MAAAd,EAAA,OAAAD,gBAAAC,EAAA,QAAAI,SAAAJ,EAAA,QAAAM,SAAAN,EAAA,QAAAE,cAAAF,EAAA,QAAAqB,MAAArB,EAAA,QAAAwB,IAAA;EAZJE,KAAA,oBAAC,IAAD;GAA0B,GACpBpB;GAAK,GACLF;GACO,WAAAiB;GAMM,iBAAAG;GAIZzB,KAAAA;GACOG;EAAU,CAAA;EACtBF,EAAA,KAAAc;EAAAd,EAAA,KAAAD;EAAAC,EAAA,MAAAI;EAAAJ,EAAA,MAAAM;EAAAN,EAAA,MAAAE;EAAAF,EAAA,MAAAqB;EAAArB,EAAA,MAAAwB;EAAAxB,EAAA,MAAA0B;CAAA,OAAAA,KAAA1B,EAAA;CAAA,IAAA2B;CAAA,IAAA3B,EAAA,QAAAJ,eAAAI,EAAA,QAAAM,SAAAN,EAAA,QAAAa,GAAAhB,UAAAG,EAAA,QAAA0B,IAAA;EAhBJC,KAAA,oBAAA,GAAA,QAAA;GAAA,GAAkCrB;GAAK,GAAMV;GAC3C8B,UAAAA;EAgBF,CAAA;EAA+B1B,EAAA,MAAAJ;EAAAI,EAAA,MAAAM;EAAAN,EAAA,MAAAa,GAAAhB;EAAAG,EAAA,MAAA0B;EAAA1B,EAAA,MAAA2B;CAAA,OAAAA,KAAA3B,EAAA;CAAA,OAjB/B2B;AAiB+B,CAGrC;AAEAnC,mCAAmCoC,cACjC"}
+{"version":3,"file":"ThreadListItemMoreContent.js","names":["c","_c","ComponentPropsWithoutRef","ComponentRef","forwardRef","Direction","DropdownMenu","DropdownMenuPrimitive","composeEventHandlers","WithRenderPropProps","DropdownMenuRenderContent","useThreadListItemFocus","useThreadListItemMoreSharedFocusGroup","useThreadListItemMoreSetOpen","ScopedProps","useDropdownMenuScope","ThreadListItemMorePrimitiveContent","Element","Content","Props","portalProps","Portal","t0","forwardedRef","$","__scopeThreadListItemMore","sideOffset","t1","props","undefined","scope","setOpen","focus","sharedFocusGroup","direction","useDirection","closeKey","t2","T0","t3","moreRef","event","key","altKey","ctrlKey","metaKey","shiftKey","preventDefault","current","t4","onKeyDown","t5","t6","onEscapeKeyDown","t7","t8","displayName"],"sources":["../../../src/primitives/threadListItemMore/ThreadListItemMoreContent.tsx"],"sourcesContent":["\"use client\";\n\nimport {\n  type ComponentPropsWithoutRef,\n  type ComponentRef,\n  forwardRef,\n} from \"react\";\nimport { Direction, DropdownMenu as DropdownMenuPrimitive } from \"radix-ui\";\nimport { composeEventHandlers } from \"radix-ui/internal\";\nimport type { WithRenderPropProps } from \"../../utils/Primitive\";\nimport { DropdownMenuRenderContent } from \"../dropdownMenuRenderPrimitives\";\nimport { useThreadListItemFocus } from \"../threadListFocusGroup\";\nimport {\n  useThreadListItemMoreSharedFocusGroup,\n  useThreadListItemMoreSetOpen,\n} from \"./ThreadListItemMoreRoot\";\nimport { type ScopedProps, useDropdownMenuScope } from \"./scope\";\n\nexport namespace ThreadListItemMorePrimitiveContent {\n  export type Element = ComponentRef<typeof DropdownMenuPrimitive.Content>;\n  export type Props = WithRenderPropProps<\n    typeof DropdownMenuPrimitive.Content\n  > & {\n    portalProps?:\n      | ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Portal>\n      | undefined;\n  };\n}\n\nexport const ThreadListItemMorePrimitiveContent = forwardRef<\n  ThreadListItemMorePrimitiveContent.Element,\n  ThreadListItemMorePrimitiveContent.Props\n>(\n  (\n    {\n      __scopeThreadListItemMore,\n      portalProps,\n      sideOffset = 4,\n      ...props\n    }: ScopedProps<ThreadListItemMorePrimitiveContent.Props>,\n    forwardedRef,\n  ) => {\n    const scope = useDropdownMenuScope(__scopeThreadListItemMore);\n    const setOpen = useThreadListItemMoreSetOpen();\n    const focus = useThreadListItemFocus();\n    const sharedFocusGroup = useThreadListItemMoreSharedFocusGroup();\n    const direction = Direction.useDirection();\n    const closeKey = direction === \"rtl\" ? \"ArrowRight\" : \"ArrowLeft\";\n\n    return (\n      <DropdownMenuPrimitive.Portal {...scope} {...portalProps}>\n        <DropdownMenuRenderContent\n          {...scope}\n          {...props}\n          onKeyDown={composeEventHandlers(props.onKeyDown, (event) => {\n            if (!sharedFocusGroup || event.key !== closeKey) return;\n            if (\n              event.altKey ||\n              event.ctrlKey ||\n              event.metaKey ||\n              event.shiftKey\n            )\n              return;\n            event.preventDefault();\n            setOpen(false);\n            focus?.moreRef.current?.focus();\n          })}\n          onEscapeKeyDown={composeEventHandlers(props.onEscapeKeyDown, () => {\n            if (!sharedFocusGroup) return;\n            focus?.moreRef.current?.focus();\n          })}\n          ref={forwardedRef}\n          sideOffset={sideOffset}\n        />\n      </DropdownMenuPrimitive.Portal>\n    );\n  },\n);\n\nThreadListItemMorePrimitiveContent.displayName =\n  \"ThreadListItemMorePrimitive.Content\";\n"],"mappings":";;;;;;;;;;;AA6BA,MAAagB,qCAAqCZ,YAIhDkB,IAAAC,iBAAA;CAAA,MAAAC,IAAAvB,EAAA,EAAA;CACE,MAAA,EAAAwB,2BAAAL,aAAAM,YAAAC,IAAA,GAAAC,UAAAN;CAGE,MAAAI,aAAAC,OAAAE,KAAAA,IAAA,IAAAF;CAKF,MAAAG,QAAcf,qBAAqBU,yBAAyB;CAC5D,MAAAM,UAAgBlB,6BAA6B;CAC7C,MAAAmB,QAAcrB,uBAAuB;CACrC,MAAAsB,mBAAyBrB,sCAAsC;CAE/D,MAAAwB,WADkB/B,UAAS8B,aACVD,MAAc,QAAd,eAAA;CAGd,MAAAG,KAAA9B;CACE,MAAA+B,KAAA5B;CAAyB,IAAA6B;CAAA,IAAAf,EAAA,OAAAY,YAAAZ,EAAA,OAAAQ,OAAAQ,WAAAhB,EAAA,OAAAO,WAAAP,EAAA,OAAAS,kBAAA;EAGyBM,MAAAE,UAAA;GAC/C,IAAI,CAACR,oBAAoBQ,MAAKC,QAASN,UAAQ;GAC/C,IACEK,MAAKE,UACLF,MAAKG,WACLH,MAAKI,WACLJ,MAAKK,UAAS;GAGhBL,MAAKM,eAAgB;GACrBhB,QAAQ,KAAK;GACbC,OAAKQ,QAAiBQ,SAAOhB,MAAC;EAAC;EAChCR,EAAA,KAAAY;EAAAZ,EAAA,KAAAQ,OAAAQ;EAAAhB,EAAA,KAAAO;EAAAP,EAAA,KAAAS;EAAAT,EAAA,KAAAe;CAAA,OAAAA,KAAAf,EAAA;CAZU,MAAAyB,KAAAzC,qBAAqBoB,MAAKsB,WAAYX,EAYhD;CAAC,IAAAY;CAAA,IAAA3B,EAAA,OAAAQ,OAAAQ,WAAAhB,EAAA,OAAAS,kBAAA;EAC2DkB,WAAA;GAC3D,IAAI,CAAClB,kBAAgB;GACrBD,OAAKQ,QAAiBQ,SAAOhB,MAAC;EAAC;EAChCR,EAAA,KAAAQ,OAAAQ;EAAAhB,EAAA,KAAAS;EAAAT,EAAA,KAAA2B;CAAA,OAAAA,KAAA3B,EAAA;CAHgB,MAAA4B,KAAA5C,qBAAqBoB,MAAKyB,iBAAkBF,EAG5D;CAAC,IAAAG;CAAA,IAAA9B,EAAA,OAAAc,MAAAd,EAAA,OAAAD,gBAAAC,EAAA,QAAAI,SAAAJ,EAAA,QAAAM,SAAAN,EAAA,QAAAE,cAAAF,EAAA,QAAAyB,MAAAzB,EAAA,QAAA4B,IAAA;EAnBJE,KAAA,oBAAC,IAAD;GAA0B,GACpBxB;GAAK,GACLF;GACO,WAAAqB;GAaM,iBAAAG;GAIZ7B,KAAAA;GACOG;EAAU,CAAA;EACtBF,EAAA,KAAAc;EAAAd,EAAA,KAAAD;EAAAC,EAAA,MAAAI;EAAAJ,EAAA,MAAAM;EAAAN,EAAA,MAAAE;EAAAF,EAAA,MAAAyB;EAAAzB,EAAA,MAAA4B;EAAA5B,EAAA,MAAA8B;CAAA,OAAAA,KAAA9B,EAAA;CAAA,IAAA+B;CAAA,IAAA/B,EAAA,QAAAJ,eAAAI,EAAA,QAAAM,SAAAN,EAAA,QAAAa,GAAAhB,UAAAG,EAAA,QAAA8B,IAAA;EAvBJC,KAAA,oBAAA,GAAA,QAAA;GAAA,GAAkCzB;GAAK,GAAMV;GAC3CkC,UAAAA;EAuBF,CAAA;EAA+B9B,EAAA,MAAAJ;EAAAI,EAAA,MAAAM;EAAAN,EAAA,MAAAa,GAAAhB;EAAAG,EAAA,MAAA8B;EAAA9B,EAAA,MAAA+B;CAAA,OAAAA,KAAA/B,EAAA;CAAA,OAxB/B+B;AAwB+B,CAGrC;AAEAvC,mCAAmCwC,cACjC"}

package/dist/primitives/threadListItemMore/ThreadListItemMoreTrigger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ThreadListItemMoreTrigger.d.ts","sourceRoot":"","sources":["../../../src/primitives/threadListItemMore/ThreadListItemMoreTrigger.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAc,MAAM,OAAO,CAAC;AACtD,OAAO,EAEL,KAAK,YAAY,IAAI,qBAAqB,EAC3C,MAAM,UAAU,CAAC;AAGlB,OAAO,KAAK,EAAE,mBAAmB,EAAE,iCAA8B;AASjE,yBAAiB,kCAAkC,CAAC;IAClD,KAAY,OAAO,GAAG,YAAY,CAAC,OAAO,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACzE,KAAY,KAAK,GAAG,mBAAmB,CAAC,OAAO,qBAAqB,CAAC,OAAO,CAAC,CAAC;CAC/E;AAED,eAAO,MAAM,kCAAkC;;qDAgC9C,CAAC"}
+{"version":3,"file":"ThreadListItemMoreTrigger.d.ts","sourceRoot":"","sources":["../../../src/primitives/threadListItemMore/ThreadListItemMoreTrigger.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAc,MAAM,OAAO,CAAC;AACtD,OAAO,EAEL,KAAK,YAAY,IAAI,qBAAqB,EAC3C,MAAM,UAAU,CAAC;AAGlB,OAAO,KAAK,EAAE,mBAAmB,EAAE,iCAA8B;AASjE,yBAAiB,kCAAkC,CAAC;IAClD,KAAY,OAAO,GAAG,YAAY,CAAC,OAAO,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACzE,KAAY,KAAK,GAAG,mBAAmB,CAAC,OAAO,qBAAqB,CAAC,OAAO,CAAC,CAAC;CAC/E;AAED,eAAO,MAAM,kCAAkC;;qDAkC9C,CAAC"}

package/dist/primitives/threadListItemMore/ThreadListItemMoreTrigger.js

@@ -23,6 +23,7 @@ const ThreadListItemMorePrimitiveTrigger = forwardRef((t0, ref) => {
 	if ($[0] !== openKey || $[1] !== setOpen || $[2] !== sharedFocusGroup) {
 		t1 = (event) => {
 			if (!sharedFocusGroup || event.key !== openKey) return;
+			if (event.altKey || event.ctrlKey || event.metaKey || event.shiftKey) return;
 			event.preventDefault();
 			setOpen(true);
 		};

package/dist/primitives/threadListItemMore/ThreadListItemMoreTrigger.js.map

@@ -1 +1 @@
-{"version":3,"file":"ThreadListItemMoreTrigger.js","names":["c","_c","ComponentRef","forwardRef","Direction","DropdownMenu","DropdownMenuPrimitive","useComposedRefs","composeEventHandlers","WithRenderPropProps","DropdownMenuRenderTrigger","useThreadListItemFocus","useThreadListItemMoreSharedFocusGroup","useThreadListItemMoreSetOpen","ScopedProps","useDropdownMenuScope","ThreadListItemMorePrimitiveTrigger","Element","Trigger","Props","t0","ref","$","__scopeThreadListItemMore","rest","scope","focus","setOpen","sharedFocusGroup","composedRef","moreRef","direction","useDirection","openKey","T0","t1","event","key","preventDefault","t2","onKeyDown","t3","displayName"],"sources":["../../../src/primitives/threadListItemMore/ThreadListItemMoreTrigger.tsx"],"sourcesContent":["\"use client\";\n\nimport { type ComponentRef, forwardRef } from \"react\";\nimport {\n  Direction,\n  type DropdownMenu as DropdownMenuPrimitive,\n} from \"radix-ui\";\nimport { useComposedRefs } from \"radix-ui/internal\";\nimport { composeEventHandlers } from \"radix-ui/internal\";\nimport type { WithRenderPropProps } from \"../../utils/Primitive\";\nimport { DropdownMenuRenderTrigger } from \"../dropdownMenuRenderPrimitives\";\nimport { useThreadListItemFocus } from \"../threadListFocusGroup\";\nimport {\n  useThreadListItemMoreSharedFocusGroup,\n  useThreadListItemMoreSetOpen,\n} from \"./ThreadListItemMoreRoot\";\nimport { type ScopedProps, useDropdownMenuScope } from \"./scope\";\n\nexport namespace ThreadListItemMorePrimitiveTrigger {\n  export type Element = ComponentRef<typeof DropdownMenuPrimitive.Trigger>;\n  export type Props = WithRenderPropProps<typeof DropdownMenuPrimitive.Trigger>;\n}\n\nexport const ThreadListItemMorePrimitiveTrigger = forwardRef<\n  ThreadListItemMorePrimitiveTrigger.Element,\n  ThreadListItemMorePrimitiveTrigger.Props\n>(\n  (\n    {\n      __scopeThreadListItemMore,\n      ...rest\n    }: ScopedProps<ThreadListItemMorePrimitiveTrigger.Props>,\n    ref,\n  ) => {\n    const scope = useDropdownMenuScope(__scopeThreadListItemMore);\n    const focus = useThreadListItemFocus();\n    const setOpen = useThreadListItemMoreSetOpen();\n    const sharedFocusGroup = useThreadListItemMoreSharedFocusGroup();\n    const composedRef = useComposedRefs(ref, focus?.moreRef);\n    const direction = Direction.useDirection();\n    const openKey = direction === \"rtl\" ? \"ArrowLeft\" : \"ArrowRight\";\n\n    return (\n      <DropdownMenuRenderTrigger\n        {...scope}\n        {...rest}\n        onKeyDown={composeEventHandlers(rest.onKeyDown, (event) => {\n          if (!sharedFocusGroup || event.key !== openKey) return;\n          event.preventDefault();\n          setOpen(true);\n        })}\n        ref={composedRef}\n      />\n    );\n  },\n);\n\nThreadListItemMorePrimitiveTrigger.displayName =\n  \"ThreadListItemMorePrimitive.Trigger\";\n"],"mappings":";;;;;;;;;;;AAuBA,MAAagB,qCAAqCb,YAIhDiB,IAAAC,QAAA;CAAA,MAAAC,IAAArB,EAAA,EAAA;CACE,MAAA,EAAAsB,2BAAA,GAAAC,SAAAJ;CAMA,MAAAK,QAAcV,qBAAqBQ,yBAAyB;CAC5D,MAAAG,QAAcf,uBAAuB;CACrC,MAAAgB,UAAgBd,6BAA6B;CAC7C,MAAAe,mBAAyBhB,sCAAsC;CAC/D,MAAAiB,cAAoBtB,gBAAgBc,KAAKK,OAAKI,OAAS;CAEvD,MAAAG,UADkB7B,UAAS4B,aACXD,MAAc,QAAd,cAAA;CAGb,MAAAG,KAAAxB;CAAyB,IAAAyB;CAAA,IAAAb,EAAA,OAAAW,WAAAX,EAAA,OAAAK,WAAAL,EAAA,OAAAM,kBAAA;EAGwBO,MAAAC,UAAA;GAC9C,IAAI,CAACR,oBAAoBQ,MAAKC,QAASJ,SAAO;GAC9CG,MAAKE,eAAgB;GACrBX,QAAQ,IAAI;EAAC;EACdL,EAAA,KAAAW;EAAAX,EAAA,KAAAK;EAAAL,EAAA,KAAAM;EAAAN,EAAA,KAAAa;CAAA,OAAAA,KAAAb,EAAA;CAJU,MAAAiB,KAAA/B,qBAAqBgB,KAAIgB,WAAYL,EAI/C;CAAC,IAAAM;CAAA,IAAAnB,EAAA,OAAAY,MAAAZ,EAAA,OAAAO,eAAAP,EAAA,OAAAE,QAAAF,EAAA,OAAAG,SAAAH,EAAA,OAAAiB,IAAA;EAPJE,KAAA,oBAAC,IAAD;GAA0B,GACpBhB;GAAK,GACLD;GACO,WAAAe;GAKNV,KAAAA;EAAW,CAAA;EAChBP,EAAA,KAAAY;EAAAZ,EAAA,KAAAO;EAAAP,EAAA,KAAAE;EAAAF,EAAA,KAAAG;EAAAH,EAAA,KAAAiB;EAAAjB,EAAA,KAAAmB;CAAA,OAAAA,KAAAnB,EAAA;CAAA,OATFmB;AASE,CAGR;AAEAzB,mCAAmC0B,cACjC"}
+{"version":3,"file":"ThreadListItemMoreTrigger.js","names":["c","_c","ComponentRef","forwardRef","Direction","DropdownMenu","DropdownMenuPrimitive","useComposedRefs","composeEventHandlers","WithRenderPropProps","DropdownMenuRenderTrigger","useThreadListItemFocus","useThreadListItemMoreSharedFocusGroup","useThreadListItemMoreSetOpen","ScopedProps","useDropdownMenuScope","ThreadListItemMorePrimitiveTrigger","Element","Trigger","Props","t0","ref","$","__scopeThreadListItemMore","rest","scope","focus","setOpen","sharedFocusGroup","composedRef","moreRef","direction","useDirection","openKey","T0","t1","event","key","altKey","ctrlKey","metaKey","shiftKey","preventDefault","t2","onKeyDown","t3","displayName"],"sources":["../../../src/primitives/threadListItemMore/ThreadListItemMoreTrigger.tsx"],"sourcesContent":["\"use client\";\n\nimport { type ComponentRef, forwardRef } from \"react\";\nimport {\n  Direction,\n  type DropdownMenu as DropdownMenuPrimitive,\n} from \"radix-ui\";\nimport { useComposedRefs } from \"radix-ui/internal\";\nimport { composeEventHandlers } from \"radix-ui/internal\";\nimport type { WithRenderPropProps } from \"../../utils/Primitive\";\nimport { DropdownMenuRenderTrigger } from \"../dropdownMenuRenderPrimitives\";\nimport { useThreadListItemFocus } from \"../threadListFocusGroup\";\nimport {\n  useThreadListItemMoreSharedFocusGroup,\n  useThreadListItemMoreSetOpen,\n} from \"./ThreadListItemMoreRoot\";\nimport { type ScopedProps, useDropdownMenuScope } from \"./scope\";\n\nexport namespace ThreadListItemMorePrimitiveTrigger {\n  export type Element = ComponentRef<typeof DropdownMenuPrimitive.Trigger>;\n  export type Props = WithRenderPropProps<typeof DropdownMenuPrimitive.Trigger>;\n}\n\nexport const ThreadListItemMorePrimitiveTrigger = forwardRef<\n  ThreadListItemMorePrimitiveTrigger.Element,\n  ThreadListItemMorePrimitiveTrigger.Props\n>(\n  (\n    {\n      __scopeThreadListItemMore,\n      ...rest\n    }: ScopedProps<ThreadListItemMorePrimitiveTrigger.Props>,\n    ref,\n  ) => {\n    const scope = useDropdownMenuScope(__scopeThreadListItemMore);\n    const focus = useThreadListItemFocus();\n    const setOpen = useThreadListItemMoreSetOpen();\n    const sharedFocusGroup = useThreadListItemMoreSharedFocusGroup();\n    const composedRef = useComposedRefs(ref, focus?.moreRef);\n    const direction = Direction.useDirection();\n    const openKey = direction === \"rtl\" ? \"ArrowLeft\" : \"ArrowRight\";\n\n    return (\n      <DropdownMenuRenderTrigger\n        {...scope}\n        {...rest}\n        onKeyDown={composeEventHandlers(rest.onKeyDown, (event) => {\n          if (!sharedFocusGroup || event.key !== openKey) return;\n          if (event.altKey || event.ctrlKey || event.metaKey || event.shiftKey)\n            return;\n          event.preventDefault();\n          setOpen(true);\n        })}\n        ref={composedRef}\n      />\n    );\n  },\n);\n\nThreadListItemMorePrimitiveTrigger.displayName =\n  \"ThreadListItemMorePrimitive.Trigger\";\n"],"mappings":";;;;;;;;;;;AAuBA,MAAagB,qCAAqCb,YAIhDiB,IAAAC,QAAA;CAAA,MAAAC,IAAArB,EAAA,EAAA;CACE,MAAA,EAAAsB,2BAAA,GAAAC,SAAAJ;CAMA,MAAAK,QAAcV,qBAAqBQ,yBAAyB;CAC5D,MAAAG,QAAcf,uBAAuB;CACrC,MAAAgB,UAAgBd,6BAA6B;CAC7C,MAAAe,mBAAyBhB,sCAAsC;CAC/D,MAAAiB,cAAoBtB,gBAAgBc,KAAKK,OAAKI,OAAS;CAEvD,MAAAG,UADkB7B,UAAS4B,aACXD,MAAc,QAAd,cAAA;CAGb,MAAAG,KAAAxB;CAAyB,IAAAyB;CAAA,IAAAb,EAAA,OAAAW,WAAAX,EAAA,OAAAK,WAAAL,EAAA,OAAAM,kBAAA;EAGwBO,MAAAC,UAAA;GAC9C,IAAI,CAACR,oBAAoBQ,MAAKC,QAASJ,SAAO;GAC9C,IAAIG,MAAKE,UAAWF,MAAKG,WAAYH,MAAKI,WAAYJ,MAAKK,UAAS;GAEpEL,MAAKM,eAAgB;GACrBf,QAAQ,IAAI;EAAC;EACdL,EAAA,KAAAW;EAAAX,EAAA,KAAAK;EAAAL,EAAA,KAAAM;EAAAN,EAAA,KAAAa;CAAA,OAAAA,KAAAb,EAAA;CANU,MAAAqB,KAAAnC,qBAAqBgB,KAAIoB,WAAYT,EAM/C;CAAC,IAAAU;CAAA,IAAAvB,EAAA,OAAAY,MAAAZ,EAAA,OAAAO,eAAAP,EAAA,OAAAE,QAAAF,EAAA,OAAAG,SAAAH,EAAA,OAAAqB,IAAA;EATJE,KAAA,oBAAC,IAAD;GAA0B,GACpBpB;GAAK,GACLD;GACO,WAAAmB;GAONd,KAAAA;EAAW,CAAA;EAChBP,EAAA,KAAAY;EAAAZ,EAAA,KAAAO;EAAAP,EAAA,KAAAE;EAAAF,EAAA,KAAAG;EAAAH,EAAA,KAAAqB;EAAArB,EAAA,KAAAuB;CAAA,OAAAA,KAAAvB,EAAA;CAAA,OAXFuB;AAWE,CAGR;AAEA7B,mCAAmC8B,cACjC"}

package/dist/unstable/webmcp/WebMcpRegistrationResource.d.ts

@@ -6,6 +6,7 @@ export type WebMcpRegistrationProps = {
     /** Re-registers when it changes; an execute-only edit reads through instead. */
     signature: string;
     tool: Tool<any, any>;
+    getCurrentTool: (name: string) => Tool<any, any> | undefined;
 };
 export declare const WebMcpRegistrationResource: import("@assistant-ui/tap").Resource<string | null, [WebMcpRegistrationProps]>;
 //# sourceMappingURL=WebMcpRegistrationResource.d.ts.map

package/dist/unstable/webmcp/WebMcpRegistrationResource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebMcpRegistrationResource.d.ts","sourceRoot":"","sources":["../../../src/unstable/webmcp/WebMcpRegistrationResource.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,KAAK,EAAE,UAAU,EAAE,yBAAsB;AAEhD,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,gFAAgF;IAChF,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;CACtB,CAAC;AA+EF,eAAO,MAAM,0BAA0B,gFAAkC,CAAC"}
+{"version":3,"file":"WebMcpRegistrationResource.d.ts","sourceRoot":"","sources":["../../../src/unstable/webmcp/WebMcpRegistrationResource.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,KAAK,EAAE,UAAU,EAAE,yBAAsB;AAEhD,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,gFAAgF;IAChF,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACrB,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC;CAC9D,CAAC;AA+EF,eAAO,MAAM,0BAA0B,gFAAkC,CAAC"}

package/dist/unstable/webmcp/WebMcpRegistrationResource.js

@@ -6,28 +6,13 @@ import { resource } from "@assistant-ui/tap";
 const notPermitted = (error) => error?.name === "NotAllowedError";
 const notPermittedMessage = (name) => `[assistant-ui] WebMCP registration for tool "${name}" was not permitted; the page's tools permission is disabled.`;
 const useWebMcpRegistration = (t0) => {
-	const $ = c(12);
-	const { host, name, signature, tool } = t0;
+	const $ = c(11);
+	const { host, name, signature, tool, getCurrentTool } = t0;
 	const [refused, setRefused] = useState(false);
-	const toolRef = useRef(tool);
+	const fallbackToolRef = useRef(tool);
 	let t1;
-	let t2;
-	if ($[0] !== tool) {
+	if ($[0] !== getCurrentTool || $[1] !== host || $[2] !== name || $[3] !== refused) {
 		t1 = () => {
-			toolRef.current = tool;
-		};
-		t2 = [tool];
-		$[0] = tool;
-		$[1] = t1;
-		$[2] = t2;
-	} else {
-		t1 = $[1];
-		t2 = $[2];
-	}
-	useEffect(t1, t2);
-	let t3;
-	if ($[3] !== host || $[4] !== name || $[5] !== refused) {
-		t3 = () => {
 			if (refused) return;
 			const lifecycle = new AbortController();
 			let live = true;
@@ -39,9 +24,9 @@ const useWebMcpRegistration = (t0) => {
 				console.warn(message, error);
 			};
 			try {
-				dispose = host.registerTool(toWebMcpTool(name, () => toolRef.current, lifecycle.signal), (error_1) => refuse(notPermitted(error_1) ? notPermittedMessage(name) : `[assistant-ui] WebMCP registration for tool "${name}" failed (name may already be registered).`, error_1));
-			} catch (t4) {
-				const error_0 = t4;
+				dispose = host.registerTool(toWebMcpTool(name, () => getCurrentTool(name) ?? fallbackToolRef.current, lifecycle.signal), (error_1) => refuse(notPermitted(error_1) ? notPermittedMessage(name) : `[assistant-ui] WebMCP registration for tool "${name}" failed (name may already be registered).`, error_1));
+			} catch (t2) {
+				const error_0 = t2;
 				refuse(notPermitted(error_0) ? notPermittedMessage(name) : `[assistant-ui] Skipping WebMCP registration for tool "${name}": registerTool failed (name may already be registered).`, error_0);
 				return;
 			}
@@ -50,32 +35,35 @@ const useWebMcpRegistration = (t0) => {
 				lifecycle.abort();
 				try {
 					dispose();
-				} catch (t5) {
-					const error_2 = t5;
+				} catch (t3) {
+					const error_2 = t3;
 					console.warn(`[assistant-ui] Unregistering WebMCP tool "${name}" failed.`, error_2);
 				}
 			};
 		};
-		$[3] = host;
-		$[4] = name;
-		$[5] = refused;
-		$[6] = t3;
-	} else t3 = $[6];
-	let t4;
-	if ($[7] !== host || $[8] !== name || $[9] !== refused || $[10] !== signature) {
-		t4 = [
+		$[0] = getCurrentTool;
+		$[1] = host;
+		$[2] = name;
+		$[3] = refused;
+		$[4] = t1;
+	} else t1 = $[4];
+	let t2;
+	if ($[5] !== getCurrentTool || $[6] !== host || $[7] !== name || $[8] !== refused || $[9] !== signature) {
+		t2 = [
+			getCurrentTool,
 			host,
 			name,
 			signature,
 			refused
 		];
-		$[7] = host;
-		$[8] = name;
-		$[9] = refused;
-		$[10] = signature;
-		$[11] = t4;
-	} else t4 = $[11];
-	useEffect(t3, t4);
+		$[5] = getCurrentTool;
+		$[6] = host;
+		$[7] = name;
+		$[8] = refused;
+		$[9] = signature;
+		$[10] = t2;
+	} else t2 = $[10];
+	useEffect(t1, t2);
 	return refused ? null : name;
 };
 const WebMcpRegistrationResource = resource(useWebMcpRegistration);

package/dist/unstable/webmcp/WebMcpRegistrationResource.js.map

@@ -1 +1 @@
-{"version":3,"file":"WebMcpRegistrationResource.js","names":["useEffect","useRef","useState","resource","Tool","toWebMcpTool","WebMcpHost","WebMcpRegistrationProps","host","name","signature","tool","notPermitted","error","notPermittedMessage","useWebMcpRegistration","t0","$","_c","refused","setRefused","toolRef","t1","t2","current","t3","lifecycle","AbortController","live","dispose","refuse","message","console","warn","registerTool","signal","error_1","t4","abort","t5","WebMcpRegistrationResource"],"sources":["../../../src/unstable/webmcp/WebMcpRegistrationResource.ts"],"sourcesContent":["import { useEffect, useRef, useState } from \"react\";\nimport { resource } from \"@assistant-ui/tap\";\nimport type { Tool } from \"assistant-stream\";\nimport { toWebMcpTool } from \"./convertTools\";\nimport type { WebMcpHost } from \"./webmcp-host\";\n\nexport type WebMcpRegistrationProps = {\n  host: WebMcpHost;\n  name: string;\n  /** Re-registers when it changes; an execute-only edit reads through instead. */\n  signature: string;\n  tool: Tool<any, any>;\n};\n\n// The explainer specifies NotAllowedError for a page whose tools permission is\n// off, which a cross-origin iframe without allow=\"tools\" reaches routinely. It\n// documents no rejection for a name already taken, so that stays a hedge.\nconst notPermitted = (error: unknown) =>\n  (error as { name?: unknown } | null | undefined)?.name === \"NotAllowedError\";\n\nconst notPermittedMessage = (name: string) =>\n  `[assistant-ui] WebMCP registration for tool \"${name}\" was not permitted; the page's tools permission is disabled.`;\n\nconst useWebMcpRegistration = ({\n  host,\n  name,\n  signature,\n  tool,\n}: WebMcpRegistrationProps): string | null => {\n  // A refused name is remembered for as long as the tool stays in the model\n  // context, so a permanent collision warns once rather than on every sync.\n  const [refused, setRefused] = useState(false);\n  const toolRef = useRef(tool);\n  // Commit phase, so an abandoned render cannot hand the host a tool the tree\n  // never committed.\n  useEffect(() => {\n    toolRef.current = tool;\n  }, [tool]);\n\n  useEffect(() => {\n    if (refused) return undefined;\n\n    const lifecycle = new AbortController();\n    let live = true;\n    let dispose: (() => void) | undefined;\n\n    const refuse = (message: string, error: unknown) => {\n      if (!live) return;\n      live = false;\n      setRefused(true);\n      console.warn(message, error);\n    };\n\n    try {\n      dispose = host.registerTool(\n        toWebMcpTool(name, () => toolRef.current, lifecycle.signal),\n        (error) =>\n          refuse(\n            notPermitted(error)\n              ? notPermittedMessage(name)\n              : `[assistant-ui] WebMCP registration for tool \"${name}\" failed (name may already be registered).`,\n            error,\n          ),\n      );\n    } catch (error) {\n      refuse(\n        notPermitted(error)\n          ? notPermittedMessage(name)\n          : `[assistant-ui] Skipping WebMCP registration for tool \"${name}\": registerTool failed (name may already be registered).`,\n        error,\n      );\n      return undefined;\n    }\n\n    return () => {\n      live = false;\n      lifecycle.abort();\n      try {\n        dispose();\n      } catch (error) {\n        console.warn(\n          `[assistant-ui] Unregistering WebMCP tool \"${name}\" failed.`,\n          error,\n        );\n      }\n    };\n  }, [host, name, signature, refused]);\n\n  return refused ? null : name;\n};\n\nexport const WebMcpRegistrationResource = resource(useWebMcpRegistration);\n"],"mappings":";;;;;AAiBA,MAAMY,gBAAgBC,UACnBA,OAAiDJ,SAAS;AAE7D,MAAMK,uBAAuBL,SAC3B,gDAAgDA,KAAI;AAEtD,MAAMM,yBAAwBC,OAAA;CAAA,MAAAC,IAAAC,EAAA,EAAA;CAAC,MAAA,EAAAV,MAAAC,MAAAC,WAAAC,SAAAK;CAQ7B,MAAA,CAAAG,SAAAC,cAA8BlB,SAAS,KAAK;CAC5C,MAAAmB,UAAgBpB,OAAOU,IAAI;CAAE,IAAAW;CAAA,IAAAC;CAAA,IAAAN,EAAA,OAAAN,MAAA;EAGnBW,WAAA;GACRD,QAAOG,UAAWb;EAAH;EACdY,KAAA,CAACZ,IAAI;EAACM,EAAA,KAAAN;EAAAM,EAAA,KAAAK;EAAAL,EAAA,KAAAM;CAAA,OAAA;EAAAD,KAAAL,EAAA;EAAAM,KAAAN,EAAA;CAAA;CAFTjB,UAAUsB,IAEPC,EAAM;CAAC,IAAAE;CAAA,IAAAR,EAAA,OAAAT,QAAAS,EAAA,OAAAR,QAAAQ,EAAA,OAAAE,SAAA;EAEAM,WAAA;GACR,IAAIN,SAAO;GAEX,MAAAO,YAAkB,IAAIC,gBAAgB;GACtC,IAAAC,OAAW;GACPC,IAAAA;GAEJ,MAAAC,UAAeC,SAAAlB,UAAA;IACb,IAAI,CAACe,MAAI;IACTA,OAAOA;IACPR,WAAW,IAAI;IACfY,QAAOC,KAAMF,SAASlB,KAAK;GAAC;GAG9B,IAAA;IACEgB,UAAUrB,KAAI0B,aACZ7B,aAAaI,YAAYY,QAAOG,SAAUE,UAASS,MAAO,IAC1DC,YACEN,OACElB,aAAaC,OAEsF,IAD/FC,oBAAoBL,IAC2E,IAFnG,gDAEoDA,KAAI,6CACxDI,OACF,CACJ;GATO,SAAAwB,IAAA;IAUAxB,MAAAA,UAAAA;IACPiB,OACElB,aAAaC,OAE6G,IADtHC,oBAAoBL,IACkG,IAF1H,yDAE6DA,KAAI,2DACjEI,OACF;IAAC;GAAA;GAEF,aAEM;IACLe,OAAOA;IACPF,UAASY,MAAO;IAChB,IAAA;KACET,QAAQ;IAAC,SAAAU,IAAA;KACF1B,MAAAA,UAAAA;KACPmB,QAAOC,KACL,6CAA6CxB,KAAI,YACjDI,OACF;IAAC;GACF;EACF;EACFI,EAAA,KAAAT;EAAAS,EAAA,KAAAR;EAAAQ,EAAA,KAAAE;EAAAF,EAAA,KAAAQ;CAAA,OAAAA,KAAAR,EAAA;CAAA,IAAAoB;CAAA,IAAApB,EAAA,OAAAT,QAAAS,EAAA,OAAAR,QAAAQ,EAAA,OAAAE,WAAAF,EAAA,QAAAP,WAAA;EAAE2B,KAAA;GAAC7B;GAAMC;GAAMC;GAAWS;EAAO;EAACF,EAAA,KAAAT;EAAAS,EAAA,KAAAR;EAAAQ,EAAA,KAAAE;EAAAF,EAAA,MAAAP;EAAAO,EAAA,MAAAoB;CAAA,OAAAA,KAAApB,EAAA;CA/CnCjB,UAAUyB,IA+CPY,EAAgC;CAAC,OAE7BlB,UAAA,OAAAV;AAAqB;AAG9B,MAAa+B,6BAA6BrC,SAASY,qBAAqB"}
+{"version":3,"file":"WebMcpRegistrationResource.js","names":["useEffect","useRef","useState","resource","Tool","toWebMcpTool","WebMcpHost","WebMcpRegistrationProps","host","name","signature","tool","getCurrentTool","notPermitted","error","notPermittedMessage","useWebMcpRegistration","t0","$","_c","refused","setRefused","fallbackToolRef","t1","lifecycle","AbortController","live","dispose","refuse","message","console","warn","registerTool","current","signal","error_1","t2","abort","t3","WebMcpRegistrationResource"],"sources":["../../../src/unstable/webmcp/WebMcpRegistrationResource.ts"],"sourcesContent":["import { useEffect, useRef, useState } from \"react\";\nimport { resource } from \"@assistant-ui/tap\";\nimport type { Tool } from \"assistant-stream\";\nimport { toWebMcpTool } from \"./convertTools\";\nimport type { WebMcpHost } from \"./webmcp-host\";\n\nexport type WebMcpRegistrationProps = {\n  host: WebMcpHost;\n  name: string;\n  /** Re-registers when it changes; an execute-only edit reads through instead. */\n  signature: string;\n  tool: Tool<any, any>;\n  getCurrentTool: (name: string) => Tool<any, any> | undefined;\n};\n\n// The explainer specifies NotAllowedError for a page whose tools permission is\n// off, which a cross-origin iframe without allow=\"tools\" reaches routinely. It\n// documents no rejection for a name already taken, so that stays a hedge.\nconst notPermitted = (error: unknown) =>\n  (error as { name?: unknown } | null | undefined)?.name === \"NotAllowedError\";\n\nconst notPermittedMessage = (name: string) =>\n  `[assistant-ui] WebMCP registration for tool \"${name}\" was not permitted; the page's tools permission is disabled.`;\n\nconst useWebMcpRegistration = ({\n  host,\n  name,\n  signature,\n  tool,\n  getCurrentTool,\n}: WebMcpRegistrationProps): string | null => {\n  // A refused name is remembered for as long as the tool stays in the model\n  // context, so a permanent collision warns once rather than on every sync.\n  const [refused, setRefused] = useState(false);\n  const fallbackToolRef = useRef(tool);\n\n  useEffect(() => {\n    if (refused) return undefined;\n\n    const lifecycle = new AbortController();\n    let live = true;\n    let dispose: (() => void) | undefined;\n\n    const refuse = (message: string, error: unknown) => {\n      if (!live) return;\n      live = false;\n      setRefused(true);\n      console.warn(message, error);\n    };\n\n    try {\n      dispose = host.registerTool(\n        toWebMcpTool(\n          name,\n          () => getCurrentTool(name) ?? fallbackToolRef.current,\n          lifecycle.signal,\n        ),\n        (error) =>\n          refuse(\n            notPermitted(error)\n              ? notPermittedMessage(name)\n              : `[assistant-ui] WebMCP registration for tool \"${name}\" failed (name may already be registered).`,\n            error,\n          ),\n      );\n    } catch (error) {\n      refuse(\n        notPermitted(error)\n          ? notPermittedMessage(name)\n          : `[assistant-ui] Skipping WebMCP registration for tool \"${name}\": registerTool failed (name may already be registered).`,\n        error,\n      );\n      return undefined;\n    }\n\n    return () => {\n      live = false;\n      lifecycle.abort();\n      try {\n        dispose();\n      } catch (error) {\n        console.warn(\n          `[assistant-ui] Unregistering WebMCP tool \"${name}\" failed.`,\n          error,\n        );\n      }\n    };\n  }, [getCurrentTool, host, name, signature, refused]);\n\n  return refused ? null : name;\n};\n\nexport const WebMcpRegistrationResource = resource(useWebMcpRegistration);\n"],"mappings":";;;;;AAkBA,MAAMa,gBAAgBC,UACnBA,OAAiDL,SAAS;AAE7D,MAAMM,uBAAuBN,SAC3B,gDAAgDA,KAAI;AAEtD,MAAMO,yBAAwBC,OAAA;CAAA,MAAAC,IAAAC,EAAA,EAAA;CAAC,MAAA,EAAAX,MAAAC,MAAAC,WAAAC,MAAAC,mBAAAK;CAS7B,MAAA,CAAAG,SAAAC,cAA8BnB,SAAS,KAAK;CAC5C,MAAAoB,kBAAwBrB,OAAOU,IAAI;CAAE,IAAAY;CAAA,IAAAL,EAAA,OAAAN,kBAAAM,EAAA,OAAAV,QAAAU,EAAA,OAAAT,QAAAS,EAAA,OAAAE,SAAA;EAE3BG,WAAA;GACR,IAAIH,SAAO;GAEX,MAAAI,YAAkB,IAAIC,gBAAgB;GACtC,IAAAC,OAAW;GACPC,IAAAA;GAEJ,MAAAC,UAAeC,SAAAf,UAAA;IACb,IAAI,CAACY,MAAI;IACTA,OAAOA;IACPL,WAAW,IAAI;IACfS,QAAOC,KAAMF,SAASf,KAAK;GAAC;GAG9B,IAAA;IACEa,UAAUnB,KAAIwB,aACZ3B,aACEI,YACMG,eAAeH,IAA+B,KAAtBa,gBAAeW,SAC7CT,UAASU,MACX,IACAC,YACEP,OACEf,aAAaC,OAEsF,IAD/FC,oBAAoBN,IAC2E,IAFnG,gDAEoDA,KAAI,6CACxDK,OACF,CACJ;GAbO,SAAAsB,IAAA;IAcAtB,MAAAA,UAAAA;IACPc,OACEf,aAAaC,OAE6G,IADtHC,oBAAoBN,IACkG,IAF1H,yDAE6DA,KAAI,2DACjEK,OACF;IAAC;GAAA;GAEF,aAEM;IACLY,OAAOA;IACPF,UAASa,MAAO;IAChB,IAAA;KACEV,QAAQ;IAAC,SAAAW,IAAA;KACFxB,MAAAA,UAAAA;KACPgB,QAAOC,KACL,6CAA6CtB,KAAI,YACjDK,OACF;IAAC;GACF;EACF;EACFI,EAAA,KAAAN;EAAAM,EAAA,KAAAV;EAAAU,EAAA,KAAAT;EAAAS,EAAA,KAAAE;EAAAF,EAAA,KAAAK;CAAA,OAAAA,KAAAL,EAAA;CAAA,IAAAkB;CAAA,IAAAlB,EAAA,OAAAN,kBAAAM,EAAA,OAAAV,QAAAU,EAAA,OAAAT,QAAAS,EAAA,OAAAE,WAAAF,EAAA,OAAAR,WAAA;EAAE0B,KAAA;GAACxB;GAAgBJ;GAAMC;GAAMC;GAAWU;EAAO;EAACF,EAAA,KAAAN;EAAAM,EAAA,KAAAV;EAAAU,EAAA,KAAAT;EAAAS,EAAA,KAAAE;EAAAF,EAAA,KAAAR;EAAAQ,EAAA,MAAAkB;CAAA,OAAAA,KAAAlB,EAAA;CAnDnDlB,UAAUuB,IAmDPa,EAAgD;CAAC,OAE7ChB,UAAA,OAAAX;AAAqB;AAG9B,MAAa8B,6BAA6BpC,SAASa,qBAAqB"}

package/dist/unstable/webmcp/useWebMcpProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useWebMcpProvider.d.ts","sourceRoot":"","sources":["../../../src/unstable/webmcp/useWebMcpProvider.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAU7C,MAAM,MAAM,8BAA8B,GAAG;IAC3C,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,OAAO,CAAC;CAC1D,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,MAAM,EAAE,aAAa,GAAG,QAAQ,CAAC;IACjC,mBAAmB,EAAE,SAAS,MAAM,EAAE,CAAC;CACxC,CAAC;AA4FF;;;;;;;GAOG;AACH,eAAO,MAAM,0BAA0B,GACrC,UAAS,8BAAmC,KAC3C,6BAuBF,CAAC"}
+{"version":3,"file":"useWebMcpProvider.d.ts","sourceRoot":"","sources":["../../../src/unstable/webmcp/useWebMcpProvider.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAU7C,MAAM,MAAM,8BAA8B,GAAG;IAC3C,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,OAAO,CAAC;CAC1D,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,MAAM,EAAE,aAAa,GAAG,QAAQ,CAAC;IACjC,mBAAmB,EAAE,SAAS,MAAM,EAAE,CAAC;CACxC,CAAC;AA8FF;;;;;;;GAOG;AACH,eAAO,MAAM,0BAA0B,GACrC,UAAS,8BAAmC,KAC3C,6BAyCF,CAAC"}

package/dist/unstable/webmcp/useWebMcpProvider.js

@@ -4,7 +4,7 @@ import { getDefaultWebMcpHost } from "./webmcp-host.js";
 import { defaultWebMcpFilter, toWebMcpInputSchema } from "./convertTools.js";
 import { WebMcpRegistrationResource } from "./WebMcpRegistrationResource.js";
 import { c } from "@assistant-ui/tap/react-shim/compiler-runtime";
-import { useEffect, useState, useSyncExternalStore } from "@assistant-ui/tap/react-shim";
+import { useCallback, useEffect, useInsertionEffect, useRef, useState, useSyncExternalStore } from "@assistant-ui/tap/react-shim";
 import { useAui } from "@assistant-ui/store";
 import { useResources, useTapRoot, withKey } from "@assistant-ui/tap";
 import { shallowEqual } from "@assistant-ui/store/internal";
@@ -38,11 +38,10 @@ const useStableNames = (names) => {
 	return next;
 };
 const useWebMcpRegistry = (t0) => {
-	const $ = c(4);
-	const { aui, host, filter } = t0;
-	const tools = useModelContextSnapshot(aui, host.available, modelContextToolSource);
+	const $ = c(5);
+	const { host, filter, tools, getCurrentTool } = t0;
 	let elements;
-	if ($[0] !== filter || $[1] !== host || $[2] !== tools) {
+	if ($[0] !== filter || $[1] !== getCurrentTool || $[2] !== host || $[3] !== tools) {
 		elements = [];
 		for (const [name, tool] of Object.entries(tools)) try {
 			if (!filter(name, tool)) continue;
@@ -51,12 +50,14 @@ const useWebMcpRegistry = (t0) => {
 				host,
 				name,
 				signature,
-				tool
+				tool,
+				getCurrentTool
 			}), [
 				host,
 				name,
 				signature,
-				tool
+				tool,
+				getCurrentTool
 			]));
 		} catch (t1) {
 			const error = t1;
@@ -65,10 +66,11 @@ const useWebMcpRegistry = (t0) => {
 			console.warn(`[assistant-ui] Skipping WebMCP registration for tool "${name}": filter or schema conversion failed.`, error);
 		}
 		$[0] = filter;
-		$[1] = host;
-		$[2] = tools;
-		$[3] = elements;
-	} else elements = $[3];
+		$[1] = getCurrentTool;
+		$[2] = host;
+		$[3] = tools;
+		$[4] = elements;
+	} else elements = $[4];
 	return useStableNames(useResources(elements));
 };
 /**
@@ -83,11 +85,18 @@ const unstable_useWebMcpProvider = (options = {}) => {
 	const aui = useAui();
 	const [host] = useState(getDefaultWebMcpHost);
 	const filter = options.filter ?? defaultWebMcpFilter;
+	const tools = useModelContextSnapshot(aui, host.available, modelContextToolSource);
+	const currentToolsRef = useRef(tools);
+	useInsertionEffect(() => {
+		currentToolsRef.current = tools;
+	}, [tools]);
+	const getCurrentTool = useCallback((name) => currentToolsRef.current[name], []);
 	const root = useTapRoot(function WebMcpProviderRoot() {
 		return useWebMcpRegistry({
-			aui,
 			host,
-			filter
+			filter,
+			tools,
+			getCurrentTool
 		});
 	});
 	const registeredToolNames = useSyncExternalStore(root.subscribe, root.getValue, () => EMPTY_NAMES);