@marimo-team/islands 0.23.14-dev46 → 0.23.14-dev49

package/dist/{code-visibility-CNAoaX9P.js → code-visibility-Bzf3rjxi.js}

@@ -36207,7 +36207,7 @@ ${d}`,
       return Logger.warn("Failed to get version from mount config"), null;
     }
   }
-  marimoVersionAtom = atom(getVersionFromMountConfig() || "0.23.14-dev46");
+  marimoVersionAtom = atom(getVersionFromMountConfig() || "0.23.14-dev49");
   showCodeInRunModeAtom = atom(true);
   atom(null);
   var import_compiler_runtime = require_compiler_runtime();

package/dist/main.js

@@ -26,7 +26,7 @@ import { $ as reducer, $t as getRequestClient, A as ChevronDownIcon, An as Trigg
 import { __tla as __tla_1 } from "./chunk-5FQGJX7Z-BbqSm5gU.js";
 import { o as useSize, s as Root$1, u as createLucideIcon } from "./dist--2Bqjvs0.js";
 import { A as SquareFunction, C as DEFAULT_COLOR_SCHEME, D as SCALE_TYPE_DESCRIPTIONS, E as EMPTY_VALUE$1, O as TIME_UNIT_DESCRIPTIONS, S as DEFAULT_AGGREGATION, T as DEFAULT_TIME_UNIT, _ as AGGREGATION_TYPE_DESCRIPTIONS, a as AGGREGATION_FNS$1, b as COLOR_SCHEMES, c as COLOR_BY_FIELDS, d as NONE_VALUE, f as SELECTABLE_DATA_TYPES, g as TIME_UNITS, h as STRING_AGGREGATION_FNS, i as convertDataTypeToSelectable, j as ChartColumn, k as escapeFieldName, l as COMBINED_TIME_UNITS, m as SORT_TYPES, n as createSpecWithoutData, o as BIN_AGGREGATION, p as SINGLE_TIME_UNITS, r as isFieldSet, s as CHART_TYPES, t as augmentSpecWithData, u as ChartType, v as AGGREGATION_TYPE_ICON, w as DEFAULT_MAX_BINS_FACET, x as COUNT_FIELD, y as CHART_TYPE_ICON } from "./spec-CnTgI25l.js";
-import { $ as PANEL_TYPES, $t as HtmlOutput, A as prettifyRowCount, At as INDEX_COLUMN_NAME, B as CompactChipRow, Bt as dateToLocalISODateTime, C as downloadSizeLimitAtom, Ct as ColumnChartSpecModel, D as ErrorState, Dt as getPageIndexForRow, E as EmptyState, Et as usePrevious$1, F as ContextMenuItem, Ft as hasFunctionProperty, G as Command, Gt as TabsTrigger, H as DateRangePicker, Ht as Tabs, I as ContextMenuSeparator, It as isRecord, J as CommandItem, Jt as ChartLoadingState, K as CommandEmpty, Kt as ChartErrorState, L as ContextMenuTrigger, Lt as isNullishFilter, M as getUserColumnVisibilityCounts, Mt as TOO_MANY_ROWS, N as ContextMenu, Nt as toFieldTypes, O as LoadingState, Ot as loadTableAndRawData, P as ContextMenuContent, Pt as getMimeValues, Q as ContextAwarePanelItem, Qt as Kbd, R as useInternalStateWithSync, Rt as Maps, S as Filenames, St as ColumnChartContext, T as ColumnPreviewContainer, Tt as useIntersectionObserver, U as Combobox, Ut as TabsContent, V as DatePicker, Vt as dateToLocalISOTime, W as ComboboxItem, Wt as TabsList, X as CommandSeparator, Xt as useOverflowDetection, Y as CommandList, Yt as LazyVegaEmbed, Z as smartMatch, Zt as RenderTextWithLinks, _ as ADD_PRINTING_CLASS, _t as TableRow, an as Funnel, at as slotsController, b as downloadHTMLAsImage, bt as inferFieldTypes, c as Slide, cn as Ellipsis, d as RadioGroupItem, dn as ChevronsUpDown, dt as Provider$1, en as EmotionCacheProvider, et as contextAwarePanelOpen, f as JsonOutput, fn as ChevronsRight, ft as Table, g as InstallPackageButton, gn as ArrowDownWideNarrow, gt as TableHeader, h as DataTable, hn as ChevronLeft, ht as TableHead, in as GripHorizontal, it as SlotNames, j as getColumnCountForDisplay, jt as SELECT_COLUMN_ID, k as prettifyRowColumnCount, kt as loadTableData, l as Switch, ln as Download, m as OutputRenderer, mn as ChevronsDownUp, mt as TableCell, n as marimoVersionAtom, nn as $fae977aafc393c5c$export$6b862160d295c8e, nt as contextAwarePanelType, o as SLIDE_TYPE_OPTIONS_BY_VALUE, on as EyeOff, ot as Toggle, p as OutputArea, pn as ChevronsLeft, pt as TableBody, q as CommandInput, qt as ChartInfoState, r as showCodeInRunModeAtom, rn as TextWrap, rt as isCellAwareAtom, t as useNotebookCodeAvailable, tn as $fae977aafc393c5c$export$588937bcd60ade55, tt as contextAwarePanelOwner, u as RadioGroup, un as Code, ut as Fill, v as downloadBlob, vt as NAMELESS_COLUMN_PREFIX, w as ColumnName, wt as DelayMount, x as Progress, xt as renderCellValue, y as downloadByURL, yt as generateColumns, z as useSelectList, zt as dateToLocalISODate, __tla as __tla_2 } from "./code-visibility-CNAoaX9P.js";
+import { $ as PANEL_TYPES, $t as HtmlOutput, A as prettifyRowCount, At as INDEX_COLUMN_NAME, B as CompactChipRow, Bt as dateToLocalISODateTime, C as downloadSizeLimitAtom, Ct as ColumnChartSpecModel, D as ErrorState, Dt as getPageIndexForRow, E as EmptyState, Et as usePrevious$1, F as ContextMenuItem, Ft as hasFunctionProperty, G as Command, Gt as TabsTrigger, H as DateRangePicker, Ht as Tabs, I as ContextMenuSeparator, It as isRecord, J as CommandItem, Jt as ChartLoadingState, K as CommandEmpty, Kt as ChartErrorState, L as ContextMenuTrigger, Lt as isNullishFilter, M as getUserColumnVisibilityCounts, Mt as TOO_MANY_ROWS, N as ContextMenu, Nt as toFieldTypes, O as LoadingState, Ot as loadTableAndRawData, P as ContextMenuContent, Pt as getMimeValues, Q as ContextAwarePanelItem, Qt as Kbd, R as useInternalStateWithSync, Rt as Maps, S as Filenames, St as ColumnChartContext, T as ColumnPreviewContainer, Tt as useIntersectionObserver, U as Combobox, Ut as TabsContent, V as DatePicker, Vt as dateToLocalISOTime, W as ComboboxItem, Wt as TabsList, X as CommandSeparator, Xt as useOverflowDetection, Y as CommandList, Yt as LazyVegaEmbed, Z as smartMatch, Zt as RenderTextWithLinks, _ as ADD_PRINTING_CLASS, _t as TableRow, an as Funnel, at as slotsController, b as downloadHTMLAsImage, bt as inferFieldTypes, c as Slide, cn as Ellipsis, d as RadioGroupItem, dn as ChevronsUpDown, dt as Provider$1, en as EmotionCacheProvider, et as contextAwarePanelOpen, f as JsonOutput, fn as ChevronsRight, ft as Table, g as InstallPackageButton, gn as ArrowDownWideNarrow, gt as TableHeader, h as DataTable, hn as ChevronLeft, ht as TableHead, in as GripHorizontal, it as SlotNames, j as getColumnCountForDisplay, jt as SELECT_COLUMN_ID, k as prettifyRowColumnCount, kt as loadTableData, l as Switch, ln as Download, m as OutputRenderer, mn as ChevronsDownUp, mt as TableCell, n as marimoVersionAtom, nn as $fae977aafc393c5c$export$6b862160d295c8e, nt as contextAwarePanelType, o as SLIDE_TYPE_OPTIONS_BY_VALUE, on as EyeOff, ot as Toggle, p as OutputArea, pn as ChevronsLeft, pt as TableBody, q as CommandInput, qt as ChartInfoState, r as showCodeInRunModeAtom, rn as TextWrap, rt as isCellAwareAtom, t as useNotebookCodeAvailable, tn as $fae977aafc393c5c$export$588937bcd60ade55, tt as contextAwarePanelOwner, u as RadioGroup, un as Code, ut as Fill, v as downloadBlob, vt as NAMELESS_COLUMN_PREFIX, w as ColumnName, wt as DelayMount, x as Progress, xt as renderCellValue, y as downloadByURL, yt as generateColumns, z as useSelectList, zt as dateToLocalISODate, __tla as __tla_2 } from "./code-visibility-Bzf3rjxi.js";
 import { c as Calendar, i as createReducerAndAtoms, n as useOnUnmount, o as ToggleLeft, t as useOnMount } from "./useLifecycle-CxffarYV.js";
 import { t as Check } from "./check-C9OoNtR4.js";
 import { A as Icon, C as logNever, D as $18f2051aff69b9bf$export$a54013f0d02a8f82, E as $18f2051aff69b9bf$export$43bb16f9c6d9e3f7, F as createCollection, I as X, M as clamp$2, N as usePrevious$2, P as useDirection, R as ChevronDown, S as assertNever, a as SelectGroup, c as SelectSeparator, d as NativeSelect, i as SelectContent, j as Trigger$1, l as SelectTrigger, n as capitalize, o as SelectItem, r as Select, s as SelectLabel, t as Strings, u as SelectValue, w as $a916eb452884faea$export$b7a616150fdb9f44 } from "./strings-Dq_j3Rxw.js";
@@ -37732,7 +37732,7 @@ ${c}
   function _temp2$2(e) {
     e.target === e.currentTarget && e.key === "Enter" && (e.preventDefault(), e.stopPropagation(), e.currentTarget.click());
   }
-  var LazySlidesComponent = import_react.lazy(() => import("./reveal-component-CB90I1dT.js"));
+  var LazySlidesComponent = import_react.lazy(() => import("./reveal-component-CwLqC8NP.js"));
   const SlidesLayoutRenderer = ({ layout: e, setLayout: r, cells: c, mode: l }) => {
     var _a3;
     let u = useAtomValue(kioskModeAtom), d = l === "read" || u, f = useAtomValue(numColumnsAtom) > 1, [p, m] = (0, import_react.useState)(null), { slideCells: h, skippedIds: g, noOutputIds: _, slideTypes: v, startCellIndex: y } = (0, import_react.useMemo)(() => computeSlideCellsInfo(c, e), [

package/dist/{reveal-component-CB90I1dT.js → reveal-component-CwLqC8NP.js}

@@ -9,7 +9,7 @@ import { t as require_compiler_runtime } from "./compiler-runtime-CEbnTgxf.js";
 import { lt as kioskModeAtom, pt as outputIsStale } from "./html-to-image-DOqQBSQc.js";
 import "./chunk-5FQGJX7Z-BbqSm5gU.js";
 import { u as createLucideIcon } from "./dist--2Bqjvs0.js";
-import { a as DEFAULT_SLIDE_TYPE, c as Slide, ct as PanelGroup, i as DEFAULT_DECK_TRANSITION, lt as PanelResizeHandle, on as EyeOff, s as SlideSidebar, sn as Expand, st as Panel, t as useNotebookCodeAvailable, un as Code } from "./code-visibility-CNAoaX9P.js";
+import { a as DEFAULT_SLIDE_TYPE, c as Slide, ct as PanelGroup, i as DEFAULT_DECK_TRANSITION, lt as PanelResizeHandle, on as EyeOff, s as SlideSidebar, sn as Expand, st as Panel, t as useNotebookCodeAvailable, un as Code } from "./code-visibility-Bzf3rjxi.js";
 import { X as useDebouncedCallback } from "./input-BSdZp5Ng.js";
 import "./toDate-D1Z7ZXWh.js";
 import "./react-dom-BTJzcVJ9.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/islands",
-  "version": "0.23.14-dev46",
+  "version": "0.23.14-dev49",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/core/codemirror/cells/__tests__/debugger-decorations.test.ts

@@ -0,0 +1,185 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { python } from "@codemirror/lang-python";
+import { EditorState } from "@codemirror/state";
+import { EditorView } from "@codemirror/view";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { cellId } from "@/__tests__/branded";
+import type { CellId } from "@/core/cells/ids";
+import { createMockObservable } from "@/core/state/__mocks__/mocks";
+import type { Observable } from "@/core/state/observable";
+import {
+  breakpointGutter,
+  debuggerLineHighlighter,
+} from "../debugger-decorations";
+
+vi.mock("../debugger-state", () => ({
+  toggleBreakpoint: vi.fn(),
+}));
+
+import { toggleBreakpoint } from "../debugger-state";
+
+const CODE = `def my_function():
+    x = 1
+    y = 2
+    return x + y
+
+result = my_function()`;
+
+function createLineHighlighterEditor(
+  lineObservable: Observable<number | null>,
+) {
+  const state = EditorState.create({
+    doc: CODE,
+    extensions: [python(), debuggerLineHighlighter(lineObservable)],
+  });
+  return new EditorView({ state, parent: document.body });
+}
+
+function createBreakpointGutterEditor(
+  cid: CellId,
+  breakpointsObservable: Observable<ReadonlySet<number>>,
+) {
+  const state = EditorState.create({
+    doc: CODE,
+    extensions: [python(), breakpointGutter(cid, breakpointsObservable)],
+  });
+  return new EditorView({ state, parent: document.body });
+}
+
+/** Flush the microtask queue and apply the resulting state changes to `view`. */
+async function flush(view: EditorView): Promise<void> {
+  await Promise.resolve();
+  view.dispatch({});
+}
+
+/**
+ * Count rendered breakpoint markers, excluding the always-present hidden
+ * spacer element (`initialSpacer`) that isn't an actual breakpoint.
+ */
+function visibleMarkerCount(view: EditorView): number {
+  const gutterElement = view.dom.querySelector(".cm-breakpoint-gutter");
+  if (!gutterElement) {
+    return 0;
+  }
+  return gutterElement.querySelectorAll(
+    '.cm-gutterElement:not([style*="visibility: hidden"]) .cm-breakpoint-marker',
+  ).length;
+}
+
+describe("debugger-decorations", () => {
+  let view: EditorView | null = null;
+
+  afterEach(() => {
+    if (view) {
+      view.destroy();
+      view = null;
+    }
+    document.body.innerHTML = "";
+    vi.clearAllMocks();
+  });
+
+  describe("debuggerLineHighlighter", () => {
+    it("renders no highlight when the observable starts null", () => {
+      const lineObservable = createMockObservable<number | null>(null);
+      view = createLineHighlighterEditor(lineObservable);
+
+      expect(view.dom.querySelector(".cm-debugger-current-line")).toBeNull();
+    });
+
+    it("highlights the line reported by the observable", () => {
+      const lineObservable = createMockObservable<number | null>(null);
+      view = createLineHighlighterEditor(lineObservable);
+
+      lineObservable.set(2);
+      view.dispatch({});
+
+      expect(
+        view.dom.querySelector(".cm-debugger-current-line"),
+      ).not.toBeNull();
+    });
+
+    it("clears the highlight when the line is set back to null", () => {
+      const lineObservable = createMockObservable<number | null>(2);
+      view = createLineHighlighterEditor(lineObservable);
+      view.dispatch({});
+      expect(
+        view.dom.querySelector(".cm-debugger-current-line"),
+      ).not.toBeNull();
+
+      lineObservable.set(null);
+      view.dispatch({});
+
+      expect(view.dom.querySelector(".cm-debugger-current-line")).toBeNull();
+    });
+
+    it("does not throw for an out-of-range line", () => {
+      const lineObservable = createMockObservable<number | null>(null);
+      view = createLineHighlighterEditor(lineObservable);
+
+      expect(() => {
+        lineObservable.set(9999);
+        view?.dispatch({});
+      }).not.toThrow();
+      expect(view.dom.querySelector(".cm-debugger-current-line")).toBeNull();
+    });
+  });
+
+  describe("breakpointGutter", () => {
+    it("renders no markers when there are no breakpoints", () => {
+      const cid = cellId("cell1");
+      const breakpointsObservable = createMockObservable<ReadonlySet<number>>(
+        new Set(),
+      );
+      view = createBreakpointGutterEditor(cid, breakpointsObservable);
+
+      expect(visibleMarkerCount(view)).toBe(0);
+    });
+
+    it("syncs pre-existing breakpoints on mount", async () => {
+      const cid = cellId("cell1");
+      const breakpointsObservable = createMockObservable<ReadonlySet<number>>(
+        new Set([2]),
+      );
+      view = createBreakpointGutterEditor(cid, breakpointsObservable);
+      await flush(view); // initial sync is deferred to a microtask
+
+      expect(visibleMarkerCount(view)).toBe(1);
+    });
+
+    it("adds a marker when the observable reports a new breakpoint", () => {
+      const cid = cellId("cell1");
+      const breakpointsObservable = createMockObservable<ReadonlySet<number>>(
+        new Set(),
+      );
+      view = createBreakpointGutterEditor(cid, breakpointsObservable);
+
+      breakpointsObservable.set(new Set([1, 3]));
+      view.dispatch({});
+
+      expect(visibleMarkerCount(view)).toBe(2);
+    });
+
+    it("toggles a breakpoint when an existing marker is clicked", async () => {
+      const cid = cellId("cell1");
+      // A single breakpoint on line 1 renders exactly one non-spacer
+      // gutter element, so the click lands unambiguously on that line.
+      const breakpointsObservable = createMockObservable<ReadonlySet<number>>(
+        new Set([1]),
+      );
+      view = createBreakpointGutterEditor(cid, breakpointsObservable);
+      await flush(view);
+
+      const gutterElement = view.dom.querySelector(".cm-breakpoint-gutter");
+      const lineElement = gutterElement?.querySelector(
+        '.cm-gutterElement:not([style*="visibility: hidden"])',
+      );
+      expect(lineElement).not.toBeNull();
+      lineElement?.dispatchEvent(
+        new MouseEvent("mousedown", { bubbles: true }),
+      );
+
+      expect(toggleBreakpoint).toHaveBeenCalledWith(cid, 1);
+    });
+  });
+});

package/src/core/codemirror/cells/__tests__/debugger-state.test.ts

@@ -0,0 +1,139 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { MockRequestClient } from "@/__mocks__/requests";
+import { cellId } from "@/__tests__/branded";
+import { store } from "@/core/state/jotai";
+import {
+  breakpointsAtom,
+  clearCellBreakpoints,
+  createCellBreakpointsAtom,
+  createDebuggerLineAtom,
+  debuggerCurrentLineAtom,
+  resyncBreakpoints,
+  toggleBreakpoint,
+} from "../debugger-state";
+
+const mockRequestClient = MockRequestClient.create();
+vi.mock("@/core/network/requests", () => ({
+  getRequestClient: () => mockRequestClient,
+}));
+
+const cell1 = cellId("cell1");
+const cell2 = cellId("cell2");
+
+describe("debugger-state", () => {
+  beforeEach(() => {
+    store.set(breakpointsAtom, new Map());
+    store.set(debuggerCurrentLineAtom, null);
+    vi.clearAllMocks();
+  });
+
+  describe("toggleBreakpoint", () => {
+    it("adds a breakpoint and syncs the full set to the kernel", () => {
+      toggleBreakpoint(cell1, 3);
+
+      expect(store.get(breakpointsAtom).get(cell1)).toEqual(new Set([3]));
+      expect(mockRequestClient.sendSetBreakpoints).toHaveBeenCalledWith({
+        breakpoints: { [cell1]: [3] },
+      });
+    });
+
+    it("removes a breakpoint on second toggle and drops the cell once empty", () => {
+      toggleBreakpoint(cell1, 3);
+      toggleBreakpoint(cell1, 3);
+
+      expect(store.get(breakpointsAtom).has(cell1)).toBe(false);
+      expect(mockRequestClient.sendSetBreakpoints).toHaveBeenLastCalledWith({
+        breakpoints: {},
+      });
+    });
+
+    it("sends lines sorted ascending for a cell with multiple breakpoints", () => {
+      toggleBreakpoint(cell1, 5);
+      toggleBreakpoint(cell1, 2);
+
+      expect(mockRequestClient.sendSetBreakpoints).toHaveBeenLastCalledWith({
+        breakpoints: { [cell1]: [2, 5] },
+      });
+    });
+
+    it("keeps breakpoints for other cells independent", () => {
+      toggleBreakpoint(cell1, 1);
+      toggleBreakpoint(cell2, 2);
+
+      expect(store.get(breakpointsAtom).get(cell1)).toEqual(new Set([1]));
+      expect(store.get(breakpointsAtom).get(cell2)).toEqual(new Set([2]));
+    });
+  });
+
+  describe("clearCellBreakpoints", () => {
+    it("removes all breakpoints for a cell and syncs", () => {
+      toggleBreakpoint(cell1, 1);
+      toggleBreakpoint(cell1, 2);
+      vi.clearAllMocks();
+
+      clearCellBreakpoints(cell1);
+
+      expect(store.get(breakpointsAtom).has(cell1)).toBe(false);
+      expect(mockRequestClient.sendSetBreakpoints).toHaveBeenCalledWith({
+        breakpoints: {},
+      });
+    });
+
+    it("is a no-op when the cell has no breakpoints", () => {
+      clearCellBreakpoints(cell1);
+
+      expect(mockRequestClient.sendSetBreakpoints).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("resyncBreakpoints", () => {
+    it("re-sends the current breakpoint set", () => {
+      toggleBreakpoint(cell1, 4);
+      vi.clearAllMocks();
+
+      resyncBreakpoints();
+
+      expect(mockRequestClient.sendSetBreakpoints).toHaveBeenCalledWith({
+        breakpoints: { [cell1]: [4] },
+      });
+    });
+
+    it("does not send when there are no breakpoints", () => {
+      resyncBreakpoints();
+
+      expect(mockRequestClient.sendSetBreakpoints).not.toHaveBeenCalled();
+    });
+  });
+
+  describe("createCellBreakpointsAtom", () => {
+    it("returns the empty set for a cell with no breakpoints", () => {
+      const atom = createCellBreakpointsAtom(cell1);
+      expect(store.get(atom)).toEqual(new Set());
+    });
+
+    it("reflects breakpoints for its own cell only", () => {
+      toggleBreakpoint(cell1, 7);
+      const cell1Atom = createCellBreakpointsAtom(cell1);
+      const cell2Atom = createCellBreakpointsAtom(cell2);
+
+      expect(store.get(cell1Atom)).toEqual(new Set([7]));
+      expect(store.get(cell2Atom)).toEqual(new Set());
+    });
+  });
+
+  describe("createDebuggerLineAtom", () => {
+    it("returns null when no line is set", () => {
+      const atom = createDebuggerLineAtom(cell1);
+      expect(store.get(atom)).toBeNull();
+    });
+
+    it("returns the line only for the matching cell", () => {
+      store.set(debuggerCurrentLineAtom, { cellId: cell1, line: 10 });
+
+      expect(store.get(createDebuggerLineAtom(cell1))).toBe(10);
+      expect(store.get(createDebuggerLineAtom(cell2))).toBeNull();
+    });
+  });
+});

package/src/core/codemirror/cells/debugger-state.ts

@@ -72,6 +72,14 @@ export function clearCellBreakpoints(cellId: CellId): void {
   sendBreakpoints(next);
 }
 
+/** Re-push the current breakpoints to a freshly started kernel, whose `MarimoPdb` starts empty. */
+export function resyncBreakpoints(): void {
+  const current = store.get(breakpointsAtom);
+  if (current.size > 0) {
+    sendBreakpoints(current);
+  }
+}
+
 /** Toggle a breakpoint at `(cellId, line)` and sync the full set to the kernel. */
 export function toggleBreakpoint(cellId: CellId, line: number): void {
   const prev = store.get(breakpointsAtom);

package/src/core/websocket/useMarimoKernelConnection.tsx

@@ -32,7 +32,10 @@ import { cacheInfoAtom } from "../cache/requests";
 import { SCRATCH_CELL_ID } from "../cells/ids";
 import { useRunsActions } from "../cells/runs";
 import { focusAndScrollCellOutputIntoView } from "../cells/scrollCellIntoView";
-import { debuggerCurrentLineAtom } from "../codemirror/cells/debugger-state";
+import {
+  debuggerCurrentLineAtom,
+  resyncBreakpoints,
+} from "../codemirror/cells/debugger-state";
 import type { CellData } from "../cells/types";
 import { capabilitiesAtom } from "../config/capabilities";
 import { useSetAppConfig } from "../config/config";
@@ -223,6 +226,11 @@ export function useMarimoKernelConnection(opts: {
           existingCells,
         });
         setKioskMode(msg.data.kiosk);
+        // A freshly started kernel has no breakpoints of its own; re-push
+        // the client's set so they still apply, and clear the stale
+        // highlighted line from the previous kernel instance.
+        setDebuggerCurrentLine(null);
+        resyncBreakpoints();
         return;
       }