@marimo-team/islands 0.25.2-dev9 → 0.25.2-dev91

package/src/components/data-table/pagination.tsx

@@ -117,6 +117,7 @@ export const DataTablePagination = <TData,>({
             size="xs"
             variant="text"
             data-testid="first-page-button"
+            aria-label="First page"
             className="hidden h-6 w-5 p-0 lg:flex"
             onClick={() => handlePageChange(() => table.setPageIndex(0))}
             onMouseDown={Events.preventFocus}
@@ -130,6 +131,7 @@ export const DataTablePagination = <TData,>({
             size="xs"
             variant="text"
             data-testid="previous-page-button"
+            aria-label="Previous page"
             className="h-6 w-5 p-0"
             onClick={() => handlePageChange(() => table.previousPage())}
             onMouseDown={Events.preventFocus}
@@ -156,6 +158,7 @@ export const DataTablePagination = <TData,>({
             size="xs"
             variant="text"
             data-testid="next-page-button"
+            aria-label="Next page"
             className="h-6 w-5 p-0"
             onClick={() => handlePageChange(() => table.nextPage())}
             onMouseDown={Events.preventFocus}
@@ -169,6 +172,7 @@ export const DataTablePagination = <TData,>({
             size="xs"
             variant="text"
             data-testid="last-page-button"
+            aria-label="Last page"
             className="hidden h-6 w-5 p-0 lg:flex"
             onClick={() =>
               handlePageChange(() =>
@@ -306,14 +310,24 @@ export const PageSelector = ({
               : "opacity-50 cursor-default",
           )}
           data-testid="page-select"
+          aria-label={`Choose page, current page ${currentPage} of ${totalPages}`}
           disabled={totalPages <= 1}
         >
           {currentPage}
           <ChevronDown className="h-3 w-3 opacity-50 mb-px" />
         </button>
       </PopoverTrigger>
-      <PopoverContent className="w-36 p-0" align="center" sideOffset={6}>
-        <Command shouldFilter={false} value={String(currentPage)}>
+      <PopoverContent
+        className="w-36 p-0"
+        align="center"
+        sideOffset={6}
+        aria-label="Choose page"
+      >
+        <Command
+          label="Search pages"
+          shouldFilter={false}
+          value={String(currentPage)}
+        >
           <CommandInput
             placeholder={`Page (1–${totalPages})`}
             rootClassName="px-2 h-8"

package/src/components/data-table/schemas.ts

@@ -3,7 +3,7 @@
 import z from "zod";
 import { rpc } from "@/plugins/core/rpc";
 
-export type DownloadFormat = "csv" | "json" | "parquet" | "tsv";
+export type DownloadFormat = "csv" | "json" | "parquet" | "tsv" | "geojson";
 
 /**
  * Per-request export options. Each field is optional. A missing field keeps
@@ -18,6 +18,7 @@ export interface DownloadAsOptions {
 export interface DownloadAsRequest {
   format: DownloadFormat;
   options?: DownloadAsOptions;
+  geometry_column?: string | null;
 }
 
 export type DownloadAsArgs = (req: DownloadAsRequest) => Promise<{
@@ -25,26 +26,101 @@ export type DownloadAsArgs = (req: DownloadAsRequest) => Promise<{
   filename: string;
   error?: string | null;
   missing_packages?: string[] | null;
+  code?:
+    | "geometry_required"
+    | "invalid_geometry"
+    | "invalid_metadata"
+    | "unsupported_representation"
+    | "unsupported_version"
+    | "missing_packages"
+    | "missing_crs"
+    | "conversion_failed"
+    | null;
+  column?: string | null;
 }>;
 
+const DownloadRequestSchema = z.object({
+  geometry_column: z.string().nullish(),
+  options: z
+    .object({
+      separator: z.string().optional(),
+      encoding: z.string().optional(),
+      ensure_ascii: z.boolean().optional(),
+    })
+    .optional(),
+});
+
+const DownloadResponseSchema = z.object({
+  url: z.string(),
+  filename: z.string(),
+  error: z.string().nullish(),
+  missing_packages: z.array(z.string()).nullish(),
+  code: z
+    .enum([
+      "geometry_required",
+      "invalid_geometry",
+      "invalid_metadata",
+      "unsupported_representation",
+      "unsupported_version",
+      "missing_packages",
+      "conversion_failed",
+    ])
+    .nullish(),
+  column: z.string().nullish(),
+});
+
 export const DownloadAsSchema = rpc
   .input(
-    z.object({
+    DownloadRequestSchema.extend({
       format: z.enum(["csv", "json", "parquet", "tsv"]),
-      options: z
-        .object({
-          separator: z.string().optional(),
-          encoding: z.string().optional(),
-          ensure_ascii: z.boolean().optional(),
-        })
-        .optional(),
     }),
   )
+  .output(DownloadResponseSchema);
+
+export const DownloadGeoJSONSchema = rpc
+  .input(DownloadRequestSchema.extend({ format: z.literal("geojson") }))
   .output(
-    z.object({
-      url: z.string(),
-      filename: z.string(),
-      error: z.string().nullish(),
-      missing_packages: z.array(z.string()).nullish(),
+    DownloadResponseSchema.extend({
+      code: z.union([
+        DownloadResponseSchema.shape.code,
+        z.literal("missing_crs"),
+      ]),
     }),
   );
+
+export type DownloadAsFunction = (
+  req: z.infer<typeof DownloadAsSchema.input>,
+) => Promise<z.infer<typeof DownloadAsSchema.output>>;
+
+export type DownloadGeoJSON = (
+  req: z.infer<typeof DownloadGeoJSONSchema.input>,
+) => Promise<z.infer<typeof DownloadGeoJSONSchema.output>>;
+
+const ExportMetadataSchema = z.object({
+  geometry_columns: z.array(
+    z.object({
+      name: z.string(),
+      encoding: z.enum(["objects", "wkb", "wkt", "other"]),
+      crs: z.union([z.string(), z.record(z.string(), z.unknown())]).nullable(),
+    }),
+  ),
+  primary_geometry_column: z.string().nullable(),
+  default_geometry_column: z.string().nullable(),
+  formats: z.record(
+    z.string(),
+    z.object({
+      available: z.boolean(),
+      reason: z.string().nullable(),
+      missing_packages: z.array(z.string()),
+    }),
+  ),
+});
+
+export type ExportMetadata = z.infer<typeof ExportMetadataSchema>;
+export type GetExportMetadata = (
+  opts: Record<string, never>,
+) => Promise<ExportMetadata>;
+
+export const GetExportMetadataSchema = rpc
+  .input(z.object({}))
+  .output(ExportMetadataSchema);

package/src/components/editor/actions/__tests__/pair-with-agent-commands.test.ts

@@ -154,63 +154,54 @@ describe("getTerminalCommand", () => {
       ).toBe(
         String.raw`${cli} "$(MARIMO_PAIR_NEXT=1 uvx marimo@latest pair prompt \
   --url http://localhost:8000 \
-  --file notebooks/example.py \
   --session s_ab12cd \
   --with-token)"`,
       );
     },
   );
 
-  it("includes the url and file for each agent", () => {
+  it("includes the url and agent flag for each agent", () => {
     expect(getTerminalCommand("claude", CONNECTION, false)).toBe(
-      `claude "$(uv run marimo pair prompt --url http://localhost:8000 --file notebooks/example.py --claude)"`,
+      `claude "$(uv run marimo pair prompt --url http://localhost:8000 --claude)"`,
     );
     expect(getTerminalCommand("codex", CONNECTION, false)).toBe(
-      `codex "$(uv run marimo pair prompt --url http://localhost:8000 --file notebooks/example.py --codex)"`,
+      `codex "$(uv run marimo pair prompt --url http://localhost:8000 --codex)"`,
     );
     expect(getTerminalCommand("opencode", CONNECTION, false)).toBe(
-      `opencode --prompt "$(uv run marimo pair prompt --url http://localhost:8000 --file notebooks/example.py --opencode)"`,
+      `opencode --prompt "$(uv run marimo pair prompt --url http://localhost:8000 --opencode)"`,
     );
   });
 
-  it("omits the file flag when the page URL has no file", () => {
-    const command = getTerminalCommand(
-      "claude",
-      CONNECTION_WITHOUT_FILE,
-      false,
-    );
+  it("never passes a file to marimo pair prompt", () => {
+    const command = getTerminalCommand("claude", CONNECTION, false);
     expect(command).not.toContain("--file");
-    expect(command).not.toContain("--session");
+    expect(command).not.toContain("notebooks/example.py");
   });
 
-  it("shell-escapes a url containing metacharacters", () => {
-    const command = getTerminalCommand(
-      "claude",
-      { url: "http://host:8000?auth=a&b", file: "notebook.py" },
-      false,
+  it("omits the session outside the preview", () => {
+    expect(getTerminalCommand("claude", CONNECTION, false)).not.toContain(
+      "--session",
     );
-    expect(command).toContain("--url 'http://host:8000?auth=a&b'");
   });
 
-  it.each([
-    ["relative/my notebook.py", "--file 'relative/my notebook.py'"],
-    ["/tmp/my notebook.py", "--file '/tmp/my notebook.py'"],
-    [
-      String.raw`C:\Users\Jane Doe\notebook.py`,
-      String.raw`--file 'C:\Users\Jane Doe\notebook.py'`,
-    ],
-    [
-      String.raw`\\server\share\my notebook.py`,
-      String.raw`--file '\\server\share\my notebook.py'`,
-    ],
-    ["notebooks/it's.py", `--file 'notebooks/it'"'"'s.py'`],
-  ])("shell-escapes file path %s", (file, expected) => {
+  it("omits the session when it is unknown", () => {
+    expect(
+      getTerminalCommand(
+        "claude",
+        CONNECTION_WITHOUT_FILE,
+        false,
+        PAIR_PREVIEW,
+      ),
+    ).not.toContain("--session");
+  });
+
+  it("shell-escapes a url containing metacharacters", () => {
     const command = getTerminalCommand(
       "claude",
-      { url: CONNECTION.url, file },
+      { url: "http://host:8000?auth=a&b" },
       false,
     );
-    expect(command).toContain(expected);
+    expect(command).toContain("--url 'http://host:8000?auth=a&b'");
   });
 
   it("adds --with-token before the agent flag when requested", () => {
@@ -230,23 +221,22 @@ describe("getRawPrompt", () => {
     expect(
       getRawPrompt(
         {
-          url: "http://host/{file}",
-          file: "{session}/it's.py",
-          session: "{command}",
+          url: "http://host/{session}",
+          session: "{command}/it's",
         },
-        "tok'en {file} $&",
+        "tok'en {session} $&",
         {
           ...PAIR_PREVIEW,
           command: "custom marimo",
           templates: {
             ...PAIR_PREVIEW.templates,
-            prompt: "{command}\n{url}\n{file}{session}{authentication}",
+            prompt: "{command}\n{url}\n{session}{authentication}",
           },
         },
       ),
     ).toBe(
-      "custom marimo\nhttp://host/{file}\nFile: {session}/it's.py\nSession: {command}\n" +
-        `\n\nFor authenticated Pair commands, set \`export MARIMO_TOKEN='tok'"'"'en {file} $&'\` in the shell that runs marimo.`,
+      "custom marimo\nhttp://host/{session}\nSession: {command}/it's\n" +
+        `\n\nFor authenticated Pair commands, set \`export MARIMO_TOKEN='tok'"'"'en {session} $&'\` in the shell that runs marimo.`,
     );
   });
 
@@ -256,10 +246,7 @@ describe("getRawPrompt", () => {
       { ...CONNECTION_WITHOUT_FILE, session: "s_ab12cd" },
       "Session: s_ab12cd\n",
     ],
-    [
-      { ...CONNECTION_WITHOUT_FILE, file: "notebook.py" },
-      "File: notebook.py\n",
-    ],
+    [{ ...CONNECTION_WITHOUT_FILE, file: "notebook.py" }, ""],
   ])("omits absent preview fields for %j", (connection, fields) => {
     expect(getRawPrompt(connection, null, PAIR_PREVIEW)).toBe(
       "Pair with me on this running marimo notebook.\n\n" +
@@ -270,13 +257,12 @@ describe("getRawPrompt", () => {
     );
   });
 
-  it("renders the shared preview template with optional session context", () => {
+  it("renders the shared preview template with the session and no file", () => {
     expect(
       getRawPrompt({ ...CONNECTION, session: "s_ab12cd" }, null, PAIR_PREVIEW),
     ).toBe(
       "Pair with me on this running marimo notebook.\n\n" +
         "URL: http://localhost:8000\n" +
-        "File: notebooks/example.py\n" +
         "Session: s_ab12cd\n\n" +
         "Run `uvx marimo@latest pair --help` first.\n" +
         "Use `uvx marimo@latest` for all marimo commands.\n\n" +

package/src/components/editor/actions/__tests__/pair-with-agent-modal.test.tsx

@@ -15,7 +15,10 @@ import { PAIR_PREVIEW } from "@/__tests__/fixtures/pair-preview";
 import { Dialog } from "@/components/ui/dialog";
 import { TooltipProvider } from "@/components/ui/tooltip";
 import { pairPreviewAtom } from "@/core/config/pair";
-import { getSessionId } from "@/core/kernel/session";
+import {
+  type StableSessionId,
+  stableSessionIdAtom,
+} from "@/core/kernel/session";
 import { filenameAtom } from "@/core/saving/file-state";
 import {
   DEFAULT_RUNTIME_CONFIG,
@@ -39,10 +42,13 @@ function wrapper({ children }: { children: React.ReactNode }) {
   );
 }
 
+const STABLE_ID = "sess-stable-1" as StableSessionId;
+
 describe("PairWithAgentModal", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     store.set(pairPreviewAtom, PAIR_PREVIEW);
+    store.set(stableSessionIdAtom, STABLE_ID);
     store.set(filenameAtom, "/project/my notebook.py");
     store.set(runtimeConfigAtom, {
       ...DEFAULT_RUNTIME_CONFIG,
@@ -57,12 +63,13 @@ describe("PairWithAgentModal", () => {
 
   afterEach(() => {
     store.set(pairPreviewAtom, undefined);
+    store.set(stableSessionIdAtom, null);
     store.set(filenameAtom, null);
     vi.unstubAllGlobals();
   });
 
   it.each(["Claude", "Codex", "OpenCode", "Prompt"])(
-    "omits skill installation and includes the current session in %s preview",
+    "omits skill installation and targets the stable session in %s preview",
     async (tab) => {
       await act(async () => {
         render(<PairWithAgentModal onClose={vi.fn()} />, { wrapper });
@@ -74,59 +81,41 @@ describe("PairWithAgentModal", () => {
 
       const panel = screen.getByRole("tabpanel");
       expect(within(panel).queryAllByText(/skill/i)).toEqual([]);
-      expect(panel).toHaveTextContent(getSessionId());
-      expect(panel).toHaveTextContent(
-        tab === "Prompt" ? "File: notebook.py" : "--file notebook.py",
-      );
-      expect(panel).not.toHaveTextContent("/project/my notebook.py");
+      expect(panel).toHaveTextContent(STABLE_ID);
+      expect(panel).not.toHaveTextContent("--file");
+      expect(panel).not.toHaveTextContent("File:");
+      expect(panel).not.toHaveTextContent("notebook.py");
       expect(panel).toHaveTextContent(
         tab === "Prompt" ? "1. Copy this prompt" : "1. Run in your terminal",
       );
-    },
-  );
-
-  it.each(["Claude", "Codex", "OpenCode", "Prompt"])(
-    "includes the known notebook file in %s preview when the URL has no file",
-    async (tab) => {
-      window.history.replaceState({}, "", "/");
-      await act(async () => {
-        render(<PairWithAgentModal onClose={vi.fn()} />, { wrapper });
-      });
-      fireEvent.mouseDown(screen.getByRole("tab", { name: tab }), {
-        button: 0,
-        ctrlKey: false,
-      });
-
-      const panel = screen.getByRole("tabpanel");
-      const fileHint =
-        tab === "Prompt"
-          ? "File: /project/my notebook.py"
-          : "--file '/project/my notebook.py'";
-      expect(panel).toHaveTextContent(fileHint);
       fireEvent.click(
         within(panel).getByRole("button", {
           name: tab === "Prompt" ? "Copy prompt" : "Copy command",
         }),
       );
       await waitFor(() => expect(copyToClipboard).toHaveBeenCalledOnce());
-      expect(vi.mocked(copyToClipboard).mock.calls[0][0]).toContain(fileHint);
+      const copied = vi.mocked(copyToClipboard).mock.calls[0][0];
+      expect(copied).toContain(STABLE_ID);
+      expect(copied).not.toContain("notebook.py");
     },
   );
 
-  it.each([null, ""])(
-    "omits the file when the URL and notebook filename are absent (%s)",
-    async (filename) => {
-      window.history.replaceState({}, "", "/");
-      store.set(filenameAtom, filename);
+  it.each(["Claude", "Prompt"])(
+    "omits the session in %s preview before kernel-ready arrives",
+    async (tab) => {
+      store.set(stableSessionIdAtom, null);
       await act(async () => {
         render(<PairWithAgentModal onClose={vi.fn()} />, { wrapper });
       });
-      expect(screen.getByRole("tabpanel")).not.toHaveTextContent("--file");
-      fireEvent.mouseDown(screen.getByRole("tab", { name: "Prompt" }), {
+      fireEvent.mouseDown(screen.getByRole("tab", { name: tab }), {
         button: 0,
         ctrlKey: false,
       });
-      expect(screen.getByRole("tabpanel")).not.toHaveTextContent("File:");
+
+      const panel = screen.getByRole("tabpanel");
+      expect(panel).not.toHaveTextContent("--session");
+      expect(panel).not.toHaveTextContent("Session:");
+      expect(panel).toHaveTextContent("http://localhost:8000");
     },
   );
 
@@ -147,7 +136,8 @@ describe("PairWithAgentModal", () => {
       expect(
         within(panel).getByText("npx skills add marimo-team/marimo-pair"),
       ).toBeVisible();
-      expect(panel).not.toHaveTextContent(getSessionId());
+      expect(panel).not.toHaveTextContent(STABLE_ID);
+      expect(panel).not.toHaveTextContent("--file");
       expect(panel).not.toHaveTextContent("MARIMO_PAIR_NEXT");
       expect(panel).not.toHaveTextContent("/project/my notebook.py");
       expect(panel).toHaveTextContent(
@@ -205,8 +195,7 @@ describe("PairWithAgentModal", () => {
       expect(copyToClipboard).toHaveBeenCalledWith(
         String.raw`claude "$(MARIMO_PAIR_NEXT=1 uvx marimo@latest pair prompt \
   --url http://localhost:8000/ \
-  --file notebook.py \
-  --session ${getSessionId()} \
+  --session ${STABLE_ID} \
   --with-token)"`,
       ),
     );

package/src/components/editor/actions/pair-with-agent-commands.ts

@@ -38,8 +38,9 @@ function getFileFlag(file: string | undefined): string {
 /** Identifies the specific running notebook to pair on. */
 export interface ConnectionInfo {
   url: string;
-  /** The server's file key or notebook filename, when known. */
+  /** The server's file key, when known. */
   file?: string;
+  /** The stable session ID, when known. */
   session?: string;
 }
 
@@ -49,7 +50,7 @@ export interface ConnectionInfo {
  */
 export function getTerminalCommand(
   agent: Exclude<AgentTab, "prompt">,
-  { url, file, session }: ConnectionInfo,
+  { url, session }: ConnectionInfo,
   withToken: boolean,
   preview?: PairPreviewConfig,
 ): string {
@@ -58,7 +59,6 @@ export function getTerminalCommand(
   const base = [
     `${prefix}${command} pair prompt`,
     `--url ${shellQuote(url)}`,
-    file ? `--file ${shellQuote(file)}` : "",
     preview && session ? `--session ${shellQuote(session)}` : "",
     withToken ? "--with-token" : "",
     preview ? "" : `--${agent}`,
@@ -92,7 +92,6 @@ export function getRawPrompt(
     return formatPrompt(templates.prompt, {
       command,
       url,
-      file: file ? formatPrompt(templates.file, { file }) : "",
       session: session ? formatPrompt(templates.session, { session }) : "",
       authentication: token
         ? formatPrompt(templates.token, { token: shellQuote(token) })

package/src/components/editor/actions/pair-with-agent-modal.tsx

@@ -18,8 +18,7 @@ import { Tooltip } from "@/components/ui/tooltip";
 import { asRemoteURL, useRuntimeManager } from "@/core/runtime/config";
 import { API } from "@/core/network/api";
 import { pairPreviewAtom } from "@/core/config/pair";
-import { getSessionId } from "@/core/kernel/session";
-import { useFilename } from "@/core/saving/filename";
+import { stableSessionIdAtom } from "@/core/kernel/session";
 import {
   AGENT_LABELS,
   AGENT_TABS,
@@ -54,16 +53,14 @@ export const PairWithAgentModal: React.FC<{
   const [activeTab, setActiveTab] = useState<AgentTab>("claude");
   const runtimeManager = useRuntimeManager();
   const preview = useAtomValue(pairPreviewAtom);
-  const filename = useFilename();
+  const stableSessionId = useAtomValue(stableSessionIdAtom);
   const commandStep = preview ? 1 : 2;
   const authToken = useAuthToken();
   const hasToken = Boolean(authToken);
   const connection: ConnectionInfo = {
     url: runtimeManager.httpURL.toString(),
-    file:
-      getFileFromURL(window.location.href) ??
-      (preview ? filename || undefined : undefined),
-    session: preview ? getSessionId() : undefined,
+    file: preview ? undefined : getFileFromURL(window.location.href),
+    session: preview ? (stableSessionId ?? undefined) : undefined,
   };
 
   return (

package/src/components/editor/actions/useRestartKernel.tsx

@@ -5,7 +5,7 @@ import { useImperativeModal } from "@/components/modal/ImperativeModal";
 import { AlertDialogDestructiveAction } from "@/components/ui/alert-dialog";
 import { connectionAtom } from "@/core/network/connection";
 import { useRequestClient } from "@/core/network/requests";
-import { WebSocketState } from "@/core/websocket/types";
+import { ConnectionState } from "@/core/websocket/types";
 import { reloadSafe } from "@/utils/reload-safe";
 
 export function useRestartKernel() {
@@ -22,7 +22,7 @@ export function useRestartKernel() {
       confirmAction: (
         <AlertDialogDestructiveAction
           onClick={async () => {
-            setConnection({ state: WebSocketState.CLOSING });
+            setConnection({ state: ConnectionState.CLOSING });
             await sendRestart();
             reloadSafe();
           }}