ai 6.0.288 → 6.0.290

package/src/prompt/content-part.ts

@@ -201,6 +201,8 @@ export const toolApprovalRequestSchema: z.ZodType<ToolApprovalRequest> =
     type: z.literal('tool-approval-request'),
     approvalId: z.string(),
     toolCallId: z.string(),
+    signature: z.string().optional(),
+    inputSchemaInput: z.unknown().optional(),
   });
 
 /**

package/src/prompt/convert-to-language-model-prompt.ts

@@ -492,8 +492,11 @@ function convertPartToLanguageModelPart(
       throw new Error(`Unsupported part type: ${type}`);
   }
 
-  const { data: convertedData, mediaType: convertedMediaType } =
-    convertToLanguageModelV3DataContent(originalData);
+  const {
+    data: convertedData,
+    mediaType: convertedMediaType,
+    originalUrl,
+  } = convertToLanguageModelV3DataContent(originalData);
 
   let mediaType: string | undefined = convertedMediaType ?? part.mediaType;
   let data: Uint8Array | string | URL = convertedData; // binary | base64 | url
@@ -525,6 +528,7 @@ function convertPartToLanguageModelPart(
         mediaType: mediaType ?? 'image/*', // any image
         filename: undefined,
         data,
+        ...(data instanceof URL && originalUrl != null ? { originalUrl } : {}),
         providerOptions: part.providerOptions,
       };
     }
@@ -540,6 +544,7 @@ function convertPartToLanguageModelPart(
         mediaType,
         filename: part.filename,
         data,
+        ...(data instanceof URL && originalUrl != null ? { originalUrl } : {}),
         providerOptions: part.providerOptions,
       };
     }

package/src/prompt/data-content.ts

@@ -28,7 +28,10 @@ export function convertToLanguageModelV3DataContent(
 ): {
   data: LanguageModelV3DataContent;
   mediaType: string | undefined;
+  originalUrl?: string;
 } {
+  let originalUrl: string | undefined;
+
   // Buffer & Uint8Array:
   if (content instanceof Uint8Array) {
     return { data: content, mediaType: undefined };
@@ -43,7 +46,9 @@ export function convertToLanguageModelV3DataContent(
   // is not a URL and likely some other sort of data.
   if (typeof content === 'string') {
     try {
-      content = new URL(content);
+      const url = new URL(content);
+      originalUrl = url.toString() !== content ? content : undefined;
+      content = url;
     } catch (error) {
       // ignored
     }
@@ -65,7 +70,11 @@ export function convertToLanguageModelV3DataContent(
     return { data: base64Content, mediaType: dataUrlMediaType };
   }
 
-  return { data: content, mediaType: undefined };
+  return {
+    data: content,
+    mediaType: undefined,
+    ...(originalUrl != null ? { originalUrl } : {}),
+  };
 }
 
 /**

package/src/ui/chat.ts

@@ -259,6 +259,7 @@ export abstract class AbstractChat<UI_MESSAGE extends UIMessage> {
   private onData?: ChatInit<UI_MESSAGE>['onData'];
   private sendAutomaticallyWhen?: ChatInit<UI_MESSAGE>['sendAutomaticallyWhen'];
 
+  private pendingApprovalMessageId: string | undefined;
   private activeResponse: ActiveResponse<UI_MESSAGE> | undefined = undefined;
   private activeResumeRequest: ActiveResumeRequest | undefined = undefined;
   private jobExecutor = new SerialJobExecutor();
@@ -361,9 +362,37 @@ export abstract class AbstractChat<UI_MESSAGE extends UIMessage> {
     options?: ChatRequestOptions,
   ): Promise<void> => {
     if (message == null) {
-      await this.makeRequest({
-        trigger: 'submit-message',
-        messageId: this.lastMessage?.id,
+      let messageId = this.pendingApprovalMessageId;
+
+      if (messageId == null) {
+        messageId = this.lastMessage?.id;
+
+        // When hydrating a chat with an already-responded approval, continue
+        // the most recent matching assistant message so result chunks can
+        // resolve its tool invocation.
+        for (let i = this.state.messages.length - 1; i >= 0; i--) {
+          const candidate = this.state.messages[i];
+          if (
+            candidate.role === 'assistant' &&
+            candidate.parts.some(
+              part => isToolUIPart(part) && part.state === 'approval-responded',
+            )
+          ) {
+            messageId = candidate.id;
+            break;
+          }
+        }
+      }
+
+      const consumesPendingApproval =
+        messageId != null && messageId === this.pendingApprovalMessageId;
+      const pendingApprovalMessageIndex = consumesPendingApproval
+        ? this.state.messages.findIndex(message => message.id === messageId)
+        : -1;
+
+      await this.makeRequestForToolApproval({
+        messageId,
+        messageIndex: pendingApprovalMessageIndex,
         ...options,
       });
       return;
@@ -489,7 +518,6 @@ export abstract class AbstractChat<UI_MESSAGE extends UIMessage> {
   }) =>
     this.jobExecutor.run(async () => {
       const messages = this.state.messages;
-      const lastMessage = messages[messages.length - 1];
 
       const updatePart = (
         part: UIMessagePart<UIDataTypes, UITools>,
@@ -504,11 +532,25 @@ export abstract class AbstractChat<UI_MESSAGE extends UIMessage> {
             }
           : part;
 
-      // update the message to trigger an immediate UI update
-      this.state.replaceMessage(messages.length - 1, {
-        ...lastMessage,
-        parts: lastMessage.parts.map(updatePart),
-      });
+      const messageIndex = messages.findIndex(message =>
+        message.parts.some(
+          part =>
+            isToolUIPart(part) &&
+            part.state === 'approval-requested' &&
+            part.approval.id === id,
+        ),
+      );
+
+      if (messageIndex !== -1) {
+        const message = messages[messageIndex];
+
+        // update the message to trigger an immediate UI update
+        this.state.replaceMessage(messageIndex, {
+          ...message,
+          parts: message.parts.map(updatePart),
+        });
+        this.pendingApprovalMessageId = message.id;
+      }
 
       // update the active response if it exists
       if (this.activeResponse) {
@@ -525,9 +567,14 @@ export abstract class AbstractChat<UI_MESSAGE extends UIMessage> {
         this.shouldSendAutomatically().then(shouldSend => {
           if (shouldSend) {
             // no await to avoid deadlocking
-            this.makeRequest({
-              trigger: 'submit-message',
-              messageId: this.lastMessage?.id,
+            const messageId =
+              messageIndex === -1
+                ? this.lastMessage?.id
+                : messages[messageIndex].id;
+
+            this.makeRequestForToolApproval({
+              messageId,
+              messageIndex,
               ...options,
             });
           }
@@ -610,6 +657,36 @@ export abstract class AbstractChat<UI_MESSAGE extends UIMessage> {
     return result as boolean;
   }
 
+  private async makeRequestForToolApproval({
+    messageId,
+    messageIndex,
+    ...options
+  }: {
+    messageId?: string;
+    messageIndex: number;
+  } & ChatRequestOptions) {
+    const consumesPendingApproval =
+      messageId != null && messageId === this.pendingApprovalMessageId;
+    if (consumesPendingApproval) {
+      this.pendingApprovalMessageId = undefined;
+    }
+
+    await this.makeRequest({
+      trigger: 'submit-message',
+      messageId,
+      ...options,
+    });
+
+    if (
+      consumesPendingApproval &&
+      this.status === 'error' &&
+      this.pendingApprovalMessageId == null
+    ) {
+      this.pendingApprovalMessageId =
+        this.state.messages[messageIndex]?.id ?? messageId;
+    }
+  }
+
   private async makeRequest({
     trigger,
     metadata,
@@ -697,6 +774,18 @@ export abstract class AbstractChat<UI_MESSAGE extends UIMessage> {
     this.setStatus({ status: 'submitted', error: undefined });
 
     const lastMessage = this.lastMessage;
+    const responseMessageIndex =
+      trigger === 'submit-message' && messageId != null
+        ? this.state.messages.findIndex(message => message.id === messageId)
+        : this.state.messages.length - 1;
+    const responseMessage =
+      responseMessageIndex === -1
+        ? lastMessage
+        : this.state.messages[responseMessageIndex];
+    const usesEarlierAssistantMessage =
+      responseMessageIndex !== -1 &&
+      responseMessageIndex < this.state.messages.length - 1 &&
+      responseMessage?.role === 'assistant';
 
     let isAbort = false;
     let isDisconnect = false;
@@ -709,7 +798,7 @@ export abstract class AbstractChat<UI_MESSAGE extends UIMessage> {
           lastMessage:
             trigger === 'resume-stream' || trigger === 'regenerate-message'
               ? undefined
-              : this.state.snapshot(lastMessage),
+              : this.state.snapshot(responseMessage),
           messageId: this.generateId(),
         }),
         abortController,
@@ -763,10 +852,12 @@ export abstract class AbstractChat<UI_MESSAGE extends UIMessage> {
                 this.setStatus({ status: 'streaming' });
               }
 
-              const replaceLastMessage =
-                response.state.message.id === this.lastMessage?.id;
-
-              if (replaceLastMessage) {
+              if (usesEarlierAssistantMessage) {
+                this.state.replaceMessage(
+                  responseMessageIndex,
+                  response.state.message,
+                );
+              } else if (response.state.message.id === this.lastMessage?.id) {
                 this.state.replaceMessage(
                   this.state.messages.length - 1,
                   response.state.message,

package/src/ui/convert-to-model-messages.ts

@@ -204,6 +204,14 @@ export async function convertToModelMessages<UI_MESSAGE extends UIMessage>(
                       type: 'tool-approval-request' as const,
                       approvalId: part.approval.id,
                       toolCallId: part.toolCallId,
+                      ...(Object.prototype.hasOwnProperty.call(
+                        part.approval,
+                        'inputSchemaInput',
+                      )
+                        ? {
+                            inputSchemaInput: part.approval.inputSchemaInput,
+                          }
+                        : {}),
                       ...(part.approval.signature != null
                         ? { signature: part.approval.signature }
                         : {}),

package/src/ui/http-chat-transport.ts

@@ -191,7 +191,7 @@ export abstract class HttpChatTransport<
     const response = await fetch(api, {
       method: 'POST',
       headers: {
-        'Content-Type': 'application/json',
+        'content-type': 'application/json',
         ...headers,
       },
       body: JSON.stringify(body),

package/src/ui/last-assistant-message-is-complete-with-approval-responses.ts

@@ -35,7 +35,7 @@ export function lastAssistantMessageIsCompleteWithApprovalResponses({
     // all tool approvals must have a response
     lastStepToolInvocations.every(
       part =>
-        part.state === 'output-available' ||
+        (part.state === 'output-available' && part.preliminary !== true) ||
         part.state === 'output-error' ||
         part.state === 'output-denied' ||
         part.state === 'approval-responded',

package/src/ui/last-assistant-message-is-complete-with-tool-calls.ts

@@ -33,7 +33,8 @@ export function lastAssistantMessageIsCompleteWithToolCalls({
     lastStepToolInvocations.length > 0 &&
     lastStepToolInvocations.every(
       part =>
-        part.state === 'output-available' || part.state === 'output-error',
+        (part.state === 'output-available' && part.preliminary !== true) ||
+        part.state === 'output-error',
     )
   );
 }

package/src/ui/process-ui-message-stream.ts

@@ -721,6 +721,12 @@ export function processUIMessageStream<UI_MESSAGE extends UIMessage>({
                 ...(chunk.approvalDescriptor != null
                   ? { descriptor: chunk.approvalDescriptor }
                   : {}),
+                ...(Object.prototype.hasOwnProperty.call(
+                  chunk,
+                  'inputSchemaInput',
+                )
+                  ? { inputSchemaInput: chunk.inputSchemaInput }
+                  : {}),
                 ...(chunk.signature != null
                   ? { signature: chunk.signature }
                   : {}),

package/src/ui/ui-messages.ts

@@ -263,6 +263,7 @@ export type UIToolInvocation<TOOL extends UITool | Tool> = {
         descriptor?: unknown;
         reason?: never;
         signature?: string;
+        inputSchemaInput?: unknown;
       };
     }
   | {
@@ -277,6 +278,7 @@ export type UIToolInvocation<TOOL extends UITool | Tool> = {
         descriptor?: unknown;
         reason?: string;
         signature?: string;
+        inputSchemaInput?: unknown;
       };
     }
   | {
@@ -293,6 +295,7 @@ export type UIToolInvocation<TOOL extends UITool | Tool> = {
         descriptor?: unknown;
         reason?: string;
         signature?: string;
+        inputSchemaInput?: unknown;
       };
     }
   | {
@@ -309,6 +312,7 @@ export type UIToolInvocation<TOOL extends UITool | Tool> = {
         descriptor?: unknown;
         reason?: string;
         signature?: string;
+        inputSchemaInput?: unknown;
       };
     }
   | {
@@ -323,6 +327,7 @@ export type UIToolInvocation<TOOL extends UITool | Tool> = {
         descriptor?: unknown;
         reason?: string;
         signature?: string;
+        inputSchemaInput?: unknown;
       };
     }
 );
@@ -381,6 +386,7 @@ export type DynamicToolUIPart = {
         descriptor?: unknown;
         reason?: never;
         signature?: string;
+        inputSchemaInput?: unknown;
       };
     }
   | {
@@ -395,6 +401,7 @@ export type DynamicToolUIPart = {
         descriptor?: unknown;
         reason?: string;
         signature?: string;
+        inputSchemaInput?: unknown;
       };
     }
   | {
@@ -411,6 +418,7 @@ export type DynamicToolUIPart = {
         descriptor?: unknown;
         reason?: string;
         signature?: string;
+        inputSchemaInput?: unknown;
       };
     }
   | {
@@ -426,6 +434,7 @@ export type DynamicToolUIPart = {
         descriptor?: unknown;
         reason?: string;
         signature?: string;
+        inputSchemaInput?: unknown;
       };
     }
   | {
@@ -440,6 +449,7 @@ export type DynamicToolUIPart = {
         descriptor?: unknown;
         reason?: string;
         signature?: string;
+        inputSchemaInput?: unknown;
       };
     }
 );