@marimo-team/frontend 0.25.2-dev121 → 0.25.2-dev122

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/frontend",
-  "version": "0.25.2-dev121",
+  "version": "0.25.2-dev122",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/components/editor/controls/__tests__/notebook-menu-dropdown.test.tsx

@@ -10,6 +10,7 @@ import {
 import { Provider } from "jotai";
 import type React from "react";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { requestId } from "@/__tests__/branded";
 import { MockRequestClient } from "@/__mocks__/requests";
 import { ModalProvider } from "@/components/modal/ImperativeModal";
 import { TooltipProvider } from "@/components/ui/tooltip";
@@ -129,7 +130,7 @@ describe("NotebookMenuDropdown", () => {
     }));
     invalidateDataSourceDiscovery();
     vi.spyOn(DiscoverDataSources, "request").mockResolvedValue({
-      request_id: "request-id",
+      request_id: requestId("request-id"),
       sources: [],
     });
   });
@@ -142,7 +143,7 @@ describe("NotebookMenuDropdown", () => {
 
   it("shows detected databases in the add connection submenu", async () => {
     vi.mocked(DiscoverDataSources.request).mockResolvedValue({
-      request_id: "request-id",
+      request_id: requestId("request-id"),
       sources: [POSTGRES_SOURCE],
     });
 
@@ -172,7 +173,7 @@ describe("NotebookMenuDropdown", () => {
 
   it("shows detected storage in the add remote storage submenu", async () => {
     vi.mocked(DiscoverDataSources.request).mockResolvedValue({
-      request_id: "request-id",
+      request_id: requestId("request-id"),
       sources: [S3_SOURCE],
     });
 

package/src/components/storage/__tests__/storage-file-viewer.test.tsx

@@ -2,6 +2,7 @@
 
 import { render, screen } from "@testing-library/react";
 import { afterEach, describe, expect, it, vi } from "vitest";
+import { requestId } from "@/__tests__/branded";
 import { TooltipProvider } from "@/components/ui/tooltip";
 import { DownloadStorage } from "@/core/storage/request-registry";
 import { StorageFileViewer } from "../storage-file-viewer";
@@ -41,7 +42,7 @@ describe("StorageFileViewer", () => {
 
   it("renders TOML from generic storage metadata as read-only TOML", async () => {
     const request = vi.spyOn(DownloadStorage, "request").mockResolvedValue({
-      request_id: "request-id",
+      request_id: requestId("request-id"),
       url: "https://example.com/pyproject.toml?signature=secret",
     });
     vi.stubGlobal(

package/src/core/codemirror/language/__tests__/sql.test.ts

@@ -8,6 +8,7 @@ import { EditorState, type Extension } from "@codemirror/state";
 import { EditorView } from "@codemirror/view";
 import { DuckDBDialect } from "@marimo-team/codemirror-sql/dialects";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { requestId } from "@/__tests__/branded";
 import type { CellId } from "@/core/cells/ids";
 import type {
   CompletionConfig,
@@ -1106,7 +1107,7 @@ describe("CustomSqlParser", () => {
     const request = vi.spyOn(ValidateSQL, "request").mockResolvedValue({
       error: null,
       parse_result: { success: false, errors: [error] },
-      request_id: "request-id",
+      request_id: requestId("request-id"),
       validate_result: null,
     });
     const state = EditorState.create({
@@ -1150,7 +1151,7 @@ describe("CustomSqlParser", () => {
     vi.spyOn(ValidateSQL, "request").mockResolvedValue({
       error: null,
       parse_result: { success: false, errors: [error] },
-      request_id: "request-id",
+      request_id: requestId("request-id"),
       validate_result: null,
     });
     const state = EditorState.create({
@@ -1194,7 +1195,7 @@ describe("CustomSqlParser", () => {
     const request = vi.spyOn(ValidateSQL, "request").mockResolvedValue({
       error: null,
       parse_result: { success: false, errors: [error] },
-      request_id: "request-id",
+      request_id: requestId("request-id"),
       validate_result: null,
     });
     const state = createNamedConnectionState({

package/src/core/datasets/__tests__/data-source-discovery.test.ts

@@ -1,5 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { requestId } from "@/__tests__/branded";
+import type { DataSourceDiscoveryResult } from "@/core/kernel/messages";
 import { connectionAtom } from "@/core/network/connection";
 import { store } from "@/core/state/jotai";
 import { ConnectionState } from "@/core/websocket/types";
@@ -41,7 +43,7 @@ describe("fetchDataSourceDiscovery", () => {
   it("shares a single in-flight request across concurrent callers", async () => {
     const request = vi
       .spyOn(DiscoverDataSources, "request")
-      .mockResolvedValue({ request_id: "request-id", sources: [] });
+      .mockResolvedValue({ request_id: requestId("request-id"), sources: [] });
 
     await Promise.all([
       fetchDataSourceDiscovery(),
@@ -55,7 +57,7 @@ describe("fetchDataSourceDiscovery", () => {
   it("re-runs discovery after the cache is invalidated", async () => {
     const request = vi
       .spyOn(DiscoverDataSources, "request")
-      .mockResolvedValue({ request_id: "request-id", sources: [] });
+      .mockResolvedValue({ request_id: requestId("request-id"), sources: [] });
 
     await fetchDataSourceDiscovery();
     invalidateDataSourceDiscovery();
@@ -68,7 +70,10 @@ describe("fetchDataSourceDiscovery", () => {
     const request = vi
       .spyOn(DiscoverDataSources, "request")
       .mockRejectedValueOnce(new Error("boom"))
-      .mockResolvedValueOnce({ request_id: "request-id", sources: [] });
+      .mockResolvedValueOnce({
+        request_id: requestId("request-id"),
+        sources: [],
+      });
 
     await expect(fetchDataSourceDiscovery()).rejects.toThrow("boom");
     await expect(fetchDataSourceDiscovery()).resolves.toEqual([]);
@@ -77,16 +82,18 @@ describe("fetchDataSourceDiscovery", () => {
 
   it("does not clear a newer cache entry when an invalidated request fails", async () => {
     let rejectFirstRequest: ((error: Error) => void) | undefined;
-    const firstRequest = new Promise<{
-      request_id: string;
-      sources: DetectedDataSource[];
-    }>((_resolve, reject) => {
-      rejectFirstRequest = reject;
-    });
+    const firstRequest = new Promise<DataSourceDiscoveryResult>(
+      (_resolve, reject) => {
+        rejectFirstRequest = reject;
+      },
+    );
     const request = vi
       .spyOn(DiscoverDataSources, "request")
       .mockReturnValueOnce(firstRequest)
-      .mockResolvedValueOnce({ request_id: "request-id", sources: [] });
+      .mockResolvedValueOnce({
+        request_id: requestId("request-id"),
+        sources: [],
+      });
 
     const staleResult = fetchDataSourceDiscovery().catch((error) => error);
     await vi.waitFor(() => expect(request).toHaveBeenCalledTimes(1));
@@ -116,7 +123,7 @@ describe("fetchDataSourceDiscovery", () => {
       }),
     ];
     vi.spyOn(DiscoverDataSources, "request").mockResolvedValue({
-      request_id: "request-id",
+      request_id: requestId("request-id"),
       sources,
     });
 

package/src/core/islands/bridge.ts

@@ -7,7 +7,7 @@ import { throwNotImplemented } from "@/utils/functions";
 import { Logger } from "@/utils/Logger";
 import { generateUUID } from "@/utils/uuid";
 import { initialNotebookState, notebookAtom } from "../cells/cells";
-import type { CommandMessage } from "../kernel/messages";
+import type { ClientCommand } from "../kernel/messages";
 import type { EditRequests, RunRequests } from "../network/types";
 import { store as defaultStore } from "../state/jotai";
 import { getMarimoExportContext } from "../static/export-context";
@@ -392,7 +392,7 @@ export class IslandsPyodideBridge implements RunRequests, EditRequests {
   // The kernel uses msgspec to parse control requests, which requires a 'type'
   // field for discriminated union deserialization.
   private async putControlRequest(
-    operation: CommandMessage,
+    operation: ClientCommand,
     session?: AppSession,
   ): Promise<void> {
     session ??= await this.getActiveSession();

package/src/core/kernel/messages.ts

@@ -55,7 +55,7 @@ export type Capabilities =
 export type CacheInfoFetched = NotificationMessageData<"cache-info">;
 
 export type NotificationMessage = schemas["KnownUnions"]["notification"];
-export type CommandMessage = schemas["KnownUnions"]["command"];
+export type ClientCommand = schemas["KnownUnions"]["command"];
 
 export type NotificationMessageType = NotificationMessage["op"];
 export interface NotificationPayload {

package/src/core/wasm/bridge.ts

@@ -11,7 +11,7 @@ import { reloadSafe } from "@/utils/reload-safe";
 import { generateUUID } from "@/utils/uuid";
 import { createModuleWorker } from "@/utils/worker";
 import { notebookIsRunningAtom } from "../cells/cells";
-import type { CommandMessage } from "../kernel/messages";
+import type { ClientCommand } from "../kernel/messages";
 import { getInitialAppMode } from "../mode";
 import { API } from "../network/api";
 import { withDevAssetUrl } from "../network/export-asset-url";
@@ -711,7 +711,7 @@ export class PyodideBridge implements RunRequests, EditRequests {
   public listStorageEntries = throwNotImplemented;
   public downloadStorage = throwNotImplemented;
 
-  private async putControlRequest(operation: CommandMessage) {
+  private async putControlRequest(operation: ClientCommand) {
     await this.rpc.proxy.request.bridge({
       functionName: "put_control_request",
       payload: operation,

package/src/core/wasm/worker/types.ts

@@ -3,7 +3,7 @@ import type { PyodideInterface } from "pyodide";
 import type { WasmRuntimeConfig } from "../runtime-config";
 import type { UserConfig } from "@/core/config/config-schema";
 import type {
-  CommandMessage,
+  ClientCommand,
   NotificationPayload,
 } from "@/core/kernel/messages";
 import type { JsonString } from "@/utils/json/base64";
@@ -74,7 +74,7 @@ export interface WasmController {
 }
 
 export interface RawBridge {
-  put_control_request(operation: CommandMessage): Promise<string>;
+  put_control_request(operation: ClientCommand): Promise<string>;
   put_input(input: string): Promise<string>;
   code_complete(request: CodeCompletionRequest): Promise<string>;
   read_code(): Promise<{ contents: string }>;