@marimo-team/islands 0.20.2 → 0.20.3-dev76

package/src/components/storage/storage-inspector.tsx

@@ -0,0 +1,610 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { CommandList } from "cmdk";
+import {
+  ChevronRightIcon,
+  CopyIcon,
+  DownloadIcon,
+  FolderIcon,
+  HardDriveIcon,
+  HelpCircleIcon,
+  LoaderCircle,
+  MoreVerticalIcon,
+  RefreshCwIcon,
+  ViewIcon,
+  XIcon,
+} from "lucide-react";
+import React, { useCallback, useState } from "react";
+import { useLocale } from "react-aria";
+import { EngineVariable } from "@/components/databases/engine-variable";
+import { PanelEmptyState } from "@/components/editor/chrome/panels/empty-state";
+import { Command, CommandInput, CommandItem } from "@/components/ui/command";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+import { Tooltip } from "@/components/ui/tooltip";
+import { toast } from "@/components/ui/use-toast";
+import { DownloadStorage } from "@/core/storage/request-registry";
+import {
+  useStorage,
+  useStorageActions,
+  useStorageEntries,
+} from "@/core/storage/state";
+import type {
+  StorageEntry,
+  StorageNamespace,
+  StoragePathKey,
+} from "@/core/storage/types";
+import { storagePathKey, storageUrl } from "@/core/storage/types";
+import type { VariableName } from "@/core/variables/types";
+import { cn } from "@/utils/cn";
+import { copyToClipboard } from "@/utils/copy";
+import { downloadByURL } from "@/utils/download";
+import { formatBytes } from "@/utils/formatting";
+import { Logger } from "@/utils/Logger";
+import { ErrorState } from "../datasources/components";
+import { Button } from "../ui/button";
+import { ProtocolIcon, renderFileIcon } from "./components";
+import { StorageFileViewer } from "./storage-file-viewer";
+
+interface OpenFileInfo {
+  entry: StorageEntry;
+  namespace: string;
+}
+
+// Pixels per depth level. Applied as paddingLeft on each full-width item
+// so the selection highlight still spans the entire panel.
+const INDENT_PX = 16;
+
+function indentStyle(depth: number): React.CSSProperties {
+  return { paddingLeft: depth * INDENT_PX };
+}
+
+function formatDate(timestamp: number, locale: string): string {
+  const date = new Date(timestamp * 1000);
+  return date.toLocaleDateString(locale, {
+    month: "short",
+    day: "numeric",
+    hour: "2-digit",
+    minute: "2-digit",
+  });
+}
+
+/** Extract display name from a full path (e.g., "folder/subfolder/" -> "subfolder") */
+function displayName(path: string): string {
+  // Remove trailing slash
+  const trimmed = path.endsWith("/") ? path.slice(0, -1) : path;
+  const parts = trimmed.split("/");
+  return parts[parts.length - 1] || trimmed;
+}
+
+/**
+ * Recursively check whether an entry (or any of its loaded descendants)
+ * matches the search query.
+ */
+function entryMatchesSearch(
+  entry: StorageEntry,
+  namespace: string,
+  searchValue: string,
+  entriesByPath: ReadonlyMap<StoragePathKey, StorageEntry[]>,
+): boolean {
+  const query = searchValue.toLowerCase();
+
+  if (displayName(entry.path).toLowerCase().includes(query)) {
+    return true;
+  }
+
+  // For directories, check loaded children recursively
+  if (entry.kind === "directory") {
+    const children = entriesByPath.get(storagePathKey(namespace, entry.path));
+    if (children) {
+      return children.some((child) =>
+        entryMatchesSearch(child, namespace, searchValue, entriesByPath),
+      );
+    }
+  }
+
+  return false;
+}
+
+/**
+ * Filter entries to those matching the search (or having loaded descendants
+ * that match). Returns all entries when there is no active search.
+ */
+function filterEntries(
+  entries: StorageEntry[],
+  namespace: string,
+  searchValue: string,
+  entriesByPath: ReadonlyMap<StoragePathKey, StorageEntry[]>,
+): StorageEntry[] {
+  if (!searchValue.trim()) {
+    return entries;
+  }
+  return entries.filter((entry) =>
+    entryMatchesSearch(entry, namespace, searchValue, entriesByPath),
+  );
+}
+
+/**
+ * Lazily loaded children of a directory entry.
+ * Caches fetched entries in the Jotai store so re-expanding doesn't re-fetch.
+ */
+const StorageEntryChildren: React.FC<{
+  namespace: string;
+  protocol: string;
+  rootPath: string;
+  prefix: string;
+  depth: number;
+  locale: string;
+  searchValue: string;
+  onOpenFile: (info: OpenFileInfo) => void;
+}> = ({
+  namespace,
+  protocol,
+  rootPath,
+  prefix,
+  depth,
+  locale,
+  searchValue,
+  onOpenFile,
+}) => {
+  const { entriesByPath } = useStorage();
+  const {
+    entries: children,
+    isPending,
+    error,
+  } = useStorageEntries(namespace, prefix);
+
+  if (isPending) {
+    return (
+      <div
+        className="flex items-center gap-1.5 py-1 text-xs text-muted-foreground"
+        style={indentStyle(depth)}
+      >
+        <LoaderCircle className="h-3 w-3 animate-spin" />
+        Loading...
+      </div>
+    );
+  }
+
+  if (error) {
+    return (
+      <div className="py-1 text-xs text-destructive" style={indentStyle(depth)}>
+        Failed to load: {error.message}
+      </div>
+    );
+  }
+
+  if (children.length === 0) {
+    return (
+      <div
+        className="py-1 text-xs text-muted-foreground italic"
+        style={indentStyle(depth)}
+      >
+        Empty
+      </div>
+    );
+  }
+
+  const filtered = filterEntries(
+    children,
+    namespace,
+    searchValue,
+    entriesByPath,
+  );
+
+  return (
+    <>
+      {filtered.map((child) => (
+        <StorageEntryRow
+          key={child.path}
+          entry={child}
+          namespace={namespace}
+          protocol={protocol}
+          rootPath={rootPath}
+          depth={depth}
+          locale={locale}
+          searchValue={searchValue}
+          onOpenFile={onOpenFile}
+        />
+      ))}
+    </>
+  );
+};
+
+const StorageEntryRow: React.FC<{
+  entry: StorageEntry;
+  namespace: string;
+  protocol: string;
+  rootPath: string;
+  depth: number;
+  locale: string;
+  searchValue: string;
+  onOpenFile: (info: OpenFileInfo) => void;
+}> = ({
+  entry,
+  namespace,
+  protocol,
+  rootPath,
+  depth,
+  locale,
+  searchValue,
+  onOpenFile,
+}) => {
+  const [isExpanded, setIsExpanded] = useState(false);
+  const { entriesByPath } = useStorage();
+  const isDir = entry.kind === "directory";
+  const name = displayName(entry.path);
+  const hasSearch = !!searchValue.trim();
+
+  // During a search, auto-expand directories whose loaded descendants match
+  const hasMatchingDescendants =
+    isDir &&
+    hasSearch &&
+    !!entriesByPath
+      .get(storagePathKey(namespace, entry.path))
+      ?.some((child) =>
+        entryMatchesSearch(child, namespace, searchValue, entriesByPath),
+      );
+
+  // Folder is shown expanded by manual toggle OR by search auto-expand
+  const effectiveExpanded = isExpanded || hasMatchingDescendants;
+
+  const handleDownload = useCallback(async () => {
+    try {
+      const result = await DownloadStorage.request({
+        namespace,
+        path: entry.path,
+      });
+      if (result.error) {
+        toast({
+          title: "Download failed",
+          description: result.error,
+          variant: "danger",
+        });
+        return;
+      }
+      if (result.url) {
+        downloadByURL(result.url, result.filename ?? "download");
+      }
+    } catch (error) {
+      Logger.error("Failed to download storage entry", error);
+      toast({
+        title: "Download failed",
+        description: String(error),
+        variant: "danger",
+      });
+    }
+  }, [namespace, entry.path]);
+
+  return (
+    <>
+      <CommandItem
+        className={cn(
+          "text-xs flex items-center gap-1.5 cursor-pointer rounded-none group h-6.5",
+          isDir && "font-medium",
+        )}
+        style={indentStyle(depth)}
+        value={`${namespace}:${entry.path}`}
+        onSelect={() => {
+          if (isDir) {
+            setIsExpanded(!effectiveExpanded);
+          } else {
+            onOpenFile({ entry, namespace });
+          }
+        }}
+      >
+        {isDir ? (
+          <ChevronRightIcon
+            className={cn(
+              "h-3 w-3 shrink-0 transition-transform",
+              effectiveExpanded && "rotate-90",
+            )}
+          />
+        ) : (
+          <span className="w-3 shrink-0" />
+        )}
+        {isDir ? (
+          <FolderIcon className="h-3.5 w-3.5 text-amber-500 shrink-0" />
+        ) : (
+          renderFileIcon(name)
+        )}
+        <span className="truncate flex-1 text-left">{name}</span>
+        <div className="flex items-center">
+          {entry.size > 0 && (
+            <span className="text-[10px] text-muted-foreground pr-2 opacity-0 group-hover:opacity-100 transition-opacity tabular-nums">
+              {formatBytes(entry.size, locale)}
+            </span>
+          )}
+          {entry.lastModified != null && (
+            <Tooltip
+              content={`Last modified: ${new Date(entry.lastModified * 1000).toLocaleString()}`}
+            >
+              <span className="text-[10px] text-muted-foreground pr-1 opacity-0 group-hover:opacity-100 transition-opacity whitespace-nowrap">
+                {formatDate(entry.lastModified, locale)}
+              </span>
+            </Tooltip>
+          )}
+          <DropdownMenu>
+            <DropdownMenuTrigger asChild={true}>
+              <Button
+                variant="text"
+                size="icon"
+                className="opacity-0 group-hover:opacity-100 transition-opacity hover:shadow-none hover:text-link text-muted-foreground"
+                onClick={(e) => e.stopPropagation()}
+              >
+                <MoreVerticalIcon className="h-3 w-3" />
+              </Button>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent
+              align="end"
+              onClick={(e) => e.stopPropagation()}
+              onCloseAutoFocus={(e) => e.preventDefault()}
+            >
+              {!isDir && (
+                <DropdownMenuItem
+                  onSelect={() => onOpenFile({ entry, namespace })}
+                >
+                  <ViewIcon className="h-3.5 w-3.5 mr-2" />
+                  View
+                </DropdownMenuItem>
+              )}
+              <DropdownMenuItem
+                onSelect={async () => {
+                  const url = storageUrl(protocol, rootPath, entry.path);
+                  await copyToClipboard(url.toString());
+                  toast({ title: "Copied to clipboard" });
+                }}
+              >
+                <CopyIcon className="h-3.5 w-3.5 mr-2" />
+                Copy URL
+              </DropdownMenuItem>
+              {!isDir && (
+                <DropdownMenuItem onSelect={() => handleDownload()}>
+                  <DownloadIcon className="h-3.5 w-3.5 mr-2" />
+                  Download
+                </DropdownMenuItem>
+              )}
+            </DropdownMenuContent>
+          </DropdownMenu>
+        </div>
+      </CommandItem>
+      {isDir && effectiveExpanded && (
+        <StorageEntryChildren
+          namespace={namespace}
+          protocol={protocol}
+          rootPath={rootPath}
+          prefix={entry.path}
+          depth={depth + 1}
+          locale={locale}
+          searchValue={searchValue}
+          onOpenFile={onOpenFile}
+        />
+      )}
+    </>
+  );
+};
+
+const StorageNamespaceSection: React.FC<{
+  namespace: StorageNamespace;
+  locale: string;
+  searchValue: string;
+  onOpenFile: (info: OpenFileInfo) => void;
+}> = ({ namespace, locale, searchValue, onOpenFile }) => {
+  const [isExpanded, setIsExpanded] = useState(true);
+  const [isSpinning, setIsSpinning] = useState(false);
+  const { entriesByPath } = useStorage();
+  const { clearNamespaceCache } = useStorageActions();
+  const namespaceName = namespace.name ?? namespace.displayName;
+
+  const {
+    entries: fetchedEntries,
+    isPending,
+    error,
+    refetch,
+  } = useStorageEntries(namespaceName);
+
+  const handleRefresh = useCallback(
+    (e: React.MouseEvent) => {
+      e.stopPropagation();
+      setIsSpinning(true);
+      clearNamespaceCache(namespaceName);
+      refetch();
+      setTimeout(() => setIsSpinning(false), 500);
+    },
+    [namespaceName, clearNamespaceCache, refetch],
+  );
+
+  // While loading, fall back to initial entries from the namespace notification
+  const entries = isPending ? namespace.storageEntries : fetchedEntries;
+  const filtered = filterEntries(
+    entries,
+    namespaceName,
+    searchValue,
+    entriesByPath,
+  );
+
+  return (
+    <>
+      <CommandItem
+        value={namespace.name}
+        onSelect={() => setIsExpanded(!isExpanded)}
+        className="flex flex-row font-semibold h-7 text-xs gap-1.5 bg-(--slate-2) text-muted-foreground rounded-none"
+      >
+        <ChevronRightIcon
+          className={cn(
+            "h-3 w-3 shrink-0 transition-transform",
+            isExpanded && "rotate-90",
+          )}
+        />
+        <ProtocolIcon protocol={namespace.protocol} />
+        <span>{namespace.displayName}</span>
+        {namespace.name && (
+          <span className="text-xs text-muted-foreground font-normal">
+            (<EngineVariable variableName={namespace.name as VariableName} />)
+          </span>
+        )}
+        <Tooltip content="Refresh storage connection">
+          <Button
+            variant="ghost"
+            size="icon"
+            className="hover:bg-transparent hover:shadow-none"
+            onClick={handleRefresh}
+          >
+            <RefreshCwIcon
+              className={cn(
+                "h-3 w-3 text-muted-foreground hover:text-foreground",
+                isSpinning && "animate-[spin_0.5s]",
+              )}
+            />
+          </Button>
+        </Tooltip>
+        <span className="text-[10px] text-muted-foreground font-normal tabular-nums ml-auto">
+          {namespace.rootPath || "(root)"}
+        </span>
+      </CommandItem>
+      {isExpanded && (
+        <>
+          {isPending && entries.length === 0 && (
+            <div
+              className="flex items-center gap-1.5 py-1 text-xs text-muted-foreground"
+              style={indentStyle(1)}
+            >
+              <LoaderCircle className="h-3 w-3 animate-spin" />
+              Loading...
+            </div>
+          )}
+          {error && entries.length === 0 && (
+            <ErrorState
+              error={error}
+              style={indentStyle(1)}
+              className="py-1 text-xs h-auto"
+              showIcon={false}
+            />
+          )}
+          {!isPending && entries.length === 0 && !error && (
+            <div
+              className="py-1 text-xs text-muted-foreground italic"
+              style={indentStyle(1)}
+            >
+              No entries
+            </div>
+          )}
+          {searchValue && filtered.length === 0 && entries.length > 0 && (
+            <div
+              className="py-1 text-xs text-muted-foreground italic"
+              style={indentStyle(1)}
+            >
+              No matches
+            </div>
+          )}
+          {filtered.map((entry) => (
+            <StorageEntryRow
+              key={entry.path}
+              entry={entry}
+              namespace={namespaceName}
+              protocol={namespace.protocol}
+              rootPath={namespace.rootPath}
+              depth={1}
+              locale={locale}
+              searchValue={searchValue}
+              onOpenFile={onOpenFile}
+            />
+          ))}
+        </>
+      )}
+    </>
+  );
+};
+
+export const StorageInspector: React.FC = () => {
+  const { namespaces } = useStorage();
+  const { locale } = useLocale();
+  const [searchValue, setSearchValue] = useState("");
+  const [openFile, setOpenFile] = useState<OpenFileInfo | null>(null);
+  const hasSearch = !!searchValue.trim();
+
+  if (namespaces.length === 0) {
+    return (
+      <PanelEmptyState
+        title="No storage connected"
+        description={
+          <span>
+            Create an Obstore or fsspec connection in your notebook. See the{" "}
+            <a
+              className="text-link"
+              href="https://docs.marimo.io/guides/working_with_data/remote_storage/#quick-start"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              docs
+            </a>
+            .
+          </span>
+        }
+        icon={<HardDriveIcon className="h-8 w-8" />}
+      />
+    );
+  }
+
+  return (
+    <div className="h-full flex flex-col">
+      {openFile && (
+        <StorageFileViewer
+          entry={openFile.entry}
+          namespace={openFile.namespace}
+          onBack={() => setOpenFile(null)}
+        />
+      )}
+      <Command
+        className={cn(
+          "border-b bg-background rounded-none h-full pb-10 overflow-auto outline-hidden scrollbar-thin",
+          // We want to keep the command open but hidden when a file is opened to preserve state (folders opened etc.)
+          // TODO: Preserve scroll position
+          openFile && "hidden",
+        )}
+        shouldFilter={false}
+      >
+        <div className="flex items-center w-full border-b">
+          <CommandInput
+            placeholder="Search entries..."
+            className="h-6 m-1"
+            value={searchValue}
+            onValueChange={setSearchValue}
+            rootClassName="flex-1 border-b-0"
+          />
+          {hasSearch && (
+            <Button
+              variant="text"
+              size="xs"
+              className="float-right border-none px-2 m-0 h-full"
+              onClick={() => setSearchValue("")}
+            >
+              <XIcon className="h-4 w-4" />
+            </Button>
+          )}
+          <Tooltip
+            content="Filters loaded entries only. Expand directories to include their contents in the search."
+            delayDuration={200}
+          >
+            <HelpCircleIcon className="h-3.5 w-3.5 mr-2 shrink-0 cursor-help text-muted-foreground hover:text-foreground" />
+          </Tooltip>
+        </div>
+        <CommandList className="flex flex-col">
+          {namespaces.map((ns) => (
+            <StorageNamespaceSection
+              key={ns.name ?? ns.displayName}
+              namespace={ns}
+              locale={locale}
+              searchValue={searchValue}
+              onOpenFile={setOpenFile}
+            />
+          ))}
+        </CommandList>
+      </Command>
+    </div>
+  );
+};

package/src/core/ai/tools/__tests__/edit-notebook-tool.test.ts

@@ -178,6 +178,85 @@ describe("EditNotebookTool", () => {
       });
     });
 
+    it("should skip no-op edits where code hasn't changed", async () => {
+      const code = "x = 1";
+
+      const editorView = createMockEditorView(code);
+      const notebook = MockNotebook.notebookState({
+        cellData: {
+          [cellId1]: { code },
+        },
+      });
+      notebook.cellHandles[cellId1] = { current: { editorView } } as never;
+      store.set(notebookAtom, notebook);
+
+      const result = await tool.handler(
+        {
+          edit: {
+            type: "update_cell",
+            position: { type: "relative", cellId: cellId1 },
+            code: code, // Same code as current
+          },
+        },
+        toolContext as never,
+      );
+
+      expect(result.status).toBe("success");
+
+      // Should NOT stage the cell or update the editor
+      expect(toolContext.addStagedCell).not.toHaveBeenCalled();
+      expect(vi.mocked(updateEditorCodeFromPython)).not.toHaveBeenCalled();
+
+      // No staged cells
+      const stagedCells = store.get(stagedAICellsAtom);
+      expect(stagedCells.size).toBe(0);
+    });
+
+    it("should skip no-op edits that revert to original code", async () => {
+      const originalCode = "x = 1";
+      const modifiedCode = "x = 2";
+
+      const editorView = createMockEditorView(originalCode);
+      const notebook = MockNotebook.notebookState({
+        cellData: {
+          [cellId1]: { code: originalCode },
+        },
+      });
+      notebook.cellHandles[cellId1] = { current: { editorView } } as never;
+      store.set(notebookAtom, notebook);
+
+      // First edit: change the code
+      await tool.handler(
+        {
+          edit: {
+            type: "update_cell",
+            position: { type: "relative", cellId: cellId1 },
+            code: modifiedCode,
+          },
+        },
+        toolContext as never,
+      );
+
+      expect(toolContext.addStagedCell).toHaveBeenCalledTimes(1);
+
+      // Second edit: revert back to the original code
+      const result = await tool.handler(
+        {
+          edit: {
+            type: "update_cell",
+            position: { type: "relative", cellId: cellId1 },
+            code: originalCode, // Same as the previousCode
+          },
+        },
+        toolContext as never,
+      );
+
+      expect(result.status).toBe("success");
+
+      // addStagedCell should not be called again (still 1 from the first edit)
+      expect(toolContext.addStagedCell).toHaveBeenCalledTimes(1);
+    });
+
     it("should throw error when cell ID doesn't exist", async () => {
       const notebook = MockNotebook.notebookState({
         cellData: {

package/src/core/ai/tools/edit-notebook-tool.ts

@@ -128,6 +128,11 @@ export class EditNotebookTool
         const previousCode =
           existingStagedCell?.previousCode ?? currentCellCode;
 
+        // Skip no-op edits where the code hasn't changed
+        if (code === previousCode) {
+          break;
+        }
+
         addStagedCell({
           cellId,
           edit: { type: "update_cell", previousCode: previousCode },