@marimo-team/islands 0.19.3-dev42 → 0.19.3-dev45

package/dist/main.js

@@ -71227,6 +71227,7 @@ Image URL: ${r.imageUrl}`)), contextToXml({
     }), z = (0, import_react.useRef)(null), { data: G } = useAsyncData(async () => (await e.get_chat_history({})).messages, []), q = e.value.length > 0 ? e.value : G, { messages: LY, sendMessage: RY, setMessages: zY, status: BY, stop: VY, error: HY, regenerate: UY, clearError: WY } = useChat({
       transport: new DefaultChatTransport({
         fetch: async (r2, c2) => {
+          var _a3;
           if (c2 === void 0) return fetch(r2);
           let d2 = JSON.parse(c2.body), f2 = c2.signal, h2 = {
             max_tokens: M.current.max_tokens,
@@ -71238,98 +71239,49 @@ Image URL: ${r.imageUrl}`)), contextToXml({
           };
           try {
             let r3 = d2.messages.map((e2) => {
-              var _a3;
+              var _a4;
               return {
                 ...e2,
-                content: (_a3 = e2.parts) == null ? void 0 : _a3.map((e3) => "text" in e3 ? e3.text : "").join("\n")
+                content: (_a4 = e2.parts) == null ? void 0 : _a4.map((e3) => "text" in e3 ? e3.text : "").join("\n")
               };
-            });
-            if (e.frontendManaged) {
-              let c4 = new ReadableStream({
-                start(e2) {
-                  z.current = e2;
-                  let r4 = () => {
-                    try {
-                      e2.close();
-                    } catch (e3) {
-                      Logger.debug("Controller may already be closed", {
-                        error: e3
-                      });
-                    }
-                    z.current = null;
-                  };
-                  return f2 == null ? void 0 : f2.addEventListener("abort", r4), () => {
-                    f2 == null ? void 0 : f2.removeEventListener("abort", r4);
-                  };
-                },
-                cancel() {
-                  z.current = null;
-                }
-              });
-              return e.send_prompt({
-                messages: r3,
-                config: h2
-              }).catch((e2) => {
-                var _a3;
-                (_a3 = z.current) == null ? void 0 : _a3.error(e2), z.current = null;
-              }), createUIMessageStreamResponse({
-                stream: c4
-              });
-            }
-            if (f2 == null ? void 0 : f2.aborted) return new Response("Aborted", {
-              status: 499
-            });
-            let c3 = Date.now().toString();
-            zY((e2) => [
-              ...e2,
-              {
-                id: c3,
-                role: "assistant",
-                parts: [
-                  {
-                    type: "text",
-                    text: ""
+            }), c3 = new ReadableStream({
+              start(e2) {
+                z.current = e2;
+                let r4 = () => {
+                  try {
+                    e2.close();
+                  } catch (e3) {
+                    Logger.debug("Controller may already be closed", {
+                      error: e3
+                    });
                   }
-                ]
+                  z.current = null;
+                };
+                return f2 == null ? void 0 : f2.addEventListener("abort", r4), () => {
+                  f2 == null ? void 0 : f2.removeEventListener("abort", r4);
+                };
+              },
+              cancel() {
+                z.current = null;
               }
-            ]);
-            let _2 = e.send_prompt({
+            });
+            return e.send_prompt({
               messages: r3,
               config: h2
-            }), v2 = await new Promise((e2, r4) => {
-              let c4 = () => {
-                r4(new DOMException("Aborted", "AbortError"));
-              };
-              f2 == null ? void 0 : f2.addEventListener("abort", c4), _2.then(e2).catch(r4).finally(() => {
-                f2 == null ? void 0 : f2.removeEventListener("abort", c4);
-              });
+            }).catch((e2) => {
+              var _a4;
+              (_a4 = z.current) == null ? void 0 : _a4.error(e2), z.current = null;
+            }), createUIMessageStreamResponse({
+              stream: c3
             });
-            return v2 === null ? (Logger.error("Non-frontend-managed response is null", {
-              response: v2
-            }), new Response("Internal server error", {
-              status: 500
-            })) : (I.current.backendMessageId === null && I.current.frontendMessageIndex === null && zY((e2) => {
-              let r4 = [
-                ...e2
-              ], d3 = r4.findIndex((e3) => e3.id === c3);
-              return d3 !== -1 && (r4[d3] = {
-                ...r4[d3],
-                parts: [
-                  {
-                    type: "text",
-                    text: v2
-                  }
-                ]
-              }), r4;
-            }), new Response(v2));
           } catch (e2) {
             if (I.current = {
               backendMessageId: null,
               frontendMessageIndex: null
-            }, e2.name === "AbortError") return new Response("Aborted", {
+            }, e2 instanceof Error && e2.name === "AbortError") return new Response("Aborted", {
               status: 499
             });
-            let r3 = e2.message.split("failed with exception ").pop();
+            let r3 = (_a3 = e2.message) == null ? void 0 : _a3.split("failed with exception ").pop();
             return new Response(r3, {
               status: 400
             });
@@ -71341,7 +71293,7 @@ Image URL: ${r.imageUrl}`)), contextToXml({
         y(void 0), S.current && (S.current.value = ""), Logger.debug("Finished streaming message:", r2), I.current = {
           backendMessageId: null,
           frontendMessageIndex: null
-        }, e.frontendManaged && e.setValue(r2.messages);
+        }, e.setValue(r2.messages);
       },
       onError: (e2) => {
         Logger.error("An error occurred:", e2), I.current = {
@@ -71350,52 +71302,13 @@ Image URL: ${r.imageUrl}`)), contextToXml({
         };
       }
     });
-    useEventListener(e.host, MarimoIncomingMessageEvent.TYPE, (r2) => {
-      let c2 = r2.detail.message;
-      if (typeof c2 != "object" || !c2 || !("type" in c2) || c2.type !== "stream_chunk") return;
-      if (e.frontendManaged) {
-        let e2 = z.current;
-        if (!e2) return;
-        let r3 = c2;
-        r3.content && e2.enqueue(r3.content), r3.is_final && (e2.close(), z.current = null);
-        return;
-      }
-      let d2 = c2;
-      I.current.backendMessageId === null && zY((e2) => {
-        let r3 = [
-          ...e2
-        ];
-        for (let e3 = r3.length - 1; e3 >= 0; e3--) if (r3[e3].role === "assistant") {
-          I.current = {
-            backendMessageId: d2.message_id,
-            frontendMessageIndex: e3
-          };
-          break;
-        }
-        return r3;
-      });
-      let f2 = I.current.frontendMessageIndex;
-      I.current.backendMessageId === d2.message_id && f2 !== null && (zY((e2) => {
-        let r3 = [
-          ...e2
-        ], c3 = f2;
-        if (c3 < r3.length) {
-          let e3 = r3[c3];
-          e3.role === "assistant" && (r3[c3] = {
-            ...e3,
-            parts: [
-              {
-                type: "text",
-                text: d2.content
-              }
-            ]
-          });
-        }
-        return r3;
-      }), d2.is_final && (I.current = {
-        backendMessageId: null,
-        frontendMessageIndex: null
-      }));
+    useEventListener(e.host, MarimoIncomingMessageEvent.TYPE, (e2) => {
+      let r2 = e2.detail.message;
+      if (typeof r2 != "object" || !r2 || !("type" in r2) || r2.type !== "stream_chunk") return;
+      let c2 = z.current;
+      if (!c2) return;
+      let d2 = r2;
+      d2.content && c2.enqueue(d2.content), d2.is_final && (c2.close(), z.current = null);
     });
     let GY = BY === "submitted" || BY === "streaming", KY = (r2) => {
       let c2 = LY.findIndex((e2) => e2.id === r2);
@@ -71403,7 +71316,7 @@ Image URL: ${r.imageUrl}`)), contextToXml({
         let d2 = LY.filter((e2) => e2.id !== r2);
         e.delete_chat_message({
           index: c2
-        }), zY(d2), e.frontendManaged && e.setValue(d2);
+        }), zY(d2), e.setValue(d2);
       }
     }, qY = Array.isArray(e.allowAttachments) && e.allowAttachments.length > 0 || e.allowAttachments === true, JY = {
       triggerCompletionRegex: /^\/(\w+)?/,
@@ -71509,7 +71422,7 @@ Image URL: ${r.imageUrl}`)), contextToXml({
                     ]
                   })
                 ]
-              }, e2.id);
+              }, `${e2.id}-${r2}`);
             }),
             GY && (0, import_jsx_runtime.jsxs)("div", {
               className: "flex items-center justify-center space-x-2 mb-4",
@@ -71975,8 +71888,7 @@ Image URL: ${r.imageUrl}`)), contextToXml({
     allowAttachments: union([
       boolean$2(),
       string$2().array()
-    ]),
-    frontendManaged: boolean$2()
+    ])
   })).withFunctions({
     get_chat_history: rpc.input(object$1({})).output(object$1({
       messages: messageSchema
@@ -71988,10 +71900,7 @@ Image URL: ${r.imageUrl}`)), contextToXml({
     send_prompt: rpc.input(object$1({
       messages: messageSchema,
       config: configSchema
-    })).output(union([
-      string$2(),
-      _null()
-    ]))
+    })).output(unknown())
   }).renderer((e) => {
     var _a2;
     return (0, import_jsx_runtime.jsx)(TooltipProvider, {
@@ -72001,7 +71910,6 @@ Image URL: ${r.imageUrl}`)), contextToXml({
           showConfigurationControls: e.data.showConfigurationControls,
           maxHeight: e.data.maxHeight,
           allowAttachments: e.data.allowAttachments,
-          frontendManaged: e.data.frontendManaged,
           config: e.data.config,
           get_chat_history: e.functions.get_chat_history,
           delete_chat_history: e.functions.delete_chat_history,
@@ -101153,7 +101061,7 @@ Defaulting to \`null\`.`;
       return Logger.warn("Failed to get version from mount config"), null;
     }
   }
-  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.19.3-dev42"), showCodeInRunModeAtom = atom(true);
+  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.19.3-dev45"), showCodeInRunModeAtom = atom(true);
   atom(null);
   var VIRTUAL_FILE_REGEX = /\/@file\/([^\s"&'/]+)\.([\dA-Za-z]+)/g, VirtualFileTracker = class e {
     constructor() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/islands",
-  "version": "0.19.3-dev42",
+  "version": "0.19.3-dev45",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/plugins/impl/chat/ChatPlugin.tsx

@@ -15,7 +15,7 @@ export type PluginFunctions = {
   get_chat_history: (req: {}) => Promise<{ messages: UIMessage[] }>;
   delete_chat_history: (req: {}) => Promise<null>;
   delete_chat_message: (req: { index: number }) => Promise<null>;
-  send_prompt: (req: SendMessageRequest) => Promise<string | null>;
+  send_prompt: (req: SendMessageRequest) => Promise<unknown>;
 };
 
 const messageSchema = z.array(
@@ -47,7 +47,6 @@ export const ChatPlugin = createPlugin<{ messages: UIMessage[] }>(
       maxHeight: z.number().optional(),
       config: configSchema,
       allowAttachments: z.union([z.boolean(), z.string().array()]),
-      frontendManaged: z.boolean(),
     }),
   )
   .withFunctions<PluginFunctions>({
@@ -67,7 +66,7 @@ export const ChatPlugin = createPlugin<{ messages: UIMessage[] }>(
           config: configSchema,
         }),
       )
-      .output(z.union([z.string(), z.null()])),
+      .output(z.unknown()),
   })
   .renderer((props) => (
     <TooltipProvider>
@@ -77,7 +76,6 @@ export const ChatPlugin = createPlugin<{ messages: UIMessage[] }>(
           showConfigurationControls={props.data.showConfigurationControls}
           maxHeight={props.data.maxHeight}
           allowAttachments={props.data.allowAttachments}
-          frontendManaged={props.data.frontendManaged}
           config={props.data.config}
           get_chat_history={props.functions.get_chat_history}
           delete_chat_history={props.functions.delete_chat_history}

package/src/plugins/impl/chat/chat-ui.tsx

@@ -66,7 +66,6 @@ interface Props extends PluginFunctions {
   showConfigurationControls: boolean;
   maxHeight: number | undefined;
   allowAttachments: boolean | string[];
-  frontendManaged: boolean;
   value: UIMessage[];
   setValue: (messages: UIMessage[]) => void;
   host: HTMLElement;
@@ -166,113 +165,42 @@ export const Chatbot: React.FC<Props> = (props) => {
             };
           });
 
-          if (props.frontendManaged) {
-            const stream = new ReadableStream<UIMessageChunk>({
-              start(controller) {
-                frontendStreamControllerRef.current = controller;
+          const stream = new ReadableStream<UIMessageChunk>({
+            start(controller) {
+              frontendStreamControllerRef.current = controller;
 
-                const abortHandler = () => {
-                  try {
-                    controller.close();
-                  } catch (error) {
-                    Logger.debug("Controller may already be closed", { error });
-                  }
-                  frontendStreamControllerRef.current = null;
-                };
-                signal?.addEventListener("abort", abortHandler);
-
-                return () => {
-                  signal?.removeEventListener("abort", abortHandler);
-                };
-              },
-              cancel() {
-                frontendStreamControllerRef.current = null;
-              },
-            });
-
-            // Start the prompt, chunks will be sent via events
-            props
-              .send_prompt({
-                messages: messages,
-                config: chatConfig,
-              })
-              .catch((error: Error) => {
-                frontendStreamControllerRef.current?.error(error);
-                frontendStreamControllerRef.current = null;
-              });
-
-            return createUIMessageStreamResponse({ stream });
-          }
-
-          if (signal?.aborted) {
-            return new Response("Aborted", { status: 499 });
-          }
-
-          // Create a placeholder message for streaming (backend-managed)
-          const messageId = Date.now().toString();
-
-          setMessages((prev) => [
-            ...prev,
-            {
-              id: messageId,
-              role: "assistant",
-              parts: [{ type: "text", text: "" }],
-            },
-          ]);
-
-          // Create an abort-aware promise for the send_prompt call
-          const sendPromptPromise = props.send_prompt({
-            messages: messages,
-            config: chatConfig,
-          });
-
-          // Race the send_prompt with an abort signal
-          const response = await new Promise<string | null>(
-            (resolve, reject) => {
-              // Listen for abort
               const abortHandler = () => {
-                reject(new DOMException("Aborted", "AbortError"));
+                try {
+                  controller.close();
+                } catch (error) {
+                  Logger.debug("Controller may already be closed", { error });
+                }
+                frontendStreamControllerRef.current = null;
               };
               signal?.addEventListener("abort", abortHandler);
 
-              sendPromptPromise
-                .then(resolve)
-                .catch(reject)
-                .finally(() => {
-                  signal?.removeEventListener("abort", abortHandler);
-                });
+              return () => {
+                signal?.removeEventListener("abort", abortHandler);
+              };
             },
-          );
+            cancel() {
+              frontendStreamControllerRef.current = null;
+            },
+          });
 
-          if (response === null) {
-            Logger.error("Non-frontend-managed response is null", {
-              response,
+          // Start the prompt, chunks will be sent via events
+          void props
+            .send_prompt({
+              messages: messages,
+              config: chatConfig,
+            })
+            .catch((error: Error) => {
+              frontendStreamControllerRef.current?.error(error);
+              frontendStreamControllerRef.current = null;
             });
-            return new Response("Internal server error", { status: 500 });
-          }
 
-          // If streaming didn't happen (non-generator response), update the message
-          // Check if streaming state is still set (meaning no chunks were received)
-          if (
-            streamingStateRef.current.backendMessageId === null &&
-            streamingStateRef.current.frontendMessageIndex === null
-          ) {
-            setMessages((prev) => {
-              const updated = [...prev];
-              const index = updated.findIndex((m) => m.id === messageId);
-              if (index !== -1) {
-                updated[index] = {
-                  ...updated[index],
-                  parts: [{ type: "text", text: response }],
-                };
-              }
-              return updated;
-            });
-          }
-
-          return new Response(response);
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        } catch (error: any) {
+          return createUIMessageStreamResponse({ stream });
+        } catch (error: unknown) {
           // Clear streaming state on error
           streamingStateRef.current = {
             backendMessageId: null,
@@ -280,13 +208,13 @@ export const Chatbot: React.FC<Props> = (props) => {
           };
 
           // Handle abort gracefully without showing an error
-          if (error.name === "AbortError") {
+          if (error instanceof Error && error.name === "AbortError") {
             return new Response("Aborted", { status: 499 });
           }
 
           // HACK: strip the error message to clean up the response
-          const strippedError = error.message
-            .split("failed with exception ")
+          const strippedError = (error as Error).message
+            ?.split("failed with exception ")
             .pop();
           return new Response(strippedError, { status: 400 });
         }
@@ -307,11 +235,7 @@ export const Chatbot: React.FC<Props> = (props) => {
         frontendMessageIndex: null,
       };
 
-      // For frontend-managed streaming, we set the value directly from the frontend.
-      // Because useChat creates the proper message structure for us.
-      if (props.frontendManaged) {
-        props.setValue(message.messages);
-      }
+      props.setValue(message.messages);
     },
     onError: (error) => {
       Logger.error("An error occurred:", error);
@@ -338,90 +262,28 @@ export const Chatbot: React.FC<Props> = (props) => {
         return;
       }
 
-      if (props.frontendManaged) {
-        // Push to the stream for useChat to process
-        const controller = frontendStreamControllerRef.current;
-        if (!controller) {
-          return;
-        }
-
-        const frontendMessage = message as {
-          type: string;
-          message_id: string;
-          content?: UIMessageChunk;
-          is_final?: boolean;
-        };
-
-        if (frontendMessage.content) {
-          controller.enqueue(frontendMessage.content);
-        }
-        if (frontendMessage.is_final) {
-          controller.close();
-          frontendStreamControllerRef.current = null;
-        }
+      // Push to the stream for useChat to process
+      const controller = frontendStreamControllerRef.current;
+      if (!controller) {
         return;
       }
 
-      // Handle regular text streaming chunks
-      const chunkMessage = message as {
+      const frontendMessage = message as {
         type: string;
         message_id: string;
-        content: string;
-        is_final: boolean;
+        content?: UIMessageChunk;
+        is_final?: boolean;
       };
 
-      // Initialize streaming state on first chunk if not already set
-      if (streamingStateRef.current.backendMessageId === null) {
-        // Find the last assistant message (which should be the placeholder we created)
-        setMessages((prev) => {
-          const updated = [...prev];
-          // Find the last assistant message
-          for (let i = updated.length - 1; i >= 0; i--) {
-            if (updated[i].role === "assistant") {
-              streamingStateRef.current = {
-                backendMessageId: chunkMessage.message_id,
-                frontendMessageIndex: i,
-              };
-              break;
-            }
-          }
-          return updated;
-        });
+      if (frontendMessage.content) {
+        controller.enqueue(frontendMessage.content);
       }
-
-      // Only process chunks for the current streaming message
-      const frontendIndex = streamingStateRef.current.frontendMessageIndex;
-      if (
-        streamingStateRef.current.backendMessageId ===
-          chunkMessage.message_id &&
-        frontendIndex !== null
-      ) {
-        setMessages((prev) => {
-          const updated = [...prev];
-          const index = frontendIndex;
-
-          // Update the message at the tracked index
-          if (index < updated.length) {
-            const messageToUpdate = updated[index];
-            if (messageToUpdate.role === "assistant") {
-              updated[index] = {
-                ...messageToUpdate,
-                parts: [{ type: "text", text: chunkMessage.content }],
-              };
-            }
-          }
-
-          return updated;
-        });
-
-        // Clear streaming state when final chunk arrives
-        if (chunkMessage.is_final) {
-          streamingStateRef.current = {
-            backendMessageId: null,
-            frontendMessageIndex: null,
-          };
-        }
+      if (frontendMessage.is_final) {
+        controller.close();
+        frontendStreamControllerRef.current = null;
       }
+
+      return;
     },
   );
 
@@ -434,10 +296,7 @@ export const Chatbot: React.FC<Props> = (props) => {
       props.delete_chat_message({ index });
       setMessages(newMessages);
 
-      // Since we manage the state in the frontend, we need to update the value.
-      if (props.frontendManaged) {
-        props.setValue(newMessages);
-      }
+      props.setValue(newMessages);
     }
   };
 
@@ -526,7 +385,7 @@ export const Chatbot: React.FC<Props> = (props) => {
 
           return (
             <div
-              key={message.id}
+              key={`${message.id}-${index}`}
               className={cn(
                 "flex flex-col group gap-2",
                 message.role === "user" ? "items-end" : "items-start",