@marimo-team/frontend 0.19.3-dev7 → 0.19.3

package/src/core/codemirror/lsp/notebook-lsp.ts

@@ -9,6 +9,7 @@ import { invariant } from "@/utils/invariant";
 import { Logger } from "@/utils/Logger";
 import { LRUCache } from "@/utils/lru";
 import { Objects } from "@/utils/objects";
+import { getPositionAtWordBounds } from "../completion/hints";
 import { topologicalCodesAtom } from "../copilot/getCodes";
 import {
   getEditorCodeAsPython,
@@ -22,6 +23,14 @@ import {
 } from "./types";
 import { getLSPDocument } from "./utils";
 
+/**
+ * Check if a variable name is private (starts with underscore but not dunder).
+ * Private variables in marimo are cell-local and should not be renamed across cells.
+ */
+function isPrivateVariable(name: string): boolean {
+  return name.startsWith("_") && !name.startsWith("__");
+}
+
 class Snapshotter {
   private documentVersion = 0;
   private readonly getNotebookCode: () => {
@@ -433,15 +442,46 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
 
     // Update the code in the plugins manually
     const editors = this.getNotebookEditors();
-    for (const [cellId, ev] of Objects.entries(editors)) {
-      const newCode = editsToNewCode.get(cellId);
+
+    // Check if this is a private variable rename (should only affect current cell)
+    // Private variables in marimo are cell-local and should not be renamed across cells
+    const originEditor = editors[cellId];
+    let isPrivateRename = false;
+    if (originEditor) {
+      // Convert LSP position (line, character) to CodeMirror position
+      const line = originEditor.state.doc.line(params.position.line + 1);
+      const cmPosition = line.from + params.position.character;
+      const { startToken, endToken } = getPositionAtWordBounds(
+        originEditor.state.doc,
+        cmPosition,
+      );
+      const originalName = originEditor.state.doc.sliceString(
+        startToken,
+        endToken,
+      );
+      isPrivateRename = isPrivateVariable(originalName);
+      if (isPrivateRename) {
+        Logger.debug(
+          "[lsp] Private variable rename detected, limiting to current cell",
+          originalName,
+        );
+      }
+    }
+
+    for (const [currentCellId, ev] of Objects.entries(editors)) {
+      // For private variable renames, only update the originating cell
+      if (isPrivateRename && currentCellId !== cellId) {
+        continue;
+      }
+
+      const newCode = editsToNewCode.get(currentCellId);
       if (newCode == null) {
-        Logger.warn("No new code for cell", cellId);
+        Logger.warn("No new code for cell", currentCellId);
         continue;
       }
 
       if (!ev) {
-        Logger.warn("No view for plugin", cellId);
+        Logger.warn("No view for plugin", currentCellId);
         continue;
       }
 

package/src/core/codemirror/misc/__tests__/string-braces.test.ts

@@ -0,0 +1,200 @@
+/* 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 } from "vitest";
+import { stringBraceInputHandler } from "../string-braces";
+
+function createEditor(
+  initialContent: string,
+  cursorPosition: number,
+): EditorView {
+  const state = EditorState.create({
+    doc: initialContent,
+    selection: { anchor: cursorPosition },
+    extensions: [python()],
+  });
+
+  const view = new EditorView({
+    state,
+    parent: document.body,
+  });
+
+  return view;
+}
+
+describe("string brace auto-closing", () => {
+  let view: EditorView;
+
+  afterEach(() => {
+    if (view) {
+      view.destroy();
+      if (document.body.contains(view.dom)) {
+        view.dom.remove();
+      }
+    }
+  });
+
+  it("should auto-close braces in f-strings", () => {
+    view = createEditor('f"hello ', 8);
+    const result = stringBraceInputHandler(view, 8, 8, "{");
+
+    expect(result).toBe(true);
+    expect(view.state.doc.toString()).toBe('f"hello {}');
+    expect(view.state.selection.main.head).toBe(9);
+  });
+
+  it("should auto-close braces in regular double-quoted strings", () => {
+    view = createEditor('"hello ', 7);
+    const result = stringBraceInputHandler(view, 7, 7, "{");
+
+    expect(result).toBe(true);
+    expect(view.state.doc.toString()).toBe('"hello {}');
+    expect(view.state.selection.main.head).toBe(8);
+  });
+
+  it("should auto-close braces in rf-strings", () => {
+    view = createEditor('rf"hello ', 9);
+    const result = stringBraceInputHandler(view, 9, 9, "{");
+
+    expect(result).toBe(true);
+    expect(view.state.doc.toString()).toBe('rf"hello {}');
+    expect(view.state.selection.main.head).toBe(10);
+  });
+
+  it("should auto-close braces in fr-strings", () => {
+    view = createEditor('fr"hello ', 9);
+    const result = stringBraceInputHandler(view, 9, 9, "{");
+
+    expect(result).toBe(true);
+    expect(view.state.doc.toString()).toBe('fr"hello {}');
+    expect(view.state.selection.main.head).toBe(10);
+  });
+
+  it("should auto-close braces in single-quoted strings", () => {
+    view = createEditor("'hello ", 7);
+    const result = stringBraceInputHandler(view, 7, 7, "{");
+
+    expect(result).toBe(true);
+    expect(view.state.doc.toString()).toBe("'hello {}");
+    expect(view.state.selection.main.head).toBe(8);
+  });
+
+  it("should auto-close braces in uppercase F-strings", () => {
+    view = createEditor('F"hello ', 8);
+    const result = stringBraceInputHandler(view, 8, 8, "{");
+
+    expect(result).toBe(true);
+    expect(view.state.doc.toString()).toBe('F"hello {}');
+    expect(view.state.selection.main.head).toBe(9);
+  });
+
+  it("should auto-close braces in raw strings without f/t", () => {
+    view = createEditor('r"hello ', 8);
+    const result = stringBraceInputHandler(view, 8, 8, "{");
+
+    expect(result).toBe(true);
+    expect(view.state.doc.toString()).toBe('r"hello {}');
+    expect(view.state.selection.main.head).toBe(9);
+  });
+
+  // Handled by other CodeMirror handler(s)
+  it("should NOT auto-close braces outside strings", () => {
+    view = createEditor("x = ", 4);
+    const result = stringBraceInputHandler(view, 4, 4, "{");
+
+    expect(result).toBe(false);
+    expect(view.state.doc.toString()).toBe("x = ");
+  });
+
+  it("should NOT auto-close braces when typing other characters", () => {
+    view = createEditor('f"hello ', 8);
+    const result = stringBraceInputHandler(view, 8, 8, "a");
+
+    expect(result).toBe(false);
+    expect(view.state.doc.toString()).toBe('f"hello ');
+  });
+
+  it("should handle braces at the start of string", () => {
+    view = createEditor('f"', 2);
+    const result = stringBraceInputHandler(view, 2, 2, "{");
+
+    expect(result).toBe(true);
+    expect(view.state.doc.toString()).toBe('f"{}');
+    expect(view.state.selection.main.head).toBe(3);
+  });
+
+  it("should handle braces in the middle of string content", () => {
+    view = createEditor('f"hello world ', 14);
+    const result = stringBraceInputHandler(view, 14, 14, "{");
+
+    expect(result).toBe(true);
+    expect(view.state.doc.toString()).toBe('f"hello world {}');
+    expect(view.state.selection.main.head).toBe(15);
+  });
+
+  it("should handle multiple braces in string", () => {
+    view = createEditor('f"hello {} world', 16);
+    const result = stringBraceInputHandler(view, 16, 16, "{");
+
+    expect(result).toBe(true);
+    expect(view.state.doc.toString()).toBe('f"hello {} world{}');
+    expect(view.state.selection.main.head).toBe(17);
+  });
+
+  it("should handle empty string", () => {
+    view = createEditor('f""', 2);
+    const result = stringBraceInputHandler(view, 2, 2, "{");
+
+    expect(result).toBe(true);
+    expect(view.state.doc.toString()).toBe('f"{}"');
+    expect(view.state.selection.main.head).toBe(3);
+  });
+
+  it("should auto-close braces in triple-quoted strings", () => {
+    view = createEditor('"""hello ', 9);
+    const result = stringBraceInputHandler(view, 9, 9, "{");
+
+    expect(result).toBe(true);
+    expect(view.state.doc.toString()).toBe('"""hello {}');
+    expect(view.state.selection.main.head).toBe(10);
+  });
+
+  it("should auto-close braces in triple-quoted f-strings", () => {
+    view = createEditor('f"""hello ', 10);
+    const result = stringBraceInputHandler(view, 10, 10, "{");
+
+    expect(result).toBe(true);
+    expect(view.state.doc.toString()).toBe('f"""hello {}');
+    expect(view.state.selection.main.head).toBe(11);
+  });
+
+  it("should auto-close braces in triple single-quoted strings", () => {
+    view = createEditor("'''hello ", 9);
+    const result = stringBraceInputHandler(view, 9, 9, "{");
+
+    expect(result).toBe(true);
+    expect(view.state.doc.toString()).toBe("'''hello {}");
+    expect(view.state.selection.main.head).toBe(10);
+  });
+
+  it("should auto-close braces in triple single-quoted f-strings", () => {
+    view = createEditor("f'''hello ", 10);
+    const result = stringBraceInputHandler(view, 10, 10, "{");
+
+    expect(result).toBe(true);
+    expect(view.state.doc.toString()).toBe("f'''hello {}");
+    expect(view.state.selection.main.head).toBe(11);
+  });
+
+  it("should NOT auto-close braces when text is selected", () => {
+    view = createEditor('f"hello world"', 8);
+    // User has selected "world" (from position 8 to 13)
+    const result = stringBraceInputHandler(view, 8, 13, "{");
+
+    expect(result).toBe(false);
+    // Document should remain unchanged since we return false
+    expect(view.state.doc.toString()).toBe('f"hello world"');
+  });
+});

package/src/core/codemirror/misc/string-braces.ts

@@ -0,0 +1,37 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+import { syntaxTree } from "@codemirror/language";
+import type { Extension } from "@codemirror/state";
+import { EditorView } from "@codemirror/view";
+
+export function stringBraceInputHandler(
+  view: EditorView,
+  from: number,
+  to: number,
+  text: string,
+): boolean {
+  if (text !== "{") {
+    return false;
+  }
+
+  if (from !== to) {
+    return false;
+  }
+
+  const tree = syntaxTree(view.state);
+  const node = tree.resolveInner(from, -1);
+
+  if (!node?.type.name.includes("String")) {
+    return false;
+  }
+
+  view.dispatch({
+    changes: { from, to, insert: "{}" },
+    selection: { anchor: from + 1 },
+    userEvent: "input.type",
+  });
+  return true;
+}
+
+export function stringsAutoCloseBraces(): Extension {
+  return EditorView.inputHandler.of(stringBraceInputHandler);
+}

package/src/core/config/__tests__/config-schema.test.ts

@@ -45,6 +45,7 @@ test("default UserConfig - empty", () => {
   expect(defaultConfig).toMatchInlineSnapshot(`
     {
       "ai": {
+        "custom_providers": {},
         "inline_tooltip": false,
         "mode": "manual",
         "models": {
@@ -114,6 +115,7 @@ test("default UserConfig - one level", () => {
   expect(defaultConfig).toMatchInlineSnapshot(`
     {
       "ai": {
+        "custom_providers": {},
         "inline_tooltip": false,
         "mode": "manual",
         "models": {
@@ -198,6 +200,40 @@ test("default UserConfig with additional information", () => {
   );
 });
 
+test("UserConfig with custom_providers", () => {
+  const config = UserConfigSchema.parse({
+    ai: {
+      custom_providers: {
+        my_provider: {
+          api_key: "test-key",
+          base_url: "https://api.example.com/v1",
+        },
+        another_provider: {
+          base_url: "https://api.another.com/v1",
+        },
+      },
+    },
+  });
+
+  expect(config.ai?.custom_providers).toEqual({
+    my_provider: {
+      api_key: "test-key",
+      base_url: "https://api.example.com/v1",
+    },
+    another_provider: {
+      base_url: "https://api.another.com/v1",
+    },
+  });
+});
+
+test("UserConfig custom_providers defaults to empty object", () => {
+  const config = UserConfigSchema.parse({
+    ai: {},
+  });
+
+  expect(config.ai?.custom_providers).toEqual({});
+});
+
 test("resolvedMarimoConfigAtom overrides correctly and does not mutate the original array", () => {
   const initialUserConfig = {
     completion: {

package/src/core/config/config-schema.ts

@@ -175,6 +175,7 @@ export const UserConfigSchema = z
             aws_secret_access_key: z.string().optional(),
           })
           .optional(),
+        custom_providers: z.record(z.string(), AiConfigSchema).prefault({}),
         models: AiModelsSchema.prefault({
           displayed_models: [],
           custom_models: [],

package/src/core/errors/state.ts

@@ -1,11 +1,17 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import { useAtomValue } from "jotai";
+import { atom, useAtomValue } from "jotai";
 import { createReducerAndAtoms } from "@/utils/createReducer";
 import type { Identified } from "@/utils/typed";
 import { generateUUID } from "@/utils/uuid";
 import type { Banner } from "../kernel/messages";
 
+/**
+ * Atom for storing kernel startup error message.
+ * When set to a non-null value, shows a modal with the error details.
+ */
+export const kernelStartupErrorAtom = atom<string | null>(null);
+
 interface BannerState {
   banners: Identified<Banner>[];
 }