@jupyterlite/ai 0.17.0 → 0.19.0

package/src/chat-model.ts

@@ -26,6 +26,14 @@ import { IRenderMime } from '@jupyterlab/rendermime';
 
 import { Contents } from '@jupyterlab/services';
 
+import { AI_AVATAR } from '@jupyternaut/agent';
+
+import type {
+  IAgentManager,
+  IProviderRegistry,
+  ITokenUsage
+} from '@jupyternaut/agent';
+
 import { UUID } from '@lumino/coreutils';
 
 import { Debouncer } from '@lumino/polling';
@@ -34,9 +42,13 @@ import { ISignal, Signal } from '@lumino/signaling';
 
 import type { UserContent, ImagePart, FilePart, ModelMessage } from 'ai';
 
-import { AI_AVATAR } from './icons';
+import type { IAIChatModel, IAISettingsModel } from './tokens';
 
-import type { IAgentManager, IAISettingsModel, ITokenUsage } from './tokens';
+import {
+  modelSupportsAudio,
+  modelSupportsImages,
+  modelSupportsPdf
+} from '@jupyternaut/agent';
 
 /**
  * Tool call status types.
@@ -69,10 +81,6 @@ interface IToolExecutionContext {
    * The tool input (formatted).
    */
   input: string;
-  /**
-   * Optional approval ID if awaiting approval.
-   */
-  approvalId?: string;
   /**
    * Current status.
    */
@@ -91,7 +99,7 @@ interface IToolExecutionContext {
  * AI Chat Model implementation that provides chat functionality tool integration,
  * and MCP server support.
  */
-export class AIChatModel extends AbstractChatModel {
+export class AIChatModel extends AbstractChatModel implements IAIChatModel {
   /**
    * Constructs a new AIChatModel instance.
    * @param options Configuration options for the chat model
@@ -109,6 +117,7 @@ export class AIChatModel extends AbstractChatModel {
     this._user = options.user;
     this._agentManager = options.agentManager;
     this._contentsManager = options.contentsManager;
+    this._providerRegistry = options.providerRegistry;
 
     // Listen for agent events
     this._agentManager.agentEvent.connect(this._onAgentEvent, this);
@@ -116,6 +125,13 @@ export class AIChatModel extends AbstractChatModel {
     // Listen for settings changes to update chat behavior
     this._settingsModel.stateChanged.connect(this._onSettingsChanged, this);
 
+    // Rebuild history when the model changes
+    this._agentManager.activeProviderChanged.connect(
+      this._onModelChanged,
+      this
+    );
+    this._settingsModel.stateChanged.connect(this._onModelChanged, this);
+
     this._autosaveDebouncer = new Debouncer(this.save, 3000);
   }
 
@@ -139,7 +155,7 @@ export class AIChatModel extends AbstractChatModel {
   /**
    * A signal emitting when the chat name has changed.
    */
-  get nameChanged(): ISignal<AIChatModel, string> {
+  get nameChanged(): ISignal<IAIChatModel, string> {
     return this._nameChanged;
   }
 
@@ -160,7 +176,7 @@ export class AIChatModel extends AbstractChatModel {
   /**
    * A signal emitting when the chat title has changed.
    */
-  get titleChanged(): ISignal<AIChatModel, string | null> {
+  get titleChanged(): ISignal<IAIChatModel, string | null> {
     return this._titleChanged;
   }
 
@@ -171,6 +187,9 @@ export class AIChatModel extends AbstractChatModel {
     return this._autosave;
   }
   set autosave(value: boolean) {
+    if (value === this._autosave) {
+      return;
+    }
     this._autosave = value;
     this._autosaveChanged.emit(value);
     if (value) {
@@ -182,7 +201,6 @@ export class AIChatModel extends AbstractChatModel {
         this._autosaveDebouncer.invoke,
         this._autosaveDebouncer
       );
-      this._autosaveDebouncer.invoke();
     } else {
       this.messagesUpdated.disconnect(
         this._autosaveDebouncer.invoke,
@@ -193,12 +211,13 @@ export class AIChatModel extends AbstractChatModel {
         this._autosaveDebouncer
       );
     }
+    this._autosaveDebouncer.invoke();
   }
 
   /**
    * A signal emitting when the autosave flag changed.
    */
-  get autosaveChanged(): ISignal<AIChatModel, boolean> {
+  get autosaveChanged(): ISignal<IAIChatModel, boolean> {
     return this._autosaveChanged;
   }
 
@@ -217,7 +236,7 @@ export class AIChatModel extends AbstractChatModel {
   }
 
   /**
-   * Get the agent manager associated to the model.
+   * The agent manager used in the model.
    */
   get agentManager(): IAgentManager {
     return this._agentManager;
@@ -234,6 +253,7 @@ export class AIChatModel extends AbstractChatModel {
    * Dispose of the model.
    */
   dispose(): void {
+    this.stopStreaming();
     this.messagesUpdated.disconnect(
       this._autosaveDebouncer.invoke,
       this._autosaveDebouncer
@@ -253,7 +273,11 @@ export class AIChatModel extends AbstractChatModel {
       stopStreaming: () => this.stopStreaming(),
       clearMessages: () => this.clearMessages(),
       agentManager: this._agentManager,
-      addSystemMessage: (body: string) => this.addSystemMessage(body)
+      addSystemMessage: (body: string) => this._addSystemMessage(body),
+      removeQueuedMessage: (id: string) => this.removeQueuedMessage(id),
+      reorderQueuedMessages: (ids: string[]) => this.reorderQueuedMessages(ids),
+      editQueuedMessage: (id: string, body: string) =>
+        this.editQueuedMessage(id, body)
     };
   }
 
@@ -268,15 +292,31 @@ export class AIChatModel extends AbstractChatModel {
    * Clears all messages from the chat and resets conversation state.
    */
   clearMessages = async (): Promise<void> => {
+    this.stopStreaming();
+    this._messageQueue = [];
+    this._isBusy = false;
+    this._queueMessageId = null;
+    this._currentStreamingMessage = null;
     this.messagesDeleted(0, this.messages.length);
+    this.title = null;
     this._toolContexts.clear();
     await this._agentManager.clearHistory();
   };
 
+  /**
+   * Overrides messageAdded to ensure queued messages stay at the bottom.
+   */
+  override messageAdded(message: IMessageContent): void {
+    super.messageAdded(message);
+    if (this._queueMessageId && message.id !== this._queueMessageId) {
+      this._updateQueueUI();
+    }
+  }
+
   /**
    * Adds a non-user message to the chat (used by chat commands).
    */
-  addSystemMessage(body: string): void {
+  private _addSystemMessage(body: string): void {
     const message: IMessageContent = {
       body,
       sender: this._getAIUser(),
@@ -309,10 +349,10 @@ export class AIChatModel extends AbstractChatModel {
       raw_time: false,
       attachments: [...this.input.attachments]
     };
-    this.messageAdded(userMessage);
 
     // Check if we have valid configuration
     if (!this._agentManager.hasValidConfig()) {
+      this.messageAdded(userMessage);
       const errorMessage: IMessageContent = {
         body: 'Please configure your AI settings first. Open the AI Settings to set your API key and model.',
         sender: this._getAIUser(),
@@ -325,35 +365,71 @@ export class AIChatModel extends AbstractChatModel {
       return;
     }
 
-    try {
-      // Process attachments and add their content to the message
-      let enhancedMessage: UserContent = message.body;
-      if (this.input.attachments.length > 0) {
-        const { textContents, binaryParts } = await Private.processAttachments(
-          this.input.attachments,
-          this.input.documentManager
-        );
-        this.input.clearAttachments();
+    if (this._isBusy) {
+      this._messageQueue.push({
+        id: UUID.uuid4(),
+        body: message.body,
+        _originalMsg: userMessage
+      });
+      this.input.clearAttachments();
+      this._updateQueueUI();
+      return;
+    }
 
-        let textPart = message.body;
-        if (textContents.length > 0) {
-          textPart +=
-            '\n\n--- Attached Files ---\n' + textContents.join('\n\n');
-        }
+    this._isBusy = true;
+    this.messageAdded(userMessage);
+    this.input.clearAttachments();
 
-        if (binaryParts.length > 0) {
-          enhancedMessage = [{ type: 'text', text: textPart }, ...binaryParts];
-        } else {
-          enhancedMessage = textPart;
-        }
-      }
+    await this._processMessage(userMessage);
+  }
 
+  /**
+   * Internal method to process attachments and send the message to the agent.
+   */
+  private async _processMessage(userMessage: IMessageContent): Promise<void> {
+    try {
       this.updateWriters([{ user: this._getAIUser() }]);
 
+      let enhancedMessage: UserContent = userMessage.body;
+      if (userMessage.attachments && userMessage.attachments.length > 0) {
+        const providerConfig = this._settingsModel.getProvider(
+          this._agentManager.activeProvider
+        );
+        const supportsImages = modelSupportsImages(
+          providerConfig,
+          this._providerRegistry
+        );
+        const supportsPdf = modelSupportsPdf(
+          providerConfig,
+          this._providerRegistry
+        );
+        const supportsAudio = modelSupportsAudio(
+          providerConfig,
+          this._providerRegistry
+        );
+
+        enhancedMessage = await Private.processAttachments(
+          userMessage.attachments,
+          this.input.documentManager,
+          userMessage.body,
+          supportsImages,
+          supportsPdf,
+          supportsAudio
+        );
+      }
+
       await this._agentManager.generateResponse(enhancedMessage);
     } catch (error) {
       const errorMessage: IMessageContent = {
-        body: `Error generating AI response: ${(error as Error).message}`,
+        body: '',
+        mime_model: {
+          data: {
+            'application/vnd.jupyter.chat.components': 'error'
+          },
+          metadata: {
+            errorMessage: `Error generating AI response: ${(error as Error).message}`
+          }
+        },
         sender: this._getAIUser(),
         id: UUID.uuid4(),
         time: Date.now() / 1000,
@@ -362,7 +438,127 @@ export class AIChatModel extends AbstractChatModel {
       };
       this.messageAdded(errorMessage);
     } finally {
+      this._drainQueue();
+
+      if (
+        this._settingsModel.config.autoTitle &&
+        (this.messages.filter(msg => msg.sender.username !== 'ai-assistant')
+          .length <= 5 ||
+          this.title === null)
+      ) {
+        try {
+          this.title = await this.requestTitle();
+        } catch (e) {
+          console.warn('Error while generating a title\n', e);
+        }
+      }
+    }
+  }
+
+  /**
+   * Removes the message-queue chat component.
+   */
+  private _removeQueueUI(): void {
+    if (this._queueMessageId) {
+      const existingMsg = this.messages.find(
+        msg => msg.id === this._queueMessageId
+      );
+      if (existingMsg) {
+        const idx = this.messages.indexOf(existingMsg);
+        if (idx !== -1) {
+          this.messagesDeleted(idx, 1);
+        }
+      }
+      this._queueMessageId = null;
+    }
+  }
+
+  /**
+   * Creates or updates the message-queue chat component.
+   */
+  private _updateQueueUI(): void {
+    this._removeQueueUI();
+
+    if (this._messageQueue.length === 0) {
+      return;
+    }
+
+    const queueBody = {
+      data: {
+        'application/vnd.jupyter.chat.components': 'message-queue'
+      },
+      metadata: {
+        messages: this._messageQueue.map(m => ({
+          id: m.id,
+          body: m.body,
+          attachments: m._originalMsg.attachments
+        })),
+        targetId: this.name
+      }
+    } as IMimeModelBody;
+
+    this._queueMessageId = UUID.uuid4();
+    const queueMessage: IMessageContent = {
+      body: '',
+      mime_model: queueBody,
+      sender: { username: 'system', display_name: '' },
+      id: this._queueMessageId,
+      time: Date.now() / 1000,
+      type: 'msg',
+      raw_time: false
+    };
+    this.messageAdded(queueMessage);
+  }
+
+  /**
+   * Processes the next message in the queue, or marks the agent as idle.
+   */
+  private async _drainQueue(): Promise<void> {
+    if (this._messageQueue.length === 0) {
+      this._isBusy = false;
       this.updateWriters([]);
+      this._removeQueueUI();
+      return;
+    }
+
+    // Dequeue and push to chat
+    const next = this._messageQueue.shift()!;
+    next._originalMsg.time = Date.now() / 1000;
+    this.messageAdded(next._originalMsg);
+
+    await this._processMessage(next._originalMsg);
+  }
+
+  /**
+   * Removes a queued message by its ID.
+   * @param messageId The ID of the queued message to remove
+   */
+  removeQueuedMessage(messageId: string): void {
+    this.messageQueue = this._messageQueue.filter(msg => msg.id !== messageId);
+  }
+
+  /**
+   * Reorders queued messages by their IDs.
+   * @param messageIds Array of message IDs in the desired order
+   */
+  reorderQueuedMessages(messageIds: string[]): void {
+    const byId = new Map(this._messageQueue.map(m => [m.id, m]));
+    this.messageQueue = messageIds
+      .map(id => byId.get(id))
+      .filter((m): m is Private.IQueuedItem => m !== undefined);
+  }
+
+  /**
+   * Edits a queued message by its ID.
+   * @param messageId The ID of the queued message to edit
+   * @param newBody The new body of the message
+   */
+  editQueuedMessage(messageId: string, newBody: string): void {
+    const queue = [...this._messageQueue];
+    const index = queue.findIndex(m => m.id === messageId);
+    if (index !== -1) {
+      queue[index] = { ...queue[index], body: newBody };
+      this.messageQueue = queue;
     }
   }
 
@@ -434,7 +630,7 @@ export class AIChatModel extends AbstractChatModel {
         );
       }
     } else if (!silent) {
-      console.log(`Provider not providing when restoring ${filepath}.`);
+      console.log(`Provider not provided when restoring ${filepath}.`);
     }
 
     const messages: IMessageContent[] = content.messages.map(message => {
@@ -452,7 +648,7 @@ export class AIChatModel extends AbstractChatModel {
     });
     await this.clearMessages();
     this.messagesInserted(0, messages);
-    this._agentManager.setHistory(messages);
+    await this._rebuildHistory();
     this.autosave = content.metadata?.autosave ?? false;
     this.title = content.metadata?.title ?? null;
     return true;
@@ -473,7 +669,7 @@ export class AIChatModel extends AbstractChatModel {
       {
         role: 'system',
         content:
-          "Generate a concise title (no more than 10 words) for the following conversation. Do not use formatting. Focus on the user's main intent."
+          "Generate a concise title (no more than 10 words) for the following conversation. Do not use formatting, quotes, or punctuation. Focus on the subject matter and specific content the user is working on, not on the actions taken (e.g. prefer 'Pandas DataFrame filtering' over 'Opening a notebook'). The title should be a noun phrase describing the topic."
       },
       {
         role: 'user',
@@ -494,6 +690,13 @@ export class AIChatModel extends AbstractChatModel {
     const attachmentsList: IAttachment[] = []; // Actual attachments
 
     this.messages.forEach(message => {
+      if (
+        message.content?.mime_model?.data?.[
+          'application/vnd.jupyter.chat.components'
+        ] === 'message-queue'
+      ) {
+        return;
+      }
       let attachmentIndexes: string[] = [];
       if (message.attachments) {
         attachmentIndexes = message.attachments.map(attachment => {
@@ -559,6 +762,75 @@ export class AIChatModel extends AbstractChatModel {
     // Agent manager handles agent recreation automatically via its own settings listener
   }
 
+  /**
+   * Rebuild history when the active model changes.
+   */
+  private _onModelChanged(): void {
+    const providerConfig = this._settingsModel.getProvider(
+      this._agentManager.activeProvider
+    );
+    const modelKey = providerConfig
+      ? `${providerConfig.provider}:${providerConfig.model}`
+      : undefined;
+    if (modelKey && modelKey !== this._currentModelKey) {
+      this._currentModelKey = modelKey;
+      this._rebuildHistory().catch(e =>
+        console.warn('Failed to rebuild history on model change:', e)
+      );
+    }
+  }
+
+  /**
+   * Rebuilds the agent history from the current messages.
+   * For vision-capable models, re-reads binary attachments from disk.
+   * For text-only models, uses message text only.
+   */
+  private async _rebuildHistory(): Promise<void> {
+    const providerConfig = this._settingsModel.getProvider(
+      this._agentManager.activeProvider
+    );
+    const supportsImages = modelSupportsImages(
+      providerConfig,
+      this._providerRegistry
+    );
+    const supportsPdf = modelSupportsPdf(
+      providerConfig,
+      this._providerRegistry
+    );
+    const supportsAudio = modelSupportsAudio(
+      providerConfig,
+      this._providerRegistry
+    );
+
+    const modelMessages: ModelMessage[] = [];
+    for (const msg of this.messages) {
+      const isAI = msg.sender.username === 'ai-assistant';
+      if (!isAI && msg.attachments?.length) {
+        const enhancedContent = await Private.processAttachments(
+          msg.attachments,
+          this.input.documentManager,
+          msg.body,
+          supportsImages,
+          supportsPdf,
+          supportsAudio
+        );
+
+        modelMessages.push({
+          role: 'user',
+          content: enhancedContent
+        } as ModelMessage);
+      } else if (msg.body) {
+        modelMessages.push({
+          role: isAI ? 'assistant' : 'user',
+          content: msg.body
+        } as ModelMessage);
+      }
+      // Skip messages with empty body like tool calls
+    }
+
+    this._agentManager.setHistory(modelMessages);
+  }
+
   /**
    * Handles events emitted by the agent manager.
    * @param event The event data containing type and payload
@@ -613,6 +885,7 @@ export class AIChatModel extends AbstractChatModel {
     this.messageAdded(aiMessage);
     this._currentStreamingMessage =
       this.messages.find(message => message.id === aiMessage.id) ?? null;
+    this._updateQueueUI();
   }
 
   /**
@@ -759,13 +1032,18 @@ export class AIChatModel extends AbstractChatModel {
       body: '',
       mime_model: {
         data: {
-          'application/vnd.jupyter.chat.components': 'tool-call'
+          'application/vnd.jupyter.chat.components': 'grouped-tool-calls'
         },
         metadata: {
-          toolName: context.toolName,
-          input: context.input,
-          status: context.status,
-          summary: context.summary
+          toolCalls: [
+            {
+              toolCallId: context.toolCallId,
+              title: `${context.toolName}${context.summary ? ' : ' + context.summary : ''}`,
+              kind: context.toolName,
+              status: 'in_progress',
+              rawInput: context.input
+            }
+          ]
         }
       },
       sender: this._getAIUser(),
@@ -776,6 +1054,7 @@ export class AIChatModel extends AbstractChatModel {
     };
 
     this.messageAdded(toolCallMessage);
+    this._updateQueueUI();
   }
 
   /**
@@ -837,13 +1116,22 @@ export class AIChatModel extends AbstractChatModel {
    */
   private _handleErrorEvent(event: IAgentManager.IAgentEvent<'error'>): void {
     this.messageAdded({
-      body: `Error generating response: ${event.data.error.message}`,
+      body: '',
+      mime_model: {
+        data: {
+          'application/vnd.jupyter.chat.components': 'error'
+        },
+        metadata: {
+          errorMessage: `Error generating response: ${event.data.error.message}`
+        }
+      },
       sender: this._getAIUser(),
       id: UUID.uuid4(),
       time: Date.now() / 1000,
       type: 'msg',
       raw_time: false
     });
+    this._updateQueueUI();
   }
 
   /**
@@ -856,7 +1144,6 @@ export class AIChatModel extends AbstractChatModel {
     if (!context) {
       return;
     }
-    context.approvalId = event.data.approvalId;
     context.input = JSON.stringify(event.data.args, null, 2);
     this._updateToolCallUI(event.data.toolCallId, 'awaiting_approval');
   }
@@ -867,15 +1154,13 @@ export class AIChatModel extends AbstractChatModel {
   private _handleToolApprovalResolved(
     event: IAgentManager.IAgentEvent<'tool_approval_resolved'>
   ): void {
-    const context = Array.from(this._toolContexts.values()).find(
-      ctx => ctx.approvalId === event.data.approvalId
-    );
+    const context = this._toolContexts.get(event.data.toolCallId);
     if (!context) {
       return;
     }
 
     const status = event.data.approved ? 'approved' : 'rejected';
-    this._updateToolCallUI(context.toolCallId, status);
+    this._updateToolCallUI(event.data.toolCallId, status);
 
     if (!event.data.approved) {
       this._toolContexts.delete(context.toolCallId);
@@ -906,47 +1191,96 @@ export class AIChatModel extends AbstractChatModel {
     existingMessage.update({
       mime_model: {
         data: {
-          'application/vnd.jupyter.chat.components': 'tool-call'
+          'application/vnd.jupyter.chat.components': 'grouped-tool-calls'
         },
         metadata: {
-          toolName: context.toolName,
-          input: context.input,
-          status: context.status,
-          summary: context.summary,
-          output,
-          targetId: this.name,
-          approvalId: context.approvalId
+          toolCalls: [
+            {
+              toolCallId: context.toolCallId,
+              title: `${context.toolName}${context.summary ? ' : ' + context.summary : ''}`,
+              kind: context.toolName,
+              status: context.status,
+              rawInput: context.input,
+              rawOutput: output,
+              sessionId: this.name,
+              permissionStatus:
+                status === 'awaiting_approval' ? 'pending' : 'resolved',
+              ...(status === 'awaiting_approval' && {
+                permissionOptions: [
+                  { optionId: 'approve', name: 'Approve', kind: 'allow_once' },
+                  { optionId: 'reject', name: 'Reject', kind: 'reject_once' }
+                ]
+              })
+            }
+          ]
         }
       }
     });
   }
 
+  /**
+   * The current message queue
+   */
+  get messageQueue(): Private.IQueuedItem[] {
+    return this._messageQueue;
+  }
+  set messageQueue(value: Private.IQueuedItem[]) {
+    this._messageQueue = value;
+    this._updateQueueUI();
+    if (this._messageQueue.length > 0 && !this._isBusy) {
+      this._drainQueue();
+    }
+  }
+
+  /**
+   * Whether the chat is busy
+   */
+  get isBusy(): boolean {
+    return this._isBusy;
+  }
+  set isBusy(value: boolean) {
+    this._isBusy = value;
+  }
+
   // Private fields
   private _settingsModel: IAISettingsModel;
   private _user: IUser;
   private _toolContexts: Map<string, IToolExecutionContext> = new Map();
   private _agentManager: IAgentManager;
+  private _providerRegistry?: IProviderRegistry;
+  private _currentModelKey: string | undefined;
   private _currentStreamingMessage: IMessage | null = null;
-  private _nameChanged = new Signal<AIChatModel, string>(this);
+  private _nameChanged = new Signal<IAIChatModel, string>(this);
   private _contentsManager?: Contents.IManager;
   private _autosave: boolean = false;
-  private _autosaveChanged = new Signal<AIChatModel, boolean>(this);
+  private _autosaveChanged = new Signal<IAIChatModel, boolean>(this);
   private _autosaveDebouncer: Debouncer;
+  private _messageQueue: Private.IQueuedItem[] = [];
+  private _isBusy: boolean = false;
+  private _queueMessageId: string | null = null;
   private _title: string | null = null;
-  private _titleChanged = new Signal<AIChatModel, string | null>(this);
+  private _titleChanged = new Signal<IAIChatModel, string | null>(this);
 }
 
 namespace Private {
+  export interface IQueuedItem {
+    id: string;
+    body: string;
+    _originalMsg: IMessageContent;
+  }
+
   type IDisplayOutput =
     | nbformat.IDisplayData
     | nbformat.IDisplayUpdate
     | nbformat.IExecuteResult;
 
-  const isPlainObject = (value: unknown): value is Record<string, unknown> => {
+  export const isPlainObject = (
+    value: unknown
+  ): value is Record<string, unknown> => {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
   };
 
-  const isDisplayOutput = (value: unknown): value is IDisplayOutput => {
+  export const isDisplayOutput = (value: unknown): value is IDisplayOutput => {
     if (!isPlainObject(value)) {
       return false;
     }
@@ -959,7 +1293,7 @@ namespace Private {
     );
   };
 
-  const toMimeBundle = (
+  export const toMimeBundle = (
     value: IDisplayOutput,
     trustedMimeTypes: ReadonlySet<string>
   ): IMimeModelBody | null => {
@@ -987,7 +1321,7 @@ namespace Private {
    * Tool outputs are not guaranteed to be raw Jupyter IOPub messages; they are
    * often wrapped objects (for example `{ success, result: { outputs: [...] } }`).
    */
-  const toDisplayOutputs = (value: unknown): IDisplayOutput[] => {
+  export const toDisplayOutputs = (value: unknown): IDisplayOutput[] => {
     if (isDisplayOutput(value)) {
       return [value];
     }
@@ -1043,23 +1377,29 @@ namespace Private {
   }
 
   /**
-   * Processes file attachments and returns text contents and binary parts separately.
+   * Processes file attachments and returns the message content with the attachments.
    * @param attachments Array of file attachments to process
    * @param documentManager Optional document manager for file operations
-   * @returns Text contents and binary parts
+   * @param body The message body
+   * @param supportsImages Whether the model supports images
+   * @param supportsPdf Whether the model supports pdfs
+   * @param supportsAudio Whether the model supports audio
+   * @returns Enhanced message content
    */
   export async function processAttachments(
     attachments: IAttachment[],
-    documentManager: IDocumentManager | null | undefined
-  ): Promise<{
-    textContents: string[];
-    binaryParts: Array<ImagePart | FilePart>;
-  }> {
+    documentManager: IDocumentManager | null | undefined,
+    body: string,
+    supportsImages: boolean,
+    supportsPdf: boolean,
+    supportsAudio: boolean
+  ): Promise<UserContent> {
     const textContents: string[] = [];
-    const binaryParts: Array<ImagePart | FilePart> = [];
+    const includedParts: Array<ImagePart | FilePart> = [];
+    const omittedNames: string[] = [];
 
     if (!documentManager) {
-      return { textContents, binaryParts };
+      return body;
     }
 
     for (const attachment of attachments) {
@@ -1093,29 +1433,54 @@ namespace Private {
           }
 
           if (mimetype?.startsWith('image/')) {
-            const data = await readBinaryAttachment(
-              attachment,
-              documentManager
-            );
-            if (data) {
-              binaryParts.push({
-                type: 'image',
-                image: data,
-                mediaType: mimetype
-              });
+            if (supportsImages) {
+              const data = await readBinaryAttachment(
+                attachment,
+                documentManager
+              );
+              if (data) {
+                includedParts.push({
+                  type: 'image',
+                  image: data,
+                  mediaType: mimetype
+                });
+              }
+            } else {
+              omittedNames.push(PathExt.basename(attachment.value));
             }
           } else if (mimetype === 'application/pdf') {
-            const data = await readBinaryAttachment(
-              attachment,
-              documentManager
-            );
-            if (data) {
-              binaryParts.push({
-                type: 'file',
-                data,
-                mediaType: mimetype,
-                filename: PathExt.basename(attachment.value)
-              });
+            if (supportsPdf) {
+              const data = await readBinaryAttachment(
+                attachment,
+                documentManager
+              );
+              if (data) {
+                includedParts.push({
+                  type: 'file',
+                  data,
+                  mediaType: mimetype,
+                  filename: PathExt.basename(attachment.value)
+                });
+              }
+            } else {
+              omittedNames.push(PathExt.basename(attachment.value));
+            }
+          } else if (mimetype?.startsWith('audio/')) {
+            if (supportsAudio) {
+              const data = await readBinaryAttachment(
+                attachment,
+                documentManager
+              );
+              if (data) {
+                includedParts.push({
+                  type: 'file',
+                  data,
+                  mediaType: mimetype,
+                  filename: PathExt.basename(attachment.value)
+                });
+              }
+            } else {
+              omittedNames.push(PathExt.basename(attachment.value));
             }
           } else {
             const fileContent = await readFileAttachment(
@@ -1142,7 +1507,18 @@ namespace Private {
       }
     }
 
-    return { textContents, binaryParts };
+    let textPart = body;
+    if (textContents.length > 0) {
+      textPart += '\n\n--- Attached Files ---\n' + textContents.join('\n\n');
+    }
+
+    if (omittedNames.length > 0) {
+      textPart += `\n[Attachments omitted (not supported by this model): ${omittedNames.join(', ')}.]`;
+    }
+
+    return includedParts.length > 0
+      ? [{ type: 'text', text: textPart }, ...includedParts]
+      : textPart;
   }
 
   /**
@@ -1462,6 +1838,10 @@ export namespace AIChatModel {
      * The contents manager.
      */
     contentsManager?: Contents.IManager;
+    /**
+     * Optional provider registry for model capability lookups.
+     */
+    providerRegistry?: IProviderRegistry;
     /**
      * Whether to restore or not the message (default to true)
      */
@@ -1488,6 +1868,18 @@ export namespace AIChatModel {
      * The agent manager of the chat.
      */
     agentManager: IAgentManager;
+    /**
+     * Removes a queued message by its ID.
+     */
+    removeQueuedMessage: (id: string) => void;
+    /**
+     * Reorders queued messages by their IDs.
+     */
+    reorderQueuedMessages: (ids: string[]) => void;
+    /**
+     * Edits a queued message by its ID.
+     */
+    editQueuedMessage: (id: string, body: string) => void;
   }
 
   /**