@marimo-team/frontend 0.25.3-dev4 → 0.25.3-dev5

package/src/components/editor/chrome/wrapper/__tests__/attachment-status.test.tsx

@@ -0,0 +1,167 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+// @vitest-environment jsdom
+
+import { act, fireEvent, render, screen } from "@testing-library/react";
+import { createStore, Provider } from "jotai";
+import { userEvent } from "storybook/test";
+import { describe, expect, it } from "vitest";
+import { PAIR_PREVIEW } from "@/__tests__/fixtures/pair-preview";
+import { TooltipProvider } from "@/components/ui/tooltip";
+import { type Attachment, attachmentsAtom } from "@/core/attachments/state";
+import { pairPreviewAtom } from "@/core/config/pair";
+import { connectionAtom } from "@/core/network/connection";
+import { WebSocketClosedReason, ConnectionState } from "@/core/websocket/types";
+import { AttachmentStatus } from "../footer-items/attachment-status";
+
+const AGENT: Attachment = {
+  id: "a1",
+  kind: "agent",
+  name: "Pi",
+  notebook_id: "nb-test",
+  identity: "pi-thread",
+  since: new Date().toISOString(),
+};
+
+function renderStatus(attachments: Attachment[] = [AGENT], preview = true) {
+  const store = createStore();
+  store.set(connectionAtom, { state: ConnectionState.OPEN });
+  store.set(pairPreviewAtom, preview ? PAIR_PREVIEW : undefined);
+  store.set(attachmentsAtom, attachments);
+  return {
+    store,
+    ...render(
+      <Provider store={store}>
+        <TooltipProvider>
+          <AttachmentStatus />
+        </TooltipProvider>
+      </Provider>,
+    ),
+  };
+}
+
+describe("AttachmentStatus", () => {
+  it("renders nothing outside the preview", () => {
+    expect(renderStatus([AGENT], false).container).toBeEmptyDOMElement();
+  });
+
+  it("renders nothing without agents", () => {
+    expect(
+      renderStatus([{ ...AGENT, kind: "client" }]).container,
+    ).toBeEmptyDOMElement();
+  });
+
+  it("lists each agent by its self-described name", () => {
+    renderStatus([
+      AGENT,
+      { ...AGENT, id: "a2", identity: "claude-thread", name: "Claude Code" },
+      { ...AGENT, id: "c1", kind: "client", name: "Browser" },
+    ]);
+    expect(screen.getAllByTestId("footer-attachment-status")).toHaveLength(2);
+    expect(screen.getByLabelText("Pi: Connected")).toBeInTheDocument();
+    expect(screen.getByLabelText("Claude Code: Connected")).toBeInTheDocument();
+    expect(screen.queryByText("Browser")).not.toBeInTheDocument();
+    fireEvent.click(screen.getByLabelText("Pi: Connected"));
+    expect(screen.getByText(/^Connected /)).toBeInTheDocument();
+  });
+
+  it("uses Agent when no name was supplied", () => {
+    renderStatus([{ ...AGENT, name: null }]);
+    expect(screen.getByLabelText("Agent: Connected")).toBeInTheDocument();
+  });
+
+  it("groups attachments by identity while retaining each connection row", () => {
+    renderStatus([
+      AGENT,
+      { ...AGENT, id: "a2", since: "2026-10-14T00:00:00Z" },
+    ]);
+    expect(screen.getAllByTestId("footer-attachment-status")).toHaveLength(1);
+    fireEvent.click(screen.getByLabelText("Pi: Connected"));
+    expect(screen.getAllByText(/^Connected /)).toHaveLength(2);
+    expect(screen.getByText("a1")).toBeInTheDocument();
+    expect(screen.getByText("a2")).toBeInTheDocument();
+  });
+
+  it("preserves an open popover when the same identity reconnects", () => {
+    const { store } = renderStatus();
+    fireEvent.click(screen.getByLabelText("Pi: Connected"));
+    act(() =>
+      store.set(attachmentsAtom, [
+        { ...AGENT, id: "a2", since: "2026-10-14T00:00:00Z" },
+      ]),
+    );
+    expect(
+      screen.getByRole("button", { name: "Pi: Connected" }),
+    ).toHaveAttribute("aria-expanded", "true");
+    expect(screen.queryByText("a1")).not.toBeInTheDocument();
+    expect(screen.getByText("a2")).toBeInTheDocument();
+  });
+
+  it("does not open a closed popover when the same identity reconnects", () => {
+    const { store } = renderStatus();
+    act(() => store.set(attachmentsAtom, [{ ...AGENT, id: "a2" }]));
+    expect(
+      screen.getByRole("button", { name: "Pi: Connected" }),
+    ).toHaveAttribute("aria-expanded", "false");
+  });
+
+  it("keeps anonymous attachments separate from matching client identities", () => {
+    renderStatus([
+      { ...AGENT, identity: undefined },
+      { ...AGENT, id: "a2", identity: undefined },
+      { ...AGENT, id: "a3", identity: "a1" },
+    ]);
+    expect(screen.getAllByTestId("footer-attachment-status")).toHaveLength(3);
+  });
+
+  it("accepts client identities that match object property names", () => {
+    renderStatus([
+      { ...AGENT, identity: "__proto__" },
+      { ...AGENT, id: "a2", identity: "constructor" },
+    ]);
+    expect(screen.getAllByTestId("footer-attachment-status")).toHaveLength(2);
+  });
+
+  it.each(["{Enter}", " "])("opens from the keyboard with %j", async (key) => {
+    const user = userEvent.setup();
+    renderStatus();
+    const button = screen.getByRole("button", { name: "Pi: Connected" });
+    expect(button.tagName).toBe("BUTTON");
+    expect(button).toHaveAttribute("type", "button");
+    await user.tab();
+    expect(button).toHaveFocus();
+    await user.keyboard(key);
+    expect(button).toHaveAttribute("aria-expanded", "true");
+    expect(screen.getByText(/^Connected /)).toBeInTheDocument();
+    await user.keyboard("{Escape}");
+    expect(button).toHaveAttribute("aria-expanded", "false");
+    expect(button).toHaveFocus();
+  });
+
+  it.each([
+    { state: ConnectionState.CONNECTING },
+    { state: ConnectionState.CLOSING },
+    { state: ConnectionState.NOT_STARTED },
+    {
+      state: ConnectionState.CLOSED,
+      code: WebSocketClosedReason.KERNEL_DISCONNECTED,
+      reason: "offline",
+    },
+  ])("hides connected claims while the browser is %j", (connection) => {
+    const { store, container } = renderStatus();
+    act(() => store.set(connectionAtom, connection));
+    expect(container).toBeEmptyDOMElement();
+  });
+
+  it("removes detached agents when the list is replaced", () => {
+    const { store, container } = renderStatus([
+      AGENT,
+      { ...AGENT, id: "a2", identity: "claude-thread", name: "Claude Code" },
+    ]);
+    act(() => store.set(attachmentsAtom, [AGENT]));
+    expect(
+      screen.queryByLabelText("Claude Code: Connected"),
+    ).not.toBeInTheDocument();
+    act(() => store.set(attachmentsAtom, []));
+    expect(container).toBeEmptyDOMElement();
+  });
+});

package/src/components/editor/chrome/wrapper/footer-item.tsx

@@ -1,6 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
 import type React from "react";
+import { Slot as SlotPrimitive } from "radix-ui";
 import { forwardRef } from "react";
 import { Tooltip } from "@/components/ui/tooltip";
 import { cn } from "@/utils/cn";
@@ -8,36 +9,43 @@ import { cn } from "@/utils/cn";
 type FooterItemProps = {
   selected: boolean;
   tooltip: React.ReactNode;
+  asChild?: boolean;
 } & React.HTMLAttributes<HTMLDivElement>;
 
 export const FooterItem: React.FC<FooterItemProps> = forwardRef<
   HTMLDivElement,
   FooterItemProps
->(({ children, tooltip, selected, className, ...rest }, ref) => {
-  const content = (
-    <div
-      ref={ref}
-      className={cn(
-        "h-full flex items-center p-2 text-sm shadow-inset font-mono cursor-pointer rounded",
-        !selected && "hover:bg-(--sage-3)",
-        selected && "bg-(--sage-4)",
-        className,
-      )}
-      {...rest}
-    >
-      {children}
-    </div>
-  );
-
-  if (tooltip) {
-    return (
-      <Tooltip content={tooltip} side="top" delayDuration={200}>
-        {content}
-      </Tooltip>
+>(
+  (
+    { children, tooltip, selected, className, asChild = false, ...rest },
+    ref,
+  ) => {
+    const Component = asChild ? SlotPrimitive.Slot : "div";
+    const content = (
+      <Component
+        ref={ref}
+        className={cn(
+          "h-full flex items-center p-2 text-sm shadow-inset font-mono cursor-pointer rounded",
+          !selected && "hover:bg-(--sage-3)",
+          selected && "bg-(--sage-4)",
+          className,
+        )}
+        {...rest}
+      >
+        {children}
+      </Component>
     );
-  }
 
-  return content;
-});
+    if (tooltip) {
+      return (
+        <Tooltip content={tooltip} side="top" delayDuration={200}>
+          {content}
+        </Tooltip>
+      );
+    }
+
+    return content;
+  },
+);
 
 FooterItem.displayName = "FooterItem";

package/src/components/editor/chrome/wrapper/footer-items/attachment-status.tsx

@@ -0,0 +1,82 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { useAtomValue } from "jotai";
+import { BotIcon } from "lucide-react";
+import { useState } from "react";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import {
+  type Attachment,
+  agentAttachmentsAtom,
+  attachmentLabel,
+} from "@/core/attachments/state";
+import { pairPreviewAtom } from "@/core/config/pair";
+import { useTimeAgo } from "@/hooks/useFormatting";
+import { Objects } from "@/utils/objects";
+import { FooterItem } from "../footer-item";
+
+export function AttachmentStatus() {
+  const pairPreview = useAtomValue(pairPreviewAtom);
+  const agents = useAtomValue(agentAttachmentsAtom);
+  if (!pairPreview) {
+    return null;
+  }
+  const groups = Objects.groupBy(
+    agents,
+    (attachment) =>
+      attachment.identity
+        ? `identity:${attachment.identity}`
+        : `attachment:${attachment.id}`,
+    (attachment) => attachment,
+  );
+  return Object.entries(groups).map(([identity, attachments]) => (
+    <AttachmentStatusItem key={identity} attachments={attachments} />
+  ));
+}
+
+function AttachmentStatusItem({ attachments }: { attachments: Attachment[] }) {
+  const [open, setOpen] = useState(false);
+  const timeAgo = useTimeAgo();
+  const label = attachmentLabel(attachments[0]);
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger asChild={true}>
+        <FooterItem
+          asChild={true}
+          tooltip={`${label}: connected`}
+          selected={open}
+          data-testid="footer-attachment-status"
+          aria-label={`${label}: Connected`}
+        >
+          <button type="button">
+            <span className="flex items-center gap-1.5">
+              <BotIcon className="w-4 h-4" />
+              <span className="max-w-48 truncate">{label}</span>
+            </span>
+          </button>
+        </FooterItem>
+      </PopoverTrigger>
+      <PopoverContent className="w-64 text-sm">
+        <h4 className="font-medium">{label}</h4>
+        <ul className="space-y-2">
+          {attachments.map((attachment) => (
+            <li key={attachment.id}>
+              <p
+                className="truncate text-xs text-muted-foreground"
+                title={attachment.id}
+              >
+                {attachment.id}
+              </p>
+              <p className="text-muted-foreground">
+                Connected {timeAgo(attachment.since)}
+              </p>
+            </li>
+          ))}
+        </ul>
+      </PopoverContent>
+    </Popover>
+  );
+}

package/src/components/editor/chrome/wrapper/footer.tsx

@@ -12,6 +12,7 @@ import { ShowInKioskMode } from "../../kiosk-mode";
 import { panelLayoutAtom, useChromeActions, useChromeState } from "../state";
 import { FooterItem } from "./footer-item";
 import { AIStatusIcon } from "./footer-items/ai-status";
+import { AttachmentStatus } from "./footer-items/attachment-status";
 import {
   BackendConnectionStatus,
   connectionStatusAtom,
@@ -107,6 +108,7 @@ export const Footer: React.FC = () => {
 
       <div className="flex items-center shrink-0 min-w-0">
         <MachineStats />
+        <AttachmentStatus />
         <AIStatusIcon />
         <CopilotStatusIcon />
         <RTCStatus />