@assistant-ui/core 0.3.16 → 0.3.17

package/dist/subscribable/subscribable.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscribable.js","names":["Unsubscribe","notifyEventListeners","SKIP_UPDATE","Symbol","Subscribable","subscribe","callback","SubscribableWithState","path","TPath","getState","TState","NestedSubscribable","EventSubscribable","event","TEvent","binding","unstable_on","payload","notifySubscribers","subscribers","Iterable","args","TArgs","errors","error","push","length","console","AggregateError","shallowEqual","objA","T","objB","undefined","keysA","Object","keys","key","valueA","valueB","is","BaseSubscribable","_subscribers","Set","add","delete","waitForUpdate","Promise","resolve","unsubscribe","_notifySubscribers","BaseSubject","_subscriptions","_connection","isConnected","_connect","errorContext","_updateConnection","size","ShallowMemoizeSubject","constructor","state","Error","_previousState","_syncState","LazyMemoizeSubject","_previousStateDirty","newState","NestedSubscriptionSubject","outerSubscribe","lastState","innerUnsubscribe","onRuntimeUpdate","outerUnsubscribe","EventSubscriptionSubject","config"],"sources":["../../src/subscribable/subscribable.ts"],"sourcesContent":["import type { Unsubscribe } from \"../types/unsubscribe\";\nimport { notifyEventListeners } from \"../utils/notify-event-listeners\";\n\nexport const SKIP_UPDATE = Symbol(\"skip-update\");\nexport type SKIP_UPDATE = typeof SKIP_UPDATE;\n\nexport type Subscribable = {\n  subscribe: (callback: () => void) => Unsubscribe;\n};\n\nexport type SubscribableWithState<TState, TPath> = Subscribable & {\n  path: TPath;\n  getState: () => TState;\n};\n\nexport type NestedSubscribable<\n  TState extends Subscribable | undefined,\n  TPath,\n> = SubscribableWithState<TState, TPath>;\n\nexport type EventSubscribable<TEvent extends string> = {\n  event: TEvent;\n  binding: SubscribableWithState<\n    | {\n        unstable_on: (\n          event: TEvent,\n          callback: (payload?: unknown) => void,\n        ) => Unsubscribe;\n      }\n    | undefined,\n    unknown\n  >;\n};\n\nexport const notifySubscribers = <TArgs extends unknown[]>(\n  subscribers: Iterable<(...args: TArgs) => void>,\n  ...args: TArgs\n): void => {\n  const errors: unknown[] = [];\n  for (const callback of subscribers) {\n    try {\n      callback(...args);\n    } catch (error) {\n      errors.push(error);\n    }\n  }\n\n  if (errors.length === 1) {\n    throw errors[0];\n  }\n\n  if (errors.length > 1) {\n    for (const error of errors) {\n      console.error(error);\n    }\n    throw new AggregateError(errors);\n  }\n};\n\nfunction shallowEqual<T extends object>(\n  objA: T | undefined,\n  objB: T | undefined,\n) {\n  if (objA === undefined && objB === undefined) return true;\n  if (objA === undefined) return false;\n  if (objB === undefined) return false;\n\n  const keysA = Object.keys(objA);\n  if (keysA.length !== Object.keys(objB).length) return false;\n\n  for (const key of keysA) {\n    const valueA = objA[key as keyof T];\n    const valueB = objB[key as keyof T];\n    if (!Object.is(valueA, valueB)) return false;\n  }\n\n  return true;\n}\n\nexport class BaseSubscribable {\n  private _subscribers = new Set<() => void>();\n\n  public subscribe(callback: () => void): Unsubscribe {\n    this._subscribers.add(callback);\n    return () => this._subscribers.delete(callback);\n  }\n\n  public waitForUpdate() {\n    return new Promise<void>((resolve) => {\n      const unsubscribe = this.subscribe(() => {\n        unsubscribe();\n        resolve();\n      });\n    });\n  }\n\n  protected _notifySubscribers() {\n    notifySubscribers(this._subscribers);\n  }\n}\n\n// lazy connect/disconnect: only opens upstream subscription while it has subscribers\nexport abstract class BaseSubject {\n  private _subscriptions = new Set<(payload?: unknown) => void>();\n  private _connection: Unsubscribe | undefined;\n\n  protected get isConnected() {\n    return !!this._connection;\n  }\n\n  protected abstract _connect(): Unsubscribe;\n\n  protected notifySubscribers(payload?: unknown, errorContext?: string) {\n    if (errorContext) {\n      notifyEventListeners(this._subscriptions, payload, errorContext);\n      return;\n    }\n\n    notifySubscribers(this._subscriptions, payload);\n  }\n\n  private _updateConnection() {\n    if (this._subscriptions.size > 0) {\n      if (this._connection) return;\n      this._connection = this._connect();\n    } else {\n      this._connection?.();\n      this._connection = undefined;\n    }\n  }\n\n  public subscribe(callback: (payload?: unknown) => void) {\n    this._subscriptions.add(callback);\n    this._updateConnection();\n\n    return () => {\n      this._subscriptions.delete(callback);\n      this._updateConnection();\n    };\n  }\n}\n\nexport class ShallowMemoizeSubject<TState extends object, TPath>\n  extends BaseSubject\n  implements SubscribableWithState<TState, TPath>\n{\n  public get path() {\n    return this.binding.path;\n  }\n\n  private binding: SubscribableWithState<TState | SKIP_UPDATE, TPath>;\n\n  constructor(binding: SubscribableWithState<TState | SKIP_UPDATE, TPath>) {\n    super();\n    this.binding = binding;\n    const state = binding.getState();\n    if (state === SKIP_UPDATE)\n      throw new Error(\"Entry not available in the store\");\n    this._previousState = state;\n  }\n\n  private _previousState: TState;\n  public getState = () => {\n    if (!this.isConnected) this._syncState();\n    return this._previousState;\n  };\n\n  private _syncState() {\n    const state = this.binding.getState();\n    if (state === SKIP_UPDATE) return false;\n    if (shallowEqual(state, this._previousState)) return false;\n    this._previousState = state;\n    return true;\n  }\n\n  protected _connect() {\n    const callback = () => {\n      if (this._syncState()) {\n        this.notifySubscribers();\n      }\n    };\n\n    const unsubscribe = this.binding.subscribe(callback);\n    this._syncState();\n    return unsubscribe;\n  }\n}\n\nexport class LazyMemoizeSubject<TState extends object, TPath>\n  extends BaseSubject\n  implements SubscribableWithState<TState, TPath>\n{\n  public get path() {\n    return this.binding.path;\n  }\n\n  private binding: SubscribableWithState<TState | SKIP_UPDATE, TPath>;\n\n  constructor(binding: SubscribableWithState<TState | SKIP_UPDATE, TPath>) {\n    super();\n    this.binding = binding;\n  }\n\n  private _previousStateDirty = true;\n  private _previousState: TState | undefined;\n  public getState = () => {\n    if (!this.isConnected || this._previousStateDirty) {\n      const newState = this.binding.getState();\n      if (\n        newState !== SKIP_UPDATE &&\n        (this._previousState === undefined ||\n          !shallowEqual(newState, this._previousState))\n      ) {\n        this._previousState = newState;\n      }\n      this._previousStateDirty = false;\n    }\n    if (this._previousState === undefined)\n      throw new Error(\"Entry not available in the store\");\n    return this._previousState;\n  };\n\n  protected _connect() {\n    const callback = () => {\n      this._previousStateDirty = true;\n      this.notifySubscribers();\n    };\n\n    const unsubscribe = this.binding.subscribe(callback);\n    this._previousStateDirty = true;\n    return unsubscribe;\n  }\n}\n\nexport class NestedSubscriptionSubject<\n  TState extends Subscribable | undefined,\n  TPath,\n>\n  extends BaseSubject\n  implements\n    SubscribableWithState<TState, TPath>,\n    NestedSubscribable<TState, TPath>\n{\n  public get path() {\n    return this.binding.path;\n  }\n\n  private binding: NestedSubscribable<TState, TPath>;\n\n  constructor(binding: NestedSubscribable<TState, TPath>) {\n    super();\n    this.binding = binding;\n  }\n\n  public getState() {\n    return this.binding.getState();\n  }\n\n  public outerSubscribe(callback: () => void) {\n    return this.binding.subscribe(callback);\n  }\n\n  protected _connect(): Unsubscribe {\n    const callback = () => {\n      this.notifySubscribers();\n    };\n\n    let lastState = this.binding.getState();\n    let innerUnsubscribe = lastState?.subscribe(callback);\n    const onRuntimeUpdate = () => {\n      const newState = this.binding.getState();\n      if (newState === lastState) return;\n      lastState = newState;\n\n      innerUnsubscribe?.();\n      innerUnsubscribe = newState?.subscribe(callback);\n\n      callback();\n    };\n\n    const outerUnsubscribe = this.outerSubscribe(onRuntimeUpdate);\n    return () => {\n      outerUnsubscribe?.();\n      innerUnsubscribe?.();\n    };\n  }\n}\n\nexport class EventSubscriptionSubject<\n  TEvent extends string,\n> extends BaseSubject {\n  private config: EventSubscribable<TEvent>;\n\n  constructor(config: EventSubscribable<TEvent>) {\n    super();\n    this.config = config;\n  }\n\n  public getState() {\n    return this.config.binding.getState();\n  }\n\n  public outerSubscribe(callback: () => void) {\n    return this.config.binding.subscribe(callback);\n  }\n\n  protected _connect(): Unsubscribe {\n    const errorContext = `Runtime event \"${this.config.event}\"`;\n    const callback = (payload?: unknown) => {\n      this.notifySubscribers(payload, errorContext);\n    };\n\n    let lastState = this.config.binding.getState();\n    let innerUnsubscribe = lastState?.unstable_on(this.config.event, callback);\n    const onRuntimeUpdate = () => {\n      const newState = this.config.binding.getState();\n      if (newState === lastState) return;\n      lastState = newState;\n\n      innerUnsubscribe?.();\n      innerUnsubscribe = newState?.unstable_on(this.config.event, callback);\n    };\n\n    const outerUnsubscribe = this.outerSubscribe(onRuntimeUpdate);\n    return () => {\n      outerUnsubscribe?.();\n      innerUnsubscribe?.();\n    };\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"subscribable.js","names":["shallowEqual","Unsubscribe","notifyEventListeners","SKIP_UPDATE","Symbol","Subscribable","subscribe","callback","SubscribableWithState","path","TPath","getState","TState","NestedSubscribable","EventSubscribable","event","TEvent","binding","unstable_on","payload","notifySubscribers","subscribers","Iterable","args","TArgs","errors","error","push","length","console","AggregateError","shallowEqualOrUndefined","a","T","b","undefined","BaseSubscribable","_subscribers","Set","add","delete","waitForUpdate","Promise","resolve","unsubscribe","_notifySubscribers","WritableSubscribable","_state","constructor","state","bind","getServerSnapshot","setState","Object","is","BaseSubject","_subscriptions","_connection","isConnected","_connect","errorContext","_updateConnection","size","ShallowMemoizeSubject","Error","_previousState","_syncState","LazyMemoizeSubject","_previousStateDirty","newState","NestedSubscriptionSubject","outerSubscribe","lastState","innerUnsubscribe","onRuntimeUpdate","outerUnsubscribe","EventSubscriptionSubject","config"],"sources":["../../src/subscribable/subscribable.ts"],"sourcesContent":["import { shallowEqual } from \"@assistant-ui/store/client\";\nimport type { Unsubscribe } from \"../types/unsubscribe\";\nimport { notifyEventListeners } from \"../utils/notify-event-listeners\";\n\nexport const SKIP_UPDATE = Symbol(\"skip-update\");\nexport type SKIP_UPDATE = typeof SKIP_UPDATE;\n\nexport type Subscribable = {\n  subscribe: (callback: () => void) => Unsubscribe;\n};\n\nexport type SubscribableWithState<TState, TPath> = Subscribable & {\n  path: TPath;\n  getState: () => TState;\n};\n\nexport type NestedSubscribable<\n  TState extends Subscribable | undefined,\n  TPath,\n> = SubscribableWithState<TState, TPath>;\n\nexport type EventSubscribable<TEvent extends string> = {\n  event: TEvent;\n  binding: SubscribableWithState<\n    | {\n        unstable_on: (\n          event: TEvent,\n          callback: (payload?: unknown) => void,\n        ) => Unsubscribe;\n      }\n    | undefined,\n    unknown\n  >;\n};\n\nexport const notifySubscribers = <TArgs extends unknown[]>(\n  subscribers: Iterable<(...args: TArgs) => void>,\n  ...args: TArgs\n): void => {\n  const errors: unknown[] = [];\n  for (const callback of subscribers) {\n    try {\n      callback(...args);\n    } catch (error) {\n      errors.push(error);\n    }\n  }\n\n  if (errors.length === 1) {\n    throw errors[0];\n  }\n\n  if (errors.length > 1) {\n    for (const error of errors) {\n      console.error(error);\n    }\n    throw new AggregateError(errors);\n  }\n};\n\nconst shallowEqualOrUndefined = <T extends object>(\n  a: T | undefined,\n  b: T | undefined,\n) => (a === undefined || b === undefined ? a === b : shallowEqual(a, b));\n\nexport class BaseSubscribable {\n  private _subscribers = new Set<() => void>();\n\n  public subscribe(callback: () => void): Unsubscribe {\n    this._subscribers.add(callback);\n    return () => this._subscribers.delete(callback);\n  }\n\n  public waitForUpdate() {\n    return new Promise<void>((resolve) => {\n      const unsubscribe = this.subscribe(() => {\n        unsubscribe();\n        resolve();\n      });\n    });\n  }\n\n  protected _notifySubscribers() {\n    notifySubscribers(this._subscribers);\n  }\n}\n\nexport class WritableSubscribable<TState> extends BaseSubscribable {\n  private _state: TState;\n\n  constructor(state: TState) {\n    super();\n    this._state = state;\n    this.subscribe = this.subscribe.bind(this);\n    this.getState = this.getState.bind(this);\n    // Hydration has to agree with what the server rendered, so the server\n    // snapshot stays at the creation-time state rather than following writes.\n    this.getServerSnapshot = () => state;\n  }\n\n  public getState(): TState {\n    return this._state;\n  }\n\n  public getServerSnapshot: () => TState;\n\n  public setState(state: TState): void {\n    if (Object.is(state, this._state)) return;\n    this._state = state;\n    this._notifySubscribers();\n  }\n}\n\n// lazy connect/disconnect: only opens upstream subscription while it has subscribers\nexport abstract class BaseSubject {\n  private _subscriptions = new Set<(payload?: unknown) => void>();\n  private _connection: Unsubscribe | undefined;\n\n  protected get isConnected() {\n    return !!this._connection;\n  }\n\n  protected abstract _connect(): Unsubscribe;\n\n  protected notifySubscribers(payload?: unknown, errorContext?: string) {\n    if (errorContext) {\n      notifyEventListeners(this._subscriptions, payload, errorContext);\n      return;\n    }\n\n    notifySubscribers(this._subscriptions, payload);\n  }\n\n  private _updateConnection() {\n    if (this._subscriptions.size > 0) {\n      if (this._connection) return;\n      this._connection = this._connect();\n    } else {\n      this._connection?.();\n      this._connection = undefined;\n    }\n  }\n\n  public subscribe(callback: (payload?: unknown) => void) {\n    this._subscriptions.add(callback);\n    this._updateConnection();\n\n    return () => {\n      this._subscriptions.delete(callback);\n      this._updateConnection();\n    };\n  }\n}\n\nexport class ShallowMemoizeSubject<TState extends object, TPath>\n  extends BaseSubject\n  implements SubscribableWithState<TState, TPath>\n{\n  public get path() {\n    return this.binding.path;\n  }\n\n  private binding: SubscribableWithState<TState | SKIP_UPDATE, TPath>;\n\n  constructor(binding: SubscribableWithState<TState | SKIP_UPDATE, TPath>) {\n    super();\n    this.binding = binding;\n    const state = binding.getState();\n    if (state === SKIP_UPDATE)\n      throw new Error(\"Entry not available in the store\");\n    this._previousState = state;\n  }\n\n  private _previousState: TState;\n  public getState = () => {\n    if (!this.isConnected) this._syncState();\n    return this._previousState;\n  };\n\n  private _syncState() {\n    const state = this.binding.getState();\n    if (state === SKIP_UPDATE) return false;\n    if (shallowEqualOrUndefined(state, this._previousState)) return false;\n    this._previousState = state;\n    return true;\n  }\n\n  protected _connect() {\n    const callback = () => {\n      if (this._syncState()) {\n        this.notifySubscribers();\n      }\n    };\n\n    const unsubscribe = this.binding.subscribe(callback);\n    this._syncState();\n    return unsubscribe;\n  }\n}\n\nexport class LazyMemoizeSubject<TState extends object, TPath>\n  extends BaseSubject\n  implements SubscribableWithState<TState, TPath>\n{\n  public get path() {\n    return this.binding.path;\n  }\n\n  private binding: SubscribableWithState<TState | SKIP_UPDATE, TPath>;\n\n  constructor(binding: SubscribableWithState<TState | SKIP_UPDATE, TPath>) {\n    super();\n    this.binding = binding;\n  }\n\n  private _previousStateDirty = true;\n  private _previousState: TState | undefined;\n  public getState = () => {\n    if (!this.isConnected || this._previousStateDirty) {\n      const newState = this.binding.getState();\n      if (\n        newState !== SKIP_UPDATE &&\n        (this._previousState === undefined ||\n          !shallowEqualOrUndefined(newState, this._previousState))\n      ) {\n        this._previousState = newState;\n      }\n      this._previousStateDirty = false;\n    }\n    if (this._previousState === undefined)\n      throw new Error(\"Entry not available in the store\");\n    return this._previousState;\n  };\n\n  protected _connect() {\n    const callback = () => {\n      this._previousStateDirty = true;\n      this.notifySubscribers();\n    };\n\n    const unsubscribe = this.binding.subscribe(callback);\n    this._previousStateDirty = true;\n    return unsubscribe;\n  }\n}\n\nexport class NestedSubscriptionSubject<\n  TState extends Subscribable | undefined,\n  TPath,\n>\n  extends BaseSubject\n  implements\n    SubscribableWithState<TState, TPath>,\n    NestedSubscribable<TState, TPath>\n{\n  public get path() {\n    return this.binding.path;\n  }\n\n  private binding: NestedSubscribable<TState, TPath>;\n\n  constructor(binding: NestedSubscribable<TState, TPath>) {\n    super();\n    this.binding = binding;\n  }\n\n  public getState() {\n    return this.binding.getState();\n  }\n\n  public outerSubscribe(callback: () => void) {\n    return this.binding.subscribe(callback);\n  }\n\n  protected _connect(): Unsubscribe {\n    const callback = () => {\n      this.notifySubscribers();\n    };\n\n    let lastState = this.binding.getState();\n    let innerUnsubscribe = lastState?.subscribe(callback);\n    const onRuntimeUpdate = () => {\n      const newState = this.binding.getState();\n      if (newState === lastState) return;\n      lastState = newState;\n\n      innerUnsubscribe?.();\n      innerUnsubscribe = newState?.subscribe(callback);\n\n      callback();\n    };\n\n    const outerUnsubscribe = this.outerSubscribe(onRuntimeUpdate);\n    return () => {\n      outerUnsubscribe?.();\n      innerUnsubscribe?.();\n    };\n  }\n}\n\nexport class EventSubscriptionSubject<\n  TEvent extends string,\n> extends BaseSubject {\n  private config: EventSubscribable<TEvent>;\n\n  constructor(config: EventSubscribable<TEvent>) {\n    super();\n    this.config = config;\n  }\n\n  public getState() {\n    return this.config.binding.getState();\n  }\n\n  public outerSubscribe(callback: () => void) {\n    return this.config.binding.subscribe(callback);\n  }\n\n  protected _connect(): Unsubscribe {\n    const errorContext = `Runtime event \"${this.config.event}\"`;\n    const callback = (payload?: unknown) => {\n      this.notifySubscribers(payload, errorContext);\n    };\n\n    let lastState = this.config.binding.getState();\n    let innerUnsubscribe = lastState?.unstable_on(this.config.event, callback);\n    const onRuntimeUpdate = () => {\n      const newState = this.config.binding.getState();\n      if (newState === lastState) return;\n      lastState = newState;\n\n      innerUnsubscribe?.();\n      innerUnsubscribe = newState?.unstable_on(this.config.event, callback);\n    };\n\n    const outerUnsubscribe = this.outerSubscribe(onRuntimeUpdate);\n    return () => {\n      outerUnsubscribe?.();\n      innerUnsubscribe?.();\n    };\n  }\n}\n"],"mappings":"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"}

package/dist/types/message.d.ts

@@ -153,15 +153,42 @@ type ToolApprovalOption = {
     description?: string;
   };
 };
+/**
+ * How an approval request should be presented, and which answers it accepts.
+ * Absent: `"decision"`.
+ *
+ * The approval seam carries a host-owned request addressed by its own id and
+ * resolved once; a request wanting an answer these modes cannot express stays
+ * on the `interrupt` seam, which hands the tool an arbitrary payload instead.
+ * Unlike {@link ToolApprovalOptionKind} the set is closed, because a renderer
+ * that cannot cover every mode exhaustively is back to guessing the affordance.
+ */
+type ToolApprovalDisplay = "decision" | "select" | "text";
+/**
+ * Whether the request asks for a free-form answer, on its own or alongside its
+ * options. Renderers read this to decide whether to offer a text affordance,
+ * and the runtime reads it to reject a `text` response the host cannot record.
+ */
+declare const toolApprovalAcceptsText: (approval: {
+  readonly display?: ToolApprovalDisplay;
+  readonly allowFreeform?: boolean;
+}) => boolean;
 type ToolApprovalResponse = {
   readonly approved: boolean;
+  readonly text?: string;
   readonly reason?: string;
 } | {
   readonly optionId: string;
+  readonly text?: string;
   readonly reason?: string;
 } | {
   readonly approved: boolean;
   readonly optionId: string;
+  readonly text?: string;
+  readonly reason?: string;
+} | {
+  /** Answer to a request that asks a question rather than for a decision. */
+  readonly text: string;
   readonly reason?: string;
 };
 type ToolCallMessagePart<TArgs = ReadonlyJSONObject, TResult = unknown> = {
@@ -201,6 +228,16 @@ type ToolCallMessagePart<TArgs = ReadonlyJSONObject, TResult = unknown> = {
   /** Server-side approval gate. `respondToApproval` may only be called while `approved` is undefined and no `resolution` is recorded. */
   readonly approval?: {
     readonly id: string;
+    /**
+     * The question put to the user. A request that asks for something other
+     * than permission carries it here, so a renderer can show the question
+     * rather than inferring a decision from the tool name.
+     */
+    readonly prompt?: string;
+    /** How the request should be presented. Absent: a plain decision. */
+    readonly display?: ToolApprovalDisplay;
+    /** Whether a free-form answer is accepted alongside the options. */
+    readonly allowFreeform?: boolean;
     readonly approved?: boolean;
     readonly reason?: string;
     readonly isAutomatic?: boolean;
@@ -208,6 +245,8 @@ type ToolCallMessagePart<TArgs = ReadonlyJSONObject, TResult = unknown> = {
     readonly options?: readonly ToolApprovalOption[];
     /** The option chosen at resolution, when options were present. */
     readonly optionId?: string;
+    /** The free-form answer recorded at resolution, when one was given. */
+    readonly text?: string;
     /** Terminal non-decision state: the request was cancelled or expired without a user decision. Set by the host. */
     readonly resolution?: "cancelled" | "expired";
   };
@@ -361,5 +400,5 @@ type AppendMessage = Omit<ThreadMessage, "id"> & {
   steer?: boolean | undefined;
 };
 //#endregion
-export { AppendMessage, DataMessagePart, FileMessagePart, GenerativeUIMessagePart, GenerativeUINode, GenerativeUISpec, ImageMessagePart, MCP_APP_URI_SCHEME, McpAppMetadata, MessagePartStatus, MessagePartStreamStatus, MessageRole, MessageStatus, MessageTiming, PartProviderMetadata, ReasoningMessagePart, RunConfig, SourceMessagePart, SourceProviderMetadata, TextMessagePart, ThreadAssistantMessage, ThreadAssistantMessagePart, ThreadMessage, ThreadStep, ThreadSystemMessage, ThreadUserMessage, ThreadUserMessagePart, ToolApprovalOption, ToolApprovalOptionKind, ToolApprovalResponse, ToolCallMessagePart, ToolCallMessagePartMcpMetadata, ToolCallMessagePartStatus, type ToolCallTiming, type ToolModelContentPart, Unstable_AudioMessagePart, isMcpAppUri };
+export { AppendMessage, DataMessagePart, FileMessagePart, GenerativeUIMessagePart, GenerativeUINode, GenerativeUISpec, ImageMessagePart, MCP_APP_URI_SCHEME, McpAppMetadata, MessagePartStatus, MessagePartStreamStatus, MessageRole, MessageStatus, MessageTiming, PartProviderMetadata, ReasoningMessagePart, RunConfig, SourceMessagePart, SourceProviderMetadata, TextMessagePart, ThreadAssistantMessage, ThreadAssistantMessagePart, ThreadMessage, ThreadStep, ThreadSystemMessage, ThreadUserMessage, ThreadUserMessagePart, ToolApprovalDisplay, ToolApprovalOption, ToolApprovalOptionKind, ToolApprovalResponse, ToolCallMessagePart, ToolCallMessagePartMcpMetadata, ToolCallMessagePartStatus, type ToolCallTiming, type ToolModelContentPart, Unstable_AudioMessagePart, isMcpAppUri, toolApprovalAcceptsText };
 //# sourceMappingURL=message.d.ts.map

package/dist/types/message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message.d.ts","names":[],"sources":["../../src/types/message.ts"],"mappings":";;;;KASY;YACA,uBAAuB;;KAGvB;WACD;WACA;WACA,SAAS;WACT,mBAAmB;WACnB;;KAGC;WACD;WACA;WACA,SAAS;WACT;WACA,mBAAmB;WACnB;;KAGC,yBAAyB;KAEzB;WAEG;WACA;WACA;WACA;WACA;WACA,mBAAmB;WACnB;;WAGA;WACA;WACA;WACA;WACA;WACA;WACA;WACA,mBAAmB;WACnB;;KAGH;WACD;WACA;WACA;WACA,mBAAmB;;KAGlB;WACD;WACA;WACA;WACA;;WAEA;WACA,mBAAmB;WACnB;;;;;;;;;;;KAYC;WACD;WACA;aACE;aACA;;;KAID,gBAAgB;WACjB;WACA;WACA,MAAM;;;;;;;;;;;KAYL;;WAIG;;WAEA,QAAQ;;WAER,oBAAoB;;WAEpB;;;;;KAMH;;WAED,MAAM,4BAA4B;;;;;;;;;;KAWjC;WACD;;WAEA,MAAM;;WAEN;WACA;;KAGC;WACD;WACA;WACA;;WAEA;;cAGE;cAEA,cAAe;KAGhB;WACD,MAAM;;KAGL;KAMA;;WAED;;;;;;;WAOA,MAAM;;WAEN;WACA;;WAEA;;WAEA;IAAsB;IAAgB;;;KAGrC;WACG;WAA4B;;WAC5B;WAA2B;;WAE3B;WACA;WACA;;KAGH,oBACV,QAAQ,oBACR;;WAGS;;WAEA;;WAEA;;;;;;WAMA,MAAM;;WAEN,SAAS;;WAET;;WAEA;;WAEA;;WAEA,SAAS;;WAET,MAAM;;WAEN,mBAAmB;;WAEnB,wBAAwB;;WAExB;IAAc;IAAe;;;WAE7B;aACE;aACA;aACA;aACA;;aAEA,mBAAmB;;aAEnB;;aAEA;;;WAGF;;;;;WAKA,oBAAoB;;KAGnB,wBACR,kBACA,mBACA,kBACA,kBACA;KAEQ,6BACR,kBACA,uBACA,sBACA,oBACA,kBACA,mBACA,kBACA;KAEQ;WAEG;;WAGA;;WAGA;WACA;WAMA;;KAGH;WAEG;;WAGA;;WAGA;WACA;;KAQH;;WAGG;;WAEA;;WAGA;WACA;WACA,QAAQ;IAEnB;KAEQ;WAEG;;WAGA;WACA;;WAGA;WACA;;WAGA;WACA;WAOA,QAAQ;;KAGX;WACD;WACA;WACA;WACA;WACA;WACA;WACA;;KAGC;WACD;WACA;aAEM;aACA;;;KAKZ;WACM;WACA,WAAW;;KAGV,sBAAsB;WACvB;WACA,mBAAmB;WACnB;aACE;aACA;aACA;aACA;aACA;aACA;aACA,QAAQ;;;KAIT,oBAAoB;WACrB;WACA,kBAAkB;WAClB,sBAAsB;WACtB;aACE;aACA;aACA;aACA;aACA;aACA;aACA;aACA,QAAQ;;;KAIT,yBAAyB;WAC1B;WACA,kBAAkB;WAClB,QAAQ;WACR;aACE,gBAAgB;aAChB,+BAA+B;aAC/B,wBAAwB;aACxB,gBAAgB;aAChB;eAA+B;;aAC/B,SAAS;;;;;aAKT;aACA,QAAQ;;;KAIhB;WACM,SAAS;WACT;aACE,iBAAiB;aACjB,gCAAgC;aAChC,yBAAyB;aACzB,iBAAiB;aACjB;eAA+B;;aAC/B,SAAS;aACT;aACA,QAAQ;;WAEV,cAAc;;KAGb,gBAAgB,qBACzB,sBAAsB,oBAAoB;KAEjC,cAAc;KAEd;WACD,SAAS;;KAGR,gBAAgB,KAAK;EAC/B;;EAGA;EACA,WAAW;EACX;;EAEA"}
+{"version":3,"file":"message.d.ts","names":[],"sources":["../../src/types/message.ts"],"mappings":";;;;KASY;YACA,uBAAuB;;KAGvB;WACD;WACA;WACA,SAAS;WACT,mBAAmB;WACnB;;KAGC;WACD;WACA;WACA,SAAS;WACT;WACA,mBAAmB;WACnB;;KAGC,yBAAyB;KAEzB;WAEG;WACA;WACA;WACA;WACA;WACA,mBAAmB;WACnB;;WAGA;WACA;WACA;WACA;WACA;WACA;WACA;WACA,mBAAmB;WACnB;;KAGH;WACD;WACA;WACA;WACA,mBAAmB;;KAGlB;WACD;WACA;WACA;WACA;;WAEA;WACA,mBAAmB;WACnB;;;;;;;;;;;KAYC;WACD;WACA;aACE;aACA;;;KAID,gBAAgB;WACjB;WACA;WACA,MAAM;;;;;;;;;;;KAYL;;WAIG;;WAEA,QAAQ;;WAER,oBAAoB;;WAEpB;;;;;KAMH;;WAED,MAAM,4BAA4B;;;;;;;;;;KAWjC;WACD;;WAEA,MAAM;;WAEN;WACA;;KAGC;WACD;WACA;WACA;;WAEA;;cAGE;cAEA,cAAe;KAGhB;WACD,MAAM;;KAGL;KAMA;;WAED;;;;;;;WAOA,MAAM;;WAEN;WACA;;WAEA;;WAEA;IAAsB;IAAgB;;;;;;;;;;;;;KAarC;;;;;;cAOC,0BAA2B;WAC7B,UAAU;WACV;;KAGC;WAEG;WACA;WACA;;WAGA;WACA;WACA;;WAGA;WACA;WACA;WACA;;;WAIA;WACA;;KAGH,oBACV,QAAQ,oBACR;;WAGS;;WAEA;;WAEA;;;;;;WAMA,MAAM;;WAEN,SAAS;;WAET;;WAEA;;WAEA;;WAEA,SAAS;;WAET,MAAM;;WAEN,mBAAmB;;WAEnB,wBAAwB;;WAExB;IAAc;IAAe;;;WAE7B;aACE;;;;;;aAMA;;aAEA,UAAU;;aAEV;aACA;aACA;aACA;;aAEA,mBAAmB;;aAEnB;;aAEA;;aAEA;;;WAGF;;;;;WAKA,oBAAoB;;KAGnB,wBACR,kBACA,mBACA,kBACA,kBACA;KAEQ,6BACR,kBACA,uBACA,sBACA,oBACA,kBACA,mBACA,kBACA;KAEQ;WAEG;;WAGA;;WAGA;WACA;WAMA;;KAGH;WAEG;;WAGA;;WAGA;WACA;;KAQH;;WAGG;;WAEA;;WAGA;WACA;WACA,QAAQ;IAEnB;KAEQ;WAEG;;WAGA;WACA;;WAGA;WACA;;WAGA;WACA;WAOA,QAAQ;;KAGX;WACD;WACA;WACA;WACA;WACA;WACA;WACA;;KAGC;WACD;WACA;aAEM;aACA;;;KAKZ;WACM;WACA,WAAW;;KAGV,sBAAsB;WACvB;WACA,mBAAmB;WACnB;aACE;aACA;aACA;aACA;aACA;aACA;aACA,QAAQ;;;KAIT,oBAAoB;WACrB;WACA,kBAAkB;WAClB,sBAAsB;WACtB;aACE;aACA;aACA;aACA;aACA;aACA;aACA;aACA,QAAQ;;;KAIT,yBAAyB;WAC1B;WACA,kBAAkB;WAClB,QAAQ;WACR;aACE,gBAAgB;aAChB,+BAA+B;aAC/B,wBAAwB;aACxB,gBAAgB;aAChB;eAA+B;;aAC/B,SAAS;;;;;aAKT;aACA,QAAQ;;;KAIhB;WACM,SAAS;WACT;aACE,iBAAiB;aACjB,gCAAgC;aAChC,yBAAyB;aACzB,iBAAiB;aACjB;eAA+B;;aAC/B,SAAS;aACT;aACA,QAAQ;;WAEV,cAAc;;KAGb,gBAAgB,qBACzB,sBAAsB,oBAAoB;KAEjC,cAAc;KAEd;WACD,SAAS;;KAGR,gBAAgB,KAAK;EAC/B;;EAGA;EACA,WAAW;EACX;;EAEA"}

package/dist/types/message.js

@@ -1,7 +1,13 @@
 //#region src/types/message.ts
 const MCP_APP_URI_SCHEME = "ui://";
 const isMcpAppUri = (uri) => !!uri?.startsWith(MCP_APP_URI_SCHEME);
+/**
+* Whether the request asks for a free-form answer, on its own or alongside its
+* options. Renderers read this to decide whether to offer a text affordance,
+* and the runtime reads it to reject a `text` response the host cannot record.
+*/
+const toolApprovalAcceptsText = (approval) => approval.display === "text" || approval.allowFreeform === true;
 //#endregion
-export { MCP_APP_URI_SCHEME, isMcpAppUri };
+export { MCP_APP_URI_SCHEME, isMcpAppUri, toolApprovalAcceptsText };
 
 //# sourceMappingURL=message.js.map

package/dist/types/message.js.map

@@ -1 +1 @@
-{"version":3,"file":"message.js","names":["ReadonlyJSONObject","ReadonlyJSONValue","ToolCallTiming","ToolModelContentPart","CompleteAttachment","PartProviderMetadata","providerName","TextMessagePart","type","text","status","MessagePartStreamStatus","providerMetadata","parentId","ReasoningMessagePart","unstable_summary","SourceProviderMetadata","SourceMessagePart","sourceType","id","url","title","mediaType","filename","ImageMessagePart","image","FileMessagePart","data","mimeType","Unstable_AudioMessagePart","audio","format","DataMessagePart","name","T","GenerativeUINode","component","props","Record","children","key","GenerativeUISpec","root","GenerativeUIMessagePart","spec","McpAppMetadata","resourceUri","visibility","serverId","MCP_APP_URI_SCHEME","isMcpAppUri","uri","startsWith","ToolCallMessagePartMcpMetadata","app","ToolApprovalOptionKind","ToolApprovalOption","kind","label","description","grants","confirm","ToolApprovalResponse","approved","reason","optionId","ToolCallMessagePart","toolCallId","toolName","args","TArgs","result","TResult","isError","argsText","artifact","timing","mcp","modelContent","interrupt","payload","approval","isAutomatic","options","resolution","messages","ThreadMessage","ThreadUserMessagePart","ThreadAssistantMessagePart","MessagePartStatus","error","ToolCallMessagePartStatus","MessageStatus","MessageTiming","streamStartTime","firstTokenTime","totalStreamTime","tokenCount","tokensPerSecond","totalChunks","toolCallCount","ThreadStep","messageId","usage","inputTokens","outputTokens","MessageCommonProps","createdAt","Date","ThreadSystemMessage","role","content","metadata","unstable_state","unstable_annotations","unstable_data","steps","submittedFeedback","custom","ThreadUserMessage","attachments","isOptimistic","ThreadAssistantMessage","BaseThreadMessage","MessageRole","RunConfig","AppendMessage","Omit","sourceId","runConfig","startRun","steer"],"sources":["../../src/types/message.ts"],"sourcesContent":["import type {\n  ReadonlyJSONObject,\n  ReadonlyJSONValue,\n} from \"assistant-stream/utils\";\nimport type { ToolCallTiming, ToolModelContentPart } from \"assistant-stream\";\nimport type { CompleteAttachment } from \"./attachment\";\n\nexport type { ToolCallTiming, ToolModelContentPart };\n\nexport type PartProviderMetadata = {\n  readonly [providerName: string]: ReadonlyJSONObject;\n};\n\nexport type TextMessagePart = {\n  readonly type: \"text\";\n  readonly text: string;\n  readonly status?: MessagePartStreamStatus;\n  readonly providerMetadata?: PartProviderMetadata;\n  readonly parentId?: string;\n};\n\nexport type ReasoningMessagePart = {\n  readonly type: \"reasoning\";\n  readonly text: string;\n  readonly status?: MessagePartStreamStatus;\n  readonly unstable_summary?: string;\n  readonly providerMetadata?: PartProviderMetadata;\n  readonly parentId?: string;\n};\n\nexport type SourceProviderMetadata = PartProviderMetadata;\n\nexport type SourceMessagePart =\n  | {\n      readonly type: \"source\";\n      readonly sourceType: \"url\";\n      readonly id: string;\n      readonly url: string;\n      readonly title?: string;\n      readonly providerMetadata?: SourceProviderMetadata;\n      readonly parentId?: string;\n    }\n  | {\n      readonly type: \"source\";\n      readonly sourceType: \"document\";\n      readonly id: string;\n      readonly url?: undefined;\n      readonly title: string;\n      readonly mediaType: string;\n      readonly filename?: string;\n      readonly providerMetadata?: SourceProviderMetadata;\n      readonly parentId?: string;\n    };\n\nexport type ImageMessagePart = {\n  readonly type: \"image\";\n  readonly image: string;\n  readonly filename?: string;\n  readonly providerMetadata?: PartProviderMetadata;\n};\n\nexport type FileMessagePart = {\n  readonly type: \"file\";\n  readonly filename?: string;\n  readonly data: string;\n  readonly mimeType: string;\n  /** How `data` goes on the wire: a url or id reference; omitted = inferred (http(s) → url, else base64). \"url\" is honored by the LangChain-family, A2A, AG-UI, and Google ADK runtimes; \"id\" by the LangChain family only. */\n  readonly sourceType?: \"url\" | \"id\";\n  readonly providerMetadata?: PartProviderMetadata;\n  readonly parentId?: string;\n};\n\n/**\n * @deprecated Use {@link FileMessagePart} with an `audio/*` mime type. `file`\n * is the carrier for every non-image binary modality: it is a member of both\n * the user and assistant unions, carries a filename, and can declare how its\n * payload goes on the wire, none of which this shape can express. The payload\n * form a `file` part needs is still adapter specific; see the Part Types\n * section of the message primitive docs. Honored everywhere it is accepted; it\n * will not gain fields.\n */\nexport type Unstable_AudioMessagePart = {\n  readonly type: \"audio\";\n  readonly audio: {\n    readonly data: string;\n    readonly format: \"mp3\" | \"wav\";\n  };\n};\n\nexport type DataMessagePart<T = any> = {\n  readonly type: \"data\";\n  readonly name: string;\n  readonly data: T;\n};\n\n/**\n * A JSON spec describing a tree of UI components to render.\n *\n * The agent emits a {@link GenerativeUIMessagePart} containing this spec, and\n * the consumer-provided component allowlist is used to resolve `component`\n * names. Any component referenced that is not present in the allowlist is\n * rejected with a typed error — the allowlist is the security boundary in the\n * default same-realm rendering path.\n */\nexport type GenerativeUINode =\n  | string\n  | {\n      /** Allowlisted component name (resolved against the consumer registry). */\n      readonly component: string;\n      /** Props passed to the resolved component (must be JSON-serializable). */\n      readonly props?: Record<string, unknown>;\n      /** Optional children — strings render as text, objects recurse. */\n      readonly children?: readonly GenerativeUINode[];\n      /** Optional stable key for React reconciliation. */\n      readonly key?: string;\n    };\n\n/**\n * The root spec for a generative UI tree.\n */\nexport type GenerativeUISpec = {\n  /** Root node(s) to render. */\n  readonly root: GenerativeUINode | readonly GenerativeUINode[];\n};\n\n/**\n * A message part that carries a JSON spec describing UI to render.\n *\n * Render with `<MessagePrimitive.GenerativeUI components={...} />`. The\n * primitive resolves component names against the consumer-provided allowlist\n * — any unknown name throws a typed error rather than rendering. Stream-\n * friendly: a partially-streamed spec renders progressively.\n */\nexport type GenerativeUIMessagePart = {\n  readonly type: \"generative-ui\";\n  /** The JSON spec describing the UI tree. */\n  readonly spec: GenerativeUISpec;\n  /** Optional id (useful for replays / stable keys). */\n  readonly id?: string;\n  readonly parentId?: string;\n};\n\nexport type McpAppMetadata = {\n  readonly resourceUri: string;\n  readonly mimeType?: string;\n  readonly visibility?: readonly (\"model\" | \"app\")[];\n  /** Routable server identity emitted by the agent stack when multiple MCP servers back one agent; for @ag-ui/mcp-apps-middleware this is the configured serverId, falling back to its serverHash. */\n  readonly serverId?: string;\n};\n\nexport const MCP_APP_URI_SCHEME = \"ui://\";\n\nexport const isMcpAppUri = (uri: string | undefined): boolean =>\n  !!uri?.startsWith(MCP_APP_URI_SCHEME);\n\nexport type ToolCallMessagePartMcpMetadata = {\n  readonly app?: McpAppMetadata;\n};\n\nexport type ToolApprovalOptionKind =\n  | \"allow-once\"\n  | \"allow-always\"\n  | \"reject-once\"\n  | \"reject-always\";\n\nexport type ToolApprovalOption = {\n  /** Opaque, host-defined identifier. Scope semantics (session vs project vs global) belong to the option supplier. */\n  readonly id: string;\n  /**\n   * Decision class. Drives approved-resolution and default rendering.\n   * Open union: `_`-prefixed custom kinds are never auto-resolved; they must\n   * be answered with an explicit `approved` value (optionally alongside the\n   * `optionId`), which is what the default kit sends when one is chosen.\n   */\n  readonly kind: ToolApprovalOptionKind | (string & {});\n  /** Human label. Renderers supply defaults per kind when omitted. */\n  readonly label?: string;\n  readonly description?: string;\n  /** Patterns or rules this option would persist, shown before the user commits. Supplied by the host; never derived by the library. */\n  readonly grants?: readonly string[];\n  /** Opt-in confirmation step before this option resolves. */\n  readonly confirm?: boolean | { title?: string; description?: string };\n};\n\nexport type ToolApprovalResponse =\n  | { readonly approved: boolean; readonly reason?: string }\n  | { readonly optionId: string; readonly reason?: string }\n  | {\n      readonly approved: boolean;\n      readonly optionId: string;\n      readonly reason?: string;\n    };\n\nexport type ToolCallMessagePart<\n  TArgs = ReadonlyJSONObject,\n  TResult = unknown,\n> = {\n  /** Identifies this part as a tool call. */\n  readonly type: \"tool-call\";\n  /** Stable identifier for this invocation of the tool. */\n  readonly toolCallId: string;\n  /** Name of the tool requested by the model. */\n  readonly toolName: string;\n  /**\n   * Arguments supplied by the model. During streaming this is a partial parse:\n   * fields may be missing or incomplete. From a tool-call renderer, use\n   * `useToolArgsStatus` to detect which fields are still arriving.\n   */\n  readonly args: TArgs;\n  /** Result returned by the tool, if it has completed. */\n  readonly result?: TResult | undefined;\n  /** Whether the result represents a tool execution error. */\n  readonly isError?: boolean | undefined;\n  /** Raw JSON argument text streamed by the model. */\n  readonly argsText: string;\n  /** UI-only artifact associated with the tool result. */\n  readonly artifact?: unknown;\n  /** Wall-clock timing for this call, when the runtime or host tracks it. */\n  readonly timing?: ToolCallTiming;\n  /** MCP app metadata associated with this tool call, when present. */\n  readonly mcp?: ToolCallMessagePartMcpMetadata;\n  /** Provider metadata associated with this tool call, when present. */\n  readonly providerMetadata?: PartProviderMetadata;\n  /** Content returned to the model for this tool result. */\n  readonly modelContent?: readonly ToolModelContentPart[] | undefined;\n  /** Human-input request that must be resolved before the run can continue. */\n  readonly interrupt?: { type: \"human\"; payload: unknown };\n  /** Server-side approval gate. `respondToApproval` may only be called while `approved` is undefined and no `resolution` is recorded. */\n  readonly approval?: {\n    readonly id: string;\n    readonly approved?: boolean;\n    readonly reason?: string;\n    readonly isAutomatic?: boolean;\n    /** Available decisions for this call. Absent: a plain allow / deny pair. */\n    readonly options?: readonly ToolApprovalOption[];\n    /** The option chosen at resolution, when options were present. */\n    readonly optionId?: string;\n    /** Terminal non-decision state: the request was cancelled or expired without a user decision. Set by the host. */\n    readonly resolution?: \"cancelled\" | \"expired\";\n  };\n  /** Parent message-part ID when this part belongs to a nested structure. */\n  readonly parentId?: string;\n  /**\n   * Nested thread messages produced by this tool call, for example a sub-agent\n   * conversation.\n   */\n  readonly messages?: readonly ThreadMessage[];\n};\n\nexport type ThreadUserMessagePart =\n  | TextMessagePart\n  | ImageMessagePart\n  | FileMessagePart\n  | DataMessagePart\n  | Unstable_AudioMessagePart;\n\nexport type ThreadAssistantMessagePart =\n  | TextMessagePart\n  | ReasoningMessagePart\n  | ToolCallMessagePart\n  | SourceMessagePart\n  | FileMessagePart\n  | ImageMessagePart\n  | DataMessagePart\n  | GenerativeUIMessagePart;\n\nexport type MessagePartStatus =\n  | {\n      readonly type: \"running\";\n    }\n  | {\n      readonly type: \"complete\";\n    }\n  | {\n      readonly type: \"incomplete\";\n      readonly reason:\n        | \"cancelled\"\n        | \"length\"\n        | \"content-filter\"\n        | \"other\"\n        | \"error\";\n      readonly error?: unknown;\n    };\n\nexport type MessagePartStreamStatus =\n  | {\n      readonly type: \"running\";\n    }\n  | {\n      readonly type: \"complete\";\n    }\n  | {\n      readonly type: \"incomplete\";\n      readonly reason:\n        | \"cancelled\"\n        | \"length\"\n        | \"content-filter\"\n        | \"other\"\n        | \"error\";\n    };\n\nexport type ToolCallMessagePartStatus =\n  | {\n      /** The tool call is waiting for UI or human input before continuing. */\n      readonly type: \"requires-action\";\n      /** Reason the tool call requires action. */\n      readonly reason: \"tool-calls\" | \"interrupt\";\n    }\n  | {\n      readonly type: \"incomplete\";\n      readonly reason: \"tool-calls\";\n      readonly error?: ReadonlyJSONValue;\n    }\n  | MessagePartStatus;\n\nexport type MessageStatus =\n  | {\n      readonly type: \"running\";\n    }\n  | {\n      readonly type: \"requires-action\";\n      readonly reason: \"tool-calls\" | \"interrupt\";\n    }\n  | {\n      readonly type: \"complete\";\n      readonly reason: \"stop\" | \"unknown\";\n    }\n  | {\n      readonly type: \"incomplete\";\n      readonly reason:\n        | \"cancelled\"\n        | \"tool-calls\"\n        | \"length\"\n        | \"content-filter\"\n        | \"other\"\n        | \"error\";\n      readonly error?: ReadonlyJSONValue;\n    };\n\nexport type MessageTiming = {\n  readonly streamStartTime: number;\n  readonly firstTokenTime?: number;\n  readonly totalStreamTime?: number;\n  readonly tokenCount?: number;\n  readonly tokensPerSecond?: number;\n  readonly totalChunks: number;\n  readonly toolCallCount: number;\n};\n\nexport type ThreadStep = {\n  readonly messageId?: string;\n  readonly usage?:\n    | {\n        readonly inputTokens: number;\n        readonly outputTokens: number;\n      }\n    | undefined;\n};\n\ntype MessageCommonProps = {\n  readonly id: string;\n  readonly createdAt: Date;\n};\n\nexport type ThreadSystemMessage = MessageCommonProps & {\n  readonly role: \"system\";\n  readonly content: readonly [TextMessagePart];\n  readonly metadata: {\n    readonly unstable_state?: undefined;\n    readonly unstable_annotations?: undefined;\n    readonly unstable_data?: undefined;\n    readonly steps?: undefined;\n    readonly submittedFeedback?: undefined;\n    readonly timing?: undefined;\n    readonly custom: Record<string, unknown>;\n  };\n};\n\nexport type ThreadUserMessage = MessageCommonProps & {\n  readonly role: \"user\";\n  readonly content: readonly ThreadUserMessagePart[];\n  readonly attachments: readonly CompleteAttachment[];\n  readonly metadata: {\n    readonly unstable_state?: undefined;\n    readonly unstable_annotations?: undefined;\n    readonly unstable_data?: undefined;\n    readonly steps?: undefined;\n    readonly submittedFeedback?: undefined;\n    readonly timing?: undefined;\n    readonly isOptimistic?: boolean;\n    readonly custom: Record<string, unknown>;\n  };\n};\n\nexport type ThreadAssistantMessage = MessageCommonProps & {\n  readonly role: \"assistant\";\n  readonly content: readonly ThreadAssistantMessagePart[];\n  readonly status: MessageStatus;\n  readonly metadata: {\n    readonly unstable_state: ReadonlyJSONValue;\n    readonly unstable_annotations: readonly ReadonlyJSONValue[];\n    readonly unstable_data: readonly ReadonlyJSONValue[];\n    readonly steps: readonly ThreadStep[];\n    readonly submittedFeedback?: { readonly type: \"positive\" | \"negative\" };\n    readonly timing?: MessageTiming;\n    /**\n     * Marks a client-side optimistic placeholder. Such messages are evicted\n     * once off the head branch and are never persisted.\n     */\n    readonly isOptimistic?: boolean;\n    readonly custom: Record<string, unknown>;\n  };\n};\n\ntype BaseThreadMessage = {\n  readonly status?: ThreadAssistantMessage[\"status\"];\n  readonly metadata: {\n    readonly unstable_state?: ReadonlyJSONValue;\n    readonly unstable_annotations?: readonly ReadonlyJSONValue[];\n    readonly unstable_data?: readonly ReadonlyJSONValue[];\n    readonly steps?: readonly ThreadStep[];\n    readonly submittedFeedback?: { readonly type: \"positive\" | \"negative\" };\n    readonly timing?: MessageTiming;\n    readonly isOptimistic?: boolean;\n    readonly custom: Record<string, unknown>;\n  };\n  readonly attachments?: ThreadUserMessage[\"attachments\"];\n};\n\nexport type ThreadMessage = BaseThreadMessage &\n  (ThreadSystemMessage | ThreadUserMessage | ThreadAssistantMessage);\n\nexport type MessageRole = ThreadMessage[\"role\"];\n\nexport type RunConfig = {\n  readonly custom?: Record<string, unknown>;\n};\n\nexport type AppendMessage = Omit<ThreadMessage, \"id\"> & {\n  parentId: string | null;\n\n  /** The ID of the message that was edited or undefined. */\n  sourceId: string | null;\n  runConfig: RunConfig | undefined;\n  startRun?: boolean | undefined;\n  /** Process this message next; only meaningful for queue-capable runtimes. */\n  steer?: boolean | undefined;\n};\n"],"mappings":";AAsJA,MAAaiD,qBAAqB;AAElC,MAAaC,eAAeC,QAC1B,CAAC,CAACA,KAAKC,WAAWH,kBAAkB"}
+{"version":3,"file":"message.js","names":["ReadonlyJSONObject","ReadonlyJSONValue","ToolCallTiming","ToolModelContentPart","CompleteAttachment","PartProviderMetadata","providerName","TextMessagePart","type","text","status","MessagePartStreamStatus","providerMetadata","parentId","ReasoningMessagePart","unstable_summary","SourceProviderMetadata","SourceMessagePart","sourceType","id","url","title","mediaType","filename","ImageMessagePart","image","FileMessagePart","data","mimeType","Unstable_AudioMessagePart","audio","format","DataMessagePart","name","T","GenerativeUINode","component","props","Record","children","key","GenerativeUISpec","root","GenerativeUIMessagePart","spec","McpAppMetadata","resourceUri","visibility","serverId","MCP_APP_URI_SCHEME","isMcpAppUri","uri","startsWith","ToolCallMessagePartMcpMetadata","app","ToolApprovalOptionKind","ToolApprovalOption","kind","label","description","grants","confirm","ToolApprovalDisplay","toolApprovalAcceptsText","approval","display","allowFreeform","ToolApprovalResponse","approved","reason","optionId","ToolCallMessagePart","toolCallId","toolName","args","TArgs","result","TResult","isError","argsText","artifact","timing","mcp","modelContent","interrupt","payload","prompt","isAutomatic","options","resolution","messages","ThreadMessage","ThreadUserMessagePart","ThreadAssistantMessagePart","MessagePartStatus","error","ToolCallMessagePartStatus","MessageStatus","MessageTiming","streamStartTime","firstTokenTime","totalStreamTime","tokenCount","tokensPerSecond","totalChunks","toolCallCount","ThreadStep","messageId","usage","inputTokens","outputTokens","MessageCommonProps","createdAt","Date","ThreadSystemMessage","role","content","metadata","unstable_state","unstable_annotations","unstable_data","steps","submittedFeedback","custom","ThreadUserMessage","attachments","isOptimistic","ThreadAssistantMessage","BaseThreadMessage","MessageRole","RunConfig","AppendMessage","Omit","sourceId","runConfig","startRun","steer"],"sources":["../../src/types/message.ts"],"sourcesContent":["import type {\n  ReadonlyJSONObject,\n  ReadonlyJSONValue,\n} from \"assistant-stream/utils\";\nimport type { ToolCallTiming, ToolModelContentPart } from \"assistant-stream\";\nimport type { CompleteAttachment } from \"./attachment\";\n\nexport type { ToolCallTiming, ToolModelContentPart };\n\nexport type PartProviderMetadata = {\n  readonly [providerName: string]: ReadonlyJSONObject;\n};\n\nexport type TextMessagePart = {\n  readonly type: \"text\";\n  readonly text: string;\n  readonly status?: MessagePartStreamStatus;\n  readonly providerMetadata?: PartProviderMetadata;\n  readonly parentId?: string;\n};\n\nexport type ReasoningMessagePart = {\n  readonly type: \"reasoning\";\n  readonly text: string;\n  readonly status?: MessagePartStreamStatus;\n  readonly unstable_summary?: string;\n  readonly providerMetadata?: PartProviderMetadata;\n  readonly parentId?: string;\n};\n\nexport type SourceProviderMetadata = PartProviderMetadata;\n\nexport type SourceMessagePart =\n  | {\n      readonly type: \"source\";\n      readonly sourceType: \"url\";\n      readonly id: string;\n      readonly url: string;\n      readonly title?: string;\n      readonly providerMetadata?: SourceProviderMetadata;\n      readonly parentId?: string;\n    }\n  | {\n      readonly type: \"source\";\n      readonly sourceType: \"document\";\n      readonly id: string;\n      readonly url?: undefined;\n      readonly title: string;\n      readonly mediaType: string;\n      readonly filename?: string;\n      readonly providerMetadata?: SourceProviderMetadata;\n      readonly parentId?: string;\n    };\n\nexport type ImageMessagePart = {\n  readonly type: \"image\";\n  readonly image: string;\n  readonly filename?: string;\n  readonly providerMetadata?: PartProviderMetadata;\n};\n\nexport type FileMessagePart = {\n  readonly type: \"file\";\n  readonly filename?: string;\n  readonly data: string;\n  readonly mimeType: string;\n  /** How `data` goes on the wire: a url or id reference; omitted = inferred (http(s) → url, else base64). \"url\" is honored by the LangChain-family, A2A, AG-UI, and Google ADK runtimes; \"id\" by the LangChain family only. */\n  readonly sourceType?: \"url\" | \"id\";\n  readonly providerMetadata?: PartProviderMetadata;\n  readonly parentId?: string;\n};\n\n/**\n * @deprecated Use {@link FileMessagePart} with an `audio/*` mime type. `file`\n * is the carrier for every non-image binary modality: it is a member of both\n * the user and assistant unions, carries a filename, and can declare how its\n * payload goes on the wire, none of which this shape can express. The payload\n * form a `file` part needs is still adapter specific; see the Part Types\n * section of the message primitive docs. Honored everywhere it is accepted; it\n * will not gain fields.\n */\nexport type Unstable_AudioMessagePart = {\n  readonly type: \"audio\";\n  readonly audio: {\n    readonly data: string;\n    readonly format: \"mp3\" | \"wav\";\n  };\n};\n\nexport type DataMessagePart<T = any> = {\n  readonly type: \"data\";\n  readonly name: string;\n  readonly data: T;\n};\n\n/**\n * A JSON spec describing a tree of UI components to render.\n *\n * The agent emits a {@link GenerativeUIMessagePart} containing this spec, and\n * the consumer-provided component allowlist is used to resolve `component`\n * names. Any component referenced that is not present in the allowlist is\n * rejected with a typed error — the allowlist is the security boundary in the\n * default same-realm rendering path.\n */\nexport type GenerativeUINode =\n  | string\n  | {\n      /** Allowlisted component name (resolved against the consumer registry). */\n      readonly component: string;\n      /** Props passed to the resolved component (must be JSON-serializable). */\n      readonly props?: Record<string, unknown>;\n      /** Optional children — strings render as text, objects recurse. */\n      readonly children?: readonly GenerativeUINode[];\n      /** Optional stable key for React reconciliation. */\n      readonly key?: string;\n    };\n\n/**\n * The root spec for a generative UI tree.\n */\nexport type GenerativeUISpec = {\n  /** Root node(s) to render. */\n  readonly root: GenerativeUINode | readonly GenerativeUINode[];\n};\n\n/**\n * A message part that carries a JSON spec describing UI to render.\n *\n * Render with `<MessagePrimitive.GenerativeUI components={...} />`. The\n * primitive resolves component names against the consumer-provided allowlist\n * — any unknown name throws a typed error rather than rendering. Stream-\n * friendly: a partially-streamed spec renders progressively.\n */\nexport type GenerativeUIMessagePart = {\n  readonly type: \"generative-ui\";\n  /** The JSON spec describing the UI tree. */\n  readonly spec: GenerativeUISpec;\n  /** Optional id (useful for replays / stable keys). */\n  readonly id?: string;\n  readonly parentId?: string;\n};\n\nexport type McpAppMetadata = {\n  readonly resourceUri: string;\n  readonly mimeType?: string;\n  readonly visibility?: readonly (\"model\" | \"app\")[];\n  /** Routable server identity emitted by the agent stack when multiple MCP servers back one agent; for @ag-ui/mcp-apps-middleware this is the configured serverId, falling back to its serverHash. */\n  readonly serverId?: string;\n};\n\nexport const MCP_APP_URI_SCHEME = \"ui://\";\n\nexport const isMcpAppUri = (uri: string | undefined): boolean =>\n  !!uri?.startsWith(MCP_APP_URI_SCHEME);\n\nexport type ToolCallMessagePartMcpMetadata = {\n  readonly app?: McpAppMetadata;\n};\n\nexport type ToolApprovalOptionKind =\n  | \"allow-once\"\n  | \"allow-always\"\n  | \"reject-once\"\n  | \"reject-always\";\n\nexport type ToolApprovalOption = {\n  /** Opaque, host-defined identifier. Scope semantics (session vs project vs global) belong to the option supplier. */\n  readonly id: string;\n  /**\n   * Decision class. Drives approved-resolution and default rendering.\n   * Open union: `_`-prefixed custom kinds are never auto-resolved; they must\n   * be answered with an explicit `approved` value (optionally alongside the\n   * `optionId`), which is what the default kit sends when one is chosen.\n   */\n  readonly kind: ToolApprovalOptionKind | (string & {});\n  /** Human label. Renderers supply defaults per kind when omitted. */\n  readonly label?: string;\n  readonly description?: string;\n  /** Patterns or rules this option would persist, shown before the user commits. Supplied by the host; never derived by the library. */\n  readonly grants?: readonly string[];\n  /** Opt-in confirmation step before this option resolves. */\n  readonly confirm?: boolean | { title?: string; description?: string };\n};\n\n/**\n * How an approval request should be presented, and which answers it accepts.\n * Absent: `\"decision\"`.\n *\n * The approval seam carries a host-owned request addressed by its own id and\n * resolved once; a request wanting an answer these modes cannot express stays\n * on the `interrupt` seam, which hands the tool an arbitrary payload instead.\n * Unlike {@link ToolApprovalOptionKind} the set is closed, because a renderer\n * that cannot cover every mode exhaustively is back to guessing the affordance.\n */\nexport type ToolApprovalDisplay = \"decision\" | \"select\" | \"text\";\n\n/**\n * Whether the request asks for a free-form answer, on its own or alongside its\n * options. Renderers read this to decide whether to offer a text affordance,\n * and the runtime reads it to reject a `text` response the host cannot record.\n */\nexport const toolApprovalAcceptsText = (approval: {\n  readonly display?: ToolApprovalDisplay;\n  readonly allowFreeform?: boolean;\n}): boolean => approval.display === \"text\" || approval.allowFreeform === true;\n\nexport type ToolApprovalResponse =\n  | {\n      readonly approved: boolean;\n      readonly text?: string;\n      readonly reason?: string;\n    }\n  | {\n      readonly optionId: string;\n      readonly text?: string;\n      readonly reason?: string;\n    }\n  | {\n      readonly approved: boolean;\n      readonly optionId: string;\n      readonly text?: string;\n      readonly reason?: string;\n    }\n  | {\n      /** Answer to a request that asks a question rather than for a decision. */\n      readonly text: string;\n      readonly reason?: string;\n    };\n\nexport type ToolCallMessagePart<\n  TArgs = ReadonlyJSONObject,\n  TResult = unknown,\n> = {\n  /** Identifies this part as a tool call. */\n  readonly type: \"tool-call\";\n  /** Stable identifier for this invocation of the tool. */\n  readonly toolCallId: string;\n  /** Name of the tool requested by the model. */\n  readonly toolName: string;\n  /**\n   * Arguments supplied by the model. During streaming this is a partial parse:\n   * fields may be missing or incomplete. From a tool-call renderer, use\n   * `useToolArgsStatus` to detect which fields are still arriving.\n   */\n  readonly args: TArgs;\n  /** Result returned by the tool, if it has completed. */\n  readonly result?: TResult | undefined;\n  /** Whether the result represents a tool execution error. */\n  readonly isError?: boolean | undefined;\n  /** Raw JSON argument text streamed by the model. */\n  readonly argsText: string;\n  /** UI-only artifact associated with the tool result. */\n  readonly artifact?: unknown;\n  /** Wall-clock timing for this call, when the runtime or host tracks it. */\n  readonly timing?: ToolCallTiming;\n  /** MCP app metadata associated with this tool call, when present. */\n  readonly mcp?: ToolCallMessagePartMcpMetadata;\n  /** Provider metadata associated with this tool call, when present. */\n  readonly providerMetadata?: PartProviderMetadata;\n  /** Content returned to the model for this tool result. */\n  readonly modelContent?: readonly ToolModelContentPart[] | undefined;\n  /** Human-input request that must be resolved before the run can continue. */\n  readonly interrupt?: { type: \"human\"; payload: unknown };\n  /** Server-side approval gate. `respondToApproval` may only be called while `approved` is undefined and no `resolution` is recorded. */\n  readonly approval?: {\n    readonly id: string;\n    /**\n     * The question put to the user. A request that asks for something other\n     * than permission carries it here, so a renderer can show the question\n     * rather than inferring a decision from the tool name.\n     */\n    readonly prompt?: string;\n    /** How the request should be presented. Absent: a plain decision. */\n    readonly display?: ToolApprovalDisplay;\n    /** Whether a free-form answer is accepted alongside the options. */\n    readonly allowFreeform?: boolean;\n    readonly approved?: boolean;\n    readonly reason?: string;\n    readonly isAutomatic?: boolean;\n    /** Available decisions for this call. Absent: a plain allow / deny pair. */\n    readonly options?: readonly ToolApprovalOption[];\n    /** The option chosen at resolution, when options were present. */\n    readonly optionId?: string;\n    /** The free-form answer recorded at resolution, when one was given. */\n    readonly text?: string;\n    /** Terminal non-decision state: the request was cancelled or expired without a user decision. Set by the host. */\n    readonly resolution?: \"cancelled\" | \"expired\";\n  };\n  /** Parent message-part ID when this part belongs to a nested structure. */\n  readonly parentId?: string;\n  /**\n   * Nested thread messages produced by this tool call, for example a sub-agent\n   * conversation.\n   */\n  readonly messages?: readonly ThreadMessage[];\n};\n\nexport type ThreadUserMessagePart =\n  | TextMessagePart\n  | ImageMessagePart\n  | FileMessagePart\n  | DataMessagePart\n  | Unstable_AudioMessagePart;\n\nexport type ThreadAssistantMessagePart =\n  | TextMessagePart\n  | ReasoningMessagePart\n  | ToolCallMessagePart\n  | SourceMessagePart\n  | FileMessagePart\n  | ImageMessagePart\n  | DataMessagePart\n  | GenerativeUIMessagePart;\n\nexport type MessagePartStatus =\n  | {\n      readonly type: \"running\";\n    }\n  | {\n      readonly type: \"complete\";\n    }\n  | {\n      readonly type: \"incomplete\";\n      readonly reason:\n        | \"cancelled\"\n        | \"length\"\n        | \"content-filter\"\n        | \"other\"\n        | \"error\";\n      readonly error?: unknown;\n    };\n\nexport type MessagePartStreamStatus =\n  | {\n      readonly type: \"running\";\n    }\n  | {\n      readonly type: \"complete\";\n    }\n  | {\n      readonly type: \"incomplete\";\n      readonly reason:\n        | \"cancelled\"\n        | \"length\"\n        | \"content-filter\"\n        | \"other\"\n        | \"error\";\n    };\n\nexport type ToolCallMessagePartStatus =\n  | {\n      /** The tool call is waiting for UI or human input before continuing. */\n      readonly type: \"requires-action\";\n      /** Reason the tool call requires action. */\n      readonly reason: \"tool-calls\" | \"interrupt\";\n    }\n  | {\n      readonly type: \"incomplete\";\n      readonly reason: \"tool-calls\";\n      readonly error?: ReadonlyJSONValue;\n    }\n  | MessagePartStatus;\n\nexport type MessageStatus =\n  | {\n      readonly type: \"running\";\n    }\n  | {\n      readonly type: \"requires-action\";\n      readonly reason: \"tool-calls\" | \"interrupt\";\n    }\n  | {\n      readonly type: \"complete\";\n      readonly reason: \"stop\" | \"unknown\";\n    }\n  | {\n      readonly type: \"incomplete\";\n      readonly reason:\n        | \"cancelled\"\n        | \"tool-calls\"\n        | \"length\"\n        | \"content-filter\"\n        | \"other\"\n        | \"error\";\n      readonly error?: ReadonlyJSONValue;\n    };\n\nexport type MessageTiming = {\n  readonly streamStartTime: number;\n  readonly firstTokenTime?: number;\n  readonly totalStreamTime?: number;\n  readonly tokenCount?: number;\n  readonly tokensPerSecond?: number;\n  readonly totalChunks: number;\n  readonly toolCallCount: number;\n};\n\nexport type ThreadStep = {\n  readonly messageId?: string;\n  readonly usage?:\n    | {\n        readonly inputTokens: number;\n        readonly outputTokens: number;\n      }\n    | undefined;\n};\n\ntype MessageCommonProps = {\n  readonly id: string;\n  readonly createdAt: Date;\n};\n\nexport type ThreadSystemMessage = MessageCommonProps & {\n  readonly role: \"system\";\n  readonly content: readonly [TextMessagePart];\n  readonly metadata: {\n    readonly unstable_state?: undefined;\n    readonly unstable_annotations?: undefined;\n    readonly unstable_data?: undefined;\n    readonly steps?: undefined;\n    readonly submittedFeedback?: undefined;\n    readonly timing?: undefined;\n    readonly custom: Record<string, unknown>;\n  };\n};\n\nexport type ThreadUserMessage = MessageCommonProps & {\n  readonly role: \"user\";\n  readonly content: readonly ThreadUserMessagePart[];\n  readonly attachments: readonly CompleteAttachment[];\n  readonly metadata: {\n    readonly unstable_state?: undefined;\n    readonly unstable_annotations?: undefined;\n    readonly unstable_data?: undefined;\n    readonly steps?: undefined;\n    readonly submittedFeedback?: undefined;\n    readonly timing?: undefined;\n    readonly isOptimistic?: boolean;\n    readonly custom: Record<string, unknown>;\n  };\n};\n\nexport type ThreadAssistantMessage = MessageCommonProps & {\n  readonly role: \"assistant\";\n  readonly content: readonly ThreadAssistantMessagePart[];\n  readonly status: MessageStatus;\n  readonly metadata: {\n    readonly unstable_state: ReadonlyJSONValue;\n    readonly unstable_annotations: readonly ReadonlyJSONValue[];\n    readonly unstable_data: readonly ReadonlyJSONValue[];\n    readonly steps: readonly ThreadStep[];\n    readonly submittedFeedback?: { readonly type: \"positive\" | \"negative\" };\n    readonly timing?: MessageTiming;\n    /**\n     * Marks a client-side optimistic placeholder. Such messages are evicted\n     * once off the head branch and are never persisted.\n     */\n    readonly isOptimistic?: boolean;\n    readonly custom: Record<string, unknown>;\n  };\n};\n\ntype BaseThreadMessage = {\n  readonly status?: ThreadAssistantMessage[\"status\"];\n  readonly metadata: {\n    readonly unstable_state?: ReadonlyJSONValue;\n    readonly unstable_annotations?: readonly ReadonlyJSONValue[];\n    readonly unstable_data?: readonly ReadonlyJSONValue[];\n    readonly steps?: readonly ThreadStep[];\n    readonly submittedFeedback?: { readonly type: \"positive\" | \"negative\" };\n    readonly timing?: MessageTiming;\n    readonly isOptimistic?: boolean;\n    readonly custom: Record<string, unknown>;\n  };\n  readonly attachments?: ThreadUserMessage[\"attachments\"];\n};\n\nexport type ThreadMessage = BaseThreadMessage &\n  (ThreadSystemMessage | ThreadUserMessage | ThreadAssistantMessage);\n\nexport type MessageRole = ThreadMessage[\"role\"];\n\nexport type RunConfig = {\n  readonly custom?: Record<string, unknown>;\n};\n\nexport type AppendMessage = Omit<ThreadMessage, \"id\"> & {\n  parentId: string | null;\n\n  /** The ID of the message that was edited or undefined. */\n  sourceId: string | null;\n  runConfig: RunConfig | undefined;\n  startRun?: boolean | undefined;\n  /** Process this message next; only meaningful for queue-capable runtimes. */\n  steer?: boolean | undefined;\n};\n"],"mappings":";AAsJA,MAAaiD,qBAAqB;AAElC,MAAaC,eAAeC,QAC1B,CAAC,CAACA,KAAKC,WAAWH,kBAAkB;;;;;;AAgDtC,MAAac,2BAA2BC,aAGzBA,SAASC,YAAY,UAAUD,SAASE,kBAAkB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/core",
-  "version": "0.3.16",
+  "version": "0.3.17",
   "description": "Framework-agnostic core runtime for assistant-ui",
   "keywords": [
     "assistant",
@@ -59,19 +59,18 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "assistant-stream": "^0.3.40",
+    "assistant-stream": "^0.3.41",
     "nanoid": "^6.0.1"
   },
   "optionalDevDependencies": {
     "@assistant-ui/x-generative-compiler": ">=0.0.3"
   },
   "peerDependencies": {
-    "@assistant-ui/store": "^0.3.0",
-    "@assistant-ui/tap": "^0.9.0",
+    "@assistant-ui/store": "^0.3.12",
+    "@assistant-ui/tap": "^0.9.16",
     "@types/react": "*",
     "react": "^18 || ^19",
-    "assistant-cloud": "^0.1.42",
-    "zustand": "^5.0.11"
+    "assistant-cloud": "^0.1.42"
   },
   "peerDependenciesMeta": {
     "@types/react": {
@@ -82,24 +81,20 @@
     },
     "react": {
       "optional": true
-    },
-    "zustand": {
-      "optional": true
     }
   },
   "devDependencies": {
-    "@assistant-ui/store": "0.3.11",
-    "@assistant-ui/tap": "0.9.15",
-    "@assistant-ui/vite": "0.0.15",
-    "@assistant-ui/x-buildutils": "0.0.24",
-    "@testing-library/react": "^16.3.2",
+    "@assistant-ui/store": "0.3.12",
+    "@assistant-ui/tap": "0.9.16",
+    "@assistant-ui/vite": "0.0.16",
+    "@assistant-ui/x-buildutils": "0.0.25",
+    "@testing-library/react": "^16.3.3",
     "@types/react": "^19.2.18",
-    "assistant-cloud": "0.1.42",
+    "assistant-cloud": "0.1.43",
     "jsdom": "^30.0.1",
     "react": "^19.2.8",
     "react-dom": "^19.2.8",
-    "vitest": "^4.1.11",
-    "zustand": "^5.0.15"
+    "vitest": "^4.1.11"
   },
   "publishConfig": {
     "access": "public",

package/src/index.ts

@@ -22,6 +22,7 @@ export type {
   GenerativeUINode,
   GenerativeUISpec,
   Unstable_AudioMessagePart,
+  ToolApprovalDisplay,
   ToolApprovalOption,
   ToolApprovalOptionKind,
   ToolApprovalResponse,
@@ -50,7 +51,11 @@ export type {
   AppendMessage,
 } from "./types/message";
 
-export { MCP_APP_URI_SCHEME, isMcpAppUri } from "./types/message";
+export {
+  MCP_APP_URI_SCHEME,
+  isMcpAppUri,
+  toolApprovalAcceptsText,
+} from "./types/message";
 
 export type {
   Attachment,

package/src/internal.ts

@@ -77,6 +77,14 @@ export {
   createToolCallCancellationStub,
   scanPendingToolCalls,
 } from "./runtime/utils/pending-tool-calls";
+// Nested tool-call traversal, reused by framework adapters so the
+// ToolCallMessagePart.messages tree is walked one way.
+export {
+  iterateToolCallParts,
+  mapToolCallPartsDeep,
+  type ToolCallTreeEntry,
+  walkToolCallTree,
+} from "./runtime/utils/tool-call-tree";
 export {
   createAbortableThreadLoad,
   type AbortableThreadLoadPurpose,

package/src/model-context/frame/provider.test.ts

@@ -13,6 +13,7 @@ describe("AssistantFrameProvider", () => {
     origin: string,
     source: Window = parentWindow,
     id = "tool-call-1",
+    toolName = "sensitiveTool",
   ) => {
     messageHandler?.(
       new MessageEvent("message", {
@@ -21,7 +22,7 @@ describe("AssistantFrameProvider", () => {
           message: {
             type: "tool-call",
             id,
-            toolName: "sensitiveTool",
+            toolName,
             args: {},
           },
         },
@@ -284,6 +285,179 @@ describe("AssistantFrameProvider", () => {
     expect(toolResults).toHaveLength(1);
   });
 
+  it("aborts in-flight tool calls when their provider is removed", async () => {
+    let toolSignal: AbortSignal | undefined;
+    const execute = vi.fn(
+      async (_args: unknown, context: { abortSignal: AbortSignal }) => {
+        toolSignal = context.abortSignal;
+        await new Promise<never>((_resolve, reject) => {
+          context.abortSignal.addEventListener(
+            "abort",
+            () => reject(context.abortSignal.reason),
+            { once: true },
+          );
+        });
+      },
+    );
+    const removeProvider = AssistantFrameProvider.addModelContextProvider({
+      getModelContext: () => ({ tools: { sensitiveTool: { execute } } }),
+    });
+
+    dispatchToolCall(window.location.origin);
+    await vi.waitFor(() => expect(toolSignal).toBeDefined());
+
+    removeProvider();
+
+    expect(toolSignal?.aborted).toBe(true);
+    expect(parentWindow.postMessage).toHaveBeenCalledWith(
+      {
+        channel: FRAME_MESSAGE_CHANNEL,
+        message: {
+          type: "tool-result",
+          id: "tool-call-1",
+          error: "AssistantFrame tool provider has been removed",
+        },
+      },
+      { targetOrigin: window.location.origin },
+    );
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    const toolResults = vi
+      .mocked(parentWindow.postMessage)
+      .mock.calls.filter(
+        ([data]) =>
+          (data as { message?: { type?: string } }).message?.type ===
+          "tool-result",
+      );
+    expect(toolResults).toHaveLength(1);
+  });
+
+  it("keeps tool calls active while the same provider remains registered", async () => {
+    let toolSignal: AbortSignal | undefined;
+    const execute = vi.fn(
+      async (_args: unknown, context: { abortSignal: AbortSignal }) => {
+        toolSignal = context.abortSignal;
+        await new Promise<never>((_resolve, reject) => {
+          context.abortSignal.addEventListener(
+            "abort",
+            () => reject(context.abortSignal.reason),
+            { once: true },
+          );
+        });
+      },
+    );
+    const provider = {
+      getModelContext: () => ({ tools: { sensitiveTool: { execute } } }),
+    };
+    const removeFirst =
+      AssistantFrameProvider.addModelContextProvider(provider);
+    const removeSecond =
+      AssistantFrameProvider.addModelContextProvider(provider);
+
+    dispatchToolCall(window.location.origin);
+    await vi.waitFor(() => expect(toolSignal).toBeDefined());
+
+    removeFirst();
+    expect(toolSignal?.aborted).toBe(false);
+
+    removeSecond();
+    expect(toolSignal?.aborted).toBe(true);
+  });
+
+  it("cancels only calls owned by the removed provider", async () => {
+    const shadowedExecute = vi.fn(async () => "shadowed");
+    const removeShadowed = AssistantFrameProvider.addModelContextProvider({
+      getModelContext: () => ({
+        tools: { sensitiveTool: { execute: shadowedExecute } },
+      }),
+    });
+
+    let toolSignal: AbortSignal | undefined;
+    const execute = vi.fn(
+      async (_args: unknown, context: { abortSignal: AbortSignal }) => {
+        toolSignal = context.abortSignal;
+        await new Promise<never>((_resolve, reject) => {
+          context.abortSignal.addEventListener(
+            "abort",
+            () => reject(context.abortSignal.reason),
+            { once: true },
+          );
+        });
+      },
+    );
+    const removeOwner = AssistantFrameProvider.addModelContextProvider({
+      getModelContext: () => ({
+        tools: { sensitiveTool: { execute } },
+      }),
+    });
+
+    dispatchToolCall(window.location.origin);
+    await vi.waitFor(() => expect(toolSignal).toBeDefined());
+    expect(shadowedExecute).not.toHaveBeenCalled();
+
+    removeShadowed();
+    expect(toolSignal?.aborted).toBe(false);
+
+    removeOwner();
+    expect(toolSignal?.aborted).toBe(true);
+  });
+
+  it("keeps other providers' tool calls active when one is removed", async () => {
+    const signals = new Map<string, AbortSignal>();
+    const execute = vi.fn(
+      async (
+        _args: unknown,
+        context: { toolCallId: string; abortSignal: AbortSignal },
+      ) => {
+        signals.set(context.toolCallId, context.abortSignal);
+        await new Promise<never>((_resolve, reject) => {
+          context.abortSignal.addEventListener(
+            "abort",
+            () => reject(context.abortSignal.reason),
+            { once: true },
+          );
+        });
+      },
+    );
+    const removeFirst = AssistantFrameProvider.addModelContextProvider({
+      getModelContext: () => ({ tools: { firstTool: { execute } } }),
+    });
+    const removeSecond = AssistantFrameProvider.addModelContextProvider({
+      getModelContext: () => ({ tools: { secondTool: { execute } } }),
+    });
+
+    dispatchToolCall(
+      window.location.origin,
+      parentWindow,
+      "first-call",
+      "firstTool",
+    );
+    dispatchToolCall(
+      window.location.origin,
+      parentWindow,
+      "second-call",
+      "secondTool",
+    );
+    await vi.waitFor(() => expect(signals.size).toBe(2));
+
+    removeFirst();
+
+    expect(signals.get("first-call")?.aborted).toBe(true);
+    expect(signals.get("second-call")?.aborted).toBe(false);
+    const toolResults = vi
+      .mocked(parentWindow.postMessage)
+      .mock.calls.filter(
+        ([data]) =>
+          (data as { message?: { type?: string } }).message?.type ===
+          "tool-result",
+      );
+    expect(toolResults).toHaveLength(1);
+    expect(toolResults[0]?.[0]).toMatchObject({
+      message: { id: "first-call" },
+    });
+
+    removeSecond();
+  });
+
   it("upgrades a wildcard origin policy when a strict provider registers", async () => {
     AssistantFrameProvider.addModelContextProvider(
       { getModelContext: () => ({}) },
@@ -385,6 +559,48 @@ describe("AssistantFrameProvider", () => {
     ).not.toThrow();
   });
 
+  it("cancels reentrant tool calls when registration rolls back", async () => {
+    let toolSignal: AbortSignal | undefined;
+    const execute = vi.fn(
+      async (_args: unknown, context: { abortSignal: AbortSignal }) => {
+        toolSignal = context.abortSignal;
+        await new Promise<never>((_resolve, reject) => {
+          context.abortSignal.addEventListener(
+            "abort",
+            () => reject(context.abortSignal.reason),
+            { once: true },
+          );
+        });
+      },
+    );
+
+    expect(() =>
+      AssistantFrameProvider.addModelContextProvider({
+        getModelContext: () => ({
+          tools: { sensitiveTool: { execute } },
+        }),
+        subscribe: () => {
+          dispatchToolCall(window.location.origin);
+          throw new Error("subscribe failed");
+        },
+      }),
+    ).toThrow("subscribe failed");
+
+    expect(toolSignal?.aborted).toBe(true);
+    expect(parentWindow.postMessage).toHaveBeenCalledWith(
+      {
+        channel: FRAME_MESSAGE_CHANNEL,
+        message: {
+          type: "tool-result",
+          id: "tool-call-1",
+          error: "AssistantFrame tool provider has been removed",
+        },
+      },
+      { targetOrigin: window.location.origin },
+    );
+    await new Promise((resolve) => setTimeout(resolve, 0));
+  });
+
   it("keeps an existing registration when the same provider fails to register again", async () => {
     const execute = vi.fn(async () => "result");
     const firstUnsubscribe = vi.fn();