@marimo-team/islands 0.25.3-dev142 → 0.25.3-dev144

package/src/components/editor/errors/send-error-report-button.tsx

@@ -4,11 +4,8 @@ import { useAtomValue } from "jotai";
 import { SendIcon } from "lucide-react";
 import { useState } from "react";
 import { Button } from "@/components/ui/button";
-import {
-  agentAttachmentsAtom,
-  attachmentLabel,
-} from "@/core/attachments/state";
-import { agentToast } from "@/core/attachments/toast";
+import { attachmentLabel, useNotebookAttachments } from "@/core/notebook";
+import { agentToast } from "@/components/editor/agent-toast";
 import { pairConfigAtom } from "@/core/config/pair";
 import { stableSessionIdAtom } from "@/core/kernel/session";
 import { API } from "@/core/network/api";
@@ -20,7 +17,7 @@ export function SendErrorReportButton({
   getContent: () => unknown;
 }) {
   const hostEnabled = useAtomValue(pairConfigAtom)?.hostEnabled;
-  const agents = useAtomValue(agentAttachmentsAtom);
+  const agents = useNotebookAttachments("agent");
   const stableSessionId = useAtomValue(stableSessionIdAtom);
   const [sending, setSending] = useState(false);
 

package/src/components/editor/header/__tests__/status.test.tsx

@@ -11,7 +11,7 @@ import {
   type ConnectionStatus,
   WebSocketClosedReason,
   ConnectionState,
-} from "@/core/websocket/types";
+} from "@/core/session/types";
 import { StatusOverlay } from "../status";
 
 function renderOverlay(
@@ -55,7 +55,7 @@ describe("StatusOverlay disconnect indicator", () => {
     expect(onReconnect).toHaveBeenCalledTimes(1);
   });
 
-  it("renders a disabled button when no onReconnect is provided", () => {
+  it("keeps the unavailable reconnect button focusable for its tooltip", () => {
     const { getByTestId } = renderOverlay({
       state: ConnectionState.CLOSED,
       code: WebSocketClosedReason.KERNEL_DISCONNECTED,
@@ -63,7 +63,9 @@ describe("StatusOverlay disconnect indicator", () => {
     });
 
     const button = getByTestId("disconnected-indicator");
-    expect((button as HTMLButtonElement).disabled).toBe(true);
+    expect(button).toHaveAttribute("aria-disabled", "true");
+    button.focus();
+    expect(button).toHaveFocus();
   });
 
   it("leaves editor startup failures to the inline notice", () => {

package/src/components/editor/header/app-header.tsx

@@ -1,7 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
 import React, { type PropsWithChildren } from "react";
-import { type ConnectionStatus, ConnectionState } from "@/core/websocket/types";
+import { type ConnectionStatus, ConnectionState } from "@/core/session/types";
 import { Disconnected } from "../Disconnected";
 
 interface Props {

package/src/components/editor/header/status.tsx

@@ -11,7 +11,7 @@ import {
   type ConnectionStatus,
   WebSocketClosedReason,
   ConnectionState,
-} from "@/core/websocket/types";
+} from "@/core/session/types";
 import { cn } from "@/utils/cn";
 
 export const StatusOverlay: React.FC<{
@@ -61,20 +61,17 @@ const DisconnectedIcon: React.FC<{ onReconnect?: () => void }> = ({
         disabled ? "App disconnected" : "App disconnected — click to reconnect"
       }
     >
-      {/* Wrapper span keeps the tooltip reachable when the button is
-          disabled — a disabled <button> swallows pointer events. */}
-      <span tabIndex={disabled ? 0 : -1}>
-        <button
-          type="button"
-          className={cn(topLeftStatus, "bg-transparent border-0 p-0")}
-          aria-label={disabled ? "App disconnected" : "Reconnect to app"}
-          data-testid="disconnected-indicator"
-          onClick={onReconnect}
-          disabled={disabled}
-        >
-          <UnlinkIcon className="w-[25px] h-[25px] text-(--red-11)" />
-        </button>
-      </span>
+      <button
+        type="button"
+        className={cn(topLeftStatus, "bg-transparent border-0 p-0")}
+        aria-label={disabled ? "App disconnected" : "Reconnect to app"}
+        data-testid="disconnected-indicator"
+        onClick={onReconnect}
+        // Keep the tooltip reachable by keyboard when reconnection is unavailable.
+        aria-disabled={disabled}
+      >
+        <UnlinkIcon className="w-[25px] h-[25px] text-(--red-11)" />
+      </button>
     </Tooltip>
   );
 };

package/src/components/editor/notebook-cell.tsx

@@ -59,7 +59,7 @@ import {
   shouldHidePublishedCell,
 } from "../../core/cells/utils";
 import type { UserConfig } from "../../core/config/config-schema";
-import { isAppInteractionDisabled } from "../../core/websocket/connection-utils";
+import { isAppInteractionDisabled } from "../../core/session/connection-utils";
 import { useCellRenderCount } from "../../hooks/useCellRenderCount";
 import type { Theme } from "../../theme/useTheme";
 import { Functions } from "../../utils/functions";

package/src/core/codemirror/readonly/__tests__/extension.test.ts

@@ -4,7 +4,7 @@ import { EditorState } from "@codemirror/state";
 import { EditorView } from "@codemirror/view";
 import { createStore } from "jotai";
 import { describe, expect, it } from "vitest";
-import { ConnectionState } from "@/core/websocket/types";
+import { ConnectionState } from "@/core/session/types";
 import { connectionAtom } from "../../../network/connection";
 import { dynamicReadonly, isEditorReadonly } from "../extension";
 

package/src/core/codemirror/readonly/extension.ts

@@ -5,9 +5,9 @@ import type { createStore } from "jotai";
 import {
   isAppConnected,
   isAppConnecting,
-} from "@/core/websocket/connection-utils";
+} from "@/core/session/connection-utils";
 import { connectionAtom } from "../../network/connection";
-import { ConnectionState } from "../../websocket/types";
+import { ConnectionState } from "../../session/types";
 
 /**
  * State effect for updating readonly status based on connection

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

@@ -4,7 +4,7 @@ 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";
+import { ConnectionState } from "@/core/session/types";
 import {
   fetchDataSourceDiscovery,
   invalidateDataSourceDiscovery,

package/src/core/edit-app.tsx

@@ -41,7 +41,7 @@ import { viewStateAtom } from "./mode";
 import { useRequestClient } from "./network/requests";
 import { useFilename } from "./saving/filename";
 import { lastSavedNotebookAtom } from "./saving/state";
-import { useNotebookSession } from "./websocket/useNotebookSession";
+import { useNotebookSession } from "./session/useNotebookSession";
 
 interface AppProps {
   /**
@@ -81,7 +81,7 @@ export const EditApp: React.FC<AppProps> = ({
     return () => {
       RuntimeState.INSTANCE.stop();
     };
-  }, []);
+  }, [sendComponentValues]);
 
   const { connection, reconnect } = useNotebookSession({
     autoInstantiate: userConfig.runtime.auto_instantiate,

package/src/core/export/hooks.ts

@@ -16,7 +16,7 @@ import { connectionAtom } from "../network/connection";
 import { useRequestClient } from "../network/requests";
 import type { UpdateCellOutputsRequest } from "../network/types";
 import { VirtualFileTracker } from "../static/virtual-file-tracker";
-import { ConnectionState } from "../websocket/types";
+import { ConnectionState } from "../session/types";
 
 const DELAY = 5000; // 5 seconds;
 

package/src/core/network/__tests__/connection.test.ts

@@ -3,7 +3,7 @@
 import { afterEach, describe, expect, it } from "vitest";
 import { initialModeAtom } from "@/core/mode";
 import { store } from "@/core/state/jotai";
-import { ConnectionState } from "../../websocket/types";
+import { ConnectionState } from "../../session/types";
 import { connectionAtom, waitForConnectionOpenIfNotebook } from "../connection";
 
 const NEVER = Symbol("never");

package/src/core/network/connection-notice.ts

@@ -6,7 +6,7 @@ import {
   type ConnectionPhase,
   WebSocketClosedReason,
   ConnectionState,
-} from "@/core/websocket/types";
+} from "@/core/session/types";
 import { connectionAtom } from "./connection";
 
 export interface ConnectionNotice {

package/src/core/network/connection.ts

@@ -4,7 +4,7 @@ import { atomWithReducer } from "jotai/utils";
 import type { NotificationMessageData } from "../kernel/messages";
 import { isNotebookPage } from "../mode";
 import { waitFor } from "../state/jotai";
-import { type ConnectionStatus, ConnectionState } from "../websocket/types";
+import { type ConnectionStatus, ConnectionState } from "../session/types";
 
 /**
  * Shared application state, not the actual event-stream status.

package/src/core/network/requests-lazy.ts

@@ -7,7 +7,7 @@ import { memoizeLastValue } from "@/utils/once";
 import { waitForKernelToBeInstantiated } from "../kernel/state";
 import type { RuntimeManager } from "../runtime/runtime";
 import { store } from "../state/jotai";
-import { ConnectionState } from "../websocket/types";
+import { ConnectionState } from "../session/types";
 import { connectionAtom, waitForConnectionOpen } from "./connection";
 import type { EditRequests, RunRequests } from "./types";
 

package/src/core/notebook/attachments.ts

@@ -0,0 +1,38 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { dequal } from "dequal";
+import { atom, useAtomValue } from "jotai";
+import { selectAtom } from "jotai/vanilla/utils";
+import { useMemo } from "react";
+import type { Attachment } from "@marimo-team/client/protocol";
+import { activeNotebookReplicaAtom } from "../session/active-notebook";
+
+export type { Attachment } from "@marimo-team/client/protocol";
+
+const EMPTY_ATTACHMENTS: readonly Attachment[] = [];
+
+/** Attachments visible to this session, empty while no notebook is available. */
+export const notebookAttachmentsAtom = atom((get) => {
+  const replica = get(activeNotebookReplicaAtom);
+  return replica ? get(replica.attachmentsAtom) : EMPTY_ATTACHMENTS;
+});
+
+/** Current notebook attachments, optionally restricted to one kind. */
+export function useNotebookAttachments(kind?: Attachment["kind"]) {
+  const attachments = useMemo(
+    () =>
+      kind === undefined
+        ? notebookAttachmentsAtom
+        : selectAtom(
+            notebookAttachmentsAtom,
+            (value) => value.filter((attachment) => attachment.kind === kind),
+            dequal,
+          ),
+    [kind],
+  );
+  return useAtomValue(attachments);
+}
+
+export function attachmentLabel(attachment: Attachment): string {
+  return attachment.name || "Agent";
+}

package/src/core/{document → notebook/document}/__tests__/codemirror.test.ts

@@ -9,22 +9,22 @@ import { afterEach, describe, expect, it, vi } from "vitest";
 import { cellId as brandedCellId } from "@/__tests__/branded";
 import { createNotebookActions } from "@/core/cells/cells";
 import { OverridingHotkeyProvider } from "@/core/hotkeys/hotkeys";
-import { cellActionsState } from "../../codemirror/cells/state";
-import { cellConfigExtension } from "../../codemirror/config/extension";
+import { cellActionsState } from "../../../codemirror/cells/state";
+import { cellConfigExtension } from "../../../codemirror/config/extension";
 import {
   adaptiveLanguageConfiguration,
   languageAdapterState,
   switchLanguage,
-} from "../../codemirror/language/extension";
+} from "../../../codemirror/language/extension";
 import {
   languageMetadataField,
   setLanguageMetadata,
-} from "../../codemirror/language/metadata";
-import { SCHEMA_CACHE } from "../../codemirror/language/languages/sql/completion-store";
-import type { Document } from "../../host/resources/document";
+} from "../../../codemirror/language/metadata";
+import { SCHEMA_CACHE } from "../../../codemirror/language/languages/sql/completion-store";
+import type { Document } from "../../replica/resources/document";
 import { cellCodeBinding } from "../codemirror";
 import { createDocumentModel } from "../model";
-import { fakeBackend } from "../../host/__tests__/fixtures";
+import { fakeBackend } from "../../replica/__tests__/fixtures";
 import { cell, document, withCells } from "./fixtures";
 
 const views: EditorView[] = [];

package/src/core/{document → notebook/document}/__tests__/fixtures.ts

@@ -1,6 +1,6 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import type { Document } from "../../host/resources/document";
+import type { Document } from "../../replica/resources/document";
 import type * as Protocol from "@marimo-team/client/protocol";
 
 export const CONFIG: Protocol.CellConfig = {

package/src/core/{document → notebook/document}/__tests__/hooks.test.tsx

@@ -5,19 +5,18 @@ import { atom, createStore, Provider } from "jotai";
 import type { PropsWithChildren } from "react";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { Deferred } from "@/utils/Deferred";
-import type { Document } from "../../host/resources/document";
+import type { Document } from "../../replica/resources/document";
 import {
-  createDocumentModel,
-  DocumentProvider,
-  useCellCode,
-  useCellConfig,
-  useCellName,
-  useCellOrder,
-  useDocumentEdit,
-  useDocumentSync,
-} from "..";
+  useNotebookCellCode,
+  useNotebookCellConfig,
+  useNotebookCellName,
+  useNotebookCellOrder,
+  useNotebookDocumentEdit,
+  useNotebookDocumentSync,
+} from "@/core/notebook";
+import { createDocumentModel, DocumentProvider } from "..";
 import { cell, CONFIG, document, withCells } from "./fixtures";
-import { type FakeEdit, fakeBackend } from "../../host/__tests__/fixtures";
+import { type FakeEdit, fakeBackend } from "../../replica/__tests__/fixtures";
 
 const lifetimes: AbortController[] = [];
 
@@ -65,9 +64,9 @@ describe("document hooks", () => {
     const { store, source, wrapper, controller } = setup(document(), edit);
     const { result, unmount } = renderHook(
       () => ({
-        code: useCellCode("c1"),
-        edit: useDocumentEdit(),
-        sync: useDocumentSync(),
+        code: useNotebookCellCode("c1"),
+        edit: useNotebookDocumentEdit(),
+        sync: useNotebookDocumentSync(),
       }),
       { wrapper, reactStrictMode: true },
     );
@@ -108,13 +107,13 @@ describe("document hooks", () => {
     const { result } = renderHook(
       () => {
         const value = {
-          code: useCellCode("c1"),
-          name: useCellName("c1"),
-          config: useCellConfig("c1"),
-          order: useCellOrder(),
+          code: useNotebookCellCode("c1"),
+          name: useNotebookCellName("c1"),
+          config: useNotebookCellConfig("c1"),
+          order: useNotebookCellOrder(),
         };
         seen(value);
-        return { ...value, edit: useDocumentEdit() };
+        return { ...value, edit: useNotebookDocumentEdit() };
       },
       { wrapper },
     );
@@ -162,23 +161,23 @@ describe("document hooks", () => {
     const onOrder = vi.fn();
     const onEdit = vi.fn();
     function Code() {
-      onCode(useCellCode("c1"));
+      onCode(useNotebookCellCode("c1"));
       return null;
     }
     function Name() {
-      onName(useCellName("c1"));
+      onName(useNotebookCellName("c1"));
       return null;
     }
     function Config() {
-      onConfig(useCellConfig("c1"));
+      onConfig(useNotebookCellConfig("c1"));
       return null;
     }
     function Order() {
-      onOrder(useCellOrder());
+      onOrder(useNotebookCellOrder());
       return null;
     }
     function Edit() {
-      onEdit(useDocumentEdit());
+      onEdit(useNotebookDocumentEdit());
       return null;
     }
     render(
@@ -191,7 +190,8 @@ describe("document hooks", () => {
       </>,
       { wrapper },
     );
-    const edit: ReturnType<typeof useDocumentEdit> = onEdit.mock.calls[0][0];
+    const edit: ReturnType<typeof useNotebookDocumentEdit> =
+      onEdit.mock.calls[0][0];
     const clear = () =>
       [onCode, onName, onConfig, onOrder, onEdit].forEach((fn) =>
         fn.mockClear(),
@@ -246,8 +246,8 @@ describe("document hooks", () => {
     const { wrapper } = setup();
     const { result, rerender } = renderHook(
       (id) => ({
-        code: useCellCode(id),
-        edit: useDocumentEdit(),
+        code: useNotebookCellCode(id),
+        edit: useNotebookDocumentEdit(),
       }),
       { wrapper, initialProps: "c1" },
     );
@@ -264,11 +264,11 @@ describe("document hooks", () => {
     const { store, source, wrapper } = setup(null);
     const { result } = renderHook(
       () => ({
-        order: useCellOrder(),
-        code: useCellCode("c1"),
-        name: useCellName("c1"),
-        config: useCellConfig("c1"),
-        edit: useDocumentEdit(),
+        order: useNotebookCellOrder(),
+        code: useNotebookCellCode("c1"),
+        name: useNotebookCellName("c1"),
+        config: useNotebookCellConfig("c1"),
+        edit: useNotebookDocumentEdit(),
       }),
       { wrapper },
     );
@@ -309,8 +309,8 @@ describe("document hooks", () => {
   it("preserves drafts across Strict Mode remounts until the session ends", () => {
     const { wrapper, controller, detached } = setup();
     const useProbe = () => ({
-      code: useCellCode("c1"),
-      edit: useDocumentEdit(),
+      code: useNotebookCellCode("c1"),
+      edit: useNotebookDocumentEdit(),
     });
     const first = renderHook(useProbe, { wrapper, reactStrictMode: true });
     const edit = first.result.current.edit;
@@ -340,7 +340,10 @@ describe("document hooks", () => {
     );
     const seen = vi.fn();
     function Probe() {
-      seen({ code: useCellCode("c1"), edit: useDocumentEdit() });
+      seen({
+        code: useNotebookCellCode("c1"),
+        edit: useNotebookDocumentEdit(),
+      });
       return null;
     }
     const tree = ({ store, model }: typeof first) => (
@@ -351,7 +354,7 @@ describe("document hooks", () => {
       </Provider>
     );
     const { rerender } = render(tree(first));
-    const oldEdit: ReturnType<typeof useDocumentEdit> =
+    const oldEdit: ReturnType<typeof useNotebookDocumentEdit> =
       seen.mock.calls.at(-1)![0].edit;
     act(() => oldEdit((tx) => tx.setCode("c1", "first draft")));
     rerender(tree(second));
@@ -359,7 +362,7 @@ describe("document hooks", () => {
     expect(first.detached).toHaveBeenCalledOnce();
     const latest: {
       code: string | null | undefined;
-      edit: ReturnType<typeof useDocumentEdit>;
+      edit: ReturnType<typeof useNotebookDocumentEdit>;
     } = seen.mock.calls.at(-1)![0];
     expect(latest.code).toBe("second source");
     expect(latest.edit).not.toBe(oldEdit);
@@ -381,6 +384,8 @@ describe("document hooks", () => {
   });
 
   it("requires a document provider", () => {
-    expect(() => renderHook(useDocumentEdit)).toThrow("DocumentProvider");
+    expect(() => renderHook(useNotebookDocumentEdit)).toThrow(
+      "DocumentProvider",
+    );
   });
 });

package/src/core/{document → notebook/document}/__tests__/model.test.ts

@@ -5,10 +5,10 @@ import type * as Protocol from "@marimo-team/client/protocol";
 import { atom, createStore } from "jotai/vanilla";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { Deferred } from "@/utils/Deferred";
-import type { NotebookBackend } from "../../host/backend";
-import type { Document } from "../../host/resources/document";
+import type { NotebookBackend } from "../../replica/backend";
+import type { Document } from "../../replica/resources/document";
 import { createDocumentModel } from "../model";
-import { type FakeEdit, fakeBackend } from "../../host/__tests__/fixtures";
+import { type FakeEdit, fakeBackend } from "../../replica/__tests__/fixtures";
 import { cell, document, withCells } from "./fixtures";
 
 function response(confirmed: Document): Result<Protocol.EditResponseOutput> {

package/src/core/{document → notebook/document}/__tests__/protocol-fixtures.ts

@@ -4,14 +4,14 @@ import { readFileSync } from "node:fs";
 import NodeUrl from "node:url";
 import type * as Protocol from "@marimo-team/client/protocol";
 import { invariant } from "@/utils/invariant";
-import { fixtureEvents } from "../../host/__tests__/fixtures";
-import type { Document } from "../../host/resources/document";
+import { fixtureEvents } from "../../replica/__tests__/fixtures";
+import type { Document } from "../../replica/resources/document";
 
 export function protocolFixture(name: string): unknown {
   return JSON.parse(
     readFileSync(
       new NodeUrl.URL(
-        `../../../../../protocols/host/fixtures/${name}`,
+        `../../../../../../protocols/host/fixtures/${name}`,
         import.meta.url,
       ),
       "utf8",

package/src/core/{document → notebook/document}/__tests__/scenario-fixture.ts

@@ -2,7 +2,7 @@
 
 import { createStore } from "jotai/vanilla";
 import { test as baseTest, vi } from "vitest";
-import type { Document } from "../../host/resources/document";
+import type { Document } from "../../replica/resources/document";
 import { createDocumentModel } from "../model";
 import { initialDocument } from "./protocol-fixtures";
 import { createTestNotebook } from "./test-notebook";

package/src/core/{document → notebook/document}/__tests__/state.test.ts

@@ -2,7 +2,7 @@
 
 import { atom, createStore } from "jotai/vanilla";
 import { afterEach, describe, expect, it, vi } from "vitest";
-import type { Document } from "../../host/resources/document";
+import type { Document } from "../../replica/resources/document";
 import {
   createDocumentState,
   type DocumentEdit,

package/src/core/{document → notebook/document}/__tests__/submission.test.ts

@@ -2,7 +2,7 @@
 
 import { atom, createStore } from "jotai/vanilla";
 import { afterEach, describe, expect, it, vi } from "vitest";
-import type { Document } from "../../host/resources/document";
+import type { Document } from "../../replica/resources/document";
 import { selectCell } from "../select";
 import { createDocumentState, type DocumentSubmission } from "../state";
 import { cell, document, withCells } from "./fixtures";

package/src/core/{document → notebook/document}/__tests__/test-host.ts

@@ -3,7 +3,7 @@
 import { createHash } from "node:crypto";
 import type { Result } from "@marimo-team/client";
 import * as Protocol from "@marimo-team/client/protocol";
-import type { Document } from "../../host/resources/document";
+import type { Document } from "../../replica/resources/document";
 
 export interface EditRequest {
   readonly notebookId: Protocol.NotebookId;

package/src/core/{document → notebook/document}/__tests__/test-notebook.ts

@@ -6,8 +6,8 @@ import { atom, type createStore } from "jotai/vanilla";
 import { vi } from "vitest";
 import { Deferred } from "@/utils/Deferred";
 import { invariant } from "@/utils/invariant";
-import { type FakeEdit, fakeBackend } from "../../host/__tests__/fixtures";
-import type { Document } from "../../host/resources/document";
+import { type FakeEdit, fakeBackend } from "../../replica/__tests__/fixtures";
+import type { Document } from "../../replica/resources/document";
 import { createTestHost, type EditRequest } from "./test-host";
 
 export interface PendingRequest extends EditRequest {

package/src/core/{document → notebook/document}/codemirror.ts

@@ -44,12 +44,12 @@ import {
   languageAdapterFromCode,
   languageAdapterState,
   switchLanguage,
-} from "../codemirror/language/extension";
-import { initializeSQLDialect } from "../codemirror/language/languages/sql/sql";
+} from "../../codemirror/language/extension";
+import { initializeSQLDialect } from "../../codemirror/language/languages/sql/sql";
 import {
   languageMetadataField,
   setLanguageMetadata,
-} from "../codemirror/language/metadata";
+} from "../../codemirror/language/metadata";
 import type { DocumentModel } from "./model";
 import { selectCellField } from "./select";
 

package/src/core/{document → notebook/document}/draft.ts

@@ -1,6 +1,6 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import type { Document } from "../host";
+import type { Document } from "../replica";
 import * as Protocol from "@marimo-team/client/protocol";
 
 /** The fields a client edits. Null code means the host withheld source. */