@assistant-ui/react-ai-sdk 1.3.26 → 1.3.28

package/src/ui/utils/convertMessage.test.ts

@@ -186,7 +186,7 @@ describe("AISDKMessageConverter", () => {
     });
   });
 
-  it("deduplicates tool calls by toolCallId and maps interrupt states", () => {
+  it("deduplicates tool calls by toolCallId and surfaces approval / interrupt state", () => {
     const converted = AISDKMessageConverter.toThreadMessages(
       [
         {
@@ -212,7 +212,7 @@ describe("AISDKMessageConverter", () => {
               toolCallId: "tc-2",
               state: "approval-requested",
               input: { action: "deploy" },
-              approval: { reason: "need human review" },
+              approval: { id: "appr-1" },
             },
             {
               type: "tool-human",
@@ -220,6 +220,39 @@ describe("AISDKMessageConverter", () => {
               state: "input-available",
               input: { task: "confirm" },
             },
+            {
+              type: "tool-approve",
+              toolCallId: "tc-4",
+              state: "approval-responded",
+              input: { action: "rollback" },
+              approval: { id: "appr-2", approved: true, reason: "looks ok" },
+            },
+            {
+              type: "tool-approve",
+              toolCallId: "tc-5",
+              state: "approval-requested",
+              input: { action: "auto" },
+              approval: { id: "appr-3", isAutomatic: true },
+            },
+            {
+              type: "tool-approve",
+              toolCallId: "tc-6",
+              state: "output-denied",
+              input: { action: "wipe" },
+              approval: {
+                id: "appr-4",
+                approved: false,
+                reason: "user denied",
+              },
+            },
+            {
+              type: "tool-approve",
+              toolCallId: "tc-7",
+              state: "output-available",
+              input: { action: "ship" },
+              output: { ok: true },
+              approval: { id: "appr-5", approved: true, isAutomatic: true },
+            },
           ],
         } as any,
       ],
@@ -237,17 +270,49 @@ describe("AISDKMessageConverter", () => {
     const toolCalls = converted[0]?.content.filter(
       (part): part is any => part.type === "tool-call",
     );
-    expect(toolCalls).toHaveLength(3);
+    expect(toolCalls).toHaveLength(7);
 
     expect(toolCalls?.filter((p) => p.toolCallId === "tc-1")).toHaveLength(1);
-    expect(toolCalls?.find((p) => p.toolCallId === "tc-2")?.status).toEqual({
-      type: "requires-action",
-      reason: "interrupt",
+
+    expect(toolCalls?.find((p) => p.toolCallId === "tc-2")?.approval).toEqual({
+      id: "appr-1",
     });
+    expect(
+      toolCalls?.find((p) => p.toolCallId === "tc-2")?.interrupt,
+    ).toBeUndefined();
+
     expect(toolCalls?.find((p) => p.toolCallId === "tc-3")?.interrupt).toEqual({
       type: "human",
       payload: { kind: "human" },
     });
+    expect(
+      toolCalls?.find((p) => p.toolCallId === "tc-3")?.approval,
+    ).toBeUndefined();
+
+    expect(toolCalls?.find((p) => p.toolCallId === "tc-4")?.approval).toEqual({
+      id: "appr-2",
+      approved: true,
+      reason: "looks ok",
+    });
+
+    expect(toolCalls?.find((p) => p.toolCallId === "tc-5")?.approval).toEqual({
+      id: "appr-3",
+      isAutomatic: true,
+    });
+
+    const denied = toolCalls?.find((p) => p.toolCallId === "tc-6");
+    expect(denied?.approval).toEqual({
+      id: "appr-4",
+      approved: false,
+      reason: "user denied",
+    });
+    expect(denied?.isError).toBe(true);
+
+    expect(toolCalls?.find((p) => p.toolCallId === "tc-7")?.approval).toEqual({
+      id: "appr-5",
+      approved: true,
+      isAutomatic: true,
+    });
   });
 
   it("strips closing delimiters from streaming tool argsText", () => {

package/src/ui/utils/convertMessage.ts

@@ -141,37 +141,39 @@ function stableStringifyToolArgs(
   return JSON.stringify(stableArgs);
 }
 
-/**
- * Resolves the interrupt fields for a tool call part.
- *
- * Two interrupt paths for tool approvals:
- * 1. AI SDK server-side approval: approval-requested state with part.approval payload
- * 2. Frontend tools: toolStatuses interrupt from context.human()
- */
-function getToolInterrupt(
-  part: { state: string; approval?: unknown },
+function getToolApprovalAndInterrupt(
+  part: {
+    approval?:
+      | {
+          id: string;
+          approved?: boolean;
+          reason?: string;
+          isAutomatic?: boolean;
+        }
+      | undefined;
+  },
   toolStatus: { type: string; payload?: unknown } | undefined,
-): Record<string, unknown> {
-  if (part.state === "approval-requested" && "approval" in part) {
+): {
+  approval?: NonNullable<ToolCallMessagePart["approval"]>;
+  interrupt?: NonNullable<ToolCallMessagePart["interrupt"]>;
+} {
+  if (part.approval && typeof part.approval.id === "string") {
+    const { id, approved, reason, isAutomatic } = part.approval;
     return {
-      interrupt: {
-        type: "human" as const,
-        payload: (part as { approval: unknown }).approval,
-      },
-      status: {
-        type: "requires-action" as const,
-        reason: "interrupt" as const,
+      approval: {
+        id,
+        ...(typeof approved === "boolean" && { approved }),
+        ...(typeof reason === "string" && { reason }),
+        ...(isAutomatic === true && { isAutomatic: true }),
       },
     };
   }
 
   if (toolStatus?.type === "interrupt") {
     return {
-      interrupt: toolStatus.payload,
-      status: {
-        type: "requires-action" as const,
-        reason: "interrupt" as const,
-      },
+      interrupt: toolStatus.payload as NonNullable<
+        ToolCallMessagePart["interrupt"]
+      >,
     };
   }
 
@@ -242,7 +244,7 @@ function convertParts(
           isError = true;
           result = {
             error:
-              (part as { approval: { reason?: string } }).approval.reason ||
+              (part as { approval?: { reason?: string } }).approval?.reason ||
               "Tool approval denied",
           };
         }
@@ -281,7 +283,7 @@ function convertParts(
           isError,
           ...(modelContent !== undefined && { modelContent }),
           ...(mcpApp && { mcp: { app: mcpApp } }),
-          ...getToolInterrupt(part, toolStatus),
+          ...getToolApprovalAndInterrupt(part, toolStatus),
         } satisfies ToolCallMessagePart;
       }
 

package/dist/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,yCAAsC;AAChE,OAAO,EAAE,cAAc,EAAE,wCAAqC;AAC9D,YAAY,EAAE,qBAAqB,EAAE,wCAAqC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,gDAA6C;AAC9E,OAAO,EACL,0BAA0B,EAC1B,6BAA6B,GAC9B,0BAAuB;AACxB,YAAY,EACV,6BAA6B,EAC7B,sBAAsB,GACvB,0BAAuB;AACxB,OAAO,EAAE,aAAa,EAAE,2BAAwB;AAChD,OAAO,EAAE,kBAAkB,EAAE,gCAA6B;AAC1D,YAAY,EAAE,gBAAgB,EAAE,4BAA4B,EAAE,mBAAgB;AAC9E,OAAO,EAAE,0BAA0B,EAAE,mBAAmB,EAAE,mBAAgB"}

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,kDAAkD;AAClD,kDAAkD;AAElD,OAAO,EAAE,eAAe,EAAE,yCAAsC;AAChE,OAAO,EAAE,cAAc,EAAE,wCAAqC;AAE9D,OAAO,EAAE,sBAAsB,EAAE,gDAA6C;AAC9E,OAAO,EACL,0BAA0B,EAC1B,6BAA6B,GAC9B,0BAAuB;AAKxB,OAAO,EAAE,aAAa,EAAE,2BAAwB;AAChD,OAAO,EAAE,kBAAkB,EAAE,gCAA6B;AAE1D,OAAO,EAAE,0BAA0B,EAAE,mBAAmB,EAAE,mBAAgB"}