@marimo-team/islands 0.21.2-dev13 → 0.21.2-dev15

package/dist/main.js

@@ -29325,6 +29325,8 @@ ${c.sqlString}
   var NotebookLanguageServerClient = (_a = class {
     constructor(e, r, c = defaultGetNotebookEditors) {
       __publicField(this, "completionItemCache", new LRUCache(10));
+      __publicField(this, "latestDiagnosticsVersion", null);
+      __publicField(this, "forwardedDiagnosticsVersion", 0);
       this.documentUri = getLSPDocument(), this.getNotebookEditors = c, this.initialSettings = r, this.client = e, this.patchProcessNotification(), this.initializePromise.then(() => {
         invariant(isClientWithNotify(this.client), "notify is not a method on the client"), this.client.notify("workspace/didChangeConfiguration", {
           settings: r
@@ -29372,7 +29374,7 @@ ${c.sqlString}
         settings: this.initialSettings
       });
       let { lens: e, version: r } = this.snapshotter.snapshot();
-      await this.client.textDocumentDidOpen({
+      this.latestDiagnosticsVersion = null, this.forwardedDiagnosticsVersion = 0, await this.client.textDocumentDidOpen({
         textDocument: {
           languageId: "python",
           text: e.mergedText,
@@ -29570,39 +29572,49 @@ ${c.sqlString}
       invariant("processNotification" in this.client, "processNotification is not a method on the client");
       let r = this.client.processNotification.bind(this.client), c = (c2) => {
         if (c2.method === "textDocument/publishDiagnostics") {
+          let d = c2.params.version;
+          if (d != null) {
+            let e = this.latestDiagnosticsVersion;
+            if (e !== null && Number.isFinite(d) && d < e) {
+              Logger.debug("[lsp] dropping stale diagnostics notification", c2);
+              return;
+            }
+            this.latestDiagnosticsVersion = d;
+          }
           Logger.debug("[lsp] handling diagnostics", c2);
-          let d = this.snapshotter.getLatestSnapshot(), f = c2.params.diagnostics, { lens: _, version: v } = d, y = /* @__PURE__ */ new Map();
-          for (let e of f) for (let r2 of _.cellIds) if (_.isInRange(e.range, r2)) {
-            y.has(r2) || y.set(r2, []);
+          let f = this.snapshotter.getLatestSnapshot(), _ = c2.params.diagnostics, { lens: v } = f, y = ++this.forwardedDiagnosticsVersion, S = /* @__PURE__ */ new Map();
+          for (let e of _) for (let r2 of v.cellIds) if (v.isInRange(e.range, r2)) {
+            S.has(r2) || S.set(r2, []);
             let c3 = {
               ...e,
-              range: _.reverseRange(e.range, r2)
+              range: v.reverseRange(e.range, r2)
             };
-            y.get(r2).push(c3);
+            S.get(r2).push(c3);
             break;
           }
-          let S = new Set(_.cellIds);
-          _a.pruneSeenCellUris(S);
-          let w = new Set(_a.SEEN_CELL_DOCUMENT_URIS);
-          for (let [e, d2] of y.entries()) {
+          let w = new Set(v.cellIds);
+          _a.pruneSeenCellUris(w);
+          let E = new Set(_a.SEEN_CELL_DOCUMENT_URIS);
+          for (let [e, d2] of S.entries()) {
             Logger.debug("[lsp] diagnostics for cell", e, d2);
             let f2 = CellDocumentUri.of(e);
-            w.delete(f2), r({
+            E.delete(f2), r({
               ...c2,
               params: {
                 ...c2.params,
                 uri: f2,
-                version: v,
+                version: y,
                 diagnostics: d2
               }
             });
           }
-          if (w.size > 0) {
-            Logger.debug("[lsp] clearing diagnostics", w);
-            for (let e of w) r({
+          if (E.size > 0) {
+            Logger.debug("[lsp] clearing diagnostics", E);
+            for (let e of E) r({
               method: "textDocument/publishDiagnostics",
               params: {
                 uri: e,
+                version: y,
                 diagnostics: []
               }
             });
@@ -70786,7 +70798,7 @@ Image URL: ${r.imageUrl}`)), contextToXml({
       return Logger.warn("Failed to get version from mount config"), null;
     }
   }
-  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.21.2-dev13"), showCodeInRunModeAtom = atom(true);
+  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.21.2-dev15"), showCodeInRunModeAtom = atom(true);
   atom(null);
   var import_compiler_runtime$89 = require_compiler_runtime();
   function useKeydownOnElement(e, r) {

package/package.json

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

package/src/components/app-config/user-config-form.tsx

@@ -2,6 +2,7 @@
 
 import { zodResolver } from "@hookform/resolvers/zod";
 import { atom, useAtom, useAtomValue, useSetAtom } from "jotai";
+import { merge } from "lodash-es";
 import {
   AlertTriangleIcon,
   BrainIcon,
@@ -287,10 +288,10 @@ export const UserConfigForm: React.FC = () => {
       dirtyValues.ai = setAiModels(values.ai, dirtyValues.ai);
     }
 
-    await saveUserConfig({ config: dirtyValues }).then(() => {
-      // Update local state with form values
-      setConfig((prev) => ({ ...prev, ...values }));
-    });
+    await saveUserConfig({ config: dirtyValues });
+    // Only apply the changed keys; this avoids stale request responses
+    // overwriting newer config changes.
+    setConfig((prev) => merge({}, prev, dirtyValues));
   };
   const onSubmit = useDebouncedCallback(onSubmitNotDebounced, FORM_DEBOUNCE);
 

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

@@ -178,6 +178,8 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
     string,
     Promise<LSP.CompletionItem>
   >(10);
+  private latestDiagnosticsVersion: number | null = null;
+  private forwardedDiagnosticsVersion = 0;
 
   constructor(
     client: ILanguageServerClient,
@@ -270,6 +272,8 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
 
     // Get the current document state
     const { lens, version } = this.snapshotter.snapshot();
+    this.latestDiagnosticsVersion = null;
+    this.forwardedDiagnosticsVersion = 0;
 
     // Re-open the merged document with the LSP server
     // This sends a textDocument/didOpen for the entire notebook
@@ -768,13 +772,34 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
         | { method: "other"; params: unknown },
     ) => {
       if (notification.method === "textDocument/publishDiagnostics") {
+        const incomingVersion = notification.params.version;
+        if (incomingVersion != null) {
+          const latestVersion = this.latestDiagnosticsVersion;
+          if (
+            latestVersion !== null &&
+            Number.isFinite(incomingVersion) &&
+            incomingVersion < latestVersion
+          ) {
+            Logger.debug(
+              "[lsp] dropping stale diagnostics notification",
+              notification,
+            );
+            return;
+          }
+          this.latestDiagnosticsVersion = incomingVersion;
+        }
+
         Logger.debug("[lsp] handling diagnostics", notification);
         // Use the correct lens by version
         const payload = this.snapshotter.getLatestSnapshot();
 
         const diagnostics = notification.params.diagnostics;
 
-        const { lens, version: cellVersion } = payload;
+        const { lens } = payload;
+        // Forward diagnostics with a strictly increasing version so downstream
+        // plugin updates/clears reliably, even when server repeats the same
+        // document version across multiple publishDiagnostics notifications.
+        const diagnosticsVersion = ++this.forwardedDiagnosticsVersion;
 
         // Pre-partition diagnostics by cell
         const diagnosticsByCellId = new Map<CellId, LSP.Diagnostic[]>();
@@ -817,7 +842,7 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
             params: {
               ...notification.params,
               uri: cellDocumentUri,
-              version: cellVersion,
+              version: diagnosticsVersion,
               diagnostics: cellDiagnostics,
             },
           });
@@ -832,6 +857,7 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
               method: "textDocument/publishDiagnostics",
               params: {
                 uri: cellDocumentUri,
+                version: diagnosticsVersion,
                 diagnostics: [],
               },
             });