From 6e22ce9f419d370998bc4639f3582eb8a0f1881a Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Mon, 28 Apr 2025 15:53:10 +0300
Subject: [PATCH 001/133] Add ts/routes/editor

---
 ts/routes/editor/[noteId]/+page.svelte | 12 ++++++++++++
 ts/routes/editor/[noteId]/+page.ts     | 10 ++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 ts/routes/editor/[noteId]/+page.svelte
 create mode 100644 ts/routes/editor/[noteId]/+page.ts

diff --git a/ts/routes/editor/[noteId]/+page.svelte b/ts/routes/editor/[noteId]/+page.svelte
new file mode 100644
index 000000000..995cede15
--- /dev/null
+++ b/ts/routes/editor/[noteId]/+page.svelte
@@ -0,0 +1,12 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+<script lang="ts">
+    import type { PageData } from "./$types";
+
+    export let data: PageData;
+
+</script>
+
+<div>{data.noteId}</div>
diff --git a/ts/routes/editor/[noteId]/+page.ts b/ts/routes/editor/[noteId]/+page.ts
new file mode 100644
index 000000000..66e82b2cd
--- /dev/null
+++ b/ts/routes/editor/[noteId]/+page.ts
@@ -0,0 +1,10 @@
+// Copyright: Ankitects Pty Ltd and contributors
+// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+
+import type { PageLoad } from "./$types";
+
+export const load = (async ({ params }) => {
+    const noteId = BigInt(params.noteId);
+
+    return { noteId };
+}) satisfies PageLoad;

From 5cbb5242c8dce70065042cf1a921d1956c0b2bbb Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 22 May 2025 02:46:01 +0300
Subject: [PATCH 002/133] Move editor code to ts/routes

---
 build/configure/src/aqt.rs                    | 12 +++----
 build/configure/src/web.rs                    | 33 ++---------------
 proto/anki/frontend.proto                     |  2 ++
 qt/aqt/editor.py                              | 36 +++++++++++--------
 qt/aqt/mediasrv.py                            | 14 ++++++++
 ts/editor/index.ts                            |  8 -----
 ts/{ => lib}/editable/ContentEditable.svelte  |  0
 ts/{ => lib}/editable/Mathjax.svelte          |  0
 ts/{ => lib}/editable/change-timer.ts         |  0
 ts/{ => lib}/editable/content-editable.ts     |  0
 ts/{ => lib}/editable/decorated.ts            |  0
 ts/{ => lib}/editable/editable-base.scss      |  2 +-
 ts/{ => lib}/editable/frame-element.ts        |  0
 ts/{ => lib}/editable/frame-handle.ts         |  0
 ts/{ => lib}/editable/index.ts                |  0
 .../editable/mathjax-element.svelte.ts        |  0
 ts/{ => lib}/editable/mathjax.ts              |  0
 ts/{ => lib}/html-filter/element.ts           |  0
 ts/{ => lib}/html-filter/helpers.ts           |  0
 ts/{ => lib}/html-filter/index.test.ts        |  0
 ts/{ => lib}/html-filter/index.ts             |  0
 ts/{ => lib}/html-filter/node.ts              |  0
 ts/{ => lib}/html-filter/styling.ts           |  0
 ts/routes/editor/+page.svelte                 | 23 ++++++++++++
 ts/{ => routes}/editor/BrowserEditor.svelte   |  0
 ts/{ => routes}/editor/ClozeButtons.svelte    |  0
 ts/{ => routes}/editor/CodeMirror.svelte      |  0
 ts/{ => routes}/editor/CollapseBadge.svelte   |  0
 ts/{ => routes}/editor/CollapseLabel.svelte   |  0
 ts/{ => routes}/editor/DuplicateLink.svelte   |  0
 ts/{ => routes}/editor/EditingArea.svelte     |  0
 ts/{ => routes}/editor/EditorField.svelte     |  0
 .../editor/FieldDescription.svelte            |  0
 ts/{ => routes}/editor/FieldState.svelte      |  0
 ts/{ => routes}/editor/Fields.svelte          |  0
 .../editor/HandleBackground.svelte            |  0
 ts/{ => routes}/editor/HandleControl.svelte   |  0
 ts/{ => routes}/editor/HandleLabel.svelte     |  0
 ts/{ => routes}/editor/LabelContainer.svelte  |  0
 ts/{ => routes}/editor/LabelName.svelte       |  0
 ts/{ => routes}/editor/NoteCreator.svelte     |  0
 ts/{ => routes}/editor/NoteEditor.svelte      | 16 ++++-----
 ts/{ => routes}/editor/Notification.svelte    |  0
 ts/{ => routes}/editor/PlainTextBadge.svelte  |  0
 ts/{ => routes}/editor/PreviewButton.svelte   |  0
 ts/{ => routes}/editor/ReviewerEditor.svelte  |  0
 ts/{ => routes}/editor/RichTextBadge.svelte   |  0
 ts/{ => routes}/editor/StickyBadge.svelte     |  0
 ts/routes/editor/[noteId]/+page.svelte        | 12 -------
 ts/routes/editor/[noteId]/+page.ts            | 10 ------
 ts/{ => routes}/editor/base.ts                |  9 ++---
 ts/{ => routes}/editor/code-mirror.ts         |  0
 ts/{ => routes}/editor/decorated-elements.ts  |  8 ++---
 ts/{ => routes}/editor/destroyable.ts         |  0
 ts/{ => routes}/editor/editor-base.scss       |  0
 .../editor/editor-toolbar/AddonButtons.svelte |  0
 .../editor/editor-toolbar/BlockButtons.svelte |  0
 .../editor/editor-toolbar/BoldButton.svelte   |  0
 .../editor/editor-toolbar/ColorPicker.svelte  |  0
 .../editor-toolbar/CommandIconButton.svelte   |  0
 .../editor-toolbar/EditorToolbar.svelte       |  0
 .../HighlightColorButton.svelte               |  0
 .../ImageOcclusionButton.svelte               |  4 +--
 .../editor-toolbar/InlineButtons.svelte       |  0
 .../editor/editor-toolbar/ItalicButton.svelte |  0
 .../editor/editor-toolbar/LatexButton.svelte  |  2 +-
 .../editor-toolbar/NotetypeButtons.svelte     |  0
 .../editor-toolbar/OptionsButton.svelte       |  2 +-
 .../editor-toolbar/OptionsButtons.svelte      |  0
 .../editor-toolbar/RemoveFormatButton.svelte  |  0
 .../RichTextClozeButtons.svelte               |  0
 .../editor-toolbar/SubscriptButton.svelte     |  0
 .../editor-toolbar/SuperscriptButton.svelte   |  0
 .../editor-toolbar/TemplateButtons.svelte     |  0
 .../editor-toolbar/TextAttributeButton.svelte |  0
 .../editor-toolbar/TextColorButton.svelte     |  0
 .../editor-toolbar/UnderlineButton.svelte     |  0
 .../editor-toolbar/WithColorHelper.svelte     |  0
 .../editor/editor-toolbar/index.ts            |  0
 ts/{ => routes}/editor/helpers.ts             |  0
 .../editor/image-overlay/FloatButtons.svelte  |  0
 .../editor/image-overlay/ImageOverlay.svelte  |  0
 .../editor/image-overlay/SizeSelect.svelte    |  0
 ts/{ => routes}/editor/image-overlay/index.ts |  0
 ts/{ => routes}/editor/legacy.scss            |  0
 .../mathjax-overlay/MathjaxButtons.svelte     |  0
 .../mathjax-overlay/MathjaxEditor.svelte      |  0
 .../mathjax-overlay/MathjaxOverlay.svelte     |  4 +--
 .../editor/mathjax-overlay/index.ts           |  0
 ts/{ => routes}/editor/old-editor-adapter.ts  |  2 +-
 .../plain-text-input/PlainTextInput.svelte    |  0
 .../editor/plain-text-input/index.ts          |  0
 .../plain-text-input/remove-prohibited.ts     |  0
 .../editor/plain-text-input/transform.ts      |  0
 .../rich-text-input/CustomStyles.svelte       |  0
 .../rich-text-input/RichTextInput.svelte      |  4 +--
 .../rich-text-input/RichTextStyles.svelte     |  0
 .../editor/rich-text-input/StyleLink.svelte   |  0
 .../editor/rich-text-input/StyleTag.svelte    |  0
 .../editor/rich-text-input/index.ts           |  0
 .../rich-text-input/normalizing-node-store.ts |  2 +-
 .../rich-text-input/rich-text-resolve.ts      |  0
 .../editor/rich-text-input/transform.ts       |  0
 ts/{ => routes}/editor/surround.ts            |  0
 ts/{ => routes}/editor/types.ts               |  2 ++
 ts/routes/tmp/_page.ts                        |  1 -
 106 files changed, 96 insertions(+), 112 deletions(-)
 delete mode 100644 ts/editor/index.ts
 rename ts/{ => lib}/editable/ContentEditable.svelte (100%)
 rename ts/{ => lib}/editable/Mathjax.svelte (100%)
 rename ts/{ => lib}/editable/change-timer.ts (100%)
 rename ts/{ => lib}/editable/content-editable.ts (100%)
 rename ts/{ => lib}/editable/decorated.ts (100%)
 rename ts/{ => lib}/editable/editable-base.scss (96%)
 rename ts/{ => lib}/editable/frame-element.ts (100%)
 rename ts/{ => lib}/editable/frame-handle.ts (100%)
 rename ts/{ => lib}/editable/index.ts (100%)
 rename ts/{ => lib}/editable/mathjax-element.svelte.ts (100%)
 rename ts/{ => lib}/editable/mathjax.ts (100%)
 rename ts/{ => lib}/html-filter/element.ts (100%)
 rename ts/{ => lib}/html-filter/helpers.ts (100%)
 rename ts/{ => lib}/html-filter/index.test.ts (100%)
 rename ts/{ => lib}/html-filter/index.ts (100%)
 rename ts/{ => lib}/html-filter/node.ts (100%)
 rename ts/{ => lib}/html-filter/styling.ts (100%)
 create mode 100644 ts/routes/editor/+page.svelte
 rename ts/{ => routes}/editor/BrowserEditor.svelte (100%)
 rename ts/{ => routes}/editor/ClozeButtons.svelte (100%)
 rename ts/{ => routes}/editor/CodeMirror.svelte (100%)
 rename ts/{ => routes}/editor/CollapseBadge.svelte (100%)
 rename ts/{ => routes}/editor/CollapseLabel.svelte (100%)
 rename ts/{ => routes}/editor/DuplicateLink.svelte (100%)
 rename ts/{ => routes}/editor/EditingArea.svelte (100%)
 rename ts/{ => routes}/editor/EditorField.svelte (100%)
 rename ts/{ => routes}/editor/FieldDescription.svelte (100%)
 rename ts/{ => routes}/editor/FieldState.svelte (100%)
 rename ts/{ => routes}/editor/Fields.svelte (100%)
 rename ts/{ => routes}/editor/HandleBackground.svelte (100%)
 rename ts/{ => routes}/editor/HandleControl.svelte (100%)
 rename ts/{ => routes}/editor/HandleLabel.svelte (100%)
 rename ts/{ => routes}/editor/LabelContainer.svelte (100%)
 rename ts/{ => routes}/editor/LabelName.svelte (100%)
 rename ts/{ => routes}/editor/NoteCreator.svelte (100%)
 rename ts/{ => routes}/editor/NoteEditor.svelte (98%)
 rename ts/{ => routes}/editor/Notification.svelte (100%)
 rename ts/{ => routes}/editor/PlainTextBadge.svelte (100%)
 rename ts/{ => routes}/editor/PreviewButton.svelte (100%)
 rename ts/{ => routes}/editor/ReviewerEditor.svelte (100%)
 rename ts/{ => routes}/editor/RichTextBadge.svelte (100%)
 rename ts/{ => routes}/editor/StickyBadge.svelte (100%)
 delete mode 100644 ts/routes/editor/[noteId]/+page.svelte
 delete mode 100644 ts/routes/editor/[noteId]/+page.ts
 rename ts/{ => routes}/editor/base.ts (91%)
 rename ts/{ => routes}/editor/code-mirror.ts (100%)
 rename ts/{ => routes}/editor/decorated-elements.ts (78%)
 rename ts/{ => routes}/editor/destroyable.ts (100%)
 rename ts/{ => routes}/editor/editor-base.scss (100%)
 rename ts/{ => routes}/editor/editor-toolbar/AddonButtons.svelte (100%)
 rename ts/{ => routes}/editor/editor-toolbar/BlockButtons.svelte (100%)
 rename ts/{ => routes}/editor/editor-toolbar/BoldButton.svelte (100%)
 rename ts/{ => routes}/editor/editor-toolbar/ColorPicker.svelte (100%)
 rename ts/{ => routes}/editor/editor-toolbar/CommandIconButton.svelte (100%)
 rename ts/{ => routes}/editor/editor-toolbar/EditorToolbar.svelte (100%)
 rename ts/{ => routes}/editor/editor-toolbar/HighlightColorButton.svelte (100%)
 rename ts/{ => routes}/editor/editor-toolbar/ImageOcclusionButton.svelte (94%)
 rename ts/{ => routes}/editor/editor-toolbar/InlineButtons.svelte (100%)
 rename ts/{ => routes}/editor/editor-toolbar/ItalicButton.svelte (100%)
 rename ts/{ => routes}/editor/editor-toolbar/LatexButton.svelte (98%)
 rename ts/{ => routes}/editor/editor-toolbar/NotetypeButtons.svelte (100%)
 rename ts/{ => routes}/editor/editor-toolbar/OptionsButton.svelte (97%)
 rename ts/{ => routes}/editor/editor-toolbar/OptionsButtons.svelte (100%)
 rename ts/{ => routes}/editor/editor-toolbar/RemoveFormatButton.svelte (100%)
 rename ts/{ => routes}/editor/editor-toolbar/RichTextClozeButtons.svelte (100%)
 rename ts/{ => routes}/editor/editor-toolbar/SubscriptButton.svelte (100%)
 rename ts/{ => routes}/editor/editor-toolbar/SuperscriptButton.svelte (100%)
 rename ts/{ => routes}/editor/editor-toolbar/TemplateButtons.svelte (100%)
 rename ts/{ => routes}/editor/editor-toolbar/TextAttributeButton.svelte (100%)
 rename ts/{ => routes}/editor/editor-toolbar/TextColorButton.svelte (100%)
 rename ts/{ => routes}/editor/editor-toolbar/UnderlineButton.svelte (100%)
 rename ts/{ => routes}/editor/editor-toolbar/WithColorHelper.svelte (100%)
 rename ts/{ => routes}/editor/editor-toolbar/index.ts (100%)
 rename ts/{ => routes}/editor/helpers.ts (100%)
 rename ts/{ => routes}/editor/image-overlay/FloatButtons.svelte (100%)
 rename ts/{ => routes}/editor/image-overlay/ImageOverlay.svelte (100%)
 rename ts/{ => routes}/editor/image-overlay/SizeSelect.svelte (100%)
 rename ts/{ => routes}/editor/image-overlay/index.ts (100%)
 rename ts/{ => routes}/editor/legacy.scss (100%)
 rename ts/{ => routes}/editor/mathjax-overlay/MathjaxButtons.svelte (100%)
 rename ts/{ => routes}/editor/mathjax-overlay/MathjaxEditor.svelte (100%)
 rename ts/{ => routes}/editor/mathjax-overlay/MathjaxOverlay.svelte (98%)
 rename ts/{ => routes}/editor/mathjax-overlay/index.ts (100%)
 rename ts/{ => routes}/editor/old-editor-adapter.ts (93%)
 rename ts/{ => routes}/editor/plain-text-input/PlainTextInput.svelte (100%)
 rename ts/{ => routes}/editor/plain-text-input/index.ts (100%)
 rename ts/{ => routes}/editor/plain-text-input/remove-prohibited.ts (100%)
 rename ts/{ => routes}/editor/plain-text-input/transform.ts (100%)
 rename ts/{ => routes}/editor/rich-text-input/CustomStyles.svelte (100%)
 rename ts/{ => routes}/editor/rich-text-input/RichTextInput.svelte (98%)
 rename ts/{ => routes}/editor/rich-text-input/RichTextStyles.svelte (100%)
 rename ts/{ => routes}/editor/rich-text-input/StyleLink.svelte (100%)
 rename ts/{ => routes}/editor/rich-text-input/StyleTag.svelte (100%)
 rename ts/{ => routes}/editor/rich-text-input/index.ts (100%)
 rename ts/{ => routes}/editor/rich-text-input/normalizing-node-store.ts (92%)
 rename ts/{ => routes}/editor/rich-text-input/rich-text-resolve.ts (100%)
 rename ts/{ => routes}/editor/rich-text-input/transform.ts (100%)
 rename ts/{ => routes}/editor/surround.ts (100%)
 rename ts/{ => routes}/editor/types.ts (92%)

diff --git a/build/configure/src/aqt.rs b/build/configure/src/aqt.rs
index 5b2b8ec49..80f7462f5 100644
--- a/build/configure/src/aqt.rs
+++ b/build/configure/src/aqt.rs
@@ -148,10 +148,8 @@ fn build_css(build: &mut Build) -> Result<()> {
             },
         )?;
     }
-    let other_ts_css = build.inputs_with_suffix(
-        inputs![":ts:editor", ":ts:editable", ":ts:reviewer:reviewer.css"],
-        ".css",
-    );
+    let other_ts_css =
+        build.inputs_with_suffix(inputs![":ts:editable", ":ts:reviewer:reviewer.css"], ".css");
     build.add_action(
         "qt:aqt:data:web:css",
         CopyFiles {
@@ -192,10 +190,8 @@ fn build_js(build: &mut Build) -> Result<()> {
             inputs: files,
         },
     )?;
-    let files_from_ts = build.inputs_with_suffix(
-        inputs![":ts:editor", ":ts:reviewer:reviewer.js", ":ts:mathjax"],
-        ".js",
-    );
+    let files_from_ts =
+        build.inputs_with_suffix(inputs![":ts:reviewer:reviewer.js", ":ts:mathjax"], ".js");
     build.add_action(
         "qt:aqt:data:web:js",
         CopyFiles {
diff --git a/build/configure/src/web.rs b/build/configure/src/web.rs
index ef2d268bb..2e5411c41 100644
--- a/build/configure/src/web.rs
+++ b/build/configure/src/web.rs
@@ -29,7 +29,6 @@ pub fn build_and_check_web(build: &mut Build) -> Result<()> {
     build_sveltekit(build)?;
     declare_and_check_other_libraries(build)?;
     build_and_check_pages(build)?;
-    build_and_check_editor(build)?;
     build_and_check_reviewer(build)?;
     build_and_check_mathjax(build)?;
     check_web(build)?;
@@ -170,7 +169,7 @@ fn declare_and_check_other_libraries(build: &mut Build) -> Result<()> {
             "components",
             inputs![":ts:lib", ":ts:sveltelib", glob!("ts/components/**")],
         ),
-        ("html-filter", inputs![glob!("ts/html-filter/**")]),
+        ("html-filter", inputs![glob!("ts/lib/html-filter/**")]),
     ] {
         let library_with_ts = format!("ts:{library}");
         build.add_dependency(&library_with_ts, inputs.clone());
@@ -187,7 +186,7 @@ fn build_and_check_pages(build: &mut Build) -> Result<()> {
         let entrypoint = if html {
             format!("ts/routes/{name}/index.ts")
         } else {
-            format!("ts/{name}/index.ts")
+            format!("ts/lib/{name}/index.ts")
         };
         build.add_action(
             &group,
@@ -208,7 +207,6 @@ fn build_and_check_pages(build: &mut Build) -> Result<()> {
         "editable",
         false,
         inputs![
-            //
             ":ts:lib",
             ":ts:components",
             ":ts:domlib",
@@ -232,33 +230,6 @@ fn build_and_check_pages(build: &mut Build) -> Result<()> {
     Ok(())
 }
 
-fn build_and_check_editor(build: &mut Build) -> Result<()> {
-    let editor_deps = inputs![
-        //
-        ":ts:lib",
-        ":ts:components",
-        ":ts:domlib",
-        ":ts:sveltelib",
-        ":ts:html-filter",
-        ":sass",
-        ":sveltekit",
-        glob!("ts/{editable,editor,routes/image-occlusion}/**")
-    ];
-
-    build.add_action(
-        "ts:editor",
-        EsbuildScript {
-            script: "ts/bundle_svelte.mjs".into(),
-            entrypoint: "ts/editor/index.ts".into(),
-            output_stem: "ts/editor/editor",
-            deps: editor_deps.clone(),
-            extra_exts: &["css"],
-        },
-    )?;
-
-    Ok(())
-}
-
 fn build_and_check_reviewer(build: &mut Build) -> Result<()> {
     let reviewer_deps = inputs![
         ":ts:lib",
diff --git a/proto/anki/frontend.proto b/proto/anki/frontend.proto
index 95b929c5c..9bf50d8e2 100644
--- a/proto/anki/frontend.proto
+++ b/proto/anki/frontend.proto
@@ -27,6 +27,8 @@ service FrontendService {
   rpc deckOptionsRequireClose(generic.Empty) returns (generic.Empty);
   // Warns python that the deck option web view is ready to receive requests.
   rpc deckOptionsReady(generic.Empty) returns (generic.Empty);
+
+  rpc editorReady(generic.Empty) returns (generic.Empty);
 }
 
 service BackendFrontendService {}
diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index c1eb14b18..ead8e1df4 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -107,6 +107,17 @@ class EditorState(Enum):
     IO_FIELDS = 3
 
 
+def on_editor_ready(func: Callable) -> Callable:
+    @functools.wraps(func)
+    def decorated(self: Editor, *args: Any, **kwargs: Any) -> None:
+        if self._ready:
+            func(self, *args, **kwargs)
+        else:
+            self._ready_callbacks.append(lambda: func(self, *args, **kwargs))
+
+    return decorated
+
+
 class Editor:
     """The screen that embeds an editing widget should listen for changes via
     the `operation_did_execute` hook, and call set_note() when the editor needs
@@ -146,12 +157,14 @@ class Editor:
         self.state: EditorState = EditorState.INITIAL
         # used for the io mask editor's context menu
         self.last_io_image_path: str | None = None
+        self._ready = False
+        self._ready_callbacks: list[Callable[[], None]] = []
         self._init_links()
         self.setupOuter()
         self.add_webview()
         self.setupWeb()
         self.setupShortcuts()
-        gui_hooks.editor_did_init(self)
+        # gui_hooks.editor_did_init(self)
 
     # Initial setup
     ############################################################
@@ -175,21 +188,9 @@ class Editor:
             mode = "browse"
         else:
             mode = "review"
+        self.web.load_sveltekit_page(f"editor/?mode={mode}")
 
-        # then load page
-        self.web.stdHtml(
-            "",
-            css=["css/editor.css"],
-            js=[
-                "js/mathjax.js",
-                "js/editor.js",
-            ],
-            context=self,
-            default_css=False,
-        )
-        self.web.eval(f"setupEditor('{mode}')")
-        self.web.show()
-
+    def _set_ready(self) -> None:
         lefttopbtns: list[str] = []
         gui_hooks.editor_did_init_left_buttons(lefttopbtns, self)
 
@@ -218,6 +219,10 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
         )
 
         self.web.eval(f"{lefttopbtns_js} {righttopbtns_js}")
+        gui_hooks.editor_did_init(self)
+        self._ready = True
+        for cb in self._ready_callbacks:
+            cb()
 
     # Top buttons
     ######################################################################
@@ -543,6 +548,7 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
     def loadNoteKeepingFocus(self) -> None:
         self.loadNote(self.currentField)
 
+    @on_editor_ready
     def loadNote(self, focusTo: int | None = None) -> None:
         if not self.note:
             return
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index 203f23ef9..45caef008 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -337,6 +337,7 @@ def is_sveltekit_page(path: str) -> bool:
         "import-csv",
         "import-page",
         "image-occlusion",
+        "editor",
     ]
 
 
@@ -602,6 +603,18 @@ def deck_options_ready() -> bytes:
     return b""
 
 
+def editor_ready() -> bytes:
+    from aqt.editor import Editor
+
+    def handle_on_main() -> None:
+        window = aqt.mw.app.activeWindow()
+        if isinstance(getattr(window, "editor"), Editor):
+            window.editor._set_ready()  # type: ignore
+
+    aqt.mw.taskman.run_on_main(handle_on_main)
+    return b""
+
+
 post_handler_list = [
     congrats_info,
     get_deck_configs_for_update,
@@ -617,6 +630,7 @@ post_handler_list = [
     search_in_browser,
     deck_options_require_close,
     deck_options_ready,
+    editor_ready,
 ]
 
 
diff --git a/ts/editor/index.ts b/ts/editor/index.ts
deleted file mode 100644
index bd8fc9029..000000000
--- a/ts/editor/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright: Ankitects Pty Ltd and contributors
-// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
-
-import { globalExport } from "@tslib/globals";
-
-import * as base from "./base";
-
-globalExport(base);
diff --git a/ts/editable/ContentEditable.svelte b/ts/lib/editable/ContentEditable.svelte
similarity index 100%
rename from ts/editable/ContentEditable.svelte
rename to ts/lib/editable/ContentEditable.svelte
diff --git a/ts/editable/Mathjax.svelte b/ts/lib/editable/Mathjax.svelte
similarity index 100%
rename from ts/editable/Mathjax.svelte
rename to ts/lib/editable/Mathjax.svelte
diff --git a/ts/editable/change-timer.ts b/ts/lib/editable/change-timer.ts
similarity index 100%
rename from ts/editable/change-timer.ts
rename to ts/lib/editable/change-timer.ts
diff --git a/ts/editable/content-editable.ts b/ts/lib/editable/content-editable.ts
similarity index 100%
rename from ts/editable/content-editable.ts
rename to ts/lib/editable/content-editable.ts
diff --git a/ts/editable/decorated.ts b/ts/lib/editable/decorated.ts
similarity index 100%
rename from ts/editable/decorated.ts
rename to ts/lib/editable/decorated.ts
diff --git a/ts/editable/editable-base.scss b/ts/lib/editable/editable-base.scss
similarity index 96%
rename from ts/editable/editable-base.scss
rename to ts/lib/editable/editable-base.scss
index 3cfaa63b4..e2cfb77d8 100644
--- a/ts/editable/editable-base.scss
+++ b/ts/lib/editable/editable-base.scss
@@ -1,4 +1,4 @@
-@use "../lib/sass/scrollbar";
+@use "../sass/scrollbar";
 
 * {
     max-width: 100%;
diff --git a/ts/editable/frame-element.ts b/ts/lib/editable/frame-element.ts
similarity index 100%
rename from ts/editable/frame-element.ts
rename to ts/lib/editable/frame-element.ts
diff --git a/ts/editable/frame-handle.ts b/ts/lib/editable/frame-handle.ts
similarity index 100%
rename from ts/editable/frame-handle.ts
rename to ts/lib/editable/frame-handle.ts
diff --git a/ts/editable/index.ts b/ts/lib/editable/index.ts
similarity index 100%
rename from ts/editable/index.ts
rename to ts/lib/editable/index.ts
diff --git a/ts/editable/mathjax-element.svelte.ts b/ts/lib/editable/mathjax-element.svelte.ts
similarity index 100%
rename from ts/editable/mathjax-element.svelte.ts
rename to ts/lib/editable/mathjax-element.svelte.ts
diff --git a/ts/editable/mathjax.ts b/ts/lib/editable/mathjax.ts
similarity index 100%
rename from ts/editable/mathjax.ts
rename to ts/lib/editable/mathjax.ts
diff --git a/ts/html-filter/element.ts b/ts/lib/html-filter/element.ts
similarity index 100%
rename from ts/html-filter/element.ts
rename to ts/lib/html-filter/element.ts
diff --git a/ts/html-filter/helpers.ts b/ts/lib/html-filter/helpers.ts
similarity index 100%
rename from ts/html-filter/helpers.ts
rename to ts/lib/html-filter/helpers.ts
diff --git a/ts/html-filter/index.test.ts b/ts/lib/html-filter/index.test.ts
similarity index 100%
rename from ts/html-filter/index.test.ts
rename to ts/lib/html-filter/index.test.ts
diff --git a/ts/html-filter/index.ts b/ts/lib/html-filter/index.ts
similarity index 100%
rename from ts/html-filter/index.ts
rename to ts/lib/html-filter/index.ts
diff --git a/ts/html-filter/node.ts b/ts/lib/html-filter/node.ts
similarity index 100%
rename from ts/html-filter/node.ts
rename to ts/lib/html-filter/node.ts
diff --git a/ts/html-filter/styling.ts b/ts/lib/html-filter/styling.ts
similarity index 100%
rename from ts/html-filter/styling.ts
rename to ts/lib/html-filter/styling.ts
diff --git a/ts/routes/editor/+page.svelte b/ts/routes/editor/+page.svelte
new file mode 100644
index 000000000..2130ad26e
--- /dev/null
+++ b/ts/routes/editor/+page.svelte
@@ -0,0 +1,23 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+<script lang="ts">
+    import { onMount } from "svelte";
+    import { setupEditor } from "./base";
+    import * as base from "./base";
+    import { page } from "$app/state";
+    import type { EditorMode } from "./types";
+    import { editorReady } from "@generated/backend";
+    import { globalExport } from "@tslib/globals";
+
+    const mode = (page.url.searchParams.get("mode") ?? "add") as EditorMode;
+
+    globalExport(base);
+
+    onMount(() => {
+        setupEditor(mode).then(() => {
+            editorReady({});
+        });
+    });
+</script>
diff --git a/ts/editor/BrowserEditor.svelte b/ts/routes/editor/BrowserEditor.svelte
similarity index 100%
rename from ts/editor/BrowserEditor.svelte
rename to ts/routes/editor/BrowserEditor.svelte
diff --git a/ts/editor/ClozeButtons.svelte b/ts/routes/editor/ClozeButtons.svelte
similarity index 100%
rename from ts/editor/ClozeButtons.svelte
rename to ts/routes/editor/ClozeButtons.svelte
diff --git a/ts/editor/CodeMirror.svelte b/ts/routes/editor/CodeMirror.svelte
similarity index 100%
rename from ts/editor/CodeMirror.svelte
rename to ts/routes/editor/CodeMirror.svelte
diff --git a/ts/editor/CollapseBadge.svelte b/ts/routes/editor/CollapseBadge.svelte
similarity index 100%
rename from ts/editor/CollapseBadge.svelte
rename to ts/routes/editor/CollapseBadge.svelte
diff --git a/ts/editor/CollapseLabel.svelte b/ts/routes/editor/CollapseLabel.svelte
similarity index 100%
rename from ts/editor/CollapseLabel.svelte
rename to ts/routes/editor/CollapseLabel.svelte
diff --git a/ts/editor/DuplicateLink.svelte b/ts/routes/editor/DuplicateLink.svelte
similarity index 100%
rename from ts/editor/DuplicateLink.svelte
rename to ts/routes/editor/DuplicateLink.svelte
diff --git a/ts/editor/EditingArea.svelte b/ts/routes/editor/EditingArea.svelte
similarity index 100%
rename from ts/editor/EditingArea.svelte
rename to ts/routes/editor/EditingArea.svelte
diff --git a/ts/editor/EditorField.svelte b/ts/routes/editor/EditorField.svelte
similarity index 100%
rename from ts/editor/EditorField.svelte
rename to ts/routes/editor/EditorField.svelte
diff --git a/ts/editor/FieldDescription.svelte b/ts/routes/editor/FieldDescription.svelte
similarity index 100%
rename from ts/editor/FieldDescription.svelte
rename to ts/routes/editor/FieldDescription.svelte
diff --git a/ts/editor/FieldState.svelte b/ts/routes/editor/FieldState.svelte
similarity index 100%
rename from ts/editor/FieldState.svelte
rename to ts/routes/editor/FieldState.svelte
diff --git a/ts/editor/Fields.svelte b/ts/routes/editor/Fields.svelte
similarity index 100%
rename from ts/editor/Fields.svelte
rename to ts/routes/editor/Fields.svelte
diff --git a/ts/editor/HandleBackground.svelte b/ts/routes/editor/HandleBackground.svelte
similarity index 100%
rename from ts/editor/HandleBackground.svelte
rename to ts/routes/editor/HandleBackground.svelte
diff --git a/ts/editor/HandleControl.svelte b/ts/routes/editor/HandleControl.svelte
similarity index 100%
rename from ts/editor/HandleControl.svelte
rename to ts/routes/editor/HandleControl.svelte
diff --git a/ts/editor/HandleLabel.svelte b/ts/routes/editor/HandleLabel.svelte
similarity index 100%
rename from ts/editor/HandleLabel.svelte
rename to ts/routes/editor/HandleLabel.svelte
diff --git a/ts/editor/LabelContainer.svelte b/ts/routes/editor/LabelContainer.svelte
similarity index 100%
rename from ts/editor/LabelContainer.svelte
rename to ts/routes/editor/LabelContainer.svelte
diff --git a/ts/editor/LabelName.svelte b/ts/routes/editor/LabelName.svelte
similarity index 100%
rename from ts/editor/LabelName.svelte
rename to ts/routes/editor/LabelName.svelte
diff --git a/ts/editor/NoteCreator.svelte b/ts/routes/editor/NoteCreator.svelte
similarity index 100%
rename from ts/editor/NoteCreator.svelte
rename to ts/routes/editor/NoteCreator.svelte
diff --git a/ts/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
similarity index 98%
rename from ts/editor/NoteEditor.svelte
rename to ts/routes/editor/NoteEditor.svelte
index 17ced575b..98bd7c989 100644
--- a/ts/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -57,8 +57,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import {
         type ImageLoadedEvent,
         resetIOImage,
-    } from "../routes/image-occlusion/mask-editor";
-    import { ChangeTimer } from "../editable/change-timer";
+    } from "../image-occlusion/mask-editor";
+    import { ChangeTimer } from "$lib/editable/change-timer";
     import { clearableArray } from "./destroyable";
     import DuplicateLink from "./DuplicateLink.svelte";
     import EditorToolbar from "./editor-toolbar";
@@ -417,16 +417,16 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     import Shortcut from "$lib/components/Shortcut.svelte";
 
-    import { mathjaxConfig } from "../editable/mathjax-element.svelte";
-    import ImageOcclusionPage from "../routes/image-occlusion/ImageOcclusionPage.svelte";
-    import ImageOcclusionPicker from "../routes/image-occlusion/ImageOcclusionPicker.svelte";
-    import type { IOMode } from "../routes/image-occlusion/lib";
-    import { exportShapesToClozeDeletions } from "../routes/image-occlusion/shapes/to-cloze";
+    import { mathjaxConfig } from "$lib/editable/mathjax-element.svelte";
+    import ImageOcclusionPage from "../image-occlusion/ImageOcclusionPage.svelte";
+    import ImageOcclusionPicker from "../image-occlusion/ImageOcclusionPicker.svelte";
+    import type { IOMode } from "../image-occlusion/lib";
+    import { exportShapesToClozeDeletions } from "../image-occlusion/shapes/to-cloze";
     import {
         hideAllGuessOne,
         ioImageLoadedStore,
         ioMaskEditorVisible,
-    } from "../routes/image-occlusion/store";
+    } from "../image-occlusion/store";
     import CollapseLabel from "./CollapseLabel.svelte";
     import * as oldEditorAdapter from "./old-editor-adapter";
 
diff --git a/ts/editor/Notification.svelte b/ts/routes/editor/Notification.svelte
similarity index 100%
rename from ts/editor/Notification.svelte
rename to ts/routes/editor/Notification.svelte
diff --git a/ts/editor/PlainTextBadge.svelte b/ts/routes/editor/PlainTextBadge.svelte
similarity index 100%
rename from ts/editor/PlainTextBadge.svelte
rename to ts/routes/editor/PlainTextBadge.svelte
diff --git a/ts/editor/PreviewButton.svelte b/ts/routes/editor/PreviewButton.svelte
similarity index 100%
rename from ts/editor/PreviewButton.svelte
rename to ts/routes/editor/PreviewButton.svelte
diff --git a/ts/editor/ReviewerEditor.svelte b/ts/routes/editor/ReviewerEditor.svelte
similarity index 100%
rename from ts/editor/ReviewerEditor.svelte
rename to ts/routes/editor/ReviewerEditor.svelte
diff --git a/ts/editor/RichTextBadge.svelte b/ts/routes/editor/RichTextBadge.svelte
similarity index 100%
rename from ts/editor/RichTextBadge.svelte
rename to ts/routes/editor/RichTextBadge.svelte
diff --git a/ts/editor/StickyBadge.svelte b/ts/routes/editor/StickyBadge.svelte
similarity index 100%
rename from ts/editor/StickyBadge.svelte
rename to ts/routes/editor/StickyBadge.svelte
diff --git a/ts/routes/editor/[noteId]/+page.svelte b/ts/routes/editor/[noteId]/+page.svelte
deleted file mode 100644
index 995cede15..000000000
--- a/ts/routes/editor/[noteId]/+page.svelte
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--
-Copyright: Ankitects Pty Ltd and contributors
-License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
--->
-<script lang="ts">
-    import type { PageData } from "./$types";
-
-    export let data: PageData;
-
-</script>
-
-<div>{data.noteId}</div>
diff --git a/ts/routes/editor/[noteId]/+page.ts b/ts/routes/editor/[noteId]/+page.ts
deleted file mode 100644
index 66e82b2cd..000000000
--- a/ts/routes/editor/[noteId]/+page.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright: Ankitects Pty Ltd and contributors
-// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
-
-import type { PageLoad } from "./$types";
-
-export const load = (async ({ params }) => {
-    const noteId = BigInt(params.noteId);
-
-    return { noteId };
-}) satisfies PageLoad;
diff --git a/ts/editor/base.ts b/ts/routes/editor/base.ts
similarity index 91%
rename from ts/editor/base.ts
rename to ts/routes/editor/base.ts
index c21a64811..bfc4a9183 100644
--- a/ts/editor/base.ts
+++ b/ts/routes/editor/base.ts
@@ -34,6 +34,7 @@ declare global {
 
 import { ModuleName } from "@tslib/i18n";
 import { mount } from "svelte";
+import type { EditorMode } from "./types";
 
 export const editorModules = [
     ModuleName.EDITING,
@@ -70,16 +71,16 @@ async function setupReviewerEditor(): Promise<void> {
     mount(ReviewerEditor, { target: document.body, props: { uiResolve } });
 }
 
-export function setupEditor(mode: "add" | "browse" | "review") {
+export async function setupEditor(mode: EditorMode) {
     switch (mode) {
         case "add":
-            setupNoteCreator();
+            await setupNoteCreator();
             break;
         case "browse":
-            setupBrowserEditor();
+            await setupBrowserEditor();
             break;
         case "review":
-            setupReviewerEditor();
+            await setupReviewerEditor();
             break;
         default:
             alert("unexpected editor type");
diff --git a/ts/editor/code-mirror.ts b/ts/routes/editor/code-mirror.ts
similarity index 100%
rename from ts/editor/code-mirror.ts
rename to ts/routes/editor/code-mirror.ts
diff --git a/ts/editor/decorated-elements.ts b/ts/routes/editor/decorated-elements.ts
similarity index 78%
rename from ts/editor/decorated-elements.ts
rename to ts/routes/editor/decorated-elements.ts
index 6eb603897..e2257b3a8 100644
--- a/ts/editor/decorated-elements.ts
+++ b/ts/routes/editor/decorated-elements.ts
@@ -3,10 +3,10 @@
 
 import { BLOCK_ELEMENTS } from "@tslib/dom";
 
-import { CustomElementArray } from "../editable/decorated";
-import { FrameElement } from "../editable/frame-element";
-import { FrameEnd, FrameStart } from "../editable/frame-handle";
-import { Mathjax } from "../editable/mathjax-element.svelte";
+import { CustomElementArray } from "$lib/editable/decorated";
+import { FrameElement } from "$lib/editable/frame-element";
+import { FrameEnd, FrameStart } from "$lib/editable/frame-handle";
+import { Mathjax } from "$lib/editable/mathjax-element.svelte";
 import { parsingInstructions } from "./plain-text-input";
 
 const decoratedElements = new CustomElementArray();
diff --git a/ts/editor/destroyable.ts b/ts/routes/editor/destroyable.ts
similarity index 100%
rename from ts/editor/destroyable.ts
rename to ts/routes/editor/destroyable.ts
diff --git a/ts/editor/editor-base.scss b/ts/routes/editor/editor-base.scss
similarity index 100%
rename from ts/editor/editor-base.scss
rename to ts/routes/editor/editor-base.scss
diff --git a/ts/editor/editor-toolbar/AddonButtons.svelte b/ts/routes/editor/editor-toolbar/AddonButtons.svelte
similarity index 100%
rename from ts/editor/editor-toolbar/AddonButtons.svelte
rename to ts/routes/editor/editor-toolbar/AddonButtons.svelte
diff --git a/ts/editor/editor-toolbar/BlockButtons.svelte b/ts/routes/editor/editor-toolbar/BlockButtons.svelte
similarity index 100%
rename from ts/editor/editor-toolbar/BlockButtons.svelte
rename to ts/routes/editor/editor-toolbar/BlockButtons.svelte
diff --git a/ts/editor/editor-toolbar/BoldButton.svelte b/ts/routes/editor/editor-toolbar/BoldButton.svelte
similarity index 100%
rename from ts/editor/editor-toolbar/BoldButton.svelte
rename to ts/routes/editor/editor-toolbar/BoldButton.svelte
diff --git a/ts/editor/editor-toolbar/ColorPicker.svelte b/ts/routes/editor/editor-toolbar/ColorPicker.svelte
similarity index 100%
rename from ts/editor/editor-toolbar/ColorPicker.svelte
rename to ts/routes/editor/editor-toolbar/ColorPicker.svelte
diff --git a/ts/editor/editor-toolbar/CommandIconButton.svelte b/ts/routes/editor/editor-toolbar/CommandIconButton.svelte
similarity index 100%
rename from ts/editor/editor-toolbar/CommandIconButton.svelte
rename to ts/routes/editor/editor-toolbar/CommandIconButton.svelte
diff --git a/ts/editor/editor-toolbar/EditorToolbar.svelte b/ts/routes/editor/editor-toolbar/EditorToolbar.svelte
similarity index 100%
rename from ts/editor/editor-toolbar/EditorToolbar.svelte
rename to ts/routes/editor/editor-toolbar/EditorToolbar.svelte
diff --git a/ts/editor/editor-toolbar/HighlightColorButton.svelte b/ts/routes/editor/editor-toolbar/HighlightColorButton.svelte
similarity index 100%
rename from ts/editor/editor-toolbar/HighlightColorButton.svelte
rename to ts/routes/editor/editor-toolbar/HighlightColorButton.svelte
diff --git a/ts/editor/editor-toolbar/ImageOcclusionButton.svelte b/ts/routes/editor/editor-toolbar/ImageOcclusionButton.svelte
similarity index 94%
rename from ts/editor/editor-toolbar/ImageOcclusionButton.svelte
rename to ts/routes/editor/editor-toolbar/ImageOcclusionButton.svelte
index c9e8bc6fd..712ed9676 100644
--- a/ts/editor/editor-toolbar/ImageOcclusionButton.svelte
+++ b/ts/routes/editor/editor-toolbar/ImageOcclusionButton.svelte
@@ -20,8 +20,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import {
         ioImageLoadedStore,
         ioMaskEditorVisible,
-    } from "../../routes/image-occlusion/store";
-    import { toggleMaskEditorKeyCombination } from "../../routes/image-occlusion/tools/shortcuts";
+    } from "../../image-occlusion/store";
+    import { toggleMaskEditorKeyCombination } from "../../image-occlusion/tools/shortcuts";
 
     export let api = {};
 </script>
diff --git a/ts/editor/editor-toolbar/InlineButtons.svelte b/ts/routes/editor/editor-toolbar/InlineButtons.svelte
similarity index 100%
rename from ts/editor/editor-toolbar/InlineButtons.svelte
rename to ts/routes/editor/editor-toolbar/InlineButtons.svelte
diff --git a/ts/editor/editor-toolbar/ItalicButton.svelte b/ts/routes/editor/editor-toolbar/ItalicButton.svelte
similarity index 100%
rename from ts/editor/editor-toolbar/ItalicButton.svelte
rename to ts/routes/editor/editor-toolbar/ItalicButton.svelte
diff --git a/ts/editor/editor-toolbar/LatexButton.svelte b/ts/routes/editor/editor-toolbar/LatexButton.svelte
similarity index 98%
rename from ts/editor/editor-toolbar/LatexButton.svelte
rename to ts/routes/editor/editor-toolbar/LatexButton.svelte
index 1d0df1f2e..78731fa81 100644
--- a/ts/editor/editor-toolbar/LatexButton.svelte
+++ b/ts/routes/editor/editor-toolbar/LatexButton.svelte
@@ -15,7 +15,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import Shortcut from "$lib/components/Shortcut.svelte";
     import WithFloating from "$lib/components/WithFloating.svelte";
 
-    import { mathjaxConfig } from "../../editable/mathjax-element.svelte";
+    import { mathjaxConfig } from "$lib/editable/mathjax-element.svelte";
     import { context as noteEditorContext } from "../NoteEditor.svelte";
     import type { RichTextInputAPI } from "../rich-text-input";
     import { editingInputIsRichText } from "../rich-text-input";
diff --git a/ts/editor/editor-toolbar/NotetypeButtons.svelte b/ts/routes/editor/editor-toolbar/NotetypeButtons.svelte
similarity index 100%
rename from ts/editor/editor-toolbar/NotetypeButtons.svelte
rename to ts/routes/editor/editor-toolbar/NotetypeButtons.svelte
diff --git a/ts/editor/editor-toolbar/OptionsButton.svelte b/ts/routes/editor/editor-toolbar/OptionsButton.svelte
similarity index 97%
rename from ts/editor/editor-toolbar/OptionsButton.svelte
rename to ts/routes/editor/editor-toolbar/OptionsButton.svelte
index 0f4e346ae..b3c54ed0f 100644
--- a/ts/editor/editor-toolbar/OptionsButton.svelte
+++ b/ts/routes/editor/editor-toolbar/OptionsButton.svelte
@@ -14,7 +14,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import Popover from "$lib/components/Popover.svelte";
     import WithFloating from "$lib/components/WithFloating.svelte";
 
-    import { mathjaxConfig } from "../../editable/mathjax-element.svelte";
+    import { mathjaxConfig } from "$lib/editable/mathjax-element.svelte";
     import { shrinkImagesByDefault } from "../image-overlay/ImageOverlay.svelte";
     import { closeHTMLTags } from "../plain-text-input/PlainTextInput.svelte";
 
diff --git a/ts/editor/editor-toolbar/OptionsButtons.svelte b/ts/routes/editor/editor-toolbar/OptionsButtons.svelte
similarity index 100%
rename from ts/editor/editor-toolbar/OptionsButtons.svelte
rename to ts/routes/editor/editor-toolbar/OptionsButtons.svelte
diff --git a/ts/editor/editor-toolbar/RemoveFormatButton.svelte b/ts/routes/editor/editor-toolbar/RemoveFormatButton.svelte
similarity index 100%
rename from ts/editor/editor-toolbar/RemoveFormatButton.svelte
rename to ts/routes/editor/editor-toolbar/RemoveFormatButton.svelte
diff --git a/ts/editor/editor-toolbar/RichTextClozeButtons.svelte b/ts/routes/editor/editor-toolbar/RichTextClozeButtons.svelte
similarity index 100%
rename from ts/editor/editor-toolbar/RichTextClozeButtons.svelte
rename to ts/routes/editor/editor-toolbar/RichTextClozeButtons.svelte
diff --git a/ts/editor/editor-toolbar/SubscriptButton.svelte b/ts/routes/editor/editor-toolbar/SubscriptButton.svelte
similarity index 100%
rename from ts/editor/editor-toolbar/SubscriptButton.svelte
rename to ts/routes/editor/editor-toolbar/SubscriptButton.svelte
diff --git a/ts/editor/editor-toolbar/SuperscriptButton.svelte b/ts/routes/editor/editor-toolbar/SuperscriptButton.svelte
similarity index 100%
rename from ts/editor/editor-toolbar/SuperscriptButton.svelte
rename to ts/routes/editor/editor-toolbar/SuperscriptButton.svelte
diff --git a/ts/editor/editor-toolbar/TemplateButtons.svelte b/ts/routes/editor/editor-toolbar/TemplateButtons.svelte
similarity index 100%
rename from ts/editor/editor-toolbar/TemplateButtons.svelte
rename to ts/routes/editor/editor-toolbar/TemplateButtons.svelte
diff --git a/ts/editor/editor-toolbar/TextAttributeButton.svelte b/ts/routes/editor/editor-toolbar/TextAttributeButton.svelte
similarity index 100%
rename from ts/editor/editor-toolbar/TextAttributeButton.svelte
rename to ts/routes/editor/editor-toolbar/TextAttributeButton.svelte
diff --git a/ts/editor/editor-toolbar/TextColorButton.svelte b/ts/routes/editor/editor-toolbar/TextColorButton.svelte
similarity index 100%
rename from ts/editor/editor-toolbar/TextColorButton.svelte
rename to ts/routes/editor/editor-toolbar/TextColorButton.svelte
diff --git a/ts/editor/editor-toolbar/UnderlineButton.svelte b/ts/routes/editor/editor-toolbar/UnderlineButton.svelte
similarity index 100%
rename from ts/editor/editor-toolbar/UnderlineButton.svelte
rename to ts/routes/editor/editor-toolbar/UnderlineButton.svelte
diff --git a/ts/editor/editor-toolbar/WithColorHelper.svelte b/ts/routes/editor/editor-toolbar/WithColorHelper.svelte
similarity index 100%
rename from ts/editor/editor-toolbar/WithColorHelper.svelte
rename to ts/routes/editor/editor-toolbar/WithColorHelper.svelte
diff --git a/ts/editor/editor-toolbar/index.ts b/ts/routes/editor/editor-toolbar/index.ts
similarity index 100%
rename from ts/editor/editor-toolbar/index.ts
rename to ts/routes/editor/editor-toolbar/index.ts
diff --git a/ts/editor/helpers.ts b/ts/routes/editor/helpers.ts
similarity index 100%
rename from ts/editor/helpers.ts
rename to ts/routes/editor/helpers.ts
diff --git a/ts/editor/image-overlay/FloatButtons.svelte b/ts/routes/editor/image-overlay/FloatButtons.svelte
similarity index 100%
rename from ts/editor/image-overlay/FloatButtons.svelte
rename to ts/routes/editor/image-overlay/FloatButtons.svelte
diff --git a/ts/editor/image-overlay/ImageOverlay.svelte b/ts/routes/editor/image-overlay/ImageOverlay.svelte
similarity index 100%
rename from ts/editor/image-overlay/ImageOverlay.svelte
rename to ts/routes/editor/image-overlay/ImageOverlay.svelte
diff --git a/ts/editor/image-overlay/SizeSelect.svelte b/ts/routes/editor/image-overlay/SizeSelect.svelte
similarity index 100%
rename from ts/editor/image-overlay/SizeSelect.svelte
rename to ts/routes/editor/image-overlay/SizeSelect.svelte
diff --git a/ts/editor/image-overlay/index.ts b/ts/routes/editor/image-overlay/index.ts
similarity index 100%
rename from ts/editor/image-overlay/index.ts
rename to ts/routes/editor/image-overlay/index.ts
diff --git a/ts/editor/legacy.scss b/ts/routes/editor/legacy.scss
similarity index 100%
rename from ts/editor/legacy.scss
rename to ts/routes/editor/legacy.scss
diff --git a/ts/editor/mathjax-overlay/MathjaxButtons.svelte b/ts/routes/editor/mathjax-overlay/MathjaxButtons.svelte
similarity index 100%
rename from ts/editor/mathjax-overlay/MathjaxButtons.svelte
rename to ts/routes/editor/mathjax-overlay/MathjaxButtons.svelte
diff --git a/ts/editor/mathjax-overlay/MathjaxEditor.svelte b/ts/routes/editor/mathjax-overlay/MathjaxEditor.svelte
similarity index 100%
rename from ts/editor/mathjax-overlay/MathjaxEditor.svelte
rename to ts/routes/editor/mathjax-overlay/MathjaxEditor.svelte
diff --git a/ts/editor/mathjax-overlay/MathjaxOverlay.svelte b/ts/routes/editor/mathjax-overlay/MathjaxOverlay.svelte
similarity index 98%
rename from ts/editor/mathjax-overlay/MathjaxOverlay.svelte
rename to ts/routes/editor/mathjax-overlay/MathjaxOverlay.svelte
index 5442fd05c..09fe33a5e 100644
--- a/ts/editor/mathjax-overlay/MathjaxOverlay.svelte
+++ b/ts/routes/editor/mathjax-overlay/MathjaxOverlay.svelte
@@ -19,8 +19,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { placeCaretAfter } from "$lib/domlib/place-caret";
     import { isComposing } from "$lib/sveltelib/composition";
 
-    import { escapeSomeEntities, unescapeSomeEntities } from "../../editable/mathjax";
-    import { Mathjax } from "../../editable/mathjax-element.svelte";
+    import { escapeSomeEntities, unescapeSomeEntities } from "$lib/editable/mathjax";
+    import { Mathjax } from "$lib/editable/mathjax-element.svelte";
     import type { EditingInputAPI } from "../EditingArea.svelte";
     import HandleBackground from "../HandleBackground.svelte";
     import { context } from "../NoteEditor.svelte";
diff --git a/ts/editor/mathjax-overlay/index.ts b/ts/routes/editor/mathjax-overlay/index.ts
similarity index 100%
rename from ts/editor/mathjax-overlay/index.ts
rename to ts/routes/editor/mathjax-overlay/index.ts
diff --git a/ts/editor/old-editor-adapter.ts b/ts/routes/editor/old-editor-adapter.ts
similarity index 93%
rename from ts/editor/old-editor-adapter.ts
rename to ts/routes/editor/old-editor-adapter.ts
index 6b6dcad82..260164116 100644
--- a/ts/editor/old-editor-adapter.ts
+++ b/ts/routes/editor/old-editor-adapter.ts
@@ -4,7 +4,7 @@
 import { updateAllState } from "$lib/components/WithState.svelte";
 import { execCommand } from "$lib/domlib";
 
-import { filterHTML } from "../html-filter";
+import { filterHTML } from "$lib/html-filter";
 
 export function pasteHTML(
     html: string,
diff --git a/ts/editor/plain-text-input/PlainTextInput.svelte b/ts/routes/editor/plain-text-input/PlainTextInput.svelte
similarity index 100%
rename from ts/editor/plain-text-input/PlainTextInput.svelte
rename to ts/routes/editor/plain-text-input/PlainTextInput.svelte
diff --git a/ts/editor/plain-text-input/index.ts b/ts/routes/editor/plain-text-input/index.ts
similarity index 100%
rename from ts/editor/plain-text-input/index.ts
rename to ts/routes/editor/plain-text-input/index.ts
diff --git a/ts/editor/plain-text-input/remove-prohibited.ts b/ts/routes/editor/plain-text-input/remove-prohibited.ts
similarity index 100%
rename from ts/editor/plain-text-input/remove-prohibited.ts
rename to ts/routes/editor/plain-text-input/remove-prohibited.ts
diff --git a/ts/editor/plain-text-input/transform.ts b/ts/routes/editor/plain-text-input/transform.ts
similarity index 100%
rename from ts/editor/plain-text-input/transform.ts
rename to ts/routes/editor/plain-text-input/transform.ts
diff --git a/ts/editor/rich-text-input/CustomStyles.svelte b/ts/routes/editor/rich-text-input/CustomStyles.svelte
similarity index 100%
rename from ts/editor/rich-text-input/CustomStyles.svelte
rename to ts/routes/editor/rich-text-input/CustomStyles.svelte
diff --git a/ts/editor/rich-text-input/RichTextInput.svelte b/ts/routes/editor/rich-text-input/RichTextInput.svelte
similarity index 98%
rename from ts/editor/rich-text-input/RichTextInput.svelte
rename to ts/routes/editor/rich-text-input/RichTextInput.svelte
index 88549aefc..0d6d0993a 100644
--- a/ts/editor/rich-text-input/RichTextInput.svelte
+++ b/ts/routes/editor/rich-text-input/RichTextInput.svelte
@@ -7,7 +7,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     import type { InputHandlerAPI } from "$lib/sveltelib/input-handler";
 
-    import type { ContentEditableAPI } from "../../editable/ContentEditable.svelte";
+    import type { ContentEditableAPI } from "$lib/editable/ContentEditable.svelte";
     import type { EditingInputAPI, FocusableInputAPI } from "../EditingArea.svelte";
     import type { SurroundedAPI } from "../surround";
 
@@ -74,7 +74,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import useInputHandler from "$lib/sveltelib/input-handler";
     import { pageTheme } from "$lib/sveltelib/theme";
 
-    import ContentEditable from "../../editable/ContentEditable.svelte";
+    import ContentEditable from "$lib/editable/ContentEditable.svelte";
     import { context as editingAreaContext } from "../EditingArea.svelte";
     import { Flag } from "../helpers";
     import { context as noteEditorContext } from "../NoteEditor.svelte";
diff --git a/ts/editor/rich-text-input/RichTextStyles.svelte b/ts/routes/editor/rich-text-input/RichTextStyles.svelte
similarity index 100%
rename from ts/editor/rich-text-input/RichTextStyles.svelte
rename to ts/routes/editor/rich-text-input/RichTextStyles.svelte
diff --git a/ts/editor/rich-text-input/StyleLink.svelte b/ts/routes/editor/rich-text-input/StyleLink.svelte
similarity index 100%
rename from ts/editor/rich-text-input/StyleLink.svelte
rename to ts/routes/editor/rich-text-input/StyleLink.svelte
diff --git a/ts/editor/rich-text-input/StyleTag.svelte b/ts/routes/editor/rich-text-input/StyleTag.svelte
similarity index 100%
rename from ts/editor/rich-text-input/StyleTag.svelte
rename to ts/routes/editor/rich-text-input/StyleTag.svelte
diff --git a/ts/editor/rich-text-input/index.ts b/ts/routes/editor/rich-text-input/index.ts
similarity index 100%
rename from ts/editor/rich-text-input/index.ts
rename to ts/routes/editor/rich-text-input/index.ts
diff --git a/ts/editor/rich-text-input/normalizing-node-store.ts b/ts/routes/editor/rich-text-input/normalizing-node-store.ts
similarity index 92%
rename from ts/editor/rich-text-input/normalizing-node-store.ts
rename to ts/routes/editor/rich-text-input/normalizing-node-store.ts
index 197322faf..9b1cd2d0a 100644
--- a/ts/editor/rich-text-input/normalizing-node-store.ts
+++ b/ts/routes/editor/rich-text-input/normalizing-node-store.ts
@@ -4,7 +4,7 @@
 import type { NodeStore } from "$lib/sveltelib/node-store";
 import { nodeStore } from "$lib/sveltelib/node-store";
 
-import type { DecoratedElement } from "../../editable/decorated";
+import type { DecoratedElement } from "$lib/editable/decorated";
 import { decoratedElements } from "../decorated-elements";
 
 function normalizeFragment(fragment: DocumentFragment): void {
diff --git a/ts/editor/rich-text-input/rich-text-resolve.ts b/ts/routes/editor/rich-text-input/rich-text-resolve.ts
similarity index 100%
rename from ts/editor/rich-text-input/rich-text-resolve.ts
rename to ts/routes/editor/rich-text-input/rich-text-resolve.ts
diff --git a/ts/editor/rich-text-input/transform.ts b/ts/routes/editor/rich-text-input/transform.ts
similarity index 100%
rename from ts/editor/rich-text-input/transform.ts
rename to ts/routes/editor/rich-text-input/transform.ts
diff --git a/ts/editor/surround.ts b/ts/routes/editor/surround.ts
similarity index 100%
rename from ts/editor/surround.ts
rename to ts/routes/editor/surround.ts
diff --git a/ts/editor/types.ts b/ts/routes/editor/types.ts
similarity index 92%
rename from ts/editor/types.ts
rename to ts/routes/editor/types.ts
index 14cece175..4ce9fd730 100644
--- a/ts/editor/types.ts
+++ b/ts/routes/editor/types.ts
@@ -27,3 +27,5 @@ export enum EditorState {
     ImageOcclusionMasks = 2,
     ImageOcclusionFields = 3,
 }
+
+export type EditorMode = "add" | "browse" | "review";
diff --git a/ts/routes/tmp/_page.ts b/ts/routes/tmp/_page.ts
index 185bba104..f68486ecf 100644
--- a/ts/routes/tmp/_page.ts
+++ b/ts/routes/tmp/_page.ts
@@ -2,5 +2,4 @@
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 // this route pulls in code that's currently bundled separately, so that
 // errors in it get caught by svelte-check
-import * as _editor from "$lib/../editor";
 import * as _reviewer from "$lib/../reviewer";

From f453e3790c90b7b531cd9207fa0ec76d369d248e Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 22 May 2025 02:56:30 +0300
Subject: [PATCH 003/133] Fix scss paths

---
 ts/routes/editor/EditorField.svelte | 2 +-
 ts/routes/editor/editor-base.scss   | 4 ++--
 ts/routes/editor/legacy.scss        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ts/routes/editor/EditorField.svelte b/ts/routes/editor/EditorField.svelte
index 4fc80e0c1..c7f6fb9d8 100644
--- a/ts/routes/editor/EditorField.svelte
+++ b/ts/routes/editor/EditorField.svelte
@@ -130,7 +130,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 </div>
 
 <style lang="scss">
-    @use "../lib/sass/elevation" as *;
+    @use "../../lib/sass/elevation" as *;
 
     /* Make sure labels are readable on custom Qt backgrounds */
     .field-container {
diff --git a/ts/routes/editor/editor-base.scss b/ts/routes/editor/editor-base.scss
index 73f4bdc1f..7f355ddf3 100644
--- a/ts/routes/editor/editor-base.scss
+++ b/ts/routes/editor/editor-base.scss
@@ -1,12 +1,12 @@
 /* Copyright: Ankitects Pty Ltd and contributors
  * License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */
 
-@import "../lib/sass/base";
+@import "../../lib/sass/base";
 
 $btn-disabled-opacity: 0.4;
 @import "bootstrap/scss/buttons";
 @import "bootstrap/scss/button-group";
-@import "../lib/sass/bootstrap-tooltip";
+@import "../../lib/sass/bootstrap-tooltip";
 
 html,
 body {
diff --git a/ts/routes/editor/legacy.scss b/ts/routes/editor/legacy.scss
index b16baa2aa..4a5479515 100644
--- a/ts/routes/editor/legacy.scss
+++ b/ts/routes/editor/legacy.scss
@@ -1,7 +1,7 @@
 /* Copyright: Ankitects Pty Ltd and contributors
  * License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */
 @use "sass:color";
-@use "../lib/sass/button-mixins" as button;
+@use "../../lib/sass/button-mixins" as button;
 
 .linkb {
     $size: var(--buttons-size);

From 053bd4380f74d23a6d78449fed71a5163fc89482 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sun, 25 May 2025 14:54:01 +0300
Subject: [PATCH 004/133] Move some JS calls in loadNote()

---
 qt/aqt/editor.py                   |  39 +--------
 qt/aqt/mediasrv.py                 |   2 +
 ts/routes/editor/NoteEditor.svelte | 127 ++++++++++++++++++++++-------
 ts/routes/editor/types.ts          |   8 +-
 4 files changed, 104 insertions(+), 72 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index ead8e1df4..32430a010 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -553,22 +553,7 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
         if not self.note:
             return
 
-        data = [
-            (fld, self.mw.col.media.escape_media_filenames(val))
-            for fld, val in self.note.items()
-        ]
-
-        note_type = self.note_type()
-        flds = note_type["flds"]
-        collapsed = [fld["collapsed"] for fld in flds]
-        cloze_fields_ords = self.mw.col.models.cloze_fields(self.note.mid)
-        cloze_fields = [ord in cloze_fields_ords for ord in range(len(flds))]
-        plain_texts = [fld.get("plainText", False) for fld in flds]
-        descriptions = [fld.get("description", "") for fld in flds]
-        notetype_meta = {"id": self.note.mid, "modTime": note_type["mod"]}
-
         self.widget.show()
-
         note_fields_status = self.note.fields_check()
 
         def oncallback(arg: Any) -> None:
@@ -583,29 +568,7 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             gui_hooks.editor_did_load_note(self)
 
         assert self.mw.pm.profile is not None
-        text_color = self.mw.pm.profile.get("lastTextColor", "#0000ff")
-        highlight_color = self.mw.pm.profile.get("lastHighlightColor", "#0000ff")
-
-        js = f"""
-            saveSession();
-            setFields({json.dumps(data)});
-            setIsImageOcclusion({json.dumps(self.current_notetype_is_image_occlusion())});
-            setNotetypeMeta({json.dumps(notetype_meta)});
-            setCollapsed({json.dumps(collapsed)});
-            setClozeFields({json.dumps(cloze_fields)});
-            setPlainTexts({json.dumps(plain_texts)});
-            setDescriptions({json.dumps(descriptions)});
-            setFonts({json.dumps(self.fonts())});
-            focusField({json.dumps(focusTo)});
-            setNoteId({json.dumps(self.note.id)});
-            setColorButtons({json.dumps([text_color, highlight_color])});
-            setTags({json.dumps(self.note.tags)});
-            setTagsCollapsed({json.dumps(self.mw.pm.tags_collapsed(self.editorMode))});
-            setMathjaxEnabled({json.dumps(self.mw.col.get_config("renderMathjax", True))});
-            setShrinkImages({json.dumps(self.mw.col.get_config("shrinkEditorImages", True))});
-            setCloseHTMLTags({json.dumps(self.mw.col.get_config("closeHTMLTags", True))});
-            triggerChanges();
-            """
+        js = f"loadNote({self.note.id}, {self.note.mid});"
 
         if self.addMode:
             sticky = [field["sticky"] for field in self.note_type()["flds"]]
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index 45caef008..658bfa345 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -648,8 +648,10 @@ exposed_backend_list = [
     "get_field_names",
     "get_note",
     # NotetypesService
+    "get_notetype",
     "get_notetype_names",
     "get_change_notetype_info",
+    "get_cloze_field_ords",
     # StatsService
     "card_stats",
     "get_review_logs",
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 98bd7c989..027ad2e35 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -92,7 +92,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     const sessionOptions: SessionOptions = {};
     export function saveSession(): void {
         if (notetypeMeta) {
-            sessionOptions[notetypeMeta.id] = {
+            sessionOptions[notetypeMeta.id.toString()] = {
                 fieldsCollapsed,
                 fieldStates: {
                     richTextsHidden,
@@ -106,19 +106,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     const fieldStores: Writable<string>[] = [];
     let fieldNames: string[] = [];
-    export function setFields(fs: [string, string][]): void {
-        // this is a bit of a mess -- when moving to Rust calls, we should make
-        // sure to have two backend endpoints for:
-        // * the note, which can be set through this view
-        // * the fieldname, font, etc., which cannot be set
+    export function setFields(newFieldNames: string[], fieldValues: string[]): void {
+        fieldNames = newFieldNames;
 
-        const newFieldNames: string[] = [];
-
-        for (const [index, [fieldName]] of fs.entries()) {
-            newFieldNames[index] = fieldName;
-        }
-
-        for (let i = fieldStores.length; i < newFieldNames.length; i++) {
+        for (let i = fieldStores.length; i < fieldValues.length; i++) {
             const newStore = writable("");
             fieldStores[i] = newStore;
             newStore.subscribe((value) => updateField(i, value));
@@ -126,23 +117,22 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
         for (
             let i = fieldStores.length;
-            i > newFieldNames.length;
+            i > fieldValues.length;
             i = fieldStores.length
         ) {
             fieldStores.pop();
         }
 
-        for (const [index, [, fieldContent]] of fs.entries()) {
-            fieldStores[index].set(fieldContent);
+        for (const [index, value] of fieldValues.entries()) {
+            fieldStores[index].set(value);
         }
-
-        fieldNames = newFieldNames;
     }
 
     let fieldsCollapsed: boolean[] = [];
     export function setCollapsed(defaultCollapsed: boolean[]): void {
         fieldsCollapsed =
-            sessionOptions[notetypeMeta?.id]?.fieldsCollapsed ?? defaultCollapsed;
+            sessionOptions[notetypeMeta?.id?.toString()]?.fieldsCollapsed ??
+            defaultCollapsed;
     }
     let clozeFields: boolean[] = [];
     export function setClozeFields(defaultClozeFields: boolean[]): void {
@@ -154,7 +144,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     let plainTextDefaults: boolean[] = [];
 
     export function setPlainTexts(defaultPlainTexts: boolean[]): void {
-        const states = sessionOptions[notetypeMeta?.id]?.fieldStates;
+        const states = sessionOptions[notetypeMeta?.id?.toString()]?.fieldStates;
         if (states) {
             richTextsHidden = states.richTextsHidden;
             plainTextsHidden = states.plainTextsHidden;
@@ -227,8 +217,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         bridgeCommand(`setTagsCollapsed:${$tagsCollapsed}`);
     }
 
-    let noteId: number | null = null;
-    export function setNoteId(ntid: number): void {
+    let noteId: bigint | null = null;
+    export function setNoteId(ntid: bigint | null): void {
         // TODO this is a hack, because it requires the NoteEditor to know implementation details of the PlainTextInput.
         // It should be refactored once we work on our own Undo stack
         for (const pi of plainTextInputs) {
@@ -238,21 +228,24 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 
     let notetypeMeta: NotetypeIdAndModTime;
-    function setNotetypeMeta({ id, modTime }: NotetypeIdAndModTime): void {
-        notetypeMeta = { id, modTime };
+    function setNotetypeMeta(notetype: Notetype): void {
+        notetypeMeta = { id: notetype.id, modTime: notetype.mtimeSecs };
         // Discard the saved state of the fields if the notetype has been modified.
-        if (sessionOptions[id]?.modTimeOfNotetype !== modTime) {
-            delete sessionOptions[id];
+        if (
+            sessionOptions[notetype.id.toString()]?.modTimeOfNotetype !==
+            notetype.mtimeSecs
+        ) {
+            delete sessionOptions[notetype.id.toString()];
         }
         if (isImageOcclusion) {
             getImageOcclusionFields({
-                notetypeId: BigInt(notetypeMeta.id),
+                notetypeId: BigInt(notetype.id),
             }).then((r) => (ioFields = r.fields!));
         }
     }
 
-    function getNoteId(): number | null {
-        return noteId;
+    function getNoteId(): string | null {
+        return noteId?.toString() ?? null;
     }
 
     let isImageOcclusion = false;
@@ -412,7 +405,17 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 
     import { ImageOcclusionFieldIndexes } from "@generated/anki/image_occlusion_pb";
-    import { getImageOcclusionFields } from "@generated/backend";
+
+    import { StockNotetype_OriginalStockKind } from "@generated/anki/notetypes_pb";
+    import type { Notetype } from "@generated/anki/notetypes_pb";
+    import {
+        getFieldNames,
+        getClozeFieldOrds,
+        getImageOcclusionFields,
+        getNote,
+        getNotetype,
+        encodeIriPaths,
+    } from "@generated/backend";
     import { wrapInternal } from "@tslib/wrap";
 
     import Shortcut from "$lib/components/Shortcut.svelte";
@@ -549,6 +552,69 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         });
     }
 
+    async function loadNote(nid: bigint | null, notetypeId: bigint, focusTo: number) {
+        const notetype = await getNotetype({
+            ntid: notetypeId,
+        });
+        let fieldValues: string[] = notetype.fields.map(() => "");
+        const fieldNames = (
+            await getFieldNames({
+                ntid: notetype.id,
+            })
+        ).vals;
+        const clozeFieldOrds = (await getClozeFieldOrds({ ntid: notetype.id })).ords;
+        const clozeFields = fieldNames.map((name, index) =>
+            clozeFieldOrds.includes(index),
+        );
+        let tags: string[] = [];
+        if (nid) {
+            const note = await getNote({
+                nid,
+            });
+            fieldValues = (
+                await Promise.all(
+                    note.fields.map((field) => encodeIriPaths({ val: field })),
+                )
+            ).map((field) => field.val);
+            tags = note.tags;
+        }
+        saveSession();
+        setFields(fieldNames, fieldValues);
+        setIsImageOcclusion(
+            notetype.config?.originalStockKind ===
+                StockNotetype_OriginalStockKind.IMAGE_OCCLUSION,
+        );
+        setNotetypeMeta(notetype);
+        setCollapsed(notetype.fields.map((field) => field.config?.collapsed ?? false));
+        setClozeFields(clozeFields);
+        setPlainTexts(notetype.fields.map((field) => field.config?.plainText ?? false));
+        setDescriptions(
+            notetype.fields.map((field) => field.config?.description ?? ""),
+        );
+        // TODO: gui_hooks.editor_will_use_font_for_field
+        setFonts(
+            notetype.fields.map((field) => [
+                field.config?.fontName ?? "",
+                field.config?.fontSize ?? 16,
+                field.config?.rtl ?? false,
+            ]),
+        );
+        focusField(focusTo);
+        setNoteId(nid);
+        // TODO: lastTextColor/lastHighlightColor profile config
+        // setColorButtons(["#0000ff", "#0000ff"]);
+        setTags(tags);
+        // TODO: mw.pm.tags_collapsed()
+        setTagsCollapsed(false);
+        // TODO: renderMathjax col config
+        setMathjaxEnabled(true);
+        // TODO: shrinkEditorImages col config
+        setShrinkImages(true);
+        // TODO: closeHTMLTags col config
+        setCloseHTMLTags(true);
+        triggerChanges();
+    }
+
     $: signalEditorState(editorState);
 
     $: editorState = getEditorState(
@@ -575,6 +641,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         }
 
         Object.assign(globalThis, {
+            loadNote,
             saveSession,
             setFields,
             setCollapsed,
diff --git a/ts/routes/editor/types.ts b/ts/routes/editor/types.ts
index 4ce9fd730..dc1ead9ed 100644
--- a/ts/routes/editor/types.ts
+++ b/ts/routes/editor/types.ts
@@ -8,16 +8,16 @@ export type EditorOptions = {
         plainTextsHidden: boolean[];
         plainTextDefaults: boolean[];
     };
-    modTimeOfNotetype: number;
+    modTimeOfNotetype: bigint;
 };
 
 export type SessionOptions = {
-    [key: number]: EditorOptions;
+    [key: string]: EditorOptions;
 };
 
 export type NotetypeIdAndModTime = {
-    id: number;
-    modTime: number;
+    id: bigint;
+    modTime: bigint;
 };
 
 export enum EditorState {

From 12e222b66e7d54b5f96b1dc0f9ed067db88dad77 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sun, 25 May 2025 15:21:42 +0300
Subject: [PATCH 005/133] Fix encodeIriPaths() not allowed

---
 qt/aqt/mediasrv.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index 658bfa345..ecff5feaf 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -675,6 +675,8 @@ exposed_backend_list = [
     "simulate_fsrs_review",
     # DeckConfigService
     "get_ignored_before_count",
+    # CardRenderingService
+    "encode_iri_paths",
 ]
 
 

From 2576a5bb752172abb89e04f978a2229a03dac4b8 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sun, 25 May 2025 16:27:37 +0300
Subject: [PATCH 006/133] Move screen-specific functionality back NoteEditor

---
 qt/aqt/browser/browser.py              |  2 +-
 ts/routes/editor/BrowserEditor.svelte  | 28 --------------
 ts/routes/editor/NoteCreator.svelte    | 51 --------------------------
 ts/routes/editor/NoteEditor.svelte     | 49 +++++++++++++++++++------
 ts/routes/editor/ReviewerEditor.svelte | 19 ----------
 ts/routes/editor/base.ts               | 37 +++----------------
 6 files changed, 44 insertions(+), 142 deletions(-)
 delete mode 100644 ts/routes/editor/BrowserEditor.svelte
 delete mode 100644 ts/routes/editor/NoteCreator.svelte
 delete mode 100644 ts/routes/editor/ReviewerEditor.svelte

diff --git a/qt/aqt/browser/browser.py b/qt/aqt/browser/browser.py
index 260746514..11488dd03 100644
--- a/qt/aqt/browser/browser.py
+++ b/qt/aqt/browser/browser.py
@@ -601,6 +601,7 @@ class Browser(QMainWindow):
 
         def add_preview_button(editor: Editor) -> None:
             editor._links["preview"] = lambda _editor: self.onTogglePreview()
+            gui_hooks.editor_did_init.remove(add_preview_button)
 
         gui_hooks.editor_did_init.append(add_preview_button)
         self.editor = aqt.editor.Editor(
@@ -609,7 +610,6 @@ class Browser(QMainWindow):
             self,
             editor_mode=aqt.editor.EditorMode.BROWSER,
         )
-        gui_hooks.editor_did_init.remove(add_preview_button)
 
     @ensure_editor_saved
     def on_all_or_selected_rows_changed(self) -> None:
diff --git a/ts/routes/editor/BrowserEditor.svelte b/ts/routes/editor/BrowserEditor.svelte
deleted file mode 100644
index 84aef7f99..000000000
--- a/ts/routes/editor/BrowserEditor.svelte
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-Copyright: Ankitects Pty Ltd and contributors
-License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
--->
-<script lang="ts">
-    import ButtonGroupItem from "$lib/components/ButtonGroupItem.svelte";
-
-    import type { NoteEditorAPI } from "./NoteEditor.svelte";
-    import NoteEditor from "./NoteEditor.svelte";
-    import PreviewButton from "./PreviewButton.svelte";
-
-    const api: Partial<NoteEditorAPI> = {};
-    let noteEditor: NoteEditor;
-
-    export let uiResolve: (api: NoteEditorAPI) => void;
-
-    $: if (noteEditor) {
-        uiResolve(api as NoteEditorAPI);
-    }
-</script>
-
-<NoteEditor bind:this={noteEditor} {api}>
-    <svelte:fragment slot="notetypeButtons">
-        <ButtonGroupItem>
-            <PreviewButton />
-        </ButtonGroupItem>
-    </svelte:fragment>
-</NoteEditor>
diff --git a/ts/routes/editor/NoteCreator.svelte b/ts/routes/editor/NoteCreator.svelte
deleted file mode 100644
index f4c205757..000000000
--- a/ts/routes/editor/NoteCreator.svelte
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
-Copyright: Ankitects Pty Ltd and contributors
-License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
--->
-<script lang="ts">
-    import { bridgeCommand } from "@tslib/bridgecommand";
-    import { registerShortcut } from "@tslib/shortcuts";
-    import { onDestroy, onMount } from "svelte";
-
-    import type { NoteEditorAPI } from "./NoteEditor.svelte";
-    import NoteEditor from "./NoteEditor.svelte";
-    import StickyBadge from "./StickyBadge.svelte";
-
-    const api: Partial<NoteEditorAPI> = {};
-    let noteEditor: NoteEditor;
-
-    export let uiResolve: (api: NoteEditorAPI) => void;
-
-    $: if (noteEditor) {
-        uiResolve(api as NoteEditorAPI);
-    }
-
-    let stickies: boolean[] = [];
-
-    function setSticky(stckies: boolean[]): void {
-        stickies = stckies;
-    }
-
-    function toggleStickyAll(): void {
-        bridgeCommand("toggleStickyAll", (values: boolean[]) => (stickies = values));
-    }
-
-    let deregisterSticky: () => void;
-    export function activateStickyShortcuts() {
-        deregisterSticky = registerShortcut(toggleStickyAll, "Shift+F9");
-    }
-
-    onMount(() => {
-        Object.assign(globalThis, {
-            setSticky,
-        });
-    });
-
-    onDestroy(() => deregisterSticky);
-</script>
-
-<NoteEditor bind:this={noteEditor} {api}>
-    <svelte:fragment slot="field-state" let:index let:show>
-        <StickyBadge bind:active={stickies[index]} {index} {show} />
-    </svelte:fragment>
-</NoteEditor>
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 027ad2e35..68f91f49e 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -13,6 +13,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import FieldState from "./FieldState.svelte";
     import LabelContainer from "./LabelContainer.svelte";
     import LabelName from "./LabelName.svelte";
+    import type { EditorMode } from "./types";
 
     export interface NoteEditorAPI {
         fields: EditorFieldAPI[];
@@ -188,6 +189,12 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         fonts = fs;
     }
 
+    let stickies: boolean[] = [];
+
+    function setSticky(stckies: boolean[]): void {
+        stickies = stckies;
+    }
+
     export function focusField(index: number | null): void {
         tick().then(() => {
             if (typeof index === "number") {
@@ -432,6 +439,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     } from "../image-occlusion/store";
     import CollapseLabel from "./CollapseLabel.svelte";
     import * as oldEditorAdapter from "./old-editor-adapter";
+    import StickyBadge from "./StickyBadge.svelte";
+    import ButtonGroupItem from "$lib/components/ButtonGroupItem.svelte";
+    import PreviewButton from "./PreviewButton.svelte";
 
     $: isIOImageLoaded = false;
     $: ioImageLoadedStore.set(isIOImageLoaded);
@@ -667,6 +677,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             setIsImageOcclusion,
             setupMaskEditor,
             saveOcclusions,
+            setSticky,
             ...oldEditorAdapter,
         });
 
@@ -701,19 +712,32 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     setupLifecycleHooks(api);
 
     $: tagAmount = $tags.length;
+
+    let noteEditor: HTMLDivElement;
+
+    export let uiResolve: (api: NoteEditorAPI) => void;
+    export let mode: EditorMode;
+
+    $: if (noteEditor) {
+        uiResolve(api as NoteEditorAPI);
+        console.log("svelte editor mode", mode);
+    }
 </script>
 
 <!--
 @component
 Serves as a pre-slotted convenience component which combines all the common
 components and functionality for general note editing.
-
-Functionality exclusive to specific note-editing views (e.g. in the browser or
-the AddCards dialog) should be implemented in the user of this component.
 -->
-<div class="note-editor">
+<div class="note-editor" bind:this={noteEditor}>
     <EditorToolbar {size} {wrap} api={toolbar}>
-        <slot slot="notetypeButtons" name="notetypeButtons" />
+        <svelte:fragment slot="notetypeButtons">
+            {#if mode === "browse"}
+                <ButtonGroupItem>
+                    <PreviewButton />
+                </ButtonGroupItem>
+            {/if}
+        </svelte:fragment>
     </EditorToolbar>
 
     {#if hint}
@@ -795,13 +819,14 @@ the AddCards dialog) should be implemented in the user of this component.
                                 {#if cols[index] === "dupe"}
                                     <DuplicateLink />
                                 {/if}
-                                <slot
-                                    name="field-state"
-                                    {field}
-                                    {index}
-                                    show={fields[index] === $hoveredField ||
-                                        fields[index] === $focusedField}
-                                />
+                                {#if mode === "add"}
+                                    <StickyBadge
+                                        bind:active={stickies[index]}
+                                        {index}
+                                        show={fields[index] === $hoveredField ||
+                                            fields[index] === $focusedField}
+                                    />
+                                {/if}
                                 {#if plainTextDefaults[index]}
                                     <RichTextBadge
                                         show={!fieldsCollapsed[index] &&
diff --git a/ts/routes/editor/ReviewerEditor.svelte b/ts/routes/editor/ReviewerEditor.svelte
deleted file mode 100644
index 2c31b9fba..000000000
--- a/ts/routes/editor/ReviewerEditor.svelte
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-Copyright: Ankitects Pty Ltd and contributors
-License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
--->
-<script lang="ts">
-    import type { NoteEditorAPI } from "./NoteEditor.svelte";
-    import NoteEditor from "./NoteEditor.svelte";
-
-    const api: Partial<NoteEditorAPI> = {};
-    let noteEditor: NoteEditor;
-
-    export let uiResolve: (api: NoteEditorAPI) => void;
-
-    $: if (noteEditor) {
-        uiResolve(api as NoteEditorAPI);
-    }
-</script>
-
-<NoteEditor bind:this={noteEditor} {api} />
diff --git a/ts/routes/editor/base.ts b/ts/routes/editor/base.ts
index bfc4a9183..884b1c8a3 100644
--- a/ts/routes/editor/base.ts
+++ b/ts/routes/editor/base.ts
@@ -19,10 +19,7 @@ import LabelButton from "$lib/components/LabelButton.svelte";
 import WithContext from "$lib/components/WithContext.svelte";
 import WithState from "$lib/components/WithState.svelte";
 
-import BrowserEditor from "./BrowserEditor.svelte";
-import NoteCreator from "./NoteCreator.svelte";
-import * as editorContextKeys from "./NoteEditor.svelte";
-import ReviewerEditor from "./ReviewerEditor.svelte";
+import NoteEditor, * as editorContextKeys from "./NoteEditor.svelte";
 
 declare global {
     interface Selection {
@@ -56,33 +53,11 @@ export const components = {
 
 export { editorToolbar } from "./editor-toolbar";
 
-async function setupBrowserEditor(): Promise<void> {
-    await setupI18n({ modules: editorModules });
-    mount(BrowserEditor, { target: document.body, props: { uiResolve } });
-}
-
-async function setupNoteCreator(): Promise<void> {
-    await setupI18n({ modules: editorModules });
-    mount(NoteCreator, { target: document.body, props: { uiResolve } });
-}
-
-async function setupReviewerEditor(): Promise<void> {
-    await setupI18n({ modules: editorModules });
-    mount(ReviewerEditor, { target: document.body, props: { uiResolve } });
-}
-
 export async function setupEditor(mode: EditorMode) {
-    switch (mode) {
-        case "add":
-            await setupNoteCreator();
-            break;
-        case "browse":
-            await setupBrowserEditor();
-            break;
-        case "review":
-            await setupReviewerEditor();
-            break;
-        default:
-            alert("unexpected editor type");
+    if (!["add", "browse", "review"].includes(mode)) {
+        alert("unexpected editor type");
+        return;
     }
+    await setupI18n({ modules: editorModules });
+    mount(NoteEditor, { target: document.body, props: { uiResolve, mode } });
 }

From 75bc67608adacf3e40e9c6f9c384dae131774edb Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sun, 25 May 2025 17:32:35 +0300
Subject: [PATCH 007/133] Remove console.log() statement

---
 ts/routes/editor/NoteEditor.svelte | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 68f91f49e..e5b260d5e 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -720,7 +720,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     $: if (noteEditor) {
         uiResolve(api as NoteEditorAPI);
-        console.log("svelte editor mode", mode);
     }
 </script>
 

From 1809e793e6c310f9491d7c9006314acef3c1da54 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sun, 25 May 2025 19:20:11 +0300
Subject: [PATCH 008/133] Move note saving to TS

---
 proto/anki/frontend.proto          |  3 ++
 qt/aqt/editor.py                   | 18 +------
 qt/aqt/mediasrv.py                 | 21 +++++++-
 ts/routes/editor/NoteEditor.svelte | 77 ++++++++++++++++--------------
 4 files changed, 64 insertions(+), 55 deletions(-)

diff --git a/proto/anki/frontend.proto b/proto/anki/frontend.proto
index 9bf50d8e2..57e6b9fc4 100644
--- a/proto/anki/frontend.proto
+++ b/proto/anki/frontend.proto
@@ -10,6 +10,7 @@ package anki.frontend;
 import "anki/scheduler.proto";
 import "anki/generic.proto";
 import "anki/search.proto";
+import "anki/notes.proto";
 
 service FrontendService {
   // Returns values from the reviewer
@@ -28,7 +29,9 @@ service FrontendService {
   // Warns python that the deck option web view is ready to receive requests.
   rpc deckOptionsReady(generic.Empty) returns (generic.Empty);
 
+  // Editor
   rpc editorReady(generic.Empty) returns (generic.Empty);
+  rpc editorUpdateNote(notes.UpdateNotesRequest) returns (generic.Empty);
 }
 
 service BackendFrontendService {}
diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 32430a010..1f7f2b5e9 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -402,24 +402,8 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
 
         # focus lost or key/button pressed?
         if cmd.startswith("blur") or cmd.startswith("key"):
-            (type, ord_str, nid_str, txt) = cmd.split(":", 3)
+            (type, ord_str) = cmd.split(":", 1)
             ord = int(ord_str)
-            try:
-                nid = int(nid_str)
-            except ValueError:
-                nid = 0
-            if nid != self.note.id:
-                print("ignored late blur")
-                return
-
-            try:
-                self.note.fields[ord] = self.mungeHTML(txt)
-            except IndexError:
-                print("ignored late blur after notetype change")
-                return
-
-            if not self.addMode:
-                self._save_current_note()
             if type == "blur":
                 self.currentField = None
                 # run any filters
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index ecff5feaf..d0bb3b75b 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -608,13 +608,30 @@ def editor_ready() -> bytes:
 
     def handle_on_main() -> None:
         window = aqt.mw.app.activeWindow()
-        if isinstance(getattr(window, "editor"), Editor):
+        if window and isinstance(getattr(window, "editor"), Editor):
             window.editor._set_ready()  # type: ignore
 
     aqt.mw.taskman.run_on_main(handle_on_main)
     return b""
 
 
+def editor_update_note() -> bytes:
+    from aqt.editor import Editor
+
+    output = raw_backend_request("update_notes")()
+    response = OpChanges()
+    response.ParseFromString(output)
+
+    def handle_on_main() -> None:
+        window = aqt.mw.app.activeWindow()
+        if window and isinstance(getattr(window, "editor"), Editor):
+            on_op_finished(aqt.mw, response, window.editor)  # type: ignore
+
+    aqt.mw.taskman.run_on_main(handle_on_main)
+
+    return output
+
+
 post_handler_list = [
     congrats_info,
     get_deck_configs_for_update,
@@ -631,6 +648,7 @@ post_handler_list = [
     deck_options_require_close,
     deck_options_ready,
     editor_ready,
+    editor_update_note,
 ]
 
 
@@ -647,6 +665,7 @@ exposed_backend_list = [
     # NotesService
     "get_field_names",
     "get_note",
+    "new_note",
     # NotetypesService
     "get_notetype",
     "get_notetype_names",
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index e5b260d5e..4000a0d93 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -224,14 +224,14 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         bridgeCommand(`setTagsCollapsed:${$tagsCollapsed}`);
     }
 
-    let noteId: bigint | null = null;
-    export function setNoteId(ntid: bigint | null): void {
+    let note: Note | null = null;
+    export function setNote(n: Note): void {
+        note = n;
         // TODO this is a hack, because it requires the NoteEditor to know implementation details of the PlainTextInput.
         // It should be refactored once we work on our own Undo stack
         for (const pi of plainTextInputs) {
             pi.api.codeMirror.editor.then((editor) => editor.clearHistory());
         }
-        noteId = ntid;
     }
 
     let notetypeMeta: NotetypeIdAndModTime;
@@ -251,10 +251,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         }
     }
 
-    function getNoteId(): string | null {
-        return noteId?.toString() ?? null;
-    }
-
     let isImageOcclusion = false;
     function setIsImageOcclusion(val: boolean) {
         isImageOcclusion = val;
@@ -294,18 +290,24 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     function transformContentBeforeSave(content: string): string {
         return content.replace(/ data-editor-shrink="(true|false)"/g, "");
+        // TODO: mungeHTML()
+    }
+
+    async function updateCurrentNote() {
+        if (mode !== "add") {
+            await editorUpdateNote({
+                notes: [note!],
+                skipUndoEntry: false,
+            });
+        }
     }
 
     function updateField(index: number, content: string): void {
-        fieldSave.schedule(
-            () =>
-                bridgeCommand(
-                    `key:${index}:${getNoteId()}:${transformContentBeforeSave(
-                        content,
-                    )}`,
-                ),
-            600,
-        );
+        fieldSave.schedule(() => {
+            bridgeCommand(`key:${index}`);
+            note!.fields[index] = transformContentBeforeSave(content);
+            updateCurrentNote();
+        }, 600);
     }
 
     function saveFieldNow(): void {
@@ -422,6 +424,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         getNote,
         getNotetype,
         encodeIriPaths,
+        newNote,
+        editorUpdateNote,
     } from "@generated/backend";
     import { wrapInternal } from "@tslib/wrap";
 
@@ -442,6 +446,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import StickyBadge from "./StickyBadge.svelte";
     import ButtonGroupItem from "$lib/components/ButtonGroupItem.svelte";
     import PreviewButton from "./PreviewButton.svelte";
+    import type { Note } from "@generated/anki/notes_pb";
 
     $: isIOImageLoaded = false;
     $: ioImageLoadedStore.set(isIOImageLoaded);
@@ -562,11 +567,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         });
     }
 
-    async function loadNote(nid: bigint | null, notetypeId: bigint, focusTo: number) {
+    async function loadNote(nid: bigint, notetypeId: bigint, focusTo: number) {
         const notetype = await getNotetype({
             ntid: notetypeId,
         });
-        let fieldValues: string[] = notetype.fields.map(() => "");
         const fieldNames = (
             await getFieldNames({
                 ntid: notetype.id,
@@ -576,18 +580,22 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         const clozeFields = fieldNames.map((name, index) =>
             clozeFieldOrds.includes(index),
         );
-        let tags: string[] = [];
-        if (nid) {
-            const note = await getNote({
-                nid,
-            });
-            fieldValues = (
-                await Promise.all(
-                    note.fields.map((field) => encodeIriPaths({ val: field })),
-                )
-            ).map((field) => field.val);
-            tags = note.tags;
+        if (mode === "add") {
+            setNote(await newNote({ ntid: notetype.id }));
+        } else {
+            setNote(
+                await getNote({
+                    nid,
+                }),
+            );
         }
+        const fieldValues = (
+            await Promise.all(
+                note!.fields.map((field) => encodeIriPaths({ val: field })),
+            )
+        ).map((field) => field.val);
+        const tags = note!.tags;
+
         saveSession();
         setFields(fieldNames, fieldValues);
         setIsImageOcclusion(
@@ -610,7 +618,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             ]),
         );
         focusField(focusTo);
-        setNoteId(nid);
         // TODO: lastTextColor/lastHighlightColor profile config
         // setColorButtons(["#0000ff", "#0000ff"]);
         setTags(tags);
@@ -666,8 +673,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             setClozeHint,
             saveNow,
             focusIfField,
-            getNoteId,
-            setNoteId,
             setNotetypeMeta,
             wrap,
             setMathjaxEnabled,
@@ -786,11 +791,9 @@ components and functionality for general note editing.
                     on:focusout={() => {
                         $focusedField = null;
                         setAddonButtonsDisabled(true);
-                        bridgeCommand(
-                            `blur:${index}:${getNoteId()}:${transformContentBeforeSave(
-                                get(content),
-                            )}`,
-                        );
+                        bridgeCommand(`blur:${index}`);
+                        note!.fields[index] = transformContentBeforeSave(get(content));
+                        updateCurrentNote();
                     }}
                     on:mouseenter={() => {
                         $hoveredField = fields[index];

From 48fb272700334d840bda66c4972a8b133f7e3781 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sun, 25 May 2025 21:10:02 +0300
Subject: [PATCH 009/133] Fix error on late editor_update_note() call

---
 qt/aqt/mediasrv.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index d0bb3b75b..b4d6e371a 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -623,9 +623,10 @@ def editor_update_note() -> bytes:
     response.ParseFromString(output)
 
     def handle_on_main() -> None:
-        window = aqt.mw.app.activeWindow()
-        if window and isinstance(getattr(window, "editor"), Editor):
-            on_op_finished(aqt.mw, response, window.editor)  # type: ignore
+        handler = aqt.mw.app.activeWindow()
+        if handler and isinstance(getattr(handler, "editor", None), Editor):
+            handler = handler.editor  # type: ignore
+        on_op_finished(aqt.mw, response, handler)
 
     aqt.mw.taskman.run_on_main(handle_on_main)
 

From 3073ef02b503c6852f27d1a46d9017721fe2388a Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sun, 25 May 2025 21:14:10 +0300
Subject: [PATCH 010/133] Remove editorReady()

bridgeCommand() looks cleaner here
---
 proto/anki/frontend.proto     |  1 -
 qt/aqt/editor.py              |  2 ++
 qt/aqt/mediasrv.py            | 13 -------------
 ts/routes/editor/+page.svelte |  4 ++--
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/proto/anki/frontend.proto b/proto/anki/frontend.proto
index 57e6b9fc4..5385da051 100644
--- a/proto/anki/frontend.proto
+++ b/proto/anki/frontend.proto
@@ -30,7 +30,6 @@ service FrontendService {
   rpc deckOptionsReady(generic.Empty) returns (generic.Empty);
 
   // Editor
-  rpc editorReady(generic.Empty) returns (generic.Empty);
   rpc editorUpdateNote(notes.UpdateNotesRequest) returns (generic.Empty);
 }
 
diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 1f7f2b5e9..788fad69f 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -496,6 +496,8 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
                 gui_hooks.editor_mask_editor_did_load_image(
                     self, NoteId(int(path_or_nid))
                 )
+        elif cmd == "editorReady":
+            self._set_ready()
 
         elif cmd in self._links:
             return self._links[cmd](self)
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index b4d6e371a..c08dd0abd 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -603,18 +603,6 @@ def deck_options_ready() -> bytes:
     return b""
 
 
-def editor_ready() -> bytes:
-    from aqt.editor import Editor
-
-    def handle_on_main() -> None:
-        window = aqt.mw.app.activeWindow()
-        if window and isinstance(getattr(window, "editor"), Editor):
-            window.editor._set_ready()  # type: ignore
-
-    aqt.mw.taskman.run_on_main(handle_on_main)
-    return b""
-
-
 def editor_update_note() -> bytes:
     from aqt.editor import Editor
 
@@ -648,7 +636,6 @@ post_handler_list = [
     search_in_browser,
     deck_options_require_close,
     deck_options_ready,
-    editor_ready,
     editor_update_note,
 ]
 
diff --git a/ts/routes/editor/+page.svelte b/ts/routes/editor/+page.svelte
index 2130ad26e..642613612 100644
--- a/ts/routes/editor/+page.svelte
+++ b/ts/routes/editor/+page.svelte
@@ -8,8 +8,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import * as base from "./base";
     import { page } from "$app/state";
     import type { EditorMode } from "./types";
-    import { editorReady } from "@generated/backend";
     import { globalExport } from "@tslib/globals";
+    import { bridgeCommand } from "@tslib/bridgecommand";
 
     const mode = (page.url.searchParams.get("mode") ?? "add") as EditorMode;
 
@@ -17,7 +17,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     onMount(() => {
         setupEditor(mode).then(() => {
-            editorReady({});
+            bridgeCommand("editorReady");
         });
     });
 </script>

From 8a87e6496c86203b4131742d7dd09a1fdd9aa12b Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sun, 25 May 2025 21:20:02 +0300
Subject: [PATCH 011/133] Remove legacy editor tagedit functions

---
 qt/aqt/editor.py | 54 +-----------------------------------------------
 1 file changed, 1 insertion(+), 53 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 788fad69f..39adfbe14 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -37,13 +37,12 @@ from anki.httpclient import HttpClient
 from anki.models import NotetypeDict, NotetypeId, StockNotetype
 from anki.notes import Note, NoteFieldsCheckResult, NoteId
 from anki.utils import checksum, is_lin, is_mac, is_win, namedtmp
-from aqt import AnkiQt, colors, gui_hooks
+from aqt import AnkiQt, gui_hooks
 from aqt.operations import QueryOp
 from aqt.operations.note import update_note
 from aqt.operations.notetype import update_notetype_legacy
 from aqt.qt import *
 from aqt.sound import av_player
-from aqt.theme import theme_manager
 from aqt.utils import (
     HelpPage,
     KeyboardModifiersPressed,
@@ -681,62 +680,11 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
 
     setNote = set_note
 
-    # Tag handling
-    ######################################################################
-
-    def setupTags(self) -> None:
-        import aqt.tagedit
-
-        g = QGroupBox(self.widget)
-        g.setStyleSheet("border: 0")
-        tb = QGridLayout()
-        tb.setSpacing(12)
-        tb.setContentsMargins(2, 6, 2, 6)
-        # tags
-        l = QLabel(tr.editing_tags())
-        tb.addWidget(l, 1, 0)
-        self.tags = aqt.tagedit.TagEdit(self.widget)
-        qconnect(self.tags.lostFocus, self.on_tag_focus_lost)
-        self.tags.setToolTip(shortcut(tr.editing_jump_to_tags_with_ctrlandshiftandt()))
-        border = theme_manager.var(colors.BORDER)
-        self.tags.setStyleSheet(f"border: 1px solid {border}")
-        tb.addWidget(self.tags, 1, 1)
-        g.setLayout(tb)
-        self.outerLayout.addWidget(g)
-
-    def updateTags(self) -> None:
-        if self.tags.col != self.mw.col:
-            self.tags.setCol(self.mw.col)
-        if not self.tags.text() or not self.addMode:
-            assert self.note is not None
-            self.tags.setText(self.note.string_tags().strip())
-
-    def on_tag_focus_lost(self) -> None:
-        assert self.note is not None
-        self.note.tags = self.mw.col.tags.split(self.tags.text())
-        gui_hooks.editor_did_update_tags(self.note)
-        if not self.addMode:
-            self._save_current_note()
-
-    def blur_tags_if_focused(self) -> None:
-        if not self.note:
-            return
-        if self.tags.hasFocus():
-            self.widget.setFocus()
-
-    def hideCompleters(self) -> None:
-        self.tags.hideCompleter()
-
-    def onFocusTags(self) -> None:
-        self.tags.setFocus()
-
     # legacy
 
     def saveAddModeVars(self) -> None:
         pass
 
-    saveTags = blur_tags_if_focused
-
     # Audio/video/images
     ######################################################################
 

From 0a3710e967ea8193d76ec53d97720c44bc7a2050 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sun, 25 May 2025 21:24:17 +0300
Subject: [PATCH 012/133] Replace note save call for saveTags cmd

---
 qt/aqt/editor.py                   | 5 -----
 ts/routes/editor/NoteEditor.svelte | 4 +++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 39adfbe14..595059b57 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -468,12 +468,7 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             self.mw.pm.profile["lastHighlightColor"] = highlightColor
 
         elif cmd.startswith("saveTags"):
-            (type, tagsJson) = cmd.split(":", 1)
-            self.note.tags = json.loads(tagsJson)
-
             gui_hooks.editor_did_update_tags(self.note)
-            if not self.addMode:
-                self._save_current_note()
 
         elif cmd.startswith("setTagsCollapsed"):
             (type, collapsed_string) = cmd.split(":", 1)
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 4000a0d93..ff179e70c 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -283,7 +283,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     function saveTags({ detail }: CustomEvent): void {
         tagAmount = detail.tags.filter((tag: string) => tag != "").length;
         lastSavedTags = detail.tags;
-        bridgeCommand(`saveTags:${JSON.stringify(detail.tags)}`);
+        note!.tags = detail.tags;
+        bridgeCommand("saveTags");
+        updateCurrentNote();
     }
 
     const fieldSave = new ChangeTimer();

From 8a9baca554c1dbe4b711412b823aec5a8fa355bd Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Mon, 26 May 2025 02:26:59 +0300
Subject: [PATCH 013/133] Fix anki-editable styles not applying

---
 build/configure/src/aqt.rs                    |  3 +--
 build/configure/src/web.rs                    | 13 ------------
 ts/lib/editable/ContentEditable.svelte        | 18 +---------------
 ts/lib/editable/Mathjax.svelte                | 21 +------------------
 ts/lib/editable/content-editable.scss         | 15 +++++++++++++
 ts/lib/editable/index.ts                      |  5 ++---
 ts/lib/editable/mathjax.scss                  | 20 ++++++++++++++++++
 .../rich-text-input/RichTextStyles.svelte     | 18 ++++++++++++++--
 8 files changed, 56 insertions(+), 57 deletions(-)
 create mode 100644 ts/lib/editable/content-editable.scss
 create mode 100644 ts/lib/editable/mathjax.scss

diff --git a/build/configure/src/aqt.rs b/build/configure/src/aqt.rs
index 80f7462f5..c3fb5ffac 100644
--- a/build/configure/src/aqt.rs
+++ b/build/configure/src/aqt.rs
@@ -148,8 +148,7 @@ fn build_css(build: &mut Build) -> Result<()> {
             },
         )?;
     }
-    let other_ts_css =
-        build.inputs_with_suffix(inputs![":ts:editable", ":ts:reviewer:reviewer.css"], ".css");
+    let other_ts_css = build.inputs_with_suffix(inputs![":ts:reviewer:reviewer.css"], ".css");
     build.add_action(
         "qt:aqt:data:web:css",
         CopyFiles {
diff --git a/build/configure/src/web.rs b/build/configure/src/web.rs
index 2e5411c41..152a1a4d0 100644
--- a/build/configure/src/web.rs
+++ b/build/configure/src/web.rs
@@ -202,19 +202,6 @@ fn build_and_check_pages(build: &mut Build) -> Result<()> {
 
         Ok(())
     };
-    // we use the generated .css file separately
-    build_page(
-        "editable",
-        false,
-        inputs![
-            ":ts:lib",
-            ":ts:components",
-            ":ts:domlib",
-            ":ts:sveltelib",
-            ":sass",
-            ":sveltekit",
-        ],
-    )?;
     build_page(
         "congrats",
         true,
diff --git a/ts/lib/editable/ContentEditable.svelte b/ts/lib/editable/ContentEditable.svelte
index d0cfe89df..3f3b7c7f5 100644
--- a/ts/lib/editable/ContentEditable.svelte
+++ b/ts/lib/editable/ContentEditable.svelte
@@ -57,21 +57,5 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 ></anki-editable>
 
 <style lang="scss">
-    anki-editable {
-        display: block;
-        position: relative;
-
-        overflow: auto;
-        overflow-wrap: anywhere;
-        /* fallback for iOS */
-        word-break: break-word;
-
-        &:focus {
-            outline: none;
-        }
-
-        min-height: 1.5em;
-    }
-
-    /* editable-base.scss contains styling targeting user HTML */
+    @import "./content-editable.scss";
 </style>
diff --git a/ts/lib/editable/Mathjax.svelte b/ts/lib/editable/Mathjax.svelte
index bc8e5cf81..7be3c986d 100644
--- a/ts/lib/editable/Mathjax.svelte
+++ b/ts/lib/editable/Mathjax.svelte
@@ -127,24 +127,5 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 />
 
 <style lang="scss">
-    :global(anki-mathjax) {
-        white-space: pre;
-    }
-
-    img {
-        vertical-align: var(--vertical-center);
-    }
-
-    .block {
-        display: block;
-        margin: 1rem auto;
-        transform: scale(1.1);
-    }
-
-    .empty {
-        vertical-align: text-bottom;
-
-        width: var(--font-size);
-        height: var(--font-size);
-    }
+    @import "./mathjax.scss";
 </style>
diff --git a/ts/lib/editable/content-editable.scss b/ts/lib/editable/content-editable.scss
new file mode 100644
index 000000000..6648283d1
--- /dev/null
+++ b/ts/lib/editable/content-editable.scss
@@ -0,0 +1,15 @@
+anki-editable {
+    display: block;
+    position: relative;
+
+    overflow: auto;
+    overflow-wrap: anywhere;
+    /* fallback for iOS */
+    word-break: break-word;
+
+    &:focus {
+        outline: none;
+    }
+
+    min-height: 1.5em;
+}
diff --git a/ts/lib/editable/index.ts b/ts/lib/editable/index.ts
index b44eb6435..00984a718 100644
--- a/ts/lib/editable/index.ts
+++ b/ts/lib/editable/index.ts
@@ -2,6 +2,5 @@
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 import "./editable-base.scss";
-/* only imported for the CSS */
-import "./ContentEditable.svelte";
-import "./Mathjax.svelte";
+import "./content-editable.scss";
+import "./mathjax.scss";
diff --git a/ts/lib/editable/mathjax.scss b/ts/lib/editable/mathjax.scss
new file mode 100644
index 000000000..30f4c7541
--- /dev/null
+++ b/ts/lib/editable/mathjax.scss
@@ -0,0 +1,20 @@
+:global(anki-mathjax) {
+    white-space: pre;
+}
+
+img {
+    vertical-align: var(--vertical-center);
+}
+
+.block {
+    display: block;
+    margin: 1rem auto;
+    transform: scale(1.1);
+}
+
+.empty {
+    vertical-align: text-bottom;
+
+    width: var(--font-size);
+    height: var(--font-size);
+}
diff --git a/ts/routes/editor/rich-text-input/RichTextStyles.svelte b/ts/routes/editor/rich-text-input/RichTextStyles.svelte
index b4f9cae0c..87629c347 100644
--- a/ts/routes/editor/rich-text-input/RichTextStyles.svelte
+++ b/ts/routes/editor/rich-text-input/RichTextStyles.svelte
@@ -7,6 +7,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     import type { StyleLinkType, StyleObject } from "./CustomStyles.svelte";
     import CustomStyles from "./CustomStyles.svelte";
+    import editableBaseCSS from "$lib/editable/editable-base.scss?url";
+    import contentEditableCSS from "$lib/editable/content-editable.scss?url";
+    import mathjaxCSS from "$lib/editable/mathjax.scss?url";
+
     import { mount } from "svelte";
 
     export let callback: (styles: Record<string, any>) => void;
@@ -45,9 +49,19 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     const styles: StyleLinkType[] = [
         {
-            id: "rootStyle",
+            id: "editableBaseStyle",
             type: "link",
-            href: "./_anki/css/editable.css",
+            href: editableBaseCSS,
+        },
+        {
+            id: "contentEditableStyle",
+            type: "link",
+            href: contentEditableCSS,
+        },
+        {
+            id: "mathjaxStyle",
+            type: "link",
+            href: mathjaxCSS,
         },
     ];
 

From 35f0bc5af65ec542b7754f2f0def5062f2411d27 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Mon, 26 May 2025 02:50:31 +0300
Subject: [PATCH 014/133] Reimplement editor_will_munge_html callbacks

---
 qt/aqt/editor.py                   | 20 --------------------
 qt/aqt/mediasrv.py                 |  1 +
 ts/routes/editor/NoteEditor.svelte | 27 +++++++++++++++++++--------
 3 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 595059b57..568de8ec6 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -499,9 +499,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
         else:
             print("uncaught cmd", cmd)
 
-    def mungeHTML(self, txt: str) -> str:
-        return gui_hooks.editor_will_munge_html(txt, self)
-
     def signal_state_change(
         self, new_state: EditorState, old_state: EditorState
     ) -> None:
@@ -1648,24 +1645,7 @@ def fontMungeHack(font: str) -> str:
     return re.sub(" L$", " Light", font)
 
 
-def munge_html(txt: str, editor: Editor) -> str:
-    return "" if txt in ("<br>", "<div><br></div>") else txt
-
-
-def remove_null_bytes(txt: str, editor: Editor) -> str:
-    # misbehaving apps may include a null byte in the text
-    return txt.replace("\x00", "")
-
-
-def reverse_url_quoting(txt: str, editor: Editor) -> str:
-    # reverse the url quoting we added to get images to display
-    return editor.mw.col.media.escape_media_filenames(txt, unescape=True)
-
-
 gui_hooks.editor_will_use_font_for_field.append(fontMungeHack)
-gui_hooks.editor_will_munge_html.append(munge_html)
-gui_hooks.editor_will_munge_html.append(remove_null_bytes)
-gui_hooks.editor_will_munge_html.append(reverse_url_quoting)
 
 
 def set_cloze_button(editor: Editor) -> None:
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index c08dd0abd..a9a6ccbb3 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -684,6 +684,7 @@ exposed_backend_list = [
     "get_ignored_before_count",
     # CardRenderingService
     "encode_iri_paths",
+    "decode_iri_paths",
 ]
 
 
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index ff179e70c..755eae772 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -290,9 +290,17 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     const fieldSave = new ChangeTimer();
 
-    function transformContentBeforeSave(content: string): string {
-        return content.replace(/ data-editor-shrink="(true|false)"/g, "");
-        // TODO: mungeHTML()
+    async function transformContentBeforeSave(content: string): Promise<string> {
+        content = content.replace(/ data-editor-shrink="(true|false)"/g, "");
+        // misbehaving apps may include a null byte in the text
+        content = content.replaceAll("\0", "");
+        // reverse the url quoting we added to get images to display
+        content = (await decodeIriPaths({ val: content })).val;
+
+        if (["<br>", "<div><br></div>"].includes(content)) {
+            return "";
+        }
+        return content;
     }
 
     async function updateCurrentNote() {
@@ -304,10 +312,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         }
     }
 
-    function updateField(index: number, content: string): void {
-        fieldSave.schedule(() => {
+    async function updateField(index: number, content: string): Promise<void> {
+        fieldSave.schedule(async () => {
             bridgeCommand(`key:${index}`);
-            note!.fields[index] = transformContentBeforeSave(content);
+            note!.fields[index] = await transformContentBeforeSave(content);
             updateCurrentNote();
         }, 600);
     }
@@ -428,6 +436,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         encodeIriPaths,
         newNote,
         editorUpdateNote,
+        decodeIriPaths,
     } from "@generated/backend";
     import { wrapInternal } from "@tslib/wrap";
 
@@ -790,11 +799,13 @@ components and functionality for general note editing.
                         setAddonButtonsDisabled(false);
                         bridgeCommand(`focus:${index}`);
                     }}
-                    on:focusout={() => {
+                    on:focusout={async () => {
                         $focusedField = null;
                         setAddonButtonsDisabled(true);
                         bridgeCommand(`blur:${index}`);
-                        note!.fields[index] = transformContentBeforeSave(get(content));
+                        note!.fields[index] = await transformContentBeforeSave(
+                            get(content),
+                        );
                         updateCurrentNote();
                     }}
                     on:mouseenter={() => {

From 436d76a81e16bc8bd68141b038161e81ac0af26b Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Mon, 26 May 2025 02:53:53 +0300
Subject: [PATCH 015/133] Move setSticky() call

---
 qt/aqt/editor.py                   | 4 ----
 ts/routes/editor/NoteEditor.svelte | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 568de8ec6..dd8b2828e 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -547,10 +547,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
         assert self.mw.pm.profile is not None
         js = f"loadNote({self.note.id}, {self.note.mid});"
 
-        if self.addMode:
-            sticky = [field["sticky"] for field in self.note_type()["flds"]]
-            js += " setSticky(%s);" % json.dumps(sticky)
-
         if self.current_notetype_is_image_occlusion():
             io_field_indices = self.mw.backend.get_image_occlusion_fields(self.note.mid)
             image_field = self.note.fields[io_field_indices.image]
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 755eae772..821be1bc6 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -640,6 +640,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         setShrinkImages(true);
         // TODO: closeHTMLTags col config
         setCloseHTMLTags(true);
+        if (mode === "add") {
+            setSticky(notetype.fields.map((field) => field.config?.sticky ?? false));
+        }
         triggerChanges();
     }
 

From 423393107dcba2ec8c686b5e3bcd64c2d808b067 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 28 May 2025 06:36:40 +0300
Subject: [PATCH 016/133] Move fontMungeHack()

---
 qt/aqt/editor.py                   | 16 ----------------
 ts/routes/editor/NoteEditor.svelte | 10 ++++++++--
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index dd8b2828e..b3b647a8b 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -574,12 +574,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             initiator=self
         )
 
-    def fonts(self) -> list[tuple[str, int, bool]]:
-        return [
-            (gui_hooks.editor_will_use_font_for_field(f["font"]), f["size"], f["rtl"])
-            for f in self.note_type()["flds"]
-        ]
-
     def call_after_note_saved(
         self, callback: Callable, keepFocus: bool = False
     ) -> None:
@@ -1634,16 +1628,6 @@ class EditorWebView(AnkiWebView):
         return clipboard
 
 
-# QFont returns "Kozuka Gothic Pro L" but WebEngine expects "Kozuka Gothic Pro Light"
-# - there may be other cases like a trailing 'Bold' that need fixing, but will
-# wait for further reports first.
-def fontMungeHack(font: str) -> str:
-    return re.sub(" L$", " Light", font)
-
-
-gui_hooks.editor_will_use_font_for_field.append(fontMungeHack)
-
-
 def set_cloze_button(editor: Editor) -> None:
     action = "show" if editor.note_type()["type"] == MODEL_CLOZE else "hide"
     editor.web.eval(
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 821be1bc6..4d937f824 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -185,6 +185,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     const fields = clearableArray<EditorFieldAPI>();
 
+    //  QFont returns "Kozuka Gothic Pro L" but WebEngine expects "Kozuka Gothic Pro Light"
+    // - there may be other cases like a trailing 'Bold' that need fixing, but will
+    // wait for further reports first.
+    function mungeFontName(fontName: string): string {
+        return fontName.replace(/ L$/g, " Light");
+    }
+
     export function setFonts(fs: [string, number, boolean][]): void {
         fonts = fs;
     }
@@ -620,10 +627,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         setDescriptions(
             notetype.fields.map((field) => field.config?.description ?? ""),
         );
-        // TODO: gui_hooks.editor_will_use_font_for_field
         setFonts(
             notetype.fields.map((field) => [
-                field.config?.fontName ?? "",
+                mungeFontName(field.config?.fontName ?? ""),
                 field.config?.fontSize ?? 16,
                 field.config?.rtl ?? false,
             ]),

From 9395b89b9236492d0daa6e84f2a5954af11aa62e Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 28 May 2025 09:25:47 +0300
Subject: [PATCH 017/133] Move setColorButtons()

---
 proto/anki/frontend.proto                     |  9 ++++++++
 qt/aqt/editor.py                              | 10 ---------
 qt/aqt/mediasrv.py                            | 22 ++++++++++++++++++-
 ts/lib/tslib/profile.ts                       | 16 ++++++++++++++
 ts/routes/editor/NoteEditor.svelte            |  9 +++++---
 .../editor-toolbar/EditorToolbar.svelte       |  6 ++---
 .../HighlightColorButton.svelte               |  4 ++--
 .../editor-toolbar/InlineButtons.svelte       | 18 +++++++++++----
 .../editor-toolbar/TextColorButton.svelte     |  4 ++--
 9 files changed, 73 insertions(+), 25 deletions(-)
 create mode 100644 ts/lib/tslib/profile.ts

diff --git a/proto/anki/frontend.proto b/proto/anki/frontend.proto
index 5385da051..1f3e7b6b3 100644
--- a/proto/anki/frontend.proto
+++ b/proto/anki/frontend.proto
@@ -31,6 +31,10 @@ service FrontendService {
 
   // Editor
   rpc editorUpdateNote(notes.UpdateNotesRequest) returns (generic.Empty);
+
+  // Profile config
+  rpc GetProfileConfigJson(generic.String) returns (generic.Json);
+  rpc SetProfileConfigJson(SetProfileConfigJsonRequest) returns (generic.Empty);
 }
 
 service BackendFrontendService {}
@@ -44,3 +48,8 @@ message SetSchedulingStatesRequest {
   string key = 1;
   scheduler.SchedulingStates states = 2;
 }
+
+message SetProfileConfigJsonRequest {
+  string key = 1;
+  bytes value_json = 2;
+}
diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index b3b647a8b..b35d11a90 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -457,16 +457,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
 
             return new_state
 
-        elif cmd.startswith("lastTextColor"):
-            (_, textColor) = cmd.split(":", 1)
-            assert self.mw.pm.profile is not None
-            self.mw.pm.profile["lastTextColor"] = textColor
-
-        elif cmd.startswith("lastHighlightColor"):
-            (_, highlightColor) = cmd.split(":", 1)
-            assert self.mw.pm.profile is not None
-            self.mw.pm.profile["lastHighlightColor"] = highlightColor
-
         elif cmd.startswith("saveTags"):
             gui_hooks.editor_did_update_tags(self.note)
 
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index d507dfdd5..636d88545 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -4,6 +4,7 @@
 from __future__ import annotations
 
 import enum
+import json
 import logging
 import mimetypes
 import os
@@ -28,7 +29,7 @@ from waitress.server import create_server
 import aqt
 import aqt.main
 import aqt.operations
-from anki import hooks
+from anki import frontend_pb2, generic_pb2, hooks
 from anki.collection import OpChanges, OpChangesOnly, Progress, SearchNode
 from anki.decks import UpdateDeckConfigs
 from anki.scheduler.v3 import SchedulingStatesWithContext, SetSchedulingStatesRequest
@@ -621,6 +622,23 @@ def editor_update_note() -> bytes:
     return output
 
 
+def get_profile_config_json() -> bytes:
+    key = generic_pb2.String()
+    key.ParseFromString(request.data)
+    value = aqt.mw.pm.profile.get(key.val, None)
+    output = generic_pb2.Json(json=json.dumps(value).encode()).SerializeToString()
+
+    return output
+
+
+def set_profile_config_json() -> bytes:
+    req = frontend_pb2.SetProfileConfigJsonRequest()
+    req.ParseFromString(request.data)
+    aqt.mw.pm.profile[req.key] = json.loads(req.value_json)
+
+    return b""
+
+
 post_handler_list = [
     congrats_info,
     get_deck_configs_for_update,
@@ -637,6 +655,8 @@ post_handler_list = [
     deck_options_require_close,
     deck_options_ready,
     editor_update_note,
+    get_profile_config_json,
+    set_profile_config_json,
 ]
 
 
diff --git a/ts/lib/tslib/profile.ts b/ts/lib/tslib/profile.ts
new file mode 100644
index 000000000..3ec10eff7
--- /dev/null
+++ b/ts/lib/tslib/profile.ts
@@ -0,0 +1,16 @@
+// Copyright: Ankitects Pty Ltd and contributors
+// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+
+import { getProfileConfigJson, setProfileConfigJson } from "@generated/backend";
+
+export async function getProfileConfig(key: string): Promise<any> {
+    const decoder = new TextDecoder();
+    const json = decoder.decode((await getProfileConfigJson({ val: key })).json);
+    return JSON.parse(json);
+}
+
+export async function setProfileConfig(key: string, value: any): Promise<void> {
+    const encoder = new TextEncoder();
+    const json = JSON.stringify(value);
+    await setProfileConfigJson({ key: key, valueJson: encoder.encode(json) });
+}
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 4d937f824..4e2159d5e 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -446,7 +446,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         decodeIriPaths,
     } from "@generated/backend";
     import { wrapInternal } from "@tslib/wrap";
-
+    import { getProfileConfig } from "@tslib/profile";
     import Shortcut from "$lib/components/Shortcut.svelte";
 
     import { mathjaxConfig } from "$lib/editable/mathjax-element.svelte";
@@ -465,6 +465,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import ButtonGroupItem from "$lib/components/ButtonGroupItem.svelte";
     import PreviewButton from "./PreviewButton.svelte";
     import type { Note } from "@generated/anki/notes_pb";
+    import InlineButtons from "./editor-toolbar/InlineButtons.svelte";
 
     $: isIOImageLoaded = false;
     $: ioImageLoadedStore.set(isIOImageLoaded);
@@ -613,6 +614,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             )
         ).map((field) => field.val);
         const tags = note!.tags;
+        const lastTextColor = (await getProfileConfig("lastTextColor")) ?? "#0000ff";
+        const lastHighlightColor =
+            (await getProfileConfig("lastHighlightColor")) ?? "#0000ff";
 
         saveSession();
         setFields(fieldNames, fieldValues);
@@ -635,8 +639,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             ]),
         );
         focusField(focusTo);
-        // TODO: lastTextColor/lastHighlightColor profile config
-        // setColorButtons(["#0000ff", "#0000ff"]);
+        toolbar.inlineButtons?.setColorButtons([lastTextColor, lastHighlightColor]);
         setTags(tags);
         // TODO: mw.pm.tags_collapsed()
         setTagsCollapsed(false);
diff --git a/ts/routes/editor/editor-toolbar/EditorToolbar.svelte b/ts/routes/editor/editor-toolbar/EditorToolbar.svelte
index 9266792b9..1ea545f8f 100644
--- a/ts/routes/editor/editor-toolbar/EditorToolbar.svelte
+++ b/ts/routes/editor/editor-toolbar/EditorToolbar.svelte
@@ -26,7 +26,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export interface EditorToolbarAPI {
         toolbar: DefaultSlotInterface;
         notetypeButtons: DefaultSlotInterface;
-        inlineButtons: DefaultSlotInterface;
+        inlineButtons: InlineButtonsAPI;
         blockButtons: DefaultSlotInterface;
         templateButtons: DefaultSlotInterface;
         removeFormats: Writable<RemoveFormat[]>;
@@ -62,14 +62,14 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import OptionsButtons from "./OptionsButtons.svelte";
     import RichTextClozeButtons from "./RichTextClozeButtons.svelte";
     import TemplateButtons from "./TemplateButtons.svelte";
-
+    import type { InlineButtonsAPI } from "./InlineButtons.svelte";
     export let size: number;
     export let wrap: boolean;
 
     const toolbar = {} as DefaultSlotInterface;
     const notetypeButtons = {} as DefaultSlotInterface;
     const optionsButtons = {} as DefaultSlotInterface;
-    const inlineButtons = {} as DefaultSlotInterface;
+    const inlineButtons = {} as InlineButtonsAPI;
     const blockButtons = {} as DefaultSlotInterface;
     const templateButtons = {} as DefaultSlotInterface;
     const removeFormats = writable<RemoveFormat[]>([]);
diff --git a/ts/routes/editor/editor-toolbar/HighlightColorButton.svelte b/ts/routes/editor/editor-toolbar/HighlightColorButton.svelte
index 865ec5668..707f76872 100644
--- a/ts/routes/editor/editor-toolbar/HighlightColorButton.svelte
+++ b/ts/routes/editor/editor-toolbar/HighlightColorButton.svelte
@@ -4,7 +4,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
     import * as tr from "@generated/ftl";
-    import { bridgeCommand } from "@tslib/bridgecommand";
     import { removeStyleProperties } from "@tslib/styling";
     import { singleCallback } from "@tslib/typing";
     import { onMount } from "svelte";
@@ -19,6 +18,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import ColorPicker from "./ColorPicker.svelte";
     import { context as editorToolbarContext } from "./EditorToolbar.svelte";
     import WithColorHelper from "./WithColorHelper.svelte";
+    import { setProfileConfig } from "@tslib/profile";
 
     export let color: string;
 
@@ -132,7 +132,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             value={color}
             on:input={(event) => {
                 color = setColor(event);
-                bridgeCommand(`lastHighlightColor:${color}`);
+                setProfileConfig("lastHighlightColor", color);
             }}
             on:change={() => setTextColor()}
         />
diff --git a/ts/routes/editor/editor-toolbar/InlineButtons.svelte b/ts/routes/editor/editor-toolbar/InlineButtons.svelte
index 45dedb1dd..71da1e2f8 100644
--- a/ts/routes/editor/editor-toolbar/InlineButtons.svelte
+++ b/ts/routes/editor/editor-toolbar/InlineButtons.svelte
@@ -2,6 +2,14 @@
 Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
+
+<script context="module" lang="ts">
+    import type { DefaultSlotInterface } from "$lib/sveltelib/dynamic-slotting";
+    export interface InlineButtonsAPI extends DefaultSlotInterface {
+        setColorButtons: (colors: [string, string]) => void;
+    }
+</script>
+
 <script lang="ts">
     import ButtonGroup from "$lib/components/ButtonGroup.svelte";
     import DynamicallySlottable from "$lib/components/DynamicallySlottable.svelte";
@@ -16,16 +24,18 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import TextColorButton from "./TextColorButton.svelte";
     import UnderlineButton from "./UnderlineButton.svelte";
 
-    export let api = {};
-
     let textColor: string = "black";
     let highlightColor: string = "black";
-    export function setColorButtons([textClr, highlightClr]: [string, string]): void {
+
+    function setColorButtons([textClr, highlightClr]: [string, string]): void {
         textColor = textClr;
         highlightColor = highlightClr;
     }
 
-    Object.assign(globalThis, { setColorButtons });
+    export let api = {} as InlineButtonsAPI;
+    Object.assign(api, {
+        setColorButtons,
+    });
 </script>
 
 <DynamicallySlottable slotHost={Item} {api}>
diff --git a/ts/routes/editor/editor-toolbar/TextColorButton.svelte b/ts/routes/editor/editor-toolbar/TextColorButton.svelte
index 165953180..ba27ddb27 100644
--- a/ts/routes/editor/editor-toolbar/TextColorButton.svelte
+++ b/ts/routes/editor/editor-toolbar/TextColorButton.svelte
@@ -4,7 +4,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
     import * as tr from "@generated/ftl";
-    import { bridgeCommand } from "@tslib/bridgecommand";
     import { getPlatformString } from "@tslib/shortcuts";
     import { removeStyleProperties } from "@tslib/styling";
     import { singleCallback } from "@tslib/typing";
@@ -22,6 +21,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import ColorPicker from "./ColorPicker.svelte";
     import { context as editorToolbarContext } from "./EditorToolbar.svelte";
     import WithColorHelper from "./WithColorHelper.svelte";
+    import { setProfileConfig } from "@tslib/profile";
 
     export let color: string;
 
@@ -151,7 +151,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             value={color}
             on:input={(event) => {
                 color = setColor(event);
-                bridgeCommand(`lastTextColor:${color}`);
+                setProfileConfig("lastTextColor", color);
             }}
             on:change={() => {
                 // Delay added to work around intermittent failures on macOS/Qt6.5

From 51fcb865216e8cac9fd6ef60b46fa6660d3b0cd1 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 28 May 2025 09:39:51 +0300
Subject: [PATCH 018/133] Fix color hint not changing

Due to IDs such as `mdi-color-helper` being removed.
---
 ts/vite.config.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ts/vite.config.ts b/ts/vite.config.ts
index 233b6c8e1..c2cd12c8d 100644
--- a/ts/vite.config.ts
+++ b/ts/vite.config.ts
@@ -19,7 +19,10 @@ const configure = (proxy: any, _options: any) => {
 };
 
 const viteConfig = defineViteConfig({
-    plugins: [sveltekit(), svg({})],
+    plugins: [
+        sveltekit(),
+        svg({ svgoOptions: { plugins: [{ name: "cleanupIds", params: { remove: false } }] } }),
+    ],
     build: {
         reportCompressedSize: false,
         // defaults use chrome87, but we need 77 for qt 5.14

From 15cbbeea24ab2f3c7b1ed76a7a72458f388a0cc5 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 28 May 2025 10:35:43 +0300
Subject: [PATCH 019/133] Move setTagsCollapsed()

---
 proto/anki/frontend.proto          |  9 ++++++--
 qt/aqt/editor.py                   | 14 ++----------
 qt/aqt/mediasrv.py                 | 35 ++++++++++++++++++++++--------
 ts/lib/tslib/profile.ts            | 30 ++++++++++++++++++++-----
 ts/routes/editor/NoteEditor.svelte | 14 ++++++------
 ts/routes/editor/base.ts           |  2 +-
 ts/routes/editor/types.ts          |  2 +-
 7 files changed, 69 insertions(+), 37 deletions(-)

diff --git a/proto/anki/frontend.proto b/proto/anki/frontend.proto
index 1f3e7b6b3..461d10528 100644
--- a/proto/anki/frontend.proto
+++ b/proto/anki/frontend.proto
@@ -34,7 +34,12 @@ service FrontendService {
 
   // Profile config
   rpc GetProfileConfigJson(generic.String) returns (generic.Json);
-  rpc SetProfileConfigJson(SetProfileConfigJsonRequest) returns (generic.Empty);
+  rpc SetProfileConfigJson(SetSettingJsonRequest) returns (generic.Empty);
+
+  // Metadata
+  rpc GetMetaJson(generic.String) returns (generic.Json);
+  rpc SetMetaJson(SetSettingJsonRequest) returns (generic.Empty);
+
 }
 
 service BackendFrontendService {}
@@ -49,7 +54,7 @@ message SetSchedulingStatesRequest {
   scheduler.SchedulingStates states = 2;
 }
 
-message SetProfileConfigJsonRequest {
+message SetSettingJsonRequest {
   string key = 1;
   bytes value_json = 2;
 }
diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index b35d11a90..344256059 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -181,13 +181,8 @@ class Editor:
         self.outerLayout.addWidget(self.web, 1)
 
     def setupWeb(self) -> None:
-        if self.editorMode == EditorMode.ADD_CARDS:
-            mode = "add"
-        elif self.editorMode == EditorMode.BROWSER:
-            mode = "browse"
-        else:
-            mode = "review"
-        self.web.load_sveltekit_page(f"editor/?mode={mode}")
+        editor_key = self.mw.pm.editor_key(self.editorMode)
+        self.web.load_sveltekit_page(f"editor/?mode={editor_key}")
 
     def _set_ready(self) -> None:
         lefttopbtns: list[str] = []
@@ -460,11 +455,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
         elif cmd.startswith("saveTags"):
             gui_hooks.editor_did_update_tags(self.note)
 
-        elif cmd.startswith("setTagsCollapsed"):
-            (type, collapsed_string) = cmd.split(":", 1)
-            collapsed = collapsed_string == "true"
-            self.setTagsCollapsed(collapsed)
-
         elif cmd.startswith("editorState"):
             (_, new_state_id, old_state_id) = cmd.split(":", 2)
             self.signal_state_change(
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index 636d88545..8c557bbc7 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -18,6 +18,7 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from errno import EPROTOTYPE
 from http import HTTPStatus
+from typing import Any
 
 import flask
 import flask_cors
@@ -622,23 +623,37 @@ def editor_update_note() -> bytes:
     return output
 
 
-def get_profile_config_json() -> bytes:
-    key = generic_pb2.String()
-    key.ParseFromString(request.data)
-    value = aqt.mw.pm.profile.get(key.val, None)
+def get_setting_json(getter: Callable[[str], Any]) -> bytes:
+    req = generic_pb2.String()
+    req.ParseFromString(request.data)
+    value = getter(req.val)
     output = generic_pb2.Json(json=json.dumps(value).encode()).SerializeToString()
-
     return output
 
 
-def set_profile_config_json() -> bytes:
-    req = frontend_pb2.SetProfileConfigJsonRequest()
+def set_setting_json(setter: Callable[[str, Any], Any]) -> bytes:
+    req = frontend_pb2.SetSettingJsonRequest()
     req.ParseFromString(request.data)
-    aqt.mw.pm.profile[req.key] = json.loads(req.value_json)
-
+    setter(req.key, json.loads(req.value_json))
     return b""
 
 
+def get_profile_config_json() -> bytes:
+    return get_setting_json(aqt.mw.pm.profile.get)
+
+
+def set_profile_config_json() -> bytes:
+    return set_setting_json(aqt.mw.pm.profile.__setitem__)
+
+
+def get_meta_json() -> bytes:
+    return get_setting_json(aqt.mw.pm.meta.get)
+
+
+def set_meta_json() -> bytes:
+    return set_setting_json(aqt.mw.pm.meta.__setitem__)
+
+
 post_handler_list = [
     congrats_info,
     get_deck_configs_for_update,
@@ -657,6 +672,8 @@ post_handler_list = [
     editor_update_note,
     get_profile_config_json,
     set_profile_config_json,
+    get_meta_json,
+    set_meta_json,
 ]
 
 
diff --git a/ts/lib/tslib/profile.ts b/ts/lib/tslib/profile.ts
index 3ec10eff7..b54d4eed8 100644
--- a/ts/lib/tslib/profile.ts
+++ b/ts/lib/tslib/profile.ts
@@ -1,16 +1,36 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-import { getProfileConfigJson, setProfileConfigJson } from "@generated/backend";
+import { getMetaJson, getProfileConfigJson, setMetaJson, setProfileConfigJson } from "@generated/backend";
 
-export async function getProfileConfig(key: string): Promise<any> {
+async function getSettingJson(key: string, backendGetter: (key: string) => Promise<any>): Promise<any> {
     const decoder = new TextDecoder();
-    const json = decoder.decode((await getProfileConfigJson({ val: key })).json);
+    const json = decoder.decode((await backendGetter(key)).json);
     return JSON.parse(json);
 }
 
-export async function setProfileConfig(key: string, value: any): Promise<void> {
+async function setSettingJson(
+    key: string,
+    value: any,
+    backendSetter: (key: string, value: any) => Promise<any>,
+): Promise<void> {
     const encoder = new TextEncoder();
     const json = JSON.stringify(value);
-    await setProfileConfigJson({ key: key, valueJson: encoder.encode(json) });
+    await backendSetter(key, encoder.encode(json));
+}
+
+export async function getProfileConfig(key: string): Promise<any> {
+    return getSettingJson(key, async (k) => await getProfileConfigJson({ val: k }));
+}
+
+export async function setProfileConfig(key: string, value: any): Promise<void> {
+    return await setSettingJson(key, value, async (k, v) => await setProfileConfigJson({ key: k, valueJson: v }));
+}
+
+export async function getMeta(key: string): Promise<any> {
+    return getSettingJson(key, async (k) => await getMetaJson({ val: k }));
+}
+
+export async function setMeta(key: string, value: any): Promise<void> {
+    return await setSettingJson(key, value, async (k, v) => await setMetaJson({ key: k, valueJson: v }));
 }
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 4e2159d5e..dfed151ce 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -222,13 +222,15 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 
     const tagsCollapsed = writable<boolean>();
+    $: tagsCollapsedMetaKey = `${mode}TagsCollapsed`;
+
     export function setTagsCollapsed(collapsed: boolean): void {
         $tagsCollapsed = collapsed;
     }
 
-    function updateTagsCollapsed(collapsed: boolean) {
+    async function updateTagsCollapsed(collapsed: boolean) {
         $tagsCollapsed = collapsed;
-        bridgeCommand(`setTagsCollapsed:${$tagsCollapsed}`);
+        await setMeta(tagsCollapsedMetaKey, collapsed);
     }
 
     let note: Note | null = null;
@@ -446,7 +448,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         decodeIriPaths,
     } from "@generated/backend";
     import { wrapInternal } from "@tslib/wrap";
-    import { getProfileConfig } from "@tslib/profile";
+    import { getProfileConfig, getMeta, setMeta } from "@tslib/profile";
     import Shortcut from "$lib/components/Shortcut.svelte";
 
     import { mathjaxConfig } from "$lib/editable/mathjax-element.svelte";
@@ -465,7 +467,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import ButtonGroupItem from "$lib/components/ButtonGroupItem.svelte";
     import PreviewButton from "./PreviewButton.svelte";
     import type { Note } from "@generated/anki/notes_pb";
-    import InlineButtons from "./editor-toolbar/InlineButtons.svelte";
 
     $: isIOImageLoaded = false;
     $: ioImageLoadedStore.set(isIOImageLoaded);
@@ -641,8 +642,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         focusField(focusTo);
         toolbar.inlineButtons?.setColorButtons([lastTextColor, lastHighlightColor]);
         setTags(tags);
-        // TODO: mw.pm.tags_collapsed()
-        setTagsCollapsed(false);
+        setTagsCollapsed(await getMeta(tagsCollapsedMetaKey));
         // TODO: renderMathjax col config
         setMathjaxEnabled(true);
         // TODO: shrinkEditorImages col config
@@ -759,7 +759,7 @@ components and functionality for general note editing.
 <div class="note-editor" bind:this={noteEditor}>
     <EditorToolbar {size} {wrap} api={toolbar}>
         <svelte:fragment slot="notetypeButtons">
-            {#if mode === "browse"}
+            {#if mode === "browser"}
                 <ButtonGroupItem>
                     <PreviewButton />
                 </ButtonGroupItem>
diff --git a/ts/routes/editor/base.ts b/ts/routes/editor/base.ts
index 884b1c8a3..a1905c5a4 100644
--- a/ts/routes/editor/base.ts
+++ b/ts/routes/editor/base.ts
@@ -54,7 +54,7 @@ export const components = {
 export { editorToolbar } from "./editor-toolbar";
 
 export async function setupEditor(mode: EditorMode) {
-    if (!["add", "browse", "review"].includes(mode)) {
+    if (!["add", "browser", "current"].includes(mode)) {
         alert("unexpected editor type");
         return;
     }
diff --git a/ts/routes/editor/types.ts b/ts/routes/editor/types.ts
index dc1ead9ed..01aa42855 100644
--- a/ts/routes/editor/types.ts
+++ b/ts/routes/editor/types.ts
@@ -28,4 +28,4 @@ export enum EditorState {
     ImageOcclusionFields = 3,
 }
 
-export type EditorMode = "add" | "browse" | "review";
+export type EditorMode = "add" | "browser" | "current";

From 544b5f54d73af5344f41a99389fc01b5832a0d01 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 28 May 2025 11:28:36 +0300
Subject: [PATCH 020/133] Move setMathjaxEnabled()

---
 qt/aqt/editor.py                              |  9 --------
 qt/aqt/mediasrv.py                            | 15 +++++++++++++
 ts/lib/tslib/profile.ts                       | 21 ++++++++++++++++++-
 ts/routes/editor/NoteEditor.svelte            |  5 ++---
 .../editor-toolbar/OptionsButton.svelte       |  4 +++-
 5 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 344256059..9dc56488e 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -1260,14 +1260,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
     def insertMathjaxChemistry(self) -> None:
         self.web.eval("wrap('\\\\(\\\\ce{', '}\\\\)');")
 
-    def toggleMathjax(self) -> None:
-        self.mw.col.set_config(
-            "renderMathjax", not self.mw.col.get_config("renderMathjax", False)
-        )
-        # hackily redraw the page
-        self.setupWeb()
-        self.loadNoteKeepingFocus()
-
     def toggleShrinkImages(self) -> None:
         self.mw.col.set_config(
             "shrinkEditorImages",
@@ -1309,7 +1301,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             mathjaxInline=Editor.insertMathjaxInline,
             mathjaxBlock=Editor.insertMathjaxBlock,
             mathjaxChemistry=Editor.insertMathjaxChemistry,
-            toggleMathjax=Editor.toggleMathjax,
             toggleShrinkImages=Editor.toggleShrinkImages,
             toggleCloseHTMLTags=Editor.toggleCloseHTMLTags,
             addImageForOcclusion=Editor.select_image_and_occlude,
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index 8c557bbc7..eed93f901 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -33,6 +33,7 @@ import aqt.operations
 from anki import frontend_pb2, generic_pb2, hooks
 from anki.collection import OpChanges, OpChangesOnly, Progress, SearchNode
 from anki.decks import UpdateDeckConfigs
+from anki.errors import NotFoundError
 from anki.scheduler.v3 import SchedulingStatesWithContext, SetSchedulingStatesRequest
 from anki.utils import dev_mode
 from aqt.changenotetype import ChangeNotetypeDialog
@@ -654,6 +655,17 @@ def set_meta_json() -> bytes:
     return set_setting_json(aqt.mw.pm.meta.__setitem__)
 
 
+def get_config_json() -> bytes:
+    try:
+        return get_setting_json(aqt.mw.col.conf.get_immutable)
+    except NotFoundError:
+        return generic_pb2.Json(json=b"null").SerializeToString()
+
+
+def set_config_json() -> bytes:
+    return set_setting_json(aqt.mw.col.set_config)
+
+
 post_handler_list = [
     congrats_info,
     get_deck_configs_for_update,
@@ -674,6 +686,7 @@ post_handler_list = [
     set_profile_config_json,
     get_meta_json,
     set_meta_json,
+    get_config_json,
 ]
 
 
@@ -723,6 +736,8 @@ exposed_backend_list = [
     # CardRenderingService
     "encode_iri_paths",
     "decode_iri_paths",
+    # ConfigService
+    "set_config_json",
 ]
 
 
diff --git a/ts/lib/tslib/profile.ts b/ts/lib/tslib/profile.ts
index b54d4eed8..1893d3b82 100644
--- a/ts/lib/tslib/profile.ts
+++ b/ts/lib/tslib/profile.ts
@@ -1,7 +1,14 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-import { getMetaJson, getProfileConfigJson, setMetaJson, setProfileConfigJson } from "@generated/backend";
+import {
+    getConfigJson,
+    getMetaJson,
+    getProfileConfigJson,
+    setConfigJson,
+    setMetaJson,
+    setProfileConfigJson,
+} from "@generated/backend";
 
 async function getSettingJson(key: string, backendGetter: (key: string) => Promise<any>): Promise<any> {
     const decoder = new TextDecoder();
@@ -34,3 +41,15 @@ export async function getMeta(key: string): Promise<any> {
 export async function setMeta(key: string, value: any): Promise<void> {
     return await setSettingJson(key, value, async (k, v) => await setMetaJson({ key: k, valueJson: v }));
 }
+
+export async function getColConfig(key: string): Promise<any> {
+    return await getSettingJson(key, async (k) => await getConfigJson({ val: k }));
+}
+
+export async function setColConfig(key: string, value: any): Promise<void> {
+    return await setSettingJson(
+        key,
+        value,
+        async (k, v) => await setConfigJson({ key: k, valueJson: v, undoable: true }),
+    );
+}
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index dfed151ce..f5e3f62f6 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -448,7 +448,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         decodeIriPaths,
     } from "@generated/backend";
     import { wrapInternal } from "@tslib/wrap";
-    import { getProfileConfig, getMeta, setMeta } from "@tslib/profile";
+    import { getProfileConfig, getMeta, setMeta, getColConfig } from "@tslib/profile";
     import Shortcut from "$lib/components/Shortcut.svelte";
 
     import { mathjaxConfig } from "$lib/editable/mathjax-element.svelte";
@@ -643,8 +643,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         toolbar.inlineButtons?.setColorButtons([lastTextColor, lastHighlightColor]);
         setTags(tags);
         setTagsCollapsed(await getMeta(tagsCollapsedMetaKey));
-        // TODO: renderMathjax col config
-        setMathjaxEnabled(true);
+        setMathjaxEnabled((await getColConfig("renderMathjax")) ?? true);
         // TODO: shrinkEditorImages col config
         setShrinkImages(true);
         // TODO: closeHTMLTags col config
diff --git a/ts/routes/editor/editor-toolbar/OptionsButton.svelte b/ts/routes/editor/editor-toolbar/OptionsButton.svelte
index b3c54ed0f..31ed19328 100644
--- a/ts/routes/editor/editor-toolbar/OptionsButton.svelte
+++ b/ts/routes/editor/editor-toolbar/OptionsButton.svelte
@@ -17,6 +17,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { mathjaxConfig } from "$lib/editable/mathjax-element.svelte";
     import { shrinkImagesByDefault } from "../image-overlay/ImageOverlay.svelte";
     import { closeHTMLTags } from "../plain-text-input/PlainTextInput.svelte";
+    import { setColConfig } from "@tslib/profile";
 
     let showFloating = false;
 
@@ -28,7 +29,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     function toggleShowMathjax(_evt: MouseEvent): void {
         mathjaxConfig.enabled = !mathjaxConfig.enabled;
-        bridgeCommand("toggleMathjax");
+        setColConfig("renderMathjax", mathjaxConfig.enabled);
+        // FIXME: refresh
     }
 
     function toggleCloseHTMLTags(_evt: MouseEvent): void {

From 0198a58a1c3071a27933102aaee515d2e1586065 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 28 May 2025 11:37:46 +0300
Subject: [PATCH 021/133] Fix wrong exception being catched in
 get_config_json()

---
 qt/aqt/mediasrv.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index eed93f901..70b9673a4 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -658,7 +658,7 @@ def set_meta_json() -> bytes:
 def get_config_json() -> bytes:
     try:
         return get_setting_json(aqt.mw.col.conf.get_immutable)
-    except NotFoundError:
+    except KeyError:
         return generic_pb2.Json(json=b"null").SerializeToString()
 
 

From 4ab3970cd6a446f22225d2d1a081fdb509dd47a4 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 28 May 2025 11:38:05 +0300
Subject: [PATCH 022/133] Move setShrinkImages()

---
 qt/aqt/editor.py                                     | 7 -------
 ts/routes/editor/NoteEditor.svelte                   | 3 +--
 ts/routes/editor/editor-toolbar/OptionsButton.svelte | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 9dc56488e..2ffac9ae5 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -1260,12 +1260,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
     def insertMathjaxChemistry(self) -> None:
         self.web.eval("wrap('\\\\(\\\\ce{', '}\\\\)');")
 
-    def toggleShrinkImages(self) -> None:
-        self.mw.col.set_config(
-            "shrinkEditorImages",
-            not self.mw.col.get_config("shrinkEditorImages", True),
-        )
-
     def toggleCloseHTMLTags(self) -> None:
         self.mw.col.set_config(
             "closeHTMLTags",
@@ -1301,7 +1295,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             mathjaxInline=Editor.insertMathjaxInline,
             mathjaxBlock=Editor.insertMathjaxBlock,
             mathjaxChemistry=Editor.insertMathjaxChemistry,
-            toggleShrinkImages=Editor.toggleShrinkImages,
             toggleCloseHTMLTags=Editor.toggleCloseHTMLTags,
             addImageForOcclusion=Editor.select_image_and_occlude,
             addImageForOcclusionFromClipboard=Editor.select_image_from_clipboard_and_occlude,
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index f5e3f62f6..3a282fbc3 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -644,8 +644,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         setTags(tags);
         setTagsCollapsed(await getMeta(tagsCollapsedMetaKey));
         setMathjaxEnabled((await getColConfig("renderMathjax")) ?? true);
-        // TODO: shrinkEditorImages col config
-        setShrinkImages(true);
+        setShrinkImages((await getColConfig("shrinkEditorImages")) ?? true);
         // TODO: closeHTMLTags col config
         setCloseHTMLTags(true);
         if (mode === "add") {
diff --git a/ts/routes/editor/editor-toolbar/OptionsButton.svelte b/ts/routes/editor/editor-toolbar/OptionsButton.svelte
index 31ed19328..42a855688 100644
--- a/ts/routes/editor/editor-toolbar/OptionsButton.svelte
+++ b/ts/routes/editor/editor-toolbar/OptionsButton.svelte
@@ -23,7 +23,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     function toggleShrinkImages(_evt: MouseEvent): void {
         $shrinkImagesByDefault = !$shrinkImagesByDefault;
-        bridgeCommand("toggleShrinkImages");
+        setColConfig("shrinkEditorImages", $shrinkImagesByDefault);
         showFloating = false;
     }
 

From a45add60df940e9bb324d6813c4daa3953ef971b Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 28 May 2025 11:40:45 +0300
Subject: [PATCH 023/133] Move setCloseHTMLTags()

---
 qt/aqt/editor.py                                     | 7 -------
 ts/routes/editor/NoteEditor.svelte                   | 3 +--
 ts/routes/editor/editor-toolbar/OptionsButton.svelte | 3 +--
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 2ffac9ae5..ac5a68a34 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -1260,12 +1260,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
     def insertMathjaxChemistry(self) -> None:
         self.web.eval("wrap('\\\\(\\\\ce{', '}\\\\)');")
 
-    def toggleCloseHTMLTags(self) -> None:
-        self.mw.col.set_config(
-            "closeHTMLTags",
-            not self.mw.col.get_config("closeHTMLTags", True),
-        )
-
     def setTagsCollapsed(self, collapsed: bool) -> None:
         aqt.mw.pm.set_tags_collapsed(self.editorMode, collapsed)
 
@@ -1295,7 +1289,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             mathjaxInline=Editor.insertMathjaxInline,
             mathjaxBlock=Editor.insertMathjaxBlock,
             mathjaxChemistry=Editor.insertMathjaxChemistry,
-            toggleCloseHTMLTags=Editor.toggleCloseHTMLTags,
             addImageForOcclusion=Editor.select_image_and_occlude,
             addImageForOcclusionFromClipboard=Editor.select_image_from_clipboard_and_occlude,
         )
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 3a282fbc3..9385cc277 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -645,8 +645,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         setTagsCollapsed(await getMeta(tagsCollapsedMetaKey));
         setMathjaxEnabled((await getColConfig("renderMathjax")) ?? true);
         setShrinkImages((await getColConfig("shrinkEditorImages")) ?? true);
-        // TODO: closeHTMLTags col config
-        setCloseHTMLTags(true);
+        setCloseHTMLTags((await getColConfig("closeHTMLTags")) ?? true);
         if (mode === "add") {
             setSticky(notetype.fields.map((field) => field.config?.sticky ?? false));
         }
diff --git a/ts/routes/editor/editor-toolbar/OptionsButton.svelte b/ts/routes/editor/editor-toolbar/OptionsButton.svelte
index 42a855688..b2bc3c983 100644
--- a/ts/routes/editor/editor-toolbar/OptionsButton.svelte
+++ b/ts/routes/editor/editor-toolbar/OptionsButton.svelte
@@ -4,7 +4,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
     import * as tr from "@generated/ftl";
-    import { bridgeCommand } from "@tslib/bridgecommand";
 
     import CheckBox from "$lib/components/CheckBox.svelte";
     import DropdownItem from "$lib/components/DropdownItem.svelte";
@@ -35,7 +34,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     function toggleCloseHTMLTags(_evt: MouseEvent): void {
         $closeHTMLTags = !$closeHTMLTags;
-        bridgeCommand("toggleCloseHTMLTags");
+        setColConfig("closeHTMLTags", $closeHTMLTags);
         showFloating = false;
     }
 </script>

From 2ee708f9d9bfebd800d51fa70d65dfb74032db91 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 28 May 2025 11:41:15 +0300
Subject: [PATCH 024/133] Formatting

---
 proto/anki/frontend.proto | 1 -
 1 file changed, 1 deletion(-)

diff --git a/proto/anki/frontend.proto b/proto/anki/frontend.proto
index 461d10528..94c96351f 100644
--- a/proto/anki/frontend.proto
+++ b/proto/anki/frontend.proto
@@ -39,7 +39,6 @@ service FrontendService {
   // Metadata
   rpc GetMetaJson(generic.String) returns (generic.Json);
   rpc SetMetaJson(SetSettingJsonRequest) returns (generic.Empty);
-
 }
 
 service BackendFrontendService {}

From 7dbbbad914a70620f83ed3d6b72dd64f95988e53 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 28 May 2025 11:43:48 +0300
Subject: [PATCH 025/133] Fix lint errors

---
 qt/aqt/mediasrv.py                                   | 3 ++-
 ts/routes/editor/editor-toolbar/EditorToolbar.svelte | 1 +
 ts/routes/editor/editor-toolbar/InlineButtons.svelte | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index 70b9673a4..bf7f4d94a 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -33,7 +33,6 @@ import aqt.operations
 from anki import frontend_pb2, generic_pb2, hooks
 from anki.collection import OpChanges, OpChangesOnly, Progress, SearchNode
 from anki.decks import UpdateDeckConfigs
-from anki.errors import NotFoundError
 from anki.scheduler.v3 import SchedulingStatesWithContext, SetSchedulingStatesRequest
 from anki.utils import dev_mode
 from aqt.changenotetype import ChangeNotetypeDialog
@@ -640,10 +639,12 @@ def set_setting_json(setter: Callable[[str, Any], Any]) -> bytes:
 
 
 def get_profile_config_json() -> bytes:
+    assert aqt.mw.pm.profile is not None
     return get_setting_json(aqt.mw.pm.profile.get)
 
 
 def set_profile_config_json() -> bytes:
+    assert aqt.mw.pm.profile is not None
     return set_setting_json(aqt.mw.pm.profile.__setitem__)
 
 
diff --git a/ts/routes/editor/editor-toolbar/EditorToolbar.svelte b/ts/routes/editor/editor-toolbar/EditorToolbar.svelte
index 1ea545f8f..10d11b28e 100644
--- a/ts/routes/editor/editor-toolbar/EditorToolbar.svelte
+++ b/ts/routes/editor/editor-toolbar/EditorToolbar.svelte
@@ -63,6 +63,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import RichTextClozeButtons from "./RichTextClozeButtons.svelte";
     import TemplateButtons from "./TemplateButtons.svelte";
     import type { InlineButtonsAPI } from "./InlineButtons.svelte";
+
     export let size: number;
     export let wrap: boolean;
 
diff --git a/ts/routes/editor/editor-toolbar/InlineButtons.svelte b/ts/routes/editor/editor-toolbar/InlineButtons.svelte
index 71da1e2f8..586137909 100644
--- a/ts/routes/editor/editor-toolbar/InlineButtons.svelte
+++ b/ts/routes/editor/editor-toolbar/InlineButtons.svelte
@@ -5,6 +5,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 <script context="module" lang="ts">
     import type { DefaultSlotInterface } from "$lib/sveltelib/dynamic-slotting";
+
     export interface InlineButtonsAPI extends DefaultSlotInterface {
         setColorButtons: (colors: [string, string]) => void;
     }

From 79f803c4e7f08e382c97dac8072260cd6ecd699d Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Fri, 30 May 2025 10:52:55 +0300
Subject: [PATCH 026/133] Use orjson helpers

---
 qt/aqt/mediasrv.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index bf7f4d94a..67869f9a9 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -4,7 +4,6 @@
 from __future__ import annotations
 
 import enum
-import json
 import logging
 import mimetypes
 import os
@@ -34,7 +33,7 @@ from anki import frontend_pb2, generic_pb2, hooks
 from anki.collection import OpChanges, OpChangesOnly, Progress, SearchNode
 from anki.decks import UpdateDeckConfigs
 from anki.scheduler.v3 import SchedulingStatesWithContext, SetSchedulingStatesRequest
-from anki.utils import dev_mode
+from anki.utils import dev_mode, from_json_bytes, to_json_bytes
 from aqt.changenotetype import ChangeNotetypeDialog
 from aqt.deckoptions import DeckOptionsDialog
 from aqt.operations import on_op_finished
@@ -627,14 +626,14 @@ def get_setting_json(getter: Callable[[str], Any]) -> bytes:
     req = generic_pb2.String()
     req.ParseFromString(request.data)
     value = getter(req.val)
-    output = generic_pb2.Json(json=json.dumps(value).encode()).SerializeToString()
+    output = generic_pb2.Json(json=to_json_bytes(value)).SerializeToString()
     return output
 
 
 def set_setting_json(setter: Callable[[str, Any], Any]) -> bytes:
     req = frontend_pb2.SetSettingJsonRequest()
     req.ParseFromString(request.data)
-    setter(req.key, json.loads(req.value_json))
+    setter(req.key, from_json_bytes(req.value_json))
     return b""
 
 

From 0966cd455245323302bde1ee3fbf3e036004da2a Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Mon, 2 Jun 2025 02:59:24 +0300
Subject: [PATCH 027/133] Move setupMaskEditor() calls

---
 qt/aqt/editor.py                   | 16 +---------------
 ts/routes/editor/NoteEditor.svelte | 28 +++++++++++++++++++++++++---
 ts/routes/image-occlusion/lib.ts   |  6 +++---
 3 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index ac5a68a34..8653ec384 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -525,21 +525,7 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             gui_hooks.editor_did_load_note(self)
 
         assert self.mw.pm.profile is not None
-        js = f"loadNote({self.note.id}, {self.note.mid});"
-
-        if self.current_notetype_is_image_occlusion():
-            io_field_indices = self.mw.backend.get_image_occlusion_fields(self.note.mid)
-            image_field = self.note.fields[io_field_indices.image]
-            self.last_io_image_path = self.extract_img_path_from_html(image_field)
-
-            if self.editorMode is not EditorMode.ADD_CARDS:
-                io_options = self._create_edit_io_options(note_id=self.note.id)
-                js += " setupMaskEditor(%s);" % json.dumps(io_options)
-            elif orig_note_id := self.orig_note_id:
-                self.orig_note_id = None
-                io_options = self._create_clone_io_options(orig_note_id)
-                js += " setupMaskEditor(%s);" % json.dumps(io_options)
-
+        js = f"loadNote({self.note.id}, {self.note.mid}, {json.dumps(focusTo)}, {json.dumps(self.orig_note_id)});"
         js = gui_hooks.editor_will_load_note(js, self.note, self)
         self.web.evalWithCallback(
             f'require("anki/ui").loaded.then(() => {{ {js} }})', oncallback
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 9385cc277..e287dadf7 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -511,7 +511,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     function setImageField(html) {
         fieldStores[ioFields.image].set(html);
     }
-    globalThis.setImageField = setImageField;
 
     function saveOcclusions(): void {
         if (isImageOcclusion && globalThis.canvas) {
@@ -535,7 +534,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             page.remove();
         }
     }
-    globalThis.resetIOImageLoaded = resetIOImageLoaded;
 
     /** hide occlusions and image */
     function hideFieldInOcclusionType(
@@ -587,7 +585,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         });
     }
 
-    async function loadNote(nid: bigint, notetypeId: bigint, focusTo: number) {
+    async function loadNote(nid: bigint, notetypeId: bigint, focusTo: number, originalNoteId: bigint | null) {
         const notetype = await getNotetype({
             ntid: notetypeId,
         });
@@ -649,6 +647,28 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         if (mode === "add") {
             setSticky(notetype.fields.map((field) => field.config?.sticky ?? false));
         }
+        if(isImageOcclusion) {
+            const imageField = note!.fields[ioFields.image];
+            // TODO: last_io_image_path
+            if(mode !== "add") {
+                setupMaskEditor({
+                    html: imageField,
+                    mode: {
+                        kind: "edit",
+                        noteId: nid,
+                    },
+                });
+            }
+            else if(originalNoteId) {
+                setupMaskEditor({
+                    html: imageField,
+                    mode: {
+                        kind: "add",
+                        clonedNoteId: originalNoteId,
+                    },
+                });
+            }
+        }
         triggerChanges();
     }
 
@@ -701,6 +721,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             triggerChanges,
             setIsImageOcclusion,
             setupMaskEditor,
+            setImageField,
+            resetIOImageLoaded,
             saveOcclusions,
             setSticky,
             ...oldEditorAdapter,
diff --git a/ts/routes/image-occlusion/lib.ts b/ts/routes/image-occlusion/lib.ts
index 8986fa3ff..d8b9e7294 100644
--- a/ts/routes/image-occlusion/lib.ts
+++ b/ts/routes/image-occlusion/lib.ts
@@ -3,18 +3,18 @@
 
 export interface IOAddingMode {
     kind: "add";
-    notetypeId: number;
+    notetypeId: bigint;
     imagePath: string;
 }
 
 export interface IOCloningMode {
     kind: "add";
-    clonedNoteId: number;
+    clonedNoteId: bigint;
 }
 
 export interface IOEditingMode {
     kind: "edit";
-    noteId: number;
+    noteId: bigint;
 }
 
 export type IOMode = IOAddingMode | IOEditingMode | IOCloningMode;

From 8391761bc227f9e0b4b52b0cd5460216ce3b9115 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Mon, 2 Jun 2025 03:41:58 +0300
Subject: [PATCH 028/133] Move showDupes()

---
 qt/aqt/editor.py                      | 18 +-----------------
 ts/routes/editor/DuplicateLink.svelte | 21 +++++++++++++++++++--
 ts/routes/editor/NoteEditor.svelte    | 16 ++++++++++------
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 8653ec384..a0c931970 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -30,7 +30,7 @@ import aqt.operations
 import aqt.sound
 from anki._legacy import deprecated
 from anki.cards import Card
-from anki.collection import Config, SearchNode
+from anki.collection import Config
 from anki.consts import MODEL_CLOZE
 from anki.hooks import runFilter
 from anki.httpclient import HttpClient
@@ -588,21 +588,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             "}); "
         )
 
-    def showDupes(self) -> None:
-        assert self.note is not None
-        aqt.dialogs.open(
-            "Browser",
-            self.mw,
-            search=(
-                SearchNode(
-                    dupe=SearchNode.Dupe(
-                        notetype_id=self.note_type()["id"],
-                        first_field=self.note.fields[0],
-                    )
-                ),
-            ),
-        )
-
     def fieldsAreBlank(self, previousNote: Note | None = None) -> bool:
         if not self.note:
             return True
@@ -1268,7 +1253,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             attach=Editor.onAddMedia,
             record=Editor.onRecSound,
             more=Editor.onAdvanced,
-            dupes=Editor.showDupes,
             paste=Editor.onPaste,
             cutOrCopy=Editor.onCutOrCopy,
             htmlEdit=Editor.onHtmlEdit,
diff --git a/ts/routes/editor/DuplicateLink.svelte b/ts/routes/editor/DuplicateLink.svelte
index 3a83cb2f1..d58083af3 100644
--- a/ts/routes/editor/DuplicateLink.svelte
+++ b/ts/routes/editor/DuplicateLink.svelte
@@ -3,12 +3,29 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
+    import { searchInBrowser } from "@generated/backend";
     import * as tr from "@generated/ftl";
-    import { bridgeCommand } from "@tslib/bridgecommand";
+    import type { Note } from "@generated/anki/notes_pb";
+
+    export let note: Note | null = null;
+
+    function showDupes() {
+        if (note) {
+            searchInBrowser({
+                filter: {
+                    case: "dupe",
+                    value: {
+                        notetypeId: note.notetypeId,
+                        firstField: note.fields[0],
+                    },
+                },
+            });
+        }
+    }
 </script>
 
 <span class="duplicate-link-container">
-    <a class="duplicate-link" href="/#" on:click={() => bridgeCommand("dupes")}>
+    <a class="duplicate-link" href="/#" on:click={showDupes}>
         {tr.editingShowDuplicates()}
     </a>
 </span>
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index e287dadf7..ec83fe969 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -585,7 +585,12 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         });
     }
 
-    async function loadNote(nid: bigint, notetypeId: bigint, focusTo: number, originalNoteId: bigint | null) {
+    async function loadNote(
+        nid: bigint,
+        notetypeId: bigint,
+        focusTo: number,
+        originalNoteId: bigint | null,
+    ) {
         const notetype = await getNotetype({
             ntid: notetypeId,
         });
@@ -647,10 +652,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         if (mode === "add") {
             setSticky(notetype.fields.map((field) => field.config?.sticky ?? false));
         }
-        if(isImageOcclusion) {
+        if (isImageOcclusion) {
             const imageField = note!.fields[ioFields.image];
             // TODO: last_io_image_path
-            if(mode !== "add") {
+            if (mode !== "add") {
                 setupMaskEditor({
                     html: imageField,
                     mode: {
@@ -658,8 +663,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                         noteId: nid,
                     },
                 });
-            }
-            else if(originalNoteId) {
+            } else if (originalNoteId) {
                 setupMaskEditor({
                     html: imageField,
                     mode: {
@@ -863,7 +867,7 @@ components and functionality for general note editing.
                             </svelte:fragment>
                             <FieldState>
                                 {#if cols[index] === "dupe"}
-                                    <DuplicateLink />
+                                    <DuplicateLink {note} />
                                 {/if}
                                 {#if mode === "add"}
                                     <StickyBadge

From 795aef09eea619bc4191ee7580cea2f73fa48a42 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Mon, 2 Jun 2025 03:59:29 +0300
Subject: [PATCH 029/133] Move fields_check()

---
 qt/aqt/editor.py                   | 45 ++----------------------------
 qt/aqt/mediasrv.py                 |  1 +
 ts/routes/editor/NoteEditor.svelte | 27 ++++++++++++++++--
 3 files changed, 27 insertions(+), 46 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index a0c931970..e723cfc35 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -35,10 +35,9 @@ from anki.consts import MODEL_CLOZE
 from anki.hooks import runFilter
 from anki.httpclient import HttpClient
 from anki.models import NotetypeDict, NotetypeId, StockNotetype
-from anki.notes import Note, NoteFieldsCheckResult, NoteId
+from anki.notes import Note, NoteId
 from anki.utils import checksum, is_lin, is_mac, is_win, namedtmp
 from aqt import AnkiQt, gui_hooks
-from aqt.operations import QueryOp
 from aqt.operations.note import update_note
 from aqt.operations.notetype import update_notetype_legacy
 from aqt.qt import *
@@ -407,11 +406,8 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
                     self.mw.progress.timer(
                         100, self.loadNoteKeepingFocus, False, parent=self.widget
                     )
-                else:
-                    self._check_and_update_duplicate_display_async()
             else:
                 gui_hooks.editor_did_fire_typing_timer(self.note)
-                self._check_and_update_duplicate_display_async()
 
         # focused into field?
         elif cmd.startswith("focus"):
@@ -511,7 +507,7 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             return
 
         self.widget.show()
-        note_fields_status = self.note.fields_check()
+        # note_fields_status = self.note.fields_check()
 
         def oncallback(arg: Any) -> None:
             if not self.note:
@@ -519,7 +515,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             self.setupForegroundButton()
             # we currently do this synchronously to ensure we load before the
             # sidebar on browser startup
-            self._update_duplicate_display(note_fields_status)
             if focusTo is not None:
                 self.web.setFocus()
             gui_hooks.editor_did_load_note(self)
@@ -552,42 +547,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
 
     saveNow = call_after_note_saved
 
-    def _check_and_update_duplicate_display_async(self) -> None:
-        note = self.note
-        if not note:
-            return
-
-        def on_done(result: NoteFieldsCheckResult.V) -> None:
-            if self.note != note:
-                return
-            self._update_duplicate_display(result)
-
-        QueryOp(
-            parent=self.parentWindow,
-            op=lambda _: note.fields_check(),
-            success=on_done,
-        ).run_in_background()
-
-    checkValid = _check_and_update_duplicate_display_async
-
-    def _update_duplicate_display(self, result: NoteFieldsCheckResult.V) -> None:
-        assert self.note is not None
-        cols = [""] * len(self.note.fields)
-        cloze_hint = ""
-        if result == NoteFieldsCheckResult.DUPLICATE:
-            cols[0] = "dupe"
-        elif result == NoteFieldsCheckResult.NOTETYPE_NOT_CLOZE:
-            cloze_hint = tr.adding_cloze_outside_cloze_notetype()
-        elif result == NoteFieldsCheckResult.FIELD_NOT_CLOZE:
-            cloze_hint = tr.adding_cloze_outside_cloze_field()
-
-        self.web.eval(
-            'require("anki/ui").loaded.then(() => {'
-            f"setBackgrounds({json.dumps(cols)});\n"
-            f"setClozeHint({json.dumps(cloze_hint)});\n"
-            "}); "
-        )
-
     def fieldsAreBlank(self, previousNote: Note | None = None) -> bool:
         if not self.note:
             return True
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index 3fd1996af..45eac407c 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -703,6 +703,7 @@ exposed_backend_list = [
     "get_field_names",
     "get_note",
     "new_note",
+    "note_fields_check",
     # NotetypesService
     "get_notetype",
     "get_notetype_names",
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index ec83fe969..08fa4c2d5 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -325,7 +325,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         fieldSave.schedule(async () => {
             bridgeCommand(`key:${index}`);
             note!.fields[index] = await transformContentBeforeSave(content);
-            updateCurrentNote();
+            await updateCurrentNote();
+            await updateDuplicateDisplay();
         }, 600);
     }
 
@@ -347,6 +348,23 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         }
     }
 
+    async function updateDuplicateDisplay(): Promise<void> {
+        if (!note) {
+            return;
+        }
+        const result = await noteFieldsCheck(note);
+        const cols = new Array(note.fields.length).fill("");
+        if (result.state === NoteFieldsCheckResponse_State.DUPLICATE) {
+            cols[0] = "dupe";
+        } else if (result.state === NoteFieldsCheckResponse_State.NOTETYPE_NOT_CLOZE) {
+            hint = tr.addingClozeOutsideClozeNotetype();
+        } else if (result.state === NoteFieldsCheckResponse_State.FIELD_NOT_CLOZE) {
+            hint = tr.addingClozeOutsideClozeField();
+        }
+        setBackgrounds(cols);
+        setClozeHint(hint);
+    }
+
     export function focusIfField(x: number, y: number): boolean {
         const elements = document.elementsFromPoint(x, y);
         const first = elements[0].closest(".field-container");
@@ -446,6 +464,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         newNote,
         editorUpdateNote,
         decodeIriPaths,
+        noteFieldsCheck,
     } from "@generated/backend";
     import { wrapInternal } from "@tslib/wrap";
     import { getProfileConfig, getMeta, setMeta, getColConfig } from "@tslib/profile";
@@ -466,7 +485,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import StickyBadge from "./StickyBadge.svelte";
     import ButtonGroupItem from "$lib/components/ButtonGroupItem.svelte";
     import PreviewButton from "./PreviewButton.svelte";
-    import type { Note } from "@generated/anki/notes_pb";
+    import { NoteFieldsCheckResponse_State, type Note } from "@generated/anki/notes_pb";
 
     $: isIOImageLoaded = false;
     $: ioImageLoadedStore.set(isIOImageLoaded);
@@ -673,6 +692,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                 });
             }
         }
+        await updateDuplicateDisplay();
         triggerChanges();
     }
 
@@ -841,7 +861,8 @@ components and functionality for general note editing.
                         note!.fields[index] = await transformContentBeforeSave(
                             get(content),
                         );
-                        updateCurrentNote();
+                        await updateCurrentNote();
+                        await updateDuplicateDisplay();
                     }}
                     on:mouseenter={() => {
                         $hoveredField = fields[index];

From b3aa8e93f340b8a272ce4a623ff5c06c630c0006 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Mon, 2 Jun 2025 04:11:20 +0300
Subject: [PATCH 030/133] Remove legacy routines moved to JS

---
 qt/aqt/editor.py | 217 +----------------------------------------------
 1 file changed, 1 insertion(+), 216 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index e723cfc35..76e959a04 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -28,7 +28,6 @@ import aqt
 import aqt.forms
 import aqt.operations
 import aqt.sound
-from anki._legacy import deprecated
 from anki.cards import Card
 from anki.collection import Config
 from anki.consts import MODEL_CLOZE
@@ -36,27 +35,19 @@ from anki.hooks import runFilter
 from anki.httpclient import HttpClient
 from anki.models import NotetypeDict, NotetypeId, StockNotetype
 from anki.notes import Note, NoteId
-from anki.utils import checksum, is_lin, is_mac, is_win, namedtmp
+from anki.utils import checksum, is_mac, is_win, namedtmp
 from aqt import AnkiQt, gui_hooks
 from aqt.operations.note import update_note
 from aqt.operations.notetype import update_notetype_legacy
 from aqt.qt import *
 from aqt.sound import av_player
 from aqt.utils import (
-    HelpPage,
     KeyboardModifiersPressed,
-    disable_help_button,
     getFile,
     openFolder,
-    openHelp,
-    qtMenuShortcutWorkaround,
-    restoreGeom,
-    saveGeom,
     shortcut,
     show_in_folder,
-    showInfo,
     showWarning,
-    tooltip,
     tr,
 )
 from aqt.webview import AnkiWebView, AnkiWebViewKind
@@ -512,7 +503,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
         def oncallback(arg: Any) -> None:
             if not self.note:
                 return
-            self.setupForegroundButton()
             # we currently do this synchronously to ensure we load before the
             # sidebar on browser startup
             if focusTo is not None:
@@ -1002,197 +992,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
     def _create_edit_io_options(note_id: NoteId) -> dict:
         return {"mode": {"kind": "edit", "noteId": note_id}}
 
-    # Legacy editing routines
-    ######################################################################
-
-    _js_legacy = "this routine has been moved into JS, and will be removed soon"
-
-    @deprecated(info=_js_legacy)
-    def onHtmlEdit(self) -> None:
-        field = self.currentField
-        self.call_after_note_saved(lambda: self._onHtmlEdit(field))
-
-    @deprecated(info=_js_legacy)
-    def _onHtmlEdit(self, field: int) -> None:
-        assert self.note is not None
-        d = QDialog(self.widget, Qt.WindowType.Window)
-        form = aqt.forms.edithtml.Ui_Dialog()
-        form.setupUi(d)
-        restoreGeom(d, "htmlEditor")
-        disable_help_button(d)
-        qconnect(
-            form.buttonBox.helpRequested, lambda: openHelp(HelpPage.EDITING_FEATURES)
-        )
-        font = QFont("Courier")
-        font.setStyleHint(QFont.StyleHint.TypeWriter)
-        form.textEdit.setFont(font)
-        form.textEdit.setPlainText(self.note.fields[field])
-        d.show()
-        form.textEdit.moveCursor(QTextCursor.MoveOperation.End)
-        d.exec()
-        html = form.textEdit.toPlainText()
-        if html.find(">") > -1:
-            # filter html through beautifulsoup so we can strip out things like a
-            # leading </div>
-            html_escaped = self.mw.col.media.escape_media_filenames(html)
-            with warnings.catch_warnings():
-                warnings.simplefilter("ignore", UserWarning)
-                html_escaped = str(BeautifulSoup(html_escaped, "html.parser"))
-                html = self.mw.col.media.escape_media_filenames(
-                    html_escaped, unescape=True
-                )
-        self.note.fields[field] = html
-        if not self.addMode:
-            self._save_current_note()
-        self.loadNote(focusTo=field)
-        saveGeom(d, "htmlEditor")
-
-    @deprecated(info=_js_legacy)
-    def toggleBold(self) -> None:
-        self.web.eval("setFormat('bold');")
-
-    @deprecated(info=_js_legacy)
-    def toggleItalic(self) -> None:
-        self.web.eval("setFormat('italic');")
-
-    @deprecated(info=_js_legacy)
-    def toggleUnderline(self) -> None:
-        self.web.eval("setFormat('underline');")
-
-    @deprecated(info=_js_legacy)
-    def toggleSuper(self) -> None:
-        self.web.eval("setFormat('superscript');")
-
-    @deprecated(info=_js_legacy)
-    def toggleSub(self) -> None:
-        self.web.eval("setFormat('subscript');")
-
-    @deprecated(info=_js_legacy)
-    def removeFormat(self) -> None:
-        self.web.eval("setFormat('removeFormat');")
-
-    @deprecated(info=_js_legacy)
-    def onCloze(self) -> None:
-        self.call_after_note_saved(self._onCloze, keepFocus=True)
-
-    @deprecated(info=_js_legacy)
-    def _onCloze(self) -> None:
-        # check that the model is set up for cloze deletion
-        if self.note_type()["type"] != MODEL_CLOZE:
-            if self.addMode:
-                tooltip(tr.editing_warning_cloze_deletions_will_not_work())
-            else:
-                showInfo(tr.editing_to_make_a_cloze_deletion_on())
-                return
-        # find the highest existing cloze
-        highest = 0
-        assert self.note is not None
-        for _, val in list(self.note.items()):
-            m = re.findall(r"\{\{c(\d+)::", val)
-            if m:
-                highest = max(highest, sorted(int(x) for x in m)[-1])
-        # reuse last?
-        if not KeyboardModifiersPressed().alt:
-            highest += 1
-        # must start at 1
-        highest = max(1, highest)
-        self.web.eval("wrap('{{c%d::', '}}');" % highest)
-
-    def setupForegroundButton(self) -> None:
-        assert self.mw.pm.profile is not None
-        self.fcolour = self.mw.pm.profile.get("lastColour", "#00f")
-
-    # use last colour
-    @deprecated(info=_js_legacy)
-    def onForeground(self) -> None:
-        self._wrapWithColour(self.fcolour)
-
-    # choose new colour
-    @deprecated(info=_js_legacy)
-    def onChangeCol(self) -> None:
-        if is_lin:
-            new = QColorDialog.getColor(
-                QColor(self.fcolour),
-                None,
-                None,
-                QColorDialog.ColorDialogOption.DontUseNativeDialog,
-            )
-        else:
-            new = QColorDialog.getColor(QColor(self.fcolour), None)
-        # native dialog doesn't refocus us for some reason
-        self.parentWindow.activateWindow()
-        if new.isValid():
-            self.fcolour = new.name()
-            self.onColourChanged()
-            self._wrapWithColour(self.fcolour)
-
-    @deprecated(info=_js_legacy)
-    def _updateForegroundButton(self) -> None:
-        pass
-
-    @deprecated(info=_js_legacy)
-    def onColourChanged(self) -> None:
-        self._updateForegroundButton()
-        assert self.mw.pm.profile is not None
-        self.mw.pm.profile["lastColour"] = self.fcolour
-
-    @deprecated(info=_js_legacy)
-    def _wrapWithColour(self, colour: str) -> None:
-        self.web.eval(f"setFormat('forecolor', '{colour}')")
-
-    @deprecated(info=_js_legacy)
-    def onAdvanced(self) -> None:
-        m = QMenu(self.mw)
-
-        for text, handler, shortcut in (
-            (tr.editing_mathjax_inline(), self.insertMathjaxInline, "Ctrl+M, M"),
-            (tr.editing_mathjax_block(), self.insertMathjaxBlock, "Ctrl+M, E"),
-            (
-                tr.editing_mathjax_chemistry(),
-                self.insertMathjaxChemistry,
-                "Ctrl+M, C",
-            ),
-            (tr.editing_latex(), self.insertLatex, "Ctrl+T, T"),
-            (tr.editing_latex_equation(), self.insertLatexEqn, "Ctrl+T, E"),
-            (tr.editing_latex_math_env(), self.insertLatexMathEnv, "Ctrl+T, M"),
-            (tr.editing_edit_html(), self.onHtmlEdit, "Ctrl+Shift+X"),
-        ):
-            a = m.addAction(text)
-            assert a is not None
-            qconnect(a.triggered, handler)
-            a.setShortcut(QKeySequence(shortcut))
-
-        qtMenuShortcutWorkaround(m)
-
-        m.exec(QCursor.pos())
-
-    @deprecated(info=_js_legacy)
-    def insertLatex(self) -> None:
-        self.web.eval("wrap('[latex]', '[/latex]');")
-
-    @deprecated(info=_js_legacy)
-    def insertLatexEqn(self) -> None:
-        self.web.eval("wrap('[$]', '[/$]');")
-
-    @deprecated(info=_js_legacy)
-    def insertLatexMathEnv(self) -> None:
-        self.web.eval("wrap('[$$]', '[/$$]');")
-
-    @deprecated(info=_js_legacy)
-    def insertMathjaxInline(self) -> None:
-        self.web.eval("wrap('\\\\(', '\\\\)');")
-
-    @deprecated(info=_js_legacy)
-    def insertMathjaxBlock(self) -> None:
-        self.web.eval("wrap('\\\\[', '\\\\]');")
-
-    @deprecated(info=_js_legacy)
-    def insertMathjaxChemistry(self) -> None:
-        self.web.eval("wrap('\\\\(\\\\ce{', '}\\\\)');")
-
-    def setTagsCollapsed(self, collapsed: bool) -> None:
-        aqt.mw.pm.set_tags_collapsed(self.editorMode, collapsed)
-
     # Links from HTML
     ######################################################################
 
@@ -1200,24 +999,10 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
         self._links: dict[str, Callable] = dict(
             fields=Editor.onFields,
             cards=Editor.onCardLayout,
-            bold=Editor.toggleBold,
-            italic=Editor.toggleItalic,
-            underline=Editor.toggleUnderline,
-            super=Editor.toggleSuper,
-            sub=Editor.toggleSub,
-            clear=Editor.removeFormat,
-            colour=Editor.onForeground,
-            changeCol=Editor.onChangeCol,
-            cloze=Editor.onCloze,
             attach=Editor.onAddMedia,
             record=Editor.onRecSound,
-            more=Editor.onAdvanced,
             paste=Editor.onPaste,
             cutOrCopy=Editor.onCutOrCopy,
-            htmlEdit=Editor.onHtmlEdit,
-            mathjaxInline=Editor.insertMathjaxInline,
-            mathjaxBlock=Editor.insertMathjaxBlock,
-            mathjaxChemistry=Editor.insertMathjaxChemistry,
             addImageForOcclusion=Editor.select_image_and_occlude,
             addImageForOcclusionFromClipboard=Editor.select_image_from_clipboard_and_occlude,
         )

From 05360e2d195d6689203c4574b298178c5423cbe1 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Mon, 2 Jun 2025 06:04:17 +0300
Subject: [PATCH 031/133] Add a temporary workaround for addcards

---
 qt/aqt/addcards.py                 | 67 +++---------------------------
 qt/aqt/editor.py                   | 56 ++++++++++++++-----------
 qt/aqt/mediasrv.py                 |  1 +
 ts/routes/editor/NoteEditor.svelte | 63 ++++++++++++++++++++++++++--
 4 files changed, 97 insertions(+), 90 deletions(-)

diff --git a/qt/aqt/addcards.py b/qt/aqt/addcards.py
index 86e8a25b1..d3b8f343b 100644
--- a/qt/aqt/addcards.py
+++ b/qt/aqt/addcards.py
@@ -172,63 +172,13 @@ class AddCards(QMainWindow):
             if deck_id := self.col.default_deck_for_notetype(notetype_id):
                 self.deck_chooser.selected_deck_id = deck_id
 
-        # only used for detecting changed sticky fields on close
-        self._last_added_note = None
-
-        # copy fields into new note with the new notetype
-        old_note = self.editor.note
-        new_note = self._new_note()
-        if old_note:
-            old_field_names = list(old_note.keys())
-            new_field_names = list(new_note.keys())
-            copied_field_names = set()
-            for f in new_note.note_type()["flds"]:
-                field_name = f["name"]
-                # copy identical non-empty fields
-                if field_name in old_field_names and old_note[field_name]:
-                    new_note[field_name] = old_note[field_name]
-                    copied_field_names.add(field_name)
-            new_idx = 0
-            for old_idx, old_field_value in enumerate(old_field_names):
-                # skip previously copied identical fields in new note
-                while (
-                    new_idx < len(new_field_names)
-                    and new_field_names[new_idx] in copied_field_names
-                ):
-                    new_idx += 1
-                if new_idx >= len(new_field_names):
-                    break
-                # copy non-empty old fields
-                if (
-                    old_field_value not in copied_field_names
-                    and old_note.fields[old_idx]
-                ):
-                    new_note.fields[new_idx] = old_note.fields[old_idx]
-                    new_idx += 1
-
-            new_note.tags = old_note.tags
-
-        # and update editor state
-        self.editor.note = new_note
-        self.editor.loadNote(
-            focusTo=min(self.editor.last_field_index or 0, len(new_note.fields) - 1)
-        )
-        gui_hooks.addcards_did_change_note_type(
-            self, old_note.note_type(), new_note.note_type()
-        )
+        if notetype_id:
+            self.editor.set_nid(None, mid=notetype_id, focus_to=0)
 
     def _load_new_note(self, sticky_fields_from: Note | None = None) -> None:
-        note = self._new_note()
-        if old_note := sticky_fields_from:
-            flds = note.note_type()["flds"]
-            # copy fields from old note
-            if old_note:
-                for n in range(min(len(note.fields), len(old_note.fields))):
-                    if flds[n]["sticky"]:
-                        note.fields[n] = old_note.fields[n]
-            # and tags
-            note.tags = old_note.tags
-        self.setAndFocusNote(note)
+        self.editor.set_nid(
+            None, mid=self.notetype_chooser.selected_notetype_id, focus_to=0
+        )
 
     def on_operation_did_execute(
         self, changes: OpChanges, handler: object | None
@@ -279,12 +229,7 @@ class AddCards(QMainWindow):
         aqt.dialogs.open("Browser", self.mw, search=(SearchNode(nid=nid),))
 
     def add_current_note(self) -> None:
-        if self.editor.current_notetype_is_image_occlusion():
-            self.editor.update_occlusions_field()
-            self.editor.call_after_note_saved(self._add_current_note)
-            self.editor.reset_image_occlusion()
-        else:
-            self.editor.call_after_note_saved(self._add_current_note)
+        self.editor.web.eval(f"addCurrentNote({self.deck_chooser.selected_deck_id})")
 
     def _add_current_note(self) -> None:
         note = self.editor.note
diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 76e959a04..582271b62 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -28,6 +28,7 @@ import aqt
 import aqt.forms
 import aqt.operations
 import aqt.sound
+from anki._legacy import deprecated
 from anki.cards import Card
 from anki.collection import Config
 from anki.consts import MODEL_CLOZE
@@ -37,7 +38,6 @@ from anki.models import NotetypeDict, NotetypeId, StockNotetype
 from anki.notes import Note, NoteId
 from anki.utils import checksum, is_mac, is_win, namedtmp
 from aqt import AnkiQt, gui_hooks
-from aqt.operations.note import update_note
 from aqt.operations.notetype import update_notetype_legacy
 from aqt.qt import *
 from aqt.sound import av_player
@@ -129,7 +129,7 @@ class Editor:
         self.mw = mw
         self.widget = widget
         self.parentWindow = parentWindow
-        self.note: Note | None = None
+        self.nid: NoteId | None = None
         # legacy argument provided?
         if addMode is not None:
             editor_mode = EditorMode.ADD_CARDS if addMode else EditorMode.EDIT_CURRENT
@@ -380,10 +380,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
     ######################################################################
 
     def onBridgeCmd(self, cmd: str) -> Any:
-        if not self.note:
-            # shutdown
-            return
-
         # focus lost or key/button pressed?
         if cmd.startswith("blur") or cmd.startswith("key"):
             (type, ord_str) = cmd.split(":", 1)
@@ -475,6 +471,18 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
     # Setting/unsetting the current note
     ######################################################################
 
+    def set_nid(
+        self,
+        nid: NoteId | None,
+        mid: int,
+        focus_to: int | None = None,
+    ) -> None:
+        "Make note with ID `nid` the current note."
+        self.nid = nid
+        self.currentField = None
+        self.load_note(mid, focus_to=focus_to)
+
+    @deprecated(replaced_by=set_nid)
     def set_note(
         self,
         note: Note | None,
@@ -482,10 +490,10 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
         focusTo: int | None = None,
     ) -> None:
         "Make NOTE the current note."
-        self.note = note
         self.currentField = None
-        if self.note:
-            self.loadNote(focusTo=focusTo)
+        if note:
+            self.nid = note.id
+            self.load_note(mid=note.mid, focus_to=focusTo)
         elif hide:
             self.widget.hide()
 
@@ -493,43 +501,35 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
         self.loadNote(self.currentField)
 
     @on_editor_ready
-    def loadNote(self, focusTo: int | None = None) -> None:
-        if not self.note:
-            return
+    def load_note(self, mid: int, focus_to: int | None = None) -> None:
 
         self.widget.show()
-        # note_fields_status = self.note.fields_check()
 
         def oncallback(arg: Any) -> None:
-            if not self.note:
+            if not self.nid:
                 return
             # we currently do this synchronously to ensure we load before the
             # sidebar on browser startup
-            if focusTo is not None:
+            if focus_to is not None:
                 self.web.setFocus()
             gui_hooks.editor_did_load_note(self)
 
         assert self.mw.pm.profile is not None
-        js = f"loadNote({self.note.id}, {self.note.mid}, {json.dumps(focusTo)}, {json.dumps(self.orig_note_id)});"
+        js = f"loadNote({json.dumps(self.nid)}, {mid}, {json.dumps(focus_to)}, {json.dumps(self.orig_note_id)});"
         js = gui_hooks.editor_will_load_note(js, self.note, self)
         self.web.evalWithCallback(
             f'require("anki/ui").loaded.then(() => {{ {js} }})', oncallback
         )
 
-    def _save_current_note(self) -> None:
-        "Call after note is updated with data from webview."
-        if not self.note:
-            return
-
-        update_note(parent=self.widget, note=self.note).run_in_background(
-            initiator=self
-        )
+    @deprecated(replaced_by=load_note)
+    def loadNote(self, focusTo: int | None = None) -> None:
+        self.load_note(self.note.mid, focus_to=focusTo)
 
     def call_after_note_saved(
         self, callback: Callable, keepFocus: bool = False
     ) -> None:
         "Save unsaved edits then call callback()."
-        if not self.note:
+        if not self.nid:
             # calling code may not expect the callback to fire immediately
             self.mw.progress.single_shot(10, callback)
             return
@@ -1007,6 +1007,12 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             addImageForOcclusionFromClipboard=Editor.select_image_from_clipboard_and_occlude,
         )
 
+    @property
+    def note(self) -> Note | None:
+        if self.nid is None:
+            return None
+        return self.mw.col.get_note(self.nid)
+
     def note_type(self) -> NotetypeDict:
         assert self.note is not None
         note_type = self.note.note_type()
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index 45eac407c..b263cd1b3 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -704,6 +704,7 @@ exposed_backend_list = [
     "get_note",
     "new_note",
     "note_fields_check",
+    "add_note",
     # NotetypesService
     "get_notetype",
     "get_notetype_names",
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 08fa4c2d5..d7b2e214f 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -365,6 +365,57 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         setClozeHint(hint);
     }
 
+    async function loadNewNote() {
+        await loadNote(0n, notetypeMeta.id, 0, null);
+    }
+
+    async function noteCanBeAdded(): Promise<boolean> {
+        let problem: string | null = null;
+        const result = await noteFieldsCheck(note!);
+        if(result.state === NoteFieldsCheckResponse_State.EMPTY) {
+            if(isImageOcclusion) {
+                problem = tr.notetypesNoOcclusionCreated2();
+            } else {
+                problem = tr.addingTheFirstFieldIsEmpty();
+            }
+        }
+        if(result.state === NoteFieldsCheckResponse_State.MISSING_CLOZE) {
+            // TODO: askUser(tr.addingYouHaveAClozeDeletionNote())
+            return false;
+        }
+        if(result.state === NoteFieldsCheckResponse_State.NOTETYPE_NOT_CLOZE) {
+            problem = tr.addingClozeOutsideClozeNotetype();
+        }
+        if(result.state === NoteFieldsCheckResponse_State.FIELD_NOT_CLOZE) {
+            problem = tr.addingClozeOutsideClozeField();
+        }
+        return problem ? false : true;
+    }
+
+    async function addCurrentNoteInner(deckId: bigint) {
+        if(!await noteCanBeAdded()) {
+            return;
+        }
+        await addNote({
+            note: note!,
+            deckId,
+        });
+        await loadNewNote();
+    }
+
+    export async function addCurrentNote(deckId: bigint) {
+        if(mode !== "add") {
+            return;
+        }
+        if(isImageOcclusion) {
+            saveOcclusions();
+            await addCurrentNoteInner(deckId);
+            resetIOImageLoaded();
+        } else {
+            await addCurrentNoteInner(deckId);
+        }
+    }
+
     export function focusIfField(x: number, y: number): boolean {
         const elements = document.elementsFromPoint(x, y);
         const first = elements[0].closest(".field-container");
@@ -465,6 +516,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         editorUpdateNote,
         decodeIriPaths,
         noteFieldsCheck,
+        addNote,
     } from "@generated/backend";
     import { wrapInternal } from "@tslib/wrap";
     import { getProfileConfig, getMeta, setMeta, getColConfig } from "@tslib/profile";
@@ -605,11 +657,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 
     async function loadNote(
-        nid: bigint,
+        nid: bigint | null,
         notetypeId: bigint,
         focusTo: number,
         originalNoteId: bigint | null,
-    ) {
+    ): Promise<bigint> {
         const notetype = await getNotetype({
             ntid: notetypeId,
         });
@@ -627,7 +679,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         } else {
             setNote(
                 await getNote({
-                    nid,
+                    nid!,
                 }),
             );
         }
@@ -679,7 +731,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                     html: imageField,
                     mode: {
                         kind: "edit",
-                        noteId: nid,
+                        noteId: nid!,
                     },
                 });
             } else if (originalNoteId) {
@@ -694,6 +746,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         }
         await updateDuplicateDisplay();
         triggerChanges();
+
+        return note!.id;
     }
 
     $: signalEditorState(editorState);
@@ -749,6 +803,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             resetIOImageLoaded,
             saveOcclusions,
             setSticky,
+            addCurrentNote,
             ...oldEditorAdapter,
         });
 

From 07d3b6d2b581c91d99d6e22c17c84b92e89685e9 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Mon, 2 Jun 2025 06:14:15 +0300
Subject: [PATCH 032/133] Fix lint errors

---
 qt/aqt/editor.py                               | 17 ++++++++++++-----
 ts/routes/editor/NoteEditor.svelte             | 18 +++++++++---------
 .../[...imagePathOrNoteId]/+page.ts            |  4 ++--
 .../add-or-update-note.svelte.ts               |  4 ++--
 ts/routes/image-occlusion/index.ts             |  4 ++--
 ts/routes/image-occlusion/mask-editor.ts       |  2 +-
 6 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 582271b62..ea18263c4 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -387,20 +387,24 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             if type == "blur":
                 self.currentField = None
                 # run any filters
-                if gui_hooks.editor_did_unfocus_field(False, self.note, ord):
+                if self.note and gui_hooks.editor_did_unfocus_field(
+                    False, self.note, ord
+                ):
                     # something updated the note; update it after a subsequent focus
                     # event has had time to fire
                     self.mw.progress.timer(
                         100, self.loadNoteKeepingFocus, False, parent=self.widget
                     )
             else:
-                gui_hooks.editor_did_fire_typing_timer(self.note)
+                if self.note:
+                    gui_hooks.editor_did_fire_typing_timer(self.note)
 
         # focused into field?
         elif cmd.startswith("focus"):
             (type, num) = cmd.split(":", 1)
             self.last_field_index = self.currentField = int(num)
-            gui_hooks.editor_did_focus_field(self.note, self.currentField)
+            if self.note:
+                gui_hooks.editor_did_focus_field(self.note, self.currentField)
 
         elif cmd.startswith("toggleStickyAll"):
             model = self.note_type()
@@ -436,7 +440,8 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             return new_state
 
         elif cmd.startswith("saveTags"):
-            gui_hooks.editor_did_update_tags(self.note)
+            if self.note:
+                gui_hooks.editor_did_update_tags(self.note)
 
         elif cmd.startswith("editorState"):
             (_, new_state_id, old_state_id) = cmd.split(":", 2)
@@ -516,13 +521,15 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
 
         assert self.mw.pm.profile is not None
         js = f"loadNote({json.dumps(self.nid)}, {mid}, {json.dumps(focus_to)}, {json.dumps(self.orig_note_id)});"
-        js = gui_hooks.editor_will_load_note(js, self.note, self)
+        if self.note:
+            js = gui_hooks.editor_will_load_note(js, self.note, self)
         self.web.evalWithCallback(
             f'require("anki/ui").loaded.then(() => {{ {js} }})', oncallback
         )
 
     @deprecated(replaced_by=load_note)
     def loadNote(self, focusTo: int | None = None) -> None:
+        assert self.note is not None
         self.load_note(self.note.mid, focus_to=focusTo)
 
     def call_after_note_saved(
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index d7b2e214f..104258d2a 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -372,28 +372,28 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     async function noteCanBeAdded(): Promise<boolean> {
         let problem: string | null = null;
         const result = await noteFieldsCheck(note!);
-        if(result.state === NoteFieldsCheckResponse_State.EMPTY) {
-            if(isImageOcclusion) {
+        if (result.state === NoteFieldsCheckResponse_State.EMPTY) {
+            if (isImageOcclusion) {
                 problem = tr.notetypesNoOcclusionCreated2();
             } else {
                 problem = tr.addingTheFirstFieldIsEmpty();
             }
         }
-        if(result.state === NoteFieldsCheckResponse_State.MISSING_CLOZE) {
+        if (result.state === NoteFieldsCheckResponse_State.MISSING_CLOZE) {
             // TODO: askUser(tr.addingYouHaveAClozeDeletionNote())
             return false;
         }
-        if(result.state === NoteFieldsCheckResponse_State.NOTETYPE_NOT_CLOZE) {
+        if (result.state === NoteFieldsCheckResponse_State.NOTETYPE_NOT_CLOZE) {
             problem = tr.addingClozeOutsideClozeNotetype();
         }
-        if(result.state === NoteFieldsCheckResponse_State.FIELD_NOT_CLOZE) {
+        if (result.state === NoteFieldsCheckResponse_State.FIELD_NOT_CLOZE) {
             problem = tr.addingClozeOutsideClozeField();
         }
         return problem ? false : true;
     }
 
     async function addCurrentNoteInner(deckId: bigint) {
-        if(!await noteCanBeAdded()) {
+        if (!(await noteCanBeAdded())) {
             return;
         }
         await addNote({
@@ -404,10 +404,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 
     export async function addCurrentNote(deckId: bigint) {
-        if(mode !== "add") {
+        if (mode !== "add") {
             return;
         }
-        if(isImageOcclusion) {
+        if (isImageOcclusion) {
             saveOcclusions();
             await addCurrentNoteInner(deckId);
             resetIOImageLoaded();
@@ -679,7 +679,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         } else {
             setNote(
                 await getNote({
-                    nid!,
+                    nid: nid!,
                 }),
             );
         }
diff --git a/ts/routes/image-occlusion/[...imagePathOrNoteId]/+page.ts b/ts/routes/image-occlusion/[...imagePathOrNoteId]/+page.ts
index 6f83cc44c..beb0fde55 100644
--- a/ts/routes/image-occlusion/[...imagePathOrNoteId]/+page.ts
+++ b/ts/routes/image-occlusion/[...imagePathOrNoteId]/+page.ts
@@ -15,9 +15,9 @@ async function save(): Promise<void> {
 export const load = (async ({ params }) => {
     let mode: IOMode;
     if (/^\d+/.test(params.imagePathOrNoteId)) {
-        mode = { kind: "edit", noteId: Number(params.imagePathOrNoteId) };
+        mode = { kind: "edit", noteId: BigInt(params.imagePathOrNoteId) };
     } else {
-        mode = { kind: "add", imagePath: params.imagePathOrNoteId, notetypeId: 0 };
+        mode = { kind: "add", imagePath: params.imagePathOrNoteId, notetypeId: 0n };
     }
 
     // for adding note from mobile devices
diff --git a/ts/routes/image-occlusion/add-or-update-note.svelte.ts b/ts/routes/image-occlusion/add-or-update-note.svelte.ts
index ce31eaaaf..98955f7a5 100644
--- a/ts/routes/image-occlusion/add-or-update-note.svelte.ts
+++ b/ts/routes/image-occlusion/add-or-update-note.svelte.ts
@@ -31,7 +31,7 @@ export const addOrUpdateNote = async function(
 
     if (mode.kind == "edit") {
         const result = await updateImageOcclusionNote({
-            noteId: BigInt(mode.noteId),
+            noteId: mode.noteId,
             occlusions: occlusionCloze,
             header,
             backExtra,
@@ -53,7 +53,7 @@ export const addOrUpdateNote = async function(
 };
 
 // show toast message
-const showResult = (noteId: number | null, result: OpChanges, count: number) => {
+const showResult = (noteId: bigint | null, result: OpChanges, count: number) => {
     const props = $state({
         message: "",
         type: "error" as "error" | "success",
diff --git a/ts/routes/image-occlusion/index.ts b/ts/routes/image-occlusion/index.ts
index 59720b1e0..84bf8cd87 100644
--- a/ts/routes/image-occlusion/index.ts
+++ b/ts/routes/image-occlusion/index.ts
@@ -50,10 +50,10 @@ export async function setupImageOcclusion(mode: IOMode, target = document.body):
 
 if (window.location.hash.startsWith("#test-")) {
     const imagePath = window.location.hash.replace("#test-", "");
-    setupImageOcclusion({ kind: "add", imagePath, notetypeId: 0 });
+    setupImageOcclusion({ kind: "add", imagePath, notetypeId: 0n });
 }
 
 if (window.location.hash.startsWith("#testforedit-")) {
-    const noteId = parseInt(window.location.hash.replace("#testforedit-", ""));
+    const noteId = BigInt(window.location.hash.replace("#testforedit-", ""));
     setupImageOcclusion({ kind: "edit", noteId });
 }
diff --git a/ts/routes/image-occlusion/mask-editor.ts b/ts/routes/image-occlusion/mask-editor.ts
index c5492d413..4602f5b19 100644
--- a/ts/routes/image-occlusion/mask-editor.ts
+++ b/ts/routes/image-occlusion/mask-editor.ts
@@ -44,7 +44,7 @@ export const setupMaskEditor = async (
 };
 
 export const setupMaskEditorForEdit = async (
-    noteId: number,
+    noteId: bigint,
     onImageLoaded: (event: ImageLoadedEvent) => void,
 ): Promise<fabric.Canvas> => {
     const clozeNoteResponse = await getImageOcclusionNote({ noteId: BigInt(noteId) });

From 545d3dbfeda298b1822950ee5d9fc6f0b7df430a Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 5 Jun 2025 04:09:10 +0300
Subject: [PATCH 033/133] Move IO/cloze button toggles

---
 qt/aqt/editor.py                     | 22 ----------------------
 ts/lib/sveltelib/dynamic-slotting.ts |  9 +++++++++
 ts/routes/editor/NoteEditor.svelte   | 14 +++++++++++++-
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index ea18263c4..c0f6f1a61 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -1310,25 +1310,3 @@ class EditorWebView(AnkiWebView):
         clipboard = self.editor.mw.app.clipboard()
         assert clipboard is not None
         return clipboard
-
-
-def set_cloze_button(editor: Editor) -> None:
-    action = "show" if editor.note_type()["type"] == MODEL_CLOZE else "hide"
-    editor.web.eval(
-        'require("anki/ui").loaded.then(() =>'
-        f'require("anki/NoteEditor").instances[0].toolbar.toolbar.{action}("cloze")'
-        "); "
-    )
-
-
-def set_image_occlusion_button(editor: Editor) -> None:
-    action = "show" if editor.current_notetype_is_image_occlusion() else "hide"
-    editor.web.eval(
-        'require("anki/ui").loaded.then(() =>'
-        f'require("anki/NoteEditor").instances[0].toolbar.toolbar.{action}("image-occlusion-button")'
-        "); "
-    )
-
-
-gui_hooks.editor_did_load_note.append(set_cloze_button)
-gui_hooks.editor_did_load_note.append(set_image_occlusion_button)
diff --git a/ts/lib/sveltelib/dynamic-slotting.ts b/ts/lib/sveltelib/dynamic-slotting.ts
index db0bb12f9..8cc3b3293 100644
--- a/ts/lib/sveltelib/dynamic-slotting.ts
+++ b/ts/lib/sveltelib/dynamic-slotting.ts
@@ -240,6 +240,7 @@ export interface DefaultSlotInterface extends Record<string, unknown> {
     show(position: Identifier): Promise<boolean>;
     hide(position: Identifier): Promise<boolean>;
     toggle(position: Identifier): Promise<boolean>;
+    setShown(position: Identifier, shown: boolean): Promise<boolean>;
 }
 
 export function defaultInterface<T extends SlotHostProps, U extends Element>({
@@ -287,12 +288,20 @@ export function defaultInterface<T extends SlotHostProps, U extends Element>({
         }, id);
     }
 
+    function setShown(id: Identifier, shown: boolean): Promise<boolean> {
+        return updateProps((props: T): T => {
+            props.detach.set(!shown);
+            return props;
+        }, id);
+    }
+
     return {
         insert,
         append,
         show,
         hide,
         toggle,
+        setShown,
     };
 }
 
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 104258d2a..00a0a13a2 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -503,7 +503,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     import { ImageOcclusionFieldIndexes } from "@generated/anki/image_occlusion_pb";
 
-    import { StockNotetype_OriginalStockKind } from "@generated/anki/notetypes_pb";
+    import {
+        Notetype_Config_Kind,
+        StockNotetype_OriginalStockKind,
+    } from "@generated/anki/notetypes_pb";
     import type { Notetype } from "@generated/anki/notetypes_pb";
     import {
         getFieldNames,
@@ -715,6 +718,15 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         );
         focusField(focusTo);
         toolbar.inlineButtons?.setColorButtons([lastTextColor, lastHighlightColor]);
+        await toolbar.toolbar?.setShown(
+            "image-occlusion-button",
+            notetype.config?.originalStockKind ===
+                StockNotetype_OriginalStockKind.IMAGE_OCCLUSION,
+        );
+        await toolbar.toolbar?.setShown(
+            "cloze",
+            notetype.config?.kind === Notetype_Config_Kind.CLOZE,
+        );
         setTags(tags);
         setTagsCollapsed(await getMeta(tagsCollapsedMetaKey));
         setMathjaxEnabled((await getColConfig("renderMathjax")) ?? true);

From 99396e5811685abdee68dfea8c265d6aa407da37 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Mon, 9 Jun 2025 18:04:57 +0300
Subject: [PATCH 034/133] Start work on copy & paste handling

---
 proto/anki/frontend.proto                     |  17 +
 qt/aqt/editor.py                              |  52 +--
 qt/aqt/mediasrv.py                            |  35 +-
 qt/aqt/utils.py                               |  46 +++
 ts/lib/html-filter/element.ts                 |   8 +-
 ts/lib/html-filter/index.ts                   |   5 +
 ts/routes/editor/NoteEditor.svelte            |   7 +
 .../editor/rich-text-input/data-transfer.ts   | 346 ++++++++++++++++++
 .../rich-text-input/rich-text-resolve.ts      |  22 +-
 9 files changed, 496 insertions(+), 42 deletions(-)
 create mode 100644 ts/routes/editor/rich-text-input/data-transfer.ts

diff --git a/proto/anki/frontend.proto b/proto/anki/frontend.proto
index 94c96351f..1036e6b26 100644
--- a/proto/anki/frontend.proto
+++ b/proto/anki/frontend.proto
@@ -31,6 +31,9 @@ service FrontendService {
 
   // Editor
   rpc editorUpdateNote(notes.UpdateNotesRequest) returns (generic.Empty);
+  rpc convertPastedImage(ConvertPastedImageRequest)
+      returns (ConvertPastedImageResponse);
+  rpc retrieveUrl(generic.String) returns (RetrieveUrlResponse);
 
   // Profile config
   rpc GetProfileConfigJson(generic.String) returns (generic.Json);
@@ -53,6 +56,20 @@ message SetSchedulingStatesRequest {
   scheduler.SchedulingStates states = 2;
 }
 
+message ConvertPastedImageRequest {
+  bytes data = 1;
+  string ext = 2;
+}
+
+message ConvertPastedImageResponse {
+  bytes data = 1;
+}
+
+message RetrieveUrlResponse {
+  string filename = 1;
+  string error = 2;
+}
+
 message SetSettingJsonRequest {
   string key = 1;
   bytes value_json = 2;
diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index c0f6f1a61..6b3cbc3bd 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -31,7 +31,6 @@ import aqt.sound
 from anki._legacy import deprecated
 from anki.cards import Card
 from anki.collection import Config
-from anki.consts import MODEL_CLOZE
 from anki.hooks import runFilter
 from anki.httpclient import HttpClient
 from anki.models import NotetypeDict, NotetypeId, StockNotetype
@@ -173,6 +172,7 @@ class Editor:
     def setupWeb(self) -> None:
         editor_key = self.mw.pm.editor_key(self.editorMode)
         self.web.load_sveltekit_page(f"editor/?mode={editor_key}")
+        self.web.allow_drops = True
 
     def _set_ready(self) -> None:
         lefttopbtns: list[str] = []
@@ -1124,37 +1124,37 @@ class EditorWebView(AnkiWebView):
     def onMiddleClickPaste(self) -> None:
         self._onPaste(QClipboard.Mode.Selection)
 
-    def dragEnterEvent(self, evt: QDragEnterEvent | None) -> None:
-        assert evt is not None
-        evt.accept()
+    # def dragEnterEvent(self, evt: QDragEnterEvent | None) -> None:
+    #     assert evt is not None
+    #     evt.accept()
 
-    def dropEvent(self, evt: QDropEvent | None) -> None:
-        assert evt is not None
-        extended = self._wantsExtendedPaste()
-        mime = evt.mimeData()
-        assert mime is not None
+    # def dropEvent(self, evt: QDropEvent | None) -> None:
+    #     assert evt is not None
+    #     extended = self._wantsExtendedPaste()
+    #     mime = evt.mimeData()
+    #     assert mime is not None
 
-        if (
-            self.editor.state is EditorState.IO_PICKER
-            and (html := self._processUrls(mime, allowed_suffixes=pics))
-            and (path := self.editor.extract_img_path_from_html(html))
-        ):
-            self.editor.setup_mask_editor(path)
-            return
+    #     if (
+    #         self.editor.state is EditorState.IO_PICKER
+    #         and (html := self._processUrls(mime, allowed_suffixes=pics))
+    #         and (path := self.editor.extract_img_path_from_html(html))
+    #     ):
+    #         self.editor.setup_mask_editor(path)
+    #         return
 
-        evt_pos = evt.position()
-        cursor_pos = QPoint(int(evt_pos.x()), int(evt_pos.y()))
+    #     evt_pos = evt.position()
+    #     cursor_pos = QPoint(int(evt_pos.x()), int(evt_pos.y()))
 
-        if evt.source() and mime.hasHtml():
-            # don't filter html from other fields
-            html, internal = mime.html(), True
-        else:
-            html, internal = self._processMime(mime, extended, drop_event=True)
+    #     if evt.source() and mime.hasHtml():
+    #         # don't filter html from other fields
+    #         html, internal = mime.html(), True
+    #     else:
+    #         html, internal = self._processMime(mime, extended, drop_event=True)
 
-        if not html:
-            return
+    #     if not html:
+    #         return
 
-        self.editor.doDrop(html, internal, extended, cursor_pos)
+    #     self.editor.doDrop(html, internal, extended, cursor_pos)
 
     # returns (html, isInternal)
     def _processMime(
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index b263cd1b3..c32e55685 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -16,7 +16,7 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from errno import EPROTOTYPE
 from http import HTTPStatus
-from typing import Any
+from typing import Any, cast
 
 import flask
 import flask_cors
@@ -665,6 +665,34 @@ def set_config_json() -> bytes:
     return set_setting_json(aqt.mw.col.set_config)
 
 
+def convert_pasted_image() -> bytes:
+    req = frontend_pb2.ConvertPastedImageRequest()
+    req.ParseFromString(request.data)
+    image = QImage.fromData(req.data)
+    buffer = QBuffer()
+    buffer.open(QBuffer.OpenModeFlag.ReadWrite)
+    if req.ext == "png":
+        quality = 50
+    else:
+        quality = 80
+    image.save(buffer, req.ext, quality)
+    buffer.reset()
+    data = bytes(cast(bytes, buffer.readAll()))
+    return frontend_pb2.ConvertPastedImageResponse(data=data).SerializeToString()
+
+
+def retrieve_url() -> bytes:
+    from aqt.utils import retrieve_url
+
+    req = generic_pb2.String()
+    req.ParseFromString(request.data)
+    url = req.val
+    filename, error = retrieve_url(url)
+    return frontend_pb2.RetrieveUrlResponse(
+        filename=filename, error=error
+    ).SerializeToString()
+
+
 post_handler_list = [
     congrats_info,
     get_deck_configs_for_update,
@@ -686,6 +714,8 @@ post_handler_list = [
     get_meta_json,
     set_meta_json,
     get_config_json,
+    convert_pasted_image,
+    retrieve_url,
 ]
 
 
@@ -739,6 +769,9 @@ exposed_backend_list = [
     "decode_iri_paths",
     # ConfigService
     "set_config_json",
+    "get_config_bool",
+    # MediaService
+    "add_media_file",
 ]
 
 
diff --git a/qt/aqt/utils.py b/qt/aqt/utils.py
index 6ae8bace8..44e2557c5 100644
--- a/qt/aqt/utils.py
+++ b/qt/aqt/utils.py
@@ -9,16 +9,19 @@ import re
 import shutil
 import subprocess
 import sys
+import urllib
 from collections.abc import Callable, Sequence
 from functools import partial, wraps
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Literal, Union
 
+import requests
 from send2trash import send2trash
 
 import aqt
 from anki._legacy import DeprecatedNamesMixinForModule
 from anki.collection import Collection, HelpPage
+from anki.httpclient import HttpClient
 from anki.lang import TR, tr_legacyglobal  # pylint: disable=unused-import
 from anki.utils import (
     call,
@@ -134,6 +137,49 @@ def openLink(link: str | QUrl) -> None:
         QDesktopServices.openUrl(QUrl(link))
 
 
+def retrieve_url(url: str) -> tuple[str, str]:
+    "Download file into media folder and return local filename or None."
+
+    local = url.lower().startswith("file://")
+    content_type = None
+    error_msg: str | None = None
+    try:
+        if local:
+            # urllib doesn't understand percent-escaped utf8, but requires things like
+            # '#' to be escaped.
+            url = urllib.parse.unquote(url)
+            url = url.replace("%", "%25")
+            url = url.replace("#", "%23")
+            req = urllib.request.Request(
+                url, None, {"User-Agent": "Mozilla/5.0 (compatible; Anki)"}
+            )
+            with urllib.request.urlopen(req) as response:
+                filecontents = response.read()
+        else:
+            with HttpClient() as client:
+                client.timeout = 30
+                with client.get(url) as response:
+                    if response.status_code != 200:
+                        error_msg = tr.qt_misc_unexpected_response_code(
+                            val=response.status_code,
+                        )
+                        return "", error_msg
+                    filecontents = response.content
+                    content_type = response.headers.get("content-type")
+    except (urllib.error.URLError, requests.exceptions.RequestException) as e:
+        error_msg = tr.editing_an_error_occurred_while_opening(val=str(e))
+        return "", error_msg
+    # strip off any query string
+    url = re.sub(r"\?.*?$", "", url)
+    fname = os.path.basename(urllib.parse.unquote(url))
+    if not fname.strip():
+        fname = "paste"
+    if content_type:
+        fname = aqt.mw.col.media.add_extension_based_on_mime(fname, content_type)
+
+    return aqt.mw.col.media.write_data(fname, filecontents), ""
+
+
 class MessageBox(QMessageBox):
     def __init__(
         self,
diff --git a/ts/lib/html-filter/element.ts b/ts/lib/html-filter/element.ts
index b3ee90753..391fd22b8 100644
--- a/ts/lib/html-filter/element.ts
+++ b/ts/lib/html-filter/element.ts
@@ -34,6 +34,12 @@ const allow = (attrs: string[]): FilterMethod => (element: Element): void =>
         element,
     );
 
+function convertToDiv(element: Element): void {
+    const div = document.createElement("div");
+    div.innerHTML = element.innerHTML;
+    element.replaceWith(div);
+}
+
 function unwrapElement(element: Element): void {
     element.replaceWith(...element.childNodes);
 }
@@ -50,7 +56,7 @@ const tagsAllowedBasic: TagsAllowed = {
     BR: allowNone,
     IMG: allow(["SRC", "ALT"]),
     DIV: allowNone,
-    P: allowNone,
+    P: convertToDiv,
     SUB: allowNone,
     SUP: allowNone,
     TITLE: removeElement,
diff --git a/ts/lib/html-filter/index.ts b/ts/lib/html-filter/index.ts
index fee6e607d..83812af0b 100644
--- a/ts/lib/html-filter/index.ts
+++ b/ts/lib/html-filter/index.ts
@@ -33,6 +33,11 @@ const outputHTMLProcessors: Record<FilterMode, (outputHTML: string) => string> =
 };
 
 export function filterHTML(html: string, internal: boolean, extended: boolean): string {
+    // https://anki.tenderapp.com/discussions/ankidesktop/39543-anki-is-replacing-the-character-by-when-i-exit-the-html-edit-mode-ctrlshiftx
+    if (html.indexOf(">") < 0) {
+        return html;
+    }
+
     const template = document.createElement("template");
     template.innerHTML = html;
 
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 00a0a13a2..309642dce 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -861,6 +861,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 </script>
 
+<!-- Block Qt's default drag & drop behavior -->
+<svelte:body
+    on:dragenter|preventDefault
+    on:dragover|preventDefault
+    on:drop|preventDefault
+/>
+
 <!--
 @component
 Serves as a pre-slotted convenience component which combines all the common
diff --git a/ts/routes/editor/rich-text-input/data-transfer.ts b/ts/routes/editor/rich-text-input/data-transfer.ts
new file mode 100644
index 000000000..77447e713
--- /dev/null
+++ b/ts/routes/editor/rich-text-input/data-transfer.ts
@@ -0,0 +1,346 @@
+// Copyright: Ankitects Pty Ltd and contributors
+// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+
+import { ConfigKey_Bool } from "@generated/anki/config_pb";
+import { addMediaFile, convertPastedImage, getConfigBool, retrieveUrl as retrieveUrlBackend } from "@generated/backend";
+import { bridgeCommand } from "@tslib/bridgecommand";
+import { shiftPressed } from "@tslib/keys";
+import { pasteHTML } from "../old-editor-adapter";
+
+type ImageData = string | Uint8Array;
+const imageSuffixes = ["jpg", "jpeg", "png", "gif", "svg", "webp", "ico", "avif"];
+const audioSuffixes = [
+    "3gp",
+    "aac",
+    "avi",
+    "flac",
+    "flv",
+    "m4a",
+    "mkv",
+    "mov",
+    "mp3",
+    "mp4",
+    "mpeg",
+    "mpg",
+    "oga",
+    "ogg",
+    "ogv",
+    "ogx",
+    "opus",
+    "spx",
+    "swf",
+    "wav",
+    "webm",
+];
+const mediaSuffixes = [...imageSuffixes, ...audioSuffixes];
+
+function imageDataToUint8Array(data: ImageData): Uint8Array {
+    return typeof data === "string" ? new TextEncoder().encode(data) : data;
+}
+
+// TODO
+async function _wantsExtendedPaste(event: MouseEvent | KeyboardEvent): Promise<boolean> {
+    let stripHtml = (await getConfigBool({
+        key: ConfigKey_Bool.PASTE_STRIPS_FORMATTING,
+    })).val;
+    if (shiftPressed(event)) {
+        stripHtml = !stripHtml;
+    }
+    return !stripHtml;
+}
+
+function escapeHtml(text: string, quote = true): string {
+    text = text
+        .replaceAll("&", "&amp;")
+        .replaceAll("<", "&lt;")
+        .replaceAll(">", "&gt;");
+    if (quote) {
+        text = text.replaceAll("\"", "&quot;")
+            .replaceAll("'", "&#039;");
+    }
+    return text;
+}
+function getUrls(data: DataTransfer): string[] {
+    const urls = data.getData("text/uri-list").split("\n");
+    return urls[0] ? urls : [];
+}
+
+function getText(data: DataTransfer): string {
+    return data.getData("text/plain") ?? "";
+}
+
+const QIMAGE_FORMATS = [
+    "image/jpeg",
+    "image/png",
+    "image/gif",
+    "image/svg+xml",
+    "image/bmp",
+    "image/x-portable-bitmap",
+    "image/x-portable-graymap",
+    "image/x-portable-pixmap",
+    "image/x-xbitmap",
+    "image/x-xpixmap",
+];
+
+async function getImageData(data: DataTransfer): Promise<ImageData | null> {
+    for (const type of QIMAGE_FORMATS) {
+        const image = data.getData(type);
+        if (image) {
+            return image;
+        } else {
+            for (const file of data.files ?? []) {
+                if (file.type === type) {
+                    return new Uint8Array(await file.arrayBuffer());
+                }
+            }
+        }
+    }
+    return null;
+}
+
+async function retrieveUrl(url: string): Promise<string | null> {
+    const response = await retrieveUrlBackend({ val: url });
+    if (response.error) {
+        alert(response.error);
+        return null;
+    }
+
+    return response.filename;
+}
+
+async function urlToFile(url: string): Promise<string | null> {
+    const lowerUrl = url.toLowerCase();
+    for (const suffix of mediaSuffixes) {
+        if (lowerUrl.endsWith(`.${suffix}`)) {
+            return await retrieveUrl(url);
+        }
+    }
+    // Not a supported type
+    return null;
+}
+
+function filenameToLink(filename: string): string {
+    const filenameParts = filename.split(".");
+    const ext = filenameParts[filenameParts.length - 1].toLowerCase();
+    if (imageSuffixes.includes(ext)) {
+        return `<img src="${encodeURI(filename)}">`;
+    } else {
+        return `[sound:${escapeHtml(filename, false)}]`;
+    }
+}
+
+async function urlToLink(url: string): Promise<string> {
+    const filename = await urlToFile(url);
+    if (!filename) {
+        const escapedTitle = escapeHtml(decodeURI(url));
+        return `<a href="${url}">${escapedTitle}</a>`;
+    }
+    return filenameToLink(filename);
+}
+
+async function checksum(data: string | Uint8Array): Promise<string> {
+    const bytes = imageDataToUint8Array(data);
+    const hashBuffer = await crypto.subtle.digest("SHA-1", bytes);
+    const hashArray = Array.from(new Uint8Array(hashBuffer));
+    const hashHex = hashArray.map(b => b.toString(16).padStart(2, "0")).join("");
+
+    return hashHex;
+}
+
+async function addMediaFromData(filename: string, data: ImageData): Promise<string> {
+    filename = (await addMediaFile({
+        desiredName: filename,
+        data: imageDataToUint8Array(data),
+    })).val;
+    return filenameToLink(filename);
+}
+
+async function pastedImageFilename(data: ImageData, ext: string): Promise<string> {
+    const csum = await checksum(data);
+    return `paste-${csum}.${ext}`;
+}
+
+async function addPastedImage(data: ImageData, ext: string, convert = false): Promise<string> {
+    const filename = await pastedImageFilename(data, ext);
+    if (convert) {
+        data = (await convertPastedImage({ data: imageDataToUint8Array(data), ext })).data;
+    }
+    return await addMediaFromData(filename, data);
+}
+
+async function inlinedImageToFilename(src: string): Promise<string> {
+    const prefix = "data:image/";
+    const suffix = ";base64,";
+    for (let ext of ["jpg", "jpeg", "png", "gif"]) {
+        const fullPrefix = prefix + ext + suffix;
+        if (src.startsWith(fullPrefix)) {
+            const b64data = src.slice(fullPrefix.length).trim();
+            const data = atob(b64data);
+            if (ext === "jpeg") {
+                ext = "jpg";
+            }
+            return await addPastedImage(data, ext);
+        }
+    }
+    return "";
+}
+
+async function inlinedImageToLink(src: string): Promise<string> {
+    const filename = await inlinedImageToFilename(src);
+    if (filename) {
+        return filenameToLink(filename);
+    }
+
+    return "";
+}
+
+function isURL(s: string): boolean {
+    s = s.toLowerCase();
+    const prefixes = ["http://", "https://", "ftp://", "file://"];
+    return prefixes.some(prefix => s.startsWith(prefix));
+}
+
+async function processUrls(data: DataTransfer, _extended: boolean): Promise<string | null> {
+    const urls = getUrls(data);
+    if (urls.length === 0) {
+        return null;
+    }
+    let text = "";
+    for (let url of urls) {
+        // Chrome likes to give us the URL twice with a \n
+        const lines = url.split("\n");
+        url = lines[0];
+        text += await urlToLink(url);
+    }
+
+    return text;
+}
+
+async function processImages(data: DataTransfer, _extended: boolean): Promise<string | null> {
+    const image = await getImageData(data);
+    if (!image) {
+        return null;
+    }
+    let ext: string;
+    if (await getConfigBool({ key: ConfigKey_Bool.PASTE_IMAGES_AS_PNG })) {
+        ext = "png";
+    } else {
+        ext = "jpg";
+    }
+    return await addPastedImage(image, ext, true);
+}
+
+async function processText(data: DataTransfer, extended: boolean): Promise<string | null> {
+    function replaceSpaces(match: string, p1: string): string {
+        return `${p1.replaceAll(" ", "&nbsp;")} `;
+    }
+
+    const text = getText(data);
+    if (text.length === 0) {
+        return null;
+    }
+    const processed: string[] = [];
+    for (const line of text.split("\n")) {
+        for (let token of line.split(/(\S+)/g)) {
+            // Inlined data in base64?
+            if (extended && token.startsWith("data:image/")) {
+                processed.push(await inlinedImageToLink(token));
+            } else if (extended && isURL(token)) {
+                // If the user is pasting an image or sound link, convert it to local, otherwise paste as a hyperlink
+                processed.push(await urlToLink(token));
+            } else {
+                token = escapeHtml(token).replaceAll("\t", " ".repeat(4));
+
+                // If there's more than one consecutive space,
+                // use non-breaking spaces for the second one on
+                token = token.replace(/ ( +)/g, replaceSpaces);
+                processed.push(token);
+            }
+        }
+        processed.push("<br>");
+    }
+    processed.pop();
+    return processed.join("");
+}
+
+async function processClipboardData(data: DataTransfer, extended = false): Promise<string | null> {
+    const html = data.getData("text/html");
+    if (html) {
+        return html;
+    }
+    const urls = getUrls(data);
+    let handlers: ((data: DataTransfer, extended: boolean) => Promise<string | null>)[];
+    if (urls.length > 0 && urls[0].startsWith("file://")) {
+        handlers = [processUrls, processImages, processText];
+    } else {
+        handlers = [processImages, processUrls, processText];
+    }
+
+    for (const handler of handlers) {
+        const html = await handler(data, extended);
+        if (html) {
+            return html;
+        }
+    }
+
+    return null;
+}
+
+async function runPreFilter(html: string, internal = false): Promise<string> {
+    const template = document.createElement("template");
+    template.innerHTML = html;
+    const content = template.content;
+    for (const img of content.querySelectorAll("img")) {
+        let src = img.getAttribute("src");
+        if (!src) {
+            continue;
+        }
+        // In internal pastes, rewrite mediasrv references to relative
+        if (internal) {
+            const match = /http:\/\/127\.0\.0\.1:\d+\/(.*)$/.exec(src);
+            if (match) {
+                src = match[1];
+            }
+        } else {
+            if (isURL(src)) {
+                const filename = await retrieveUrl(src);
+                if (filename) {
+                    src = filename;
+                }
+            } else if (src.startsWith("data:image/")) {
+                src = await inlinedImageToFilename(src);
+            }
+        }
+        img.src = src;
+    }
+    return template.innerHTML;
+}
+
+export async function handlePaste(event: ClipboardEvent) {
+    // bridgeCommand("paste");
+    event.preventDefault();
+    const data = event.clipboardData!;
+    let html = await processClipboardData(data, true);
+    if (html) {
+        html = await runPreFilter(html);
+        pasteHTML(html, false, false);
+    }
+}
+
+export async function handleDrop(event: DragEvent) {
+    event.preventDefault();
+    const data = event.dataTransfer!;
+    let html = await processClipboardData(data, true);
+    if (html) {
+        html = await runPreFilter(html);
+        pasteHTML(html, false, false);
+    }
+}
+
+export async function handleDragover(event: DragEvent) {
+    event.preventDefault();
+}
+
+export function handleCutOrCopy() {
+    bridgeCommand("cutOrCopy");
+}
diff --git a/ts/routes/editor/rich-text-input/rich-text-resolve.ts b/ts/routes/editor/rich-text-input/rich-text-resolve.ts
index 3fde4faae..bb9ffd7da 100644
--- a/ts/routes/editor/rich-text-input/rich-text-resolve.ts
+++ b/ts/routes/editor/rich-text-input/rich-text-resolve.ts
@@ -1,29 +1,23 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-import { bridgeCommand } from "@tslib/bridgecommand";
 import { on } from "@tslib/events";
 import { promiseWithResolver } from "@tslib/promise";
+import { handleCutOrCopy, handleDragover, handleDrop, handlePaste } from "./data-transfer";
 
 function bridgeCopyPasteCommands(input: HTMLElement): { destroy(): void } {
-    function onPaste(event: Event): void {
-        event.preventDefault();
-        bridgeCommand("paste");
-    }
-
-    function onCutOrCopy(): void {
-        bridgeCommand("cutOrCopy");
-    }
-
-    const removePaste = on(input, "paste", onPaste);
-    const removeCopy = on(input, "copy", onCutOrCopy);
-    const removeCut = on(input, "cut", onCutOrCopy);
-
+    const removePaste = on(input, "paste", handlePaste);
+    const removeCopy = on(input, "copy", handleCutOrCopy);
+    const removeCut = on(input, "cut", handleCutOrCopy);
+    const removeDragover = on(input, "dragover", handleDragover);
+    const removeDrop = on(input, "drop", handleDrop);
     return {
         destroy() {
             removePaste();
             removeCopy();
             removeCut();
+            removeDragover();
+            removeDrop();
         },
     };
 }

From 2239bf9b025c7639f6a5316a9b405d187b145882 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 11 Jun 2025 18:47:32 +0300
Subject: [PATCH 035/133] Use wantsExtendedPaste() for drop event

---
 .../editor/rich-text-input/data-transfer.ts   | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/ts/routes/editor/rich-text-input/data-transfer.ts b/ts/routes/editor/rich-text-input/data-transfer.ts
index 77447e713..eca796d0b 100644
--- a/ts/routes/editor/rich-text-input/data-transfer.ts
+++ b/ts/routes/editor/rich-text-input/data-transfer.ts
@@ -38,8 +38,7 @@ function imageDataToUint8Array(data: ImageData): Uint8Array {
     return typeof data === "string" ? new TextEncoder().encode(data) : data;
 }
 
-// TODO
-async function _wantsExtendedPaste(event: MouseEvent | KeyboardEvent): Promise<boolean> {
+async function wantsExtendedPaste(event: MouseEvent | KeyboardEvent): Promise<boolean> {
     let stripHtml = (await getConfigBool({
         key: ConfigKey_Bool.PASTE_STRIPS_FORMATTING,
     })).val;
@@ -200,7 +199,7 @@ function isURL(s: string): boolean {
     return prefixes.some(prefix => s.startsWith(prefix));
 }
 
-async function processUrls(data: DataTransfer, _extended: boolean): Promise<string | null> {
+async function processUrls(data: DataTransfer, _extended: Promise<boolean>): Promise<string | null> {
     const urls = getUrls(data);
     if (urls.length === 0) {
         return null;
@@ -216,7 +215,7 @@ async function processUrls(data: DataTransfer, _extended: boolean): Promise<stri
     return text;
 }
 
-async function processImages(data: DataTransfer, _extended: boolean): Promise<string | null> {
+async function processImages(data: DataTransfer, _extended: Promise<boolean>): Promise<string | null> {
     const image = await getImageData(data);
     if (!image) {
         return null;
@@ -230,7 +229,7 @@ async function processImages(data: DataTransfer, _extended: boolean): Promise<st
     return await addPastedImage(image, ext, true);
 }
 
-async function processText(data: DataTransfer, extended: boolean): Promise<string | null> {
+async function processText(data: DataTransfer, extended: Promise<boolean>): Promise<string | null> {
     function replaceSpaces(match: string, p1: string): string {
         return `${p1.replaceAll(" ", "&nbsp;")} `;
     }
@@ -243,9 +242,9 @@ async function processText(data: DataTransfer, extended: boolean): Promise<strin
     for (const line of text.split("\n")) {
         for (let token of line.split(/(\S+)/g)) {
             // Inlined data in base64?
-            if (extended && token.startsWith("data:image/")) {
+            if ((await extended) && token.startsWith("data:image/")) {
                 processed.push(await inlinedImageToLink(token));
-            } else if (extended && isURL(token)) {
+            } else if ((await extended) && isURL(token)) {
                 // If the user is pasting an image or sound link, convert it to local, otherwise paste as a hyperlink
                 processed.push(await urlToLink(token));
             } else {
@@ -263,13 +262,17 @@ async function processText(data: DataTransfer, extended: boolean): Promise<strin
     return processed.join("");
 }
 
-async function processClipboardData(data: DataTransfer, extended = false): Promise<string | null> {
+async function processDataTransferEvent(
+    event: ClipboardEvent | DragEvent,
+    extended: Promise<boolean>,
+): Promise<string | null> {
+    const data = event instanceof ClipboardEvent ? event.clipboardData! : event.dataTransfer!;
     const html = data.getData("text/html");
     if (html) {
         return html;
     }
     const urls = getUrls(data);
-    let handlers: ((data: DataTransfer, extended: boolean) => Promise<string | null>)[];
+    let handlers: ((data: DataTransfer, extended: Promise<boolean>) => Promise<string | null>)[];
     if (urls.length > 0 && urls[0].startsWith("file://")) {
         handlers = [processUrls, processImages, processText];
     } else {
@@ -319,8 +322,7 @@ async function runPreFilter(html: string, internal = false): Promise<string> {
 export async function handlePaste(event: ClipboardEvent) {
     // bridgeCommand("paste");
     event.preventDefault();
-    const data = event.clipboardData!;
-    let html = await processClipboardData(data, true);
+    let html = await processDataTransferEvent(event, Promise.resolve(true));
     if (html) {
         html = await runPreFilter(html);
         pasteHTML(html, false, false);
@@ -329,8 +331,8 @@ export async function handlePaste(event: ClipboardEvent) {
 
 export async function handleDrop(event: DragEvent) {
     event.preventDefault();
-    const data = event.dataTransfer!;
-    let html = await processClipboardData(data, true);
+    // `extended` is passed as a promise because the event's data is apparently cleared if we wait here before calling getData()
+    let html = await processDataTransferEvent(event, wantsExtendedPaste(event));
     if (html) {
         html = await runPreFilter(html);
         pasteHTML(html, false, false);

From 4567c721adfa73108fed181fc260323be241c693 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 11 Jun 2025 19:02:42 +0300
Subject: [PATCH 036/133] Use wantsExtendedPaste() for paste event

---
 ts/routes/editor/rich-text-input/data-transfer.ts    | 12 +++++++++---
 .../editor/rich-text-input/rich-text-resolve.ts      |  4 +++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ts/routes/editor/rich-text-input/data-transfer.ts b/ts/routes/editor/rich-text-input/data-transfer.ts
index eca796d0b..721fd060f 100644
--- a/ts/routes/editor/rich-text-input/data-transfer.ts
+++ b/ts/routes/editor/rich-text-input/data-transfer.ts
@@ -38,11 +38,13 @@ function imageDataToUint8Array(data: ImageData): Uint8Array {
     return typeof data === "string" ? new TextEncoder().encode(data) : data;
 }
 
-async function wantsExtendedPaste(event: MouseEvent | KeyboardEvent): Promise<boolean> {
+let isShiftPressed = false;
+
+async function wantsExtendedPaste(event: MouseEvent | KeyboardEvent | null = null): Promise<boolean> {
     let stripHtml = (await getConfigBool({
         key: ConfigKey_Bool.PASTE_STRIPS_FORMATTING,
     })).val;
-    if (shiftPressed(event)) {
+    if ((event && shiftPressed(event)) || isShiftPressed) {
         stripHtml = !stripHtml;
     }
     return !stripHtml;
@@ -322,7 +324,7 @@ async function runPreFilter(html: string, internal = false): Promise<string> {
 export async function handlePaste(event: ClipboardEvent) {
     // bridgeCommand("paste");
     event.preventDefault();
-    let html = await processDataTransferEvent(event, Promise.resolve(true));
+    let html = await processDataTransferEvent(event, wantsExtendedPaste());
     if (html) {
         html = await runPreFilter(html);
         pasteHTML(html, false, false);
@@ -343,6 +345,10 @@ export async function handleDragover(event: DragEvent) {
     event.preventDefault();
 }
 
+export async function handleKeydown(event: KeyboardEvent) {
+    isShiftPressed = shiftPressed(event);
+}
+
 export function handleCutOrCopy() {
     bridgeCommand("cutOrCopy");
 }
diff --git a/ts/routes/editor/rich-text-input/rich-text-resolve.ts b/ts/routes/editor/rich-text-input/rich-text-resolve.ts
index bb9ffd7da..8eac252eb 100644
--- a/ts/routes/editor/rich-text-input/rich-text-resolve.ts
+++ b/ts/routes/editor/rich-text-input/rich-text-resolve.ts
@@ -3,7 +3,7 @@
 
 import { on } from "@tslib/events";
 import { promiseWithResolver } from "@tslib/promise";
-import { handleCutOrCopy, handleDragover, handleDrop, handlePaste } from "./data-transfer";
+import { handleCutOrCopy, handleDragover, handleDrop, handleKeydown, handlePaste } from "./data-transfer";
 
 function bridgeCopyPasteCommands(input: HTMLElement): { destroy(): void } {
     const removePaste = on(input, "paste", handlePaste);
@@ -11,6 +11,7 @@ function bridgeCopyPasteCommands(input: HTMLElement): { destroy(): void } {
     const removeCut = on(input, "cut", handleCutOrCopy);
     const removeDragover = on(input, "dragover", handleDragover);
     const removeDrop = on(input, "drop", handleDrop);
+    const removeKeydown = on(input, "keydown", handleKeydown);
     return {
         destroy() {
             removePaste();
@@ -18,6 +19,7 @@ function bridgeCopyPasteCommands(input: HTMLElement): { destroy(): void } {
             removeCut();
             removeDragover();
             removeDrop();
+            removeKeydown();
         },
     };
 }

From 3b42cd0e543cad4a28aacfe51610c2c43f5742d7 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 11 Jun 2025 19:21:31 +0300
Subject: [PATCH 037/133] Handle internal pastes

---
 .../editor/rich-text-input/data-transfer.ts   | 55 +++++++++++--------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/ts/routes/editor/rich-text-input/data-transfer.ts b/ts/routes/editor/rich-text-input/data-transfer.ts
index 721fd060f..1da56b194 100644
--- a/ts/routes/editor/rich-text-input/data-transfer.ts
+++ b/ts/routes/editor/rich-text-input/data-transfer.ts
@@ -3,7 +3,6 @@
 
 import { ConfigKey_Bool } from "@generated/anki/config_pb";
 import { addMediaFile, convertPastedImage, getConfigBool, retrieveUrl as retrieveUrlBackend } from "@generated/backend";
-import { bridgeCommand } from "@tslib/bridgecommand";
 import { shiftPressed } from "@tslib/keys";
 import { pasteHTML } from "../old-editor-adapter";
 
@@ -34,11 +33,8 @@ const audioSuffixes = [
 ];
 const mediaSuffixes = [...imageSuffixes, ...audioSuffixes];
 
-function imageDataToUint8Array(data: ImageData): Uint8Array {
-    return typeof data === "string" ? new TextEncoder().encode(data) : data;
-}
-
 let isShiftPressed = false;
+let lastInternalFieldText = "";
 
 async function wantsExtendedPaste(event: MouseEvent | KeyboardEvent | null = null): Promise<boolean> {
     let stripHtml = (await getConfigBool({
@@ -70,6 +66,10 @@ function getText(data: DataTransfer): string {
     return data.getData("text/plain") ?? "";
 }
 
+function getHtml(data: DataTransfer): string {
+    return data.getData("text/html") ?? "";
+}
+
 const QIMAGE_FORMATS = [
     "image/jpeg",
     "image/png",
@@ -139,6 +139,10 @@ async function urlToLink(url: string): Promise<string> {
     return filenameToLink(filename);
 }
 
+function imageDataToUint8Array(data: ImageData): Uint8Array {
+    return typeof data === "string" ? new TextEncoder().encode(data) : data;
+}
+
 async function checksum(data: string | Uint8Array): Promise<string> {
     const bytes = imageDataToUint8Array(data);
     const hashBuffer = await crypto.subtle.digest("SHA-1", bytes);
@@ -267,11 +271,11 @@ async function processText(data: DataTransfer, extended: Promise<boolean>): Prom
 async function processDataTransferEvent(
     event: ClipboardEvent | DragEvent,
     extended: Promise<boolean>,
-): Promise<string | null> {
+): Promise<{ html: string | null; internal: boolean }> {
     const data = event instanceof ClipboardEvent ? event.clipboardData! : event.dataTransfer!;
-    const html = data.getData("text/html");
+    const html = getHtml(data);
     if (html) {
-        return html;
+        return { html, internal: false };
     }
     const urls = getUrls(data);
     let handlers: ((data: DataTransfer, extended: Promise<boolean>) => Promise<string | null>)[];
@@ -284,11 +288,11 @@ async function processDataTransferEvent(
     for (const handler of handlers) {
         const html = await handler(data, extended);
         if (html) {
-            return html;
+            return { html, internal: true };
         }
     }
 
-    return null;
+    return { html: null, internal: false };
 }
 
 async function runPreFilter(html: string, internal = false): Promise<string> {
@@ -321,24 +325,27 @@ async function runPreFilter(html: string, internal = false): Promise<string> {
     return template.innerHTML;
 }
 
-export async function handlePaste(event: ClipboardEvent) {
-    // bridgeCommand("paste");
+async function handlePasteOrDrop(event: ClipboardEvent | DragEvent) {
     event.preventDefault();
-    let html = await processDataTransferEvent(event, wantsExtendedPaste());
+    let html: string | null = lastInternalFieldText;
+    let internal = !!lastInternalFieldText;
+    const extended = wantsExtendedPaste(event instanceof ClipboardEvent ? null : event);
+    if (!html) {
+        // `extended` is passed as a promise because the event's data is apparently cleared if we wait here before calling getData()
+        ({ html, internal } = await processDataTransferEvent(event, extended));
+    }
     if (html) {
-        html = await runPreFilter(html);
-        pasteHTML(html, false, false);
+        html = await runPreFilter(html, internal);
+        pasteHTML(html, internal, await extended);
     }
 }
 
+export async function handlePaste(event: ClipboardEvent) {
+    await handlePasteOrDrop(event);
+}
+
 export async function handleDrop(event: DragEvent) {
-    event.preventDefault();
-    // `extended` is passed as a promise because the event's data is apparently cleared if we wait here before calling getData()
-    let html = await processDataTransferEvent(event, wantsExtendedPaste(event));
-    if (html) {
-        html = await runPreFilter(html);
-        pasteHTML(html, false, false);
-    }
+    await handlePasteOrDrop(event);
 }
 
 export async function handleDragover(event: DragEvent) {
@@ -349,6 +356,6 @@ export async function handleKeydown(event: KeyboardEvent) {
     isShiftPressed = shiftPressed(event);
 }
 
-export function handleCutOrCopy() {
-    bridgeCommand("cutOrCopy");
+export function handleCutOrCopy(event: ClipboardEvent) {
+    lastInternalFieldText = getHtml(event.clipboardData!);
 }

From 13c2dd201abb3f3c5229268f27f120fbfe7b6076 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 11 Jun 2025 21:16:56 +0300
Subject: [PATCH 038/133] Move more image occlusion calls

---
 proto/anki/frontend.proto                     |   8 ++
 proto/anki/media.proto                        |   7 +
 python/requirements.bundle.txt                |   2 +-
 python/requirements.dev.txt                   |   2 +-
 qt/aqt/editor.py                              | 134 +++---------------
 qt/aqt/mediasrv.py                            |  52 ++++++-
 rslib/src/media/service.rs                    |  23 +++
 ts/routes/editor/NoteEditor.svelte            |  72 ++++++++--
 .../editor/rich-text-input/data-transfer.ts   | 118 +++++++++++----
 9 files changed, 271 insertions(+), 147 deletions(-)

diff --git a/proto/anki/frontend.proto b/proto/anki/frontend.proto
index 1036e6b26..9c8ce622f 100644
--- a/proto/anki/frontend.proto
+++ b/proto/anki/frontend.proto
@@ -34,6 +34,7 @@ service FrontendService {
   rpc convertPastedImage(ConvertPastedImageRequest)
       returns (ConvertPastedImageResponse);
   rpc retrieveUrl(generic.String) returns (RetrieveUrlResponse);
+  rpc openFilePicker(openFilePickerRequest) returns (generic.String);
 
   // Profile config
   rpc GetProfileConfigJson(generic.String) returns (generic.Json);
@@ -74,3 +75,10 @@ message SetSettingJsonRequest {
   string key = 1;
   bytes value_json = 2;
 }
+
+message openFilePickerRequest {
+  string title = 1;
+  string key = 2;
+  string filter_description = 3;
+  repeated string extensions = 4;
+}
diff --git a/proto/anki/media.proto b/proto/anki/media.proto
index 76d42931a..ee2fb5e1d 100644
--- a/proto/anki/media.proto
+++ b/proto/anki/media.proto
@@ -13,11 +13,14 @@ import "anki/notetypes.proto";
 service MediaService {
   rpc CheckMedia(generic.Empty) returns (CheckMediaResponse);
   rpc AddMediaFile(AddMediaFileRequest) returns (generic.String);
+  rpc AddMediaFromPath(AddMediaFromPathRequest) returns (generic.String);
   rpc TrashMediaFiles(TrashMediaFilesRequest) returns (generic.Empty);
   rpc EmptyTrash(generic.Empty) returns (generic.Empty);
   rpc RestoreTrash(generic.Empty) returns (generic.Empty);
   rpc ExtractStaticMediaFiles(notetypes.NotetypeId)
       returns (generic.StringList);
+  rpc ExtractMediaFiles(generic.String) returns (generic.StringList);
+  rpc GetAbsoluteMediaPath(generic.String) returns (generic.String);
 }
 
 // Implicitly includes any of the above methods that are not listed in the
@@ -40,3 +43,7 @@ message AddMediaFileRequest {
   string desired_name = 1;
   bytes data = 2;
 }
+
+message AddMediaFromPathRequest {
+  string path = 1;
+}
diff --git a/python/requirements.bundle.txt b/python/requirements.bundle.txt
index 1540ba074..8aab16467 100644
--- a/python/requirements.bundle.txt
+++ b/python/requirements.bundle.txt
@@ -130,7 +130,7 @@ distro==1.9.0 ; sys_platform != "darwin" and sys_platform != "win32" \
     --hash=sha256:2fa77c6fd8940f116ee1d6b94a2f90b13b5ea8d019b98bc8bafdcabcdd9bdbed \
     --hash=sha256:7bffd925d65168f85027d8da9af6bddab658135b840670a223589bc0c8ef02b2
     # via -r requirements.anki.in
-flask==3.0.3 \
+flask[async]==3.0.3 \
     --hash=sha256:34e815dfaa43340d1d15a5c3a02b8476004037eb4840b34910c6e21679d288f3 \
     --hash=sha256:ceb27b0af3823ea2737928a4d99d125a06175b8512c445cbd9a9ce200ef76842
     # via
diff --git a/python/requirements.dev.txt b/python/requirements.dev.txt
index 671a8ee9b..293ee343d 100644
--- a/python/requirements.dev.txt
+++ b/python/requirements.dev.txt
@@ -176,7 +176,7 @@ exceptiongroup==1.2.2 \
     --hash=sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b \
     --hash=sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc
     # via pytest
-flask==3.0.3 \
+flask[async]==3.0.3 \
     --hash=sha256:34e815dfaa43340d1d15a5c3a02b8476004037eb4840b34910c6e21679d288f3 \
     --hash=sha256:ceb27b0af3823ea2737928a4d99d125a06175b8512c445cbd9a9ce200ef76842
     # via
diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 6b3cbc3bd..8424b3b35 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -873,131 +873,37 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
     def setup_mask_editor(self, image_path: str) -> None:
         try:
             if self.editorMode == EditorMode.ADD_CARDS:
-                self.setup_mask_editor_for_new_note(
-                    image_path=image_path, notetype_id=0
-                )
+                self.setup_mask_editor_for_new_note(image_path=image_path)
             else:
                 assert self.note is not None
-                self.setup_mask_editor_for_existing_note(
-                    note_id=self.note.id, image_path=image_path
-                )
+                self.setup_mask_editor_for_existing_note(image_path=image_path)
         except Exception as e:
             showWarning(str(e))
 
-    def select_image_and_occlude(self) -> None:
-        """Show a file selection screen, then get selected image path."""
-        extension_filter = " ".join(
-            f"*.{extension}" for extension in sorted(itertools.chain(pics))
-        )
-        filter = f"{tr.editing_media()} ({extension_filter})"
-
-        file = getFile(
-            parent=self.widget,
-            title=tr.editing_add_media(),
-            cb=cast(Callable[[Any], None], self.setup_mask_editor),
-            filter=filter,
-            key="media",
-        )
-
-        self.parentWindow.activateWindow()
-
-    def extract_img_path_from_html(self, html: str) -> str | None:
-        assert self.note is not None
-        # with allowed_suffixes=pics, all non-pics will be rendered as <a>s and won't be included here
-        if not (images := self.mw.col.media.files_in_str(self.note.mid, html)):
-            return None
-        image_path = urllib.parse.unquote(images[0])
-        return os.path.join(self.mw.col.media.dir(), image_path)
-
-    def select_image_from_clipboard_and_occlude(self) -> None:
-        """Set up the mask editor for the image in the clipboard."""
-
-        clipboard = self.mw.app.clipboard()
-        assert clipboard is not None
-        mime = clipboard.mimeData()
-        assert mime is not None
-        # try checking for urls first, fallback to image data
-        if (
-            (html := self.web._processUrls(mime, allowed_suffixes=pics))
-            and (path := self.extract_img_path_from_html(html))
-        ) or (mime.hasImage() and (path := self._read_pasted_image(mime))):
-            self.setup_mask_editor(path)
-            self.parentWindow.activateWindow()
-        else:
-            showWarning(tr.editing_no_image_found_on_clipboard())
-            return
-
-    def setup_mask_editor_for_new_note(
-        self,
-        image_path: str,
-        notetype_id: NotetypeId | int = 0,
-    ):
+    def setup_mask_editor_for_new_note(self, image_path: str):
         """Set-up IO mask editor for adding new notes
         Presupposes that active editor notetype is an image occlusion notetype
         Args:
             image_path: Absolute path to image.
-            notetype_id: ID of note type to use. Provided ID must belong to an
-              image occlusion notetype. Set this to 0 to auto-select the first
-              found image occlusion notetype in the user's collection.
         """
-        image_field_html = self._addMedia(image_path)
-        self.last_io_image_path = self.extract_img_path_from_html(image_field_html)
-        io_options = self._create_add_io_options(
-            image_path=image_path,
-            image_field_html=image_field_html,
-            notetype_id=notetype_id,
-        )
-        self._setup_mask_editor(io_options)
-
-    def setup_mask_editor_for_existing_note(
-        self, note_id: NoteId, image_path: str | None = None
-    ):
-        """Set-up IO mask editor for editing existing notes
-        Presupposes that active editor notetype is an image occlusion notetype
-        Args:
-            note_id: ID of note to edit.
-            image_path: (Optional) Absolute path to image that should replace current
-              image
-        """
-        io_options = self._create_edit_io_options(note_id)
-        if image_path:
-            image_field_html = self._addMedia(image_path)
-            self.last_io_image_path = self.extract_img_path_from_html(image_field_html)
-            self.web.eval(f"resetIOImage({json.dumps(image_path)})")
-            self.web.eval(f"setImageField({json.dumps(image_field_html)})")
-        self._setup_mask_editor(io_options)
-
-    def reset_image_occlusion(self) -> None:
-        self.web.eval("resetIOImageLoaded()")
-
-    def update_occlusions_field(self) -> None:
-        self.web.eval("saveOcclusions()")
-
-    def _setup_mask_editor(self, io_options: dict):
         self.web.eval(
             'require("anki/ui").loaded.then(() =>'
-            f"setupMaskEditor({json.dumps(io_options)})"
+            f"setupMaskEditorForNewNote({json.dumps(image_path)})"
             "); "
         )
 
-    @staticmethod
-    def _create_add_io_options(
-        image_path: str, image_field_html: str, notetype_id: NotetypeId | int = 0
-    ) -> dict:
-        return {
-            "mode": {"kind": "add", "imagePath": image_path, "notetypeId": notetype_id},
-            "html": image_field_html,
-        }
-
-    @staticmethod
-    def _create_clone_io_options(orig_note_id: NoteId) -> dict:
-        return {
-            "mode": {"kind": "add", "clonedNoteId": orig_note_id},
-        }
-
-    @staticmethod
-    def _create_edit_io_options(note_id: NoteId) -> dict:
-        return {"mode": {"kind": "edit", "noteId": note_id}}
+    def setup_mask_editor_for_existing_note(self, image_path: str | None = None):
+        """Set-up IO mask editor for editing existing notes
+        Presupposes that active editor notetype is an image occlusion notetype
+        Args:
+            image_path: (Optional) Absolute path to image that should replace current
+              image
+        """
+        self.web.eval(
+            'require("anki/ui").loaded.then(() =>'
+            f"setupMaskEditorForExistingNote({json.dumps(image_path)})"
+            "); "
+        )
 
     # Links from HTML
     ######################################################################
@@ -1010,8 +916,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             record=Editor.onRecSound,
             paste=Editor.onPaste,
             cutOrCopy=Editor.onCutOrCopy,
-            addImageForOcclusion=Editor.select_image_and_occlude,
-            addImageForOcclusionFromClipboard=Editor.select_image_from_clipboard_and_occlude,
         )
 
     @property
@@ -1044,6 +948,12 @@ class EditorWebView(AnkiWebView):
         clip = self.editor.mw.app.clipboard()
         assert clip is not None
         clip.dataChanged.connect(self._on_clipboard_change)
+        self.settings().setAttribute(
+            QWebEngineSettings.WebAttribute.JavascriptCanPaste, True
+        )
+        self.settings().setAttribute(
+            QWebEngineSettings.WebAttribute.JavascriptCanAccessClipboard, True
+        )
         gui_hooks.editor_web_view_did_init(self)
 
     def user_cut_or_copied(self) -> None:
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index c32e55685..8ae7f03d6 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -3,6 +3,7 @@
 
 from __future__ import annotations
 
+import asyncio
 import enum
 import logging
 import mimetypes
@@ -693,6 +694,34 @@ def retrieve_url() -> bytes:
     ).SerializeToString()
 
 
+async def open_file_picker() -> bytes:
+    req = frontend_pb2.openFilePickerRequest()
+    req.ParseFromString(request.data)
+
+    loop = asyncio.get_event_loop()
+    future = loop.create_future()
+
+    def on_main() -> None:
+        from aqt.utils import getFile
+
+        def cb(filename: str | None) -> None:
+            loop.call_soon_threadsafe(future.set_result, filename)
+
+        getFile(
+            parent=aqt.mw.app.activeWindow(),
+            title=req.title,
+            cb=cb,
+            filter=f"{req.filter_description} ({' '.join(f'*.{ext}' for ext in req.extensions)})",
+            key=req.key,
+        )
+
+    aqt.mw.taskman.run_on_main(on_main)
+
+    filename = await future
+
+    return generic_pb2.String(val=filename if filename else "").SerializeToString()
+
+
 post_handler_list = [
     congrats_info,
     get_deck_configs_for_update,
@@ -716,6 +745,7 @@ post_handler_list = [
     get_config_json,
     convert_pasted_image,
     retrieve_url,
+    open_file_picker,
 ]
 
 
@@ -772,6 +802,8 @@ exposed_backend_list = [
     "get_config_bool",
     # MediaService
     "add_media_file",
+    "add_media_from_path",
+    "get_absolute_media_path",
 ]
 
 
@@ -800,7 +832,25 @@ def _extract_collection_post_request(path: str) -> DynamicRequest | NotFound:
         # convert bytes/None into response
         def wrapped() -> Response:
             try:
-                if data := handler():
+                import inspect
+
+                if inspect.iscoroutinefunction(handler):
+                    try:
+                        loop = asyncio.get_event_loop()
+                        if loop.is_running():
+                            import concurrent.futures
+
+                            with concurrent.futures.ThreadPoolExecutor() as executor:
+                                future = executor.submit(asyncio.run, handler())
+                                data = future.result()
+                        else:
+                            data = loop.run_until_complete(handler())
+                    except RuntimeError:
+                        data = asyncio.run(handler())
+                else:
+                    result = handler()
+                    data = result
+                if data:
                     response = flask.make_response(data)
                     response.headers["Content-Type"] = "application/binary"
                 else:
diff --git a/rslib/src/media/service.rs b/rslib/src/media/service.rs
index b2ec99d1d..b69f4014d 100644
--- a/rslib/src/media/service.rs
+++ b/rslib/src/media/service.rs
@@ -1,9 +1,11 @@
 use std::collections::HashSet;
+use std::path::Path;
 
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 use anki_proto::generic;
 use anki_proto::media::AddMediaFileRequest;
+use anki_proto::media::AddMediaFromPathRequest;
 use anki_proto::media::CheckMediaResponse;
 use anki_proto::media::TrashMediaFilesRequest;
 
@@ -12,6 +14,7 @@ use crate::error;
 use crate::error::OrNotFound;
 use crate::notes::service::to_i64s;
 use crate::notetype::NotetypeId;
+use crate::text::extract_media_refs;
 
 impl crate::services::MediaService for Collection {
     fn check_media(&mut self) -> error::Result<CheckMediaResponse> {
@@ -40,6 +43,16 @@ impl crate::services::MediaService for Collection {
             .into())
     }
 
+    fn add_media_from_path(&mut self, input: AddMediaFromPathRequest) -> error::Result<generic::String> {
+        let base_name = Path::new(&input.path).file_name().unwrap_or_default().to_str().unwrap_or_default();
+        let data = std::fs::read(&input.path)?;
+        Ok(self
+            .media()?
+            .add_file(&base_name, &data)?
+            .to_string()
+            .into())
+    }
+
     fn trash_media_files(&mut self, input: TrashMediaFilesRequest) -> error::Result<()> {
         self.media()?.remove_files(&input.fnames)
     }
@@ -66,4 +79,14 @@ impl crate::services::MediaService for Collection {
 
         Ok(files.into_iter().collect::<Vec<_>>().into())
     }
+
+
+    fn extract_media_files(&mut self, html: anki_proto::generic::String) -> error::Result<generic::StringList> {
+        let files = extract_media_refs(&html.val).iter().map(|r| r.fname_decoded.to_string()).collect::<Vec<_>>();
+        Ok(files.into())
+    }
+
+    fn get_absolute_media_path(&mut self, path: anki_proto::generic::String) -> error::Result<generic::String> {
+        Ok(self.media()?.media_folder.join(path.val).to_string_lossy().to_string().into())
+    }
 }
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 309642dce..3086a1095 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -24,7 +24,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 
     import { registerPackage } from "@tslib/runtime-require";
-
+    import { filenameToLink, openFilePickerForImageOcclusion, readImageFromClipboard } from "./rich-text-input/data-transfer";
     import contextProperty from "$lib/sveltelib/context-property";
     import lifecycleHooks from "$lib/sveltelib/lifecycle-hooks";
 
@@ -520,6 +520,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         decodeIriPaths,
         noteFieldsCheck,
         addNote,
+        addMediaFromPath,
     } from "@generated/backend";
     import { wrapInternal } from "@tslib/wrap";
     import { getProfileConfig, getMeta, setMeta, getColConfig } from "@tslib/profile";
@@ -542,22 +543,34 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import PreviewButton from "./PreviewButton.svelte";
     import { NoteFieldsCheckResponse_State, type Note } from "@generated/anki/notes_pb";
 
+
     $: isIOImageLoaded = false;
     $: ioImageLoadedStore.set(isIOImageLoaded);
     let imageOcclusionMode: IOMode | undefined;
     let ioFields = new ImageOcclusionFieldIndexes({});
 
-    function pickIOImage() {
+    async function pickIOImage() {
         imageOcclusionMode = undefined;
-        bridgeCommand("addImageForOcclusion");
+        const filename = await openFilePickerForImageOcclusion();
+        if(!filename) {
+            return;
+        }
+        setupMaskEditor(filename);
     }
 
-    function pickIOImageFromClipboard() {
+    async function pickIOImageFromClipboard() {
         imageOcclusionMode = undefined;
-        bridgeCommand("addImageForOcclusionFromClipboard");
+        await setupMaskEditorFromClipboard();
     }
 
-    async function setupMaskEditor(options: { html: string; mode: IOMode }) {
+    async function setupMaskEditor(filename: string) {
+        if(mode == "add") {
+            setupMaskEditorForNewNote(filename);
+        } else {
+            setupMaskEditorForExistingNote(filename);
+        }
+    }
+    async function setupMaskEditorInner(options: { html: string; mode: IOMode }) {
         imageOcclusionMode = undefined;
         await tick();
         imageOcclusionMode = options.mode;
@@ -582,6 +595,47 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         isIOImageLoaded = true;
     }
 
+    async function setupMaskEditorForNewNote(imagePath: string) {
+        const imageFieldHtml = filenameToLink((await addMediaFromPath({
+            path: imagePath,
+        })).val);
+        setupMaskEditorInner({
+            html: imageFieldHtml,
+            mode: {
+                kind: "add",
+                imagePath: imagePath,
+                notetypeId: notetypeMeta.id,
+            },
+        });
+    }
+
+    async function setupMaskEditorForExistingNote(imagePath: string | null = null) {
+        if (imagePath) {
+            const imageFieldHtml = filenameToLink((await addMediaFromPath({
+                path: imagePath,
+            })).val);
+            resetIOImage(imagePath, () => {});
+            setImageField(imageFieldHtml);
+        }
+        setupMaskEditorInner({
+                html: note!.fields[ioFields.image],
+                mode: {
+                    kind: "edit",
+                    noteId: note!.id,
+                },
+            });
+    }
+
+    async function setupMaskEditorFromClipboard() {
+        const path = await readImageFromClipboard();
+        console.log("setupMaskEditorFromClipboard path", path);
+        if(path) {
+            setupMaskEditor(path);
+        } else {
+            alert(tr.editingNoImageFoundOnClipboard());
+        }
+    }
+
     function setImageField(html) {
         fieldStores[ioFields.image].set(html);
     }
@@ -739,7 +793,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             const imageField = note!.fields[ioFields.image];
             // TODO: last_io_image_path
             if (mode !== "add") {
-                setupMaskEditor({
+                setupMaskEditorInner({
                     html: imageField,
                     mode: {
                         kind: "edit",
@@ -747,7 +801,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                     },
                 });
             } else if (originalNoteId) {
-                setupMaskEditor({
+                setupMaskEditorInner({
                     html: imageField,
                     mode: {
                         kind: "add",
@@ -811,6 +865,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             triggerChanges,
             setIsImageOcclusion,
             setupMaskEditor,
+            setupMaskEditorForNewNote,
+            setupMaskEditorForExistingNote,
             setImageField,
             resetIOImageLoaded,
             saveOcclusions,
diff --git a/ts/routes/editor/rich-text-input/data-transfer.ts b/ts/routes/editor/rich-text-input/data-transfer.ts
index 1da56b194..114df131c 100644
--- a/ts/routes/editor/rich-text-input/data-transfer.ts
+++ b/ts/routes/editor/rich-text-input/data-transfer.ts
@@ -2,7 +2,16 @@
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 import { ConfigKey_Bool } from "@generated/anki/config_pb";
-import { addMediaFile, convertPastedImage, getConfigBool, retrieveUrl as retrieveUrlBackend } from "@generated/backend";
+import {
+    addMediaFile,
+    convertPastedImage,
+    extractMediaFiles,
+    getAbsoluteMediaPath,
+    getConfigBool,
+    openFilePicker,
+    retrieveUrl as retrieveUrlBackend,
+} from "@generated/backend";
+import * as tr from "@generated/ftl";
 import { shiftPressed } from "@tslib/keys";
 import { pasteHTML } from "../old-editor-adapter";
 
@@ -57,8 +66,20 @@ function escapeHtml(text: string, quote = true): string {
     }
     return text;
 }
-function getUrls(data: DataTransfer): string[] {
-    const urls = data.getData("text/uri-list").split("\n");
+
+async function getUrls(data: DataTransfer | ClipboardItem): Promise<string[]> {
+    const mime = "text/uri-list";
+    let dataString: string;
+    if (data instanceof DataTransfer) {
+        dataString = data.getData(mime);
+    } else {
+        try {
+            dataString = await (await data.getType(mime)).text();
+        } catch (e) {
+            return [];
+        }
+    }
+    const urls = dataString.split("\n");
     return urls[0] ? urls : [];
 }
 
@@ -83,17 +104,23 @@ const QIMAGE_FORMATS = [
     "image/x-xpixmap",
 ];
 
-async function getImageData(data: DataTransfer): Promise<ImageData | null> {
+async function getImageData(data: DataTransfer | ClipboardItem): Promise<ImageData | null> {
     for (const type of QIMAGE_FORMATS) {
-        const image = data.getData(type);
-        if (image) {
-            return image;
-        } else {
-            for (const file of data.files ?? []) {
-                if (file.type === type) {
-                    return new Uint8Array(await file.arrayBuffer());
+        try {
+            const image = data instanceof DataTransfer
+                ? data.getData(type)
+                : new Uint8Array(await (await data.getType(type)).arrayBuffer());
+            if (image) {
+                return image;
+            } else if (data instanceof DataTransfer) {
+                for (const file of data.files ?? []) {
+                    if (file.type === type) {
+                        return new Uint8Array(await file.arrayBuffer());
+                    }
                 }
             }
+        } catch (e) {
+            continue;
         }
     }
     return null;
@@ -120,7 +147,7 @@ async function urlToFile(url: string): Promise<string | null> {
     return null;
 }
 
-function filenameToLink(filename: string): string {
+export function filenameToLink(filename: string): string {
     const filenameParts = filename.split(".");
     const ext = filenameParts[filenameParts.length - 1].toLowerCase();
     if (imageSuffixes.includes(ext)) {
@@ -157,7 +184,7 @@ async function addMediaFromData(filename: string, data: ImageData): Promise<stri
         desiredName: filename,
         data: imageDataToUint8Array(data),
     })).val;
-    return filenameToLink(filename);
+    return filename;
 }
 
 async function pastedImageFilename(data: ImageData, ext: string): Promise<string> {
@@ -184,7 +211,7 @@ async function inlinedImageToFilename(src: string): Promise<string> {
             if (ext === "jpeg") {
                 ext = "jpg";
             }
-            return await addPastedImage(data, ext);
+            return filenameToLink(await addPastedImage(data, ext));
         }
     }
     return "";
@@ -205,8 +232,8 @@ function isURL(s: string): boolean {
     return prefixes.some(prefix => s.startsWith(prefix));
 }
 
-async function processUrls(data: DataTransfer, _extended: Promise<boolean>): Promise<string | null> {
-    const urls = getUrls(data);
+async function processUrls(data: DataTransfer | ClipboardItem, _extended: Promise<boolean>): Promise<string | null> {
+    const urls = await getUrls(data);
     if (urls.length === 0) {
         return null;
     }
@@ -221,18 +248,20 @@ async function processUrls(data: DataTransfer, _extended: Promise<boolean>): Pro
     return text;
 }
 
+async function getPreferredImageExtension(): Promise<string> {
+    if (await getConfigBool({ key: ConfigKey_Bool.PASTE_IMAGES_AS_PNG })) {
+        return "png";
+    }
+    return "jpg";
+}
+
 async function processImages(data: DataTransfer, _extended: Promise<boolean>): Promise<string | null> {
     const image = await getImageData(data);
     if (!image) {
         return null;
     }
-    let ext: string;
-    if (await getConfigBool({ key: ConfigKey_Bool.PASTE_IMAGES_AS_PNG })) {
-        ext = "png";
-    } else {
-        ext = "jpg";
-    }
-    return await addPastedImage(image, ext, true);
+    const ext = await getPreferredImageExtension();
+    return filenameToLink(await addPastedImage(image, ext, true));
 }
 
 async function processText(data: DataTransfer, extended: Promise<boolean>): Promise<string | null> {
@@ -277,7 +306,7 @@ async function processDataTransferEvent(
     if (html) {
         return { html, internal: false };
     }
-    const urls = getUrls(data);
+    const urls = await getUrls(data);
     let handlers: ((data: DataTransfer, extended: Promise<boolean>) => Promise<string | null>)[];
     if (urls.length > 0 && urls[0].startsWith("file://")) {
         handlers = [processUrls, processImages, processText];
@@ -359,3 +388,44 @@ export async function handleKeydown(event: KeyboardEvent) {
 export function handleCutOrCopy(event: ClipboardEvent) {
     lastInternalFieldText = getHtml(event.clipboardData!);
 }
+
+const FILE_PICKER_MEDIA_KEY = "media";
+
+export async function openFilePickerForImageOcclusion(): Promise<string> {
+    const filename = (await openFilePicker({
+        title: tr.editingAddMedia(),
+        filterDescription: tr.editingMedia(),
+        extensions: imageSuffixes,
+        key: FILE_PICKER_MEDIA_KEY,
+    })).val;
+    return filename;
+}
+
+export async function extractImagePathFromHtml(html: string): Promise<string | null> {
+    const images = (await extractMediaFiles({ val: html })).vals;
+    if (images.length === 0) {
+        return null;
+    }
+    return images[0];
+}
+
+export async function readImageFromClipboard(): Promise<string | null> {
+    // TODO: check browser support and available formats
+    for (const item of await navigator.clipboard.read()) {
+        let path: string | null = null;
+        const html = await processUrls(item, Promise.resolve(false));
+        if (html) {
+            path = await extractImagePathFromHtml(html);
+        }
+        if (!path) {
+            const image = await getImageData(item);
+            if (!image) {
+                continue;
+            }
+            const ext = await getPreferredImageExtension();
+            path = await addPastedImage(image, ext, true);
+        }
+        return (await getAbsoluteMediaPath({ val: path })).val;
+    }
+    return null;
+}

From d5859163139e38f12e372938534f1a49c55c2201 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 12 Jun 2025 05:00:33 +0300
Subject: [PATCH 039/133] Fix lint errors

---
 qt/aqt/editor.py                   |  6 ++--
 qt/aqt/mediasrv.py                 |  6 ++--
 rslib/src/media/service.rs         | 41 +++++++++++++++++++--------
 ts/routes/editor/NoteEditor.svelte | 45 +++++++++++++++++++-----------
 4 files changed, 64 insertions(+), 34 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 8424b3b35..c0aa30452 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -33,7 +33,7 @@ from anki.cards import Card
 from anki.collection import Config
 from anki.hooks import runFilter
 from anki.httpclient import HttpClient
-from anki.models import NotetypeDict, NotetypeId, StockNotetype
+from anki.models import NotetypeDict, StockNotetype
 from anki.notes import Note, NoteId
 from anki.utils import checksum, is_mac, is_win, namedtmp
 from aqt import AnkiQt, gui_hooks
@@ -948,10 +948,10 @@ class EditorWebView(AnkiWebView):
         clip = self.editor.mw.app.clipboard()
         assert clip is not None
         clip.dataChanged.connect(self._on_clipboard_change)
-        self.settings().setAttribute(
+        self.settings().setAttribute(  # type: ignore
             QWebEngineSettings.WebAttribute.JavascriptCanPaste, True
         )
-        self.settings().setAttribute(
+        self.settings().setAttribute(  # type: ignore
             QWebEngineSettings.WebAttribute.JavascriptCanAccessClipboard, True
         )
         gui_hooks.editor_web_view_did_init(self)
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index 8ae7f03d6..ce30e3aad 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -707,10 +707,12 @@ async def open_file_picker() -> bytes:
         def cb(filename: str | None) -> None:
             loop.call_soon_threadsafe(future.set_result, filename)
 
+        window = aqt.mw.app.activeWindow()
+        assert window is not None
         getFile(
-            parent=aqt.mw.app.activeWindow(),
+            parent=window,
             title=req.title,
-            cb=cb,
+            cb=cast(Callable[[Any], None], cb),
             filter=f"{req.filter_description} ({' '.join(f'*.{ext}' for ext in req.extensions)})",
             key=req.key,
         )
diff --git a/rslib/src/media/service.rs b/rslib/src/media/service.rs
index b69f4014d..b0515e65a 100644
--- a/rslib/src/media/service.rs
+++ b/rslib/src/media/service.rs
@@ -43,14 +43,17 @@ impl crate::services::MediaService for Collection {
             .into())
     }
 
-    fn add_media_from_path(&mut self, input: AddMediaFromPathRequest) -> error::Result<generic::String> {
-        let base_name = Path::new(&input.path).file_name().unwrap_or_default().to_str().unwrap_or_default();
+    fn add_media_from_path(
+        &mut self,
+        input: AddMediaFromPathRequest,
+    ) -> error::Result<generic::String> {
+        let base_name = Path::new(&input.path)
+            .file_name()
+            .unwrap_or_default()
+            .to_str()
+            .unwrap_or_default();
         let data = std::fs::read(&input.path)?;
-        Ok(self
-            .media()?
-            .add_file(&base_name, &data)?
-            .to_string()
-            .into())
+        Ok(self.media()?.add_file(base_name, &data)?.to_string().into())
     }
 
     fn trash_media_files(&mut self, input: TrashMediaFilesRequest) -> error::Result<()> {
@@ -80,13 +83,27 @@ impl crate::services::MediaService for Collection {
         Ok(files.into_iter().collect::<Vec<_>>().into())
     }
 
-
-    fn extract_media_files(&mut self, html: anki_proto::generic::String) -> error::Result<generic::StringList> {
-        let files = extract_media_refs(&html.val).iter().map(|r| r.fname_decoded.to_string()).collect::<Vec<_>>();
+    fn extract_media_files(
+        &mut self,
+        html: anki_proto::generic::String,
+    ) -> error::Result<generic::StringList> {
+        let files = extract_media_refs(&html.val)
+            .iter()
+            .map(|r| r.fname_decoded.to_string())
+            .collect::<Vec<_>>();
         Ok(files.into())
     }
 
-    fn get_absolute_media_path(&mut self, path: anki_proto::generic::String) -> error::Result<generic::String> {
-        Ok(self.media()?.media_folder.join(path.val).to_string_lossy().to_string().into())
+    fn get_absolute_media_path(
+        &mut self,
+        path: anki_proto::generic::String,
+    ) -> error::Result<generic::String> {
+        Ok(self
+            .media()?
+            .media_folder
+            .join(path.val)
+            .to_string_lossy()
+            .to_string()
+            .into())
     }
 }
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 3086a1095..49fcb8532 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -24,7 +24,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 
     import { registerPackage } from "@tslib/runtime-require";
-    import { filenameToLink, openFilePickerForImageOcclusion, readImageFromClipboard } from "./rich-text-input/data-transfer";
+    import {
+        filenameToLink,
+        openFilePickerForImageOcclusion,
+        readImageFromClipboard,
+    } from "./rich-text-input/data-transfer";
     import contextProperty from "$lib/sveltelib/context-property";
     import lifecycleHooks from "$lib/sveltelib/lifecycle-hooks";
 
@@ -543,7 +547,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import PreviewButton from "./PreviewButton.svelte";
     import { NoteFieldsCheckResponse_State, type Note } from "@generated/anki/notes_pb";
 
-
     $: isIOImageLoaded = false;
     $: ioImageLoadedStore.set(isIOImageLoaded);
     let imageOcclusionMode: IOMode | undefined;
@@ -552,7 +555,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     async function pickIOImage() {
         imageOcclusionMode = undefined;
         const filename = await openFilePickerForImageOcclusion();
-        if(!filename) {
+        if (!filename) {
             return;
         }
         setupMaskEditor(filename);
@@ -564,7 +567,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 
     async function setupMaskEditor(filename: string) {
-        if(mode == "add") {
+        if (mode == "add") {
             setupMaskEditorForNewNote(filename);
         } else {
             setupMaskEditorForExistingNote(filename);
@@ -596,9 +599,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 
     async function setupMaskEditorForNewNote(imagePath: string) {
-        const imageFieldHtml = filenameToLink((await addMediaFromPath({
-            path: imagePath,
-        })).val);
+        const imageFieldHtml = filenameToLink(
+            (
+                await addMediaFromPath({
+                    path: imagePath,
+                })
+            ).val,
+        );
         setupMaskEditorInner({
             html: imageFieldHtml,
             mode: {
@@ -611,25 +618,29 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     async function setupMaskEditorForExistingNote(imagePath: string | null = null) {
         if (imagePath) {
-            const imageFieldHtml = filenameToLink((await addMediaFromPath({
-                path: imagePath,
-            })).val);
+            const imageFieldHtml = filenameToLink(
+                (
+                    await addMediaFromPath({
+                        path: imagePath,
+                    })
+                ).val,
+            );
             resetIOImage(imagePath, () => {});
             setImageField(imageFieldHtml);
         }
         setupMaskEditorInner({
-                html: note!.fields[ioFields.image],
-                mode: {
-                    kind: "edit",
-                    noteId: note!.id,
-                },
-            });
+            html: note!.fields[ioFields.image],
+            mode: {
+                kind: "edit",
+                noteId: note!.id,
+            },
+        });
     }
 
     async function setupMaskEditorFromClipboard() {
         const path = await readImageFromClipboard();
         console.log("setupMaskEditorFromClipboard path", path);
-        if(path) {
+        if (path) {
             setupMaskEditor(path);
         } else {
             alert(tr.editingNoImageFoundOnClipboard());

From 70a69cfdbe372b46f6fe2b877c36f1839651fb54 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 18 Jun 2025 22:25:40 +0300
Subject: [PATCH 040/133] Move context menu logic

---
 package.json                                  |    3 +-
 proto/anki/frontend.proto                     |    2 +
 qt/aqt/editor.py                              |   87 +-
 qt/aqt/mediasrv.py                            |   25 +
 ts/routes/editor/NoteEditor.svelte            |   51 +-
 ts/routes/editor/context-menu.svelte.ts       |  122 +
 .../plain-text-input/PlainTextInput.svelte    |    6 +
 .../editor/rich-text-input/data-transfer.ts   |   10 +-
 yarn.lock                                     | 2417 +++++++++--------
 9 files changed, 1547 insertions(+), 1176 deletions(-)
 create mode 100644 ts/routes/editor/context-menu.svelte.ts

diff --git a/package.json b/package.json
index d08655bad..dc6f6bd2c 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,8 @@
         "lodash-es": "^4.17.21",
         "lru-cache": "^10.2.0",
         "marked": "^5.1.0",
-        "mathjax": "^3.1.2"
+        "mathjax": "^3.1.2",
+        "svelte-contextmenu": "^1.0.2"
     },
     "resolutions": {
         "canvas": "npm:empty-npm-package@1.0.0",
diff --git a/proto/anki/frontend.proto b/proto/anki/frontend.proto
index 9c8ce622f..9e4d2de13 100644
--- a/proto/anki/frontend.proto
+++ b/proto/anki/frontend.proto
@@ -35,6 +35,8 @@ service FrontendService {
       returns (ConvertPastedImageResponse);
   rpc retrieveUrl(generic.String) returns (RetrieveUrlResponse);
   rpc openFilePicker(openFilePickerRequest) returns (generic.String);
+  rpc openMedia(generic.String) returns (generic.Empty);
+  rpc showInMediaFolder(generic.String) returns (generic.Empty);
 
   // Profile config
   rpc GetProfileConfigJson(generic.String) returns (generic.Json);
diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index c0aa30452..ee135ec93 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -25,8 +25,6 @@ import requests
 from bs4 import BeautifulSoup
 
 import aqt
-import aqt.forms
-import aqt.operations
 import aqt.sound
 from anki._legacy import deprecated
 from anki.cards import Card
@@ -35,20 +33,12 @@ from anki.hooks import runFilter
 from anki.httpclient import HttpClient
 from anki.models import NotetypeDict, StockNotetype
 from anki.notes import Note, NoteId
-from anki.utils import checksum, is_mac, is_win, namedtmp
+from anki.utils import checksum, is_win, namedtmp
 from aqt import AnkiQt, gui_hooks
 from aqt.operations.notetype import update_notetype_legacy
 from aqt.qt import *
 from aqt.sound import av_player
-from aqt.utils import (
-    KeyboardModifiersPressed,
-    getFile,
-    openFolder,
-    shortcut,
-    show_in_folder,
-    showWarning,
-    tr,
-)
+from aqt.utils import KeyboardModifiersPressed, getFile, shortcut, showWarning, tr
 from aqt.webview import AnkiWebView, AnkiWebViewKind
 
 pics = ("jpg", "jpeg", "png", "gif", "svg", "webp", "ico", "avif")
@@ -855,8 +845,11 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
     def onPaste(self) -> None:
         self.web.onPaste()
 
-    def onCutOrCopy(self) -> None:
-        self.web.user_cut_or_copied()
+    def onCut(self) -> None:
+        self.web.onCut()
+
+    def onCopy(self) -> None:
+        self.web.onCopy()
 
     # Image occlusion
     ######################################################################
@@ -915,7 +908,8 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             attach=Editor.onAddMedia,
             record=Editor.onRecSound,
             paste=Editor.onPaste,
-            cutOrCopy=Editor.onCutOrCopy,
+            cut=Editor.onCut,
+            copy=Editor.onCopy,
         )
 
     @property
@@ -956,10 +950,6 @@ class EditorWebView(AnkiWebView):
         )
         gui_hooks.editor_web_view_did_init(self)
 
-    def user_cut_or_copied(self) -> None:
-        self._store_field_content_on_next_clipboard_change = True
-        self._internal_field_text_for_paste = None
-
     def _on_clipboard_change(
         self, mode: QClipboard.Mode = QClipboard.Mode.Clipboard
     ) -> None:
@@ -990,19 +980,6 @@ class EditorWebView(AnkiWebView):
     def onCopy(self) -> None:
         self.triggerPageAction(QWebEnginePage.WebAction.Copy)
 
-    def on_copy_image(self) -> None:
-        self.triggerPageAction(QWebEnginePage.WebAction.CopyImageToClipboard)
-
-    def _opened_context_menu_on_image(self) -> bool:
-        if not hasattr(self, "lastContextMenuRequest"):
-            return False
-        context_menu_request = self.lastContextMenuRequest()
-        assert context_menu_request is not None
-        return (
-            context_menu_request.mediaType()
-            == context_menu_request.MediaType.MediaTypeImage
-        )
-
     def _wantsExtendedPaste(self) -> bool:
         strip_html = self.editor.mw.col.get_config_bool(
             Config.Bool.PASTE_STRIPS_FORMATTING
@@ -1029,7 +1006,7 @@ class EditorWebView(AnkiWebView):
                 self.editor.doPaste(html, internal, extended)
 
     def onPaste(self) -> None:
-        self._onPaste(QClipboard.Mode.Clipboard)
+        self.triggerPageAction(QWebEnginePage.WebAction.Paste)
 
     def onMiddleClickPaste(self) -> None:
         self._onPaste(QClipboard.Mode.Selection)
@@ -1169,53 +1146,9 @@ class EditorWebView(AnkiWebView):
 
     def contextMenuEvent(self, evt: QContextMenuEvent | None) -> None:
         m = QMenu(self)
-        if self.hasSelection():
-            self._add_cut_action(m)
-            self._add_copy_action(m)
-        a = m.addAction(tr.editing_paste())
-        assert a is not None
-        qconnect(a.triggered, self.onPaste)
-        if self.editor.state is EditorState.IO_MASKS and (
-            path := self.editor.last_io_image_path
-        ):
-            self._add_image_menu_with_path(m, path)
-        elif self._opened_context_menu_on_image():
-            self._add_image_menu(m)
         gui_hooks.editor_will_show_context_menu(self, m)
         m.popup(QCursor.pos())
 
-    def _add_cut_action(self, menu: QMenu) -> None:
-        a = menu.addAction(tr.editing_cut())
-        assert a is not None
-        qconnect(a.triggered, self.onCut)
-
-    def _add_copy_action(self, menu: QMenu) -> None:
-        a = menu.addAction(tr.actions_copy())
-        assert a is not None
-        qconnect(a.triggered, self.onCopy)
-
-    def _add_image_menu(self, menu: QMenu) -> None:
-        a = menu.addAction(tr.editing_copy_image())
-        assert a is not None
-        qconnect(a.triggered, self.on_copy_image)
-
-        context_menu_request = self.lastContextMenuRequest()
-        assert context_menu_request is not None
-        url = context_menu_request.mediaUrl()
-        file_name = url.fileName()
-        path = os.path.join(self.editor.mw.col.media.dir(), file_name)
-        self._add_image_menu_with_path(menu, path)
-
-    def _add_image_menu_with_path(self, menu: QMenu, path: str) -> None:
-        a = menu.addAction(tr.editing_open_image())
-        assert a is not None
-        qconnect(a.triggered, lambda: openFolder(path))
-
-        if is_win or is_mac:
-            a = menu.addAction(tr.editing_show_in_folder())
-            assert a is not None
-            qconnect(a.triggered, lambda: show_in_folder(path))
-
     def _clipboard(self) -> QClipboard:
         clipboard = self.editor.mw.app.clipboard()
         assert clipboard is not None
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index ce30e3aad..4cda76eab 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -724,6 +724,28 @@ async def open_file_picker() -> bytes:
     return generic_pb2.String(val=filename if filename else "").SerializeToString()
 
 
+def open_media() -> bytes:
+    from aqt.utils import openFolder
+
+    req = generic_pb2.String()
+    req.ParseFromString(request.data)
+    path = os.path.join(aqt.mw.col.media.dir(), req.val)
+    aqt.mw.taskman.run_on_main(lambda: openFolder(path))
+
+    return b""
+
+
+def show_in_media_folder() -> bytes:
+    from aqt.utils import show_in_folder
+
+    req = generic_pb2.String()
+    req.ParseFromString(request.data)
+    path = os.path.join(aqt.mw.col.media.dir(), req.val)
+    aqt.mw.taskman.run_on_main(lambda: show_in_folder(path))
+
+    return b""
+
+
 post_handler_list = [
     congrats_info,
     get_deck_configs_for_update,
@@ -748,6 +770,8 @@ post_handler_list = [
     convert_pasted_image,
     retrieve_url,
     open_file_picker,
+    open_media,
+    show_in_media_folder,
 ]
 
 
@@ -806,6 +830,7 @@ exposed_backend_list = [
     "add_media_file",
     "add_media_from_path",
     "get_absolute_media_path",
+    "extract_media_files",
 ]
 
 
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 49fcb8532..d707d9706 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -13,7 +13,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import FieldState from "./FieldState.svelte";
     import LabelContainer from "./LabelContainer.svelte";
     import LabelName from "./LabelName.svelte";
-    import type { EditorMode } from "./types";
+    import { EditorState, type EditorMode } from "./types";
+    import ContextMenu, { Item } from "svelte-contextmenu";
 
     export interface NoteEditorAPI {
         fields: EditorFieldAPI[];
@@ -21,6 +22,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         focusedField: Writable<EditorFieldAPI | null>;
         focusedInput: Writable<EditingInputAPI | null>;
         toolbar: EditorToolbarAPI;
+        state: Writable<EditorState>;
+        lastIOImagePath: Writable<string | null>;
     }
 
     import { registerPackage } from "@tslib/runtime-require";
@@ -28,6 +31,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         filenameToLink,
         openFilePickerForImageOcclusion,
         readImageFromClipboard,
+        extractImagePathFromHtml,
     } from "./rich-text-input/data-transfer";
     import contextProperty from "$lib/sveltelib/context-property";
     import lifecycleHooks from "$lib/sveltelib/lifecycle-hooks";
@@ -81,7 +85,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import RichTextInput, { editingInputIsRichText } from "./rich-text-input";
     import RichTextBadge from "./RichTextBadge.svelte";
     import type { NotetypeIdAndModTime, SessionOptions } from "./types";
-    import { EditorState } from "./types";
+
+    let contextMenu: ContextMenu;
+    const [onContextMenu, contextMenuItems] = setupContextMenu();
 
     function quoteFontFamily(fontFamily: string): string {
         // generic families (e.g. sans-serif) must not be quoted
@@ -546,11 +552,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import ButtonGroupItem from "$lib/components/ButtonGroupItem.svelte";
     import PreviewButton from "./PreviewButton.svelte";
     import { NoteFieldsCheckResponse_State, type Note } from "@generated/anki/notes_pb";
+    import { setupContextMenu } from "./context-menu.svelte";
 
     $: isIOImageLoaded = false;
     $: ioImageLoadedStore.set(isIOImageLoaded);
     let imageOcclusionMode: IOMode | undefined;
     let ioFields = new ImageOcclusionFieldIndexes({});
+    const lastIOImagePath: Writable<string | null> = writable(null);
 
     async function pickIOImage() {
         imageOcclusionMode = undefined;
@@ -606,6 +614,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                 })
             ).val,
         );
+        $lastIOImagePath = await extractImagePathFromHtml(imageFieldHtml);
         setupMaskEditorInner({
             html: imageFieldHtml,
             mode: {
@@ -625,6 +634,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                     })
                 ).val,
             );
+            $lastIOImagePath = await extractImagePathFromHtml(imageFieldHtml);
             resetIOImage(imagePath, () => {});
             setImageField(imageFieldHtml);
         }
@@ -639,7 +649,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     async function setupMaskEditorFromClipboard() {
         const path = await readImageFromClipboard();
-        console.log("setupMaskEditorFromClipboard path", path);
         if (path) {
             setupMaskEditor(path);
         } else {
@@ -697,8 +706,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     // Signal editor UI state changes to add-ons
 
-    let editorState: EditorState = EditorState.Initial;
-    let lastEditorState: EditorState = editorState;
+    const editorState: Writable<EditorState> = writable(EditorState.Initial);
+    let lastEditorState: EditorState = $editorState;
 
     function getEditorState(
         ioMaskEditorVisible: boolean,
@@ -802,7 +811,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         }
         if (isImageOcclusion) {
             const imageField = note!.fields[ioFields.image];
-            // TODO: last_io_image_path
+            $lastIOImagePath = await extractImagePathFromHtml(imageField);
             if (mode !== "add") {
                 setupMaskEditorInner({
                     html: imageField,
@@ -827,9 +836,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         return note!.id;
     }
 
-    $: signalEditorState(editorState);
+    $: signalEditorState($editorState);
 
-    $: editorState = getEditorState(
+    $: $editorState = getEditorState(
         $ioMaskEditorVisible,
         isImageOcclusion,
         isIOImageLoaded,
@@ -886,7 +895,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             ...oldEditorAdapter,
         });
 
-        editorState = getEditorState(
+        $editorState = getEditorState(
             $ioMaskEditorVisible,
             isImageOcclusion,
             isIOImageLoaded,
@@ -911,6 +920,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         focusedInput,
         toolbar: toolbar as EditorToolbarAPI,
         fields,
+        state: editorState,
+        lastIOImagePath,
     };
 
     setContextProperty(api);
@@ -940,7 +951,14 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 Serves as a pre-slotted convenience component which combines all the common
 components and functionality for general note editing.
 -->
-<div class="note-editor" bind:this={noteEditor}>
+<div
+    class="note-editor"
+    role="presentation"
+    bind:this={noteEditor}
+    on:contextmenu={(event) => {
+        onContextMenu(event, api, $focusedInput, contextMenu);
+    }}
+>
     <EditorToolbar {size} {wrap} api={toolbar}>
         <svelte:fragment slot="notetypeButtons">
             {#if mode === "browser"}
@@ -1117,6 +1135,19 @@ components and functionality for general note editing.
             <TagEditor {tags} on:tagsupdate={saveTags} />
         </Collapsible>
     {/if}
+
+    <ContextMenu bind:this={contextMenu}>
+        {#each contextMenuItems as item}
+            <Item
+                on:click={() => {
+                    item.action();
+                    $focusedInput?.focus();
+                }}
+            >
+                {item.label}
+            </Item>
+        {/each}
+    </ContextMenu>
 </div>
 
 <style lang="scss">
diff --git a/ts/routes/editor/context-menu.svelte.ts b/ts/routes/editor/context-menu.svelte.ts
new file mode 100644
index 000000000..8c2c17c8c
--- /dev/null
+++ b/ts/routes/editor/context-menu.svelte.ts
@@ -0,0 +1,122 @@
+// Copyright: Ankitects Pty Ltd and contributors
+// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+
+import { openMedia, showInMediaFolder } from "@generated/backend";
+import * as tr from "@generated/ftl";
+import { bridgeCommand } from "@tslib/bridgecommand";
+import { getSelection } from "@tslib/cross-browser";
+import type ContextMenu from "svelte-contextmenu";
+import type { ContextMenuMouseEvent } from "svelte-contextmenu/ContextMenuMouseEvent";
+import { get } from "svelte/store";
+import type { EditingInputAPI } from "./EditingArea.svelte";
+import type { NoteEditorAPI } from "./NoteEditor.svelte";
+import { editingInputIsPlainText } from "./plain-text-input";
+import { editingInputIsRichText } from "./rich-text-input";
+import { writeBlobToClipboard } from "./rich-text-input/data-transfer";
+import { EditorState } from "./types";
+
+async function getFieldSelection(focusedInput: EditingInputAPI): Promise<string | null> {
+    if (editingInputIsRichText(focusedInput)) {
+        const selection = getSelection(await focusedInput.element);
+        if (selection && selection.toString()) {
+            return selection.toString();
+        }
+    } else if (editingInputIsPlainText(focusedInput)) {
+        const selection = (await focusedInput.codeMirror.editor).getSelection();
+        if (selection) {
+            return selection;
+        }
+    }
+
+    return null;
+}
+
+function getImageFromMouseEvent(event: ContextMenuMouseEvent, element: HTMLElement): string | null {
+    const elements = element.getRootNode().elementsFromPoint(event.clientX, event.clientY);
+    for (const element of elements) {
+        if (element instanceof HTMLImageElement && (new URL(element.src)).hostname === window.location.hostname) {
+            return decodeURI(element.getAttribute("src")!);
+        }
+    }
+    return null;
+}
+
+interface ContextMenuItem {
+    label: string;
+    action: () => void;
+}
+
+export function setupContextMenu(): [
+    (
+        event: ContextMenuMouseEvent,
+        noteEditor: NoteEditorAPI,
+        focusedInput: EditingInputAPI | null,
+        contextMenu: ContextMenu,
+    ) => Promise<void>,
+    ContextMenuItem[],
+] {
+    const contextMenuItems: ContextMenuItem[] = $state([]);
+    async function onContextMenu(
+        event: ContextMenuMouseEvent,
+        noteEditor: NoteEditorAPI,
+        focusedInput: EditingInputAPI | null,
+        contextMenu: ContextMenu,
+    ) {
+        contextMenuItems.length = 0;
+        contextMenuItems.push({
+            label: tr.editingPaste(),
+            action: () => {
+                bridgeCommand("paste");
+            },
+        });
+        const selection = focusedInput ? await getFieldSelection(focusedInput) : null;
+        if (selection) {
+            contextMenuItems.push({
+                label: tr.editingCut(),
+                action: () => {
+                    bridgeCommand("cut");
+                },
+            }, {
+                label: tr.actionsCopy(),
+                action: () => {
+                    bridgeCommand("copy");
+                },
+            });
+        }
+
+        let imagePath: string | null = null;
+        if (get(noteEditor.state) === EditorState.ImageOcclusionMasks) {
+            imagePath = get(noteEditor.lastIOImagePath);
+        } else if (focusedInput && editingInputIsRichText(focusedInput)) {
+            imagePath = getImageFromMouseEvent(event, await focusedInput.element);
+        }
+        if (imagePath) {
+            contextMenuItems.push({
+                label: tr.editingCopyImage(),
+                action: async () => {
+                    const image = await fetch(imagePath);
+                    const blob = await image.blob();
+                    await writeBlobToClipboard(blob);
+                },
+            }, {
+                label: tr.editingOpenImage(),
+                action: () => {
+                    openMedia({ val: imagePath });
+                },
+            }, {
+                label: tr.editingShowInFolder(),
+                action: () => {
+                    showInMediaFolder({ val: imagePath });
+                },
+            });
+        }
+
+        if (contextMenuItems.length > 0) {
+            contextMenu?.show(event);
+        }
+
+        event.preventDefault();
+    }
+
+    return [onContextMenu, contextMenuItems];
+}
diff --git a/ts/routes/editor/plain-text-input/PlainTextInput.svelte b/ts/routes/editor/plain-text-input/PlainTextInput.svelte
index 7fae1e500..4f9626ad0 100644
--- a/ts/routes/editor/plain-text-input/PlainTextInput.svelte
+++ b/ts/routes/editor/plain-text-input/PlainTextInput.svelte
@@ -17,6 +17,12 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         codeMirror: CodeMirrorAPI;
     }
 
+    export function editingInputIsPlainText(
+        editingInput: EditingInputAPI,
+    ): editingInput is PlainTextInputAPI {
+        return editingInput.name === "plain-text";
+    }
+
     export const parsingInstructions: string[] = [];
     export const closeHTMLTags = writable(true);
 
diff --git a/ts/routes/editor/rich-text-input/data-transfer.ts b/ts/routes/editor/rich-text-input/data-transfer.ts
index 114df131c..993348b1d 100644
--- a/ts/routes/editor/rich-text-input/data-transfer.ts
+++ b/ts/routes/editor/rich-text-input/data-transfer.ts
@@ -406,7 +406,7 @@ export async function extractImagePathFromHtml(html: string): Promise<string | n
     if (images.length === 0) {
         return null;
     }
-    return images[0];
+    return decodeURI(images[0]);
 }
 
 export async function readImageFromClipboard(): Promise<string | null> {
@@ -429,3 +429,11 @@ export async function readImageFromClipboard(): Promise<string | null> {
     }
     return null;
 }
+
+export async function writeBlobToClipboard(blob: Blob) {
+    await navigator.clipboard.write([
+        new ClipboardItem({
+            [blob.type]: blob,
+        }),
+    ]);
+}
diff --git a/yarn.lock b/yarn.lock
index 096dcc809..ce1860928 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15,93 +15,100 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@bufbuild/protobuf@npm:1.10.0, @bufbuild/protobuf@npm:^1.10.0, @bufbuild/protobuf@npm:^1.2.1":
-  version: 1.10.0
-  resolution: "@bufbuild/protobuf@npm:1.10.0"
-  checksum: 10c0/5487b9c2e63846d0e3bde4d025cc77ae44a22166a5d6c184df0da5581e1ab6d66dd115af0ccad814576dcd011bb1b93989fb0ac1eb4ae452979bb8b186693ba0
+"@bufbuild/protobuf@npm:1.10.1, @bufbuild/protobuf@npm:^1.10.1, @bufbuild/protobuf@npm:^1.2.1":
+  version: 1.10.1
+  resolution: "@bufbuild/protobuf@npm:1.10.1"
+  checksum: 10c0/a89572ae99aa193dd232fca0cdc9ece1dfe2f3d8b061be1f966a4f88fb63410aeb0fe7de927037e970aefcb52036eec58a7f89a40fe1286eed1448ea1bd2634e
   languageName: node
   linkType: hard
 
 "@bufbuild/protoc-gen-es@npm:^1.8.0":
-  version: 1.10.0
-  resolution: "@bufbuild/protoc-gen-es@npm:1.10.0"
+  version: 1.10.1
+  resolution: "@bufbuild/protoc-gen-es@npm:1.10.1"
   dependencies:
-    "@bufbuild/protobuf": "npm:^1.10.0"
-    "@bufbuild/protoplugin": "npm:1.10.0"
+    "@bufbuild/protobuf": "npm:^1.10.1"
+    "@bufbuild/protoplugin": "npm:1.10.1"
   peerDependencies:
-    "@bufbuild/protobuf": 1.10.0
+    "@bufbuild/protobuf": 1.10.1
   peerDependenciesMeta:
     "@bufbuild/protobuf":
       optional: true
   bin:
     protoc-gen-es: bin/protoc-gen-es
-  checksum: 10c0/d5f53df70a6fc4d13b47ff56244318313de1a24a61aa5a7dd82efc4b5baa031c6bf1aface6a3f5b28a935ab5802de28fbe5c8bbc4d16d7d245fb4918cfe263df
+  checksum: 10c0/aa06192c9cc85ea8abe7397da31b35fb057c2e6646374d18f91b8be27ce802647e221bfbd49d6a404e0a918dfad11a8654952fc4eab3115e7fb56788912a7c4c
   languageName: node
   linkType: hard
 
-"@bufbuild/protoplugin@npm:1.10.0":
-  version: 1.10.0
-  resolution: "@bufbuild/protoplugin@npm:1.10.0"
+"@bufbuild/protoplugin@npm:1.10.1":
+  version: 1.10.1
+  resolution: "@bufbuild/protoplugin@npm:1.10.1"
   dependencies:
-    "@bufbuild/protobuf": "npm:1.10.0"
+    "@bufbuild/protobuf": "npm:1.10.1"
     "@typescript/vfs": "npm:^1.4.0"
     typescript: "npm:4.5.2"
-  checksum: 10c0/8080e75d3c2b122f763ea4b1f039c40d7ea9a5e9054c3b3c55cabe4d2949eb18b6ebb45fcc23d2463a3ea22dfaeda8c91e82cac700a957ca75cf002f231f3d43
+  checksum: 10c0/8c2b8bfbc29996824c1f13ae1063d68f55bbda7be2ff20c6404e80476f01c92b640348bb775f3ebe1d261723264da2e81b90b1cacbd134539185b54d53ef8dfc
   languageName: node
   linkType: hard
 
-"@dprint/darwin-arm64@npm:0.47.4":
-  version: 0.47.4
-  resolution: "@dprint/darwin-arm64@npm:0.47.4"
+"@dprint/darwin-arm64@npm:0.47.6":
+  version: 0.47.6
+  resolution: "@dprint/darwin-arm64@npm:0.47.6"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@dprint/darwin-x64@npm:0.47.4":
-  version: 0.47.4
-  resolution: "@dprint/darwin-x64@npm:0.47.4"
+"@dprint/darwin-x64@npm:0.47.6":
+  version: 0.47.6
+  resolution: "@dprint/darwin-x64@npm:0.47.6"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@dprint/linux-arm64-glibc@npm:0.47.4":
-  version: 0.47.4
-  resolution: "@dprint/linux-arm64-glibc@npm:0.47.4"
+"@dprint/linux-arm64-glibc@npm:0.47.6":
+  version: 0.47.6
+  resolution: "@dprint/linux-arm64-glibc@npm:0.47.6"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@dprint/linux-arm64-musl@npm:0.47.4":
-  version: 0.47.4
-  resolution: "@dprint/linux-arm64-musl@npm:0.47.4"
+"@dprint/linux-arm64-musl@npm:0.47.6":
+  version: 0.47.6
+  resolution: "@dprint/linux-arm64-musl@npm:0.47.6"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@dprint/linux-x64-glibc@npm:0.47.4":
-  version: 0.47.4
-  resolution: "@dprint/linux-x64-glibc@npm:0.47.4"
+"@dprint/linux-riscv64-glibc@npm:0.47.6":
+  version: 0.47.6
+  resolution: "@dprint/linux-riscv64-glibc@npm:0.47.6"
+  conditions: os=linux & cpu=riscv64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@dprint/linux-x64-glibc@npm:0.47.6":
+  version: 0.47.6
+  resolution: "@dprint/linux-x64-glibc@npm:0.47.6"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@dprint/linux-x64-musl@npm:0.47.4":
-  version: 0.47.4
-  resolution: "@dprint/linux-x64-musl@npm:0.47.4"
+"@dprint/linux-x64-musl@npm:0.47.6":
+  version: 0.47.6
+  resolution: "@dprint/linux-x64-musl@npm:0.47.6"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@dprint/win32-arm64@npm:0.47.4":
-  version: 0.47.4
-  resolution: "@dprint/win32-arm64@npm:0.47.4"
+"@dprint/win32-arm64@npm:0.47.6":
+  version: 0.47.6
+  resolution: "@dprint/win32-arm64@npm:0.47.6"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@dprint/win32-x64@npm:0.47.4":
-  version: 0.47.4
-  resolution: "@dprint/win32-x64@npm:0.47.4"
+"@dprint/win32-x64@npm:0.47.6":
+  version: 0.47.6
+  resolution: "@dprint/win32-x64@npm:0.47.6"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
@@ -113,9 +120,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/aix-ppc64@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/aix-ppc64@npm:0.25.3"
+"@esbuild/aix-ppc64@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/aix-ppc64@npm:0.25.5"
   conditions: os=aix & cpu=ppc64
   languageName: node
   linkType: hard
@@ -134,9 +141,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm64@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/android-arm64@npm:0.25.3"
+"@esbuild/android-arm64@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/android-arm64@npm:0.25.5"
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
@@ -155,9 +162,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/android-arm@npm:0.25.3"
+"@esbuild/android-arm@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/android-arm@npm:0.25.5"
   conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
@@ -176,9 +183,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-x64@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/android-x64@npm:0.25.3"
+"@esbuild/android-x64@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/android-x64@npm:0.25.5"
   conditions: os=android & cpu=x64
   languageName: node
   linkType: hard
@@ -197,9 +204,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-arm64@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/darwin-arm64@npm:0.25.3"
+"@esbuild/darwin-arm64@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/darwin-arm64@npm:0.25.5"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
@@ -218,9 +225,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-x64@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/darwin-x64@npm:0.25.3"
+"@esbuild/darwin-x64@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/darwin-x64@npm:0.25.5"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
@@ -239,9 +246,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-arm64@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/freebsd-arm64@npm:0.25.3"
+"@esbuild/freebsd-arm64@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/freebsd-arm64@npm:0.25.5"
   conditions: os=freebsd & cpu=arm64
   languageName: node
   linkType: hard
@@ -260,9 +267,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-x64@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/freebsd-x64@npm:0.25.3"
+"@esbuild/freebsd-x64@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/freebsd-x64@npm:0.25.5"
   conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
@@ -281,9 +288,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm64@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/linux-arm64@npm:0.25.3"
+"@esbuild/linux-arm64@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/linux-arm64@npm:0.25.5"
   conditions: os=linux & cpu=arm64
   languageName: node
   linkType: hard
@@ -302,9 +309,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/linux-arm@npm:0.25.3"
+"@esbuild/linux-arm@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/linux-arm@npm:0.25.5"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
@@ -323,9 +330,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ia32@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/linux-ia32@npm:0.25.3"
+"@esbuild/linux-ia32@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/linux-ia32@npm:0.25.5"
   conditions: os=linux & cpu=ia32
   languageName: node
   linkType: hard
@@ -344,9 +351,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-loong64@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/linux-loong64@npm:0.25.3"
+"@esbuild/linux-loong64@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/linux-loong64@npm:0.25.5"
   conditions: os=linux & cpu=loong64
   languageName: node
   linkType: hard
@@ -365,9 +372,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-mips64el@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/linux-mips64el@npm:0.25.3"
+"@esbuild/linux-mips64el@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/linux-mips64el@npm:0.25.5"
   conditions: os=linux & cpu=mips64el
   languageName: node
   linkType: hard
@@ -386,9 +393,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ppc64@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/linux-ppc64@npm:0.25.3"
+"@esbuild/linux-ppc64@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/linux-ppc64@npm:0.25.5"
   conditions: os=linux & cpu=ppc64
   languageName: node
   linkType: hard
@@ -407,9 +414,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-riscv64@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/linux-riscv64@npm:0.25.3"
+"@esbuild/linux-riscv64@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/linux-riscv64@npm:0.25.5"
   conditions: os=linux & cpu=riscv64
   languageName: node
   linkType: hard
@@ -428,9 +435,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-s390x@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/linux-s390x@npm:0.25.3"
+"@esbuild/linux-s390x@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/linux-s390x@npm:0.25.5"
   conditions: os=linux & cpu=s390x
   languageName: node
   linkType: hard
@@ -449,16 +456,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-x64@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/linux-x64@npm:0.25.3"
+"@esbuild/linux-x64@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/linux-x64@npm:0.25.5"
   conditions: os=linux & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/netbsd-arm64@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/netbsd-arm64@npm:0.25.3"
+"@esbuild/netbsd-arm64@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/netbsd-arm64@npm:0.25.5"
   conditions: os=netbsd & cpu=arm64
   languageName: node
   linkType: hard
@@ -477,16 +484,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/netbsd-x64@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/netbsd-x64@npm:0.25.3"
+"@esbuild/netbsd-x64@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/netbsd-x64@npm:0.25.5"
   conditions: os=netbsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/openbsd-arm64@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/openbsd-arm64@npm:0.25.3"
+"@esbuild/openbsd-arm64@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/openbsd-arm64@npm:0.25.5"
   conditions: os=openbsd & cpu=arm64
   languageName: node
   linkType: hard
@@ -505,9 +512,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/openbsd-x64@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/openbsd-x64@npm:0.25.3"
+"@esbuild/openbsd-x64@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/openbsd-x64@npm:0.25.5"
   conditions: os=openbsd & cpu=x64
   languageName: node
   linkType: hard
@@ -526,9 +533,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/sunos-x64@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/sunos-x64@npm:0.25.3"
+"@esbuild/sunos-x64@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/sunos-x64@npm:0.25.5"
   conditions: os=sunos & cpu=x64
   languageName: node
   linkType: hard
@@ -547,9 +554,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/win32-arm64@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/win32-arm64@npm:0.25.3"
+"@esbuild/win32-arm64@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/win32-arm64@npm:0.25.5"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
@@ -568,9 +575,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/win32-ia32@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/win32-ia32@npm:0.25.3"
+"@esbuild/win32-ia32@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/win32-ia32@npm:0.25.5"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
@@ -589,28 +596,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/win32-x64@npm:0.25.3":
-  version: 0.25.3
-  resolution: "@esbuild/win32-x64@npm:0.25.3"
+"@esbuild/win32-x64@npm:0.25.5":
+  version: 0.25.5
+  resolution: "@esbuild/win32-x64@npm:0.25.5"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
 "@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0":
-  version: 4.4.1
-  resolution: "@eslint-community/eslint-utils@npm:4.4.1"
+  version: 4.7.0
+  resolution: "@eslint-community/eslint-utils@npm:4.7.0"
   dependencies:
     eslint-visitor-keys: "npm:^3.4.3"
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
-  checksum: 10c0/2aa0ac2fc50ff3f234408b10900ed4f1a0b19352f21346ad4cc3d83a1271481bdda11097baa45d484dd564c895e0762a27a8240be7a256b3ad47129e96528252
+  checksum: 10c0/c0f4f2bd73b7b7a9de74b716a664873d08ab71ab439e51befe77d61915af41a81ecec93b408778b3a7856185244c34c2c8ee28912072ec14def84ba2dec70adf
   languageName: node
   linkType: hard
 
 "@eslint-community/regexpp@npm:^4.4.0, @eslint-community/regexpp@npm:^4.6.1":
-  version: 4.11.2
-  resolution: "@eslint-community/regexpp@npm:4.11.2"
-  checksum: 10c0/c6ab16307c64bc72ea05b9c1740734dfe4a3eea8f7cc395266eb7f04a0ab8f84fe58d41888e906c18bc56262b685eb3074443a0375fb8c44fb4ff20fdb11e250
+  version: 4.12.1
+  resolution: "@eslint-community/regexpp@npm:4.12.1"
+  checksum: 10c0/a03d98c246bcb9109aec2c08e4d10c8d010256538dcb3f56610191607214523d4fb1b00aa81df830b6dffb74c5fa0be03642513a289c567949d3e550ca11cdf6
   languageName: node
   linkType: hard
 
@@ -638,29 +645,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@floating-ui/core@npm:^1.6.0":
-  version: 1.6.8
-  resolution: "@floating-ui/core@npm:1.6.8"
+"@floating-ui/core@npm:^1.7.1":
+  version: 1.7.1
+  resolution: "@floating-ui/core@npm:1.7.1"
   dependencies:
-    "@floating-ui/utils": "npm:^0.2.8"
-  checksum: 10c0/d6985462aeccae7b55a2d3f40571551c8c42bf820ae0a477fc40ef462e33edc4f3f5b7f11b100de77c9b58ecb581670c5c3f46d0af82b5e30aa185c735257eb9
+    "@floating-ui/utils": "npm:^0.2.9"
+  checksum: 10c0/40df1e1dd8a2bad6f70c1ee163f0e151c456f52b9b98a38488d88720b2be72ccd631501a66f8369f96d2e8ad1c4250936b6fd4243e3a99833f2d008ee6afec18
   languageName: node
   linkType: hard
 
 "@floating-ui/dom@npm:^1.4.3":
-  version: 1.6.11
-  resolution: "@floating-ui/dom@npm:1.6.11"
+  version: 1.7.1
+  resolution: "@floating-ui/dom@npm:1.7.1"
   dependencies:
-    "@floating-ui/core": "npm:^1.6.0"
-    "@floating-ui/utils": "npm:^0.2.8"
-  checksum: 10c0/02ef34a75a515543c772880338eea7b66724997bd5ec7cd58d26b50325709d46d480a306b84e7d5509d734434411a4bcf23af5680c2e461e6e6a8bf45d751df8
+    "@floating-ui/core": "npm:^1.7.1"
+    "@floating-ui/utils": "npm:^0.2.9"
+  checksum: 10c0/33b0e892f4c50ce568169cd58793ff5e3bc1e72ee007237d73b9458d4475e1e5f5a4b3f9e6752422d5f5ac902bc0c135ca7dc0a23c6df187fd9d28dc34cdceed
   languageName: node
   linkType: hard
 
-"@floating-ui/utils@npm:^0.2.8":
-  version: 0.2.8
-  resolution: "@floating-ui/utils@npm:0.2.8"
-  checksum: 10c0/a8cee5f17406c900e1c3ef63e3ca89b35e7a2ed645418459a73627b93b7377477fc888081011c6cd177cac45ec2b92a6cab018c14ea140519465498dddd2d3f9
+"@floating-ui/utils@npm:^0.2.9":
+  version: 0.2.9
+  resolution: "@floating-ui/utils@npm:0.2.9"
+  checksum: 10c0/48bbed10f91cb7863a796cc0d0e917c78d11aeb89f98d03fc38d79e7eb792224a79f538ed8a2d5d5584511d4ca6354ef35f1712659fd569868e342df4398ad6f
   languageName: node
   linkType: hard
 
@@ -720,13 +727,13 @@ __metadata:
   linkType: hard
 
 "@jridgewell/gen-mapping@npm:^0.3.5":
-  version: 0.3.5
-  resolution: "@jridgewell/gen-mapping@npm:0.3.5"
+  version: 0.3.8
+  resolution: "@jridgewell/gen-mapping@npm:0.3.8"
   dependencies:
     "@jridgewell/set-array": "npm:^1.2.1"
     "@jridgewell/sourcemap-codec": "npm:^1.4.10"
     "@jridgewell/trace-mapping": "npm:^0.3.24"
-  checksum: 10c0/1be4fd4a6b0f41337c4f5fdf4afc3bd19e39c3691924817108b82ffcb9c9e609c273f936932b9fba4b3a298ce2eb06d9bff4eb1cc3bd81c4f4ee1b4917e25feb
+  checksum: 10c0/c668feaf86c501d7c804904a61c23c67447b2137b813b9ce03eca82cb9d65ac7006d766c218685d76e3d72828279b6ee26c347aa1119dab23fbaf36aed51585a
   languageName: node
   linkType: hard
 
@@ -768,10 +775,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@mdn/browser-compat-data@npm:^5.2.34, @mdn/browser-compat-data@npm:^5.3.13":
-  version: 5.6.10
-  resolution: "@mdn/browser-compat-data@npm:5.6.10"
-  checksum: 10c0/56535910b510a1f2db24f66dc43d2b708ae38fcc4841b028012682c2d88949509fad2fb62d565c2e1b53e3b4dd517255e21ddf9c32f15f2acae03f2c54501f4f
+"@mdn/browser-compat-data@npm:^5.3.13, @mdn/browser-compat-data@npm:^5.6.19":
+  version: 5.7.6
+  resolution: "@mdn/browser-compat-data@npm:5.7.6"
+  checksum: 10c0/918df768e734115bee0a43fb2eceaf6438cb9b294c27e13d0ac8a19ab9f00f59e4f306fc38c498b62bdec2d726d4f3874826fa2afccd2a29d50d306f687bfdff
   languageName: node
   linkType: hard
 
@@ -833,106 +840,114 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/watcher-android-arm64@npm:2.4.1":
-  version: 2.4.1
-  resolution: "@parcel/watcher-android-arm64@npm:2.4.1"
+"@parcel/watcher-android-arm64@npm:2.5.1":
+  version: 2.5.1
+  resolution: "@parcel/watcher-android-arm64@npm:2.5.1"
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
 
-"@parcel/watcher-darwin-arm64@npm:2.4.1":
-  version: 2.4.1
-  resolution: "@parcel/watcher-darwin-arm64@npm:2.4.1"
+"@parcel/watcher-darwin-arm64@npm:2.5.1":
+  version: 2.5.1
+  resolution: "@parcel/watcher-darwin-arm64@npm:2.5.1"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@parcel/watcher-darwin-x64@npm:2.4.1":
-  version: 2.4.1
-  resolution: "@parcel/watcher-darwin-x64@npm:2.4.1"
+"@parcel/watcher-darwin-x64@npm:2.5.1":
+  version: 2.5.1
+  resolution: "@parcel/watcher-darwin-x64@npm:2.5.1"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@parcel/watcher-freebsd-x64@npm:2.4.1":
-  version: 2.4.1
-  resolution: "@parcel/watcher-freebsd-x64@npm:2.4.1"
+"@parcel/watcher-freebsd-x64@npm:2.5.1":
+  version: 2.5.1
+  resolution: "@parcel/watcher-freebsd-x64@npm:2.5.1"
   conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@parcel/watcher-linux-arm-glibc@npm:2.4.1":
-  version: 2.4.1
-  resolution: "@parcel/watcher-linux-arm-glibc@npm:2.4.1"
+"@parcel/watcher-linux-arm-glibc@npm:2.5.1":
+  version: 2.5.1
+  resolution: "@parcel/watcher-linux-arm-glibc@npm:2.5.1"
   conditions: os=linux & cpu=arm & libc=glibc
   languageName: node
   linkType: hard
 
-"@parcel/watcher-linux-arm64-glibc@npm:2.4.1":
-  version: 2.4.1
-  resolution: "@parcel/watcher-linux-arm64-glibc@npm:2.4.1"
+"@parcel/watcher-linux-arm-musl@npm:2.5.1":
+  version: 2.5.1
+  resolution: "@parcel/watcher-linux-arm-musl@npm:2.5.1"
+  conditions: os=linux & cpu=arm & libc=musl
+  languageName: node
+  linkType: hard
+
+"@parcel/watcher-linux-arm64-glibc@npm:2.5.1":
+  version: 2.5.1
+  resolution: "@parcel/watcher-linux-arm64-glibc@npm:2.5.1"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@parcel/watcher-linux-arm64-musl@npm:2.4.1":
-  version: 2.4.1
-  resolution: "@parcel/watcher-linux-arm64-musl@npm:2.4.1"
+"@parcel/watcher-linux-arm64-musl@npm:2.5.1":
+  version: 2.5.1
+  resolution: "@parcel/watcher-linux-arm64-musl@npm:2.5.1"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@parcel/watcher-linux-x64-glibc@npm:2.4.1":
-  version: 2.4.1
-  resolution: "@parcel/watcher-linux-x64-glibc@npm:2.4.1"
+"@parcel/watcher-linux-x64-glibc@npm:2.5.1":
+  version: 2.5.1
+  resolution: "@parcel/watcher-linux-x64-glibc@npm:2.5.1"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@parcel/watcher-linux-x64-musl@npm:2.4.1":
-  version: 2.4.1
-  resolution: "@parcel/watcher-linux-x64-musl@npm:2.4.1"
+"@parcel/watcher-linux-x64-musl@npm:2.5.1":
+  version: 2.5.1
+  resolution: "@parcel/watcher-linux-x64-musl@npm:2.5.1"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@parcel/watcher-win32-arm64@npm:2.4.1":
-  version: 2.4.1
-  resolution: "@parcel/watcher-win32-arm64@npm:2.4.1"
+"@parcel/watcher-win32-arm64@npm:2.5.1":
+  version: 2.5.1
+  resolution: "@parcel/watcher-win32-arm64@npm:2.5.1"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@parcel/watcher-win32-ia32@npm:2.4.1":
-  version: 2.4.1
-  resolution: "@parcel/watcher-win32-ia32@npm:2.4.1"
+"@parcel/watcher-win32-ia32@npm:2.5.1":
+  version: 2.5.1
+  resolution: "@parcel/watcher-win32-ia32@npm:2.5.1"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@parcel/watcher-win32-x64@npm:2.4.1":
-  version: 2.4.1
-  resolution: "@parcel/watcher-win32-x64@npm:2.4.1"
+"@parcel/watcher-win32-x64@npm:2.5.1":
+  version: 2.5.1
+  resolution: "@parcel/watcher-win32-x64@npm:2.5.1"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
 "@parcel/watcher@npm:^2.4.1":
-  version: 2.4.1
-  resolution: "@parcel/watcher@npm:2.4.1"
+  version: 2.5.1
+  resolution: "@parcel/watcher@npm:2.5.1"
   dependencies:
-    "@parcel/watcher-android-arm64": "npm:2.4.1"
-    "@parcel/watcher-darwin-arm64": "npm:2.4.1"
-    "@parcel/watcher-darwin-x64": "npm:2.4.1"
-    "@parcel/watcher-freebsd-x64": "npm:2.4.1"
-    "@parcel/watcher-linux-arm-glibc": "npm:2.4.1"
-    "@parcel/watcher-linux-arm64-glibc": "npm:2.4.1"
-    "@parcel/watcher-linux-arm64-musl": "npm:2.4.1"
-    "@parcel/watcher-linux-x64-glibc": "npm:2.4.1"
-    "@parcel/watcher-linux-x64-musl": "npm:2.4.1"
-    "@parcel/watcher-win32-arm64": "npm:2.4.1"
-    "@parcel/watcher-win32-ia32": "npm:2.4.1"
-    "@parcel/watcher-win32-x64": "npm:2.4.1"
+    "@parcel/watcher-android-arm64": "npm:2.5.1"
+    "@parcel/watcher-darwin-arm64": "npm:2.5.1"
+    "@parcel/watcher-darwin-x64": "npm:2.5.1"
+    "@parcel/watcher-freebsd-x64": "npm:2.5.1"
+    "@parcel/watcher-linux-arm-glibc": "npm:2.5.1"
+    "@parcel/watcher-linux-arm-musl": "npm:2.5.1"
+    "@parcel/watcher-linux-arm64-glibc": "npm:2.5.1"
+    "@parcel/watcher-linux-arm64-musl": "npm:2.5.1"
+    "@parcel/watcher-linux-x64-glibc": "npm:2.5.1"
+    "@parcel/watcher-linux-x64-musl": "npm:2.5.1"
+    "@parcel/watcher-win32-arm64": "npm:2.5.1"
+    "@parcel/watcher-win32-ia32": "npm:2.5.1"
+    "@parcel/watcher-win32-x64": "npm:2.5.1"
     detect-libc: "npm:^1.0.3"
     is-glob: "npm:^4.0.3"
     micromatch: "npm:^4.0.5"
@@ -949,6 +964,8 @@ __metadata:
       optional: true
     "@parcel/watcher-linux-arm-glibc":
       optional: true
+    "@parcel/watcher-linux-arm-musl":
+      optional: true
     "@parcel/watcher-linux-arm64-glibc":
       optional: true
     "@parcel/watcher-linux-arm64-musl":
@@ -963,7 +980,7 @@ __metadata:
       optional: true
     "@parcel/watcher-win32-x64":
       optional: true
-  checksum: 10c0/33b7112094b9eb46c234d824953967435b628d3d93a0553255e9910829b84cab3da870153c3a870c31db186dc58f3b2db81382fcaee3451438aeec4d786a6211
+  checksum: 10c0/8f35073d0c0b34a63d4c8d2213482f0ebc6a25de7b2cdd415d19cb929964a793cb285b68d1d50bfb732b070b3c82a2fdb4eb9c250eab709a1cd9d63345455a82
   languageName: node
   linkType: hard
 
@@ -975,22 +992,22 @@ __metadata:
   linkType: hard
 
 "@polka/url@npm:^1.0.0-next.24":
-  version: 1.0.0-next.28
-  resolution: "@polka/url@npm:1.0.0-next.28"
-  checksum: 10c0/acc5ea62597e4da2fb42dbee02749d07f102ae7d6d2c966bf7e423c79cd65d1621da305af567e6e7c232f3b565e242d1ec932cbb3dcc0db1508d02e9a2cafa2e
+  version: 1.0.0-next.29
+  resolution: "@polka/url@npm:1.0.0-next.29"
+  checksum: 10c0/0d58e081844095cb029d3c19a659bfefd09d5d51a2f791bc61eba7ea826f13d6ee204a8a448c2f5a855c17df07b37517373ff916dd05801063c0568ae9937684
   languageName: node
   linkType: hard
 
 "@poppanator/sveltekit-svg@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "@poppanator/sveltekit-svg@npm:5.0.0"
+  version: 5.0.1
+  resolution: "@poppanator/sveltekit-svg@npm:5.0.1"
   dependencies:
-    "@rollup/pluginutils": "npm:^5.1.0"
+    "@rollup/pluginutils": "npm:5.1.4"
+    svgo: "npm:^3.2.0"
   peerDependencies:
     svelte: ">=5.x"
-    svgo: ">=3.x"
-    vite: ">=5.x"
-  checksum: 10c0/2b4fa4e93d7c6bebc1b3ee8512b747e125393bc4abc69c465c9f3713324d0c30af88fa75f9e3a1cd36e64e0fe0c60cf6177acc66da2ae9777f6419a9a5df91f6
+    vite: ">=5.x || >= 6.x"
+  checksum: 10c0/1bf6223d18cb50bdf8739b0d06763114622b11545b7004c0009b0e09e3369ec8a5f055eacb5490a23ddd71add3f0e3e66b7f3313feb2cedceda5dd4ffcdac74a
   languageName: node
   linkType: hard
 
@@ -1001,9 +1018,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/pluginutils@npm:^5.1.0":
-  version: 5.1.3
-  resolution: "@rollup/pluginutils@npm:5.1.3"
+"@rollup/pluginutils@npm:5.1.4":
+  version: 5.1.4
+  resolution: "@rollup/pluginutils@npm:5.1.4"
   dependencies:
     "@types/estree": "npm:^1.0.0"
     estree-walker: "npm:^2.0.2"
@@ -1013,139 +1030,146 @@ __metadata:
   peerDependenciesMeta:
     rollup:
       optional: true
-  checksum: 10c0/ba46ad588733fb01d184ee3bc7a127d626158bc840b5874a94c129ff62689d12f16f537530709c54da6f3b71f67d705c4e09235b1dc9542e9d47ee8f2d0b8b9e
+  checksum: 10c0/6d58fbc6f1024eb4b087bc9bf59a1d655a8056a60c0b4021d3beaeec3f0743503f52467fd89d2cf0e7eccf2831feb40a05ad541a17637ea21ba10b21c2004deb
   languageName: node
   linkType: hard
 
-"@rollup/rollup-android-arm-eabi@npm:4.31.0":
-  version: 4.31.0
-  resolution: "@rollup/rollup-android-arm-eabi@npm:4.31.0"
+"@rollup/rollup-android-arm-eabi@npm:4.43.0":
+  version: 4.43.0
+  resolution: "@rollup/rollup-android-arm-eabi@npm:4.43.0"
   conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
 
-"@rollup/rollup-android-arm64@npm:4.31.0":
-  version: 4.31.0
-  resolution: "@rollup/rollup-android-arm64@npm:4.31.0"
+"@rollup/rollup-android-arm64@npm:4.43.0":
+  version: 4.43.0
+  resolution: "@rollup/rollup-android-arm64@npm:4.43.0"
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-darwin-arm64@npm:4.31.0":
-  version: 4.31.0
-  resolution: "@rollup/rollup-darwin-arm64@npm:4.31.0"
+"@rollup/rollup-darwin-arm64@npm:4.43.0":
+  version: 4.43.0
+  resolution: "@rollup/rollup-darwin-arm64@npm:4.43.0"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-darwin-x64@npm:4.31.0":
-  version: 4.31.0
-  resolution: "@rollup/rollup-darwin-x64@npm:4.31.0"
+"@rollup/rollup-darwin-x64@npm:4.43.0":
+  version: 4.43.0
+  resolution: "@rollup/rollup-darwin-x64@npm:4.43.0"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-freebsd-arm64@npm:4.31.0":
-  version: 4.31.0
-  resolution: "@rollup/rollup-freebsd-arm64@npm:4.31.0"
+"@rollup/rollup-freebsd-arm64@npm:4.43.0":
+  version: 4.43.0
+  resolution: "@rollup/rollup-freebsd-arm64@npm:4.43.0"
   conditions: os=freebsd & cpu=arm64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-freebsd-x64@npm:4.31.0":
-  version: 4.31.0
-  resolution: "@rollup/rollup-freebsd-x64@npm:4.31.0"
+"@rollup/rollup-freebsd-x64@npm:4.43.0":
+  version: 4.43.0
+  resolution: "@rollup/rollup-freebsd-x64@npm:4.43.0"
   conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm-gnueabihf@npm:4.31.0":
-  version: 4.31.0
-  resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.31.0"
+"@rollup/rollup-linux-arm-gnueabihf@npm:4.43.0":
+  version: 4.43.0
+  resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.43.0"
   conditions: os=linux & cpu=arm & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm-musleabihf@npm:4.31.0":
-  version: 4.31.0
-  resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.31.0"
+"@rollup/rollup-linux-arm-musleabihf@npm:4.43.0":
+  version: 4.43.0
+  resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.43.0"
   conditions: os=linux & cpu=arm & libc=musl
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm64-gnu@npm:4.31.0":
-  version: 4.31.0
-  resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.31.0"
+"@rollup/rollup-linux-arm64-gnu@npm:4.43.0":
+  version: 4.43.0
+  resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.43.0"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm64-musl@npm:4.31.0":
-  version: 4.31.0
-  resolution: "@rollup/rollup-linux-arm64-musl@npm:4.31.0"
+"@rollup/rollup-linux-arm64-musl@npm:4.43.0":
+  version: 4.43.0
+  resolution: "@rollup/rollup-linux-arm64-musl@npm:4.43.0"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-loongarch64-gnu@npm:4.31.0":
-  version: 4.31.0
-  resolution: "@rollup/rollup-linux-loongarch64-gnu@npm:4.31.0"
+"@rollup/rollup-linux-loongarch64-gnu@npm:4.43.0":
+  version: 4.43.0
+  resolution: "@rollup/rollup-linux-loongarch64-gnu@npm:4.43.0"
   conditions: os=linux & cpu=loong64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-powerpc64le-gnu@npm:4.31.0":
-  version: 4.31.0
-  resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.31.0"
+"@rollup/rollup-linux-powerpc64le-gnu@npm:4.43.0":
+  version: 4.43.0
+  resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.43.0"
   conditions: os=linux & cpu=ppc64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-riscv64-gnu@npm:4.31.0":
-  version: 4.31.0
-  resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.31.0"
+"@rollup/rollup-linux-riscv64-gnu@npm:4.43.0":
+  version: 4.43.0
+  resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.43.0"
   conditions: os=linux & cpu=riscv64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-s390x-gnu@npm:4.31.0":
-  version: 4.31.0
-  resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.31.0"
+"@rollup/rollup-linux-riscv64-musl@npm:4.43.0":
+  version: 4.43.0
+  resolution: "@rollup/rollup-linux-riscv64-musl@npm:4.43.0"
+  conditions: os=linux & cpu=riscv64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-s390x-gnu@npm:4.43.0":
+  version: 4.43.0
+  resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.43.0"
   conditions: os=linux & cpu=s390x & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-x64-gnu@npm:4.31.0":
-  version: 4.31.0
-  resolution: "@rollup/rollup-linux-x64-gnu@npm:4.31.0"
+"@rollup/rollup-linux-x64-gnu@npm:4.43.0":
+  version: 4.43.0
+  resolution: "@rollup/rollup-linux-x64-gnu@npm:4.43.0"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-x64-musl@npm:4.31.0":
-  version: 4.31.0
-  resolution: "@rollup/rollup-linux-x64-musl@npm:4.31.0"
+"@rollup/rollup-linux-x64-musl@npm:4.43.0":
+  version: 4.43.0
+  resolution: "@rollup/rollup-linux-x64-musl@npm:4.43.0"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-arm64-msvc@npm:4.31.0":
-  version: 4.31.0
-  resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.31.0"
+"@rollup/rollup-win32-arm64-msvc@npm:4.43.0":
+  version: 4.43.0
+  resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.43.0"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-ia32-msvc@npm:4.31.0":
-  version: 4.31.0
-  resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.31.0"
+"@rollup/rollup-win32-ia32-msvc@npm:4.43.0":
+  version: 4.43.0
+  resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.43.0"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-x64-msvc@npm:4.31.0":
-  version: 4.31.0
-  resolution: "@rollup/rollup-win32-x64-msvc@npm:4.31.0"
+"@rollup/rollup-win32-x64-msvc@npm:4.43.0":
+  version: 4.43.0
+  resolution: "@rollup/rollup-win32-x64-msvc@npm:4.43.0"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
@@ -1164,37 +1188,48 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@sveltejs/acorn-typescript@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "@sveltejs/acorn-typescript@npm:1.0.5"
+  peerDependencies:
+    acorn: ^8.9.0
+  checksum: 10c0/5f5393ca3afc3d532baa3d418b51972ad26966ff352e13a46c6baa6d7099655acf2668be1d693e9daba2d3994a40b4c9a6b3157340e9cdfe2ffb52e4334630fd
+  languageName: node
+  linkType: hard
+
 "@sveltejs/adapter-static@npm:^3.0.0":
-  version: 3.0.6
-  resolution: "@sveltejs/adapter-static@npm:3.0.6"
+  version: 3.0.8
+  resolution: "@sveltejs/adapter-static@npm:3.0.8"
   peerDependencies:
     "@sveltejs/kit": ^2.0.0
-  checksum: 10c0/39fa8be56a9acf468d25d1d7608f3b89541a471afd6021ba627bc228e929cbe1f0c1c6c75e9e1da27e0873c4cd38d189833f4966b708780dae4f3e5e2faf7833
+  checksum: 10c0/0ae958463d074c49b733059f53b685ee26e0debe9207aad5d77ea1b651a1efc743647f9c0cf78d72ae0243e23ece4b620b0600f17ec83e732791a265fea6df4f
   languageName: node
   linkType: hard
 
 "@sveltejs/kit@npm:^2.20.7":
-  version: 2.20.7
-  resolution: "@sveltejs/kit@npm:2.20.7"
+  version: 2.21.5
+  resolution: "@sveltejs/kit@npm:2.21.5"
   dependencies:
+    "@sveltejs/acorn-typescript": "npm:^1.0.5"
     "@types/cookie": "npm:^0.6.0"
+    acorn: "npm:^8.14.1"
     cookie: "npm:^0.6.0"
     devalue: "npm:^5.1.0"
     esm-env: "npm:^1.2.2"
-    import-meta-resolve: "npm:^4.1.0"
     kleur: "npm:^4.1.5"
     magic-string: "npm:^0.30.5"
     mrmime: "npm:^2.0.0"
     sade: "npm:^1.8.1"
     set-cookie-parser: "npm:^2.6.0"
     sirv: "npm:^3.0.0"
+    vitefu: "npm:^1.0.6"
   peerDependencies:
     "@sveltejs/vite-plugin-svelte": ^3.0.0 || ^4.0.0-next.1 || ^5.0.0
     svelte: ^4.0.0 || ^5.0.0-next.0
     vite: ^5.0.3 || ^6.0.0
   bin:
     svelte-kit: svelte-kit.js
-  checksum: 10c0/f1c0e477e981b5dc3fd04bd636e68f77c1947bd4b7200914b1b3553095f34ed9ca249765be7e04e89b21ebeb58227546fd807238f558c0d6e7d6559e4ee61b26
+  checksum: 10c0/56728cad376f20811d1b519d25bfe5a05f58513059b369afb430cb9f6213771d71c58904ebdabbaa0a8d321c8fd392922370c902d86f43b87887db3f04c48630
   languageName: node
   linkType: hard
 
@@ -1252,11 +1287,11 @@ __metadata:
   linkType: hard
 
 "@types/codemirror@npm:^5.60.0":
-  version: 5.60.15
-  resolution: "@types/codemirror@npm:5.60.15"
+  version: 5.60.16
+  resolution: "@types/codemirror@npm:5.60.16"
   dependencies:
     "@types/tern": "npm:*"
-  checksum: 10c0/4d32ee8d335650956fc59b26f29909de0656ce9c68f7527caf2aa68e6a6a2e8be6ec7a6b80c02bfab7ac6b17040d6c2d83d394b9d00fdbf4b5588691f2efbba6
+  checksum: 10c0/34d82229b5c4e702deaf4c8f8822bcf79a3bf68bc9bbadd630aa54122566f7e353180902906b5512f0539e66f8eb8c878c98335fe6793375575d74746a26fb64
   languageName: node
   linkType: hard
 
@@ -1402,9 +1437,9 @@ __metadata:
   linkType: hard
 
 "@types/d3-path@npm:*":
-  version: 3.1.0
-  resolution: "@types/d3-path@npm:3.1.0"
-  checksum: 10c0/85e8b3aa968a60a5b33198ade06ae7ffedcf9a22d86f24859ff58e014b053ccb7141ec163b78d547bc8215bb12bb54171c666057ab6156912814005b686afb31
+  version: 3.1.1
+  resolution: "@types/d3-path@npm:3.1.1"
+  checksum: 10c0/2c36eb31ebaf2ce4712e793fd88087117976f7c4ed69cc2431825f999c8c77cca5cea286f3326432b770739ac6ccd5d04d851eb65e7a4dbcc10c982b49ad2c02
   languageName: node
   linkType: hard
 
@@ -1430,18 +1465,18 @@ __metadata:
   linkType: hard
 
 "@types/d3-scale-chromatic@npm:*":
-  version: 3.0.3
-  resolution: "@types/d3-scale-chromatic@npm:3.0.3"
-  checksum: 10c0/2f48c6f370edba485b57b73573884ded71914222a4580140ff87ee96e1d55ccd05b1d457f726e234a31269b803270ac95d5554229ab6c43c7e4a9894e20dd490
+  version: 3.1.0
+  resolution: "@types/d3-scale-chromatic@npm:3.1.0"
+  checksum: 10c0/93c564e02d2e97a048e18fe8054e4a935335da6ab75a56c3df197beaa87e69122eef0dfbeb7794d4a444a00e52e3123514ee27cec084bd21f6425b7037828cc2
   languageName: node
   linkType: hard
 
 "@types/d3-scale@npm:*":
-  version: 4.0.8
-  resolution: "@types/d3-scale@npm:4.0.8"
+  version: 4.0.9
+  resolution: "@types/d3-scale@npm:4.0.9"
   dependencies:
     "@types/d3-time": "npm:*"
-  checksum: 10c0/57de90e4016f640b83cb960b7e3a0ab3ed02e720898840ddc5105264ffcfea73336161442fdc91895377c2d2f91904d637282f16852b8535b77e15a761c8e99e
+  checksum: 10c0/4ac44233c05cd50b65b33ecb35d99fdf07566bcdbc55bc1306b2f27d1c5134d8c560d356f2c8e76b096e9125ffb8d26d95f78d56e210d1c542cb255bdf31d6c8
   languageName: node
   linkType: hard
 
@@ -1453,11 +1488,11 @@ __metadata:
   linkType: hard
 
 "@types/d3-shape@npm:*":
-  version: 3.1.6
-  resolution: "@types/d3-shape@npm:3.1.6"
+  version: 3.1.7
+  resolution: "@types/d3-shape@npm:3.1.7"
   dependencies:
     "@types/d3-path": "npm:*"
-  checksum: 10c0/0625715925d3c7ed3d44ce998b42c993f063c31605b6e4a8046c4be0fe724e2d214fc83e86d04f429a30a6e1f439053e92b0d9e59e1180c3a5327b4a6e79fa0a
+  checksum: 10c0/38e59771c1c4c83b67aa1f941ce350410522a149d2175832fdc06396b2bb3b2c1a2dd549e0f8230f9f24296ee5641a515eaf10f55ee1ef6c4f83749e2dd7dcfd
   languageName: node
   linkType: hard
 
@@ -1469,9 +1504,9 @@ __metadata:
   linkType: hard
 
 "@types/d3-time@npm:*":
-  version: 3.0.3
-  resolution: "@types/d3-time@npm:3.0.3"
-  checksum: 10c0/245a8aadca504df27edf730de502e47a68f16ae795c86b5ca35e7afa91c133aa9ef4d08778f8cf1ed2be732f89a4105ba4b437ce2afbdfd17d3d937b6ba5f568
+  version: 3.0.4
+  resolution: "@types/d3-time@npm:3.0.4"
+  checksum: 10c0/6d9e2255d63f7a313a543113920c612e957d70da4fb0890931da6c2459010291b8b1f95e149a538500c1c99e7e6c89ffcce5554dd29a31ff134a38ea94b6d174
   languageName: node
   linkType: hard
 
@@ -1546,24 +1581,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/estree@npm:*, @types/estree@npm:1.0.6, @types/estree@npm:^1.0.0, @types/estree@npm:^1.0.5, @types/estree@npm:^1.0.6":
-  version: 1.0.6
-  resolution: "@types/estree@npm:1.0.6"
-  checksum: 10c0/cdfd751f6f9065442cd40957c07fd80361c962869aa853c1c2fd03e101af8b9389d8ff4955a43a6fcfa223dd387a089937f95be0f3eec21ca527039fd2d9859a
+"@types/estree@npm:*, @types/estree@npm:^1.0.0, @types/estree@npm:^1.0.5, @types/estree@npm:^1.0.6":
+  version: 1.0.8
+  resolution: "@types/estree@npm:1.0.8"
+  checksum: 10c0/39d34d1afaa338ab9763f37ad6066e3f349444f9052b9676a7cc0252ef9485a41c6d81c9c4e0d26e9077993354edf25efc853f3224dd4b447175ef62bdcc86a5
+  languageName: node
+  linkType: hard
+
+"@types/estree@npm:1.0.7":
+  version: 1.0.7
+  resolution: "@types/estree@npm:1.0.7"
+  checksum: 10c0/be815254316882f7c40847336cd484c3bc1c3e34f710d197160d455dc9d6d050ffbf4c3bc76585dba86f737f020ab20bdb137ebe0e9116b0c86c7c0342221b8c
   languageName: node
   linkType: hard
 
 "@types/fabric@npm:^5.3.7":
-  version: 5.3.9
-  resolution: "@types/fabric@npm:5.3.9"
-  checksum: 10c0/fc3befd764675dd7e2bb4dc817d8a67e7dff0f57cb1eb1a3ca04bdb6ab5acd25d9c1c586b64a0b91e6d61f0350f805c569b60578e0148e97037f279da2fe1695
+  version: 5.3.10
+  resolution: "@types/fabric@npm:5.3.10"
+  checksum: 10c0/5c3a81246202cbce9421afa09c2daf454d514dd2fa4246b1a9bf64d601a008666aa13dde99a9580817df1b81b6b7fa94da8343af91662ac3d96142c8d5a9a7e6
   languageName: node
   linkType: hard
 
 "@types/geojson@npm:*":
-  version: 7946.0.14
-  resolution: "@types/geojson@npm:7946.0.14"
-  checksum: 10c0/54f3997708fa2970c03eeb31f7e4540a0eb6387b15e9f8a60513a1409c23cafec8d618525404573468b59c6fecbfd053724b3327f7fca416729c26271d799f55
+  version: 7946.0.16
+  resolution: "@types/geojson@npm:7946.0.16"
+  checksum: 10c0/1ff24a288bd5860b766b073ead337d31d73bdc715e5b50a2cee5cb0af57a1ed02cc04ef295f5fa68dc40fe3e4f104dd31282b2b818a5ba3231bc1001ba084e3c
   languageName: node
   linkType: hard
 
@@ -1577,11 +1619,11 @@ __metadata:
   linkType: hard
 
 "@types/jqueryui@npm:^1.12.13":
-  version: 1.12.23
-  resolution: "@types/jqueryui@npm:1.12.23"
+  version: 1.12.24
+  resolution: "@types/jqueryui@npm:1.12.24"
   dependencies:
     "@types/jquery": "npm:*"
-  checksum: 10c0/2b28473f289dbdbac4b2932734b36ebf714cbdf9bff8127e9b3270ec6778ea5144b98788b963e2d23547d3a3c5b69db5892349d26a680872822471e95c12dab1
+  checksum: 10c0/95afc94bfa4cf31de6b34b7770de849ccb2b5c2c9d8e092e6b9d3a1e0b4ee913659ede75eeebcbf8cb00a59d73da0da648da2be15fea2b94dd8ddeb237027bcf
   languageName: node
   linkType: hard
 
@@ -1609,9 +1651,9 @@ __metadata:
   linkType: hard
 
 "@types/lodash@npm:*":
-  version: 4.17.12
-  resolution: "@types/lodash@npm:4.17.12"
-  checksum: 10c0/106008f628ea3c74ed7ee7842dee79e230c84e3721ac38c293700031adb5bd130113048c22f476dbde0d0c119506b0fc447d4bd62eca922682d11e00e1377967
+  version: 4.17.17
+  resolution: "@types/lodash@npm:4.17.17"
+  checksum: 10c0/8e75df02a15f04d4322c5a503e4efd0e7a92470570ce80f17e9f11ce2b1f1a7c994009c9bcff39f07e0f9ffd8ccaff09b3598997c404b801abd5a7eee5a639dc
   languageName: node
   linkType: hard
 
@@ -1623,11 +1665,11 @@ __metadata:
   linkType: hard
 
 "@types/node@npm:^20":
-  version: 20.17.16
-  resolution: "@types/node@npm:20.17.16"
+  version: 20.19.1
+  resolution: "@types/node@npm:20.19.1"
   dependencies:
-    undici-types: "npm:~6.19.2"
-  checksum: 10c0/50c589dd6a377238bc51b6fb5b8fc60ff6d688df0bde621d4a9fc59f480eb956cdf6d46052e1cb9536f150bc62e9194ddc733aa78b65e812155b4d3a32717de2
+    undici-types: "npm:~6.21.0"
+  checksum: 10c0/4f1c3c8ec24c79af6802b376fa307904abf19accb9ac291de0bfc02220494c8b027d3ef733dbf64cc09b37594f22f679a15eabb30f3785bcfcc13bd9bbd8c0e2
   languageName: node
   linkType: hard
 
@@ -1639,9 +1681,9 @@ __metadata:
   linkType: hard
 
 "@types/semver@npm:^7.3.12":
-  version: 7.5.8
-  resolution: "@types/semver@npm:7.5.8"
-  checksum: 10c0/8663ff927234d1c5fcc04b33062cb2b9fcfbe0f5f351ed26c4d1e1581657deebd506b41ff7fdf89e787e3d33ce05854bc01686379b89e9c49b564c4cfa988efa
+  version: 7.7.0
+  resolution: "@types/semver@npm:7.7.0"
+  checksum: 10c0/6b5f65f647474338abbd6ee91a6bbab434662ddb8fe39464edcbcfc96484d388baad9eb506dff217b6fc1727a88894930eb1f308617161ac0f376fe06be4e1ee
   languageName: node
   linkType: hard
 
@@ -1783,20 +1825,20 @@ __metadata:
   linkType: hard
 
 "@typescript/vfs@npm:^1.4.0":
-  version: 1.6.0
-  resolution: "@typescript/vfs@npm:1.6.0"
+  version: 1.6.1
+  resolution: "@typescript/vfs@npm:1.6.1"
   dependencies:
     debug: "npm:^4.1.1"
   peerDependencies:
     typescript: "*"
-  checksum: 10c0/35e17d92f0d4f33c4be12fc4468196788794bc2edc1a371f1023c42314f6d1e0e851f07b45732a634ef750e61e2ef8769e8ab4f6a6c511cea8da397fa87852ff
+  checksum: 10c0/3878686aff4bf26813dad9242aa8e01c5c9734f4d37f31035f93e9c8b850f15ec6a4480f04cf3a3a1cbf78a4e796ae1be5d6c54f7f7c91556eafee913a8d0da4
   languageName: node
   linkType: hard
 
 "@ungap/structured-clone@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@ungap/structured-clone@npm:1.2.0"
-  checksum: 10c0/8209c937cb39119f44eb63cf90c0b73e7c754209a6411c707be08e50e29ee81356dca1a848a405c8bdeebfe2f5e4f831ad310ae1689eeef65e7445c090c6657d
+  version: 1.3.0
+  resolution: "@ungap/structured-clone@npm:1.3.0"
+  checksum: 10c0/0fc3097c2540ada1fc340ee56d58d96b5b536a2a0dab6e3ec17d4bfc8c4c86db345f61a375a8185f9da96f01c69678f836a2b57eeaa9e4b8eeafd26428e57b0a
   languageName: node
   linkType: hard
 
@@ -1896,9 +1938,9 @@ __metadata:
   linkType: hard
 
 "abbrev@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "abbrev@npm:3.0.0"
-  checksum: 10c0/049704186396f571650eb7b22ed3627b77a5aedf98bb83caf2eac81ca2a3e25e795394b0464cfb2d6076df3db6a5312139eac5b6a126ca296ac53c5008069c28
+  version: 3.0.1
+  resolution: "abbrev@npm:3.0.1"
+  checksum: 10c0/21ba8f574ea57a3106d6d35623f2c4a9111d9ee3e9a5be47baed46ec2457d2eac46e07a5c4a60186f88cb98abbe3e24f2d4cca70bc2b12f1692523e2209a9ccf
   languageName: node
   linkType: hard
 
@@ -1921,15 +1963,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-typescript@npm:^1.4.13":
-  version: 1.4.13
-  resolution: "acorn-typescript@npm:1.4.13"
-  peerDependencies:
-    acorn: ">=8.9.0"
-  checksum: 10c0/f2f17cf03379d63beeb007f0feea02cebbd9af261f6b5619ea7345b177bd7a5f99752927cbf652baa3fc97962ae4561592093ab0a1c3e00ca4f354ba23c557ae
-  languageName: node
-  linkType: hard
-
 "acorn-walk@npm:^7.1.1":
   version: 7.2.0
   resolution: "acorn-walk@npm:7.2.0"
@@ -1946,12 +1979,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^8.12.1, acorn@npm:^8.5.0, acorn@npm:^8.9.0":
-  version: 8.13.0
-  resolution: "acorn@npm:8.13.0"
+"acorn@npm:^8.12.1, acorn@npm:^8.14.1, acorn@npm:^8.5.0, acorn@npm:^8.9.0":
+  version: 8.15.0
+  resolution: "acorn@npm:8.15.0"
   bin:
     acorn: bin/acorn
-  checksum: 10c0/f35dd53d68177c90699f4c37d0bb205b8abe036d955d0eb011ddb7f14a81e6fd0f18893731c457c1b5bd96754683f4c3d80d9a5585ddecaa53cdf84e0b3d68f7
+  checksum: 10c0/dec73ff59b7d6628a01eebaece7f2bdb8bb62b9b5926dcad0f8931f2b8b79c2be21f6c68ac095592adb5adb15831a3635d9343e6a91d028bbe85d564875ec3ec
   languageName: node
   linkType: hard
 
@@ -2040,6 +2073,7 @@ __metadata:
     sass: "npm:<1.77"
     svelte: "npm:^5.17.3"
     svelte-check: "npm:^3.4.4"
+    svelte-contextmenu: "npm:^1.0.2"
     svelte-preprocess: "npm:^5.0.4"
     svelte-preprocess-esbuild: "npm:^3.0.1"
     svgo: "npm:^3.2.0"
@@ -2105,13 +2139,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-buffer-byte-length@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "array-buffer-byte-length@npm:1.0.1"
+"array-buffer-byte-length@npm:^1.0.1, array-buffer-byte-length@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "array-buffer-byte-length@npm:1.0.2"
   dependencies:
-    call-bind: "npm:^1.0.5"
-    is-array-buffer: "npm:^3.0.4"
-  checksum: 10c0/f5cdf54527cd18a3d2852ddf73df79efec03829e7373a8322ef5df2b4ef546fb365c19c71d6b42d641cb6bfe0f1a2f19bc0ece5b533295f86d7c3d522f228917
+    call-bound: "npm:^1.0.3"
+    is-array-buffer: "npm:^3.0.5"
+  checksum: 10c0/74e1d2d996941c7a1badda9cabb7caab8c449db9086407cad8a1b71d2604cc8abf105db8ca4e02c04579ec58b7be40279ddb09aea4784832984485499f48432d
   languageName: node
   linkType: hard
 
@@ -2123,16 +2157,18 @@ __metadata:
   linkType: hard
 
 "array-includes@npm:^3.1.8":
-  version: 3.1.8
-  resolution: "array-includes@npm:3.1.8"
+  version: 3.1.9
+  resolution: "array-includes@npm:3.1.9"
   dependencies:
-    call-bind: "npm:^1.0.7"
+    call-bind: "npm:^1.0.8"
+    call-bound: "npm:^1.0.4"
     define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.23.2"
-    es-object-atoms: "npm:^1.0.0"
-    get-intrinsic: "npm:^1.2.4"
-    is-string: "npm:^1.0.7"
-  checksum: 10c0/5b1004d203e85873b96ddc493f090c9672fd6c80d7a60b798da8a14bff8a670ff95db5aafc9abc14a211943f05220dacf8ea17638ae0af1a6a47b8c0b48ce370
+    es-abstract: "npm:^1.24.0"
+    es-object-atoms: "npm:^1.1.1"
+    get-intrinsic: "npm:^1.3.0"
+    is-string: "npm:^1.1.1"
+    math-intrinsics: "npm:^1.1.0"
+  checksum: 10c0/0235fa69078abeac05ac4250699c44996bc6f774a9cbe45db48674ce6bd142f09b327d31482ff75cf03344db4ea03eae23edb862d59378b484b47ed842574856
   languageName: node
   linkType: hard
 
@@ -2144,56 +2180,56 @@ __metadata:
   linkType: hard
 
 "array.prototype.findlastindex@npm:^1.2.5":
-  version: 1.2.5
-  resolution: "array.prototype.findlastindex@npm:1.2.5"
+  version: 1.2.6
+  resolution: "array.prototype.findlastindex@npm:1.2.6"
   dependencies:
-    call-bind: "npm:^1.0.7"
+    call-bind: "npm:^1.0.8"
+    call-bound: "npm:^1.0.4"
     define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.23.2"
+    es-abstract: "npm:^1.23.9"
     es-errors: "npm:^1.3.0"
-    es-object-atoms: "npm:^1.0.0"
-    es-shim-unscopables: "npm:^1.0.2"
-  checksum: 10c0/962189487728b034f3134802b421b5f39e42ee2356d13b42d2ddb0e52057ffdcc170b9524867f4f0611a6f638f4c19b31e14606e8bcbda67799e26685b195aa3
+    es-object-atoms: "npm:^1.1.1"
+    es-shim-unscopables: "npm:^1.1.0"
+  checksum: 10c0/82559310d2e57ec5f8fc53d7df420e3abf0ba497935de0a5570586035478ba7d07618cb18e2d4ada2da514c8fb98a034aaf5c06caa0a57e2f7f4c4adedef5956
   languageName: node
   linkType: hard
 
 "array.prototype.flat@npm:^1.3.2":
-  version: 1.3.2
-  resolution: "array.prototype.flat@npm:1.3.2"
+  version: 1.3.3
+  resolution: "array.prototype.flat@npm:1.3.3"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-    es-shim-unscopables: "npm:^1.0.0"
-  checksum: 10c0/a578ed836a786efbb6c2db0899ae80781b476200617f65a44846cb1ed8bd8b24c8821b83703375d8af639c689497b7b07277060024b9919db94ac3e10dc8a49b
+    call-bind: "npm:^1.0.8"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.5"
+    es-shim-unscopables: "npm:^1.0.2"
+  checksum: 10c0/d90e04dfbc43bb96b3d2248576753d1fb2298d2d972e29ca7ad5ec621f0d9e16ff8074dae647eac4f31f4fb7d3f561a7ac005fb01a71f51705a13b5af06a7d8a
   languageName: node
   linkType: hard
 
 "array.prototype.flatmap@npm:^1.3.2":
-  version: 1.3.2
-  resolution: "array.prototype.flatmap@npm:1.3.2"
+  version: 1.3.3
+  resolution: "array.prototype.flatmap@npm:1.3.3"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-    es-shim-unscopables: "npm:^1.0.0"
-  checksum: 10c0/67b3f1d602bb73713265145853128b1ad77cc0f9b833c7e1e056b323fbeac41a4ff1c9c99c7b9445903caea924d9ca2450578d9011913191aa88cc3c3a4b54f4
+    call-bind: "npm:^1.0.8"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.5"
+    es-shim-unscopables: "npm:^1.0.2"
+  checksum: 10c0/ba899ea22b9dc9bf276e773e98ac84638ed5e0236de06f13d63a90b18ca9e0ec7c97d622d899796e3773930b946cd2413d098656c0c5d8cc58c6f25c21e6bd54
   languageName: node
   linkType: hard
 
-"arraybuffer.prototype.slice@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "arraybuffer.prototype.slice@npm:1.0.3"
+"arraybuffer.prototype.slice@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "arraybuffer.prototype.slice@npm:1.0.4"
   dependencies:
     array-buffer-byte-length: "npm:^1.0.1"
-    call-bind: "npm:^1.0.5"
+    call-bind: "npm:^1.0.8"
     define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.22.3"
-    es-errors: "npm:^1.2.1"
-    get-intrinsic: "npm:^1.2.3"
+    es-abstract: "npm:^1.23.5"
+    es-errors: "npm:^1.3.0"
+    get-intrinsic: "npm:^1.2.6"
     is-array-buffer: "npm:^3.0.4"
-    is-shared-array-buffer: "npm:^1.0.2"
-  checksum: 10c0/d32754045bcb2294ade881d45140a5e52bda2321b9e98fa514797b7f0d252c4c5ab0d1edb34112652c62fa6a9398def568da63a4d7544672229afea283358c36
+  checksum: 10c0/2f2459caa06ae0f7f615003f9104b01f6435cc803e11bd2a655107d52a1781dc040532dc44d93026b694cc18793993246237423e13a5337e86b43ed604932c06
   languageName: node
   linkType: hard
 
@@ -2205,11 +2241,18 @@ __metadata:
   linkType: hard
 
 "ast-metadata-inferer@npm:^0.8.0":
-  version: 0.8.0
-  resolution: "ast-metadata-inferer@npm:0.8.0"
+  version: 0.8.1
+  resolution: "ast-metadata-inferer@npm:0.8.1"
   dependencies:
-    "@mdn/browser-compat-data": "npm:^5.2.34"
-  checksum: 10c0/5af230afb50ead8efbd0be5284deadada461566e36b9e84b1a70028503eda5042f5fee5c8b0cdd47691b2e4b0591a91d7c09e853c839eae8eaab07ee101f3938
+    "@mdn/browser-compat-data": "npm:^5.6.19"
+  checksum: 10c0/4bfa6c268951f31123c2ea902d13d8fda5a226679a028eab7ccc063b5cc10964b07a30f075c3876fadaec315df9a894490ed24e6cb5c185afd373da42fff7a4f
+  languageName: node
+  linkType: hard
+
+"async-function@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "async-function@npm:1.0.0"
+  checksum: 10c0/669a32c2cb7e45091330c680e92eaeb791bc1d4132d827591e499cd1f776ff5a873e77e5f92d0ce795a8d60f10761dec9ddfe7225a5de680f5d357f67b1aac73
   languageName: node
   linkType: hard
 
@@ -2258,37 +2301,37 @@ __metadata:
   linkType: hard
 
 "bootstrap-icons@npm:^1.10.5":
-  version: 1.11.3
-  resolution: "bootstrap-icons@npm:1.11.3"
-  checksum: 10c0/37eefd418c6bbbb304bdff0f2ed527f82c3c6f331d3e3a7c4aa8bbdbaf7118bb86725b024f85e7d738c613d48c7353cd81c09e58e9d8d34c5633960fdec8410b
+  version: 1.13.1
+  resolution: "bootstrap-icons@npm:1.13.1"
+  checksum: 10c0/2c1adeb1796502e67b476ce049c86bc3a7ff7984c61777e056820389a8db5ec6535c12a33f76f3ed52674bca4c01472065a7fbcde6cc384ebb86c2eae51390bd
   languageName: node
   linkType: hard
 
 "bootstrap@npm:^5.3.0":
-  version: 5.3.3
-  resolution: "bootstrap@npm:5.3.3"
+  version: 5.3.6
+  resolution: "bootstrap@npm:5.3.6"
   peerDependencies:
     "@popperjs/core": ^2.11.8
-  checksum: 10c0/bb68ca7b763977b9cce40cb5b8c676ae19a716d2f5d15009fa7bdbcec9dea426968e3cb748fbed7592fbf10edd7c749aea841c2920996a7c1aa5e0a6e2d4c2ad
+  checksum: 10c0/1b3f8f4f265463b3cd6aece84135b521ff55f3225a5c16c6981fdd8fb2bfb53b35b0815bff63382e5c83f6d537c017ae8392afe34366d5d547e4fd507d086e1c
   languageName: node
   linkType: hard
 
 "brace-expansion@npm:^1.1.7":
-  version: 1.1.11
-  resolution: "brace-expansion@npm:1.1.11"
+  version: 1.1.12
+  resolution: "brace-expansion@npm:1.1.12"
   dependencies:
     balanced-match: "npm:^1.0.0"
     concat-map: "npm:0.0.1"
-  checksum: 10c0/695a56cd058096a7cb71fb09d9d6a7070113c7be516699ed361317aca2ec169f618e28b8af352e02ab4233fb54eb0168460a40dc320bab0034b36ab59aaad668
+  checksum: 10c0/975fecac2bb7758c062c20d0b3b6288c7cc895219ee25f0a64a9de662dbac981ff0b6e89909c3897c1f84fa353113a721923afdec5f8b2350255b097f12b1f73
   languageName: node
   linkType: hard
 
 "brace-expansion@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "brace-expansion@npm:2.0.1"
+  version: 2.0.2
+  resolution: "brace-expansion@npm:2.0.2"
   dependencies:
     balanced-match: "npm:^1.0.0"
-  checksum: 10c0/b358f2fe060e2d7a87aa015979ecea07f3c37d4018f8d6deb5bd4c229ad3a0384fe6029bb76cd8be63c81e516ee52d1a0673edbe2023d53a5191732ae3c3e49f
+  checksum: 10c0/6d117a4c793488af86b83172deb6af143e94c17bc53b0b3cec259733923b4ca84679d506ac261f4ba3c7ed37c46018e2ff442f9ce453af8643ecd64f4a54e6cf
   languageName: node
   linkType: hard
 
@@ -2309,16 +2352,16 @@ __metadata:
   linkType: hard
 
 "browserslist@npm:^4.21.10":
-  version: 4.24.2
-  resolution: "browserslist@npm:4.24.2"
+  version: 4.25.0
+  resolution: "browserslist@npm:4.25.0"
   dependencies:
-    caniuse-lite: "npm:^1.0.30001669"
-    electron-to-chromium: "npm:^1.5.41"
-    node-releases: "npm:^2.0.18"
-    update-browserslist-db: "npm:^1.1.1"
+    caniuse-lite: "npm:^1.0.30001718"
+    electron-to-chromium: "npm:^1.5.160"
+    node-releases: "npm:^2.0.19"
+    update-browserslist-db: "npm:^1.1.3"
   bin:
     browserslist: cli.js
-  checksum: 10c0/d747c9fb65ed7b4f1abcae4959405707ed9a7b835639f8a9ba0da2911995a6ab9b0648fd05baf2a4d4e3cf7f9fdbad56d3753f91881e365992c1d49c8d88ff7a
+  checksum: 10c0/cc16c55b4468b18684a0e1ca303592b38635b1155d6724f172407192737a2f405b8030d87a05813729592793445b3d15e737b0055f901cdecccb29b1e580a1c5
   languageName: node
   linkType: hard
 
@@ -2363,16 +2406,35 @@ __metadata:
   languageName: node
   linkType: hard
 
-"call-bind@npm:^1.0.2, call-bind@npm:^1.0.5, call-bind@npm:^1.0.6, call-bind@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "call-bind@npm:1.0.7"
+"call-bind-apply-helpers@npm:^1.0.0, call-bind-apply-helpers@npm:^1.0.1, call-bind-apply-helpers@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "call-bind-apply-helpers@npm:1.0.2"
   dependencies:
-    es-define-property: "npm:^1.0.0"
     es-errors: "npm:^1.3.0"
     function-bind: "npm:^1.1.2"
+  checksum: 10c0/47bd9901d57b857590431243fea704ff18078b16890a6b3e021e12d279bbf211d039155e27d7566b374d49ee1f8189344bac9833dec7a20cdec370506361c938
+  languageName: node
+  linkType: hard
+
+"call-bind@npm:^1.0.7, call-bind@npm:^1.0.8":
+  version: 1.0.8
+  resolution: "call-bind@npm:1.0.8"
+  dependencies:
+    call-bind-apply-helpers: "npm:^1.0.0"
+    es-define-property: "npm:^1.0.0"
     get-intrinsic: "npm:^1.2.4"
-    set-function-length: "npm:^1.2.1"
-  checksum: 10c0/a3ded2e423b8e2a265983dba81c27e125b48eefb2655e7dfab6be597088da3d47c47976c24bc51b8fd9af1061f8f87b4ab78a314f3c77784b2ae2ba535ad8b8d
+    set-function-length: "npm:^1.2.2"
+  checksum: 10c0/a13819be0681d915144467741b69875ae5f4eba8961eb0bf322aab63ec87f8250eb6d6b0dcbb2e1349876412a56129ca338592b3829ef4343527f5f18a0752d4
+  languageName: node
+  linkType: hard
+
+"call-bound@npm:^1.0.2, call-bound@npm:^1.0.3, call-bound@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "call-bound@npm:1.0.4"
+  dependencies:
+    call-bind-apply-helpers: "npm:^1.0.2"
+    get-intrinsic: "npm:^1.3.0"
+  checksum: 10c0/f4796a6a0941e71c766aea672f63b72bc61234c4f4964dc6d7606e3664c307e7d77845328a8f3359ce39ddb377fed67318f9ee203dea1d47e46165dcf2917644
   languageName: node
   linkType: hard
 
@@ -2383,10 +2445,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.30001431, caniuse-lite@npm:^1.0.30001524, caniuse-lite@npm:^1.0.30001669":
-  version: 1.0.30001714
-  resolution: "caniuse-lite@npm:1.0.30001714"
-  checksum: 10c0/b0e3372f018c5c177912f0282af98049057d83c80846293a4e3df728644a622db42a9e8971d6b7708d76e0fd4e9f6d5ce93802cf4e6818de80fdf371dc0f6a06
+"caniuse-lite@npm:^1.0.30001431, caniuse-lite@npm:^1.0.30001524, caniuse-lite@npm:^1.0.30001718":
+  version: 1.0.30001723
+  resolution: "caniuse-lite@npm:1.0.30001723"
+  checksum: 10c0/e019503061759b96017c4d27ddd7ca1b48533eabcd0431b51d2e3156f99f6b031075e46c279c0db63424cdfc874bba992caec2db51b922a0f945e686246886f6
   languageName: node
   linkType: hard
 
@@ -2398,15 +2460,15 @@ __metadata:
   linkType: hard
 
 "chai@npm:^5.1.2":
-  version: 5.1.2
-  resolution: "chai@npm:5.1.2"
+  version: 5.2.0
+  resolution: "chai@npm:5.2.0"
   dependencies:
     assertion-error: "npm:^2.0.1"
     check-error: "npm:^2.1.1"
     deep-eql: "npm:^5.0.1"
     loupe: "npm:^3.1.0"
     pathval: "npm:^2.0.0"
-  checksum: 10c0/6c04ff8495b6e535df9c1b062b6b094828454e9a3c9493393e55b2f4dbff7aa2a29a4645133cad160fb00a16196c4dc03dc9bb37e1f4ba9df3b5f50d7533a736
+  checksum: 10c0/dfd1cb719c7cebb051b727672d382a35338af1470065cb12adb01f4ee451bbf528e0e0f9ab2016af5fc1eea4df6e7f4504dc8443f8f00bd8fb87ad32dc516f7d
   languageName: node
   linkType: hard
 
@@ -2447,11 +2509,11 @@ __metadata:
   linkType: hard
 
 "chokidar@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "chokidar@npm:4.0.1"
+  version: 4.0.3
+  resolution: "chokidar@npm:4.0.3"
   dependencies:
     readdirp: "npm:^4.0.1"
-  checksum: 10c0/4bb7a3adc304059810bb6c420c43261a15bb44f610d77c35547addc84faa0374265c3adc67f25d06f363d9a4571962b02679268c40de07676d260de1986efea9
+  checksum: 10c0/a58b9df05bb452f7d105d9e7229ac82fa873741c0c40ddcc7bb82f8a909fbe3f7814c9ebe9bc9a2bef9b737c0ec6e2d699d179048ef06ad3ec46315df0ebe6ad
   languageName: node
   linkType: hard
 
@@ -2470,9 +2532,9 @@ __metadata:
   linkType: hard
 
 "codemirror@npm:^5.63.1":
-  version: 5.65.18
-  resolution: "codemirror@npm:5.65.18"
-  checksum: 10c0/806e00c7081f9a5ba6bc59205d0cf5ada273bc977da9967d04a78e94e27cdfbd41a10409fcf74eea4b12eebe1972e05120771780729a8bc04eef14b1ed20ac98
+  version: 5.65.19
+  resolution: "codemirror@npm:5.65.19"
+  checksum: 10c0/067024d74a9a98721063bcd78373899e827914c92881c595a2d6789649a3c4e061edd892b29bca10995a5450488c9c93fc3998a3c4ed6fd19cba2e97cd23d4e1
   languageName: node
   linkType: hard
 
@@ -2534,7 +2596,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.2":
+"cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.6":
   version: 7.0.6
   resolution: "cross-spawn@npm:7.0.6"
   dependencies:
@@ -2955,48 +3017,48 @@ __metadata:
   languageName: node
   linkType: hard
 
-"data-view-buffer@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "data-view-buffer@npm:1.0.1"
+"data-view-buffer@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "data-view-buffer@npm:1.0.2"
   dependencies:
-    call-bind: "npm:^1.0.6"
+    call-bound: "npm:^1.0.3"
     es-errors: "npm:^1.3.0"
-    is-data-view: "npm:^1.0.1"
-  checksum: 10c0/8984119e59dbed906a11fcfb417d7d861936f16697a0e7216fe2c6c810f6b5e8f4a5281e73f2c28e8e9259027190ac4a33e2a65fdd7fa86ac06b76e838918583
+    is-data-view: "npm:^1.0.2"
+  checksum: 10c0/7986d40fc7979e9e6241f85db8d17060dd9a71bd53c894fa29d126061715e322a4cd47a00b0b8c710394854183d4120462b980b8554012acc1c0fa49df7ad38c
   languageName: node
   linkType: hard
 
-"data-view-byte-length@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "data-view-byte-length@npm:1.0.1"
+"data-view-byte-length@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "data-view-byte-length@npm:1.0.2"
   dependencies:
-    call-bind: "npm:^1.0.7"
+    call-bound: "npm:^1.0.3"
     es-errors: "npm:^1.3.0"
-    is-data-view: "npm:^1.0.1"
-  checksum: 10c0/b7d9e48a0cf5aefed9ab7d123559917b2d7e0d65531f43b2fd95b9d3a6b46042dd3fca597c42bba384e66b70d7ad66ff23932f8367b241f53d93af42cfe04ec2
+    is-data-view: "npm:^1.0.2"
+  checksum: 10c0/f8a4534b5c69384d95ac18137d381f18a5cfae1f0fc1df0ef6feef51ef0d568606d970b69e02ea186c6c0f0eac77fe4e6ad96fec2569cc86c3afcc7475068c55
   languageName: node
   linkType: hard
 
-"data-view-byte-offset@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "data-view-byte-offset@npm:1.0.0"
+"data-view-byte-offset@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "data-view-byte-offset@npm:1.0.1"
   dependencies:
-    call-bind: "npm:^1.0.6"
+    call-bound: "npm:^1.0.2"
     es-errors: "npm:^1.3.0"
     is-data-view: "npm:^1.0.1"
-  checksum: 10c0/21b0d2e53fd6e20cc4257c873bf6d36d77bd6185624b84076c0a1ddaa757b49aaf076254006341d35568e89f52eecd1ccb1a502cfb620f2beca04f48a6a62a8f
+  checksum: 10c0/fa7aa40078025b7810dcffc16df02c480573b7b53ef1205aa6a61533011005c1890e5ba17018c692ce7c900212b547262d33279fde801ad9843edc0863bf78c4
   languageName: node
   linkType: hard
 
 "debug@npm:4, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.7":
-  version: 4.3.7
-  resolution: "debug@npm:4.3.7"
+  version: 4.4.1
+  resolution: "debug@npm:4.4.1"
   dependencies:
     ms: "npm:^2.1.3"
   peerDependenciesMeta:
     supports-color:
       optional: true
-  checksum: 10c0/1471db19c3b06d485a622d62f65947a19a23fbd0dd73f7fd3eafb697eec5360cde447fb075919987899b1a2096e85d35d4eb5a4de09a57600ac9cf7e6c8e768b
+  checksum: 10c0/d2b44bc1afd912b49bb7ebb0d50a860dc93a4dd7d946e8de94abc957bb63726b7dd5aa48c18c2386c379ec024c46692e15ed3ed97d481729f929201e671fcd55
   languageName: node
   linkType: hard
 
@@ -3010,9 +3072,9 @@ __metadata:
   linkType: hard
 
 "decimal.js@npm:^10.3.1":
-  version: 10.4.3
-  resolution: "decimal.js@npm:10.4.3"
-  checksum: 10c0/6d60206689ff0911f0ce968d40f163304a6c1bc739927758e6efc7921cfa630130388966f16bf6ef6b838cb33679fbe8e7a78a2f3c478afce841fd55ac8fb8ee
+  version: 10.5.0
+  resolution: "decimal.js@npm:10.5.0"
+  checksum: 10c0/785c35279df32762143914668df35948920b6c1c259b933e0519a69b7003fc0a5ed2a766b1e1dda02574450c566b21738a45f15e274b47c2ac02072c0d1f3ac3
   languageName: node
   linkType: hard
 
@@ -3048,7 +3110,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"define-properties@npm:^1.2.0, define-properties@npm:^1.2.1":
+"define-properties@npm:^1.2.1":
   version: 1.2.1
   resolution: "define-properties@npm:1.2.1"
   dependencies:
@@ -3169,28 +3231,29 @@ __metadata:
   linkType: hard
 
 "domutils@npm:^3.0.1":
-  version: 3.1.0
-  resolution: "domutils@npm:3.1.0"
+  version: 3.2.2
+  resolution: "domutils@npm:3.2.2"
   dependencies:
     dom-serializer: "npm:^2.0.0"
     domelementtype: "npm:^2.3.0"
     domhandler: "npm:^5.0.3"
-  checksum: 10c0/342d64cf4d07b8a0573fb51e0a6312a88fb520c7fefd751870bf72fa5fc0f2e0cb9a3958a573610b1d608c6e2a69b8e9b4b40f0bfb8f87a71bce4f180cca1887
+  checksum: 10c0/47938f473b987ea71cd59e59626eb8666d3aa8feba5266e45527f3b636c7883cca7e582d901531961f742c519d7514636b7973353b648762b2e3bedbf235fada
   languageName: node
   linkType: hard
 
 "dprint@npm:^0.47.2":
-  version: 0.47.4
-  resolution: "dprint@npm:0.47.4"
+  version: 0.47.6
+  resolution: "dprint@npm:0.47.6"
   dependencies:
-    "@dprint/darwin-arm64": "npm:0.47.4"
-    "@dprint/darwin-x64": "npm:0.47.4"
-    "@dprint/linux-arm64-glibc": "npm:0.47.4"
-    "@dprint/linux-arm64-musl": "npm:0.47.4"
-    "@dprint/linux-x64-glibc": "npm:0.47.4"
-    "@dprint/linux-x64-musl": "npm:0.47.4"
-    "@dprint/win32-arm64": "npm:0.47.4"
-    "@dprint/win32-x64": "npm:0.47.4"
+    "@dprint/darwin-arm64": "npm:0.47.6"
+    "@dprint/darwin-x64": "npm:0.47.6"
+    "@dprint/linux-arm64-glibc": "npm:0.47.6"
+    "@dprint/linux-arm64-musl": "npm:0.47.6"
+    "@dprint/linux-riscv64-glibc": "npm:0.47.6"
+    "@dprint/linux-x64-glibc": "npm:0.47.6"
+    "@dprint/linux-x64-musl": "npm:0.47.6"
+    "@dprint/win32-arm64": "npm:0.47.6"
+    "@dprint/win32-x64": "npm:0.47.6"
   dependenciesMeta:
     "@dprint/darwin-arm64":
       optional: true
@@ -3200,6 +3263,8 @@ __metadata:
       optional: true
     "@dprint/linux-arm64-musl":
       optional: true
+    "@dprint/linux-riscv64-glibc":
+      optional: true
     "@dprint/linux-x64-glibc":
       optional: true
     "@dprint/linux-x64-musl":
@@ -3210,7 +3275,18 @@ __metadata:
       optional: true
   bin:
     dprint: bin.js
-  checksum: 10c0/4d675258908e300f467fe646abac87a7626d83aa2dbe5138194ddbc66900c823ffdb4bd272b3d15103969b60984fd5f57175ec7194fe0f2a0d846fc8881e1b4b
+  checksum: 10c0/48c03f1ed185b3105ecceacc9a262d21f6ad7950f74b7dd00a0a6cfddc9b74185d9637b2a0a1c0644a8dfa78722552f28b1abea808f0baf3a407d83741cdf1bc
+  languageName: node
+  linkType: hard
+
+"dunder-proto@npm:^1.0.0, dunder-proto@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "dunder-proto@npm:1.0.1"
+  dependencies:
+    call-bind-apply-helpers: "npm:^1.0.1"
+    es-errors: "npm:^1.3.0"
+    gopd: "npm:^1.2.0"
+  checksum: 10c0/199f2a0c1c16593ca0a145dbf76a962f8033ce3129f01284d48c45ed4e14fea9bbacd7b3610b6cdc33486cef20385ac054948fefc6272fcce645c09468f93031
   languageName: node
   linkType: hard
 
@@ -3221,10 +3297,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.5.41":
-  version: 1.5.47
-  resolution: "electron-to-chromium@npm:1.5.47"
-  checksum: 10c0/5f8c4a9f0698695960f7bef5242d52b1043020ce50b51fb534409a768847f9bdc9672cb4a6a560eeb8f8b47a04327ae9b31b2cee376cb637b3eb04a4daeaa3b8
+"electron-to-chromium@npm:^1.5.160":
+  version: 1.5.167
+  resolution: "electron-to-chromium@npm:1.5.167"
+  checksum: 10c0/eba07d2d8ae99e1e29f1af380d005c378f71608617ca904cbe4e2b5b72b102b46c5687bdbef855e2214876729655661b2c20248cce425d54c8d40f0785cb998a
   languageName: node
   linkType: hard
 
@@ -3272,70 +3348,76 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.23.0, es-abstract@npm:^1.23.2":
-  version: 1.23.3
-  resolution: "es-abstract@npm:1.23.3"
+"es-abstract@npm:^1.23.2, es-abstract@npm:^1.23.5, es-abstract@npm:^1.23.9, es-abstract@npm:^1.24.0":
+  version: 1.24.0
+  resolution: "es-abstract@npm:1.24.0"
   dependencies:
-    array-buffer-byte-length: "npm:^1.0.1"
-    arraybuffer.prototype.slice: "npm:^1.0.3"
+    array-buffer-byte-length: "npm:^1.0.2"
+    arraybuffer.prototype.slice: "npm:^1.0.4"
     available-typed-arrays: "npm:^1.0.7"
-    call-bind: "npm:^1.0.7"
-    data-view-buffer: "npm:^1.0.1"
-    data-view-byte-length: "npm:^1.0.1"
-    data-view-byte-offset: "npm:^1.0.0"
-    es-define-property: "npm:^1.0.0"
+    call-bind: "npm:^1.0.8"
+    call-bound: "npm:^1.0.4"
+    data-view-buffer: "npm:^1.0.2"
+    data-view-byte-length: "npm:^1.0.2"
+    data-view-byte-offset: "npm:^1.0.1"
+    es-define-property: "npm:^1.0.1"
     es-errors: "npm:^1.3.0"
-    es-object-atoms: "npm:^1.0.0"
-    es-set-tostringtag: "npm:^2.0.3"
-    es-to-primitive: "npm:^1.2.1"
-    function.prototype.name: "npm:^1.1.6"
-    get-intrinsic: "npm:^1.2.4"
-    get-symbol-description: "npm:^1.0.2"
-    globalthis: "npm:^1.0.3"
-    gopd: "npm:^1.0.1"
+    es-object-atoms: "npm:^1.1.1"
+    es-set-tostringtag: "npm:^2.1.0"
+    es-to-primitive: "npm:^1.3.0"
+    function.prototype.name: "npm:^1.1.8"
+    get-intrinsic: "npm:^1.3.0"
+    get-proto: "npm:^1.0.1"
+    get-symbol-description: "npm:^1.1.0"
+    globalthis: "npm:^1.0.4"
+    gopd: "npm:^1.2.0"
     has-property-descriptors: "npm:^1.0.2"
-    has-proto: "npm:^1.0.3"
-    has-symbols: "npm:^1.0.3"
+    has-proto: "npm:^1.2.0"
+    has-symbols: "npm:^1.1.0"
     hasown: "npm:^2.0.2"
-    internal-slot: "npm:^1.0.7"
-    is-array-buffer: "npm:^3.0.4"
+    internal-slot: "npm:^1.1.0"
+    is-array-buffer: "npm:^3.0.5"
     is-callable: "npm:^1.2.7"
-    is-data-view: "npm:^1.0.1"
+    is-data-view: "npm:^1.0.2"
     is-negative-zero: "npm:^2.0.3"
-    is-regex: "npm:^1.1.4"
-    is-shared-array-buffer: "npm:^1.0.3"
-    is-string: "npm:^1.0.7"
-    is-typed-array: "npm:^1.1.13"
-    is-weakref: "npm:^1.0.2"
-    object-inspect: "npm:^1.13.1"
+    is-regex: "npm:^1.2.1"
+    is-set: "npm:^2.0.3"
+    is-shared-array-buffer: "npm:^1.0.4"
+    is-string: "npm:^1.1.1"
+    is-typed-array: "npm:^1.1.15"
+    is-weakref: "npm:^1.1.1"
+    math-intrinsics: "npm:^1.1.0"
+    object-inspect: "npm:^1.13.4"
     object-keys: "npm:^1.1.1"
-    object.assign: "npm:^4.1.5"
-    regexp.prototype.flags: "npm:^1.5.2"
-    safe-array-concat: "npm:^1.1.2"
-    safe-regex-test: "npm:^1.0.3"
-    string.prototype.trim: "npm:^1.2.9"
-    string.prototype.trimend: "npm:^1.0.8"
+    object.assign: "npm:^4.1.7"
+    own-keys: "npm:^1.0.1"
+    regexp.prototype.flags: "npm:^1.5.4"
+    safe-array-concat: "npm:^1.1.3"
+    safe-push-apply: "npm:^1.0.0"
+    safe-regex-test: "npm:^1.1.0"
+    set-proto: "npm:^1.0.0"
+    stop-iteration-iterator: "npm:^1.1.0"
+    string.prototype.trim: "npm:^1.2.10"
+    string.prototype.trimend: "npm:^1.0.9"
     string.prototype.trimstart: "npm:^1.0.8"
-    typed-array-buffer: "npm:^1.0.2"
-    typed-array-byte-length: "npm:^1.0.1"
-    typed-array-byte-offset: "npm:^1.0.2"
-    typed-array-length: "npm:^1.0.6"
-    unbox-primitive: "npm:^1.0.2"
-    which-typed-array: "npm:^1.1.15"
-  checksum: 10c0/d27e9afafb225c6924bee9971a7f25f20c314f2d6cb93a63cada4ac11dcf42040896a6c22e5fb8f2a10767055ed4ddf400be3b1eb12297d281726de470b75666
+    typed-array-buffer: "npm:^1.0.3"
+    typed-array-byte-length: "npm:^1.0.3"
+    typed-array-byte-offset: "npm:^1.0.4"
+    typed-array-length: "npm:^1.0.7"
+    unbox-primitive: "npm:^1.1.0"
+    which-typed-array: "npm:^1.1.19"
+  checksum: 10c0/b256e897be32df5d382786ce8cce29a1dd8c97efbab77a26609bd70f2ed29fbcfc7a31758cb07488d532e7ccccdfca76c1118f2afe5a424cdc05ca007867c318
   languageName: node
   linkType: hard
 
-"es-define-property@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "es-define-property@npm:1.0.0"
-  dependencies:
-    get-intrinsic: "npm:^1.2.4"
-  checksum: 10c0/6bf3191feb7ea2ebda48b577f69bdfac7a2b3c9bcf97307f55fd6ef1bbca0b49f0c219a935aca506c993d8c5d8bddd937766cb760cd5e5a1071351f2df9f9aa4
+"es-define-property@npm:^1.0.0, es-define-property@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "es-define-property@npm:1.0.1"
+  checksum: 10c0/3f54eb49c16c18707949ff25a1456728c883e81259f045003499efba399c08bad00deebf65cccde8c0e07908c1a225c9d472b7107e558f2a48e28d530e34527c
   languageName: node
   linkType: hard
 
-"es-errors@npm:^1.2.1, es-errors@npm:^1.3.0":
+"es-errors@npm:^1.3.0":
   version: 1.3.0
   resolution: "es-errors@npm:1.3.0"
   checksum: 10c0/0a61325670072f98d8ae3b914edab3559b6caa980f08054a3b872052640d91da01d38df55df797fcc916389d77fc92b8d5906cf028f4db46d7e3003abecbca85
@@ -3343,49 +3425,50 @@ __metadata:
   linkType: hard
 
 "es-module-lexer@npm:^1.5.4":
-  version: 1.6.0
-  resolution: "es-module-lexer@npm:1.6.0"
-  checksum: 10c0/667309454411c0b95c476025929881e71400d74a746ffa1ff4cb450bd87f8e33e8eef7854d68e401895039ac0bac64e7809acbebb6253e055dd49ea9e3ea9212
+  version: 1.7.0
+  resolution: "es-module-lexer@npm:1.7.0"
+  checksum: 10c0/4c935affcbfeba7fb4533e1da10fa8568043df1e3574b869385980de9e2d475ddc36769891936dbb07036edb3c3786a8b78ccf44964cd130dedc1f2c984b6c7b
   languageName: node
   linkType: hard
 
-"es-object-atoms@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "es-object-atoms@npm:1.0.0"
+"es-object-atoms@npm:^1.0.0, es-object-atoms@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "es-object-atoms@npm:1.1.1"
   dependencies:
     es-errors: "npm:^1.3.0"
-  checksum: 10c0/1fed3d102eb27ab8d983337bb7c8b159dd2a1e63ff833ec54eea1311c96d5b08223b433060ba240541ca8adba9eee6b0a60cdbf2f80634b784febc9cc8b687b4
+  checksum: 10c0/65364812ca4daf48eb76e2a3b7a89b3f6a2e62a1c420766ce9f692665a29d94fe41fe88b65f24106f449859549711e4b40d9fb8002d862dfd7eb1c512d10be0c
   languageName: node
   linkType: hard
 
-"es-set-tostringtag@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "es-set-tostringtag@npm:2.0.3"
+"es-set-tostringtag@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "es-set-tostringtag@npm:2.1.0"
   dependencies:
-    get-intrinsic: "npm:^1.2.4"
+    es-errors: "npm:^1.3.0"
+    get-intrinsic: "npm:^1.2.6"
     has-tostringtag: "npm:^1.0.2"
-    hasown: "npm:^2.0.1"
-  checksum: 10c0/f22aff1585eb33569c326323f0b0d175844a1f11618b86e193b386f8be0ea9474cfbe46df39c45d959f7aa8f6c06985dc51dd6bce5401645ec5a74c4ceaa836a
+    hasown: "npm:^2.0.2"
+  checksum: 10c0/ef2ca9ce49afe3931cb32e35da4dcb6d86ab02592cfc2ce3e49ced199d9d0bb5085fc7e73e06312213765f5efa47cc1df553a6a5154584b21448e9fb8355b1af
   languageName: node
   linkType: hard
 
-"es-shim-unscopables@npm:^1.0.0, es-shim-unscopables@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "es-shim-unscopables@npm:1.0.2"
+"es-shim-unscopables@npm:^1.0.2, es-shim-unscopables@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "es-shim-unscopables@npm:1.1.0"
   dependencies:
-    hasown: "npm:^2.0.0"
-  checksum: 10c0/f495af7b4b7601a4c0cfb893581c352636e5c08654d129590386a33a0432cf13a7bdc7b6493801cadd990d838e2839b9013d1de3b880440cb537825e834fe783
+    hasown: "npm:^2.0.2"
+  checksum: 10c0/1b9702c8a1823fc3ef39035a4e958802cf294dd21e917397c561d0b3e195f383b978359816b1732d02b255ccf63e1e4815da0065b95db8d7c992037be3bbbcdb
   languageName: node
   linkType: hard
 
-"es-to-primitive@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "es-to-primitive@npm:1.2.1"
+"es-to-primitive@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "es-to-primitive@npm:1.3.0"
   dependencies:
-    is-callable: "npm:^1.1.4"
-    is-date-object: "npm:^1.0.1"
-    is-symbol: "npm:^1.0.2"
-  checksum: 10c0/0886572b8dc075cb10e50c0af62a03d03a68e1e69c388bd4f10c0649ee41b1fbb24840a1b7e590b393011b5cdbe0144b776da316762653685432df37d6de60f1
+    is-callable: "npm:^1.2.7"
+    is-date-object: "npm:^1.0.5"
+    is-symbol: "npm:^1.0.4"
+  checksum: 10c0/c7e87467abb0b438639baa8139f701a06537d2b9bc758f23e8622c3b42fd0fdb5bde0f535686119e446dd9d5e4c0f238af4e14960f4771877cf818d023f6730b
   languageName: node
   linkType: hard
 
@@ -3411,14 +3494,14 @@ __metadata:
   linkType: hard
 
 "esbuild-svelte@npm:^0.9.2":
-  version: 0.9.2
-  resolution: "esbuild-svelte@npm:0.9.2"
+  version: 0.9.3
+  resolution: "esbuild-svelte@npm:0.9.3"
   dependencies:
     "@jridgewell/trace-mapping": "npm:^0.3.19"
   peerDependencies:
     esbuild: ">=0.17.0"
     svelte: ">=4.2.1 <6"
-  checksum: 10c0/391141420f7806b45c774e0448a35706e242d71651bc4362f9aed300d6238ad0fa22bfeabdc3ca45c8e62b89eba641c0edee905980f2760aa6d281c01ee112a8
+  checksum: 10c0/50c0b90ce8f2446da51f6a8ecf22666116781ed0dc3342f17b317fc47b46388998490f1382870f0dc3dde323d6dd75b6ae6444c965ad3c8f28192234e1a9cf8a
   languageName: node
   linkType: hard
 
@@ -3503,34 +3586,34 @@ __metadata:
   linkType: hard
 
 "esbuild@npm:^0.25.3":
-  version: 0.25.3
-  resolution: "esbuild@npm:0.25.3"
+  version: 0.25.5
+  resolution: "esbuild@npm:0.25.5"
   dependencies:
-    "@esbuild/aix-ppc64": "npm:0.25.3"
-    "@esbuild/android-arm": "npm:0.25.3"
-    "@esbuild/android-arm64": "npm:0.25.3"
-    "@esbuild/android-x64": "npm:0.25.3"
-    "@esbuild/darwin-arm64": "npm:0.25.3"
-    "@esbuild/darwin-x64": "npm:0.25.3"
-    "@esbuild/freebsd-arm64": "npm:0.25.3"
-    "@esbuild/freebsd-x64": "npm:0.25.3"
-    "@esbuild/linux-arm": "npm:0.25.3"
-    "@esbuild/linux-arm64": "npm:0.25.3"
-    "@esbuild/linux-ia32": "npm:0.25.3"
-    "@esbuild/linux-loong64": "npm:0.25.3"
-    "@esbuild/linux-mips64el": "npm:0.25.3"
-    "@esbuild/linux-ppc64": "npm:0.25.3"
-    "@esbuild/linux-riscv64": "npm:0.25.3"
-    "@esbuild/linux-s390x": "npm:0.25.3"
-    "@esbuild/linux-x64": "npm:0.25.3"
-    "@esbuild/netbsd-arm64": "npm:0.25.3"
-    "@esbuild/netbsd-x64": "npm:0.25.3"
-    "@esbuild/openbsd-arm64": "npm:0.25.3"
-    "@esbuild/openbsd-x64": "npm:0.25.3"
-    "@esbuild/sunos-x64": "npm:0.25.3"
-    "@esbuild/win32-arm64": "npm:0.25.3"
-    "@esbuild/win32-ia32": "npm:0.25.3"
-    "@esbuild/win32-x64": "npm:0.25.3"
+    "@esbuild/aix-ppc64": "npm:0.25.5"
+    "@esbuild/android-arm": "npm:0.25.5"
+    "@esbuild/android-arm64": "npm:0.25.5"
+    "@esbuild/android-x64": "npm:0.25.5"
+    "@esbuild/darwin-arm64": "npm:0.25.5"
+    "@esbuild/darwin-x64": "npm:0.25.5"
+    "@esbuild/freebsd-arm64": "npm:0.25.5"
+    "@esbuild/freebsd-x64": "npm:0.25.5"
+    "@esbuild/linux-arm": "npm:0.25.5"
+    "@esbuild/linux-arm64": "npm:0.25.5"
+    "@esbuild/linux-ia32": "npm:0.25.5"
+    "@esbuild/linux-loong64": "npm:0.25.5"
+    "@esbuild/linux-mips64el": "npm:0.25.5"
+    "@esbuild/linux-ppc64": "npm:0.25.5"
+    "@esbuild/linux-riscv64": "npm:0.25.5"
+    "@esbuild/linux-s390x": "npm:0.25.5"
+    "@esbuild/linux-x64": "npm:0.25.5"
+    "@esbuild/netbsd-arm64": "npm:0.25.5"
+    "@esbuild/netbsd-x64": "npm:0.25.5"
+    "@esbuild/openbsd-arm64": "npm:0.25.5"
+    "@esbuild/openbsd-x64": "npm:0.25.5"
+    "@esbuild/sunos-x64": "npm:0.25.5"
+    "@esbuild/win32-arm64": "npm:0.25.5"
+    "@esbuild/win32-ia32": "npm:0.25.5"
+    "@esbuild/win32-x64": "npm:0.25.5"
   dependenciesMeta:
     "@esbuild/aix-ppc64":
       optional: true
@@ -3584,7 +3667,7 @@ __metadata:
       optional: true
   bin:
     esbuild: bin/esbuild
-  checksum: 10c0/127aff654310ede4e2eb232a7b1d8823f5b5d69222caf17aa7f172574a5b6b75f71ce78c6d8a40030421d7c75b784dc640de0fb1b87b7ea77ab2a1c832fa8df8
+  checksum: 10c0/aba8cbc11927fa77562722ed5e95541ce2853f67ad7bdc40382b558abc2e0ec57d92ffb820f082ba2047b4ef9f3bc3da068cdebe30dfd3850cfa3827a78d604e
   languageName: node
   linkType: hard
 
@@ -3778,8 +3861,8 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-svelte@npm:^2":
-  version: 2.46.0
-  resolution: "eslint-plugin-svelte@npm:2.46.0"
+  version: 2.46.1
+  resolution: "eslint-plugin-svelte@npm:2.46.1"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
     "@jridgewell/sourcemap-codec": "npm:^1.4.15"
@@ -3798,7 +3881,7 @@ __metadata:
   peerDependenciesMeta:
     svelte:
       optional: true
-  checksum: 10c0/4d484183e29e6e6d2c85e91672e024b88b31d1bf98476e40379577b2e6c1d93f8676df11a4210864260fd7f23d14a1b7e80bb4a6bfba31324b78d88ee13cb81f
+  checksum: 10c0/48fd6c792615c534b505e5ef4616034da71af3892e5895de0b3802cdef03819e43716f36442137233a734726385a66ed8a01c08ff4c0496eaab1bb8bfbbc07c0
   languageName: node
   linkType: hard
 
@@ -3914,12 +3997,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esrap@npm:^1.3.2":
-  version: 1.4.2
-  resolution: "esrap@npm:1.4.2"
+"esrap@npm:^1.4.8":
+  version: 1.4.9
+  resolution: "esrap@npm:1.4.9"
   dependencies:
     "@jridgewell/sourcemap-codec": "npm:^1.4.15"
-  checksum: 10c0/128bb5855e13207fb98248f90f87df1a1c552379938b7b0729e1ac71a0eed82a3cd75515d069067be08d4cda49bc8cf5d2d129a337843019650cab1b773430e6
+  checksum: 10c0/21b4c58f358360ada596ea46b8dbf47771c6d7734277add55e7cd1d5655126dea25591788712452ed8575a99acd388eae756bf941bab31d7b9fb424620c10c40
   languageName: node
   linkType: hard
 
@@ -3970,22 +4053,22 @@ __metadata:
   linkType: hard
 
 "expect-type@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "expect-type@npm:1.1.0"
-  checksum: 10c0/5af0febbe8fe18da05a6d51e3677adafd75213512285408156b368ca471252565d5ca6e59e4bddab25121f3cfcbbebc6a5489f8cc9db131cc29e69dcdcc7ae15
+  version: 1.2.1
+  resolution: "expect-type@npm:1.2.1"
+  checksum: 10c0/b775c9adab3c190dd0d398c722531726cdd6022849b4adba19dceab58dda7e000a7c6c872408cd73d665baa20d381eca36af4f7b393a4ba60dd10232d1fb8898
   languageName: node
   linkType: hard
 
 "exponential-backoff@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "exponential-backoff@npm:3.1.1"
-  checksum: 10c0/160456d2d647e6019640bd07111634d8c353038d9fa40176afb7cd49b0548bdae83b56d05e907c2cce2300b81cae35d800ef92fefb9d0208e190fa3b7d6bb579
+  version: 3.1.2
+  resolution: "exponential-backoff@npm:3.1.2"
+  checksum: 10c0/d9d3e1eafa21b78464297df91f1776f7fbaa3d5e3f7f0995648ca5b89c069d17055033817348d9f4a43d1c20b0eab84f75af6991751e839df53e4dfd6f22e844
   languageName: node
   linkType: hard
 
 "fabric@npm:^5.3.0":
-  version: 5.4.0
-  resolution: "fabric@npm:5.4.0"
+  version: 5.5.2
+  resolution: "fabric@npm:5.5.2"
   dependencies:
     canvas: "npm:^2.8.0"
     jsdom: "npm:^19.0.0"
@@ -3994,7 +4077,7 @@ __metadata:
       optional: true
     jsdom:
       optional: true
-  checksum: 10c0/247e7ab664f31cf8be192e10c335abfe0dadd2df2df13bd2995cbf57a42182b6b56d5340199c5557251f0478915be234ad3b03a7ef9b3c615cb4d5af625a8023
+  checksum: 10c0/518b0696677664e9745b03afac7914757e489c827aaa0a5631125b08d24305d79d5e01c01b34c6f6c68be0c4ff62306efb666bbab766b9f7af38ebe10c25e461
   languageName: node
   linkType: hard
 
@@ -4006,15 +4089,15 @@ __metadata:
   linkType: hard
 
 "fast-glob@npm:^3.2.9":
-  version: 3.3.2
-  resolution: "fast-glob@npm:3.3.2"
+  version: 3.3.3
+  resolution: "fast-glob@npm:3.3.3"
   dependencies:
     "@nodelib/fs.stat": "npm:^2.0.2"
     "@nodelib/fs.walk": "npm:^1.2.3"
     glob-parent: "npm:^5.1.2"
     merge2: "npm:^1.3.0"
-    micromatch: "npm:^4.0.4"
-  checksum: 10c0/42baad7b9cd40b63e42039132bde27ca2cb3a4950d0a0f9abe4639ea1aa9d3e3b40f98b1fe31cbc0cc17b664c9ea7447d911a152fa34ec5b72977b125a6fc845
+    micromatch: "npm:^4.0.8"
+  checksum: 10c0/f6aaa141d0d3384cf73cbcdfc52f475ed293f6d5b65bfc5def368b09163a9f7e5ec2b3014d80f733c405f58e470ee0cc451c2937685045cddcdeaa24199c43fe
   languageName: node
   linkType: hard
 
@@ -4033,11 +4116,23 @@ __metadata:
   linkType: hard
 
 "fastq@npm:^1.6.0":
-  version: 1.17.1
-  resolution: "fastq@npm:1.17.1"
+  version: 1.19.1
+  resolution: "fastq@npm:1.19.1"
   dependencies:
     reusify: "npm:^1.0.4"
-  checksum: 10c0/1095f16cea45fb3beff558bb3afa74ca7a9250f5a670b65db7ed585f92b4b48381445cd328b3d87323da81e43232b5d5978a8201bde84e0cd514310f1ea6da34
+  checksum: 10c0/ebc6e50ac7048daaeb8e64522a1ea7a26e92b3cee5cd1c7f2316cdca81ba543aa40a136b53891446ea5c3a67ec215fbaca87ad405f102dd97012f62916905630
+  languageName: node
+  linkType: hard
+
+"fdir@npm:^6.4.4":
+  version: 6.4.6
+  resolution: "fdir@npm:6.4.6"
+  peerDependencies:
+    picomatch: ^3 || ^4
+  peerDependenciesMeta:
+    picomatch:
+      optional: true
+  checksum: 10c0/45b559cff889934ebb8bc498351e5acba40750ada7e7d6bde197768d2fa67c149be8ae7f8ff34d03f4e1eb20f2764116e56440aaa2f6689e9a4aa7ef06acafe9
   languageName: node
   linkType: hard
 
@@ -4081,39 +4176,41 @@ __metadata:
   linkType: hard
 
 "flatted@npm:^3.2.9":
-  version: 3.3.1
-  resolution: "flatted@npm:3.3.1"
-  checksum: 10c0/324166b125ee07d4ca9bcf3a5f98d915d5db4f39d711fba640a3178b959919aae1f7cfd8aabcfef5826ed8aa8a2aa14cc85b2d7d18ff638ddf4ae3df39573eaf
+  version: 3.3.3
+  resolution: "flatted@npm:3.3.3"
+  checksum: 10c0/e957a1c6b0254aa15b8cce8533e24165abd98fadc98575db082b786b5da1b7d72062b81bfdcd1da2f4d46b6ed93bec2434e62333e9b4261d79ef2e75a10dd538
   languageName: node
   linkType: hard
 
-"for-each@npm:^0.3.3":
-  version: 0.3.3
-  resolution: "for-each@npm:0.3.3"
+"for-each@npm:^0.3.3, for-each@npm:^0.3.5":
+  version: 0.3.5
+  resolution: "for-each@npm:0.3.5"
   dependencies:
-    is-callable: "npm:^1.1.3"
-  checksum: 10c0/22330d8a2db728dbf003ec9182c2d421fbcd2969b02b4f97ec288721cda63eb28f2c08585ddccd0f77cb2930af8d958005c9e72f47141dc51816127a118f39aa
+    is-callable: "npm:^1.2.7"
+  checksum: 10c0/0e0b50f6a843a282637d43674d1fb278dda1dd85f4f99b640024cfb10b85058aac0cc781bf689d5fe50b4b7f638e91e548560723a4e76e04fe96ae35ef039cee
   languageName: node
   linkType: hard
 
 "foreground-child@npm:^3.1.0":
-  version: 3.3.0
-  resolution: "foreground-child@npm:3.3.0"
+  version: 3.3.1
+  resolution: "foreground-child@npm:3.3.1"
   dependencies:
-    cross-spawn: "npm:^7.0.0"
+    cross-spawn: "npm:^7.0.6"
     signal-exit: "npm:^4.0.1"
-  checksum: 10c0/028f1d41000553fcfa6c4bb5c372963bf3d9bf0b1f25a87d1a6253014343fb69dfb1b42d9625d7cf44c8ba429940f3d0ff718b62105d4d4a4f6ef8ca0a53faa2
+  checksum: 10c0/8986e4af2430896e65bc2788d6679067294d6aee9545daefc84923a0a4b399ad9c7a3ea7bd8c0b2b80fdf4a92de4c69df3f628233ff3224260e9c1541a9e9ed3
   languageName: node
   linkType: hard
 
 "form-data@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "form-data@npm:4.0.1"
+  version: 4.0.3
+  resolution: "form-data@npm:4.0.3"
   dependencies:
     asynckit: "npm:^0.4.0"
     combined-stream: "npm:^1.0.8"
+    es-set-tostringtag: "npm:^2.1.0"
+    hasown: "npm:^2.0.2"
     mime-types: "npm:^2.1.12"
-  checksum: 10c0/bb102d570be8592c23f4ea72d7df9daa50c7792eb0cf1c5d7e506c1706e7426a4e4ae48a35b109e91c85f1c0ec63774a21ae252b66f4eb981cb8efef7d0463c8
+  checksum: 10c0/f0cf45873d600110b5fadf5804478377694f73a1ed97aaa370a74c90cebd7fe6e845a081171668a5476477d0d55a73a4e03d6682968fa8661eac2a81d651fcdb
   languageName: node
   linkType: hard
 
@@ -4159,15 +4256,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"function.prototype.name@npm:^1.1.6":
-  version: 1.1.6
-  resolution: "function.prototype.name@npm:1.1.6"
+"function.prototype.name@npm:^1.1.6, function.prototype.name@npm:^1.1.8":
+  version: 1.1.8
+  resolution: "function.prototype.name@npm:1.1.8"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
+    call-bind: "npm:^1.0.8"
+    call-bound: "npm:^1.0.3"
+    define-properties: "npm:^1.2.1"
     functions-have-names: "npm:^1.2.3"
-  checksum: 10c0/9eae11294905b62cb16874adb4fc687927cda3162285e0ad9612e6a1d04934005d46907362ea9cdb7428edce05a2f2c3dabc3b2d21e9fd343e9bb278230ad94b
+    hasown: "npm:^2.0.2"
+    is-callable: "npm:^1.2.7"
+  checksum: 10c0/e920a2ab52663005f3cbe7ee3373e3c71c1fb5558b0b0548648cdf3e51961085032458e26c71ff1a8c8c20e7ee7caeb03d43a5d1fa8610c459333323a2e71253
   languageName: node
   linkType: hard
 
@@ -4178,36 +4277,51 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4":
-  version: 1.2.4
-  resolution: "get-intrinsic@npm:1.2.4"
+"get-intrinsic@npm:^1.2.4, get-intrinsic@npm:^1.2.5, get-intrinsic@npm:^1.2.6, get-intrinsic@npm:^1.2.7, get-intrinsic@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "get-intrinsic@npm:1.3.0"
   dependencies:
+    call-bind-apply-helpers: "npm:^1.0.2"
+    es-define-property: "npm:^1.0.1"
     es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.1.1"
     function-bind: "npm:^1.1.2"
-    has-proto: "npm:^1.0.1"
-    has-symbols: "npm:^1.0.3"
-    hasown: "npm:^2.0.0"
-  checksum: 10c0/0a9b82c16696ed6da5e39b1267104475c47e3a9bdbe8b509dfe1710946e38a87be70d759f4bb3cda042d76a41ef47fe769660f3b7c0d1f68750299344ffb15b7
+    get-proto: "npm:^1.0.1"
+    gopd: "npm:^1.2.0"
+    has-symbols: "npm:^1.1.0"
+    hasown: "npm:^2.0.2"
+    math-intrinsics: "npm:^1.1.0"
+  checksum: 10c0/52c81808af9a8130f581e6a6a83e1ba4a9f703359e7a438d1369a5267a25412322f03dcbd7c549edaef0b6214a0630a28511d7df0130c93cfd380f4fa0b5b66a
   languageName: node
   linkType: hard
 
-"get-symbol-description@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "get-symbol-description@npm:1.0.2"
+"get-proto@npm:^1.0.0, get-proto@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "get-proto@npm:1.0.1"
   dependencies:
-    call-bind: "npm:^1.0.5"
+    dunder-proto: "npm:^1.0.1"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10c0/9224acb44603c5526955e83510b9da41baf6ae73f7398875fba50edc5e944223a89c4a72b070fcd78beb5f7bdda58ecb6294adc28f7acfc0da05f76a2399643c
+  languageName: node
+  linkType: hard
+
+"get-symbol-description@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "get-symbol-description@npm:1.1.0"
+  dependencies:
+    call-bound: "npm:^1.0.3"
     es-errors: "npm:^1.3.0"
-    get-intrinsic: "npm:^1.2.4"
-  checksum: 10c0/867be6d63f5e0eb026cb3b0ef695ec9ecf9310febb041072d2e142f260bd91ced9eeb426b3af98791d1064e324e653424afa6fd1af17dee373bea48ae03162bc
+    get-intrinsic: "npm:^1.2.6"
+  checksum: 10c0/d6a7d6afca375779a4b307738c9e80dbf7afc0bdbe5948768d54ab9653c865523d8920e670991a925936eb524b7cb6a6361d199a760b21d0ca7620194455aa4b
   languageName: node
   linkType: hard
 
 "get-tsconfig@npm:^4.7.2":
-  version: 4.8.1
-  resolution: "get-tsconfig@npm:4.8.1"
+  version: 4.10.1
+  resolution: "get-tsconfig@npm:4.10.1"
   dependencies:
     resolve-pkg-maps: "npm:^1.0.0"
-  checksum: 10c0/536ee85d202f604f4b5fb6be81bcd6e6d9a96846811e83e9acc6de4a04fb49506edea0e1b8cf1d5ee7af33e469916ec2809d4c5445ab8ae015a7a51fbd1572f9
+  checksum: 10c0/7f8e3dabc6a49b747920a800fb88e1952fef871cdf51b79e98db48275a5de6cdaf499c55ee67df5fa6fe7ce65f0063e26de0f2e53049b408c585aa74d39ffa21
   languageName: node
   linkType: hard
 
@@ -4229,7 +4343,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:^10.2.2, glob@npm:^10.3.10, glob@npm:^10.3.7":
+"glob@npm:^10.2.2":
   version: 10.4.5
   resolution: "glob@npm:10.4.5"
   dependencies:
@@ -4268,7 +4382,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globalthis@npm:^1.0.3":
+"globalthis@npm:^1.0.4":
   version: 1.0.4
   resolution: "globalthis@npm:1.0.4"
   dependencies:
@@ -4292,12 +4406,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"gopd@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "gopd@npm:1.0.1"
-  dependencies:
-    get-intrinsic: "npm:^1.1.3"
-  checksum: 10c0/505c05487f7944c552cee72087bf1567debb470d4355b1335f2c262d218ebbff805cd3715448fe29b4b380bae6912561d0467233e4165830efd28da241418c63
+"gopd@npm:^1.0.1, gopd@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "gopd@npm:1.2.0"
+  checksum: 10c0/50fff1e04ba2b7737c097358534eacadad1e68d24cccee3272e04e007bed008e68d2614f3987788428fd192a5ae3889d08fb2331417e4fc4a9ab366b2043cead
   languageName: node
   linkType: hard
 
@@ -4322,10 +4434,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has-bigints@npm:^1.0.1, has-bigints@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "has-bigints@npm:1.0.2"
-  checksum: 10c0/724eb1485bfa3cdff6f18d95130aa190561f00b3fcf9f19dc640baf8176b5917c143b81ec2123f8cddb6c05164a198c94b13e1377c497705ccc8e1a80306e83b
+"has-bigints@npm:^1.0.2":
+  version: 1.1.0
+  resolution: "has-bigints@npm:1.1.0"
+  checksum: 10c0/2de0cdc4a1ccf7a1e75ffede1876994525ac03cc6f5ae7392d3415dd475cd9eee5bceec63669ab61aa997ff6cceebb50ef75561c7002bed8988de2b9d1b40788
   languageName: node
   linkType: hard
 
@@ -4345,21 +4457,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has-proto@npm:^1.0.1, has-proto@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "has-proto@npm:1.0.3"
-  checksum: 10c0/35a6989f81e9f8022c2f4027f8b48a552de714938765d019dbea6bb547bd49ce5010a3c7c32ec6ddac6e48fc546166a3583b128f5a7add8b058a6d8b4afec205
+"has-proto@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "has-proto@npm:1.2.0"
+  dependencies:
+    dunder-proto: "npm:^1.0.0"
+  checksum: 10c0/46538dddab297ec2f43923c3d35237df45d8c55a6fc1067031e04c13ed8a9a8f94954460632fd4da84c31a1721eefee16d901cbb1ae9602bab93bb6e08f93b95
   languageName: node
   linkType: hard
 
-"has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "has-symbols@npm:1.0.3"
-  checksum: 10c0/e6922b4345a3f37069cdfe8600febbca791c94988c01af3394d86ca3360b4b93928bbf395859158f88099cb10b19d98e3bbab7c9ff2c1bd09cf665ee90afa2c3
+"has-symbols@npm:^1.0.3, has-symbols@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "has-symbols@npm:1.1.0"
+  checksum: 10c0/dde0a734b17ae51e84b10986e651c664379018d10b91b6b0e9b293eddb32f0f069688c841fb40f19e9611546130153e0a2a48fd7f512891fb000ddfa36f5a20e
   languageName: node
   linkType: hard
 
-"has-tostringtag@npm:^1.0.0, has-tostringtag@npm:^1.0.2":
+"has-tostringtag@npm:^1.0.2":
   version: 1.0.2
   resolution: "has-tostringtag@npm:1.0.2"
   dependencies:
@@ -4368,7 +4482,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hasown@npm:^2.0.0, hasown@npm:^2.0.1, hasown@npm:^2.0.2":
+"hasown@npm:^2.0.2":
   version: 2.0.2
   resolution: "hasown@npm:2.0.2"
   dependencies:
@@ -4378,11 +4492,11 @@ __metadata:
   linkType: hard
 
 "hosted-git-info@npm:^6.0.0":
-  version: 6.1.1
-  resolution: "hosted-git-info@npm:6.1.1"
+  version: 6.1.3
+  resolution: "hosted-git-info@npm:6.1.3"
   dependencies:
     lru-cache: "npm:^7.5.1"
-  checksum: 10c0/ba7158f81ae29c1b5a1e452fa517082f928051da8797a00788a84ff82b434996d34f78a875bbb688aec162bda1d4cf71d2312f44da3c896058803f5efa6ce77f
+  checksum: 10c0/a1fc10faf67d04d575ebabf89cd5c9e3ebca041d99f42f31143bc8027684da4612c2f6deaf7cf2c09ac3b04dd502ad3957caa49d913628f0558964b2e1e7b414
   languageName: node
   linkType: hard
 
@@ -4396,9 +4510,9 @@ __metadata:
   linkType: hard
 
 "http-cache-semantics@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "http-cache-semantics@npm:4.1.1"
-  checksum: 10c0/ce1319b8a382eb3cbb4a37c19f6bfe14e5bb5be3d09079e885e8c513ab2d3cd9214902f8a31c9dc4e37022633ceabfc2d697405deeaf1b8f3552bb4ed996fdfc
+  version: 4.2.0
+  resolution: "http-cache-semantics@npm:4.2.0"
+  checksum: 10c0/45b66a945cf13ec2d1f29432277201313babf4a01d9e52f44b31ca923434083afeca03f18417f599c9ab3d0e7b618ceb21257542338b57c54b710463b4a53e37
   languageName: node
   linkType: hard
 
@@ -4467,26 +4581,19 @@ __metadata:
   linkType: hard
 
 "immutable@npm:^5.0.2":
-  version: 5.0.3
-  resolution: "immutable@npm:5.0.3"
-  checksum: 10c0/3269827789e1026cd25c2ea97f0b2c19be852ffd49eda1b674b20178f73d84fa8d945ad6f5ac5bc4545c2b4170af9f6e1f77129bc1cae7974a4bf9b04a9cdfb9
+  version: 5.1.3
+  resolution: "immutable@npm:5.1.3"
+  checksum: 10c0/f094891dcefb9488a84598376c9218ebff3a130c8b807bda3f6b703c45fe7ef238b8bf9a1eb9961db0523c8d7eb116ab6f47166702e4bbb1927ff5884157cd97
   languageName: node
   linkType: hard
 
 "import-fresh@npm:^3.2.1":
-  version: 3.3.0
-  resolution: "import-fresh@npm:3.3.0"
+  version: 3.3.1
+  resolution: "import-fresh@npm:3.3.1"
   dependencies:
     parent-module: "npm:^1.0.0"
     resolve-from: "npm:^4.0.0"
-  checksum: 10c0/7f882953aa6b740d1f0e384d0547158bc86efbf2eea0f1483b8900a6f65c5a5123c2cf09b0d542cc419d0b98a759ecaeb394237e97ea427f2da221dc3cd80cc3
-  languageName: node
-  linkType: hard
-
-"import-meta-resolve@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "import-meta-resolve@npm:4.1.0"
-  checksum: 10c0/42f3284b0460635ddf105c4ad99c6716099c3ce76702602290ad5cbbcd295700cbc04e4bdf47bacf9e3f1a4cec2e1ff887dabc20458bef398f9de22ddff45ef5
+  checksum: 10c0/bf8cc494872fef783249709385ae883b447e3eb09db0ebd15dcead7d9afe7224dad7bd7591c6b73b0b19b3c0f9640eb8ee884f01cfaf2887ab995b0b36a0cbec
   languageName: node
   linkType: hard
 
@@ -4514,14 +4621,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"internal-slot@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "internal-slot@npm:1.0.7"
+"internal-slot@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "internal-slot@npm:1.1.0"
   dependencies:
     es-errors: "npm:^1.3.0"
-    hasown: "npm:^2.0.0"
-    side-channel: "npm:^1.0.4"
-  checksum: 10c0/f8b294a4e6ea3855fc59551bbf35f2b832cf01fd5e6e2a97f5c201a071cc09b49048f856e484b67a6c721da5e55736c5b6ddafaf19e2dbeb4a3ff1821680de6c
+    hasown: "npm:^2.0.2"
+    side-channel: "npm:^1.1.0"
+  checksum: 10c0/03966f5e259b009a9bf1a78d60da920df198af4318ec004f57b8aef1dd3fe377fbc8cce63a96e8c810010302654de89f9e19de1cd8ad0061d15be28a695465c7
   languageName: node
   linkType: hard
 
@@ -4549,22 +4656,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-array-buffer@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "is-array-buffer@npm:3.0.4"
+"is-array-buffer@npm:^3.0.4, is-array-buffer@npm:^3.0.5":
+  version: 3.0.5
+  resolution: "is-array-buffer@npm:3.0.5"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    get-intrinsic: "npm:^1.2.1"
-  checksum: 10c0/42a49d006cc6130bc5424eae113e948c146f31f9d24460fc0958f855d9d810e6fd2e4519bf19aab75179af9c298ea6092459d8cafdec523cd19e529b26eab860
+    call-bind: "npm:^1.0.8"
+    call-bound: "npm:^1.0.3"
+    get-intrinsic: "npm:^1.2.6"
+  checksum: 10c0/c5c9f25606e86dbb12e756694afbbff64bc8b348d1bc989324c037e1068695131930199d6ad381952715dad3a9569333817f0b1a72ce5af7f883ce802e49c83d
   languageName: node
   linkType: hard
 
-"is-bigint@npm:^1.0.1":
-  version: 1.0.4
-  resolution: "is-bigint@npm:1.0.4"
+"is-async-function@npm:^2.0.0":
+  version: 2.1.1
+  resolution: "is-async-function@npm:2.1.1"
   dependencies:
-    has-bigints: "npm:^1.0.1"
-  checksum: 10c0/eb9c88e418a0d195ca545aff2b715c9903d9b0a5033bc5922fec600eb0c3d7b1ee7f882dbf2e0d5a6e694e42391be3683e4368737bd3c4a77f8ac293e7773696
+    async-function: "npm:^1.0.0"
+    call-bound: "npm:^1.0.3"
+    get-proto: "npm:^1.0.1"
+    has-tostringtag: "npm:^1.0.2"
+    safe-regex-test: "npm:^1.1.0"
+  checksum: 10c0/d70c236a5e82de6fc4d44368ffd0c2fee2b088b893511ce21e679da275a5ecc6015ff59a7d7e1bdd7ca39f71a8dbdd253cf8cce5c6b3c91cdd5b42b5ce677298
+  languageName: node
+  linkType: hard
+
+"is-bigint@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "is-bigint@npm:1.1.0"
+  dependencies:
+    has-bigints: "npm:^1.0.2"
+  checksum: 10c0/f4f4b905ceb195be90a6ea7f34323bf1c18e3793f18922e3e9a73c684c29eeeeff5175605c3a3a74cc38185fe27758f07efba3dbae812e5c5afbc0d2316b40e4
   languageName: node
   linkType: hard
 
@@ -4577,33 +4698,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-boolean-object@npm:^1.1.0":
-  version: 1.1.2
-  resolution: "is-boolean-object@npm:1.1.2"
+"is-boolean-object@npm:^1.2.1":
+  version: 1.2.2
+  resolution: "is-boolean-object@npm:1.2.2"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    has-tostringtag: "npm:^1.0.0"
-  checksum: 10c0/6090587f8a8a8534c0f816da868bc94f32810f08807aa72fa7e79f7e11c466d281486ffe7a788178809c2aa71fe3e700b167fe80dd96dad68026bfff8ebf39f7
+    call-bound: "npm:^1.0.3"
+    has-tostringtag: "npm:^1.0.2"
+  checksum: 10c0/36ff6baf6bd18b3130186990026f5a95c709345c39cd368468e6c1b6ab52201e9fd26d8e1f4c066357b4938b0f0401e1a5000e08257787c1a02f3a719457001e
   languageName: node
   linkType: hard
 
-"is-callable@npm:^1.1.3, is-callable@npm:^1.1.4, is-callable@npm:^1.2.7":
+"is-callable@npm:^1.2.7":
   version: 1.2.7
   resolution: "is-callable@npm:1.2.7"
   checksum: 10c0/ceebaeb9d92e8adee604076971dd6000d38d6afc40bb843ea8e45c5579b57671c3f3b50d7f04869618242c6cee08d1b67806a8cb8edaaaf7c0748b3720d6066f
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.13.0, is-core-module@npm:^2.15.1, is-core-module@npm:^2.8.1":
-  version: 2.15.1
-  resolution: "is-core-module@npm:2.15.1"
-  dependencies:
-    hasown: "npm:^2.0.2"
-  checksum: 10c0/53432f10c69c40bfd2fa8914133a68709ff9498c86c3bf5fca3cdf3145a56fd2168cbf4a43b29843a6202a120a5f9c5ffba0a4322e1e3441739bc0b641682612
-  languageName: node
-  linkType: hard
-
-"is-core-module@npm:^2.16.0":
+"is-core-module@npm:^2.13.0, is-core-module@npm:^2.15.1, is-core-module@npm:^2.16.0, is-core-module@npm:^2.8.1":
   version: 2.16.1
   resolution: "is-core-module@npm:2.16.1"
   dependencies:
@@ -4612,21 +4724,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-data-view@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "is-data-view@npm:1.0.1"
+"is-data-view@npm:^1.0.1, is-data-view@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "is-data-view@npm:1.0.2"
   dependencies:
+    call-bound: "npm:^1.0.2"
+    get-intrinsic: "npm:^1.2.6"
     is-typed-array: "npm:^1.1.13"
-  checksum: 10c0/a3e6ec84efe303da859107aed9b970e018e2bee7ffcb48e2f8096921a493608134240e672a2072577e5f23a729846241d9634806e8a0e51d9129c56d5f65442d
+  checksum: 10c0/ef3548a99d7e7f1370ce21006baca6d40c73e9f15c941f89f0049c79714c873d03b02dae1c64b3f861f55163ecc16da06506c5b8a1d4f16650b3d9351c380153
   languageName: node
   linkType: hard
 
-"is-date-object@npm:^1.0.1":
-  version: 1.0.5
-  resolution: "is-date-object@npm:1.0.5"
+"is-date-object@npm:^1.0.5, is-date-object@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "is-date-object@npm:1.1.0"
   dependencies:
-    has-tostringtag: "npm:^1.0.0"
-  checksum: 10c0/eed21e5dcc619c48ccef804dfc83a739dbb2abee6ca202838ee1bd5f760fe8d8a93444f0d49012ad19bb7c006186e2884a1b92f6e1c056da7fd23d0a9ad5992e
+    call-bound: "npm:^1.0.2"
+    has-tostringtag: "npm:^1.0.2"
+  checksum: 10c0/1a4d199c8e9e9cac5128d32e6626fa7805175af9df015620ac0d5d45854ccf348ba494679d872d37301032e35a54fc7978fba1687e8721b2139aea7870cafa2f
   languageName: node
   linkType: hard
 
@@ -4637,6 +4752,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-finalizationregistry@npm:^1.1.0":
+  version: 1.1.1
+  resolution: "is-finalizationregistry@npm:1.1.1"
+  dependencies:
+    call-bound: "npm:^1.0.3"
+  checksum: 10c0/818dff679b64f19e228a8205a1e2d09989a98e98def3a817f889208cfcbf918d321b251aadf2c05918194803ebd2eb01b14fc9d0b2bea53d984f4137bfca5e97
+  languageName: node
+  linkType: hard
+
 "is-fullwidth-code-point@npm:^3.0.0":
   version: 3.0.0
   resolution: "is-fullwidth-code-point@npm:3.0.0"
@@ -4644,6 +4768,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-generator-function@npm:^1.0.10":
+  version: 1.1.0
+  resolution: "is-generator-function@npm:1.1.0"
+  dependencies:
+    call-bound: "npm:^1.0.3"
+    get-proto: "npm:^1.0.0"
+    has-tostringtag: "npm:^1.0.2"
+    safe-regex-test: "npm:^1.1.0"
+  checksum: 10c0/fdfa96c8087bf36fc4cd514b474ba2ff404219a4dd4cfa6cf5426404a1eed259bdcdb98f082a71029a48d01f27733e3436ecc6690129a7ec09cb0434bee03a2a
+  languageName: node
+  linkType: hard
+
 "is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:^4.0.3, is-glob@npm:~4.0.1":
   version: 4.0.3
   resolution: "is-glob@npm:4.0.3"
@@ -4653,6 +4789,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-map@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "is-map@npm:2.0.3"
+  checksum: 10c0/2c4d431b74e00fdda7162cd8e4b763d6f6f217edf97d4f8538b94b8702b150610e2c64961340015fe8df5b1fcee33ccd2e9b62619c4a8a3a155f8de6d6d355fc
+  languageName: node
+  linkType: hard
+
 "is-negative-zero@npm:^2.0.3":
   version: 2.0.3
   resolution: "is-negative-zero@npm:2.0.3"
@@ -4660,12 +4803,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-number-object@npm:^1.0.4":
-  version: 1.0.7
-  resolution: "is-number-object@npm:1.0.7"
+"is-number-object@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "is-number-object@npm:1.1.1"
   dependencies:
-    has-tostringtag: "npm:^1.0.0"
-  checksum: 10c0/aad266da1e530f1804a2b7bd2e874b4869f71c98590b3964f9d06cc9869b18f8d1f4778f838ecd2a11011bce20aeecb53cb269ba916209b79c24580416b74b1b
+    call-bound: "npm:^1.0.3"
+    has-tostringtag: "npm:^1.0.2"
+  checksum: 10c0/97b451b41f25135ff021d85c436ff0100d84a039bb87ffd799cbcdbea81ef30c464ced38258cdd34f080be08fc3b076ca1f472086286d2aa43521d6ec6a79f53
   languageName: node
   linkType: hard
 
@@ -4699,58 +4843,87 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-regex@npm:^1.1.4":
-  version: 1.1.4
-  resolution: "is-regex@npm:1.1.4"
+"is-regex@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "is-regex@npm:1.2.1"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    has-tostringtag: "npm:^1.0.0"
-  checksum: 10c0/bb72aae604a69eafd4a82a93002058c416ace8cde95873589a97fc5dac96a6c6c78a9977d487b7b95426a8f5073969124dd228f043f9f604f041f32fcc465fc1
+    call-bound: "npm:^1.0.2"
+    gopd: "npm:^1.2.0"
+    has-tostringtag: "npm:^1.0.2"
+    hasown: "npm:^2.0.2"
+  checksum: 10c0/1d3715d2b7889932349241680032e85d0b492cfcb045acb75ffc2c3085e8d561184f1f7e84b6f8321935b4aea39bc9c6ba74ed595b57ce4881a51dfdbc214e04
   languageName: node
   linkType: hard
 
-"is-shared-array-buffer@npm:^1.0.2, is-shared-array-buffer@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "is-shared-array-buffer@npm:1.0.3"
-  dependencies:
-    call-bind: "npm:^1.0.7"
-  checksum: 10c0/adc11ab0acbc934a7b9e5e9d6c588d4ec6682f6fea8cda5180721704fa32927582ede5b123349e32517fdadd07958973d24716c80e7ab198970c47acc09e59c7
+"is-set@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "is-set@npm:2.0.3"
+  checksum: 10c0/f73732e13f099b2dc879c2a12341cfc22ccaca8dd504e6edae26484bd5707a35d503fba5b4daad530a9b088ced1ae6c9d8200fd92e09b428fe14ea79ce8080b7
   languageName: node
   linkType: hard
 
-"is-string@npm:^1.0.5, is-string@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "is-string@npm:1.0.7"
-  dependencies:
-    has-tostringtag: "npm:^1.0.0"
-  checksum: 10c0/905f805cbc6eedfa678aaa103ab7f626aac9ebbdc8737abb5243acaa61d9820f8edc5819106b8fcd1839e33db21de9f0116ae20de380c8382d16dc2a601921f6
-  languageName: node
-  linkType: hard
-
-"is-symbol@npm:^1.0.2, is-symbol@npm:^1.0.3":
+"is-shared-array-buffer@npm:^1.0.4":
   version: 1.0.4
-  resolution: "is-symbol@npm:1.0.4"
+  resolution: "is-shared-array-buffer@npm:1.0.4"
   dependencies:
-    has-symbols: "npm:^1.0.2"
-  checksum: 10c0/9381dd015f7c8906154dbcbf93fad769de16b4b961edc94f88d26eb8c555935caa23af88bda0c93a18e65560f6d7cca0fd5a3f8a8e1df6f1abbb9bead4502ef7
+    call-bound: "npm:^1.0.3"
+  checksum: 10c0/65158c2feb41ff1edd6bbd6fd8403a69861cf273ff36077982b5d4d68e1d59278c71691216a4a64632bd76d4792d4d1d2553901b6666d84ade13bba5ea7bc7db
   languageName: node
   linkType: hard
 
-"is-typed-array@npm:^1.1.13":
-  version: 1.1.13
-  resolution: "is-typed-array@npm:1.1.13"
+"is-string@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "is-string@npm:1.1.1"
   dependencies:
-    which-typed-array: "npm:^1.1.14"
-  checksum: 10c0/fa5cb97d4a80e52c2cc8ed3778e39f175a1a2ae4ddf3adae3187d69586a1fd57cfa0b095db31f66aa90331e9e3da79184cea9c6abdcd1abc722dc3c3edd51cca
+    call-bound: "npm:^1.0.3"
+    has-tostringtag: "npm:^1.0.2"
+  checksum: 10c0/2f518b4e47886bb81567faba6ffd0d8a8333cf84336e2e78bf160693972e32ad00fe84b0926491cc598dee576fdc55642c92e62d0cbe96bf36f643b6f956f94d
   languageName: node
   linkType: hard
 
-"is-weakref@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "is-weakref@npm:1.0.2"
+"is-symbol@npm:^1.0.4, is-symbol@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "is-symbol@npm:1.1.1"
   dependencies:
-    call-bind: "npm:^1.0.2"
-  checksum: 10c0/1545c5d172cb690c392f2136c23eec07d8d78a7f57d0e41f10078aa4f5daf5d7f57b6513a67514ab4f073275ad00c9822fc8935e00229d0a2089e1c02685d4b1
+    call-bound: "npm:^1.0.2"
+    has-symbols: "npm:^1.1.0"
+    safe-regex-test: "npm:^1.1.0"
+  checksum: 10c0/f08f3e255c12442e833f75a9e2b84b2d4882fdfd920513cf2a4a2324f0a5b076c8fd913778e3ea5d258d5183e9d92c0cd20e04b03ab3df05316b049b2670af1e
+  languageName: node
+  linkType: hard
+
+"is-typed-array@npm:^1.1.13, is-typed-array@npm:^1.1.14, is-typed-array@npm:^1.1.15":
+  version: 1.1.15
+  resolution: "is-typed-array@npm:1.1.15"
+  dependencies:
+    which-typed-array: "npm:^1.1.16"
+  checksum: 10c0/415511da3669e36e002820584e264997ffe277ff136643a3126cc949197e6ca3334d0f12d084e83b1994af2e9c8141275c741cf2b7da5a2ff62dd0cac26f76c4
+  languageName: node
+  linkType: hard
+
+"is-weakmap@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "is-weakmap@npm:2.0.2"
+  checksum: 10c0/443c35bb86d5e6cc5929cd9c75a4024bb0fff9586ed50b092f94e700b89c43a33b186b76dbc6d54f3d3d09ece689ab38dcdc1af6a482cbe79c0f2da0a17f1299
+  languageName: node
+  linkType: hard
+
+"is-weakref@npm:^1.0.2, is-weakref@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "is-weakref@npm:1.1.1"
+  dependencies:
+    call-bound: "npm:^1.0.3"
+  checksum: 10c0/8e0a9c07b0c780949a100e2cab2b5560a48ecd4c61726923c1a9b77b6ab0aa0046c9e7fb2206042296817045376dee2c8ab1dabe08c7c3dfbf195b01275a085b
+  languageName: node
+  linkType: hard
+
+"is-weakset@npm:^2.0.3":
+  version: 2.0.4
+  resolution: "is-weakset@npm:2.0.4"
+  dependencies:
+    call-bound: "npm:^1.0.3"
+    get-intrinsic: "npm:^1.2.6"
+  checksum: 10c0/6491eba08acb8dc9532da23cb226b7d0192ede0b88f16199e592e4769db0a077119c1f5d2283d1e0d16d739115f70046e887e477eb0e66cd90e1bb29f28ba647
   languageName: node
   linkType: hard
 
@@ -5006,17 +5179,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"loupe@npm:^3.1.0":
-  version: 3.1.2
-  resolution: "loupe@npm:3.1.2"
-  checksum: 10c0/b13c02e3ddd6a9d5f8bf84133b3242de556512d824dddeea71cce2dbd6579c8f4d672381c4e742d45cf4423d0701765b4a6e5fbc24701def16bc2b40f8daa96a
-  languageName: node
-  linkType: hard
-
-"loupe@npm:^3.1.2":
-  version: 3.1.3
-  resolution: "loupe@npm:3.1.3"
-  checksum: 10c0/f5dab4144254677de83a35285be1b8aba58b3861439ce4ba65875d0d5f3445a4a496daef63100ccf02b2dbc25bf58c6db84c9cb0b96d6435331e9d0a33b48541
+"loupe@npm:^3.1.0, loupe@npm:^3.1.2":
+  version: 3.1.4
+  resolution: "loupe@npm:3.1.4"
+  checksum: 10c0/5c2e6aefaad25f812d361c750b8cf4ff91d68de289f141d7c85c2ce9bb79eeefa06a93c85f7b87cba940531ed8f15e492f32681d47eed23842ad1963eb3a154d
   languageName: node
   linkType: hard
 
@@ -5035,11 +5201,11 @@ __metadata:
   linkType: hard
 
 "magic-string@npm:^0.30.11, magic-string@npm:^0.30.12, magic-string@npm:^0.30.5":
-  version: 0.30.12
-  resolution: "magic-string@npm:0.30.12"
+  version: 0.30.17
+  resolution: "magic-string@npm:0.30.17"
   dependencies:
     "@jridgewell/sourcemap-codec": "npm:^1.5.0"
-  checksum: 10c0/469f457d18af37dfcca8617086ea8a65bcd8b60ba8a1182cb024ce43e470ace3c9d1cb6bee58d3b311768fb16bc27bd50bdeebcaa63dadd0fd46cac4d2e11d5f
+  checksum: 10c0/16826e415d04b88378f200fe022b53e638e3838b9e496edda6c0e086d7753a44a6ed187adc72d19f3623810589bf139af1a315541cd6a26ae0771a0193eaf7b8
   languageName: node
   linkType: hard
 
@@ -5071,6 +5237,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"math-intrinsics@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "math-intrinsics@npm:1.1.0"
+  checksum: 10c0/7579ff94e899e2f76ab64491d76cf606274c874d8f2af4a442c016bd85688927fcfca157ba6bf74b08e9439dc010b248ce05b96cc7c126a354c3bae7fcb48b7f
+  languageName: node
+  linkType: hard
+
 "mathjax@npm:^3.1.2":
   version: 3.2.2
   resolution: "mathjax@npm:3.2.2"
@@ -5099,7 +5272,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"micromatch@npm:^4.0.4, micromatch@npm:^4.0.5":
+"micromatch@npm:^4.0.5, micromatch@npm:^4.0.8":
   version: 4.0.8
   resolution: "micromatch@npm:4.0.8"
   dependencies:
@@ -5167,8 +5340,8 @@ __metadata:
   linkType: hard
 
 "minipass-fetch@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "minipass-fetch@npm:4.0.0"
+  version: 4.0.1
+  resolution: "minipass-fetch@npm:4.0.1"
   dependencies:
     encoding: "npm:^0.1.13"
     minipass: "npm:^7.0.3"
@@ -5177,7 +5350,7 @@ __metadata:
   dependenciesMeta:
     encoding:
       optional: true
-  checksum: 10c0/7fa30ce7c373fb6f94c086b374fff1589fd7e78451855d2d06c2e2d9df936d131e73e952163063016592ed3081444bd8d1ea608533313b0149156ce23311da4b
+  checksum: 10c0/a3147b2efe8e078c9bf9d024a0059339c5a09c5b1dded6900a219c218cc8b1b78510b62dae556b507304af226b18c3f1aeb1d48660283602d5b6586c399eed5c
   languageName: node
   linkType: hard
 
@@ -5225,12 +5398,11 @@ __metadata:
   linkType: hard
 
 "minizlib@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "minizlib@npm:3.0.1"
+  version: 3.0.2
+  resolution: "minizlib@npm:3.0.2"
   dependencies:
-    minipass: "npm:^7.0.4"
-    rimraf: "npm:^5.0.5"
-  checksum: 10c0/82f8bf70da8af656909a8ee299d7ed3b3372636749d29e105f97f20e88971be31f5ed7642f2e898f00283b68b701cc01307401cdc209b0efc5dd3818220e5093
+    minipass: "npm:^7.1.2"
+  checksum: 10c0/9f3bd35e41d40d02469cb30470c55ccc21cae0db40e08d1d0b1dff01cc8cc89a6f78e9c5d2b7c844e485ec0a8abc2238111213fdc5b2038e6d1012eacf316f78
   languageName: node
   linkType: hard
 
@@ -5271,9 +5443,9 @@ __metadata:
   linkType: hard
 
 "mrmime@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "mrmime@npm:2.0.0"
-  checksum: 10c0/312b35ed288986aec90955410b21ed7427fd1e4ee318cb5fc18765c8d029eeded9444faa46589e5b1ed6b35fb2054a802ac8dcb917ddf6b3e189cb3bf11a965c
+  version: 2.0.1
+  resolution: "mrmime@npm:2.0.1"
+  checksum: 10c0/af05afd95af202fdd620422f976ad67dc18e6ee29beb03dd1ce950ea6ef664de378e44197246df4c7cdd73d47f2e7143a6e26e473084b9e4aa2095c0ad1e1761
   languageName: node
   linkType: hard
 
@@ -5284,12 +5456,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nanoid@npm:^3.3.7, nanoid@npm:^3.3.8":
-  version: 3.3.8
-  resolution: "nanoid@npm:3.3.8"
+"nanoid@npm:^3.3.11":
+  version: 3.3.11
+  resolution: "nanoid@npm:3.3.11"
   bin:
     nanoid: bin/nanoid.cjs
-  checksum: 10c0/4b1bb29f6cfebf3be3bc4ad1f1296fb0a10a3043a79f34fbffe75d1621b4318319211cd420549459018ea3592f0d2f159247a6f874911d6d26eaaadda2478120
+  checksum: 10c0/40e7f70b3d15f725ca072dfc4f74e81fcf1fbb02e491cf58ac0c79093adc9b0a73b152bcde57df4b79cd097e13023d7504acb38404a4da7bc1cd8e887b82fe0b
   languageName: node
   linkType: hard
 
@@ -5324,29 +5496,29 @@ __metadata:
   linkType: hard
 
 "node-gyp@npm:latest":
-  version: 11.0.0
-  resolution: "node-gyp@npm:11.0.0"
+  version: 11.2.0
+  resolution: "node-gyp@npm:11.2.0"
   dependencies:
     env-paths: "npm:^2.2.0"
     exponential-backoff: "npm:^3.1.1"
-    glob: "npm:^10.3.10"
     graceful-fs: "npm:^4.2.6"
     make-fetch-happen: "npm:^14.0.3"
     nopt: "npm:^8.0.0"
     proc-log: "npm:^5.0.0"
     semver: "npm:^7.3.5"
     tar: "npm:^7.4.3"
+    tinyglobby: "npm:^0.2.12"
     which: "npm:^5.0.0"
   bin:
     node-gyp: bin/node-gyp.js
-  checksum: 10c0/a3b885bbee2d271f1def32ba2e30ffcf4562a3db33af06b8b365e053153e2dd2051b9945783c3c8e852d26a0f20f65b251c7e83361623383a99635c0280ee573
+  checksum: 10c0/bd8d8c76b06be761239b0c8680f655f6a6e90b48e44d43415b11c16f7e8c15be346fba0cbf71588c7cdfb52c419d928a7d3db353afc1d952d19756237d8f10b9
   languageName: node
   linkType: hard
 
-"node-releases@npm:^2.0.18":
-  version: 2.0.18
-  resolution: "node-releases@npm:2.0.18"
-  checksum: 10c0/786ac9db9d7226339e1dc84bbb42007cb054a346bd9257e6aa154d294f01bc6a6cddb1348fa099f079be6580acbb470e3c048effd5f719325abd0179e566fd27
+"node-releases@npm:^2.0.19":
+  version: 2.0.19
+  resolution: "node-releases@npm:2.0.19"
+  checksum: 10c0/52a0dbd25ccf545892670d1551690fe0facb6a471e15f2cfa1b20142a5b255b3aa254af5f59d6ecb69c2bec7390bc643c43aa63b13bf5e64b6075952e716b1aa
   languageName: node
   linkType: hard
 
@@ -5408,16 +5580,16 @@ __metadata:
   linkType: hard
 
 "nwsapi@npm:^2.2.0":
-  version: 2.2.13
-  resolution: "nwsapi@npm:2.2.13"
-  checksum: 10c0/9dbd1071bba3570ef0b046c43c03d0584c461063f27539ba39f4185188e9d5c10cb06fd4426cdb300bb83020c3daa2c8f4fa9e8a070299539ac4007433357ac0
+  version: 2.2.20
+  resolution: "nwsapi@npm:2.2.20"
+  checksum: 10c0/07f4dafa3186aef7c007863e90acd4342a34ba9d44b22f14f644fdb311f6086887e21c2fc15efaa826c2bc39ab2bc841364a1a630e7c87e0cb723ba59d729297
   languageName: node
   linkType: hard
 
-"object-inspect@npm:^1.13.1":
-  version: 1.13.2
-  resolution: "object-inspect@npm:1.13.2"
-  checksum: 10c0/b97835b4c91ec37b5fd71add84f21c3f1047d1d155d00c0fcd6699516c256d4fcc6ff17a1aced873197fe447f91a3964178fd2a67a1ee2120cdaf60e81a050b4
+"object-inspect@npm:^1.13.3, object-inspect@npm:^1.13.4":
+  version: 1.13.4
+  resolution: "object-inspect@npm:1.13.4"
+  checksum: 10c0/d7f8711e803b96ea3191c745d6f8056ce1f2496e530e6a19a0e92d89b0fa3c76d910c31f0aa270432db6bd3b2f85500a376a83aaba849a8d518c8845b3211692
   languageName: node
   linkType: hard
 
@@ -5428,15 +5600,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.assign@npm:^4.1.5":
-  version: 4.1.5
-  resolution: "object.assign@npm:4.1.5"
+"object.assign@npm:^4.1.7":
+  version: 4.1.7
+  resolution: "object.assign@npm:4.1.7"
   dependencies:
-    call-bind: "npm:^1.0.5"
+    call-bind: "npm:^1.0.8"
+    call-bound: "npm:^1.0.3"
     define-properties: "npm:^1.2.1"
-    has-symbols: "npm:^1.0.3"
+    es-object-atoms: "npm:^1.0.0"
+    has-symbols: "npm:^1.1.0"
     object-keys: "npm:^1.1.1"
-  checksum: 10c0/60108e1fa2706f22554a4648299b0955236c62b3685c52abf4988d14fffb0e7731e00aa8c6448397e3eb63d087dcc124a9f21e1980f36d0b2667f3c18bacd469
+  checksum: 10c0/3b2732bd860567ea2579d1567525168de925a8d852638612846bd8082b3a1602b7b89b67b09913cbb5b9bd6e95923b2ae73580baa9d99cb4e990564e8cbf5ddc
   languageName: node
   linkType: hard
 
@@ -5464,13 +5638,14 @@ __metadata:
   linkType: hard
 
 "object.values@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "object.values@npm:1.2.0"
+  version: 1.2.1
+  resolution: "object.values@npm:1.2.1"
   dependencies:
-    call-bind: "npm:^1.0.7"
+    call-bind: "npm:^1.0.8"
+    call-bound: "npm:^1.0.3"
     define-properties: "npm:^1.2.1"
     es-object-atoms: "npm:^1.0.0"
-  checksum: 10c0/15809dc40fd6c5529501324fec5ff08570b7d70fb5ebbe8e2b3901afec35cf2b3dc484d1210c6c642cd3e7e0a5e18dd1d6850115337fef46bdae14ab0cb18ac3
+  checksum: 10c0/3c47814fdc64842ae3d5a74bc9d06bdd8d21563c04d9939bf6716a9c00596a4ebc342552f8934013d1ec991c74e3671b26710a0c51815f0b603795605ab6b2c9
   languageName: node
   linkType: hard
 
@@ -5497,6 +5672,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"own-keys@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "own-keys@npm:1.0.1"
+  dependencies:
+    get-intrinsic: "npm:^1.2.6"
+    object-keys: "npm:^1.1.1"
+    safe-push-apply: "npm:^1.0.0"
+  checksum: 10c0/6dfeb3455bff92ec3f16a982d4e3e65676345f6902d9f5ded1d8265a6318d0200ce461956d6d1c70053c7fe9f9fe65e552faac03f8140d37ef0fdd108e67013a
+  languageName: node
+  linkType: hard
+
 "p-limit@npm:^3.0.2":
   version: 3.1.0
   resolution: "p-limit@npm:3.1.0"
@@ -5604,7 +5790,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"picocolors@npm:^1.0.0, picocolors@npm:^1.1.0, picocolors@npm:^1.1.1":
+"picocolors@npm:^1.0.0, picocolors@npm:^1.1.1":
   version: 1.1.1
   resolution: "picocolors@npm:1.1.1"
   checksum: 10c0/e2e3e8170ab9d7c7421969adaa7e1b31434f789afb9b3f115f6b96d91945041ac3ceb02e9ec6fe6510ff036bcc0bf91e69a1772edc0b707e12b19c0f2d6bcf58
@@ -5626,9 +5812,9 @@ __metadata:
   linkType: hard
 
 "possible-typed-array-names@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "possible-typed-array-names@npm:1.0.0"
-  checksum: 10c0/d9aa22d31f4f7680e20269db76791b41c3a32c01a373e25f8a4813b4d45f7456bfc2b6d68f752dc4aab0e0bb0721cb3d76fb678c9101cb7a16316664bc2c73fd
+  version: 1.1.0
+  resolution: "possible-typed-array-names@npm:1.1.0"
+  checksum: 10c0/c810983414142071da1d644662ce4caebce890203eb2bc7bf119f37f3fe5796226e117e6cca146b521921fa6531072674174a3325066ac66fce089a53e1e5196
   languageName: node
   linkType: hard
 
@@ -5678,25 +5864,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.4.38, postcss@npm:^8.4.39":
-  version: 8.4.47
-  resolution: "postcss@npm:8.4.47"
+"postcss@npm:^8.4.38, postcss@npm:^8.4.39, postcss@npm:^8.4.43":
+  version: 8.5.5
+  resolution: "postcss@npm:8.5.5"
   dependencies:
-    nanoid: "npm:^3.3.7"
-    picocolors: "npm:^1.1.0"
-    source-map-js: "npm:^1.2.1"
-  checksum: 10c0/929f68b5081b7202709456532cee2a145c1843d391508c5a09de2517e8c4791638f71dd63b1898dba6712f8839d7a6da046c72a5e44c162e908f5911f57b5f44
-  languageName: node
-  linkType: hard
-
-"postcss@npm:^8.4.43":
-  version: 8.5.1
-  resolution: "postcss@npm:8.5.1"
-  dependencies:
-    nanoid: "npm:^3.3.8"
+    nanoid: "npm:^3.3.11"
     picocolors: "npm:^1.1.1"
     source-map-js: "npm:^1.2.1"
-  checksum: 10c0/c4d90c59c98e8a0c102b77d3f4cac190f883b42d63dc60e2f3ed840f16197c0c8e25a4327d2e9a847b45a985612317dc0534178feeebd0a1cf3eb0eecf75cae4
+  checksum: 10c0/6415873fab84de05c2d8fd18f72ea6654bca437bb4b9f02ca819c438501e4b3a450023e575e17587c6eaa5bedddaaa4dad3af210f5cf166e30cec09cac58baf8
   languageName: node
   linkType: hard
 
@@ -5708,21 +5883,21 @@ __metadata:
   linkType: hard
 
 "prettier-plugin-svelte@npm:^3.3.2":
-  version: 3.3.2
-  resolution: "prettier-plugin-svelte@npm:3.3.2"
+  version: 3.4.0
+  resolution: "prettier-plugin-svelte@npm:3.4.0"
   peerDependencies:
     prettier: ^3.0.0
     svelte: ^3.2.0 || ^4.0.0-next.0 || ^5.0.0-next.0
-  checksum: 10c0/00c428e18fcc5db84eb55969425041aa80bb82c95b9abeb5bf5354605f84e31301e104bb7c7ab3264dbe42a8b7b12c994e795effcf71c3c4b51dfd0a5ff41a9b
+  checksum: 10c0/caf11188adf6c5ce86189c98de5d0a9371c72bba64fc9b714a9b074f63677a3dead6c3cf3c2912a9aa63b1a2235e6c562b4f7c8f812631c69d3cc1ca07dc1a9c
   languageName: node
   linkType: hard
 
 "prettier@npm:^3.4.2":
-  version: 3.4.2
-  resolution: "prettier@npm:3.4.2"
+  version: 3.5.3
+  resolution: "prettier@npm:3.5.3"
   bin:
     prettier: bin/prettier.cjs
-  checksum: 10c0/99e076a26ed0aba4ebc043880d0f08bbb8c59a4c6641cdee6cdadf2205bdd87aa1d7823f50c3aea41e015e99878d37c58d7b5f0e663bba0ef047f94e36b96446
+  checksum: 10c0/3880cb90b9dc0635819ab52ff571518c35bd7f15a6e80a2054c05dbc8a3aa6e74f135519e91197de63705bcb38388ded7e7230e2178432a1468005406238b877
   languageName: node
   linkType: hard
 
@@ -5744,13 +5919,15 @@ __metadata:
   linkType: hard
 
 "psl@npm:^1.1.33":
-  version: 1.9.0
-  resolution: "psl@npm:1.9.0"
-  checksum: 10c0/6a3f805fdab9442f44de4ba23880c4eba26b20c8e8e0830eff1cb31007f6825dace61d17203c58bfe36946842140c97a1ba7f67bc63ca2d88a7ee052b65d97ab
+  version: 1.15.0
+  resolution: "psl@npm:1.15.0"
+  dependencies:
+    punycode: "npm:^2.3.1"
+  checksum: 10c0/d8d45a99e4ca62ca12ac3c373e63d80d2368d38892daa40cfddaa1eb908be98cd549ac059783ef3a56cfd96d57ae8e2fd9ae53d1378d90d42bc661ff924e102a
   languageName: node
   linkType: hard
 
-"punycode@npm:^2.1.0, punycode@npm:^2.1.1":
+"punycode@npm:^2.1.0, punycode@npm:^2.1.1, punycode@npm:^2.3.1":
   version: 2.3.1
   resolution: "punycode@npm:2.3.1"
   checksum: 10c0/14f76a8206bc3464f794fb2e3d3cc665ae416c01893ad7a02b23766eb07159144ee612ad67af5e84fa4479ccfe67678c4feb126b0485651b302babf66f04f9e9
@@ -5801,9 +5978,9 @@ __metadata:
   linkType: hard
 
 "readdirp@npm:^4.0.1":
-  version: 4.0.2
-  resolution: "readdirp@npm:4.0.2"
-  checksum: 10c0/a16ecd8ef3286dcd90648c3b103e3826db2b766cdb4a988752c43a83f683d01c7059158d623cbcd8bdfb39e65d302d285be2d208e7d9f34d022d912b929217dd
+  version: 4.1.2
+  resolution: "readdirp@npm:4.1.2"
+  checksum: 10c0/60a14f7619dec48c9c850255cd523e2717001b0e179dc7037cfa0895da7b9e9ab07532d324bfb118d73a710887d1e35f79c495fa91582784493e085d18c72c62
   languageName: node
   linkType: hard
 
@@ -5816,15 +5993,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"regexp.prototype.flags@npm:^1.5.2":
-  version: 1.5.3
-  resolution: "regexp.prototype.flags@npm:1.5.3"
+"reflect.getprototypeof@npm:^1.0.6, reflect.getprototypeof@npm:^1.0.9":
+  version: 1.0.10
+  resolution: "reflect.getprototypeof@npm:1.0.10"
   dependencies:
-    call-bind: "npm:^1.0.7"
+    call-bind: "npm:^1.0.8"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.9"
+    es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.0.0"
+    get-intrinsic: "npm:^1.2.7"
+    get-proto: "npm:^1.0.1"
+    which-builtin-type: "npm:^1.2.1"
+  checksum: 10c0/7facec28c8008876f8ab98e80b7b9cb4b1e9224353fd4756dda5f2a4ab0d30fa0a5074777c6df24e1e0af463a2697513b0a11e548d99cf52f21f7bc6ba48d3ac
+  languageName: node
+  linkType: hard
+
+"regexp.prototype.flags@npm:^1.5.4":
+  version: 1.5.4
+  resolution: "regexp.prototype.flags@npm:1.5.4"
+  dependencies:
+    call-bind: "npm:^1.0.8"
     define-properties: "npm:^1.2.1"
     es-errors: "npm:^1.3.0"
+    get-proto: "npm:^1.0.1"
+    gopd: "npm:^1.2.0"
     set-function-name: "npm:^2.0.2"
-  checksum: 10c0/e1a7c7dc42cc91abf73e47a269c4b3a8f225321b7f617baa25821f6a123a91d23a73b5152f21872c566e699207e1135d075d2251cd3e84cc96d82a910adf6020
+  checksum: 10c0/83b88e6115b4af1c537f8dabf5c3744032cb875d63bc05c288b1b8c0ef37cbe55353f95d8ca817e8843806e3e150b118bc624e4279b24b4776b4198232735a77
   languageName: node
   linkType: hard
 
@@ -5849,20 +6044,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.22.4":
-  version: 1.22.8
-  resolution: "resolve@npm:1.22.8"
-  dependencies:
-    is-core-module: "npm:^2.13.0"
-    path-parse: "npm:^1.0.7"
-    supports-preserve-symlinks-flag: "npm:^1.0.0"
-  bin:
-    resolve: bin/resolve
-  checksum: 10c0/07e179f4375e1fd072cfb72ad66d78547f86e6196c4014b31cb0b8bb1db5f7ca871f922d08da0fbc05b94e9fd42206f819648fa3b5b873ebbc8e1dc68fec433a
-  languageName: node
-  linkType: hard
-
-"resolve@npm:^1.22.8":
+"resolve@npm:^1.22.4, resolve@npm:^1.22.8":
   version: 1.22.10
   resolution: "resolve@npm:1.22.10"
   dependencies:
@@ -5875,20 +6057,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@npm%3A^1.22.4#optional!builtin<compat/resolve>":
-  version: 1.22.8
-  resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
-  dependencies:
-    is-core-module: "npm:^2.13.0"
-    path-parse: "npm:^1.0.7"
-    supports-preserve-symlinks-flag: "npm:^1.0.0"
-  bin:
-    resolve: bin/resolve
-  checksum: 10c0/0446f024439cd2e50c6c8fa8ba77eaa8370b4180f401a96abf3d1ebc770ac51c1955e12764cde449fde3fff480a61f84388e3505ecdbab778f4bef5f8212c729
-  languageName: node
-  linkType: hard
-
-"resolve@patch:resolve@npm%3A^1.22.8#optional!builtin<compat/resolve>":
+"resolve@patch:resolve@npm%3A^1.22.4#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.8#optional!builtin<compat/resolve>":
   version: 1.22.10
   resolution: "resolve@patch:resolve@npm%3A1.22.10#optional!builtin<compat/resolve>::version=1.22.10&hash=c3c19d"
   dependencies:
@@ -5909,9 +6078,9 @@ __metadata:
   linkType: hard
 
 "reusify@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "reusify@npm:1.0.4"
-  checksum: 10c0/c19ef26e4e188f408922c46f7ff480d38e8dfc55d448310dfb518736b23ed2c4f547fb64a6ed5bdba92cd7e7ddc889d36ff78f794816d5e71498d645ef476107
+  version: 1.1.0
+  resolution: "reusify@npm:1.1.0"
+  checksum: 10c0/4eff0d4a5f9383566c7d7ec437b671cc51b25963bd61bf127c3f3d3f68e44a026d99b8d2f1ad344afff8d278a8fe70a8ea092650a716d22287e8bef7126bb2fa
   languageName: node
   linkType: hard
 
@@ -5937,17 +6106,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rimraf@npm:^5.0.5":
-  version: 5.0.10
-  resolution: "rimraf@npm:5.0.10"
-  dependencies:
-    glob: "npm:^10.3.7"
-  bin:
-    rimraf: dist/esm/bin.mjs
-  checksum: 10c0/7da4fd0e15118ee05b918359462cfa1e7fe4b1228c7765195a45b55576e8c15b95db513b8466ec89129666f4af45ad978a3057a02139afba1a63512a2d9644cc
-  languageName: node
-  linkType: hard
-
 "robust-predicates@npm:^3.0.2":
   version: 3.0.2
   resolution: "robust-predicates@npm:3.0.2"
@@ -5956,29 +6114,30 @@ __metadata:
   linkType: hard
 
 "rollup@npm:^4.20.0":
-  version: 4.31.0
-  resolution: "rollup@npm:4.31.0"
+  version: 4.43.0
+  resolution: "rollup@npm:4.43.0"
   dependencies:
-    "@rollup/rollup-android-arm-eabi": "npm:4.31.0"
-    "@rollup/rollup-android-arm64": "npm:4.31.0"
-    "@rollup/rollup-darwin-arm64": "npm:4.31.0"
-    "@rollup/rollup-darwin-x64": "npm:4.31.0"
-    "@rollup/rollup-freebsd-arm64": "npm:4.31.0"
-    "@rollup/rollup-freebsd-x64": "npm:4.31.0"
-    "@rollup/rollup-linux-arm-gnueabihf": "npm:4.31.0"
-    "@rollup/rollup-linux-arm-musleabihf": "npm:4.31.0"
-    "@rollup/rollup-linux-arm64-gnu": "npm:4.31.0"
-    "@rollup/rollup-linux-arm64-musl": "npm:4.31.0"
-    "@rollup/rollup-linux-loongarch64-gnu": "npm:4.31.0"
-    "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.31.0"
-    "@rollup/rollup-linux-riscv64-gnu": "npm:4.31.0"
-    "@rollup/rollup-linux-s390x-gnu": "npm:4.31.0"
-    "@rollup/rollup-linux-x64-gnu": "npm:4.31.0"
-    "@rollup/rollup-linux-x64-musl": "npm:4.31.0"
-    "@rollup/rollup-win32-arm64-msvc": "npm:4.31.0"
-    "@rollup/rollup-win32-ia32-msvc": "npm:4.31.0"
-    "@rollup/rollup-win32-x64-msvc": "npm:4.31.0"
-    "@types/estree": "npm:1.0.6"
+    "@rollup/rollup-android-arm-eabi": "npm:4.43.0"
+    "@rollup/rollup-android-arm64": "npm:4.43.0"
+    "@rollup/rollup-darwin-arm64": "npm:4.43.0"
+    "@rollup/rollup-darwin-x64": "npm:4.43.0"
+    "@rollup/rollup-freebsd-arm64": "npm:4.43.0"
+    "@rollup/rollup-freebsd-x64": "npm:4.43.0"
+    "@rollup/rollup-linux-arm-gnueabihf": "npm:4.43.0"
+    "@rollup/rollup-linux-arm-musleabihf": "npm:4.43.0"
+    "@rollup/rollup-linux-arm64-gnu": "npm:4.43.0"
+    "@rollup/rollup-linux-arm64-musl": "npm:4.43.0"
+    "@rollup/rollup-linux-loongarch64-gnu": "npm:4.43.0"
+    "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.43.0"
+    "@rollup/rollup-linux-riscv64-gnu": "npm:4.43.0"
+    "@rollup/rollup-linux-riscv64-musl": "npm:4.43.0"
+    "@rollup/rollup-linux-s390x-gnu": "npm:4.43.0"
+    "@rollup/rollup-linux-x64-gnu": "npm:4.43.0"
+    "@rollup/rollup-linux-x64-musl": "npm:4.43.0"
+    "@rollup/rollup-win32-arm64-msvc": "npm:4.43.0"
+    "@rollup/rollup-win32-ia32-msvc": "npm:4.43.0"
+    "@rollup/rollup-win32-x64-msvc": "npm:4.43.0"
+    "@types/estree": "npm:1.0.7"
     fsevents: "npm:~2.3.2"
   dependenciesMeta:
     "@rollup/rollup-android-arm-eabi":
@@ -6007,6 +6166,8 @@ __metadata:
       optional: true
     "@rollup/rollup-linux-riscv64-gnu":
       optional: true
+    "@rollup/rollup-linux-riscv64-musl":
+      optional: true
     "@rollup/rollup-linux-s390x-gnu":
       optional: true
     "@rollup/rollup-linux-x64-gnu":
@@ -6023,7 +6184,7 @@ __metadata:
       optional: true
   bin:
     rollup: dist/bin/rollup
-  checksum: 10c0/0d6da45098af14c678e78be887fefefbf5a97fef6277c5a1c24ca722537bb3a02e695c6fcad8880218d8fbef8a7a17d865786afd99bb6e70409fad73844ca8cf
+  checksum: 10c0/a14a16ee5433f9eddfe803ed1a3f4528e3e96f746e55bf88c5482f9a60a4ad61f507b59f46d5d9c8dc98bb7983483e0c94b760ae37c02157eba9da5665c1641b
   languageName: node
   linkType: hard
 
@@ -6052,15 +6213,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"safe-array-concat@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "safe-array-concat@npm:1.1.2"
+"safe-array-concat@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "safe-array-concat@npm:1.1.3"
   dependencies:
-    call-bind: "npm:^1.0.7"
-    get-intrinsic: "npm:^1.2.4"
-    has-symbols: "npm:^1.0.3"
+    call-bind: "npm:^1.0.8"
+    call-bound: "npm:^1.0.2"
+    get-intrinsic: "npm:^1.2.6"
+    has-symbols: "npm:^1.1.0"
     isarray: "npm:^2.0.5"
-  checksum: 10c0/12f9fdb01c8585e199a347eacc3bae7b5164ae805cdc8c6707199dbad5b9e30001a50a43c4ee24dc9ea32dbb7279397850e9208a7e217f4d8b1cf5d90129dec9
+  checksum: 10c0/43c86ffdddc461fb17ff8a17c5324f392f4868f3c7dd2c6a5d9f5971713bc5fd755667212c80eab9567595f9a7509cc2f83e590ddaebd1bd19b780f9c79f9a8d
   languageName: node
   linkType: hard
 
@@ -6071,14 +6233,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"safe-regex-test@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "safe-regex-test@npm:1.0.3"
+"safe-push-apply@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "safe-push-apply@npm:1.0.0"
   dependencies:
-    call-bind: "npm:^1.0.6"
     es-errors: "npm:^1.3.0"
-    is-regex: "npm:^1.1.4"
-  checksum: 10c0/900bf7c98dc58f08d8523b7012b468e4eb757afa624f198902c0643d7008ba777b0bdc35810ba0b758671ce887617295fb742b3f3968991b178ceca54cb07603
+    isarray: "npm:^2.0.5"
+  checksum: 10c0/831f1c9aae7436429e7862c7e46f847dfe490afac20d0ee61bae06108dbf5c745a0de3568ada30ccdd3eeb0864ca8331b2eef703abd69bfea0745b21fd320750
+  languageName: node
+  linkType: hard
+
+"safe-regex-test@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "safe-regex-test@npm:1.1.0"
+  dependencies:
+    call-bound: "npm:^1.0.2"
+    es-errors: "npm:^1.3.0"
+    is-regex: "npm:^1.2.1"
+  checksum: 10c0/f2c25281bbe5d39cddbbce7f86fca5ea9b3ce3354ea6cd7c81c31b006a5a9fff4286acc5450a3b9122c56c33eba69c56b9131ad751457b2b4a585825e6a10665
   languageName: node
   linkType: hard
 
@@ -6115,8 +6287,8 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.71.1":
-  version: 1.87.0
-  resolution: "sass@npm:1.87.0"
+  version: 1.89.2
+  resolution: "sass@npm:1.89.2"
   dependencies:
     "@parcel/watcher": "npm:^2.4.1"
     chokidar: "npm:^4.0.0"
@@ -6127,7 +6299,7 @@ __metadata:
       optional: true
   bin:
     sass: sass.js
-  checksum: 10c0/bd245faf14e4783dc547765350cf05817edaac0d6d6f6e4da8ab751f3eb3cc3873afd563c0ce416a24aa6c9c4e9023b05096447fc006660a01f76adffb54fbc6
+  checksum: 10c0/752ccc7581b0c6395f63918116c20924e99943a86d79e94f5c4a0d41b1e981fe1f0ecd1ee82fff21496f81dbc91f68fb35a498166562ec8ec53e7aad7c3dbd9d
   languageName: node
   linkType: hard
 
@@ -6141,11 +6313,11 @@ __metadata:
   linkType: hard
 
 "semver@npm:2 || 3 || 4 || 5 || 6 || 7, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.4, semver@npm:^7.6.2":
-  version: 7.6.3
-  resolution: "semver@npm:7.6.3"
+  version: 7.7.2
+  resolution: "semver@npm:7.7.2"
   bin:
     semver: bin/semver.js
-  checksum: 10c0/88f33e148b210c153873cb08cfe1e281d518aaa9a666d4d148add6560db5cd3c582f3a08ccb91f38d5f379ead256da9931234ed122057f40bb5766e65e58adaf
+  checksum: 10c0/aca305edfbf2383c22571cb7714f48cadc7ac95371b4b52362fb8eeffdfbc0de0669368b82b2b15978f8848f01d7114da65697e56cd8c37b0dab8c58e543f9ea
   languageName: node
   linkType: hard
 
@@ -6165,7 +6337,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"set-function-length@npm:^1.2.1":
+"set-function-length@npm:^1.2.2":
   version: 1.2.2
   resolution: "set-function-length@npm:1.2.2"
   dependencies:
@@ -6191,6 +6363,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"set-proto@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "set-proto@npm:1.0.0"
+  dependencies:
+    dunder-proto: "npm:^1.0.1"
+    es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10c0/ca5c3ccbba479d07c30460e367e66337cec825560b11e8ba9c5ebe13a2a0d6021ae34eddf94ff3dfe17a3104dc1f191519cb6c48378b503e5c3f36393938776a
+  languageName: node
+  linkType: hard
+
 "shebang-command@npm:^2.0.0":
   version: 2.0.0
   resolution: "shebang-command@npm:2.0.0"
@@ -6207,15 +6390,51 @@ __metadata:
   languageName: node
   linkType: hard
 
-"side-channel@npm:^1.0.4":
-  version: 1.0.6
-  resolution: "side-channel@npm:1.0.6"
+"side-channel-list@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "side-channel-list@npm:1.0.0"
   dependencies:
-    call-bind: "npm:^1.0.7"
     es-errors: "npm:^1.3.0"
-    get-intrinsic: "npm:^1.2.4"
-    object-inspect: "npm:^1.13.1"
-  checksum: 10c0/d2afd163dc733cc0a39aa6f7e39bf0c436293510dbccbff446733daeaf295857dbccf94297092ec8c53e2503acac30f0b78830876f0485991d62a90e9cad305f
+    object-inspect: "npm:^1.13.3"
+  checksum: 10c0/644f4ac893456c9490ff388bf78aea9d333d5e5bfc64cfb84be8f04bf31ddc111a8d4b83b85d7e7e8a7b845bc185a9ad02c052d20e086983cf59f0be517d9b3d
+  languageName: node
+  linkType: hard
+
+"side-channel-map@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "side-channel-map@npm:1.0.1"
+  dependencies:
+    call-bound: "npm:^1.0.2"
+    es-errors: "npm:^1.3.0"
+    get-intrinsic: "npm:^1.2.5"
+    object-inspect: "npm:^1.13.3"
+  checksum: 10c0/010584e6444dd8a20b85bc926d934424bd809e1a3af941cace229f7fdcb751aada0fb7164f60c2e22292b7fa3c0ff0bce237081fd4cdbc80de1dc68e95430672
+  languageName: node
+  linkType: hard
+
+"side-channel-weakmap@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "side-channel-weakmap@npm:1.0.2"
+  dependencies:
+    call-bound: "npm:^1.0.2"
+    es-errors: "npm:^1.3.0"
+    get-intrinsic: "npm:^1.2.5"
+    object-inspect: "npm:^1.13.3"
+    side-channel-map: "npm:^1.0.1"
+  checksum: 10c0/71362709ac233e08807ccd980101c3e2d7efe849edc51455030327b059f6c4d292c237f94dc0685031dd11c07dd17a68afde235d6cf2102d949567f98ab58185
+  languageName: node
+  linkType: hard
+
+"side-channel@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "side-channel@npm:1.1.0"
+  dependencies:
+    es-errors: "npm:^1.3.0"
+    object-inspect: "npm:^1.13.3"
+    side-channel-list: "npm:^1.0.0"
+    side-channel-map: "npm:^1.0.1"
+    side-channel-weakmap: "npm:^1.0.2"
+  checksum: 10c0/cb20dad41eb032e6c24c0982e1e5a24963a28aa6122b4f05b3f3d6bf8ae7fd5474ef382c8f54a6a3ab86e0cac4d41a23bd64ede3970e5bfb50326ba02a7996e6
   languageName: node
   linkType: hard
 
@@ -6234,13 +6453,13 @@ __metadata:
   linkType: hard
 
 "sirv@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "sirv@npm:3.0.0"
+  version: 3.0.1
+  resolution: "sirv@npm:3.0.1"
   dependencies:
     "@polka/url": "npm:^1.0.0-next.24"
     mrmime: "npm:^2.0.0"
     totalist: "npm:^3.0.0"
-  checksum: 10c0/282c52ee5a93cafa297096ad31aa6c3004a21d4c93abe728b701e51e4329acb887f6e92f07696225414fd6bb4a7782fd64a42d0b6b6467ae0f66bd3fde90b865
+  checksum: 10c0/7cf64b28daa69b15f77b38b0efdd02c007b72bb3ec5f107b208ebf59f01b174ef63a1db3aca16d2df925501831f4c209be6ece3302b98765919ef5088b45bf80
   languageName: node
   linkType: hard
 
@@ -6277,12 +6496,12 @@ __metadata:
   linkType: hard
 
 "socks@npm:^2.8.3":
-  version: 2.8.3
-  resolution: "socks@npm:2.8.3"
+  version: 2.8.5
+  resolution: "socks@npm:2.8.5"
   dependencies:
     ip-address: "npm:^9.0.5"
     smart-buffer: "npm:^4.2.0"
-  checksum: 10c0/d54a52bf9325165770b674a67241143a3d8b4e4c8884560c4e0e078aace2a728dffc7f70150660f51b85797c4e1a3b82f9b7aa25e0a0ceae1a243365da5c51a7
+  checksum: 10c0/e427d0eb0451cfd04e20b9156ea8c0e9b5e38a8d70f21e55c30fbe4214eda37cfc25d782c63f9adc5fbdad6d062a0f127ef2cefc9a44b6fee2b9ea5d1ed10827
   languageName: node
   linkType: hard
 
@@ -6363,9 +6582,9 @@ __metadata:
   linkType: hard
 
 "spdx-license-ids@npm:^3.0.0":
-  version: 3.0.20
-  resolution: "spdx-license-ids@npm:3.0.20"
-  checksum: 10c0/bdff7534fad6ef59be49becda1edc3fb7f5b3d6f296a715516ab9d972b8ad59af2c34b2003e01db8970d4c673d185ff696ba74c6b61d3bf327e2b3eac22c297c
+  version: 3.0.21
+  resolution: "spdx-license-ids@npm:3.0.21"
+  checksum: 10c0/ecb24c698d8496aa9efe23e0b1f751f8a7a89faedcdfcbfabae772b546c2db46ccde8f3bc447a238eb86bbcd4f73fea88720ef3b8394f7896381bec3d7736411
   languageName: node
   linkType: hard
 
@@ -6411,9 +6630,19 @@ __metadata:
   linkType: hard
 
 "std-env@npm:^3.8.0":
-  version: 3.8.0
-  resolution: "std-env@npm:3.8.0"
-  checksum: 10c0/f560a2902fd0fa3d648d7d0acecbd19d664006f7372c1fba197ed4c216b4c9e48db6e2769b5fe1616d42a9333c9f066c5011935035e85c59f45dc4f796272040
+  version: 3.9.0
+  resolution: "std-env@npm:3.9.0"
+  checksum: 10c0/4a6f9218aef3f41046c3c7ecf1f98df00b30a07f4f35c6d47b28329bc2531eef820828951c7d7b39a1c5eb19ad8a46e3ddfc7deb28f0a2f3ceebee11bab7ba50
+  languageName: node
+  linkType: hard
+
+"stop-iteration-iterator@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "stop-iteration-iterator@npm:1.1.0"
+  dependencies:
+    es-errors: "npm:^1.3.0"
+    internal-slot: "npm:^1.1.0"
+  checksum: 10c0/de4e45706bb4c0354a4b1122a2b8cc45a639e86206807ce0baf390ee9218d3ef181923fa4d2b67443367c491aa255c5fbaa64bb74648e3c5b48299928af86c09
   languageName: node
   linkType: hard
 
@@ -6439,26 +6668,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string.prototype.trim@npm:^1.2.9":
-  version: 1.2.9
-  resolution: "string.prototype.trim@npm:1.2.9"
+"string.prototype.trim@npm:^1.2.10":
+  version: 1.2.10
+  resolution: "string.prototype.trim@npm:1.2.10"
   dependencies:
-    call-bind: "npm:^1.0.7"
+    call-bind: "npm:^1.0.8"
+    call-bound: "npm:^1.0.2"
+    define-data-property: "npm:^1.1.4"
     define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.23.0"
+    es-abstract: "npm:^1.23.5"
     es-object-atoms: "npm:^1.0.0"
-  checksum: 10c0/dcef1a0fb61d255778155006b372dff8cc6c4394bc39869117e4241f41a2c52899c0d263ffc7738a1f9e61488c490b05c0427faa15151efad721e1a9fb2663c2
+    has-property-descriptors: "npm:^1.0.2"
+  checksum: 10c0/8a8854241c4b54a948e992eb7dd6b8b3a97185112deb0037a134f5ba57541d8248dd610c966311887b6c2fd1181a3877bffb14d873ce937a344535dabcc648f8
   languageName: node
   linkType: hard
 
-"string.prototype.trimend@npm:^1.0.8":
-  version: 1.0.8
-  resolution: "string.prototype.trimend@npm:1.0.8"
+"string.prototype.trimend@npm:^1.0.8, string.prototype.trimend@npm:^1.0.9":
+  version: 1.0.9
+  resolution: "string.prototype.trimend@npm:1.0.9"
   dependencies:
-    call-bind: "npm:^1.0.7"
+    call-bind: "npm:^1.0.8"
+    call-bound: "npm:^1.0.2"
     define-properties: "npm:^1.2.1"
     es-object-atoms: "npm:^1.0.0"
-  checksum: 10c0/0a0b54c17c070551b38e756ae271865ac6cc5f60dabf2e7e343cceae7d9b02e1a1120a824e090e79da1b041a74464e8477e2da43e2775c85392be30a6f60963c
+  checksum: 10c0/59e1a70bf9414cb4c536a6e31bef5553c8ceb0cf44d8b4d0ed65c9653358d1c64dd0ec203b100df83d0413bbcde38b8c5d49e14bc4b86737d74adc593a0d35b6
   languageName: node
   linkType: hard
 
@@ -6548,6 +6781,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"svelte-contextmenu@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "svelte-contextmenu@npm:1.0.2"
+  checksum: 10c0/33cf79540337862278927f4b732b5d97f2c029348666ebcd3105b5c08bed54498a1d66f61b0212c18c204942cf54c9f6ce5ed509981d9f19f99f9334d8961cdf
+  languageName: node
+  linkType: hard
+
 "svelte-eslint-parser@npm:^0.43.0":
   version: 0.43.0
   resolution: "svelte-eslint-parser@npm:0.43.0"
@@ -6623,24 +6863,24 @@ __metadata:
   linkType: hard
 
 "svelte@npm:^5.17.3":
-  version: 5.17.3
-  resolution: "svelte@npm:5.17.3"
+  version: 5.34.3
+  resolution: "svelte@npm:5.34.3"
   dependencies:
     "@ampproject/remapping": "npm:^2.3.0"
     "@jridgewell/sourcemap-codec": "npm:^1.5.0"
+    "@sveltejs/acorn-typescript": "npm:^1.0.5"
     "@types/estree": "npm:^1.0.5"
     acorn: "npm:^8.12.1"
-    acorn-typescript: "npm:^1.4.13"
     aria-query: "npm:^5.3.1"
     axobject-query: "npm:^4.1.0"
     clsx: "npm:^2.1.1"
     esm-env: "npm:^1.2.1"
-    esrap: "npm:^1.3.2"
+    esrap: "npm:^1.4.8"
     is-reference: "npm:^3.0.3"
     locate-character: "npm:^3.0.0"
     magic-string: "npm:^0.30.11"
     zimmerframe: "npm:^1.1.2"
-  checksum: 10c0/ca80ca7b8ef7aea07188f3c5c698b0d19ac5ea7ee1adafcb9c3f1ec210be04a69a0711ce7dfe2017ec6f7892b098fb60b07150483274de73d85b7bc7c20c5e23
+  checksum: 10c0/78f7befb176bc5a9cb24343d644b8cb7f2d02d78e6ed6a2410760fca3019b31ded1dd70b2bc8fc6805435dce3a36787308c1730974d0511cc3aaf0d80cd471d2
   languageName: node
   linkType: hard
 
@@ -6703,10 +6943,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tinyglobby@npm:^0.2.12":
+  version: 0.2.14
+  resolution: "tinyglobby@npm:0.2.14"
+  dependencies:
+    fdir: "npm:^6.4.4"
+    picomatch: "npm:^4.0.2"
+  checksum: 10c0/f789ed6c924287a9b7d3612056ed0cda67306cd2c80c249fd280cf1504742b12583a2089b61f4abbd24605f390809017240e250241f09938054c9b363e51c0a6
+  languageName: node
+  linkType: hard
+
 "tinypool@npm:^1.0.1":
-  version: 1.0.2
-  resolution: "tinypool@npm:1.0.2"
-  checksum: 10c0/31ac184c0ff1cf9a074741254fe9ea6de95026749eb2b8ec6fd2b9d8ca94abdccda731f8e102e7f32e72ed3b36d32c6975fd5f5523df3f1b6de6c3d8dfd95e63
+  version: 1.1.0
+  resolution: "tinypool@npm:1.1.0"
+  checksum: 10c0/deb6bde5e3d85d4ba043806c66f43fb5b649716312a47b52761a83668ffc71cd0ea4e24254c1b02a3702e5c27e02605f0189a1460f6284a5930a08bd0c06435c
   languageName: node
   linkType: hard
 
@@ -6788,9 +7038,9 @@ __metadata:
   linkType: hard
 
 "tslib@npm:^2.0.3":
-  version: 2.8.0
-  resolution: "tslib@npm:2.8.0"
-  checksum: 10c0/31e4d14dc1355e9b89e4d3c893a18abb7f90b6886b089c2da91224d0a7752c79f3ddc41bc1aa0a588ac895bd97bb99c5bc2bfdb2f86de849f31caeb3ba79bbe5
+  version: 2.8.1
+  resolution: "tslib@npm:2.8.1"
+  checksum: 10c0/9c4759110a19c53f992d9aae23aac5ced636e99887b51b9e61def52611732872ff7668757d4e4c61f19691e36f4da981cd9485e869b4a7408d689f6bf1f14e62
   languageName: node
   linkType: hard
 
@@ -6838,55 +7088,56 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typed-array-buffer@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "typed-array-buffer@npm:1.0.2"
+"typed-array-buffer@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "typed-array-buffer@npm:1.0.3"
   dependencies:
-    call-bind: "npm:^1.0.7"
+    call-bound: "npm:^1.0.3"
     es-errors: "npm:^1.3.0"
-    is-typed-array: "npm:^1.1.13"
-  checksum: 10c0/9e043eb38e1b4df4ddf9dde1aa64919ae8bb909571c1cc4490ba777d55d23a0c74c7d73afcdd29ec98616d91bb3ae0f705fad4421ea147e1daf9528200b562da
+    is-typed-array: "npm:^1.1.14"
+  checksum: 10c0/1105071756eb248774bc71646bfe45b682efcad93b55532c6ffa4518969fb6241354e4aa62af679ae83899ec296d69ef88f1f3763657cdb3a4d29321f7b83079
   languageName: node
   linkType: hard
 
-"typed-array-byte-length@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "typed-array-byte-length@npm:1.0.1"
+"typed-array-byte-length@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "typed-array-byte-length@npm:1.0.3"
   dependencies:
-    call-bind: "npm:^1.0.7"
+    call-bind: "npm:^1.0.8"
     for-each: "npm:^0.3.3"
-    gopd: "npm:^1.0.1"
-    has-proto: "npm:^1.0.3"
-    is-typed-array: "npm:^1.1.13"
-  checksum: 10c0/fcebeffb2436c9f355e91bd19e2368273b88c11d1acc0948a2a306792f1ab672bce4cfe524ab9f51a0505c9d7cd1c98eff4235c4f6bfef6a198f6cfc4ff3d4f3
+    gopd: "npm:^1.2.0"
+    has-proto: "npm:^1.2.0"
+    is-typed-array: "npm:^1.1.14"
+  checksum: 10c0/6ae083c6f0354f1fce18b90b243343b9982affd8d839c57bbd2c174a5d5dc71be9eb7019ffd12628a96a4815e7afa85d718d6f1e758615151d5f35df841ffb3e
   languageName: node
   linkType: hard
 
-"typed-array-byte-offset@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "typed-array-byte-offset@npm:1.0.2"
+"typed-array-byte-offset@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "typed-array-byte-offset@npm:1.0.4"
   dependencies:
     available-typed-arrays: "npm:^1.0.7"
-    call-bind: "npm:^1.0.7"
+    call-bind: "npm:^1.0.8"
     for-each: "npm:^0.3.3"
-    gopd: "npm:^1.0.1"
-    has-proto: "npm:^1.0.3"
-    is-typed-array: "npm:^1.1.13"
-  checksum: 10c0/d2628bc739732072e39269389a758025f75339de2ed40c4f91357023c5512d237f255b633e3106c461ced41907c1bf9a533c7e8578066b0163690ca8bc61b22f
+    gopd: "npm:^1.2.0"
+    has-proto: "npm:^1.2.0"
+    is-typed-array: "npm:^1.1.15"
+    reflect.getprototypeof: "npm:^1.0.9"
+  checksum: 10c0/3d805b050c0c33b51719ee52de17c1cd8e6a571abdf0fffb110e45e8dd87a657e8b56eee94b776b13006d3d347a0c18a730b903cf05293ab6d92e99ff8f77e53
   languageName: node
   linkType: hard
 
-"typed-array-length@npm:^1.0.6":
-  version: 1.0.6
-  resolution: "typed-array-length@npm:1.0.6"
+"typed-array-length@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "typed-array-length@npm:1.0.7"
   dependencies:
     call-bind: "npm:^1.0.7"
     for-each: "npm:^0.3.3"
     gopd: "npm:^1.0.1"
-    has-proto: "npm:^1.0.3"
     is-typed-array: "npm:^1.1.13"
     possible-typed-array-names: "npm:^1.0.0"
-  checksum: 10c0/74253d7dc488eb28b6b2711cf31f5a9dcefc9c41b0681fd1c178ed0a1681b4468581a3626d39cd4df7aee3d3927ab62be06aa9ca74e5baf81827f61641445b77
+    reflect.getprototypeof: "npm:^1.0.6"
+  checksum: 10c0/e38f2ae3779584c138a2d8adfa8ecf749f494af3cd3cdafe4e688ce51418c7d2c5c88df1bd6be2bbea099c3f7cea58c02ca02ed438119e91f162a9de23f61295
   languageName: node
   linkType: hard
 
@@ -6901,12 +7152,12 @@ __metadata:
   linkType: hard
 
 "typescript@npm:^5.0.3, typescript@npm:^5.0.4":
-  version: 5.6.3
-  resolution: "typescript@npm:5.6.3"
+  version: 5.8.3
+  resolution: "typescript@npm:5.8.3"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/44f61d3fb15c35359bc60399cb8127c30bae554cd555b8e2b46d68fa79d680354b83320ad419ff1b81a0bdf324197b29affe6cc28988cd6a74d4ac60c94f9799
+  checksum: 10c0/5f8bb01196e542e64d44db3d16ee0e4063ce4f3e3966df6005f2588e86d91c03e1fb131c2581baf0fb65ee79669eea6e161cd448178986587e9f6844446dbb48
   languageName: node
   linkType: hard
 
@@ -6921,31 +7172,31 @@ __metadata:
   linkType: hard
 
 "typescript@patch:typescript@npm%3A^5.0.3#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.0.4#optional!builtin<compat/typescript>":
-  version: 5.6.3
-  resolution: "typescript@patch:typescript@npm%3A5.6.3#optional!builtin<compat/typescript>::version=5.6.3&hash=8c6c40"
+  version: 5.8.3
+  resolution: "typescript@patch:typescript@npm%3A5.8.3#optional!builtin<compat/typescript>::version=5.8.3&hash=5786d5"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/7c9d2e07c81226d60435939618c91ec2ff0b75fbfa106eec3430f0fcf93a584bc6c73176676f532d78c3594fe28a54b36eb40b3d75593071a7ec91301533ace7
+  checksum: 10c0/39117e346ff8ebd87ae1510b3a77d5d92dae5a89bde588c747d25da5c146603a99c8ee588c7ef80faaf123d89ed46f6dbd918d534d641083177d5fac38b8a1cb
   languageName: node
   linkType: hard
 
-"unbox-primitive@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "unbox-primitive@npm:1.0.2"
+"unbox-primitive@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "unbox-primitive@npm:1.1.0"
   dependencies:
-    call-bind: "npm:^1.0.2"
+    call-bound: "npm:^1.0.3"
     has-bigints: "npm:^1.0.2"
-    has-symbols: "npm:^1.0.3"
-    which-boxed-primitive: "npm:^1.0.2"
-  checksum: 10c0/81ca2e81134167cc8f75fa79fbcc8a94379d6c61de67090986a2273850989dd3bae8440c163121b77434b68263e34787a675cbdcb34bb2f764c6b9c843a11b66
+    has-symbols: "npm:^1.1.0"
+    which-boxed-primitive: "npm:^1.1.1"
+  checksum: 10c0/7dbd35ab02b0e05fe07136c72cb9355091242455473ec15057c11430129bab38b7b3624019b8778d02a881c13de44d63cd02d122ee782fb519e1de7775b5b982
   languageName: node
   linkType: hard
 
-"undici-types@npm:~6.19.2":
-  version: 6.19.8
-  resolution: "undici-types@npm:6.19.8"
-  checksum: 10c0/078afa5990fba110f6824823ace86073b4638f1d5112ee26e790155f481f2a868cc3e0615505b6f4282bdf74a3d8caad715fd809e870c2bb0704e3ea6082f344
+"undici-types@npm:~6.21.0":
+  version: 6.21.0
+  resolution: "undici-types@npm:6.21.0"
+  checksum: 10c0/c01ed51829b10aa72fc3ce64b747f8e74ae9b60eafa19a7b46ef624403508a54c526ffab06a14a26b3120d055e1104d7abe7c9017e83ced038ea5cf52f8d5e04
   languageName: node
   linkType: hard
 
@@ -6974,17 +7225,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"update-browserslist-db@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "update-browserslist-db@npm:1.1.1"
+"update-browserslist-db@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "update-browserslist-db@npm:1.1.3"
   dependencies:
     escalade: "npm:^3.2.0"
-    picocolors: "npm:^1.1.0"
+    picocolors: "npm:^1.1.1"
   peerDependencies:
     browserslist: ">= 4.21.0"
   bin:
     update-browserslist-db: cli.js
-  checksum: 10c0/536a2979adda2b4be81b07e311bd2f3ad5e978690987956bc5f514130ad50cac87cd22c710b686d79731e00fbee8ef43efe5fcd72baa241045209195d43dcc80
+  checksum: 10c0/682e8ecbf9de474a626f6462aa85927936cdd256fe584c6df2508b0df9f7362c44c957e9970df55dfe44d3623807d26316ea2c7d26b80bb76a16c56c37233c32
   languageName: node
   linkType: hard
 
@@ -7039,7 +7290,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:5.4.19":
+"vite@npm:5.4.19, vite@npm:^5.0.0":
   version: 5.4.19
   resolution: "vite@npm:5.4.19"
   dependencies:
@@ -7082,58 +7333,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:^5.0.0":
-  version: 5.4.14
-  resolution: "vite@npm:5.4.14"
-  dependencies:
-    esbuild: "npm:^0.21.3"
-    fsevents: "npm:~2.3.3"
-    postcss: "npm:^8.4.43"
-    rollup: "npm:^4.20.0"
+"vitefu@npm:^1.0.3, vitefu@npm:^1.0.6":
+  version: 1.0.6
+  resolution: "vitefu@npm:1.0.6"
   peerDependencies:
-    "@types/node": ^18.0.0 || >=20.0.0
-    less: "*"
-    lightningcss: ^1.21.0
-    sass: "*"
-    sass-embedded: "*"
-    stylus: "*"
-    sugarss: "*"
-    terser: ^5.4.0
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  peerDependenciesMeta:
-    "@types/node":
-      optional: true
-    less:
-      optional: true
-    lightningcss:
-      optional: true
-    sass:
-      optional: true
-    sass-embedded:
-      optional: true
-    stylus:
-      optional: true
-    sugarss:
-      optional: true
-    terser:
-      optional: true
-  bin:
-    vite: bin/vite.js
-  checksum: 10c0/8842933bd70ca6a98489a0bb9c8464bec373de00f9a97c8c7a4e64b24d15c88bfaa8c1acb38a68c3e5eb49072ffbccb146842c2d4edcdd036a9802964cffe3d1
-  languageName: node
-  linkType: hard
-
-"vitefu@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "vitefu@npm:1.0.3"
-  peerDependencies:
-    vite: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0-beta.0
+    vite: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0
   peerDependenciesMeta:
     vite:
       optional: true
-  checksum: 10c0/0b41021767885d538d04bb0cdabd140a5397a780997533a3cc1a1ea3c0ffae0cac4bde3e67632440587cd0505c0b6e825dfd8ab7da6249a68076072bea6eada1
+  checksum: 10c0/d153966fbcc9375bb858a5f5a096466900b42b25d2a3b255e10d050672300a978cccbe249c1f2beb2e09caaa0c800261e9305c62df4f2b75aa32b32bb936799c
   languageName: node
   linkType: hard
 
@@ -7248,29 +7456,64 @@ __metadata:
   languageName: node
   linkType: hard
 
-"which-boxed-primitive@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "which-boxed-primitive@npm:1.0.2"
+"which-boxed-primitive@npm:^1.1.0, which-boxed-primitive@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "which-boxed-primitive@npm:1.1.1"
   dependencies:
-    is-bigint: "npm:^1.0.1"
-    is-boolean-object: "npm:^1.1.0"
-    is-number-object: "npm:^1.0.4"
-    is-string: "npm:^1.0.5"
-    is-symbol: "npm:^1.0.3"
-  checksum: 10c0/0a62a03c00c91dd4fb1035b2f0733c341d805753b027eebd3a304b9cb70e8ce33e25317add2fe9b5fea6f53a175c0633ae701ff812e604410ddd049777cd435e
+    is-bigint: "npm:^1.1.0"
+    is-boolean-object: "npm:^1.2.1"
+    is-number-object: "npm:^1.1.1"
+    is-string: "npm:^1.1.1"
+    is-symbol: "npm:^1.1.1"
+  checksum: 10c0/aceea8ede3b08dede7dce168f3883323f7c62272b49801716e8332ff750e7ae59a511ae088840bc6874f16c1b7fd296c05c949b0e5b357bfe3c431b98c417abe
   languageName: node
   linkType: hard
 
-"which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15":
-  version: 1.1.15
-  resolution: "which-typed-array@npm:1.1.15"
+"which-builtin-type@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "which-builtin-type@npm:1.2.1"
+  dependencies:
+    call-bound: "npm:^1.0.2"
+    function.prototype.name: "npm:^1.1.6"
+    has-tostringtag: "npm:^1.0.2"
+    is-async-function: "npm:^2.0.0"
+    is-date-object: "npm:^1.1.0"
+    is-finalizationregistry: "npm:^1.1.0"
+    is-generator-function: "npm:^1.0.10"
+    is-regex: "npm:^1.2.1"
+    is-weakref: "npm:^1.0.2"
+    isarray: "npm:^2.0.5"
+    which-boxed-primitive: "npm:^1.1.0"
+    which-collection: "npm:^1.0.2"
+    which-typed-array: "npm:^1.1.16"
+  checksum: 10c0/8dcf323c45e5c27887800df42fbe0431d0b66b1163849bb7d46b5a730ad6a96ee8bfe827d078303f825537844ebf20c02459de41239a0a9805e2fcb3cae0d471
+  languageName: node
+  linkType: hard
+
+"which-collection@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "which-collection@npm:1.0.2"
+  dependencies:
+    is-map: "npm:^2.0.3"
+    is-set: "npm:^2.0.3"
+    is-weakmap: "npm:^2.0.2"
+    is-weakset: "npm:^2.0.3"
+  checksum: 10c0/3345fde20964525a04cdf7c4a96821f85f0cc198f1b2ecb4576e08096746d129eb133571998fe121c77782ac8f21cbd67745a3d35ce100d26d4e684c142ea1f2
+  languageName: node
+  linkType: hard
+
+"which-typed-array@npm:^1.1.16, which-typed-array@npm:^1.1.19":
+  version: 1.1.19
+  resolution: "which-typed-array@npm:1.1.19"
   dependencies:
     available-typed-arrays: "npm:^1.0.7"
-    call-bind: "npm:^1.0.7"
-    for-each: "npm:^0.3.3"
-    gopd: "npm:^1.0.1"
+    call-bind: "npm:^1.0.8"
+    call-bound: "npm:^1.0.4"
+    for-each: "npm:^0.3.5"
+    get-proto: "npm:^1.0.1"
+    gopd: "npm:^1.2.0"
     has-tostringtag: "npm:^1.0.2"
-  checksum: 10c0/4465d5348c044032032251be54d8988270e69c6b7154f8fcb2a47ff706fe36f7624b3a24246b8d9089435a8f4ec48c1c1025c5d6b499456b9e5eff4f48212983
+  checksum: 10c0/702b5dc878addafe6c6300c3d0af5983b175c75fcb4f2a72dfc3dd38d93cf9e89581e4b29c854b16ea37e50a7d7fca5ae42ece5c273d8060dcd603b2404bbb3f
   languageName: node
   linkType: hard
 
@@ -7345,8 +7588,8 @@ __metadata:
   linkType: hard
 
 "ws@npm:^8.2.3":
-  version: 8.18.0
-  resolution: "ws@npm:8.18.0"
+  version: 8.18.2
+  resolution: "ws@npm:8.18.2"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ">=5.0.2"
@@ -7355,7 +7598,7 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 10c0/25eb33aff17edcb90721ed6b0eb250976328533ad3cd1a28a274bd263682e7296a6591ff1436d6cbc50fa67463158b062f9d1122013b361cec99a05f84680e06
+  checksum: 10c0/4b50f67931b8c6943c893f59c524f0e4905bbd183016cfb0f2b8653aa7f28dad4e456b9d99d285bbb67cca4fedd9ce90dfdfaa82b898a11414ebd66ee99141e4
   languageName: node
   linkType: hard
 

From e48a2a5b6ae043cc4590c83fd8c7dda541dcb037 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 18 Jun 2025 23:16:23 +0300
Subject: [PATCH 041/133] Move Attach Media button

---
 qt/aqt/editor.py                              | 27 ++-----------------
 .../editor-toolbar/TemplateButtons.svelte     |  9 ++++---
 .../editor/rich-text-input/data-transfer.ts   | 14 +++++++---
 3 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index ee135ec93..99f648686 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -6,7 +6,6 @@ from __future__ import annotations
 import base64
 import functools
 import html
-import itertools
 import json
 import mimetypes
 import os
@@ -18,7 +17,7 @@ import warnings
 from collections.abc import Callable
 from enum import Enum
 from random import randrange
-from typing import Any, Iterable, Match, cast
+from typing import Any, Iterable, Match
 
 import bs4
 import requests
@@ -38,7 +37,7 @@ from aqt import AnkiQt, gui_hooks
 from aqt.operations.notetype import update_notetype_legacy
 from aqt.qt import *
 from aqt.sound import av_player
-from aqt.utils import KeyboardModifiersPressed, getFile, shortcut, showWarning, tr
+from aqt.utils import KeyboardModifiersPressed, shortcut, showWarning, tr
 from aqt.webview import AnkiWebView, AnkiWebViewKind
 
 pics = ("jpg", "jpeg", "png", "gif", "svg", "webp", "ico", "avif")
@@ -567,27 +566,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
     # Audio/video/images
     ######################################################################
 
-    def onAddMedia(self) -> None:
-        """Show a file selection screen, then add the selected media.
-        This expects initial setup to have been done by TemplateButtons.svelte."""
-        extension_filter = " ".join(
-            f"*.{extension}" for extension in sorted(itertools.chain(pics, audio))
-        )
-        filter = f"{tr.editing_media()} ({extension_filter})"
-
-        def accept(file: str) -> None:
-            self.resolve_media(file)
-
-        file = getFile(
-            parent=self.widget,
-            title=tr.editing_add_media(),
-            cb=cast(Callable[[Any], None], accept),
-            filter=filter,
-            key="media",
-        )
-
-        self.parentWindow.activateWindow()
-
     def addMedia(self, path: str, canDelete: bool = False) -> None:
         """Legacy routine used by add-ons to add a media file and update the current field.
         canDelete is ignored."""
@@ -905,7 +883,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
         self._links: dict[str, Callable] = dict(
             fields=Editor.onFields,
             cards=Editor.onCardLayout,
-            attach=Editor.onAddMedia,
             record=Editor.onRecSound,
             paste=Editor.onPaste,
             cut=Editor.onCut,
diff --git a/ts/routes/editor/editor-toolbar/TemplateButtons.svelte b/ts/routes/editor/editor-toolbar/TemplateButtons.svelte
index 13795f418..8102a7f1f 100644
--- a/ts/routes/editor/editor-toolbar/TemplateButtons.svelte
+++ b/ts/routes/editor/editor-toolbar/TemplateButtons.svelte
@@ -26,6 +26,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type { RichTextInputAPI } from "../rich-text-input";
     import { editingInputIsRichText } from "../rich-text-input";
     import LatexButton from "./LatexButton.svelte";
+    import { filenameToLink, openFilePickerForMedia } from "../rich-text-input/data-transfer";
+    import { addMediaFromPath } from "@generated/backend";
 
     const { focusedInput } = context.get();
 
@@ -38,7 +40,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         resolve?.(media);
     }
 
-    function attachMediaOnFocus(): void {
+    async function attachMediaOnFocus(): Promise<void> {
         if (disabled) {
             return;
         }
@@ -48,8 +50,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             async () => setFormat("inserthtml", await mediaPromise),
             { once: true },
         );
-
-        bridgeCommand("attach");
+        let file = await openFilePickerForMedia();
+        file = (await addMediaFromPath({ path: file })).val;
+        resolveMedia(filenameToLink(file));
     }
 
     registerPackage("anki/TemplateButtons", {
diff --git a/ts/routes/editor/rich-text-input/data-transfer.ts b/ts/routes/editor/rich-text-input/data-transfer.ts
index 993348b1d..76cab078c 100644
--- a/ts/routes/editor/rich-text-input/data-transfer.ts
+++ b/ts/routes/editor/rich-text-input/data-transfer.ts
@@ -391,16 +391,24 @@ export function handleCutOrCopy(event: ClipboardEvent) {
 
 const FILE_PICKER_MEDIA_KEY = "media";
 
-export async function openFilePickerForImageOcclusion(): Promise<string> {
+export async function openFilePickerForSuffixes(suffixes: string[]): Promise<string> {
     const filename = (await openFilePicker({
-        title: tr.editingAddMedia(),
+        title: tr.editingMedia(),
         filterDescription: tr.editingMedia(),
-        extensions: imageSuffixes,
+        extensions: suffixes,
         key: FILE_PICKER_MEDIA_KEY,
     })).val;
     return filename;
 }
 
+export async function openFilePickerForImageOcclusion(): Promise<string> {
+    return await openFilePickerForSuffixes(imageSuffixes);
+}
+
+export async function openFilePickerForMedia(): Promise<string> {
+    return await openFilePickerForSuffixes(mediaSuffixes);
+}
+
 export async function extractImagePathFromHtml(html: string): Promise<string | null> {
     const images = (await extractMediaFiles({ val: html })).vals;
     if (images.length === 0) {

From cf099ea508e020c52f64a007c4a69f2e498679ea Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 18 Jun 2025 23:30:39 +0300
Subject: [PATCH 042/133] Move Record Audio button

---
 proto/anki/frontend.proto                     |  1 +
 qt/aqt/editor.py                              | 24 -------------------
 qt/aqt/mediasrv.py                            | 20 ++++++++++++++++
 .../editor-toolbar/TemplateButtons.svelte     | 19 ++++++++-------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/proto/anki/frontend.proto b/proto/anki/frontend.proto
index 9e4d2de13..73effc4d6 100644
--- a/proto/anki/frontend.proto
+++ b/proto/anki/frontend.proto
@@ -37,6 +37,7 @@ service FrontendService {
   rpc openFilePicker(openFilePickerRequest) returns (generic.String);
   rpc openMedia(generic.String) returns (generic.Empty);
   rpc showInMediaFolder(generic.String) returns (generic.Empty);
+  rpc recordAudio(generic.Empty) returns (generic.String);
 
   // Profile config
   rpc GetProfileConfigJson(generic.String) returns (generic.Json);
diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 99f648686..38429953f 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -23,8 +23,6 @@ import bs4
 import requests
 from bs4 import BeautifulSoup
 
-import aqt
-import aqt.sound
 from anki._legacy import deprecated
 from anki.cards import Card
 from anki.collection import Config
@@ -578,19 +576,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
 
         self.web.eval(f"setFormat('inserthtml', {json.dumps(html)});")
 
-    def resolve_media(self, path: str) -> None:
-        """Finish inserting media into a field.
-        This expects initial setup to have been done by TemplateButtons.svelte."""
-        try:
-            html = self._addMedia(path)
-        except Exception as e:
-            showWarning(str(e))
-            return
-
-        self.web.eval(
-            f'require("anki/TemplateButtons").resolveMedia({json.dumps(html)})'
-        )
-
     def _addMedia(self, path: str, canDelete: bool = False) -> str:
         """Add to media folder and return local img or sound tag."""
         # copy to media folder
@@ -601,14 +586,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
     def _addMediaFromData(self, fname: str, data: bytes) -> str:
         return self.mw.col.media._legacy_write_data(fname, data)
 
-    def onRecSound(self) -> None:
-        aqt.sound.record_audio(
-            self.parentWindow,
-            self.mw,
-            True,
-            self.resolve_media,
-        )
-
     # Media downloads
     ######################################################################
 
@@ -883,7 +860,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
         self._links: dict[str, Callable] = dict(
             fields=Editor.onFields,
             cards=Editor.onCardLayout,
-            record=Editor.onRecSound,
             paste=Editor.onPaste,
             cut=Editor.onCut,
             copy=Editor.onCopy,
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index 4cda76eab..ddd8ac335 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -745,6 +745,25 @@ def show_in_media_folder() -> bytes:
 
     return b""
 
+async def record_audio() -> bytes:
+    loop = asyncio.get_event_loop()
+    future = loop.create_future()
+
+    def on_main() -> None:
+        from aqt.sound import record_audio
+
+        def cb(path: str | None) -> None:
+            loop.call_soon_threadsafe(future.set_result, path)
+
+        window = aqt.mw.app.activeWindow()
+        assert window is not None
+        record_audio(window, aqt.mw, True, cb)
+
+    aqt.mw.taskman.run_on_main(on_main)
+
+    path = await future
+
+    return generic_pb2.String(val=path if path else "").SerializeToString()
 
 post_handler_list = [
     congrats_info,
@@ -772,6 +791,7 @@ post_handler_list = [
     open_file_picker,
     open_media,
     show_in_media_folder,
+    record_audio,
 ]
 
 
diff --git a/ts/routes/editor/editor-toolbar/TemplateButtons.svelte b/ts/routes/editor/editor-toolbar/TemplateButtons.svelte
index 8102a7f1f..9c19dc79a 100644
--- a/ts/routes/editor/editor-toolbar/TemplateButtons.svelte
+++ b/ts/routes/editor/editor-toolbar/TemplateButtons.svelte
@@ -4,7 +4,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
     import * as tr from "@generated/ftl";
-    import { bridgeCommand } from "@tslib/bridgecommand";
     import { promiseWithResolver } from "@tslib/promise";
     import { registerPackage } from "@tslib/runtime-require";
     import { getPlatformString } from "@tslib/shortcuts";
@@ -27,7 +26,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { editingInputIsRichText } from "../rich-text-input";
     import LatexButton from "./LatexButton.svelte";
     import { filenameToLink, openFilePickerForMedia } from "../rich-text-input/data-transfer";
-    import { addMediaFromPath } from "@generated/backend";
+    import { addMediaFromPath, recordAudio } from "@generated/backend";
 
     const { focusedInput } = context.get();
 
@@ -40,6 +39,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         resolve?.(media);
     }
 
+    async function attachPath(path: string): Promise<void> {
+        const filename = (await addMediaFromPath({ path })).val;
+        resolveMedia(filenameToLink(filename));
+    }
+
     async function attachMediaOnFocus(): Promise<void> {
         if (disabled) {
             return;
@@ -50,9 +54,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             async () => setFormat("inserthtml", await mediaPromise),
             { once: true },
         );
-        let file = await openFilePickerForMedia();
-        file = (await addMediaFromPath({ path: file })).val;
-        resolveMedia(filenameToLink(file));
+        const path = await openFilePickerForMedia();
+        await attachPath(path);
     }
 
     registerPackage("anki/TemplateButtons", {
@@ -61,7 +64,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     const recordCombination = "F5";
 
-    function attachRecordingOnFocus(): void {
+    async function attachRecordingOnFocus(): Promise<void> {
         if (disabled) {
             return;
         }
@@ -71,8 +74,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             async () => setFormat("inserthtml", await mediaPromise),
             { once: true },
         );
-
-        bridgeCommand("record");
+        const path = (await recordAudio({})).val;
+        await attachPath(path);
     }
 
     $: disabled = !$focusedInput || !editingInputIsRichText($focusedInput);

From f4293c1f9ee967fc0dd19c7199495b303baa261d Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 18 Jun 2025 23:45:18 +0300
Subject: [PATCH 043/133] Remove mediaPromise

---
 .../editor-toolbar/TemplateButtons.svelte     | 29 ++-----------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/ts/routes/editor/editor-toolbar/TemplateButtons.svelte b/ts/routes/editor/editor-toolbar/TemplateButtons.svelte
index 9c19dc79a..f50c6ce3f 100644
--- a/ts/routes/editor/editor-toolbar/TemplateButtons.svelte
+++ b/ts/routes/editor/editor-toolbar/TemplateButtons.svelte
@@ -4,8 +4,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
     import * as tr from "@generated/ftl";
-    import { promiseWithResolver } from "@tslib/promise";
-    import { registerPackage } from "@tslib/runtime-require";
     import { getPlatformString } from "@tslib/shortcuts";
 
     import ButtonGroup from "$lib/components/ButtonGroup.svelte";
@@ -22,7 +20,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     import { context } from "../NoteEditor.svelte";
     import { setFormat } from "../old-editor-adapter";
-    import type { RichTextInputAPI } from "../rich-text-input";
     import { editingInputIsRichText } from "../rich-text-input";
     import LatexButton from "./LatexButton.svelte";
     import { filenameToLink, openFilePickerForMedia } from "../rich-text-input/data-transfer";
@@ -32,35 +29,19 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     const attachmentCombination = "F3";
 
-    let mediaPromise: Promise<string>;
-    let resolve: (media: string) => void;
-
-    function resolveMedia(media: string): void {
-        resolve?.(media);
-    }
-
-    async function attachPath(path: string): Promise<void> {
+    async function attachPath(path: string) {
         const filename = (await addMediaFromPath({ path })).val;
-        resolveMedia(filenameToLink(filename));
+        setFormat("inserthtml", filenameToLink(filename));
     }
 
     async function attachMediaOnFocus(): Promise<void> {
         if (disabled) {
             return;
         }
-
-        [mediaPromise, resolve] = promiseWithResolver<string>();
-        ($focusedInput as RichTextInputAPI).editable.focusHandler.focus.on(
-            async () => setFormat("inserthtml", await mediaPromise),
-            { once: true },
-        );
         const path = await openFilePickerForMedia();
         await attachPath(path);
     }
 
-    registerPackage("anki/TemplateButtons", {
-        resolveMedia,
-    });
 
     const recordCombination = "F5";
 
@@ -68,12 +49,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         if (disabled) {
             return;
         }
-
-        [mediaPromise, resolve] = promiseWithResolver<string>();
-        ($focusedInput as RichTextInputAPI).editable.focusHandler.focus.on(
-            async () => setFormat("inserthtml", await mediaPromise),
-            { once: true },
-        );
         const path = (await recordAudio({})).val;
         await attachPath(path);
     }

From 4dd402334f3effdee020909d6f78bcb267f04f97 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 18 Jun 2025 23:53:44 +0300
Subject: [PATCH 044/133] Remove legacy editor code

We can worry about add-on compatibility later
---
 qt/aqt/editor.py | 461 +----------------------------------------------
 1 file changed, 3 insertions(+), 458 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 38429953f..deedd2970 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -5,37 +5,25 @@ from __future__ import annotations
 
 import base64
 import functools
-import html
 import json
 import mimetypes
 import os
-import re
-import urllib.error
-import urllib.parse
-import urllib.request
-import warnings
 from collections.abc import Callable
 from enum import Enum
 from random import randrange
-from typing import Any, Iterable, Match
-
-import bs4
-import requests
-from bs4 import BeautifulSoup
+from typing import Any
 
 from anki._legacy import deprecated
 from anki.cards import Card
-from anki.collection import Config
 from anki.hooks import runFilter
-from anki.httpclient import HttpClient
 from anki.models import NotetypeDict, StockNotetype
 from anki.notes import Note, NoteId
-from anki.utils import checksum, is_win, namedtmp
+from anki.utils import is_win
 from aqt import AnkiQt, gui_hooks
 from aqt.operations.notetype import update_notetype_legacy
 from aqt.qt import *
 from aqt.sound import av_player
-from aqt.utils import KeyboardModifiersPressed, shortcut, showWarning, tr
+from aqt.utils import shortcut, showWarning
 from aqt.webview import AnkiWebView, AnkiWebViewKind
 
 pics = ("jpg", "jpeg", "png", "gif", "svg", "webp", "ico", "avif")
@@ -552,251 +540,11 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             self.web.cleanup()
             self.web = None  # type: ignore
 
-    # legacy
-
     setNote = set_note
 
-    # legacy
-
-    def saveAddModeVars(self) -> None:
-        pass
-
-    # Audio/video/images
-    ######################################################################
-
-    def addMedia(self, path: str, canDelete: bool = False) -> None:
-        """Legacy routine used by add-ons to add a media file and update the current field.
-        canDelete is ignored."""
-
-        try:
-            html = self._addMedia(path)
-        except Exception as e:
-            showWarning(str(e))
-            return
-
-        self.web.eval(f"setFormat('inserthtml', {json.dumps(html)});")
-
-    def _addMedia(self, path: str, canDelete: bool = False) -> str:
-        """Add to media folder and return local img or sound tag."""
-        # copy to media folder
-        fname = self.mw.col.media.add_file(path)
-        # return a local html link
-        return self.fnameToLink(fname)
-
-    def _addMediaFromData(self, fname: str, data: bytes) -> str:
-        return self.mw.col.media._legacy_write_data(fname, data)
-
-    # Media downloads
-    ######################################################################
-
-    def urlToLink(self, url: str, allowed_suffixes: Iterable[str] = ()) -> str:
-        fname = (
-            self.urlToFile(url, allowed_suffixes)
-            if allowed_suffixes
-            else self.urlToFile(url)
-        )
-        if not fname:
-            return '<a href="{}">{}</a>'.format(
-                url, html.escape(urllib.parse.unquote(url))
-            )
-        return self.fnameToLink(fname)
-
-    def fnameToLink(self, fname: str) -> str:
-        ext = fname.split(".")[-1].lower()
-        if ext in pics:
-            name = urllib.parse.quote(fname.encode("utf8"))
-            return f'<img src="{name}">'
-        else:
-            av_player.play_file_with_caller(fname, self.editorMode)
-            return f"[sound:{html.escape(fname, quote=False)}]"
-
-    def urlToFile(
-        self, url: str, allowed_suffixes: Iterable[str] = pics + audio
-    ) -> str | None:
-        l = url.lower()
-        for suffix in allowed_suffixes:
-            if l.endswith(f".{suffix}"):
-                return self._retrieveURL(url)
-        # not a supported type
-        return None
-
-    def isURL(self, s: str) -> bool:
-        s = s.lower()
-        return (
-            s.startswith("http://")
-            or s.startswith("https://")
-            or s.startswith("ftp://")
-            or s.startswith("file://")
-        )
-
-    def inlinedImageToFilename(self, txt: str) -> str:
-        prefix = "data:image/"
-        suffix = ";base64,"
-        for ext in ("jpg", "jpeg", "png", "gif"):
-            fullPrefix = prefix + ext + suffix
-            if txt.startswith(fullPrefix):
-                b64data = txt[len(fullPrefix) :].strip()
-                data = base64.b64decode(b64data, validate=True)
-                if ext == "jpeg":
-                    ext = "jpg"
-                return self._addPastedImage(data, ext)
-
-        return ""
-
-    def inlinedImageToLink(self, src: str) -> str:
-        fname = self.inlinedImageToFilename(src)
-        if fname:
-            return self.fnameToLink(fname)
-
-        return ""
-
-    def _pasted_image_filename(self, data: bytes, ext: str) -> str:
-        csum = checksum(data)
-        return f"paste-{csum}.{ext}"
-
-    def _read_pasted_image(self, mime: QMimeData) -> str:
-        image = QImage(mime.imageData())
-        buffer = QBuffer()
-        buffer.open(QBuffer.OpenModeFlag.ReadWrite)
-        if self.mw.col.get_config_bool(Config.Bool.PASTE_IMAGES_AS_PNG):
-            ext = "png"
-            quality = 50
-        else:
-            ext = "jpg"
-            quality = 80
-        image.save(buffer, ext, quality)
-        buffer.reset()
-        data = bytes(buffer.readAll())  # type: ignore
-        fname = self._pasted_image_filename(data, ext)
-        path = namedtmp(fname)
-        with open(path, "wb") as file:
-            file.write(data)
-
-        return path
-
-    def _addPastedImage(self, data: bytes, ext: str) -> str:
-        # hash and write
-        fname = self._pasted_image_filename(data, ext)
-        return self._addMediaFromData(fname, data)
-
-    def _retrieveURL(self, url: str) -> str | None:
-        "Download file into media folder and return local filename or None."
-        local = url.lower().startswith("file://")
-        # fetch it into a temporary folder
-        self.mw.progress.start(immediate=not local, parent=self.parentWindow)
-        content_type = None
-        error_msg: str | None = None
-        try:
-            if local:
-                # urllib doesn't understand percent-escaped utf8, but requires things like
-                # '#' to be escaped.
-                url = urllib.parse.unquote(url)
-                url = url.replace("%", "%25")
-                url = url.replace("#", "%23")
-                req = urllib.request.Request(
-                    url, None, {"User-Agent": "Mozilla/5.0 (compatible; Anki)"}
-                )
-                with urllib.request.urlopen(req) as response:
-                    filecontents = response.read()
-            else:
-                with HttpClient() as client:
-                    client.timeout = 30
-                    with client.get(url) as response:
-                        if response.status_code != 200:
-                            error_msg = tr.qt_misc_unexpected_response_code(
-                                val=response.status_code,
-                            )
-                            return None
-                        filecontents = response.content
-                        content_type = response.headers.get("content-type")
-        except (urllib.error.URLError, requests.exceptions.RequestException) as e:
-            error_msg = tr.editing_an_error_occurred_while_opening(val=str(e))
-            return None
-        finally:
-            self.mw.progress.finish()
-            if error_msg:
-                showWarning(error_msg)
-        # strip off any query string
-        url = re.sub(r"\?.*?$", "", url)
-        fname = os.path.basename(urllib.parse.unquote(url))
-        if not fname.strip():
-            fname = "paste"
-        if content_type:
-            fname = self.mw.col.media.add_extension_based_on_mime(fname, content_type)
-
-        return self.mw.col.media.write_data(fname, filecontents)
-
     # Paste/drag&drop
     ######################################################################
 
-    removeTags = ["script", "iframe", "object", "style"]
-
-    def _pastePreFilter(self, html: str, internal: bool) -> str:
-        # https://anki.tenderapp.com/discussions/ankidesktop/39543-anki-is-replacing-the-character-by-when-i-exit-the-html-edit-mode-ctrlshiftx
-        if html.find(">") < 0:
-            return html
-
-        with warnings.catch_warnings() as w:
-            warnings.simplefilter("ignore", UserWarning)
-            doc = BeautifulSoup(html, "html.parser")
-
-        tag: bs4.element.Tag
-        if not internal:
-            for tag in self.removeTags:
-                for node in doc(tag):
-                    node.decompose()
-
-            # convert p tags to divs
-            for node in doc("p"):
-                node.name = "div"
-
-        for tag in doc("img"):
-            try:
-                src = tag["src"]
-            except KeyError:
-                # for some bizarre reason, mnemosyne removes src elements
-                # from missing media
-                continue
-
-            # in internal pastes, rewrite mediasrv references to relative
-            if internal:
-                m = re.match(r"http://127.0.0.1:\d+/(.*)$", src)
-                if m:
-                    tag["src"] = m.group(1)
-            else:
-                # in external pastes, download remote media
-                if self.isURL(src):
-                    fname = self._retrieveURL(src)
-                    if fname:
-                        tag["src"] = fname
-                elif src.startswith("data:image/"):
-                    # and convert inlined data
-                    tag["src"] = self.inlinedImageToFilename(src)
-
-        html = str(doc)
-        return html
-
-    def doPaste(self, html: str, internal: bool, extended: bool = False) -> None:
-        html = self._pastePreFilter(html, internal)
-        if extended:
-            ext = "true"
-        else:
-            ext = "false"
-        self.web.eval(f"pasteHTML({json.dumps(html)}, {json.dumps(internal)}, {ext});")
-        gui_hooks.editor_did_paste(self, html, internal, extended)
-
-    def doDrop(
-        self, html: str, internal: bool, extended: bool, cursor_pos: QPoint
-    ) -> None:
-        def pasteIfField(ret: bool) -> None:
-            if ret:
-                self.doPaste(html, internal, extended)
-
-        zoom = self.web.zoomFactor()
-        x, y = int(cursor_pos.x() / zoom), int(cursor_pos.y() / zoom)
-
-        self.web.evalWithCallback(f"focusIfField({x}, {y});", pasteIfField)
-
     def onPaste(self) -> None:
         self.web.onPaste()
 
@@ -887,14 +635,6 @@ class EditorWebView(AnkiWebView):
         AnkiWebView.__init__(self, kind=AnkiWebViewKind.EDITOR)
         self.editor = editor
         self.setAcceptDrops(True)
-        self._store_field_content_on_next_clipboard_change = False
-        # when we detect the user copying from a field, we store the content
-        # here, and use it when they paste, so we avoid filtering field content
-        self._internal_field_text_for_paste: str | None = None
-        self._last_known_clipboard_mime: QMimeData | None = None
-        clip = self.editor.mw.app.clipboard()
-        assert clip is not None
-        clip.dataChanged.connect(self._on_clipboard_change)
         self.settings().setAttribute(  # type: ignore
             QWebEngineSettings.WebAttribute.JavascriptCanPaste, True
         )
@@ -903,206 +643,11 @@ class EditorWebView(AnkiWebView):
         )
         gui_hooks.editor_web_view_did_init(self)
 
-    def _on_clipboard_change(
-        self, mode: QClipboard.Mode = QClipboard.Mode.Clipboard
-    ) -> None:
-        self._last_known_clipboard_mime = self._clipboard().mimeData(mode)
-        if self._store_field_content_on_next_clipboard_change:
-            # if the flag was set, save the field data
-            self._internal_field_text_for_paste = self._get_clipboard_html_for_field(
-                mode
-            )
-            self._store_field_content_on_next_clipboard_change = False
-        elif self._internal_field_text_for_paste != self._get_clipboard_html_for_field(
-            mode
-        ):
-            # if we've previously saved the field, blank it out if the clipboard state has changed
-            self._internal_field_text_for_paste = None
-
-    def _get_clipboard_html_for_field(self, mode: QClipboard.Mode) -> str | None:
-        clip = self._clipboard()
-        if not (mime := clip.mimeData(mode)):
-            return None
-        if not mime.hasHtml():
-            return None
-        return mime.html()
-
     def onCut(self) -> None:
         self.triggerPageAction(QWebEnginePage.WebAction.Cut)
 
     def onCopy(self) -> None:
         self.triggerPageAction(QWebEnginePage.WebAction.Copy)
 
-    def _wantsExtendedPaste(self) -> bool:
-        strip_html = self.editor.mw.col.get_config_bool(
-            Config.Bool.PASTE_STRIPS_FORMATTING
-        )
-        if KeyboardModifiersPressed().shift:
-            strip_html = not strip_html
-        return not strip_html
-
-    def _onPaste(self, mode: QClipboard.Mode) -> None:
-        # Since _on_clipboard_change doesn't always trigger properly on macOS, we do a double check if any changes were made before pasting
-        clipboard = self._clipboard()
-        if self._last_known_clipboard_mime != clipboard.mimeData(mode):
-            self._on_clipboard_change(mode)
-        extended = self._wantsExtendedPaste()
-        if html := self._internal_field_text_for_paste:
-            print("reuse internal")
-            self.editor.doPaste(html, True, extended)
-        else:
-            if not (mime := clipboard.mimeData(mode=mode)):
-                return
-            print("use clipboard")
-            html, internal = self._processMime(mime, extended)
-            if html:
-                self.editor.doPaste(html, internal, extended)
-
     def onPaste(self) -> None:
         self.triggerPageAction(QWebEnginePage.WebAction.Paste)
-
-    def onMiddleClickPaste(self) -> None:
-        self._onPaste(QClipboard.Mode.Selection)
-
-    # def dragEnterEvent(self, evt: QDragEnterEvent | None) -> None:
-    #     assert evt is not None
-    #     evt.accept()
-
-    # def dropEvent(self, evt: QDropEvent | None) -> None:
-    #     assert evt is not None
-    #     extended = self._wantsExtendedPaste()
-    #     mime = evt.mimeData()
-    #     assert mime is not None
-
-    #     if (
-    #         self.editor.state is EditorState.IO_PICKER
-    #         and (html := self._processUrls(mime, allowed_suffixes=pics))
-    #         and (path := self.editor.extract_img_path_from_html(html))
-    #     ):
-    #         self.editor.setup_mask_editor(path)
-    #         return
-
-    #     evt_pos = evt.position()
-    #     cursor_pos = QPoint(int(evt_pos.x()), int(evt_pos.y()))
-
-    #     if evt.source() and mime.hasHtml():
-    #         # don't filter html from other fields
-    #         html, internal = mime.html(), True
-    #     else:
-    #         html, internal = self._processMime(mime, extended, drop_event=True)
-
-    #     if not html:
-    #         return
-
-    #     self.editor.doDrop(html, internal, extended, cursor_pos)
-
-    # returns (html, isInternal)
-    def _processMime(
-        self, mime: QMimeData, extended: bool = False, drop_event: bool = False
-    ) -> tuple[str, bool]:
-        # print("html=%s image=%s urls=%s txt=%s" % (
-        #     mime.hasHtml(), mime.hasImage(), mime.hasUrls(), mime.hasText()))
-        # print("html", mime.html())
-        # print("urls", mime.urls())
-        # print("text", mime.text())
-
-        internal = False
-
-        mime = gui_hooks.editor_will_process_mime(
-            mime, self, internal, extended, drop_event
-        )
-
-        # try various content types in turn
-        if mime.hasHtml():
-            html_content = mime.html()[11:] if internal else mime.html()
-            return html_content, internal
-
-        # given _processUrls' extra allowed_suffixes kwarg, placate the typechecker
-        def process_url(mime: QMimeData, extended: bool = False) -> str | None:
-            return self._processUrls(mime, extended)
-
-        # favour url if it's a local link
-        if (
-            mime.hasUrls()
-            and (urls := mime.urls())
-            and urls[0].toString().startswith("file://")
-        ):
-            types = (process_url, self._processImage, self._processText)
-        else:
-            types = (self._processImage, process_url, self._processText)
-
-        for fn in types:
-            html = fn(mime, extended)
-            if html:
-                return html, True
-        return "", False
-
-    def _processUrls(
-        self,
-        mime: QMimeData,
-        extended: bool = False,
-        allowed_suffixes: Iterable[str] = (),
-    ) -> str | None:
-        if not mime.hasUrls():
-            return None
-
-        buf = ""
-        for qurl in mime.urls():
-            url = qurl.toString()
-            # chrome likes to give us the URL twice with a \n
-            if lines := url.splitlines():
-                url = lines[0]
-                buf += self.editor.urlToLink(url, allowed_suffixes=allowed_suffixes)
-
-        return buf
-
-    def _processText(self, mime: QMimeData, extended: bool = False) -> str | None:
-        if not mime.hasText():
-            return None
-
-        txt = mime.text()
-        processed = []
-        lines = txt.split("\n")
-
-        for line in lines:
-            for token in re.split(r"(\S+)", line):
-                # inlined data in base64?
-                if extended and token.startswith("data:image/"):
-                    processed.append(self.editor.inlinedImageToLink(token))
-                elif extended and self.editor.isURL(token):
-                    # if the user is pasting an image or sound link, convert it to local, otherwise paste as a hyperlink
-                    link = self.editor.urlToLink(token)
-                    processed.append(link)
-                else:
-                    token = html.escape(token).replace("\t", " " * 4)
-
-                    # if there's more than one consecutive space,
-                    # use non-breaking spaces for the second one on
-                    def repl(match: Match) -> str:
-                        return f"{match.group(1).replace(' ', '&nbsp;')} "
-
-                    token = re.sub(" ( +)", repl, token)
-                    processed.append(token)
-
-            processed.append("<br>")
-        # remove last <br>
-        processed.pop()
-        return "".join(processed)
-
-    def _processImage(self, mime: QMimeData, extended: bool = False) -> str | None:
-        if not mime.hasImage():
-            return None
-        path = self.editor._read_pasted_image(mime)
-        fname = self.editor._addMedia(path)
-
-        return fname
-
-    def contextMenuEvent(self, evt: QContextMenuEvent | None) -> None:
-        m = QMenu(self)
-        gui_hooks.editor_will_show_context_menu(self, m)
-        m.popup(QCursor.pos())
-
-    def _clipboard(self) -> QClipboard:
-        clipboard = self.editor.mw.app.clipboard()
-        assert clipboard is not None
-        return clipboard

From f8ce1c3526505c50150c18b5d76c6eea7979e3fb Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 18 Jun 2025 23:57:19 +0300
Subject: [PATCH 045/133] Fix lint errors

---
 qt/aqt/mediasrv.py                                     | 2 ++
 ts/routes/editor/editor-toolbar/TemplateButtons.svelte | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index ddd8ac335..0c41f1e8a 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -745,6 +745,7 @@ def show_in_media_folder() -> bytes:
 
     return b""
 
+
 async def record_audio() -> bytes:
     loop = asyncio.get_event_loop()
     future = loop.create_future()
@@ -765,6 +766,7 @@ async def record_audio() -> bytes:
 
     return generic_pb2.String(val=path if path else "").SerializeToString()
 
+
 post_handler_list = [
     congrats_info,
     get_deck_configs_for_update,
diff --git a/ts/routes/editor/editor-toolbar/TemplateButtons.svelte b/ts/routes/editor/editor-toolbar/TemplateButtons.svelte
index f50c6ce3f..e3a7a5f36 100644
--- a/ts/routes/editor/editor-toolbar/TemplateButtons.svelte
+++ b/ts/routes/editor/editor-toolbar/TemplateButtons.svelte
@@ -22,7 +22,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { setFormat } from "../old-editor-adapter";
     import { editingInputIsRichText } from "../rich-text-input";
     import LatexButton from "./LatexButton.svelte";
-    import { filenameToLink, openFilePickerForMedia } from "../rich-text-input/data-transfer";
+    import {
+        filenameToLink,
+        openFilePickerForMedia,
+    } from "../rich-text-input/data-transfer";
     import { addMediaFromPath, recordAudio } from "@generated/backend";
 
     const { focusedInput } = context.get();
@@ -42,7 +45,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         await attachPath(path);
     }
 
-
     const recordCombination = "F5";
 
     async function attachRecordingOnFocus(): Promise<void> {

From e0120309fa2b08204c65c988277630dfc2310cd9 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Fri, 20 Jun 2025 22:55:02 +0300
Subject: [PATCH 046/133] Fix Cards/Fields buttons

---
 qt/aqt/addcards.py                 |   6 --
 qt/aqt/editor.py                   | 152 +++++++++--------------------
 ts/routes/editor/NoteEditor.svelte |  10 ++
 3 files changed, 58 insertions(+), 110 deletions(-)

diff --git a/qt/aqt/addcards.py b/qt/aqt/addcards.py
index d3b8f343b..d4d94f0d4 100644
--- a/qt/aqt/addcards.py
+++ b/qt/aqt/addcards.py
@@ -110,9 +110,6 @@ class AddCards(QMainWindow):
         )
 
     def reopen(self, mw: AnkiQt) -> None:
-        if not self.editor.fieldsAreBlank():
-            return
-
         defaults = self.col.defaults_for_adding(
             current_review_card=self.mw.reviewer.card
         )
@@ -315,9 +312,6 @@ class AddCards(QMainWindow):
                 onOk()
 
         def afterSave() -> None:
-            if self.editor.fieldsAreBlank(self._last_added_note):
-                return onOk()
-
             ask_user_dialog(
                 tr.adding_discard_current_input(),
                 callback=callback,
diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index deedd2970..496d893a7 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -9,6 +9,7 @@ import json
 import mimetypes
 import os
 from collections.abc import Callable
+from dataclasses import dataclass
 from enum import Enum
 from random import randrange
 from typing import Any
@@ -16,7 +17,7 @@ from typing import Any
 from anki._legacy import deprecated
 from anki.cards import Card
 from anki.hooks import runFilter
-from anki.models import NotetypeDict, StockNotetype
+from anki.models import NotetypeDict, NotetypeId, StockNotetype
 from anki.notes import Note, NoteId
 from anki.utils import is_win
 from aqt import AnkiQt, gui_hooks
@@ -81,6 +82,21 @@ def on_editor_ready(func: Callable) -> Callable:
     return decorated
 
 
+@dataclass
+class NoteInfo:
+    "Used to hold partial note info fetched from the webview"
+
+    id: NoteId | None
+    mid: NotetypeId
+    fields: list[str]
+
+    def __post_init__(self) -> None:
+        if self.id is not None:
+            self.id = NoteId(int(self.id))
+        if self.mid is not None:
+            self.mid = NotetypeId(int(self.mid))
+
+
 class Editor:
     """The screen that embeds an editing widget should listen for changes via
     the `operation_did_execute` hook, and call set_note() when the editor needs
@@ -103,7 +119,7 @@ class Editor:
         self.mw = mw
         self.widget = widget
         self.parentWindow = parentWindow
-        self.nid: NoteId | None = None
+        self.mid: NotetypeId | None = None
         # legacy argument provided?
         if addMode is not None:
             editor_mode = EditorMode.ADD_CARDS if addMode else EditorMode.EDIT_CURRENT
@@ -118,8 +134,6 @@ class Editor:
         # current card, for card layout
         self.card: Card | None = None
         self.state: EditorState = EditorState.INITIAL
-        # used for the io mask editor's context menu
-        self.last_io_image_path: str | None = None
         self._ready = False
         self._ready_callbacks: list[Callable[[], None]] = []
         self._init_links()
@@ -127,7 +141,6 @@ class Editor:
         self.add_webview()
         self.setupWeb()
         self.setupShortcuts()
-        # gui_hooks.editor_did_init(self)
 
     # Initial setup
     ############################################################
@@ -327,7 +340,12 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
     def _onFields(self) -> None:
         from aqt.fields import FieldDialog
 
-        FieldDialog(self.mw, self.note_type(), parent=self.parentWindow)
+        def on_note_info(note_info: NoteInfo) -> None:
+            FieldDialog(
+                self.mw, self.mw.col.models.get(note_info.mid), parent=self.parentWindow
+            )
+
+        self.get_note_info(on_note_info)
 
     def onCardLayout(self) -> None:
         self.call_after_note_saved(self._onCardLayout)
@@ -340,16 +358,23 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
         else:
             ord = 0
 
-        assert self.note is not None
-        CardLayout(
-            self.mw,
-            self.note,
-            ord=ord,
-            parent=self.parentWindow,
-            fill_empty=False,
-        )
-        if is_win:
-            self.parentWindow.activateWindow()
+        def on_note_info(note_info: NoteInfo) -> None:
+            if note_info.id:
+                note = self.mw.col.get_note(note_info.id)
+            else:
+                note = Note(self.mw.col, note_info.mid)
+                note.fields = note_info.fields
+            CardLayout(
+                self.mw,
+                note,
+                ord=ord,
+                parent=self.parentWindow,
+                fill_empty=False,
+            )
+            if is_win:
+                self.parentWindow.activateWindow()
+
+        self.get_note_info(on_note_info)
 
     # JS->Python bridge
     ######################################################################
@@ -361,62 +386,16 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             ord = int(ord_str)
             if type == "blur":
                 self.currentField = None
-                # run any filters
-                if self.note and gui_hooks.editor_did_unfocus_field(
-                    False, self.note, ord
-                ):
-                    # something updated the note; update it after a subsequent focus
-                    # event has had time to fire
-                    self.mw.progress.timer(
-                        100, self.loadNoteKeepingFocus, False, parent=self.widget
-                    )
             else:
-                if self.note:
-                    gui_hooks.editor_did_fire_typing_timer(self.note)
+                pass
 
         # focused into field?
         elif cmd.startswith("focus"):
             (type, num) = cmd.split(":", 1)
             self.last_field_index = self.currentField = int(num)
-            if self.note:
-                gui_hooks.editor_did_focus_field(self.note, self.currentField)
-
-        elif cmd.startswith("toggleStickyAll"):
-            model = self.note_type()
-            flds = model["flds"]
-
-            any_sticky = any([fld["sticky"] for fld in flds])
-            result = []
-            for fld in flds:
-                if not any_sticky or fld["sticky"]:
-                    fld["sticky"] = not fld["sticky"]
-
-                result.append(fld["sticky"])
-
-            update_notetype_legacy(parent=self.mw, notetype=model).run_in_background(
-                initiator=self
-            )
-
-            return result
-
-        elif cmd.startswith("toggleSticky"):
-            (type, num) = cmd.split(":", 1)
-            ord = int(num)
-
-            model = self.note_type()
-            fld = model["flds"][ord]
-            new_state = not fld["sticky"]
-            fld["sticky"] = new_state
-
-            update_notetype_legacy(parent=self.mw, notetype=model).run_in_background(
-                initiator=self
-            )
-
-            return new_state
 
         elif cmd.startswith("saveTags"):
-            if self.note:
-                gui_hooks.editor_did_update_tags(self.note)
+            pass
 
         elif cmd.startswith("editorState"):
             (_, new_state_id, old_state_id) = cmd.split(":", 2)
@@ -496,17 +475,10 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
 
         assert self.mw.pm.profile is not None
         js = f"loadNote({json.dumps(self.nid)}, {mid}, {json.dumps(focus_to)}, {json.dumps(self.orig_note_id)});"
-        if self.note:
-            js = gui_hooks.editor_will_load_note(js, self.note, self)
         self.web.evalWithCallback(
             f'require("anki/ui").loaded.then(() => {{ {js} }})', oncallback
         )
 
-    @deprecated(replaced_by=load_note)
-    def loadNote(self, focusTo: int | None = None) -> None:
-        assert self.note is not None
-        self.load_note(self.note.mid, focus_to=focusTo)
-
     def call_after_note_saved(
         self, callback: Callable, keepFocus: bool = False
     ) -> None:
@@ -519,19 +491,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
 
     saveNow = call_after_note_saved
 
-    def fieldsAreBlank(self, previousNote: Note | None = None) -> bool:
-        if not self.note:
-            return True
-        m = self.note_type()
-        for c, f in enumerate(self.note.fields):
-            f = f.replace("<br>", "").strip()
-            notChangedvalues = {"", "<br>"}
-            if previousNote and m["flds"][c]["sticky"]:
-                notChangedvalues.add(previousNote.fields[c].replace("<br>", "").strip())
-            if f not in notChangedvalues:
-                return False
-        return True
-
     def cleanup(self) -> None:
         av_player.stop_and_clear_queue_if_caller(self.editorMode)
         self.set_note(None)
@@ -557,21 +516,11 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
     # Image occlusion
     ######################################################################
 
-    def current_notetype_is_image_occlusion(self) -> bool:
-        if not self.note:
-            return False
-
-        return (
-            self.note_type().get("originalStockKind", None)
-            == StockNotetype.OriginalStockKind.ORIGINAL_STOCK_KIND_IMAGE_OCCLUSION
-        )
-
     def setup_mask_editor(self, image_path: str) -> None:
         try:
             if self.editorMode == EditorMode.ADD_CARDS:
                 self.setup_mask_editor_for_new_note(image_path=image_path)
             else:
-                assert self.note is not None
                 self.setup_mask_editor_for_existing_note(image_path=image_path)
         except Exception as e:
             showWarning(str(e))
@@ -613,17 +562,11 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             copy=Editor.onCopy,
         )
 
-    @property
-    def note(self) -> Note | None:
-        if self.nid is None:
-            return None
-        return self.mw.col.get_note(self.nid)
+    def get_note_info(self, on_done: Callable[[NoteInfo], None]) -> None:
+        def wrapped_on_done(note_info: dict[str, Any]) -> None:
+            on_done(NoteInfo(**note_info))
 
-    def note_type(self) -> NotetypeDict:
-        assert self.note is not None
-        note_type = self.note.note_type()
-        assert note_type is not None
-        return note_type
+        self.web.evalWithCallback("getNoteInfo()", wrapped_on_done)
 
 
 # Pasting, drag & drop, and keyboard layouts
@@ -651,3 +594,4 @@ class EditorWebView(AnkiWebView):
 
     def onPaste(self) -> None:
         self.triggerPageAction(QWebEnginePage.WebAction.Paste)
+        self.triggerPageAction(QWebEnginePage.WebAction.Paste)
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index d707d9706..af256825c 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -449,6 +449,15 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         return true;
     }
 
+    export function getNoteInfo() {
+        return {
+            id: note?.id.toString() ?? null,
+            mid: notetypeMeta.id.toString(),
+            fields: note?.fields ?? [],
+        };
+    }
+
+
     let richTextInputs: RichTextInput[] = [];
     $: richTextInputs = richTextInputs.filter(Boolean);
 
@@ -870,6 +879,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             setPlainTexts,
             setDescriptions,
             setFonts,
+            getNoteInfo,
             focusField,
             setTags,
             setTagsCollapsed,

From dabd0def55f69ec8076654632c47a64ca867f25a Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sat, 21 Jun 2025 09:43:23 +0300
Subject: [PATCH 047/133] Formatting

---
 ts/routes/editor/NoteEditor.svelte | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index af256825c..d7634ad94 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -457,7 +457,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         };
     }
 
-
     let richTextInputs: RichTextInput[] = [];
     $: richTextInputs = richTextInputs.filter(Boolean);
 

From c4a9ba254ee5d34710b25638e12f340050fd1fdd Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sat, 21 Jun 2025 10:08:45 +0300
Subject: [PATCH 048/133] Remove editor.note refs and fix some lint errors

---
 qt/aqt/addcards.py                 | 64 +-----------------------------
 qt/aqt/browser/browser.py          | 15 ++-----
 qt/aqt/editcurrent.py              | 14 +------
 qt/aqt/editor.py                   | 16 ++++----
 ts/routes/editor/NoteEditor.svelte |  5 +++
 5 files changed, 17 insertions(+), 97 deletions(-)

diff --git a/qt/aqt/addcards.py b/qt/aqt/addcards.py
index d4d94f0d4..f1b1cdbcf 100644
--- a/qt/aqt/addcards.py
+++ b/qt/aqt/addcards.py
@@ -11,26 +11,21 @@ from anki._legacy import deprecated
 from anki.collection import OpChanges, SearchNode
 from anki.decks import DeckId
 from anki.models import NotetypeId
-from anki.notes import Note, NoteFieldsCheckResult, NoteId
+from anki.notes import Note, NoteId
 from anki.utils import html_to_text_line, is_mac
 from aqt import AnkiQt, gui_hooks
 from aqt.deckchooser import DeckChooser
 from aqt.notetypechooser import NotetypeChooser
-from aqt.operations.note import add_note
 from aqt.qt import *
-from aqt.sound import av_player
 from aqt.utils import (
     HelpPage,
     add_close_shortcut,
     ask_user_dialog,
-    askUser,
     downArrow,
     openHelp,
     restoreGeom,
     saveGeom,
     shortcut,
-    showWarning,
-    tooltip,
     tr,
 )
 
@@ -228,59 +223,6 @@ class AddCards(QMainWindow):
     def add_current_note(self) -> None:
         self.editor.web.eval(f"addCurrentNote({self.deck_chooser.selected_deck_id})")
 
-    def _add_current_note(self) -> None:
-        note = self.editor.note
-
-        if not self._note_can_be_added(note):
-            return
-
-        target_deck_id = self.deck_chooser.selected_deck_id
-
-        def on_success(changes: OpChanges) -> None:
-            # only used for detecting changed sticky fields on close
-            self._last_added_note = note
-
-            self.addHistory(note)
-
-            tooltip(tr.adding_added(), period=500)
-            av_player.stop_and_clear_queue()
-            self._load_new_note(sticky_fields_from=note)
-            gui_hooks.add_cards_did_add_note(note)
-
-        add_note(parent=self, note=note, target_deck_id=target_deck_id).success(
-            on_success
-        ).run_in_background()
-
-    def _note_can_be_added(self, note: Note) -> bool:
-        result = note.fields_check()
-        # no problem, duplicate, and confirmed cloze cases
-        problem = None
-        if result == NoteFieldsCheckResult.EMPTY:
-            if self.editor.current_notetype_is_image_occlusion():
-                problem = tr.notetypes_no_occlusion_created2()
-            else:
-                problem = tr.adding_the_first_field_is_empty()
-        elif result == NoteFieldsCheckResult.MISSING_CLOZE:
-            if not askUser(tr.adding_you_have_a_cloze_deletion_note()):
-                return False
-        elif result == NoteFieldsCheckResult.NOTETYPE_NOT_CLOZE:
-            problem = tr.adding_cloze_outside_cloze_notetype()
-        elif result == NoteFieldsCheckResult.FIELD_NOT_CLOZE:
-            problem = tr.adding_cloze_outside_cloze_field()
-
-        # filter problem through add-ons
-        problem = gui_hooks.add_cards_will_add_note(problem, note)
-        if problem is not None:
-            showWarning(problem, help=HelpPage.ADDING_CARD_AND_NOTE)
-            return False
-
-        optional_problems: list[str] = []
-        gui_hooks.add_cards_might_add_note(optional_problems, note)
-        if not all(askUser(op) for op in optional_problems):
-            return False
-
-        return True
-
     def keyPressEvent(self, evt: QKeyEvent) -> None:
         if evt.key() == Qt.Key.Key_Escape:
             self.close()
@@ -340,10 +282,6 @@ class AddCards(QMainWindow):
             print("deckChooser is deprecated; use deck_chooser instead")
         return self.deck_chooser
 
-    addCards = add_current_note
-    _addCards = _add_current_note
-    onModelChange = on_notetype_change
-
     @deprecated(info="obsolete")
     def addNote(self, note: Note) -> None:
         pass
diff --git a/qt/aqt/browser/browser.py b/qt/aqt/browser/browser.py
index 2ef8d3ed9..6e7af72cd 100644
--- a/qt/aqt/browser/browser.py
+++ b/qt/aqt/browser/browser.py
@@ -20,7 +20,6 @@ from anki.cards import Card, CardId
 from anki.collection import Collection, Config, OpChanges, SearchNode
 from anki.consts import *
 from anki.decks import DeckId
-from anki.errors import NotFoundError
 from anki.lang import without_unicode_isolation
 from anki.models import NotetypeId
 from anki.notes import NoteId
@@ -190,15 +189,7 @@ class Browser(QMainWindow):
                 # fixme: this will leave the splitter shown, but with no current
                 # note being edited
                 assert self.editor is not None
-
-                note = self.editor.note
-                if note:
-                    try:
-                        note.load()
-                    except NotFoundError:
-                        self.editor.set_note(None)
-                        return
-                    self.editor.set_note(note)
+                self.editor.reload_note()
 
         if changes.browser_table and changes.card:
             self.card = self.table.get_single_selected_card()
@@ -839,7 +830,7 @@ class Browser(QMainWindow):
 
         if self._previewer:
             self._previewer.close()
-        elif self.editor.note:
+        else:
             self._previewer = PreviewDialog(self, self.mw, self._on_preview_closed)
             self._previewer.open()
             self.toggle_preview_button_state(True)
@@ -1261,7 +1252,7 @@ class Browser(QMainWindow):
         def cb():
             assert self.editor is not None and self.editor.web is not None
             self.editor.web.setFocus()
-            self.editor.loadNote(focusTo=0)
+            self.editor.reload_note()
 
         assert self.editor is not None
         self.editor.call_after_note_saved(cb)
diff --git a/qt/aqt/editcurrent.py b/qt/aqt/editcurrent.py
index 6ec4938b7..d8007c75c 100644
--- a/qt/aqt/editcurrent.py
+++ b/qt/aqt/editcurrent.py
@@ -6,7 +6,6 @@ from collections.abc import Callable
 
 import aqt.editor
 from anki.collection import OpChanges
-from anki.errors import NotFoundError
 from aqt import gui_hooks
 from aqt.qt import *
 from aqt.utils import add_close_shortcut, restoreGeom, saveGeom, tr
@@ -47,18 +46,7 @@ class EditCurrent(QMainWindow):
         self, changes: OpChanges, handler: object | None
     ) -> None:
         if changes.note_text and handler is not self.editor:
-            # reload note
-            note = self.editor.note
-            try:
-                assert note is not None
-                note.load()
-            except NotFoundError:
-                # note's been deleted
-                self.cleanup()
-                self.close()
-                return
-
-            self.editor.set_note(note)
+            self.editor.reload_note()
 
     def cleanup(self) -> None:
         gui_hooks.operation_did_execute.remove(self.on_operation_did_execute)
diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 496d893a7..4ae96f0cd 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -17,11 +17,10 @@ from typing import Any
 from anki._legacy import deprecated
 from anki.cards import Card
 from anki.hooks import runFilter
-from anki.models import NotetypeDict, NotetypeId, StockNotetype
+from anki.models import NotetypeId
 from anki.notes import Note, NoteId
 from anki.utils import is_win
 from aqt import AnkiQt, gui_hooks
-from aqt.operations.notetype import update_notetype_legacy
 from aqt.qt import *
 from aqt.sound import av_player
 from aqt.utils import shortcut, showWarning
@@ -119,7 +118,6 @@ class Editor:
         self.mw = mw
         self.widget = widget
         self.parentWindow = parentWindow
-        self.mid: NotetypeId | None = None
         # legacy argument provided?
         if addMode is not None:
             editor_mode = EditorMode.ADD_CARDS if addMode else EditorMode.EDIT_CURRENT
@@ -341,9 +339,9 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
         from aqt.fields import FieldDialog
 
         def on_note_info(note_info: NoteInfo) -> None:
-            FieldDialog(
-                self.mw, self.mw.col.models.get(note_info.mid), parent=self.parentWindow
-            )
+            note_type = self.mw.col.models.get(note_info.mid)
+            assert note_type is not None
+            FieldDialog(self.mw, note_type, parent=self.parentWindow)
 
         self.get_note_info(on_note_info)
 
@@ -456,9 +454,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
         elif hide:
             self.widget.hide()
 
-    def loadNoteKeepingFocus(self) -> None:
-        self.loadNote(self.currentField)
-
     @on_editor_ready
     def load_note(self, mid: int, focus_to: int | None = None) -> None:
 
@@ -479,6 +474,9 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             f'require("anki/ui").loaded.then(() => {{ {js} }})', oncallback
         )
 
+    def reload_note(self) -> None:
+        self.web.eval("reloadNote();")
+
     def call_after_note_saved(
         self, callback: Callable, keepFocus: bool = False
     ) -> None:
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index d7634ad94..af55c0f0e 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -844,6 +844,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         return note!.id;
     }
 
+    async function reloadNote() {
+        await loadNote(note!.id, notetypeMeta.id, 0, null);
+    }
+
     $: signalEditorState($editorState);
 
     $: $editorState = getEditorState(
@@ -871,6 +875,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
         Object.assign(globalThis, {
             loadNote,
+            reloadNote,
             saveSession,
             setFields,
             setCollapsed,

From 723b54830b26d04e68c6319dcdfb5c1c6240e2b1 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Tue, 24 Jun 2025 15:28:40 +0300
Subject: [PATCH 049/133] Add missing editor.nid initialization

---
 qt/aqt/editor.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 4ae96f0cd..a9ee3db72 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -118,6 +118,7 @@ class Editor:
         self.mw = mw
         self.widget = widget
         self.parentWindow = parentWindow
+        self.nid: NoteId | None = None
         # legacy argument provided?
         if addMode is not None:
             editor_mode = EditorMode.ADD_CARDS if addMode else EditorMode.EDIT_CURRENT

From bc26b283a0f292d671254e782e3ad7381cdb2f86 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Tue, 24 Jun 2025 15:51:05 +0300
Subject: [PATCH 050/133] Reimplement sticky field saving

---
 qt/aqt/mediasrv.py                  |  1 +
 ts/routes/editor/NoteEditor.svelte  | 30 ++++++++++++++++++++++++++++-
 ts/routes/editor/StickyBadge.svelte | 13 ++++++++-----
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index 2621efb18..29dd0ebc8 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -812,6 +812,7 @@ exposed_backend_list = [
     "get_notetype_names",
     "get_change_notetype_info",
     "get_cloze_field_ords",
+    "update_notetype",
     # StatsService
     "card_stats",
     "get_review_logs",
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index af55c0f0e..73e189363 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -52,7 +52,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 <script lang="ts">
     import * as tr from "@generated/ftl";
     import { bridgeCommand } from "@tslib/bridgecommand";
-    import { onMount, tick } from "svelte";
+    import { onDestroy, onMount, tick } from "svelte";
     import { get, writable } from "svelte/store";
     import { nodeIsCommonElement } from "@tslib/dom";
 
@@ -212,6 +212,23 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         stickies = stckies;
     }
 
+    async function toggleStickyAll() {
+        const values: boolean[] = [];
+        const notetype = await getNotetype({ ntid: notetypeMeta.id });
+        const anySticky = notetype.fields.some((f) => f.config!.sticky);
+        for (const field of notetype.fields) {
+            const sticky = field.config!.sticky;
+            if (!anySticky || sticky) {
+                field.config!.sticky = !sticky;
+            }
+            values.push(field.config!.sticky);
+        }
+        await updateNotetype(notetype);
+        setSticky(values);
+    }
+
+    let deregisterSticky: () => void;
+
     export function focusField(index: number | null): void {
         tick().then(() => {
             if (typeof index === "number") {
@@ -539,6 +556,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         noteFieldsCheck,
         addNote,
         addMediaFromPath,
+        updateNotetype,
     } from "@generated/backend";
     import { wrapInternal } from "@tslib/wrap";
     import { getProfileConfig, getMeta, setMeta, getColConfig } from "@tslib/profile";
@@ -561,6 +579,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import PreviewButton from "./PreviewButton.svelte";
     import { NoteFieldsCheckResponse_State, type Note } from "@generated/anki/notes_pb";
     import { setupContextMenu } from "./context-menu.svelte";
+    import { registerShortcut } from "@tslib/shortcuts";
 
     $: isIOImageLoaded = false;
     $: ioImageLoadedStore.set(isIOImageLoaded);
@@ -863,6 +882,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 
     onMount(() => {
+        if (mode === "add") {
+            deregisterSticky = registerShortcut(toggleStickyAll, "Shift+F9");
+        }
+
         function wrap(before: string, after: string): void {
             if (!$focusedInput || !editingInputIsRichText($focusedInput)) {
                 return;
@@ -920,6 +943,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         return () => document.removeEventListener("visibilitychange", saveOnPageHide);
     });
 
+    onDestroy(() => {
+        deregisterSticky();
+    });
+
     let apiPartial: Partial<NoteEditorAPI> = {};
     export { apiPartial as api };
 
@@ -1067,6 +1094,7 @@ components and functionality for general note editing.
                                     <StickyBadge
                                         bind:active={stickies[index]}
                                         {index}
+                                        {note}
                                         show={fields[index] === $hoveredField ||
                                             fields[index] === $focusedField}
                                     />
diff --git a/ts/routes/editor/StickyBadge.svelte b/ts/routes/editor/StickyBadge.svelte
index 596678f30..45560a1ce 100644
--- a/ts/routes/editor/StickyBadge.svelte
+++ b/ts/routes/editor/StickyBadge.svelte
@@ -4,7 +4,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
     import * as tr from "@generated/ftl";
-    import { bridgeCommand } from "@tslib/bridgecommand";
     import { getPlatformString, registerShortcut } from "@tslib/shortcuts";
     import { onEnterOrSpace } from "@tslib/keys";
     import { onMount } from "svelte";
@@ -15,6 +14,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { stickyIconSolid } from "$lib/components/icons";
 
     import { context as editorFieldContext } from "./EditorField.svelte";
+    import type { Note } from "@generated/anki/notes_pb";
+    import { getNotetype, updateNotetype } from "@generated/backend";
 
     const animated = !document.body.classList.contains("reduce-motion");
 
@@ -25,11 +26,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     const keyCombination = "F9";
 
     export let index: number;
+    export let note: Note;
 
-    function toggle() {
-        bridgeCommand(`toggleSticky:${index}`, (value: boolean) => {
-            active = value;
-        });
+    async function toggle() {
+        active = !active;
+        const notetype = await getNotetype({ ntid: note.notetypeId });
+        notetype.fields[index].config!.sticky = active;
+        await updateNotetype(notetype);
     }
 
     function shortcut(target: HTMLElement): () => void {

From 2ffcbc9c5d0a0a7cfa8c96fa917b51be4ce90a9c Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Tue, 24 Jun 2025 16:06:30 +0300
Subject: [PATCH 051/133] Focus field input on drop

---
 ts/routes/editor/rich-text-input/data-transfer.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ts/routes/editor/rich-text-input/data-transfer.ts b/ts/routes/editor/rich-text-input/data-transfer.ts
index 76cab078c..4c318f84b 100644
--- a/ts/routes/editor/rich-text-input/data-transfer.ts
+++ b/ts/routes/editor/rich-text-input/data-transfer.ts
@@ -374,6 +374,7 @@ export async function handlePaste(event: ClipboardEvent) {
 }
 
 export async function handleDrop(event: DragEvent) {
+    (event.target as HTMLElement).focus();
     await handlePasteOrDrop(event);
 }
 

From 0bc06d6c1a9617955190841e01291a8aa87e134b Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Tue, 24 Jun 2025 17:06:25 +0300
Subject: [PATCH 052/133] Fix lint error

---
 ts/routes/editor/NoteEditor.svelte | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 73e189363..861c0109f 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -260,7 +260,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         await setMeta(tagsCollapsedMetaKey, collapsed);
     }
 
-    let note: Note | null = null;
+    let note: Note;
     export function setNote(n: Note): void {
         note = n;
         // TODO this is a hack, because it requires the NoteEditor to know implementation details of the PlainTextInput.
@@ -468,9 +468,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     export function getNoteInfo() {
         return {
-            id: note?.id.toString() ?? null,
+            id: note.id.toString() ?? null,
             mid: notetypeMeta.id.toString(),
-            fields: note?.fields ?? [],
+            fields: note.fields ?? [],
         };
     }
 

From 91bba5f42960f541e4e8f1fe4378ad132960a4e7 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sat, 28 Jun 2025 13:46:21 +0300
Subject: [PATCH 053/133] Add missing allowedSuffixes arg

---
 .../editor/rich-text-input/data-transfer.ts    | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/ts/routes/editor/rich-text-input/data-transfer.ts b/ts/routes/editor/rich-text-input/data-transfer.ts
index 4c318f84b..4d00688f9 100644
--- a/ts/routes/editor/rich-text-input/data-transfer.ts
+++ b/ts/routes/editor/rich-text-input/data-transfer.ts
@@ -136,9 +136,9 @@ async function retrieveUrl(url: string): Promise<string | null> {
     return response.filename;
 }
 
-async function urlToFile(url: string): Promise<string | null> {
+async function urlToFile(url: string, allowedSuffixes = mediaSuffixes): Promise<string | null> {
     const lowerUrl = url.toLowerCase();
-    for (const suffix of mediaSuffixes) {
+    for (const suffix of allowedSuffixes) {
         if (lowerUrl.endsWith(`.${suffix}`)) {
             return await retrieveUrl(url);
         }
@@ -157,8 +157,8 @@ export function filenameToLink(filename: string): string {
     }
 }
 
-async function urlToLink(url: string): Promise<string> {
-    const filename = await urlToFile(url);
+async function urlToLink(url: string, allowedSuffixes: string[] = mediaSuffixes): Promise<string> {
+    const filename = await urlToFile(url, allowedSuffixes);
     if (!filename) {
         const escapedTitle = escapeHtml(decodeURI(url));
         return `<a href="${url}">${escapedTitle}</a>`;
@@ -232,7 +232,11 @@ function isURL(s: string): boolean {
     return prefixes.some(prefix => s.startsWith(prefix));
 }
 
-async function processUrls(data: DataTransfer | ClipboardItem, _extended: Promise<boolean>): Promise<string | null> {
+async function processUrls(
+    data: DataTransfer | ClipboardItem,
+    _extended: Promise<boolean>,
+    allowedSuffixes: string[] = mediaSuffixes,
+): Promise<string | null> {
     const urls = await getUrls(data);
     if (urls.length === 0) {
         return null;
@@ -242,7 +246,7 @@ async function processUrls(data: DataTransfer | ClipboardItem, _extended: Promis
         // Chrome likes to give us the URL twice with a \n
         const lines = url.split("\n");
         url = lines[0];
-        text += await urlToLink(url);
+        text += await urlToLink(url, allowedSuffixes);
     }
 
     return text;
@@ -422,7 +426,7 @@ export async function readImageFromClipboard(): Promise<string | null> {
     // TODO: check browser support and available formats
     for (const item of await navigator.clipboard.read()) {
         let path: string | null = null;
-        const html = await processUrls(item, Promise.resolve(false));
+        const html = await processUrls(item, Promise.resolve(false), imageSuffixes);
         if (html) {
             path = await extractImagePathFromHtml(html);
         }

From 33fb6bf4008bbff66a5d6d49646f9c83975f897c Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sat, 28 Jun 2025 14:51:53 +0300
Subject: [PATCH 054/133] Handle image occlusion drops

---
 ts/routes/editor/NoteEditor.svelte                | 13 +++++++++++++
 ts/routes/editor/rich-text-input/data-transfer.ts | 14 ++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 861c0109f..8a0dae384 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -32,6 +32,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         openFilePickerForImageOcclusion,
         readImageFromClipboard,
         extractImagePathFromHtml,
+        extractImagePathFromData,
     } from "./rich-text-input/data-transfer";
     import contextProperty from "$lib/sveltelib/context-property";
     import lifecycleHooks from "$lib/sveltelib/lifecycle-hooks";
@@ -601,6 +602,16 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         await setupMaskEditorFromClipboard();
     }
 
+    async function handlePickerDrop(event: DragEvent) {
+        if($editorState === EditorState.ImageOcclusionPicker) {
+            const path = await extractImagePathFromData(event.dataTransfer!);
+            if (path) {
+                setupMaskEditor(path);
+                event.preventDefault();
+            }
+        }
+    }
+
     async function setupMaskEditor(filename: string) {
         if (mode == "add") {
             setupMaskEditorForNewNote(filename);
@@ -999,6 +1010,8 @@ components and functionality for general note editing.
     on:contextmenu={(event) => {
         onContextMenu(event, api, $focusedInput, contextMenu);
     }}
+    on:dragover|preventDefault
+    on:drop={handlePickerDrop}
 >
     <EditorToolbar {size} {wrap} api={toolbar}>
         <svelte:fragment slot="notetypeButtons">
diff --git a/ts/routes/editor/rich-text-input/data-transfer.ts b/ts/routes/editor/rich-text-input/data-transfer.ts
index 4d00688f9..b941ff932 100644
--- a/ts/routes/editor/rich-text-input/data-transfer.ts
+++ b/ts/routes/editor/rich-text-input/data-transfer.ts
@@ -248,7 +248,6 @@ async function processUrls(
         url = lines[0];
         text += await urlToLink(url, allowedSuffixes);
     }
-
     return text;
 }
 
@@ -421,15 +420,18 @@ export async function extractImagePathFromHtml(html: string): Promise<string | n
     }
     return decodeURI(images[0]);
 }
+export async function extractImagePathFromData(data: DataTransfer | ClipboardItem): Promise<string | null> {
+    const html = await processUrls(data, Promise.resolve(false), imageSuffixes);
+    if (html) {
+        return await extractImagePathFromHtml(html);
+    }
+    return null;
+}
 
 export async function readImageFromClipboard(): Promise<string | null> {
     // TODO: check browser support and available formats
     for (const item of await navigator.clipboard.read()) {
-        let path: string | null = null;
-        const html = await processUrls(item, Promise.resolve(false), imageSuffixes);
-        if (html) {
-            path = await extractImagePathFromHtml(html);
-        }
+        let path = await extractImagePathFromData(item);
         if (!path) {
             const image = await getImageData(item);
             if (!image) {

From 0bdeab974f2bc9154282137bb4832afd3893b17c Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sat, 28 Jun 2025 16:42:12 +0300
Subject: [PATCH 055/133] Trim leading/trailing whitespace from URL

Windows likes to add extra newlines...
---
 ts/routes/editor/rich-text-input/data-transfer.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ts/routes/editor/rich-text-input/data-transfer.ts b/ts/routes/editor/rich-text-input/data-transfer.ts
index b941ff932..dd992db67 100644
--- a/ts/routes/editor/rich-text-input/data-transfer.ts
+++ b/ts/routes/editor/rich-text-input/data-transfer.ts
@@ -244,8 +244,7 @@ async function processUrls(
     let text = "";
     for (let url of urls) {
         // Chrome likes to give us the URL twice with a \n
-        const lines = url.split("\n");
-        url = lines[0];
+        url = url.split("\n")[0].trim();
         text += await urlToLink(url, allowedSuffixes);
     }
     return text;

From dd673851db6bcd565d51712e22e4590ee88ef9b7 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sat, 28 Jun 2025 16:46:13 +0300
Subject: [PATCH 056/133] Go back to using QClipboard

---
 proto/anki/frontend.proto                     | 16 ++++
 qt/aqt/mediasrv.py                            | 24 ++++++
 .../editor/rich-text-input/data-transfer.ts   | 75 ++++++++-----------
 3 files changed, 73 insertions(+), 42 deletions(-)

diff --git a/proto/anki/frontend.proto b/proto/anki/frontend.proto
index 73effc4d6..130f617af 100644
--- a/proto/anki/frontend.proto
+++ b/proto/anki/frontend.proto
@@ -46,6 +46,10 @@ service FrontendService {
   // Metadata
   rpc GetMetaJson(generic.String) returns (generic.Json);
   rpc SetMetaJson(SetSettingJsonRequest) returns (generic.Empty);
+
+  // Clipboard
+  rpc ReadClipboard(ReadClipboardRequest) returns (ReadClipboardResponse);
+  rpc WriteClipboard(WriteClipboardRequest) returns (generic.Empty);
 }
 
 service BackendFrontendService {}
@@ -85,3 +89,15 @@ message openFilePickerRequest {
   string filter_description = 3;
   repeated string extensions = 4;
 }
+
+message ReadClipboardRequest {
+  repeated string types = 1;
+}
+
+message ReadClipboardResponse {
+  map<string, bytes> data = 1;
+}
+
+message WriteClipboardRequest {
+  map<string, bytes> data = 1;
+}
\ No newline at end of file
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index 29dd0ebc8..af9b3a769 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -761,6 +761,28 @@ async def record_audio() -> bytes:
     return generic_pb2.String(val=path if path else "").SerializeToString()
 
 
+def read_clipboard() -> bytes:
+    req = frontend_pb2.ReadClipboardRequest()
+    req.ParseFromString(request.data)
+    data = {}
+    clipboard = aqt.mw.app.clipboard()
+    mime_data = clipboard.mimeData(QClipboard.Mode.Clipboard)
+    for type in req.types:
+        data[type] = bytes(mime_data.data(type))
+
+    return frontend_pb2.ReadClipboardResponse(data=data).SerializeToString()
+
+
+def write_clipboard() -> bytes:
+    req = frontend_pb2.WriteClipboardRequest()
+    req.ParseFromString(request.data)
+    clipboard = aqt.mw.app.clipboard()
+    mime_data = clipboard.mimeData(QClipboard.Mode.Clipboard)
+    for type, data in req.data.items():
+        mime_data.setData(type, data)
+    return b""
+
+
 post_handler_list = [
     congrats_info,
     get_deck_configs_for_update,
@@ -788,6 +810,8 @@ post_handler_list = [
     open_media,
     show_in_media_folder,
     record_audio,
+    read_clipboard,
+    write_clipboard,
 ]
 
 
diff --git a/ts/routes/editor/rich-text-input/data-transfer.ts b/ts/routes/editor/rich-text-input/data-transfer.ts
index dd992db67..de4aef0f1 100644
--- a/ts/routes/editor/rich-text-input/data-transfer.ts
+++ b/ts/routes/editor/rich-text-input/data-transfer.ts
@@ -2,6 +2,7 @@
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 import { ConfigKey_Bool } from "@generated/anki/config_pb";
+import type { ReadClipboardResponse } from "@generated/anki/frontend_pb";
 import {
     addMediaFile,
     convertPastedImage,
@@ -9,7 +10,9 @@ import {
     getAbsoluteMediaPath,
     getConfigBool,
     openFilePicker,
+    readClipboard,
     retrieveUrl as retrieveUrlBackend,
+    writeClipboard,
 } from "@generated/backend";
 import * as tr from "@generated/ftl";
 import { shiftPressed } from "@tslib/keys";
@@ -41,6 +44,19 @@ const audioSuffixes = [
     "webm",
 ];
 const mediaSuffixes = [...imageSuffixes, ...audioSuffixes];
+const QIMAGE_FORMATS = [
+    "image/jpeg",
+    "image/png",
+    "image/gif",
+    "image/svg+xml",
+    "image/bmp",
+    "image/x-portable-bitmap",
+    "image/x-portable-graymap",
+    "image/x-portable-pixmap",
+    "image/x-xbitmap",
+    "image/x-xpixmap",
+];
+const URI_LIST_MIME = "text/uri-list";
 
 let isShiftPressed = false;
 let lastInternalFieldText = "";
@@ -67,17 +83,12 @@ function escapeHtml(text: string, quote = true): string {
     return text;
 }
 
-async function getUrls(data: DataTransfer | ClipboardItem): Promise<string[]> {
-    const mime = "text/uri-list";
+async function getUrls(data: DataTransfer | ReadClipboardResponse): Promise<string[]> {
     let dataString: string;
     if (data instanceof DataTransfer) {
-        dataString = data.getData(mime);
+        dataString = data.getData(URI_LIST_MIME);
     } else {
-        try {
-            dataString = await (await data.getType(mime)).text();
-        } catch (e) {
-            return [];
-        }
+        dataString = new TextDecoder().decode(data.data[URI_LIST_MIME]);
     }
     const urls = dataString.split("\n");
     return urls[0] ? urls : [];
@@ -91,25 +102,12 @@ function getHtml(data: DataTransfer): string {
     return data.getData("text/html") ?? "";
 }
 
-const QIMAGE_FORMATS = [
-    "image/jpeg",
-    "image/png",
-    "image/gif",
-    "image/svg+xml",
-    "image/bmp",
-    "image/x-portable-bitmap",
-    "image/x-portable-graymap",
-    "image/x-portable-pixmap",
-    "image/x-xbitmap",
-    "image/x-xpixmap",
-];
-
-async function getImageData(data: DataTransfer | ClipboardItem): Promise<ImageData | null> {
+async function getImageData(data: DataTransfer | ReadClipboardResponse): Promise<ImageData | null> {
     for (const type of QIMAGE_FORMATS) {
         try {
             const image = data instanceof DataTransfer
                 ? data.getData(type)
-                : new Uint8Array(await (await data.getType(type)).arrayBuffer());
+                : data.data[type];
             if (image) {
                 return image;
             } else if (data instanceof DataTransfer) {
@@ -233,7 +231,7 @@ function isURL(s: string): boolean {
 }
 
 async function processUrls(
-    data: DataTransfer | ClipboardItem,
+    data: DataTransfer | ReadClipboardResponse,
     _extended: Promise<boolean>,
     allowedSuffixes: string[] = mediaSuffixes,
 ): Promise<string | null> {
@@ -419,7 +417,7 @@ export async function extractImagePathFromHtml(html: string): Promise<string | n
     }
     return decodeURI(images[0]);
 }
-export async function extractImagePathFromData(data: DataTransfer | ClipboardItem): Promise<string | null> {
+export async function extractImagePathFromData(data: DataTransfer | ReadClipboardResponse): Promise<string | null> {
     const html = await processUrls(data, Promise.resolve(false), imageSuffixes);
     if (html) {
         return await extractImagePathFromHtml(html);
@@ -428,26 +426,19 @@ export async function extractImagePathFromData(data: DataTransfer | ClipboardIte
 }
 
 export async function readImageFromClipboard(): Promise<string | null> {
-    // TODO: check browser support and available formats
-    for (const item of await navigator.clipboard.read()) {
-        let path = await extractImagePathFromData(item);
-        if (!path) {
-            const image = await getImageData(item);
-            if (!image) {
-                continue;
-            }
-            const ext = await getPreferredImageExtension();
-            path = await addPastedImage(image, ext, true);
+    const data = await readClipboard({ types: QIMAGE_FORMATS.concat(URI_LIST_MIME) });
+    let path = await extractImagePathFromData(data);
+    if (!path) {
+        const image = await getImageData(data);
+        if (!image) {
+            return null;
         }
-        return (await getAbsoluteMediaPath({ val: path })).val;
+        const ext = await getPreferredImageExtension();
+        path = await addPastedImage(image, ext, true);
     }
-    return null;
+    return (await getAbsoluteMediaPath({ val: path })).val;
 }
 
 export async function writeBlobToClipboard(blob: Blob) {
-    await navigator.clipboard.write([
-        new ClipboardItem({
-            [blob.type]: blob,
-        }),
-    ]);
+    await writeClipboard({ data: { [blob.type]: new Uint8Array(await blob.arrayBuffer()) } });
 }

From b8815a0a5bd278af629a6655514e747b576502fd Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sat, 28 Jun 2025 16:46:59 +0300
Subject: [PATCH 057/133] Update uv.lock

---
 uv.lock | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/uv.lock b/uv.lock
index 868bb55e6..d5d605c2b 100644
--- a/uv.lock
+++ b/uv.lock
@@ -165,7 +165,7 @@ source = { editable = "qt" }
 dependencies = [
     { name = "anki-mac-helper", marker = "sys_platform == 'darwin' or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt66') or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt69') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt69') or (extra == 'extra-3-aqt-qt67' and extra == 'extra-3-aqt-qt69')" },
     { name = "beautifulsoup4" },
-    { name = "flask" },
+    { name = "flask", extra = ["async"] },
     { name = "flask-cors" },
     { name = "jsonschema" },
     { name = "pip-system-certs", version = "4.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.10' or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt66') or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt69') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt69') or (extra == 'extra-3-aqt-qt67' and extra == 'extra-3-aqt-qt69')" },
@@ -222,7 +222,7 @@ requires-dist = [
     { name = "anki-audio", marker = "(sys_platform == 'darwin' and extra == 'audio') or (sys_platform == 'win32' and extra == 'audio')", specifier = "==0.1.0" },
     { name = "anki-mac-helper", marker = "sys_platform == 'darwin'" },
     { name = "beautifulsoup4" },
-    { name = "flask" },
+    { name = "flask", extras = ["async"] },
     { name = "flask-cors" },
     { name = "jsonschema" },
     { name = "pip-system-certs", specifier = "!=5.1" },
@@ -255,6 +255,18 @@ requires-dist = [
 ]
 provides-extras = ["audio", "qt", "qt66", "qt67", "qt69"]
 
+[[package]]
+name = "asgiref"
+version = "3.8.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "typing-extensions", marker = "python_full_version < '3.11' or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt66') or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt' and extra == 'extra-3-aqt-qt69') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt67') or (extra == 'extra-3-aqt-qt66' and extra == 'extra-3-aqt-qt69') or (extra == 'extra-3-aqt-qt67' and extra == 'extra-3-aqt-qt69')" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/29/38/b3395cc9ad1b56d2ddac9970bc8f4141312dbaec28bc7c218b0dfafd0f42/asgiref-3.8.1.tar.gz", hash = "sha256:c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590", size = 35186, upload-time = "2024-03-22T14:39:36.863Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/39/e3/893e8757be2612e6c266d9bb58ad2e3651524b5b40cf56761e985a28b13e/asgiref-3.8.1-py3-none-any.whl", hash = "sha256:3e1e3ecc849832fe52ccf2cb6686b7a55f82bb1d6aee72a58826471390335e47", size = 23828, upload-time = "2024-03-22T14:39:34.521Z" },
+]
+
 [[package]]
 name = "astroid"
 version = "3.3.10"
@@ -537,6 +549,11 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/3d/68/9d4508e893976286d2ead7f8f571314af6c2037af34853a30fd769c02e9d/flask-3.1.1-py3-none-any.whl", hash = "sha256:07aae2bb5eaf77993ef57e357491839f5fd9f4dc281593a81a9e4d79a24f295c", size = 103305, upload-time = "2025-05-13T15:01:15.591Z" },
 ]
 
+[package.optional-dependencies]
+async = [
+    { name = "asgiref" },
+]
+
 [[package]]
 name = "flask-cors"
 version = "6.0.1"

From 70264bd23f6aa70624c789b9a91a47054a421a86 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sat, 28 Jun 2025 16:56:54 +0300
Subject: [PATCH 058/133] Fix lint errors

---
 qt/aqt/mediasrv.py                 | 6 +++++-
 ts/routes/editor/NoteEditor.svelte | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index af9b3a769..63a177338 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -766,9 +766,11 @@ def read_clipboard() -> bytes:
     req.ParseFromString(request.data)
     data = {}
     clipboard = aqt.mw.app.clipboard()
+    assert clipboard is not None
     mime_data = clipboard.mimeData(QClipboard.Mode.Clipboard)
+    assert mime_data is not None
     for type in req.types:
-        data[type] = bytes(mime_data.data(type))
+        data[type] = bytes(mime_data.data(type))  # type: ignore
 
     return frontend_pb2.ReadClipboardResponse(data=data).SerializeToString()
 
@@ -777,7 +779,9 @@ def write_clipboard() -> bytes:
     req = frontend_pb2.WriteClipboardRequest()
     req.ParseFromString(request.data)
     clipboard = aqt.mw.app.clipboard()
+    assert clipboard is not None
     mime_data = clipboard.mimeData(QClipboard.Mode.Clipboard)
+    assert mime_data is not None
     for type, data in req.data.items():
         mime_data.setData(type, data)
     return b""
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 8a0dae384..43096e18d 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -603,7 +603,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 
     async function handlePickerDrop(event: DragEvent) {
-        if($editorState === EditorState.ImageOcclusionPicker) {
+        if ($editorState === EditorState.ImageOcclusionPicker) {
             const path = await extractImagePathFromData(event.dataTransfer!);
             if (path) {
                 setupMaskEditor(path);

From 77466b2a6cc262892078a279eef1c8def526eabe Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sat, 28 Jun 2025 23:06:02 +0300
Subject: [PATCH 059/133] Formatting

---
 ts/routes/deck-options/SimulatorModal.svelte | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ts/routes/deck-options/SimulatorModal.svelte b/ts/routes/deck-options/SimulatorModal.svelte
index 0fb9c2ab7..4a336aa71 100644
--- a/ts/routes/deck-options/SimulatorModal.svelte
+++ b/ts/routes/deck-options/SimulatorModal.svelte
@@ -473,8 +473,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
                     {#if simulateFsrsRequest.target?.kind.case === "memorized"}
                         <SpinBoxFloatRow
-                            bind:value={simulateFsrsRequest.target.kind.value
-                                .lossAversion}
+                            bind:value={
+                                simulateFsrsRequest.target.kind.value.lossAversion
+                            }
                             defaultValue={1.6}
                         >
                             <SettingTitle>

From 83e1f150fb68148b27c0b0f81aae3c85a8f19cf5 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sun, 29 Jun 2025 03:21:25 +0300
Subject: [PATCH 060/133] Add a hide_while_preserving_layout() call

This should reduce flicker.
---
 qt/aqt/editor.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index a9ee3db72..8ddd2ebce 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -154,6 +154,7 @@ class Editor:
     def add_webview(self) -> None:
         self.web = EditorWebView(self.widget, self)
         self.web.set_bridge_command(self.onBridgeCmd, self)
+        self.web.hide_while_preserving_layout()
         self.outerLayout.addWidget(self.web, 1)
 
     def setupWeb(self) -> None:

From 230fb3c7aea45c637f85f2c10cb49fb2b180d566 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sun, 29 Jun 2025 04:18:04 +0300
Subject: [PATCH 061/133] Use CamelCase consistently for Protobuf names

---
 proto/anki/frontend.proto | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/proto/anki/frontend.proto b/proto/anki/frontend.proto
index 130f617af..0974913ec 100644
--- a/proto/anki/frontend.proto
+++ b/proto/anki/frontend.proto
@@ -30,14 +30,14 @@ service FrontendService {
   rpc deckOptionsReady(generic.Empty) returns (generic.Empty);
 
   // Editor
-  rpc editorUpdateNote(notes.UpdateNotesRequest) returns (generic.Empty);
-  rpc convertPastedImage(ConvertPastedImageRequest)
+  rpc EditorUpdateNote(notes.UpdateNotesRequest) returns (generic.Empty);
+  rpc ConvertPastedImage(ConvertPastedImageRequest)
       returns (ConvertPastedImageResponse);
-  rpc retrieveUrl(generic.String) returns (RetrieveUrlResponse);
-  rpc openFilePicker(openFilePickerRequest) returns (generic.String);
-  rpc openMedia(generic.String) returns (generic.Empty);
-  rpc showInMediaFolder(generic.String) returns (generic.Empty);
-  rpc recordAudio(generic.Empty) returns (generic.String);
+  rpc RetrieveUrl(generic.String) returns (RetrieveUrlResponse);
+  rpc OpenFilePicker(openFilePickerRequest) returns (generic.String);
+  rpc OpenMedia(generic.String) returns (generic.Empty);
+  rpc ShowInMediaFolder(generic.String) returns (generic.Empty);
+  rpc RecordAudio(generic.Empty) returns (generic.String);
 
   // Profile config
   rpc GetProfileConfigJson(generic.String) returns (generic.Json);

From 4e2f7445bac6c6672060f7089cb9ce8fbe4ba8e3 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sun, 29 Jun 2025 04:19:30 +0300
Subject: [PATCH 062/133] Fix duplicate triggerPageAction() call

---
 qt/aqt/editor.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 8ddd2ebce..9cd173f1e 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -594,4 +594,3 @@ class EditorWebView(AnkiWebView):
 
     def onPaste(self) -> None:
         self.triggerPageAction(QWebEnginePage.WebAction.Paste)
-        self.triggerPageAction(QWebEnginePage.WebAction.Paste)

From 24913d1a64f531300ed187adba080646fdaf07c9 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sun, 29 Jun 2025 05:26:37 +0300
Subject: [PATCH 063/133] Fix context menu input field focus handling

---
 ts/routes/editor/NoteEditor.svelte | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 43096e18d..b0bd2bc3a 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -89,6 +89,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     let contextMenu: ContextMenu;
     const [onContextMenu, contextMenuItems] = setupContextMenu();
+    let contextMenuInput: EditingInputAPI | null = null;
+
 
     function quoteFontFamily(fontFamily: string): string {
         // generic families (e.g. sans-serif) must not be quoted
@@ -1008,6 +1010,7 @@ components and functionality for general note editing.
     role="presentation"
     bind:this={noteEditor}
     on:contextmenu={(event) => {
+        contextMenuInput = $focusedInput;
         onContextMenu(event, api, $focusedInput, contextMenu);
     }}
     on:dragover|preventDefault
@@ -1196,7 +1199,7 @@ components and functionality for general note editing.
             <Item
                 on:click={() => {
                     item.action();
-                    $focusedInput?.focus();
+                    contextMenuInput?.focus();
                 }}
             >
                 {item.label}

From a32ef31382702119103888221c6bcbedf28936a3 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sun, 29 Jun 2025 22:03:58 +0300
Subject: [PATCH 064/133] Fix lint errors

---
 qt/aqt/editor.py                   | 4 +---
 qt/aqt/utils.py                    | 8 +++++---
 ts/routes/editor/NoteEditor.svelte | 1 -
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 5ee4fce37..5610d64ed 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -382,8 +382,7 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
     def onBridgeCmd(self, cmd: str) -> Any:
         # focus lost or key/button pressed?
         if cmd.startswith("blur") or cmd.startswith("key"):
-            (type, ord_str) = cmd.split(":", 1)
-            ord = int(ord_str)
+            (type, _) = cmd.split(":", 1)
             if type == "blur":
                 self.currentField = None
             else:
@@ -458,7 +457,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
 
     @on_editor_ready
     def load_note(self, mid: int, focus_to: int | None = None) -> None:
-
         self.widget.show()
 
         def oncallback(arg: Any) -> None:
diff --git a/qt/aqt/utils.py b/qt/aqt/utils.py
index 2002c4615..2c49b2e65 100644
--- a/qt/aqt/utils.py
+++ b/qt/aqt/utils.py
@@ -15,8 +15,10 @@ from functools import partial, wraps
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Literal, Union
 
-import aqt
 import requests
+from send2trash import send2trash
+
+import aqt
 from anki._legacy import DeprecatedNamesMixinForModule
 from anki.collection import Collection, HelpPage
 from anki.httpclient import HttpClient
@@ -30,9 +32,9 @@ from anki.utils import (
     version_with_build,
 )
 from aqt.qt import *
-from aqt.qt import QT_VERSION_STR  # noqa: F401
 from aqt.qt import (
     PYQT_VERSION_STR,
+    QT_VERSION_STR,  # noqa: F401
     QAction,
     QApplication,
     QCheckBox,
@@ -82,7 +84,6 @@ from aqt.qt import (
     traceback,
 )
 from aqt.theme import theme_manager
-from send2trash import send2trash
 
 if TYPE_CHECKING:
     TextFormat = Literal["plain", "rich", "markdown"]
@@ -1014,6 +1015,7 @@ def show_in_folder(path: str) -> None:
 def _show_in_folder_win32(path: str) -> None:
     import win32con
     import win32gui
+
     from aqt import mw
 
     def focus_explorer():
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index b0bd2bc3a..3bef364b9 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -91,7 +91,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     const [onContextMenu, contextMenuItems] = setupContextMenu();
     let contextMenuInput: EditingInputAPI | null = null;
 
-
     function quoteFontFamily(fontFamily: string): string {
         // generic families (e.g. sans-serif) must not be quoted
         if (!/^[-a-z]+$/.test(fontFamily)) {

From 1f002134fe0dabcb7ade0d542b93f6aa8fc47e95 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Mon, 30 Jun 2025 11:50:00 +0300
Subject: [PATCH 065/133] Add a basic fieldsAreBlank()

---
 proto/anki/frontend.proto          |  1 +
 qt/aqt/addcards.py                 | 30 ++++++++++++++++++------------
 qt/aqt/mediasrv.py                 | 16 ++++++++++++++++
 ts/routes/editor/NoteEditor.svelte | 16 ++++++++++++++++
 4 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/proto/anki/frontend.proto b/proto/anki/frontend.proto
index 0974913ec..60a82b845 100644
--- a/proto/anki/frontend.proto
+++ b/proto/anki/frontend.proto
@@ -38,6 +38,7 @@ service FrontendService {
   rpc OpenMedia(generic.String) returns (generic.Empty);
   rpc ShowInMediaFolder(generic.String) returns (generic.Empty);
   rpc RecordAudio(generic.Empty) returns (generic.String);
+  rpc CloseAddCards(generic.Bool) returns (generic.Empty);
 
   // Profile config
   rpc GetProfileConfigJson(generic.String) returns (generic.Json);
diff --git a/qt/aqt/addcards.py b/qt/aqt/addcards.py
index f1b1cdbcf..b4319d038 100644
--- a/qt/aqt/addcards.py
+++ b/qt/aqt/addcards.py
@@ -34,6 +34,7 @@ class AddCards(QMainWindow):
     def __init__(self, mw: AnkiQt) -> None:
         super().__init__(None, Qt.WindowType.Window)
         self._close_event_has_cleaned_up = False
+        self._close_callback: Callable[[], None] | None = None
         self.mw = mw
         self.col = mw.col
         form = aqt.forms.addcards.Ui_Dialog()
@@ -249,21 +250,26 @@ class AddCards(QMainWindow):
         self.close()
 
     def ifCanClose(self, onOk: Callable) -> None:
+        self._close_callback = onOk
+        self.editor.web.eval("closeAddCards()")
+
+    def _close_if_user_wants_to_discard_changes(self, is_empty: bool) -> None:
+        if is_empty:
+            self._close_callback()
+            return
+
         def callback(choice: int) -> None:
             if choice == 0:
-                onOk()
+                self._close_callback()
 
-        def afterSave() -> None:
-            ask_user_dialog(
-                tr.adding_discard_current_input(),
-                callback=callback,
-                buttons=[
-                    QMessageBox.StandardButton.Discard,
-                    (tr.adding_keep_editing(), QMessageBox.ButtonRole.RejectRole),
-                ],
-            )
-
-        self.editor.call_after_note_saved(afterSave)
+        ask_user_dialog(
+            tr.adding_discard_current_input(),
+            callback=callback,
+            buttons=[
+                QMessageBox.StandardButton.Discard,
+                (tr.adding_keep_editing(), QMessageBox.ButtonRole.RejectRole),
+            ],
+        )
 
     def closeWithCallback(self, cb: Callable[[], None]) -> None:
         def doClose() -> None:
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index 21ab8ad68..e4c1b256d 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -791,6 +791,21 @@ def write_clipboard() -> bytes:
     return b""
 
 
+def close_add_cards() -> bytes:
+    req = generic_pb2.Bool()
+    req.ParseFromString(request.data)
+
+    def handle_on_main() -> None:
+        from aqt.addcards import AddCards
+
+        window = aqt.mw.app.activeWindow()
+        if isinstance(window, AddCards):
+            window._close_if_user_wants_to_discard_changes(req.val)
+
+    aqt.mw.taskman.run_on_main(lambda: QTimer.singleShot(0, handle_on_main))
+    return b""
+
+
 post_handler_list = [
     congrats_info,
     get_deck_configs_for_update,
@@ -820,6 +835,7 @@ post_handler_list = [
     record_audio,
     read_clipboard,
     write_clipboard,
+    close_add_cards,
 ]
 
 
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 3bef364b9..7b9f42688 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -370,6 +370,20 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         saveFieldNow();
     }
 
+    // TODO this needs to accept a previousNote arg
+    async function fieldsAreBlank(): Promise<boolean> {
+        const result = await noteFieldsCheck(note!);
+        if (result.state === NoteFieldsCheckResponse_State.EMPTY) {
+            return true;
+        }
+        return false;
+    }
+
+    async function closeAddCards() {
+        saveNow();
+        await closeAddCardsBackend({ val: await fieldsAreBlank() });
+    }
+
     export function saveOnPageHide() {
         if (document.visibilityState === "hidden") {
             // will fire on session close and minimize
@@ -559,6 +573,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         addNote,
         addMediaFromPath,
         updateNotetype,
+        closeAddCards as closeAddCardsBackend,
     } from "@generated/backend";
     import { wrapInternal } from "@tslib/wrap";
     import { getProfileConfig, getMeta, setMeta, getColConfig } from "@tslib/profile";
@@ -925,6 +940,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             setBackgrounds,
             setClozeHint,
             saveNow,
+            closeAddCards,
             focusIfField,
             setNotetypeMeta,
             wrap,

From 966801fbe77a81cdad60dcda4b8fc80457adc023 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 3 Jul 2025 07:25:16 +0300
Subject: [PATCH 066/133] Fix misaligned sticky badge

---
 ts/routes/editor/StickyBadge.svelte | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ts/routes/editor/StickyBadge.svelte b/ts/routes/editor/StickyBadge.svelte
index 45560a1ce..0615665a8 100644
--- a/ts/routes/editor/StickyBadge.svelte
+++ b/ts/routes/editor/StickyBadge.svelte
@@ -55,12 +55,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     <Badge
         tooltip="{tr.editingToggleSticky()} ({getPlatformString(keyCombination)})"
         widthMultiplier={0.7}
-    ></Badge>
-    {#if active}
-        <Icon icon={stickyIconSolid} />
-    {:else}
-        <Icon icon={stickyIconHollow} />
-    {/if}
+    >
+        {#if active}
+            <Icon icon={stickyIconSolid} />
+        {:else}
+            <Icon icon={stickyIconHollow} />
+        {/if}
+    </Badge>
 </span>
 
 <style lang="scss">

From 5a7832b16d6e96a3fedd31fd1be78f4832a57ce7 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 3 Jul 2025 07:44:30 +0300
Subject: [PATCH 067/133] Rewrite empty check

---
 qt/aqt/addcards.py                 |  4 ++--
 ts/routes/editor/NoteEditor.svelte | 26 ++++++++++++++++++++------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/qt/aqt/addcards.py b/qt/aqt/addcards.py
index b4319d038..133bfb42b 100644
--- a/qt/aqt/addcards.py
+++ b/qt/aqt/addcards.py
@@ -253,8 +253,8 @@ class AddCards(QMainWindow):
         self._close_callback = onOk
         self.editor.web.eval("closeAddCards()")
 
-    def _close_if_user_wants_to_discard_changes(self, is_empty: bool) -> None:
-        if is_empty:
+    def _close_if_user_wants_to_discard_changes(self, prompt: bool) -> None:
+        if not prompt:
             self._close_callback()
             return
 
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 7b9f42688..9ea23807a 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -370,18 +370,31 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         saveFieldNow();
     }
 
-    // TODO this needs to accept a previousNote arg
-    async function fieldsAreBlank(): Promise<boolean> {
-        const result = await noteFieldsCheck(note!);
-        if (result.state === NoteFieldsCheckResponse_State.EMPTY) {
-            return true;
+    // Used for detecting changed sticky fields on close
+    let lastAddedNote: Note | null = null;
+
+    async function shouldPromptBeforeClosing(): Promise<boolean> {
+        const brPattern = /<br\s*\/?>/gi;
+        for (let c = 0; c < note.fields.length; c++) {
+            const field = note.fields[c].replace(brPattern, "").trim();
+            const notChangedValues = new Set(["", "<br>"]);
+            if (lastAddedNote && stickies[c]) {
+                const previousFieldValue = lastAddedNote.fields[c]
+                    .replace(brPattern, "")
+                    .trim();
+                notChangedValues.add(previousFieldValue);
+            }
+            if (!notChangedValues.has(field)) {
+                return true;
+            }
         }
+
         return false;
     }
 
     async function closeAddCards() {
         saveNow();
-        await closeAddCardsBackend({ val: await fieldsAreBlank() });
+        await closeAddCardsBackend({ val: await shouldPromptBeforeClosing() });
     }
 
     export function saveOnPageHide() {
@@ -443,6 +456,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             note: note!,
             deckId,
         });
+        lastAddedNote = note;
         await loadNewNote();
     }
 

From dbd8737f0ad97bec5abd925c3d373802c20fdc43 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 3 Jul 2025 10:58:30 +0300
Subject: [PATCH 068/133] Fix undo ops of add_note/update_notetype

---
 proto/anki/frontend.proto           |  3 +++
 qt/aqt/mediasrv.py                  | 24 ++++++++++++++++++------
 ts/routes/editor/NoteEditor.svelte  |  8 ++++----
 ts/routes/editor/StickyBadge.svelte |  4 ++--
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/proto/anki/frontend.proto b/proto/anki/frontend.proto
index 60a82b845..f1156a21d 100644
--- a/proto/anki/frontend.proto
+++ b/proto/anki/frontend.proto
@@ -11,6 +11,7 @@ import "anki/scheduler.proto";
 import "anki/generic.proto";
 import "anki/search.proto";
 import "anki/notes.proto";
+import "anki/notetypes.proto";
 
 service FrontendService {
   // Returns values from the reviewer
@@ -31,6 +32,8 @@ service FrontendService {
 
   // Editor
   rpc EditorUpdateNote(notes.UpdateNotesRequest) returns (generic.Empty);
+  rpc EditorUpdateNotetype(notetypes.Notetype) returns (generic.Empty);
+  rpc EditorAddNote(notes.AddNoteRequest) returns (generic.Empty);
   rpc ConvertPastedImage(ConvertPastedImageRequest)
       returns (ConvertPastedImageResponse);
   rpc RetrieveUrl(generic.String) returns (RetrieveUrlResponse);
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index e4c1b256d..4bf6578f0 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -602,14 +602,14 @@ def deck_options_ready() -> bytes:
     return b""
 
 
-def editor_update_note() -> bytes:
-    from aqt.editor import Editor
-
-    output = raw_backend_request("update_notes")()
+def editor_op_changes_request(endpoint: str) -> bytes:
+    output = raw_backend_request(endpoint)()
     response = OpChanges()
     response.ParseFromString(output)
 
     def handle_on_main() -> None:
+        from aqt.editor import Editor
+
         handler = aqt.mw.app.activeWindow()
         if handler and isinstance(getattr(handler, "editor", None), Editor):
             handler = handler.editor  # type: ignore
@@ -620,6 +620,18 @@ def editor_update_note() -> bytes:
     return output
 
 
+def editor_update_note() -> bytes:
+    return editor_op_changes_request("update_notes")
+
+
+def editor_update_notetype() -> bytes:
+    return editor_op_changes_request("update_notetype")
+
+
+def editor_add_note() -> bytes:
+    return editor_op_changes_request("add_note")
+
+
 def get_setting_json(getter: Callable[[str], Any]) -> bytes:
     req = generic_pb2.String()
     req.ParseFromString(request.data)
@@ -822,6 +834,8 @@ post_handler_list = [
     deck_options_require_close,
     deck_options_ready,
     editor_update_note,
+    editor_update_notetype,
+    editor_add_note,
     get_profile_config_json,
     set_profile_config_json,
     get_meta_json,
@@ -854,13 +868,11 @@ exposed_backend_list = [
     "get_note",
     "new_note",
     "note_fields_check",
-    "add_note",
     # NotetypesService
     "get_notetype",
     "get_notetype_names",
     "get_change_notetype_info",
     "get_cloze_field_ords",
-    "update_notetype",
     # StatsService
     "card_stats",
     "get_review_logs",
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 9ea23807a..e4f768b78 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -225,7 +225,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             }
             values.push(field.config!.sticky);
         }
-        await updateNotetype(notetype);
+        await editorUpdateNotetype(notetype);
         setSticky(values);
     }
 
@@ -452,7 +452,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         if (!(await noteCanBeAdded())) {
             return;
         }
-        await addNote({
+        await editorAddNote({
             note: note!,
             deckId,
         });
@@ -584,9 +584,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         editorUpdateNote,
         decodeIriPaths,
         noteFieldsCheck,
-        addNote,
+        editorAddNote,
         addMediaFromPath,
-        updateNotetype,
+        editorUpdateNotetype,
         closeAddCards as closeAddCardsBackend,
     } from "@generated/backend";
     import { wrapInternal } from "@tslib/wrap";
diff --git a/ts/routes/editor/StickyBadge.svelte b/ts/routes/editor/StickyBadge.svelte
index 0615665a8..c9bf5f355 100644
--- a/ts/routes/editor/StickyBadge.svelte
+++ b/ts/routes/editor/StickyBadge.svelte
@@ -15,7 +15,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     import { context as editorFieldContext } from "./EditorField.svelte";
     import type { Note } from "@generated/anki/notes_pb";
-    import { getNotetype, updateNotetype } from "@generated/backend";
+    import { getNotetype, editorUpdateNotetype } from "@generated/backend";
 
     const animated = !document.body.classList.contains("reduce-motion");
 
@@ -32,7 +32,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         active = !active;
         const notetype = await getNotetype({ ntid: note.notetypeId });
         notetype.fields[index].config!.sticky = active;
-        await updateNotetype(notetype);
+        await editorUpdateNotetype(notetype);
     }
 
     function shortcut(target: HTMLElement): () => void {

From d0bb1ffd9a99515bb9706a11aeadc72a7bb12d56 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 3 Jul 2025 11:03:03 +0300
Subject: [PATCH 069/133] Tweak naming

---
 proto/anki/frontend.proto           |  6 +++---
 qt/aqt/mediasrv.py                  | 12 ++++++------
 ts/routes/editor/NoteEditor.svelte  | 12 ++++++------
 ts/routes/editor/StickyBadge.svelte |  4 ++--
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/proto/anki/frontend.proto b/proto/anki/frontend.proto
index f1156a21d..f7557cd23 100644
--- a/proto/anki/frontend.proto
+++ b/proto/anki/frontend.proto
@@ -31,9 +31,9 @@ service FrontendService {
   rpc deckOptionsReady(generic.Empty) returns (generic.Empty);
 
   // Editor
-  rpc EditorUpdateNote(notes.UpdateNotesRequest) returns (generic.Empty);
-  rpc EditorUpdateNotetype(notetypes.Notetype) returns (generic.Empty);
-  rpc EditorAddNote(notes.AddNoteRequest) returns (generic.Empty);
+  rpc UpdateEditorNote(notes.UpdateNotesRequest) returns (generic.Empty);
+  rpc UpdateEditorNotetype(notetypes.Notetype) returns (generic.Empty);
+  rpc AddEditorNote(notes.AddNoteRequest) returns (generic.Empty);
   rpc ConvertPastedImage(ConvertPastedImageRequest)
       returns (ConvertPastedImageResponse);
   rpc RetrieveUrl(generic.String) returns (RetrieveUrlResponse);
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index 4bf6578f0..1f9f1ad29 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -620,15 +620,15 @@ def editor_op_changes_request(endpoint: str) -> bytes:
     return output
 
 
-def editor_update_note() -> bytes:
+def update_editor_note() -> bytes:
     return editor_op_changes_request("update_notes")
 
 
-def editor_update_notetype() -> bytes:
+def update_editor_notetype() -> bytes:
     return editor_op_changes_request("update_notetype")
 
 
-def editor_add_note() -> bytes:
+def add_editor_note() -> bytes:
     return editor_op_changes_request("add_note")
 
 
@@ -833,9 +833,9 @@ post_handler_list = [
     search_in_browser,
     deck_options_require_close,
     deck_options_ready,
-    editor_update_note,
-    editor_update_notetype,
-    editor_add_note,
+    update_editor_note,
+    update_editor_notetype,
+    add_editor_note,
     get_profile_config_json,
     set_profile_config_json,
     get_meta_json,
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index e4f768b78..34fae2c46 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -225,7 +225,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             }
             values.push(field.config!.sticky);
         }
-        await editorUpdateNotetype(notetype);
+        await updateEditorNotetype(notetype);
         setSticky(values);
     }
 
@@ -343,7 +343,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     async function updateCurrentNote() {
         if (mode !== "add") {
-            await editorUpdateNote({
+            await updateEditorNote({
                 notes: [note!],
                 skipUndoEntry: false,
             });
@@ -452,7 +452,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         if (!(await noteCanBeAdded())) {
             return;
         }
-        await editorAddNote({
+        await addEditorNote({
             note: note!,
             deckId,
         });
@@ -581,12 +581,12 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         getNotetype,
         encodeIriPaths,
         newNote,
-        editorUpdateNote,
+        updateEditorNote,
         decodeIriPaths,
         noteFieldsCheck,
-        editorAddNote,
+        addEditorNote,
         addMediaFromPath,
-        editorUpdateNotetype,
+        updateEditorNotetype,
         closeAddCards as closeAddCardsBackend,
     } from "@generated/backend";
     import { wrapInternal } from "@tslib/wrap";
diff --git a/ts/routes/editor/StickyBadge.svelte b/ts/routes/editor/StickyBadge.svelte
index c9bf5f355..426600ba5 100644
--- a/ts/routes/editor/StickyBadge.svelte
+++ b/ts/routes/editor/StickyBadge.svelte
@@ -15,7 +15,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     import { context as editorFieldContext } from "./EditorField.svelte";
     import type { Note } from "@generated/anki/notes_pb";
-    import { getNotetype, editorUpdateNotetype } from "@generated/backend";
+    import { getNotetype, updateEditorNotetype } from "@generated/backend";
 
     const animated = !document.body.classList.contains("reduce-motion");
 
@@ -32,7 +32,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         active = !active;
         const notetype = await getNotetype({ ntid: note.notetypeId });
         notetype.fields[index].config!.sticky = active;
-        await editorUpdateNotetype(notetype);
+        await updateEditorNotetype(notetype);
     }
 
     function shortcut(target: HTMLElement): () => void {

From 01fd4df9cbd1f456fe6093e601e91c9173ebbf3a Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 9 Jul 2025 04:47:03 +0300
Subject: [PATCH 070/133] Replace svelte-contextmenu with a custom
 implementation

Keyboard navigation is to be handled.
---
 package.json                            |  3 +-
 ts/lib/context-menu/ContextMenu.svelte  | 82 +++++++++++++++++++++++++
 ts/lib/context-menu/Item.svelte         | 33 ++++++++++
 ts/lib/context-menu/index.ts            |  6 ++
 ts/lib/context-menu/types.ts            | 12 ++++
 ts/routes/editor/NoteEditor.svelte      |  4 +-
 ts/routes/editor/context-menu.svelte.ts |  6 +-
 yarn.lock                               |  8 ---
 8 files changed, 138 insertions(+), 16 deletions(-)
 create mode 100644 ts/lib/context-menu/ContextMenu.svelte
 create mode 100644 ts/lib/context-menu/Item.svelte
 create mode 100644 ts/lib/context-menu/index.ts
 create mode 100644 ts/lib/context-menu/types.ts

diff --git a/package.json b/package.json
index fc0a6e1b3..9f12133db 100644
--- a/package.json
+++ b/package.json
@@ -77,8 +77,7 @@
         "lodash-es": "^4.17.21",
         "lru-cache": "^10.2.0",
         "marked": "^5.1.0",
-        "mathjax": "^3.1.2",
-        "svelte-contextmenu": "^1.0.2"
+        "mathjax": "^3.1.2"
     },
     "resolutions": {
         "canvas": "npm:empty-npm-package@1.0.0",
diff --git a/ts/lib/context-menu/ContextMenu.svelte b/ts/lib/context-menu/ContextMenu.svelte
new file mode 100644
index 000000000..4fe5da6a2
--- /dev/null
+++ b/ts/lib/context-menu/ContextMenu.svelte
@@ -0,0 +1,82 @@
+<!-- Copyright: Ankitects Pty Ltd and contributors -->
+<!-- License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html -->
+
+<script lang="ts">
+    import { tick } from "svelte";
+    import type { ContextMenuMouseEvent } from "./types";
+
+    let visible = $state(false);
+    let x = $state(0);
+    let y = $state(0);
+    let contextMenuElement = $state<HTMLDivElement>();
+
+    const { children } = $props();
+
+    export async function show(event: ContextMenuMouseEvent) {
+        event.preventDefault();
+
+        x = event.clientX;
+        y = event.clientY;
+        visible = true;
+
+        await tick();
+        const rect = contextMenuElement!.getBoundingClientRect();
+        const viewportWidth = window.innerWidth;
+        const viewportHeight = window.innerHeight;
+
+        if (x + rect.width > viewportWidth) {
+            x = viewportWidth - rect.width;
+        }
+        if (y + rect.height > viewportHeight) {
+            y = viewportHeight - rect.height;
+        }
+
+        x = Math.max(0, x);
+        y = Math.max(0, y);
+    }
+
+    function hide() {
+        visible = false;
+    }
+
+    function handleClickOutside(event: MouseEvent) {
+        if (
+            visible &&
+            contextMenuElement &&
+            !contextMenuElement.contains(event.target as Node)
+        ) {
+            hide();
+        }
+    }
+</script>
+
+<svelte:document on:click={handleClickOutside} />
+
+{#if visible}
+    <div
+        bind:this={contextMenuElement}
+        class="context-menu"
+        style="left: {x}px; top: {y}px;"
+        role="menu"
+        tabindex="0"
+        onclick={hide}
+        onkeydown={hide}
+    >
+        {@render children?.()}
+    </div>
+{/if}
+
+<style lang="scss">
+    .context-menu {
+        position: fixed;
+        background: var(--canvas);
+        border: 1px solid var(--border);
+        border-radius: 4px;
+        box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+        padding: 4px 0;
+        min-width: 120px;
+        z-index: 1000;
+        font-size: 13px;
+        outline: none;
+    }
+</style>
diff --git a/ts/lib/context-menu/Item.svelte b/ts/lib/context-menu/Item.svelte
new file mode 100644
index 000000000..333cb3453
--- /dev/null
+++ b/ts/lib/context-menu/Item.svelte
@@ -0,0 +1,33 @@
+<!-- Copyright: Ankitects Pty Ltd and contributors -->
+<!-- License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html -->
+
+<script lang="ts">
+    const { click, children } = $props();
+</script>
+
+<div
+    class="context-menu-item"
+    onclick={click}
+    onkeydown={click}
+    role="menuitem"
+    tabindex="-1"
+>
+    {@render children?.()}
+</div>
+
+<style lang="scss">
+    .context-menu-item {
+        padding: 8px 16px;
+        cursor: pointer;
+        user-select: none;
+        white-space: nowrap;
+
+        &:hover {
+            background-color: var(--highlight-bg);
+        }
+
+        &:active {
+            background-color: var(--highlight-bg);
+        }
+    }
+</style>
diff --git a/ts/lib/context-menu/index.ts b/ts/lib/context-menu/index.ts
new file mode 100644
index 000000000..b6b85d6ce
--- /dev/null
+++ b/ts/lib/context-menu/index.ts
@@ -0,0 +1,6 @@
+// Copyright: Ankitects Pty Ltd and contributors
+// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+
+export { default as ContextMenu } from "./ContextMenu.svelte";
+export { default as Item } from "./Item.svelte";
+export type { ContextMenuAPI, ContextMenuMouseEvent } from "./types";
diff --git a/ts/lib/context-menu/types.ts b/ts/lib/context-menu/types.ts
new file mode 100644
index 000000000..d48405874
--- /dev/null
+++ b/ts/lib/context-menu/types.ts
@@ -0,0 +1,12 @@
+// Copyright: Ankitects Pty Ltd and contributors
+// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+
+export interface ContextMenuMouseEvent {
+    clientX: number;
+    clientY: number;
+    preventDefault(): void;
+}
+
+export interface ContextMenuAPI {
+    show(event: ContextMenuMouseEvent): void;
+}
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 34fae2c46..14ae874ca 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -14,7 +14,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import LabelContainer from "./LabelContainer.svelte";
     import LabelName from "./LabelName.svelte";
     import { EditorState, type EditorMode } from "./types";
-    import ContextMenu, { Item } from "svelte-contextmenu";
+    import { ContextMenu, Item } from "$lib/context-menu";
 
     export interface NoteEditorAPI {
         fields: EditorFieldAPI[];
@@ -1226,7 +1226,7 @@ components and functionality for general note editing.
     <ContextMenu bind:this={contextMenu}>
         {#each contextMenuItems as item}
             <Item
-                on:click={() => {
+                click={() => {
                     item.action();
                     contextMenuInput?.focus();
                 }}
diff --git a/ts/routes/editor/context-menu.svelte.ts b/ts/routes/editor/context-menu.svelte.ts
index 8c2c17c8c..51cd7e35a 100644
--- a/ts/routes/editor/context-menu.svelte.ts
+++ b/ts/routes/editor/context-menu.svelte.ts
@@ -1,12 +1,12 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
+import type { ContextMenu, ContextMenuMouseEvent } from "$lib/context-menu";
+
 import { openMedia, showInMediaFolder } from "@generated/backend";
 import * as tr from "@generated/ftl";
 import { bridgeCommand } from "@tslib/bridgecommand";
 import { getSelection } from "@tslib/cross-browser";
-import type ContextMenu from "svelte-contextmenu";
-import type { ContextMenuMouseEvent } from "svelte-contextmenu/ContextMenuMouseEvent";
 import { get } from "svelte/store";
 import type { EditingInputAPI } from "./EditingArea.svelte";
 import type { NoteEditorAPI } from "./NoteEditor.svelte";
@@ -114,8 +114,6 @@ export function setupContextMenu(): [
         if (contextMenuItems.length > 0) {
             contextMenu?.show(event);
         }
-
-        event.preventDefault();
     }
 
     return [onContextMenu, contextMenuItems];
diff --git a/yarn.lock b/yarn.lock
index b19f7d2d0..d898d28c9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1761,7 +1761,6 @@ __metadata:
     sass: "npm:<1.77"
     svelte: "npm:^5.34.9"
     svelte-check: "npm:^4.2.2"
-    svelte-contextmenu: "npm:^1.0.2"
     svelte-preprocess: "npm:^6.0.3"
     svelte-preprocess-esbuild: "npm:^3.0.1"
     svgo: "npm:^3.2.0"
@@ -6229,13 +6228,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"svelte-contextmenu@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "svelte-contextmenu@npm:1.0.2"
-  checksum: 10c0/33cf79540337862278927f4b732b5d97f2c029348666ebcd3105b5c08bed54498a1d66f61b0212c18c204942cf54c9f6ce5ed509981d9f19f99f9334d8961cdf
-  languageName: node
-  linkType: hard
-
 "svelte-eslint-parser@npm:^0.43.0":
   version: 0.43.0
   resolution: "svelte-eslint-parser@npm:0.43.0"

From a8a2e4ee32613de3b646a9bf73fee9d7d17e7b93 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 9 Jul 2025 05:32:46 +0300
Subject: [PATCH 071/133] Implement close button

---
 proto/anki/frontend.proto             |  1 +
 qt/aqt/addcards.py                    |  2 +-
 qt/aqt/editcurrent.py                 |  6 -----
 qt/aqt/forms/editcurrent.ui           | 28 -----------------------
 qt/aqt/mediasrv.py                    | 14 ++++++++++++
 ts/routes/editor/ActionButtons.svelte | 23 +++++++++++++++++++
 ts/routes/editor/CloseButton.svelte   | 32 +++++++++++++++++++++++++++
 ts/routes/editor/NoteEditor.svelte    | 16 ++++++++++++++
 8 files changed, 87 insertions(+), 35 deletions(-)
 create mode 100644 ts/routes/editor/ActionButtons.svelte
 create mode 100644 ts/routes/editor/CloseButton.svelte

diff --git a/proto/anki/frontend.proto b/proto/anki/frontend.proto
index f7557cd23..021322383 100644
--- a/proto/anki/frontend.proto
+++ b/proto/anki/frontend.proto
@@ -42,6 +42,7 @@ service FrontendService {
   rpc ShowInMediaFolder(generic.String) returns (generic.Empty);
   rpc RecordAudio(generic.Empty) returns (generic.String);
   rpc CloseAddCards(generic.Bool) returns (generic.Empty);
+  rpc CloseEditCurrent(generic.Empty) returns (generic.Empty);
 
   // Profile config
   rpc GetProfileConfigJson(generic.String) returns (generic.Json);
diff --git a/qt/aqt/addcards.py b/qt/aqt/addcards.py
index 133bfb42b..3b0421b30 100644
--- a/qt/aqt/addcards.py
+++ b/qt/aqt/addcards.py
@@ -34,7 +34,7 @@ class AddCards(QMainWindow):
     def __init__(self, mw: AnkiQt) -> None:
         super().__init__(None, Qt.WindowType.Window)
         self._close_event_has_cleaned_up = False
-        self._close_callback: Callable[[], None] | None = None
+        self._close_callback: Callable[[], None] = self._close
         self.mw = mw
         self.col = mw.col
         form = aqt.forms.addcards.Ui_Dialog()
diff --git a/qt/aqt/editcurrent.py b/qt/aqt/editcurrent.py
index d8007c75c..4cd8dcb0c 100644
--- a/qt/aqt/editcurrent.py
+++ b/qt/aqt/editcurrent.py
@@ -32,13 +32,7 @@ class EditCurrent(QMainWindow):
         self.editor.card = self.mw.reviewer.card
         self.editor.set_note(self.mw.reviewer.card.note(), focusTo=0)
         restoreGeom(self, "editcurrent")
-        close_button = self.form.buttonBox.button(QDialogButtonBox.StandardButton.Close)
-        assert close_button is not None
-        close_button.setShortcut(QKeySequence("Ctrl+Return"))
         add_close_shortcut(self)
-        # qt5.14+ doesn't handle numpad enter on Windows
-        self.compat_add_shorcut = QShortcut(QKeySequence("Ctrl+Enter"), self)
-        qconnect(self.compat_add_shorcut.activated, close_button.click)
         gui_hooks.operation_did_execute.append(self.on_operation_did_execute)
         self.show()
 
diff --git a/qt/aqt/forms/editcurrent.ui b/qt/aqt/forms/editcurrent.ui
index 14ecd21fa..d2102e306 100644
--- a/qt/aqt/forms/editcurrent.ui
+++ b/qt/aqt/forms/editcurrent.ui
@@ -28,16 +28,6 @@
     <item>
       <widget class="QWidget" name="fieldsArea" native="true"/>
     </item>
-    <item>
-      <widget class="QDialogButtonBox" name="buttonBox">
-      <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="standardButtons">
-        <set>QDialogButtonBox::Close</set>
-      </property>
-      </widget>
-    </item>
     </layout>
   </widget>
   <widget class="QMenuBar" name="menubar">
@@ -60,22 +50,4 @@
  <resources>
   <include location="icons.qrc"/>
  </resources>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>Dialog</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
 </ui>
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index 35ae517e0..1bc7cce8b 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -818,6 +818,18 @@ def close_add_cards() -> bytes:
     return b""
 
 
+def close_edit_current() -> bytes:
+    def handle_on_main() -> None:
+        from aqt.editcurrent import EditCurrent
+
+        window = aqt.mw.app.activeWindow()
+        if isinstance(window, EditCurrent):
+            window.close()
+
+    aqt.mw.taskman.run_on_main(lambda: QTimer.singleShot(0, handle_on_main))
+    return b""
+
+
 post_handler_list = [
     congrats_info,
     get_deck_configs_for_update,
@@ -850,6 +862,7 @@ post_handler_list = [
     read_clipboard,
     write_clipboard,
     close_add_cards,
+    close_edit_current,
 ]
 
 
@@ -1048,3 +1061,4 @@ def _extract_dynamic_get_request(path: str) -> DynamicRequest | None:
         return legacy_page_data
     else:
         return None
+        return None
diff --git a/ts/routes/editor/ActionButtons.svelte b/ts/routes/editor/ActionButtons.svelte
new file mode 100644
index 000000000..9dfa8cbe9
--- /dev/null
+++ b/ts/routes/editor/ActionButtons.svelte
@@ -0,0 +1,23 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+<script lang="ts">
+    import CloseButton from "./CloseButton.svelte";
+    import type { EditorMode } from "./types";
+
+    export let mode: EditorMode;
+    export let onClose: () => void;
+</script>
+
+<div class="action-buttons d-flex flex-row-reverse">
+    {#if mode === "add" || mode === "current"}
+        <CloseButton {onClose} />
+    {/if}
+</div>
+
+<style lang="scss">
+    .action-buttons {
+        margin-top: 10px;
+    }
+</style>
diff --git a/ts/routes/editor/CloseButton.svelte b/ts/routes/editor/CloseButton.svelte
new file mode 100644
index 000000000..824f1adcf
--- /dev/null
+++ b/ts/routes/editor/CloseButton.svelte
@@ -0,0 +1,32 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+<script lang="ts">
+    import * as tr from "@generated/ftl";
+    import { getPlatformString } from "@tslib/shortcuts";
+    import LabelButton from "$lib/components/LabelButton.svelte";
+    import Shortcut from "$lib/components/Shortcut.svelte";
+
+    const rtl: boolean = window.getComputedStyle(document.body).direction == "rtl";
+
+    export let onClose: () => void;
+    const closeKeyCombination = "Control+Enter";
+</script>
+
+<LabelButton
+    primary
+    on:click={onClose}
+    tooltip={getPlatformString(closeKeyCombination)}
+    --border-left-radius={!rtl ? "var(--border-radius)" : "0"}
+    --border-right-radius={rtl ? "var(--border-radius)" : "0"}
+>
+    <div class="close">{tr.actionsClose()}</div>
+</LabelButton>
+<Shortcut keyCombination={closeKeyCombination} on:action={onClose} />
+
+<style lang="scss">
+    .close {
+        margin: 0 0.75rem;
+    }
+</style>
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 14ae874ca..0eb4de744 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -397,6 +397,19 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         await closeAddCardsBackend({ val: await shouldPromptBeforeClosing() });
     }
 
+    async function closeEditCurrent() {
+        saveNow();
+        await closeEditCurrentBackend({});
+    }
+
+    async function onClose() {
+        if (mode === "add") {
+            await closeAddCards();
+        } else if (mode == "current") {
+            await closeEditCurrent();
+        }
+    }
+
     export function saveOnPageHide() {
         if (document.visibilityState === "hidden") {
             // will fire on session close and minimize
@@ -588,6 +601,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         addMediaFromPath,
         updateEditorNotetype,
         closeAddCards as closeAddCardsBackend,
+        closeEditCurrent as closeEditCurrentBackend,
     } from "@generated/backend";
     import { wrapInternal } from "@tslib/wrap";
     import { getProfileConfig, getMeta, setMeta, getColConfig } from "@tslib/profile";
@@ -611,6 +625,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { NoteFieldsCheckResponse_State, type Note } from "@generated/anki/notes_pb";
     import { setupContextMenu } from "./context-menu.svelte";
     import { registerShortcut } from "@tslib/shortcuts";
+    import ActionButtons from "./ActionButtons.svelte";
 
     $: isIOImageLoaded = false;
     $: ioImageLoadedStore.set(isIOImageLoaded);
@@ -1221,6 +1236,7 @@ components and functionality for general note editing.
         <Collapsible toggleDisplay collapse={$tagsCollapsed}>
             <TagEditor {tags} on:tagsupdate={saveTags} />
         </Collapsible>
+        <ActionButtons {mode} {onClose} />
     {/if}
 
     <ContextMenu bind:this={contextMenu}>

From c2374dcc24fa23642e7f0b4d29890d6e3b0c47ac Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 9 Jul 2025 06:26:58 +0300
Subject: [PATCH 072/133] Implement help button

---
 proto/anki/frontend.proto             |  1 +
 qt/aqt/mediasrv.py                    | 13 ++++++++++-
 ts/lib/tslib/help-page.ts             |  3 +++
 ts/routes/editor/ActionButton.svelte  | 32 +++++++++++++++++++++++++++
 ts/routes/editor/ActionButtons.svelte |  4 ++++
 ts/routes/editor/CloseButton.svelte   | 24 +++++---------------
 ts/routes/editor/HelpButton.svelte    | 23 +++++++++++++++++++
 7 files changed, 80 insertions(+), 20 deletions(-)
 create mode 100644 ts/routes/editor/ActionButton.svelte
 create mode 100644 ts/routes/editor/HelpButton.svelte

diff --git a/proto/anki/frontend.proto b/proto/anki/frontend.proto
index 021322383..17090fe1e 100644
--- a/proto/anki/frontend.proto
+++ b/proto/anki/frontend.proto
@@ -43,6 +43,7 @@ service FrontendService {
   rpc RecordAudio(generic.Empty) returns (generic.String);
   rpc CloseAddCards(generic.Bool) returns (generic.Empty);
   rpc CloseEditCurrent(generic.Empty) returns (generic.Empty);
+  rpc OpenLink(generic.String) returns (generic.Empty);
 
   // Profile config
   rpc GetProfileConfigJson(generic.String) returns (generic.Json);
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index 1bc7cce8b..f973394a0 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -40,7 +40,7 @@ from aqt.operations import on_op_finished
 from aqt.operations.deck import update_deck_configs as update_deck_configs_op
 from aqt.progress import ProgressUpdate
 from aqt.qt import *
-from aqt.utils import aqt_data_path, show_warning, tr
+from aqt.utils import aqt_data_path, openLink, show_warning, tr
 
 # https://forums.ankiweb.net/t/anki-crash-when-using-a-specific-deck/22266
 waitress.wasyncore._DISCONNECTED = waitress.wasyncore._DISCONNECTED.union({EPROTOTYPE})  # type: ignore
@@ -830,6 +830,14 @@ def close_edit_current() -> bytes:
     return b""
 
 
+def open_link() -> bytes:
+    req = generic_pb2.String()
+    req.ParseFromString(request.data)
+    url = req.val
+    aqt.mw.taskman.run_on_main(lambda: openLink(url))
+    return b""
+
+
 post_handler_list = [
     congrats_info,
     get_deck_configs_for_update,
@@ -863,6 +871,7 @@ post_handler_list = [
     write_clipboard,
     close_add_cards,
     close_edit_current,
+    open_link,
 ]
 
 
@@ -1062,3 +1071,5 @@ def _extract_dynamic_get_request(path: str) -> DynamicRequest | None:
     else:
         return None
         return None
+        return None
+        return None
diff --git a/ts/lib/tslib/help-page.ts b/ts/lib/tslib/help-page.ts
index ff4e7e434..26363ba33 100644
--- a/ts/lib/tslib/help-page.ts
+++ b/ts/lib/tslib/help-page.ts
@@ -45,4 +45,7 @@ export const HelpPage = {
         updating: "https://docs.ankiweb.net/importing/text-files.html#duplicates-and-updating",
         html: "https://docs.ankiweb.net/importing/text-files.html#html",
     },
+    Editing: {
+        adding: "https://docs.ankiweb.net/editing.html#adding-cards-and-notes",
+    },
 };
diff --git a/ts/routes/editor/ActionButton.svelte b/ts/routes/editor/ActionButton.svelte
new file mode 100644
index 000000000..1e7826132
--- /dev/null
+++ b/ts/routes/editor/ActionButton.svelte
@@ -0,0 +1,32 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+<script lang="ts">
+    import LabelButton from "$lib/components/LabelButton.svelte";
+
+    const { children, onClick, tooltip } = $props();
+</script>
+
+<div class="action-button">
+    <LabelButton
+        primary
+        on:click={onClick}
+        {tooltip}
+        --border-left-radius="5px"
+        --border-right-radius="5px"
+    >
+        <div class="action-text">
+            {@render children()}
+        </div>
+    </LabelButton>
+</div>
+
+<style lang="scss">
+    .action-button {
+        margin-inline-end: 0.5rem;
+    }
+    .action-text {
+        margin: 0 0.75rem;
+    }
+</style>
diff --git a/ts/routes/editor/ActionButtons.svelte b/ts/routes/editor/ActionButtons.svelte
index 9dfa8cbe9..dc7196862 100644
--- a/ts/routes/editor/ActionButtons.svelte
+++ b/ts/routes/editor/ActionButtons.svelte
@@ -4,6 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
     import CloseButton from "./CloseButton.svelte";
+    import HelpButton from "./HelpButton.svelte";
     import type { EditorMode } from "./types";
 
     export let mode: EditorMode;
@@ -11,6 +12,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 </script>
 
 <div class="action-buttons d-flex flex-row-reverse">
+    {#if mode === "add"}
+        <HelpButton />
+    {/if}
     {#if mode === "add" || mode === "current"}
         <CloseButton {onClose} />
     {/if}
diff --git a/ts/routes/editor/CloseButton.svelte b/ts/routes/editor/CloseButton.svelte
index 824f1adcf..51e14f43e 100644
--- a/ts/routes/editor/CloseButton.svelte
+++ b/ts/routes/editor/CloseButton.svelte
@@ -5,28 +5,14 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 <script lang="ts">
     import * as tr from "@generated/ftl";
     import { getPlatformString } from "@tslib/shortcuts";
-    import LabelButton from "$lib/components/LabelButton.svelte";
     import Shortcut from "$lib/components/Shortcut.svelte";
-
-    const rtl: boolean = window.getComputedStyle(document.body).direction == "rtl";
+    import ActionButton from "./ActionButton.svelte";
 
     export let onClose: () => void;
     const closeKeyCombination = "Control+Enter";
 </script>
 
-<LabelButton
-    primary
-    on:click={onClose}
-    tooltip={getPlatformString(closeKeyCombination)}
-    --border-left-radius={!rtl ? "var(--border-radius)" : "0"}
-    --border-right-radius={rtl ? "var(--border-radius)" : "0"}
->
-    <div class="close">{tr.actionsClose()}</div>
-</LabelButton>
-<Shortcut keyCombination={closeKeyCombination} on:action={onClose} />
-
-<style lang="scss">
-    .close {
-        margin: 0 0.75rem;
-    }
-</style>
+<ActionButton onClick={onClose} tooltip={getPlatformString(closeKeyCombination)}>
+    {tr.actionsClose()}
+    <Shortcut keyCombination={closeKeyCombination} on:action={onClose} />
+</ActionButton>
diff --git a/ts/routes/editor/HelpButton.svelte b/ts/routes/editor/HelpButton.svelte
new file mode 100644
index 000000000..32053489f
--- /dev/null
+++ b/ts/routes/editor/HelpButton.svelte
@@ -0,0 +1,23 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+<script lang="ts">
+    import * as tr from "@generated/ftl";
+    import { HelpPage } from "@tslib/help-page";
+    import ActionButton from "./ActionButton.svelte";
+    import { getPlatformString } from "@tslib/shortcuts";
+    import Shortcut from "$lib/components/Shortcut.svelte";
+    import { openLink } from "@generated/backend";
+
+    const helpKeyCombination = "F1";
+
+    function onClick() {
+        openLink({ val: HelpPage.Editing.adding });
+    }
+</script>
+
+<ActionButton tooltip={getPlatformString(helpKeyCombination)} {onClick}>
+    {tr.actionsHelp()}
+    <Shortcut keyCombination={helpKeyCombination} on:action={onClick} />
+</ActionButton>

From 8e9cc5c382bf95a19d8f85ec313efdab1f77be8c Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 10 Jul 2025 00:14:34 +0300
Subject: [PATCH 073/133] Implement add button

---
 ts/routes/editor/ActionButtons.svelte |  7 ++++++-
 ts/routes/editor/AddButton.svelte     | 18 ++++++++++++++++++
 ts/routes/editor/CloseButton.svelte   |  8 ++++++--
 ts/routes/editor/NoteEditor.svelte    |  7 ++++++-
 4 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 ts/routes/editor/AddButton.svelte

diff --git a/ts/routes/editor/ActionButtons.svelte b/ts/routes/editor/ActionButtons.svelte
index dc7196862..30b273ff4 100644
--- a/ts/routes/editor/ActionButtons.svelte
+++ b/ts/routes/editor/ActionButtons.svelte
@@ -3,12 +3,14 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
+    import AddButton from "./AddButton.svelte";
     import CloseButton from "./CloseButton.svelte";
     import HelpButton from "./HelpButton.svelte";
     import type { EditorMode } from "./types";
 
     export let mode: EditorMode;
     export let onClose: () => void;
+    export let onAdd: () => void;
 </script>
 
 <div class="action-buttons d-flex flex-row-reverse">
@@ -16,7 +18,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         <HelpButton />
     {/if}
     {#if mode === "add" || mode === "current"}
-        <CloseButton {onClose} />
+        <CloseButton {onClose} enableShortcut={mode === "current"} />
+    {/if}
+    {#if mode === "add"}
+        <AddButton {onAdd} />
     {/if}
 </div>
 
diff --git a/ts/routes/editor/AddButton.svelte b/ts/routes/editor/AddButton.svelte
new file mode 100644
index 000000000..145e40c75
--- /dev/null
+++ b/ts/routes/editor/AddButton.svelte
@@ -0,0 +1,18 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+<script lang="ts">
+    import * as tr from "@generated/ftl";
+    import { getPlatformString } from "@tslib/shortcuts";
+    import Shortcut from "$lib/components/Shortcut.svelte";
+    import ActionButton from "./ActionButton.svelte";
+
+    export let onAdd: () => void;
+    const addKeyCombination = "Control+Enter";
+</script>
+
+<ActionButton onClick={onAdd} tooltip={getPlatformString(addKeyCombination)}>
+    {tr.actionsAdd()}
+    <Shortcut keyCombination={addKeyCombination} on:action={onAdd} />
+</ActionButton>
diff --git a/ts/routes/editor/CloseButton.svelte b/ts/routes/editor/CloseButton.svelte
index 51e14f43e..ab0038531 100644
--- a/ts/routes/editor/CloseButton.svelte
+++ b/ts/routes/editor/CloseButton.svelte
@@ -9,10 +9,14 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import ActionButton from "./ActionButton.svelte";
 
     export let onClose: () => void;
-    const closeKeyCombination = "Control+Enter";
+    export let enableShortcut: boolean;
+
+    const closeKeyCombination = enableShortcut ? "Control+Enter" : "";
 </script>
 
 <ActionButton onClick={onClose} tooltip={getPlatformString(closeKeyCombination)}>
     {tr.actionsClose()}
-    <Shortcut keyCombination={closeKeyCombination} on:action={onClose} />
+    {#if enableShortcut}
+        <Shortcut keyCombination={closeKeyCombination} on:action={onClose} />
+    {/if}
 </ActionButton>
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 0eb4de744..a25bc6d9f 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -410,6 +410,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         }
     }
 
+    async function onAdd() {
+        // TODO get selected deck
+        await addCurrentNote(1n);
+    }
+
     export function saveOnPageHide() {
         if (document.visibilityState === "hidden") {
             // will fire on session close and minimize
@@ -1236,7 +1241,7 @@ components and functionality for general note editing.
         <Collapsible toggleDisplay collapse={$tagsCollapsed}>
             <TagEditor {tags} on:tagsupdate={saveTags} />
         </Collapsible>
-        <ActionButtons {mode} {onClose} />
+        <ActionButtons {mode} {onClose} {onAdd} />
     {/if}
 
     <ContextMenu bind:this={contextMenu}>

From 6cf81965131cc81441fa59685ca21b55cf38d6c9 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 10 Jul 2025 14:05:10 +0300
Subject: [PATCH 074/133] Remove unintended change in mediasrv.py

---
 qt/aqt/mediasrv.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index f973394a0..052dac291 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -1070,6 +1070,3 @@ def _extract_dynamic_get_request(path: str) -> DynamicRequest | None:
         return legacy_page_data
     else:
         return None
-        return None
-        return None
-        return None

From 3a83958b296856ab19e048c9dfc3214269424b9a Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 10 Jul 2025 14:06:27 +0300
Subject: [PATCH 075/133] Remove old requirements.txt files

---
 python/requirements.bundle.txt | 494 -----------------------
 python/requirements.dev.txt    | 715 ---------------------------------
 2 files changed, 1209 deletions(-)
 delete mode 100644 python/requirements.bundle.txt
 delete mode 100644 python/requirements.dev.txt

diff --git a/python/requirements.bundle.txt b/python/requirements.bundle.txt
deleted file mode 100644
index 8aab16467..000000000
--- a/python/requirements.bundle.txt
+++ /dev/null
@@ -1,494 +0,0 @@
-attrs==24.2.0 \
-    --hash=sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346 \
-    --hash=sha256:81921eb96de3191c8258c199618104dd27ac608d9366f5e35d011eae1867ede2
-    # via jsonschema
-beautifulsoup4==4.12.3 \
-    --hash=sha256:74e3d1928edc070d21748185c46e3fb33490f22f52a3addee9aee0f4f7781051 \
-    --hash=sha256:b80878c9f40111313e55da8ba20bdba06d8fa3969fc68304167741bbf9e082ed
-    # via
-    #   -r requirements.anki.in
-    #   -r requirements.aqt.in
-blinker==1.8.2 \
-    --hash=sha256:1779309f71bf239144b9399d06ae925637cf6634cf6bd131104184531bf67c01 \
-    --hash=sha256:8f77b09d3bf7c795e969e9486f39c2c5e9c39d4ee07424be2bc594ece9642d83
-    # via flask
-build==1.2.1 \
-    --hash=sha256:526263f4870c26f26c433545579475377b2b7588b6f1eac76a001e873ae3e19d \
-    --hash=sha256:75e10f767a433d9a86e50d83f418e83efc18ede923ee5ff7df93b6cb0306c5d4
-    # via pip-tools
-certifi==2024.8.30 \
-    --hash=sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8 \
-    --hash=sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9
-    # via requests
-charset-normalizer==3.3.2 \
-    --hash=sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027 \
-    --hash=sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087 \
-    --hash=sha256:0a55554a2fa0d408816b3b5cedf0045f4b8e1a6065aec45849de2d6f3f8e9786 \
-    --hash=sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8 \
-    --hash=sha256:10955842570876604d404661fbccbc9c7e684caf432c09c715ec38fbae45ae09 \
-    --hash=sha256:122c7fa62b130ed55f8f285bfd56d5f4b4a5b503609d181f9ad85e55c89f4185 \
-    --hash=sha256:1ceae2f17a9c33cb48e3263960dc5fc8005351ee19db217e9b1bb15d28c02574 \
-    --hash=sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e \
-    --hash=sha256:1f79682fbe303db92bc2b1136016a38a42e835d932bab5b3b1bfcfbf0640e519 \
-    --hash=sha256:2127566c664442652f024c837091890cb1942c30937add288223dc895793f898 \
-    --hash=sha256:22afcb9f253dac0696b5a4be4a1c0f8762f8239e21b99680099abd9b2b1b2269 \
-    --hash=sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3 \
-    --hash=sha256:2e81c7b9c8979ce92ed306c249d46894776a909505d8f5a4ba55b14206e3222f \
-    --hash=sha256:3287761bc4ee9e33561a7e058c72ac0938c4f57fe49a09eae428fd88aafe7bb6 \
-    --hash=sha256:34d1c8da1e78d2e001f363791c98a272bb734000fcef47a491c1e3b0505657a8 \
-    --hash=sha256:37e55c8e51c236f95b033f6fb391d7d7970ba5fe7ff453dad675e88cf303377a \
-    --hash=sha256:3d47fa203a7bd9c5b6cee4736ee84ca03b8ef23193c0d1ca99b5089f72645c73 \
-    --hash=sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc \
-    --hash=sha256:42cb296636fcc8b0644486d15c12376cb9fa75443e00fb25de0b8602e64c1714 \
-    --hash=sha256:45485e01ff4d3630ec0d9617310448a8702f70e9c01906b0d0118bdf9d124cf2 \
-    --hash=sha256:4a78b2b446bd7c934f5dcedc588903fb2f5eec172f3d29e52a9096a43722adfc \
-    --hash=sha256:4ab2fe47fae9e0f9dee8c04187ce5d09f48eabe611be8259444906793ab7cbce \
-    --hash=sha256:4d0d1650369165a14e14e1e47b372cfcb31d6ab44e6e33cb2d4e57265290044d \
-    --hash=sha256:549a3a73da901d5bc3ce8d24e0600d1fa85524c10287f6004fbab87672bf3e1e \
-    --hash=sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6 \
-    --hash=sha256:572c3763a264ba47b3cf708a44ce965d98555f618ca42c926a9c1616d8f34269 \
-    --hash=sha256:573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96 \
-    --hash=sha256:5b4c145409bef602a690e7cfad0a15a55c13320ff7a3ad7ca59c13bb8ba4d45d \
-    --hash=sha256:6463effa3186ea09411d50efc7d85360b38d5f09b870c48e4600f63af490e56a \
-    --hash=sha256:65f6f63034100ead094b8744b3b97965785388f308a64cf8d7c34f2f2e5be0c4 \
-    --hash=sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77 \
-    --hash=sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d \
-    --hash=sha256:68d1f8a9e9e37c1223b656399be5d6b448dea850bed7d0f87a8311f1ff3dabb0 \
-    --hash=sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed \
-    --hash=sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068 \
-    --hash=sha256:6c4caeef8fa63d06bd437cd4bdcf3ffefe6738fb1b25951440d80dc7df8c03ac \
-    --hash=sha256:6ef1d82a3af9d3eecdba2321dc1b3c238245d890843e040e41e470ffa64c3e25 \
-    --hash=sha256:753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8 \
-    --hash=sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab \
-    --hash=sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26 \
-    --hash=sha256:7f04c839ed0b6b98b1a7501a002144b76c18fb1c1850c8b98d458ac269e26ed2 \
-    --hash=sha256:802fe99cca7457642125a8a88a084cef28ff0cf9407060f7b93dca5aa25480db \
-    --hash=sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f \
-    --hash=sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5 \
-    --hash=sha256:86216b5cee4b06df986d214f664305142d9c76df9b6512be2738aa72a2048f99 \
-    --hash=sha256:87d1351268731db79e0f8e745d92493ee2841c974128ef629dc518b937d9194c \
-    --hash=sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d \
-    --hash=sha256:8c622a5fe39a48f78944a87d4fb8a53ee07344641b0562c540d840748571b811 \
-    --hash=sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa \
-    --hash=sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a \
-    --hash=sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03 \
-    --hash=sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b \
-    --hash=sha256:923c0c831b7cfcb071580d3f46c4baf50f174be571576556269530f4bbd79d04 \
-    --hash=sha256:95f2a5796329323b8f0512e09dbb7a1860c46a39da62ecb2324f116fa8fdc85c \
-    --hash=sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001 \
-    --hash=sha256:9f96df6923e21816da7e0ad3fd47dd8f94b2a5ce594e00677c0013018b813458 \
-    --hash=sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389 \
-    --hash=sha256:a50aebfa173e157099939b17f18600f72f84eed3049e743b68ad15bd69b6bf99 \
-    --hash=sha256:a981a536974bbc7a512cf44ed14938cf01030a99e9b3a06dd59578882f06f985 \
-    --hash=sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537 \
-    --hash=sha256:ae5f4161f18c61806f411a13b0310bea87f987c7d2ecdbdaad0e94eb2e404238 \
-    --hash=sha256:aed38f6e4fb3f5d6bf81bfa990a07806be9d83cf7bacef998ab1a9bd660a581f \
-    --hash=sha256:b01b88d45a6fcb69667cd6d2f7a9aeb4bf53760d7fc536bf679ec94fe9f3ff3d \
-    --hash=sha256:b261ccdec7821281dade748d088bb6e9b69e6d15b30652b74cbbac25e280b796 \
-    --hash=sha256:b2b0a0c0517616b6869869f8c581d4eb2dd83a4d79e0ebcb7d373ef9956aeb0a \
-    --hash=sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143 \
-    --hash=sha256:bd8f7df7d12c2db9fab40bdd87a7c09b1530128315d047a086fa3ae3435cb3a8 \
-    --hash=sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c \
-    --hash=sha256:c002b4ffc0be611f0d9da932eb0f704fe2602a9a949d1f738e4c34c75b0863d5 \
-    --hash=sha256:c083af607d2515612056a31f0a8d9e0fcb5876b7bfc0abad3ecd275bc4ebc2d5 \
-    --hash=sha256:c180f51afb394e165eafe4ac2936a14bee3eb10debc9d9e4db8958fe36afe711 \
-    --hash=sha256:c235ebd9baae02f1b77bcea61bce332cb4331dc3617d254df3323aa01ab47bd4 \
-    --hash=sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6 \
-    --hash=sha256:d0eccceffcb53201b5bfebb52600a5fb483a20b61da9dbc885f8b103cbe7598c \
-    --hash=sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7 \
-    --hash=sha256:db364eca23f876da6f9e16c9da0df51aa4f104a972735574842618b8c6d999d4 \
-    --hash=sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b \
-    --hash=sha256:deb6be0ac38ece9ba87dea880e438f25ca3eddfac8b002a2ec3d9183a454e8ae \
-    --hash=sha256:e06ed3eb3218bc64786f7db41917d4e686cc4856944f53d5bdf83a6884432e12 \
-    --hash=sha256:e27ad930a842b4c5eb8ac0016b0a54f5aebbe679340c26101df33424142c143c \
-    --hash=sha256:e537484df0d8f426ce2afb2d0f8e1c3d0b114b83f8850e5f2fbea0e797bd82ae \
-    --hash=sha256:eb00ed941194665c332bf8e078baf037d6c35d7c4f3102ea2d4f16ca94a26dc8 \
-    --hash=sha256:eb6904c354526e758fda7167b33005998fb68c46fbc10e013ca97f21ca5c8887 \
-    --hash=sha256:eb8821e09e916165e160797a6c17edda0679379a4be5c716c260e836e122f54b \
-    --hash=sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4 \
-    --hash=sha256:f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f \
-    --hash=sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5 \
-    --hash=sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33 \
-    --hash=sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519 \
-    --hash=sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561
-    # via requests
-click==8.1.7 \
-    --hash=sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28 \
-    --hash=sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de
-    # via
-    #   flask
-    #   pip-tools
-colorama==0.4.6 \
-    --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \
-    --hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6
-    # via -r requirements.base.in
-decorator==5.1.1 \
-    --hash=sha256:637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330 \
-    --hash=sha256:b8c3f85900b9dc423225913c5aace94729fe1fa9763b38939a95226f02d37186
-    # via -r requirements.anki.in
-distro==1.9.0 ; sys_platform != "darwin" and sys_platform != "win32" \
-    --hash=sha256:2fa77c6fd8940f116ee1d6b94a2f90b13b5ea8d019b98bc8bafdcabcdd9bdbed \
-    --hash=sha256:7bffd925d65168f85027d8da9af6bddab658135b840670a223589bc0c8ef02b2
-    # via -r requirements.anki.in
-flask[async]==3.0.3 \
-    --hash=sha256:34e815dfaa43340d1d15a5c3a02b8476004037eb4840b34910c6e21679d288f3 \
-    --hash=sha256:ceb27b0af3823ea2737928a4d99d125a06175b8512c445cbd9a9ce200ef76842
-    # via
-    #   -r requirements.aqt.in
-    #   flask-cors
-flask-cors==6.0.0 \
-    --hash=sha256:4592c1570246bf7beee96b74bc0adbbfcb1b0318f6ba05c412e8909eceec3393 \
-    --hash=sha256:6332073356452343a8ccddbfec7befdc3fdd040141fe776ec9b94c262f058657
-    # via -r requirements.aqt.in
-idna==3.8 \
-    --hash=sha256:050b4e5baadcd44d760cedbd2b8e639f2ff89bbc7a5730fcc662954303377aac \
-    --hash=sha256:d838c2c0ed6fced7693d5e8ab8e734d5f8fda53a039c0164afb0b82e771e3603
-    # via requests
-importlib-metadata==8.4.0 \
-    --hash=sha256:66f342cc6ac9818fc6ff340576acd24d65ba0b3efabb2b4ac08b598965a4a2f1 \
-    --hash=sha256:9a547d3bc3608b025f93d403fdd1aae741c24fbb8314df4b155675742ce303c5
-    # via
-    #   build
-    #   flask
-    #   markdown
-itsdangerous==2.2.0 \
-    --hash=sha256:c6242fc49e35958c8b15141343aa660db5fc54d4f13a1db01a3f5891b98700ef \
-    --hash=sha256:e0050c0b7da1eea53ffaf149c0cfbb5c6e2e2b69c4bef22c81fa6eb73e5f6173
-    # via flask
-jinja2==3.1.5 \
-    --hash=sha256:8fefff8dc3034e27bb80d67c671eb8a9bc424c0ef4c0826edbff304cceff43bb \
-    --hash=sha256:aba0f4dc9ed8013c424088f68a5c226f7d6097ed89b246d7749c2ec4175c6adb
-    # via flask
-jsonschema==4.1.2 \
-    --hash=sha256:166870c8ab27bd712a8627e0598de4685bd8d199c4d7bd7cacc3d941ba0c6ca0 \
-    --hash=sha256:5c1a282ee6b74235057421fd0f766ac5f2972f77440927f6471c9e8493632fac
-    # via
-    #   -r requirements.aqt.in
-    #   -r requirements.bundle.in
-markdown==3.7 \
-    --hash=sha256:2ae2471477cfd02dbbf038d5d9bc226d40def84b4fe2986e49b59b6b472bbed2 \
-    --hash=sha256:7eb6df5690b81a1d7942992c97fad2938e956e79df20cbc6186e9c3a77b1c803
-    # via -r requirements.anki.in
-markupsafe==2.1.5 \
-    --hash=sha256:00e046b6dd71aa03a41079792f8473dc494d564611a8f89bbbd7cb93295ebdcf \
-    --hash=sha256:075202fa5b72c86ad32dc7d0b56024ebdbcf2048c0ba09f1cde31bfdd57bcfff \
-    --hash=sha256:0e397ac966fdf721b2c528cf028494e86172b4feba51d65f81ffd65c63798f3f \
-    --hash=sha256:17b950fccb810b3293638215058e432159d2b71005c74371d784862b7e4683f3 \
-    --hash=sha256:1f3fbcb7ef1f16e48246f704ab79d79da8a46891e2da03f8783a5b6fa41a9532 \
-    --hash=sha256:2174c595a0d73a3080ca3257b40096db99799265e1c27cc5a610743acd86d62f \
-    --hash=sha256:2b7c57a4dfc4f16f7142221afe5ba4e093e09e728ca65c51f5620c9aaeb9a617 \
-    --hash=sha256:2d2d793e36e230fd32babe143b04cec8a8b3eb8a3122d2aceb4a371e6b09b8df \
-    --hash=sha256:30b600cf0a7ac9234b2638fbc0fb6158ba5bdcdf46aeb631ead21248b9affbc4 \
-    --hash=sha256:397081c1a0bfb5124355710fe79478cdbeb39626492b15d399526ae53422b906 \
-    --hash=sha256:3a57fdd7ce31c7ff06cdfbf31dafa96cc533c21e443d57f5b1ecc6cdc668ec7f \
-    --hash=sha256:3c6b973f22eb18a789b1460b4b91bf04ae3f0c4234a0a6aa6b0a92f6f7b951d4 \
-    --hash=sha256:3e53af139f8579a6d5f7b76549125f0d94d7e630761a2111bc431fd820e163b8 \
-    --hash=sha256:4096e9de5c6fdf43fb4f04c26fb114f61ef0bf2e5604b6ee3019d51b69e8c371 \
-    --hash=sha256:4275d846e41ecefa46e2015117a9f491e57a71ddd59bbead77e904dc02b1bed2 \
-    --hash=sha256:4c31f53cdae6ecfa91a77820e8b151dba54ab528ba65dfd235c80b086d68a465 \
-    --hash=sha256:4f11aa001c540f62c6166c7726f71f7573b52c68c31f014c25cc7901deea0b52 \
-    --hash=sha256:5049256f536511ee3f7e1b3f87d1d1209d327e818e6ae1365e8653d7e3abb6a6 \
-    --hash=sha256:58c98fee265677f63a4385256a6d7683ab1832f3ddd1e66fe948d5880c21a169 \
-    --hash=sha256:598e3276b64aff0e7b3451b72e94fa3c238d452e7ddcd893c3ab324717456bad \
-    --hash=sha256:5b7b716f97b52c5a14bffdf688f971b2d5ef4029127f1ad7a513973cfd818df2 \
-    --hash=sha256:5dedb4db619ba5a2787a94d877bc8ffc0566f92a01c0ef214865e54ecc9ee5e0 \
-    --hash=sha256:619bc166c4f2de5caa5a633b8b7326fbe98e0ccbfacabd87268a2b15ff73a029 \
-    --hash=sha256:629ddd2ca402ae6dbedfceeba9c46d5f7b2a61d9749597d4307f943ef198fc1f \
-    --hash=sha256:656f7526c69fac7f600bd1f400991cc282b417d17539a1b228617081106feb4a \
-    --hash=sha256:6ec585f69cec0aa07d945b20805be741395e28ac1627333b1c5b0105962ffced \
-    --hash=sha256:72b6be590cc35924b02c78ef34b467da4ba07e4e0f0454a2c5907f473fc50ce5 \
-    --hash=sha256:7502934a33b54030eaf1194c21c692a534196063db72176b0c4028e140f8f32c \
-    --hash=sha256:7a68b554d356a91cce1236aa7682dc01df0edba8d043fd1ce607c49dd3c1edcf \
-    --hash=sha256:7b2e5a267c855eea6b4283940daa6e88a285f5f2a67f2220203786dfa59b37e9 \
-    --hash=sha256:823b65d8706e32ad2df51ed89496147a42a2a6e01c13cfb6ffb8b1e92bc910bb \
-    --hash=sha256:8590b4ae07a35970728874632fed7bd57b26b0102df2d2b233b6d9d82f6c62ad \
-    --hash=sha256:8dd717634f5a044f860435c1d8c16a270ddf0ef8588d4887037c5028b859b0c3 \
-    --hash=sha256:8dec4936e9c3100156f8a2dc89c4b88d5c435175ff03413b443469c7c8c5f4d1 \
-    --hash=sha256:97cafb1f3cbcd3fd2b6fbfb99ae11cdb14deea0736fc2b0952ee177f2b813a46 \
-    --hash=sha256:a17a92de5231666cfbe003f0e4b9b3a7ae3afb1ec2845aadc2bacc93ff85febc \
-    --hash=sha256:a549b9c31bec33820e885335b451286e2969a2d9e24879f83fe904a5ce59d70a \
-    --hash=sha256:ac07bad82163452a6884fe8fa0963fb98c2346ba78d779ec06bd7a6262132aee \
-    --hash=sha256:ae2ad8ae6ebee9d2d94b17fb62763125f3f374c25618198f40cbb8b525411900 \
-    --hash=sha256:b91c037585eba9095565a3556f611e3cbfaa42ca1e865f7b8015fe5c7336d5a5 \
-    --hash=sha256:bc1667f8b83f48511b94671e0e441401371dfd0f0a795c7daa4a3cd1dde55bea \
-    --hash=sha256:bec0a414d016ac1a18862a519e54b2fd0fc8bbfd6890376898a6c0891dd82e9f \
-    --hash=sha256:bf50cd79a75d181c9181df03572cdce0fbb75cc353bc350712073108cba98de5 \
-    --hash=sha256:bff1b4290a66b490a2f4719358c0cdcd9bafb6b8f061e45c7a2460866bf50c2e \
-    --hash=sha256:c061bb86a71b42465156a3ee7bd58c8c2ceacdbeb95d05a99893e08b8467359a \
-    --hash=sha256:c8b29db45f8fe46ad280a7294f5c3ec36dbac9491f2d1c17345be8e69cc5928f \
-    --hash=sha256:ce409136744f6521e39fd8e2a24c53fa18ad67aa5bc7c2cf83645cce5b5c4e50 \
-    --hash=sha256:d050b3361367a06d752db6ead6e7edeb0009be66bc3bae0ee9d97fb326badc2a \
-    --hash=sha256:d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b \
-    --hash=sha256:d9fad5155d72433c921b782e58892377c44bd6252b5af2f67f16b194987338a4 \
-    --hash=sha256:daa4ee5a243f0f20d528d939d06670a298dd39b1ad5f8a72a4275124a7819eff \
-    --hash=sha256:db0b55e0f3cc0be60c1f19efdde9a637c32740486004f20d1cff53c3c0ece4d2 \
-    --hash=sha256:e61659ba32cf2cf1481e575d0462554625196a1f2fc06a1c777d3f48e8865d46 \
-    --hash=sha256:ea3d8a3d18833cf4304cd2fc9cbb1efe188ca9b5efef2bdac7adc20594a0e46b \
-    --hash=sha256:ec6a563cff360b50eed26f13adc43e61bc0c04d94b8be985e6fb24b81f6dcfdf \
-    --hash=sha256:f5dfb42c4604dddc8e4305050aa6deb084540643ed5804d7455b5df8fe16f5e5 \
-    --hash=sha256:fa173ec60341d6bb97a89f5ea19c85c5643c1e7dedebc22f5181eb73573142c5 \
-    --hash=sha256:fa9db3f79de01457b03d4f01b34cf91bc0048eb2c3846ff26f66687c2f6d16ab \
-    --hash=sha256:fce659a462a1be54d2ffcacea5e3ba2d74daa74f30f5f143fe0c58636e355fdd \
-    --hash=sha256:ffee1f21e5ef0d712f9033568f8344d5da8cc2869dbd08d87c84656e6a2d2f68
-    # via
-    #   jinja2
-    #   werkzeug
-orjson==3.10.7 \
-    --hash=sha256:084e537806b458911137f76097e53ce7bf5806dda33ddf6aaa66a028f8d43a23 \
-    --hash=sha256:09b2d92fd95ad2402188cf51573acde57eb269eddabaa60f69ea0d733e789fe9 \
-    --hash=sha256:0fa5886854673222618638c6df7718ea7fe2f3f2384c452c9ccedc70b4a510a5 \
-    --hash=sha256:11748c135f281203f4ee695b7f80bb1358a82a63905f9f0b794769483ea854ad \
-    --hash=sha256:1193b2416cbad1a769f868b1749535d5da47626ac29445803dae7cc64b3f5c98 \
-    --hash=sha256:144888c76f8520e39bfa121b31fd637e18d4cc2f115727865fdf9fa325b10412 \
-    --hash=sha256:1d9c0e733e02ada3ed6098a10a8ee0052dd55774de3d9110d29868d24b17faa1 \
-    --hash=sha256:23820a1563a1d386414fef15c249040042b8e5d07b40ab3fe3efbfbbcbcb8864 \
-    --hash=sha256:33cfb96c24034a878d83d1a9415799a73dc77480e6c40417e5dda0710d559ee6 \
-    --hash=sha256:348bdd16b32556cf8d7257b17cf2bdb7ab7976af4af41ebe79f9796c218f7e91 \
-    --hash=sha256:34a566f22c28222b08875b18b0dfbf8a947e69df21a9ed5c51a6bf91cfb944ac \
-    --hash=sha256:3dcfbede6737fdbef3ce9c37af3fb6142e8e1ebc10336daa05872bfb1d87839c \
-    --hash=sha256:430ee4d85841e1483d487e7b81401785a5dfd69db5de01314538f31f8fbf7ee1 \
-    --hash=sha256:44a96f2d4c3af51bfac6bc4ef7b182aa33f2f054fd7f34cc0ee9a320d051d41f \
-    --hash=sha256:479fd0844ddc3ca77e0fd99644c7fe2de8e8be1efcd57705b5c92e5186e8a250 \
-    --hash=sha256:480f455222cb7a1dea35c57a67578848537d2602b46c464472c995297117fa09 \
-    --hash=sha256:4829cf2195838e3f93b70fd3b4292156fc5e097aac3739859ac0dcc722b27ac0 \
-    --hash=sha256:4b6146e439af4c2472c56f8540d799a67a81226e11992008cb47e1267a9b3225 \
-    --hash=sha256:4e6c3da13e5a57e4b3dca2de059f243ebec705857522f188f0180ae88badd354 \
-    --hash=sha256:5b24a579123fa884f3a3caadaed7b75eb5715ee2b17ab5c66ac97d29b18fe57f \
-    --hash=sha256:6b0dd04483499d1de9c8f6203f8975caf17a6000b9c0c54630cef02e44ee624e \
-    --hash=sha256:6ea2b2258eff652c82652d5e0f02bd5e0463a6a52abb78e49ac288827aaa1469 \
-    --hash=sha256:7122a99831f9e7fe977dc45784d3b2edc821c172d545e6420c375e5a935f5a1c \
-    --hash=sha256:74f4544f5a6405b90da8ea724d15ac9c36da4d72a738c64685003337401f5c12 \
-    --hash=sha256:75ef0640403f945f3a1f9f6400686560dbfb0fb5b16589ad62cd477043c4eee3 \
-    --hash=sha256:76ac14cd57df0572453543f8f2575e2d01ae9e790c21f57627803f5e79b0d3c3 \
-    --hash=sha256:77d325ed866876c0fa6492598ec01fe30e803272a6e8b10e992288b009cbe149 \
-    --hash=sha256:7c4c17f8157bd520cdb7195f75ddbd31671997cbe10aee559c2d613592e7d7eb \
-    --hash=sha256:7db8539039698ddfb9a524b4dd19508256107568cdad24f3682d5773e60504a2 \
-    --hash=sha256:8272527d08450ab16eb405f47e0f4ef0e5ff5981c3d82afe0efd25dcbef2bcd2 \
-    --hash=sha256:82763b46053727a7168d29c772ed5c870fdae2f61aa8a25994c7984a19b1021f \
-    --hash=sha256:8a9c9b168b3a19e37fe2778c0003359f07822c90fdff8f98d9d2a91b3144d8e0 \
-    --hash=sha256:8de062de550f63185e4c1c54151bdddfc5625e37daf0aa1e75d2a1293e3b7d9a \
-    --hash=sha256:974683d4618c0c7dbf4f69c95a979734bf183d0658611760017f6e70a145af58 \
-    --hash=sha256:9ea2c232deedcb605e853ae1db2cc94f7390ac776743b699b50b071b02bea6fe \
-    --hash=sha256:a0c6a008e91d10a2564edbb6ee5069a9e66df3fbe11c9a005cb411f441fd2c09 \
-    --hash=sha256:a763bc0e58504cc803739e7df040685816145a6f3c8a589787084b54ebc9f16e \
-    --hash=sha256:a7e19150d215c7a13f39eb787d84db274298d3f83d85463e61d277bbd7f401d2 \
-    --hash=sha256:ac7cf6222b29fbda9e3a472b41e6a5538b48f2c8f99261eecd60aafbdb60690c \
-    --hash=sha256:b48b3db6bb6e0a08fa8c83b47bc169623f801e5cc4f24442ab2b6617da3b5313 \
-    --hash=sha256:b58d3795dafa334fc8fd46f7c5dc013e6ad06fd5b9a4cc98cb1456e7d3558bd6 \
-    --hash=sha256:bdbb61dcc365dd9be94e8f7df91975edc9364d6a78c8f7adb69c1cdff318ec93 \
-    --hash=sha256:bf6ba8ebc8ef5792e2337fb0419f8009729335bb400ece005606336b7fd7bab7 \
-    --hash=sha256:c31008598424dfbe52ce8c5b47e0752dca918a4fdc4a2a32004efd9fab41d866 \
-    --hash=sha256:cb61938aec8b0ffb6eef484d480188a1777e67b05d58e41b435c74b9d84e0b9c \
-    --hash=sha256:d2d9f990623f15c0ae7ac608103c33dfe1486d2ed974ac3f40b693bad1a22a7b \
-    --hash=sha256:d352ee8ac1926d6193f602cbe36b1643bbd1bbcb25e3c1a657a4390f3000c9a5 \
-    --hash=sha256:d374d36726746c81a49f3ff8daa2898dccab6596864ebe43d50733275c629175 \
-    --hash=sha256:de817e2f5fc75a9e7dd350c4b0f54617b280e26d1631811a43e7e968fa71e3e9 \
-    --hash=sha256:e724cebe1fadc2b23c6f7415bad5ee6239e00a69f30ee423f319c6af70e2a5c0 \
-    --hash=sha256:e72591bcfe7512353bd609875ab38050efe3d55e18934e2f18950c108334b4ff \
-    --hash=sha256:e76be12658a6fa376fcd331b1ea4e58f5a06fd0220653450f0d415b8fd0fbe20 \
-    --hash=sha256:eb8d384a24778abf29afb8e41d68fdd9a156cf6e5390c04cc07bbc24b89e98b5 \
-    --hash=sha256:ed350d6978d28b92939bfeb1a0570c523f6170efc3f0a0ef1f1df287cd4f4960 \
-    --hash=sha256:eef44224729e9525d5261cc8d28d6b11cafc90e6bd0be2157bde69a52ec83024 \
-    --hash=sha256:f4db56635b58cd1a200b0a23744ff44206ee6aa428185e2b6c4a65b3197abdcd \
-    --hash=sha256:fdf5197a21dd660cf19dfd2a3ce79574588f8f5e2dbf21bda9ee2d2b46924d84
-    # via -r requirements.anki.in
-packaging==24.1 \
-    --hash=sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002 \
-    --hash=sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124
-    # via build
-pip-system-certs==4.0 \
-    --hash=sha256:47202b9403a6f40783a9674bbc8873f5fc86544ec01a49348fa913e99e2ff68b \
-    --hash=sha256:db8e6a31388d9795ec9139957df1a89fa5274fb66164456fd091a5d3e94c350c
-    # via -r requirements.aqt.in
-pip-tools==7.4.1 \
-    --hash=sha256:4c690e5fbae2f21e87843e89c26191f0d9454f362d8acdbd695716493ec8b3a9 \
-    --hash=sha256:864826f5073864450e24dbeeb85ce3920cdfb09848a3d69ebf537b521f14bcc9
-    # via -r requirements.base.in
-protobuf==5.28.2 \
-    --hash=sha256:2c69461a7fcc8e24be697624c09a839976d82ae75062b11a0972e41fd2cd9132 \
-    --hash=sha256:35cfcb15f213449af7ff6198d6eb5f739c37d7e4f1c09b5d0641babf2cc0c68f \
-    --hash=sha256:52235802093bd8a2811abbe8bf0ab9c5f54cca0a751fdd3f6ac2a21438bffece \
-    --hash=sha256:59379674ff119717404f7454647913787034f03fe7049cbef1d74a97bb4593f0 \
-    --hash=sha256:5e8a95246d581eef20471b5d5ba010d55f66740942b95ba9b872d918c459452f \
-    --hash=sha256:87317e9bcda04a32f2ee82089a204d3a2f0d3c8aeed16568c7daf4756e4f1fe0 \
-    --hash=sha256:8ddc60bf374785fb7cb12510b267f59067fa10087325b8e1855b898a0d81d276 \
-    --hash=sha256:a8b9403fc70764b08d2f593ce44f1d2920c5077bf7d311fefec999f8c40f78b7 \
-    --hash=sha256:c0ea0123dac3399a2eeb1a1443d82b7afc9ff40241433296769f7da42d142ec3 \
-    --hash=sha256:ca53faf29896c526863366a52a8f4d88e69cd04ec9571ed6082fa117fac3ab36 \
-    --hash=sha256:eeea10f3dc0ac7e6b4933d32db20662902b4ab81bf28df12218aa389e9c2102d
-    # via -r requirements.anki.in
-pyproject-hooks==1.1.0 \
-    --hash=sha256:4b37730834edbd6bd37f26ece6b44802fb1c1ee2ece0e54ddff8bfc06db86965 \
-    --hash=sha256:7ceeefe9aec63a1064c18d939bdc3adf2d8aa1988a510afec15151578b232aa2
-    # via
-    #   build
-    #   pip-tools
-pyrsistent==0.20.0 \
-    --hash=sha256:0724c506cd8b63c69c7f883cc233aac948c1ea946ea95996ad8b1380c25e1d3f \
-    --hash=sha256:09848306523a3aba463c4b49493a760e7a6ca52e4826aa100ee99d8d39b7ad1e \
-    --hash=sha256:0f3b1bcaa1f0629c978b355a7c37acd58907390149b7311b5db1b37648eb6958 \
-    --hash=sha256:21cc459636983764e692b9eba7144cdd54fdec23ccdb1e8ba392a63666c60c34 \
-    --hash=sha256:2e14c95c16211d166f59c6611533d0dacce2e25de0f76e4c140fde250997b3ca \
-    --hash=sha256:2e2c116cc804d9b09ce9814d17df5edf1df0c624aba3b43bc1ad90411487036d \
-    --hash=sha256:4021a7f963d88ccd15b523787d18ed5e5269ce57aa4037146a2377ff607ae87d \
-    --hash=sha256:4c48f78f62ab596c679086084d0dd13254ae4f3d6c72a83ffdf5ebdef8f265a4 \
-    --hash=sha256:4f5c2d012671b7391803263419e31b5c7c21e7c95c8760d7fc35602353dee714 \
-    --hash=sha256:58b8f6366e152092194ae68fefe18b9f0b4f89227dfd86a07770c3d86097aebf \
-    --hash=sha256:59a89bccd615551391f3237e00006a26bcf98a4d18623a19909a2c48b8e986ee \
-    --hash=sha256:5cdd7ef1ea7a491ae70d826b6cc64868de09a1d5ff9ef8d574250d0940e275b8 \
-    --hash=sha256:6288b3fa6622ad8a91e6eb759cfc48ff3089e7c17fb1d4c59a919769314af224 \
-    --hash=sha256:6d270ec9dd33cdb13f4d62c95c1a5a50e6b7cdd86302b494217137f760495b9d \
-    --hash=sha256:79ed12ba79935adaac1664fd7e0e585a22caa539dfc9b7c7c6d5ebf91fb89054 \
-    --hash=sha256:7d29c23bdf6e5438c755b941cef867ec2a4a172ceb9f50553b6ed70d50dfd656 \
-    --hash=sha256:8441cf9616d642c475684d6cf2520dd24812e996ba9af15e606df5f6fd9d04a7 \
-    --hash=sha256:881bbea27bbd32d37eb24dd320a5e745a2a5b092a17f6debc1349252fac85423 \
-    --hash=sha256:8c3aba3e01235221e5b229a6c05f585f344734bd1ad42a8ac51493d74722bbce \
-    --hash=sha256:a14798c3005ec892bbada26485c2eea3b54109cb2533713e355c806891f63c5e \
-    --hash=sha256:b14decb628fac50db5e02ee5a35a9c0772d20277824cfe845c8a8b717c15daa3 \
-    --hash=sha256:b318ca24db0f0518630e8b6f3831e9cba78f099ed5c1d65ffe3e023003043ba0 \
-    --hash=sha256:c1beb78af5423b879edaf23c5591ff292cf7c33979734c99aa66d5914ead880f \
-    --hash=sha256:c55acc4733aad6560a7f5f818466631f07efc001fd023f34a6c203f8b6df0f0b \
-    --hash=sha256:ca52d1ceae015859d16aded12584c59eb3825f7b50c6cfd621d4231a6cc624ce \
-    --hash=sha256:cae40a9e3ce178415040a0383f00e8d68b569e97f31928a3a8ad37e3fde6df6a \
-    --hash=sha256:e78d0c7c1e99a4a45c99143900ea0546025e41bb59ebc10182e947cf1ece9174 \
-    --hash=sha256:ef3992833fbd686ee783590639f4b8343a57f1f75de8633749d984dc0eb16c86 \
-    --hash=sha256:f058a615031eea4ef94ead6456f5ec2026c19fb5bd6bfe86e9665c4158cf802f \
-    --hash=sha256:f5ac696f02b3fc01a710427585c855f65cd9c640e14f52abe52020722bb4906b \
-    --hash=sha256:f920385a11207dc372a028b3f1e1038bb244b3ec38d448e6d8e43c6b3ba20e98 \
-    --hash=sha256:fed2c3216a605dc9a6ea50c7e84c82906e3684c4e80d2908208f662a6cbf9022
-    # via jsonschema
-pysocks==1.7.1 \
-    --hash=sha256:08e69f092cc6dbe92a0fdd16eeb9b9ffbc13cadfe5ca4c7bd92ffb078b293299 \
-    --hash=sha256:2725bd0a9925919b9b51739eea5f9e2bae91e83288108a9ad338b2e3a4435ee5 \
-    --hash=sha256:3f8804571ebe159c380ac6de37643bb4685970655d3bba243530d6558b799aa0
-    # via requests
-requests==2.32.3 \
-    --hash=sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 \
-    --hash=sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6
-    # via
-    #   -r requirements.anki.in
-    #   -r requirements.aqt.in
-send2trash==1.8.3 \
-    --hash=sha256:0c31227e0bd08961c7665474a3d1ef7193929fedda4233843689baa056be46c9 \
-    --hash=sha256:b18e7a3966d99871aefeb00cfbcfdced55ce4871194810fc71f4aa484b953abf
-    # via -r requirements.aqt.in
-soupsieve==2.6 \
-    --hash=sha256:e2e68417777af359ec65daac1057404a3c8a5455bb8abc36f1a9866ab1a51abb \
-    --hash=sha256:e72c4ff06e4fb6e4b5a9f0f55fe6e81514581fca1515028625d0f299c602ccc9
-    # via beautifulsoup4
-tomli==2.0.1 \
-    --hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \
-    --hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f
-    # via
-    #   build
-    #   pip-tools
-typing-extensions==4.13.2 \
-    --hash=sha256:a439e7c04b49fec3e5d3e2beaa21755cadbbdc391694e28ccdd36ca4a1408f8c \
-    --hash=sha256:e6c81219bd689f51865d9e372991c540bda33a0379d5573cddb9a3a23f7caaef
-    # via -r requirements.anki.in
-urllib3==2.2.2 \
-    --hash=sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472 \
-    --hash=sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168
-    # via requests
-waitress==3.0.1 \
-    --hash=sha256:26cdbc593093a15119351690752c99adc13cbc6786d75f7b6341d1234a3730ac \
-    --hash=sha256:ef0c1f020d9f12a515c4ec65c07920a702613afcad1dbfdc3bcec256b6c072b3
-    # via -r requirements.aqt.in
-werkzeug==3.0.6 \
-    --hash=sha256:1bc0c2310d2fbb07b1dd1105eba2f7af72f322e1e455f2f93c993bee8c8a5f17 \
-    --hash=sha256:a8dd59d4de28ca70471a34cba79bed5f7ef2e036a76b3ab0835474246eb41f8d
-    # via
-    #   flask
-    #   flask-cors
-wheel==0.44.0 \
-    --hash=sha256:2376a90c98cc337d18623527a97c31797bd02bad0033d41547043a1cbfbe448f \
-    --hash=sha256:a29c3f2817e95ab89aa4660681ad547c0e9547f20e75b0562fe7723c9a2a9d49
-    # via pip-tools
-wrapt==1.16.0 \
-    --hash=sha256:0d2691979e93d06a95a26257adb7bfd0c93818e89b1406f5a28f36e0d8c1e1fc \
-    --hash=sha256:14d7dc606219cdd7405133c713f2c218d4252f2a469003f8c46bb92d5d095d81 \
-    --hash=sha256:1a5db485fe2de4403f13fafdc231b0dbae5eca4359232d2efc79025527375b09 \
-    --hash=sha256:1acd723ee2a8826f3d53910255643e33673e1d11db84ce5880675954183ec47e \
-    --hash=sha256:1ca9b6085e4f866bd584fb135a041bfc32cab916e69f714a7d1d397f8c4891ca \
-    --hash=sha256:1dd50a2696ff89f57bd8847647a1c363b687d3d796dc30d4dd4a9d1689a706f0 \
-    --hash=sha256:2076fad65c6736184e77d7d4729b63a6d1ae0b70da4868adeec40989858eb3fb \
-    --hash=sha256:2a88e6010048489cda82b1326889ec075a8c856c2e6a256072b28eaee3ccf487 \
-    --hash=sha256:3ebf019be5c09d400cf7b024aa52b1f3aeebeff51550d007e92c3c1c4afc2a40 \
-    --hash=sha256:418abb18146475c310d7a6dc71143d6f7adec5b004ac9ce08dc7a34e2babdc5c \
-    --hash=sha256:43aa59eadec7890d9958748db829df269f0368521ba6dc68cc172d5d03ed8060 \
-    --hash=sha256:44a2754372e32ab315734c6c73b24351d06e77ffff6ae27d2ecf14cf3d229202 \
-    --hash=sha256:490b0ee15c1a55be9c1bd8609b8cecd60e325f0575fc98f50058eae366e01f41 \
-    --hash=sha256:49aac49dc4782cb04f58986e81ea0b4768e4ff197b57324dcbd7699c5dfb40b9 \
-    --hash=sha256:5eb404d89131ec9b4f748fa5cfb5346802e5ee8836f57d516576e61f304f3b7b \
-    --hash=sha256:5f15814a33e42b04e3de432e573aa557f9f0f56458745c2074952f564c50e664 \
-    --hash=sha256:5f370f952971e7d17c7d1ead40e49f32345a7f7a5373571ef44d800d06b1899d \
-    --hash=sha256:66027d667efe95cc4fa945af59f92c5a02c6f5bb6012bff9e60542c74c75c362 \
-    --hash=sha256:66dfbaa7cfa3eb707bbfcd46dab2bc6207b005cbc9caa2199bcbc81d95071a00 \
-    --hash=sha256:685f568fa5e627e93f3b52fda002c7ed2fa1800b50ce51f6ed1d572d8ab3e7fc \
-    --hash=sha256:6906c4100a8fcbf2fa735f6059214bb13b97f75b1a61777fcf6432121ef12ef1 \
-    --hash=sha256:6a42cd0cfa8ffc1915aef79cb4284f6383d8a3e9dcca70c445dcfdd639d51267 \
-    --hash=sha256:6dcfcffe73710be01d90cae08c3e548d90932d37b39ef83969ae135d36ef3956 \
-    --hash=sha256:6f6eac2360f2d543cc875a0e5efd413b6cbd483cb3ad7ebf888884a6e0d2e966 \
-    --hash=sha256:72554a23c78a8e7aa02abbd699d129eead8b147a23c56e08d08dfc29cfdddca1 \
-    --hash=sha256:73870c364c11f03ed072dda68ff7aea6d2a3a5c3fe250d917a429c7432e15228 \
-    --hash=sha256:73aa7d98215d39b8455f103de64391cb79dfcad601701a3aa0dddacf74911d72 \
-    --hash=sha256:75ea7d0ee2a15733684badb16de6794894ed9c55aa5e9903260922f0482e687d \
-    --hash=sha256:7bd2d7ff69a2cac767fbf7a2b206add2e9a210e57947dd7ce03e25d03d2de292 \
-    --hash=sha256:807cc8543a477ab7422f1120a217054f958a66ef7314f76dd9e77d3f02cdccd0 \
-    --hash=sha256:8e9723528b9f787dc59168369e42ae1c3b0d3fadb2f1a71de14531d321ee05b0 \
-    --hash=sha256:9090c9e676d5236a6948330e83cb89969f433b1943a558968f659ead07cb3b36 \
-    --hash=sha256:9153ed35fc5e4fa3b2fe97bddaa7cbec0ed22412b85bcdaf54aeba92ea37428c \
-    --hash=sha256:9159485323798c8dc530a224bd3ffcf76659319ccc7bbd52e01e73bd0241a0c5 \
-    --hash=sha256:941988b89b4fd6b41c3f0bfb20e92bd23746579736b7343283297c4c8cbae68f \
-    --hash=sha256:94265b00870aa407bd0cbcfd536f17ecde43b94fb8d228560a1e9d3041462d73 \
-    --hash=sha256:98b5e1f498a8ca1858a1cdbffb023bfd954da4e3fa2c0cb5853d40014557248b \
-    --hash=sha256:9b201ae332c3637a42f02d1045e1d0cccfdc41f1f2f801dafbaa7e9b4797bfc2 \
-    --hash=sha256:a0ea261ce52b5952bf669684a251a66df239ec6d441ccb59ec7afa882265d593 \
-    --hash=sha256:a33a747400b94b6d6b8a165e4480264a64a78c8a4c734b62136062e9a248dd39 \
-    --hash=sha256:a452f9ca3e3267cd4d0fcf2edd0d035b1934ac2bd7e0e57ac91ad6b95c0c6389 \
-    --hash=sha256:a86373cf37cd7764f2201b76496aba58a52e76dedfaa698ef9e9688bfd9e41cf \
-    --hash=sha256:ac83a914ebaf589b69f7d0a1277602ff494e21f4c2f743313414378f8f50a4cf \
-    --hash=sha256:aefbc4cb0a54f91af643660a0a150ce2c090d3652cf4052a5397fb2de549cd89 \
-    --hash=sha256:b3646eefa23daeba62643a58aac816945cadc0afaf21800a1421eeba5f6cfb9c \
-    --hash=sha256:b47cfad9e9bbbed2339081f4e346c93ecd7ab504299403320bf85f7f85c7d46c \
-    --hash=sha256:b935ae30c6e7400022b50f8d359c03ed233d45b725cfdd299462f41ee5ffba6f \
-    --hash=sha256:bb2dee3874a500de01c93d5c71415fcaef1d858370d405824783e7a8ef5db440 \
-    --hash=sha256:bc57efac2da352a51cc4658878a68d2b1b67dbe9d33c36cb826ca449d80a8465 \
-    --hash=sha256:bf5703fdeb350e36885f2875d853ce13172ae281c56e509f4e6eca049bdfb136 \
-    --hash=sha256:c31f72b1b6624c9d863fc095da460802f43a7c6868c5dda140f51da24fd47d7b \
-    --hash=sha256:c5cd603b575ebceca7da5a3a251e69561bec509e0b46e4993e1cac402b7247b8 \
-    --hash=sha256:d2efee35b4b0a347e0d99d28e884dfd82797852d62fcd7ebdeee26f3ceb72cf3 \
-    --hash=sha256:d462f28826f4657968ae51d2181a074dfe03c200d6131690b7d65d55b0f360f8 \
-    --hash=sha256:d5e49454f19ef621089e204f862388d29e6e8d8b162efce05208913dde5b9ad6 \
-    --hash=sha256:da4813f751142436b075ed7aa012a8778aa43a99f7b36afe9b742d3ed8bdc95e \
-    --hash=sha256:db2e408d983b0e61e238cf579c09ef7020560441906ca990fe8412153e3b291f \
-    --hash=sha256:db98ad84a55eb09b3c32a96c576476777e87c520a34e2519d3e59c44710c002c \
-    --hash=sha256:dbed418ba5c3dce92619656802cc5355cb679e58d0d89b50f116e4a9d5a9603e \
-    --hash=sha256:dcdba5c86e368442528f7060039eda390cc4091bfd1dca41e8046af7c910dda8 \
-    --hash=sha256:decbfa2f618fa8ed81c95ee18a387ff973143c656ef800c9f24fb7e9c16054e2 \
-    --hash=sha256:e4fdb9275308292e880dcbeb12546df7f3e0f96c6b41197e0cf37d2826359020 \
-    --hash=sha256:eb1b046be06b0fce7249f1d025cd359b4b80fc1c3e24ad9eca33e0dcdb2e4a35 \
-    --hash=sha256:eb6e651000a19c96f452c85132811d25e9264d836951022d6e81df2fff38337d \
-    --hash=sha256:ed867c42c268f876097248e05b6117a65bcd1e63b779e916fe2e33cd6fd0d3c3 \
-    --hash=sha256:edfad1d29c73f9b863ebe7082ae9321374ccb10879eeabc84ba3b69f2579d537 \
-    --hash=sha256:f2058f813d4f2b5e3a9eb2eb3faf8f1d99b81c3e51aeda4b168406443e8ba809 \
-    --hash=sha256:f6b2d0c6703c988d334f297aa5df18c45e97b0af3679bb75059e0e0bd8b1069d \
-    --hash=sha256:f8212564d49c50eb4565e502814f694e240c55551a5f1bc841d4fcaabb0a9b8a \
-    --hash=sha256:ffa565331890b90056c01db69c0fe634a776f8019c143a5ae265f9c6bc4bd6d4
-    # via pip-system-certs
-zipp==3.20.1 \
-    --hash=sha256:9960cd8967c8f85a56f920d5d507274e74f9ff813a0ab8889a5b5be2daf44064 \
-    --hash=sha256:c22b14cc4763c5a5b04134207736c107db42e9d3ef2d9779d465f5f1bcba572b
-    # via importlib-metadata
-
-# The following packages are considered to be unsafe in a requirements file:
-pip==24.2 \
-    --hash=sha256:2cd581cf58ab7fcfca4ce8efa6dcacd0de5bf8d0a3eb9ec927e07405f4d9e2a2 \
-    --hash=sha256:5b5e490b5e9cb275c879595064adce9ebd31b854e3e803740b72f9ccf34a45b8
-    # via pip-tools
-setuptools==69.5.1 \
-    --hash=sha256:6c1fccdac05a97e598fb0ae3bbed5904ccb317337a51139dcd51453611bbb987 \
-    --hash=sha256:c636ac361bc47580504644275c9ad802c50415c7522212252c033bd15f301f32
-    # via
-    #   -r requirements.bundle.in
-    #   pip-tools
diff --git a/python/requirements.dev.txt b/python/requirements.dev.txt
deleted file mode 100644
index 293ee343d..000000000
--- a/python/requirements.dev.txt
+++ /dev/null
@@ -1,715 +0,0 @@
-astroid==3.2.4 \
-    --hash=sha256:0e14202810b30da1b735827f78f5157be2bbd4a7a59b7707ca0bfc2fb4c0063a \
-    --hash=sha256:413658a61eeca6202a59231abb473f932038fbcbf1666587f66d482083413a25
-    # via pylint
-atomicwrites==1.4.1 \
-    --hash=sha256:81b2c9071a49367a7f770170e5eec8cb66567cfbbc8c73d20ce5ca4a8d71cf11
-    # via -r requirements.dev.in
-attrs==24.2.0 \
-    --hash=sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346 \
-    --hash=sha256:81921eb96de3191c8258c199618104dd27ac608d9366f5e35d011eae1867ede2
-    # via jsonschema
-beautifulsoup4==4.12.3 \
-    --hash=sha256:74e3d1928edc070d21748185c46e3fb33490f22f52a3addee9aee0f4f7781051 \
-    --hash=sha256:b80878c9f40111313e55da8ba20bdba06d8fa3969fc68304167741bbf9e082ed
-    # via
-    #   -r requirements.anki.in
-    #   -r requirements.aqt.in
-black==24.8.0 \
-    --hash=sha256:09cdeb74d494ec023ded657f7092ba518e8cf78fa8386155e4a03fdcc44679e6 \
-    --hash=sha256:1f13f7f386f86f8121d76599114bb8c17b69d962137fc70efe56137727c7047e \
-    --hash=sha256:2500945420b6784c38b9ee885af039f5e7471ef284ab03fa35ecdde4688cd83f \
-    --hash=sha256:2b59b250fdba5f9a9cd9d0ece6e6d993d91ce877d121d161e4698af3eb9c1018 \
-    --hash=sha256:3c4285573d4897a7610054af5a890bde7c65cb466040c5f0c8b732812d7f0e5e \
-    --hash=sha256:505289f17ceda596658ae81b61ebbe2d9b25aa78067035184ed0a9d855d18afd \
-    --hash=sha256:62e8730977f0b77998029da7971fa896ceefa2c4c4933fcd593fa599ecbf97a4 \
-    --hash=sha256:649f6d84ccbae73ab767e206772cc2d7a393a001070a4c814a546afd0d423aed \
-    --hash=sha256:6e55d30d44bed36593c3163b9bc63bf58b3b30e4611e4d88a0c3c239930ed5b2 \
-    --hash=sha256:707a1ca89221bc8a1a64fb5e15ef39cd755633daa672a9db7498d1c19de66a42 \
-    --hash=sha256:72901b4913cbac8972ad911dc4098d5753704d1f3c56e44ae8dce99eecb0e3af \
-    --hash=sha256:73bbf84ed136e45d451a260c6b73ed674652f90a2b3211d6a35e78054563a9bb \
-    --hash=sha256:7c046c1d1eeb7aea9335da62472481d3bbf3fd986e093cffd35f4385c94ae368 \
-    --hash=sha256:81c6742da39f33b08e791da38410f32e27d632260e599df7245cccee2064afeb \
-    --hash=sha256:837fd281f1908d0076844bc2b801ad2d369c78c45cf800cad7b61686051041af \
-    --hash=sha256:972085c618ee94f402da1af548a4f218c754ea7e5dc70acb168bfaca4c2542ed \
-    --hash=sha256:9e84e33b37be070ba135176c123ae52a51f82306def9f7d063ee302ecab2cf47 \
-    --hash=sha256:b19c9ad992c7883ad84c9b22aaa73562a16b819c1d8db7a1a1a49fb7ec13c7d2 \
-    --hash=sha256:d6417535d99c37cee4091a2f24eb2b6d5ec42b144d50f1f2e436d9fe1916fe1a \
-    --hash=sha256:eab4dd44ce80dea27dc69db40dab62d4ca96112f87996bca68cd75639aeb2e4c \
-    --hash=sha256:f490dbd59680d809ca31efdae20e634f3fae27fba3ce0ba3208333b713bc3920 \
-    --hash=sha256:fb6e2c0b86bbd43dee042e48059c9ad7830abd5c94b0bc518c0eeec57c3eddc1
-    # via -r requirements.dev.in
-blinker==1.8.2 \
-    --hash=sha256:1779309f71bf239144b9399d06ae925637cf6634cf6bd131104184531bf67c01 \
-    --hash=sha256:8f77b09d3bf7c795e969e9486f39c2c5e9c39d4ee07424be2bc594ece9642d83
-    # via flask
-build==1.2.1 \
-    --hash=sha256:526263f4870c26f26c433545579475377b2b7588b6f1eac76a001e873ae3e19d \
-    --hash=sha256:75e10f767a433d9a86e50d83f418e83efc18ede923ee5ff7df93b6cb0306c5d4
-    # via pip-tools
-certifi==2024.8.30 \
-    --hash=sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8 \
-    --hash=sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9
-    # via requests
-charset-normalizer==3.3.2 \
-    --hash=sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027 \
-    --hash=sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087 \
-    --hash=sha256:0a55554a2fa0d408816b3b5cedf0045f4b8e1a6065aec45849de2d6f3f8e9786 \
-    --hash=sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8 \
-    --hash=sha256:10955842570876604d404661fbccbc9c7e684caf432c09c715ec38fbae45ae09 \
-    --hash=sha256:122c7fa62b130ed55f8f285bfd56d5f4b4a5b503609d181f9ad85e55c89f4185 \
-    --hash=sha256:1ceae2f17a9c33cb48e3263960dc5fc8005351ee19db217e9b1bb15d28c02574 \
-    --hash=sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e \
-    --hash=sha256:1f79682fbe303db92bc2b1136016a38a42e835d932bab5b3b1bfcfbf0640e519 \
-    --hash=sha256:2127566c664442652f024c837091890cb1942c30937add288223dc895793f898 \
-    --hash=sha256:22afcb9f253dac0696b5a4be4a1c0f8762f8239e21b99680099abd9b2b1b2269 \
-    --hash=sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3 \
-    --hash=sha256:2e81c7b9c8979ce92ed306c249d46894776a909505d8f5a4ba55b14206e3222f \
-    --hash=sha256:3287761bc4ee9e33561a7e058c72ac0938c4f57fe49a09eae428fd88aafe7bb6 \
-    --hash=sha256:34d1c8da1e78d2e001f363791c98a272bb734000fcef47a491c1e3b0505657a8 \
-    --hash=sha256:37e55c8e51c236f95b033f6fb391d7d7970ba5fe7ff453dad675e88cf303377a \
-    --hash=sha256:3d47fa203a7bd9c5b6cee4736ee84ca03b8ef23193c0d1ca99b5089f72645c73 \
-    --hash=sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc \
-    --hash=sha256:42cb296636fcc8b0644486d15c12376cb9fa75443e00fb25de0b8602e64c1714 \
-    --hash=sha256:45485e01ff4d3630ec0d9617310448a8702f70e9c01906b0d0118bdf9d124cf2 \
-    --hash=sha256:4a78b2b446bd7c934f5dcedc588903fb2f5eec172f3d29e52a9096a43722adfc \
-    --hash=sha256:4ab2fe47fae9e0f9dee8c04187ce5d09f48eabe611be8259444906793ab7cbce \
-    --hash=sha256:4d0d1650369165a14e14e1e47b372cfcb31d6ab44e6e33cb2d4e57265290044d \
-    --hash=sha256:549a3a73da901d5bc3ce8d24e0600d1fa85524c10287f6004fbab87672bf3e1e \
-    --hash=sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6 \
-    --hash=sha256:572c3763a264ba47b3cf708a44ce965d98555f618ca42c926a9c1616d8f34269 \
-    --hash=sha256:573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96 \
-    --hash=sha256:5b4c145409bef602a690e7cfad0a15a55c13320ff7a3ad7ca59c13bb8ba4d45d \
-    --hash=sha256:6463effa3186ea09411d50efc7d85360b38d5f09b870c48e4600f63af490e56a \
-    --hash=sha256:65f6f63034100ead094b8744b3b97965785388f308a64cf8d7c34f2f2e5be0c4 \
-    --hash=sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77 \
-    --hash=sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d \
-    --hash=sha256:68d1f8a9e9e37c1223b656399be5d6b448dea850bed7d0f87a8311f1ff3dabb0 \
-    --hash=sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed \
-    --hash=sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068 \
-    --hash=sha256:6c4caeef8fa63d06bd437cd4bdcf3ffefe6738fb1b25951440d80dc7df8c03ac \
-    --hash=sha256:6ef1d82a3af9d3eecdba2321dc1b3c238245d890843e040e41e470ffa64c3e25 \
-    --hash=sha256:753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8 \
-    --hash=sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab \
-    --hash=sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26 \
-    --hash=sha256:7f04c839ed0b6b98b1a7501a002144b76c18fb1c1850c8b98d458ac269e26ed2 \
-    --hash=sha256:802fe99cca7457642125a8a88a084cef28ff0cf9407060f7b93dca5aa25480db \
-    --hash=sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f \
-    --hash=sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5 \
-    --hash=sha256:86216b5cee4b06df986d214f664305142d9c76df9b6512be2738aa72a2048f99 \
-    --hash=sha256:87d1351268731db79e0f8e745d92493ee2841c974128ef629dc518b937d9194c \
-    --hash=sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d \
-    --hash=sha256:8c622a5fe39a48f78944a87d4fb8a53ee07344641b0562c540d840748571b811 \
-    --hash=sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa \
-    --hash=sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a \
-    --hash=sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03 \
-    --hash=sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b \
-    --hash=sha256:923c0c831b7cfcb071580d3f46c4baf50f174be571576556269530f4bbd79d04 \
-    --hash=sha256:95f2a5796329323b8f0512e09dbb7a1860c46a39da62ecb2324f116fa8fdc85c \
-    --hash=sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001 \
-    --hash=sha256:9f96df6923e21816da7e0ad3fd47dd8f94b2a5ce594e00677c0013018b813458 \
-    --hash=sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389 \
-    --hash=sha256:a50aebfa173e157099939b17f18600f72f84eed3049e743b68ad15bd69b6bf99 \
-    --hash=sha256:a981a536974bbc7a512cf44ed14938cf01030a99e9b3a06dd59578882f06f985 \
-    --hash=sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537 \
-    --hash=sha256:ae5f4161f18c61806f411a13b0310bea87f987c7d2ecdbdaad0e94eb2e404238 \
-    --hash=sha256:aed38f6e4fb3f5d6bf81bfa990a07806be9d83cf7bacef998ab1a9bd660a581f \
-    --hash=sha256:b01b88d45a6fcb69667cd6d2f7a9aeb4bf53760d7fc536bf679ec94fe9f3ff3d \
-    --hash=sha256:b261ccdec7821281dade748d088bb6e9b69e6d15b30652b74cbbac25e280b796 \
-    --hash=sha256:b2b0a0c0517616b6869869f8c581d4eb2dd83a4d79e0ebcb7d373ef9956aeb0a \
-    --hash=sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143 \
-    --hash=sha256:bd8f7df7d12c2db9fab40bdd87a7c09b1530128315d047a086fa3ae3435cb3a8 \
-    --hash=sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c \
-    --hash=sha256:c002b4ffc0be611f0d9da932eb0f704fe2602a9a949d1f738e4c34c75b0863d5 \
-    --hash=sha256:c083af607d2515612056a31f0a8d9e0fcb5876b7bfc0abad3ecd275bc4ebc2d5 \
-    --hash=sha256:c180f51afb394e165eafe4ac2936a14bee3eb10debc9d9e4db8958fe36afe711 \
-    --hash=sha256:c235ebd9baae02f1b77bcea61bce332cb4331dc3617d254df3323aa01ab47bd4 \
-    --hash=sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6 \
-    --hash=sha256:d0eccceffcb53201b5bfebb52600a5fb483a20b61da9dbc885f8b103cbe7598c \
-    --hash=sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7 \
-    --hash=sha256:db364eca23f876da6f9e16c9da0df51aa4f104a972735574842618b8c6d999d4 \
-    --hash=sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b \
-    --hash=sha256:deb6be0ac38ece9ba87dea880e438f25ca3eddfac8b002a2ec3d9183a454e8ae \
-    --hash=sha256:e06ed3eb3218bc64786f7db41917d4e686cc4856944f53d5bdf83a6884432e12 \
-    --hash=sha256:e27ad930a842b4c5eb8ac0016b0a54f5aebbe679340c26101df33424142c143c \
-    --hash=sha256:e537484df0d8f426ce2afb2d0f8e1c3d0b114b83f8850e5f2fbea0e797bd82ae \
-    --hash=sha256:eb00ed941194665c332bf8e078baf037d6c35d7c4f3102ea2d4f16ca94a26dc8 \
-    --hash=sha256:eb6904c354526e758fda7167b33005998fb68c46fbc10e013ca97f21ca5c8887 \
-    --hash=sha256:eb8821e09e916165e160797a6c17edda0679379a4be5c716c260e836e122f54b \
-    --hash=sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4 \
-    --hash=sha256:f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f \
-    --hash=sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5 \
-    --hash=sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33 \
-    --hash=sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519 \
-    --hash=sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561
-    # via requests
-click==8.1.7 \
-    --hash=sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28 \
-    --hash=sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de
-    # via
-    #   black
-    #   flask
-    #   pip-tools
-colorama==0.4.6 \
-    --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \
-    --hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6
-    # via
-    #   -r requirements.base.in
-    #   -r requirements.dev.in
-compare-locales==9.0.4 \
-    --hash=sha256:73d0d384aefa0bc96f5fd8521c08c8bb89b16a37316701323a77960accabd551 \
-    --hash=sha256:933d2b6e20f460d3ac2d3176295684505a42085b25e6c31944fcafbaf52f1cc0
-    # via -r requirements.dev.in
-decorator==5.1.1 \
-    --hash=sha256:637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330 \
-    --hash=sha256:b8c3f85900b9dc423225913c5aace94729fe1fa9763b38939a95226f02d37186
-    # via -r requirements.anki.in
-dill==0.3.8 \
-    --hash=sha256:3ebe3c479ad625c4553aca177444d89b486b1d84982eeacded644afc0cf797ca \
-    --hash=sha256:c36ca9ffb54365bdd2f8eb3eff7d2a21237f8452b57ace88b1ac615b7e815bd7
-    # via pylint
-distro==1.9.0 ; sys_platform != "darwin" and sys_platform != "win32" \
-    --hash=sha256:2fa77c6fd8940f116ee1d6b94a2f90b13b5ea8d019b98bc8bafdcabcdd9bdbed \
-    --hash=sha256:7bffd925d65168f85027d8da9af6bddab658135b840670a223589bc0c8ef02b2
-    # via -r requirements.anki.in
-exceptiongroup==1.2.2 \
-    --hash=sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b \
-    --hash=sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc
-    # via pytest
-flask[async]==3.0.3 \
-    --hash=sha256:34e815dfaa43340d1d15a5c3a02b8476004037eb4840b34910c6e21679d288f3 \
-    --hash=sha256:ceb27b0af3823ea2737928a4d99d125a06175b8512c445cbd9a9ce200ef76842
-    # via
-    #   -r requirements.aqt.in
-    #   flask-cors
-    #   types-flask-cors
-flask-cors==6.0.0 \
-    --hash=sha256:4592c1570246bf7beee96b74bc0adbbfcb1b0318f6ba05c412e8909eceec3393 \
-    --hash=sha256:6332073356452343a8ccddbfec7befdc3fdd040141fe776ec9b94c262f058657
-    # via -r requirements.aqt.in
-fluent-syntax==0.19.0 \
-    --hash=sha256:920326d7f46864b9758f0044e9968e3112198bc826acee16ddd8f11d359004fd \
-    --hash=sha256:b352b3475fac6c6ed5f06527921f432aac073d764445508ee5218aeccc7cc5c4
-    # via
-    #   -r requirements.dev.in
-    #   compare-locales
-idna==3.8 \
-    --hash=sha256:050b4e5baadcd44d760cedbd2b8e639f2ff89bbc7a5730fcc662954303377aac \
-    --hash=sha256:d838c2c0ed6fced7693d5e8ab8e734d5f8fda53a039c0164afb0b82e771e3603
-    # via requests
-importlib-metadata==8.4.0 \
-    --hash=sha256:66f342cc6ac9818fc6ff340576acd24d65ba0b3efabb2b4ac08b598965a4a2f1 \
-    --hash=sha256:9a547d3bc3608b025f93d403fdd1aae741c24fbb8314df4b155675742ce303c5
-    # via
-    #   build
-    #   flask
-    #   markdown
-iniconfig==2.0.0 \
-    --hash=sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3 \
-    --hash=sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374
-    # via pytest
-isort==5.13.2 \
-    --hash=sha256:48fdfcb9face5d58a4f6dde2e72a1fb8dcaf8ab26f95ab49fab84c2ddefb0109 \
-    --hash=sha256:8ca5e72a8d85860d5a3fa69b8745237f2939afe12dbf656afbcb47fe72d947a6
-    # via
-    #   -r requirements.dev.in
-    #   pylint
-itsdangerous==2.2.0 \
-    --hash=sha256:c6242fc49e35958c8b15141343aa660db5fc54d4f13a1db01a3f5891b98700ef \
-    --hash=sha256:e0050c0b7da1eea53ffaf149c0cfbb5c6e2e2b69c4bef22c81fa6eb73e5f6173
-    # via flask
-jinja2==3.1.5 \
-    --hash=sha256:8fefff8dc3034e27bb80d67c671eb8a9bc424c0ef4c0826edbff304cceff43bb \
-    --hash=sha256:aba0f4dc9ed8013c424088f68a5c226f7d6097ed89b246d7749c2ec4175c6adb
-    # via flask
-jsonschema==4.1.2 \
-    --hash=sha256:166870c8ab27bd712a8627e0598de4685bd8d199c4d7bd7cacc3d941ba0c6ca0 \
-    --hash=sha256:5c1a282ee6b74235057421fd0f766ac5f2972f77440927f6471c9e8493632fac
-    # via -r requirements.aqt.in
-markdown==3.7 \
-    --hash=sha256:2ae2471477cfd02dbbf038d5d9bc226d40def84b4fe2986e49b59b6b472bbed2 \
-    --hash=sha256:7eb6df5690b81a1d7942992c97fad2938e956e79df20cbc6186e9c3a77b1c803
-    # via -r requirements.anki.in
-markupsafe==2.1.5 \
-    --hash=sha256:00e046b6dd71aa03a41079792f8473dc494d564611a8f89bbbd7cb93295ebdcf \
-    --hash=sha256:075202fa5b72c86ad32dc7d0b56024ebdbcf2048c0ba09f1cde31bfdd57bcfff \
-    --hash=sha256:0e397ac966fdf721b2c528cf028494e86172b4feba51d65f81ffd65c63798f3f \
-    --hash=sha256:17b950fccb810b3293638215058e432159d2b71005c74371d784862b7e4683f3 \
-    --hash=sha256:1f3fbcb7ef1f16e48246f704ab79d79da8a46891e2da03f8783a5b6fa41a9532 \
-    --hash=sha256:2174c595a0d73a3080ca3257b40096db99799265e1c27cc5a610743acd86d62f \
-    --hash=sha256:2b7c57a4dfc4f16f7142221afe5ba4e093e09e728ca65c51f5620c9aaeb9a617 \
-    --hash=sha256:2d2d793e36e230fd32babe143b04cec8a8b3eb8a3122d2aceb4a371e6b09b8df \
-    --hash=sha256:30b600cf0a7ac9234b2638fbc0fb6158ba5bdcdf46aeb631ead21248b9affbc4 \
-    --hash=sha256:397081c1a0bfb5124355710fe79478cdbeb39626492b15d399526ae53422b906 \
-    --hash=sha256:3a57fdd7ce31c7ff06cdfbf31dafa96cc533c21e443d57f5b1ecc6cdc668ec7f \
-    --hash=sha256:3c6b973f22eb18a789b1460b4b91bf04ae3f0c4234a0a6aa6b0a92f6f7b951d4 \
-    --hash=sha256:3e53af139f8579a6d5f7b76549125f0d94d7e630761a2111bc431fd820e163b8 \
-    --hash=sha256:4096e9de5c6fdf43fb4f04c26fb114f61ef0bf2e5604b6ee3019d51b69e8c371 \
-    --hash=sha256:4275d846e41ecefa46e2015117a9f491e57a71ddd59bbead77e904dc02b1bed2 \
-    --hash=sha256:4c31f53cdae6ecfa91a77820e8b151dba54ab528ba65dfd235c80b086d68a465 \
-    --hash=sha256:4f11aa001c540f62c6166c7726f71f7573b52c68c31f014c25cc7901deea0b52 \
-    --hash=sha256:5049256f536511ee3f7e1b3f87d1d1209d327e818e6ae1365e8653d7e3abb6a6 \
-    --hash=sha256:58c98fee265677f63a4385256a6d7683ab1832f3ddd1e66fe948d5880c21a169 \
-    --hash=sha256:598e3276b64aff0e7b3451b72e94fa3c238d452e7ddcd893c3ab324717456bad \
-    --hash=sha256:5b7b716f97b52c5a14bffdf688f971b2d5ef4029127f1ad7a513973cfd818df2 \
-    --hash=sha256:5dedb4db619ba5a2787a94d877bc8ffc0566f92a01c0ef214865e54ecc9ee5e0 \
-    --hash=sha256:619bc166c4f2de5caa5a633b8b7326fbe98e0ccbfacabd87268a2b15ff73a029 \
-    --hash=sha256:629ddd2ca402ae6dbedfceeba9c46d5f7b2a61d9749597d4307f943ef198fc1f \
-    --hash=sha256:656f7526c69fac7f600bd1f400991cc282b417d17539a1b228617081106feb4a \
-    --hash=sha256:6ec585f69cec0aa07d945b20805be741395e28ac1627333b1c5b0105962ffced \
-    --hash=sha256:72b6be590cc35924b02c78ef34b467da4ba07e4e0f0454a2c5907f473fc50ce5 \
-    --hash=sha256:7502934a33b54030eaf1194c21c692a534196063db72176b0c4028e140f8f32c \
-    --hash=sha256:7a68b554d356a91cce1236aa7682dc01df0edba8d043fd1ce607c49dd3c1edcf \
-    --hash=sha256:7b2e5a267c855eea6b4283940daa6e88a285f5f2a67f2220203786dfa59b37e9 \
-    --hash=sha256:823b65d8706e32ad2df51ed89496147a42a2a6e01c13cfb6ffb8b1e92bc910bb \
-    --hash=sha256:8590b4ae07a35970728874632fed7bd57b26b0102df2d2b233b6d9d82f6c62ad \
-    --hash=sha256:8dd717634f5a044f860435c1d8c16a270ddf0ef8588d4887037c5028b859b0c3 \
-    --hash=sha256:8dec4936e9c3100156f8a2dc89c4b88d5c435175ff03413b443469c7c8c5f4d1 \
-    --hash=sha256:97cafb1f3cbcd3fd2b6fbfb99ae11cdb14deea0736fc2b0952ee177f2b813a46 \
-    --hash=sha256:a17a92de5231666cfbe003f0e4b9b3a7ae3afb1ec2845aadc2bacc93ff85febc \
-    --hash=sha256:a549b9c31bec33820e885335b451286e2969a2d9e24879f83fe904a5ce59d70a \
-    --hash=sha256:ac07bad82163452a6884fe8fa0963fb98c2346ba78d779ec06bd7a6262132aee \
-    --hash=sha256:ae2ad8ae6ebee9d2d94b17fb62763125f3f374c25618198f40cbb8b525411900 \
-    --hash=sha256:b91c037585eba9095565a3556f611e3cbfaa42ca1e865f7b8015fe5c7336d5a5 \
-    --hash=sha256:bc1667f8b83f48511b94671e0e441401371dfd0f0a795c7daa4a3cd1dde55bea \
-    --hash=sha256:bec0a414d016ac1a18862a519e54b2fd0fc8bbfd6890376898a6c0891dd82e9f \
-    --hash=sha256:bf50cd79a75d181c9181df03572cdce0fbb75cc353bc350712073108cba98de5 \
-    --hash=sha256:bff1b4290a66b490a2f4719358c0cdcd9bafb6b8f061e45c7a2460866bf50c2e \
-    --hash=sha256:c061bb86a71b42465156a3ee7bd58c8c2ceacdbeb95d05a99893e08b8467359a \
-    --hash=sha256:c8b29db45f8fe46ad280a7294f5c3ec36dbac9491f2d1c17345be8e69cc5928f \
-    --hash=sha256:ce409136744f6521e39fd8e2a24c53fa18ad67aa5bc7c2cf83645cce5b5c4e50 \
-    --hash=sha256:d050b3361367a06d752db6ead6e7edeb0009be66bc3bae0ee9d97fb326badc2a \
-    --hash=sha256:d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b \
-    --hash=sha256:d9fad5155d72433c921b782e58892377c44bd6252b5af2f67f16b194987338a4 \
-    --hash=sha256:daa4ee5a243f0f20d528d939d06670a298dd39b1ad5f8a72a4275124a7819eff \
-    --hash=sha256:db0b55e0f3cc0be60c1f19efdde9a637c32740486004f20d1cff53c3c0ece4d2 \
-    --hash=sha256:e61659ba32cf2cf1481e575d0462554625196a1f2fc06a1c777d3f48e8865d46 \
-    --hash=sha256:ea3d8a3d18833cf4304cd2fc9cbb1efe188ca9b5efef2bdac7adc20594a0e46b \
-    --hash=sha256:ec6a563cff360b50eed26f13adc43e61bc0c04d94b8be985e6fb24b81f6dcfdf \
-    --hash=sha256:f5dfb42c4604dddc8e4305050aa6deb084540643ed5804d7455b5df8fe16f5e5 \
-    --hash=sha256:fa173ec60341d6bb97a89f5ea19c85c5643c1e7dedebc22f5181eb73573142c5 \
-    --hash=sha256:fa9db3f79de01457b03d4f01b34cf91bc0048eb2c3846ff26f66687c2f6d16ab \
-    --hash=sha256:fce659a462a1be54d2ffcacea5e3ba2d74daa74f30f5f143fe0c58636e355fdd \
-    --hash=sha256:ffee1f21e5ef0d712f9033568f8344d5da8cc2869dbd08d87c84656e6a2d2f68
-    # via
-    #   jinja2
-    #   werkzeug
-mccabe==0.7.0 \
-    --hash=sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325 \
-    --hash=sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e
-    # via pylint
-mock==5.1.0 \
-    --hash=sha256:18c694e5ae8a208cdb3d2c20a993ca1a7b0efa258c247a1e565150f477f83744 \
-    --hash=sha256:5e96aad5ccda4718e0a229ed94b2024df75cc2d55575ba5762d31f5767b8767d
-    # via -r requirements.dev.in
-mypy==1.11.2 \
-    --hash=sha256:06d26c277962f3fb50e13044674aa10553981ae514288cb7d0a738f495550b36 \
-    --hash=sha256:2ff93107f01968ed834f4256bc1fc4475e2fecf6c661260066a985b52741ddce \
-    --hash=sha256:36383a4fcbad95f2657642a07ba22ff797de26277158f1cc7bd234821468b1b6 \
-    --hash=sha256:37c7fa6121c1cdfcaac97ce3d3b5588e847aa79b580c1e922bb5d5d2902df19b \
-    --hash=sha256:3a66169b92452f72117e2da3a576087025449018afc2d8e9bfe5ffab865709ca \
-    --hash=sha256:3f14cd3d386ac4d05c5a39a51b84387403dadbd936e17cb35882134d4f8f0d24 \
-    --hash=sha256:41ea707d036a5307ac674ea172875f40c9d55c5394f888b168033177fce47383 \
-    --hash=sha256:478db5f5036817fe45adb7332d927daa62417159d49783041338921dcf646fc7 \
-    --hash=sha256:4a8a53bc3ffbd161b5b2a4fff2f0f1e23a33b0168f1c0778ec70e1a3d66deb86 \
-    --hash=sha256:539c570477a96a4e6fb718b8d5c3e0c0eba1f485df13f86d2970c91f0673148d \
-    --hash=sha256:57555a7715c0a34421013144a33d280e73c08df70f3a18a552938587ce9274f4 \
-    --hash=sha256:6e658bd2d20565ea86da7d91331b0eed6d2eee22dc031579e6297f3e12c758c8 \
-    --hash=sha256:6e7184632d89d677973a14d00ae4d03214c8bc301ceefcdaf5c474866814c987 \
-    --hash=sha256:75746e06d5fa1e91bfd5432448d00d34593b52e7e91a187d981d08d1f33d4385 \
-    --hash=sha256:7f9993ad3e0ffdc95c2a14b66dee63729f021968bff8ad911867579c65d13a79 \
-    --hash=sha256:801780c56d1cdb896eacd5619a83e427ce436d86a3bdf9112527f24a66618fef \
-    --hash=sha256:801ca29f43d5acce85f8e999b1e431fb479cb02d0e11deb7d2abb56bdaf24fd6 \
-    --hash=sha256:969ea3ef09617aff826885a22ece0ddef69d95852cdad2f60c8bb06bf1f71f70 \
-    --hash=sha256:a976775ab2256aadc6add633d44f100a2517d2388906ec4f13231fafbb0eccca \
-    --hash=sha256:af8d155170fcf87a2afb55b35dc1a0ac21df4431e7d96717621962e4b9192e70 \
-    --hash=sha256:b499bc07dbdcd3de92b0a8b29fdf592c111276f6a12fe29c30f6c417dd546d12 \
-    --hash=sha256:cd953f221ac1379050a8a646585a29574488974f79d8082cedef62744f0a0104 \
-    --hash=sha256:d42a6dd818ffce7be66cce644f1dff482f1d97c53ca70908dff0b9ddc120b77a \
-    --hash=sha256:e8960dbbbf36906c5c0b7f4fbf2f0c7ffb20f4898e6a879fcf56a41a08b0d318 \
-    --hash=sha256:edb91dded4df17eae4537668b23f0ff6baf3707683734b6a818d5b9d0c0c31a1 \
-    --hash=sha256:ee23de8530d99b6db0573c4ef4bd8f39a2a6f9b60655bf7a1357e585a3486f2b \
-    --hash=sha256:f7821776e5c4286b6a13138cc935e2e9b6fde05e081bdebf5cdb2bb97c9df81d
-    # via -r requirements.dev.in
-mypy-extensions==1.0.0 \
-    --hash=sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d \
-    --hash=sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782
-    # via
-    #   black
-    #   mypy
-mypy-protobuf==3.6.0 \
-    --hash=sha256:02f242eb3409f66889f2b1a3aa58356ec4d909cdd0f93115622e9e70366eca3c \
-    --hash=sha256:56176e4d569070e7350ea620262478b49b7efceba4103d468448f1d21492fd6c
-    # via -r requirements.dev.in
-orjson==3.10.7 \
-    --hash=sha256:084e537806b458911137f76097e53ce7bf5806dda33ddf6aaa66a028f8d43a23 \
-    --hash=sha256:09b2d92fd95ad2402188cf51573acde57eb269eddabaa60f69ea0d733e789fe9 \
-    --hash=sha256:0fa5886854673222618638c6df7718ea7fe2f3f2384c452c9ccedc70b4a510a5 \
-    --hash=sha256:11748c135f281203f4ee695b7f80bb1358a82a63905f9f0b794769483ea854ad \
-    --hash=sha256:1193b2416cbad1a769f868b1749535d5da47626ac29445803dae7cc64b3f5c98 \
-    --hash=sha256:144888c76f8520e39bfa121b31fd637e18d4cc2f115727865fdf9fa325b10412 \
-    --hash=sha256:1d9c0e733e02ada3ed6098a10a8ee0052dd55774de3d9110d29868d24b17faa1 \
-    --hash=sha256:23820a1563a1d386414fef15c249040042b8e5d07b40ab3fe3efbfbbcbcb8864 \
-    --hash=sha256:33cfb96c24034a878d83d1a9415799a73dc77480e6c40417e5dda0710d559ee6 \
-    --hash=sha256:348bdd16b32556cf8d7257b17cf2bdb7ab7976af4af41ebe79f9796c218f7e91 \
-    --hash=sha256:34a566f22c28222b08875b18b0dfbf8a947e69df21a9ed5c51a6bf91cfb944ac \
-    --hash=sha256:3dcfbede6737fdbef3ce9c37af3fb6142e8e1ebc10336daa05872bfb1d87839c \
-    --hash=sha256:430ee4d85841e1483d487e7b81401785a5dfd69db5de01314538f31f8fbf7ee1 \
-    --hash=sha256:44a96f2d4c3af51bfac6bc4ef7b182aa33f2f054fd7f34cc0ee9a320d051d41f \
-    --hash=sha256:479fd0844ddc3ca77e0fd99644c7fe2de8e8be1efcd57705b5c92e5186e8a250 \
-    --hash=sha256:480f455222cb7a1dea35c57a67578848537d2602b46c464472c995297117fa09 \
-    --hash=sha256:4829cf2195838e3f93b70fd3b4292156fc5e097aac3739859ac0dcc722b27ac0 \
-    --hash=sha256:4b6146e439af4c2472c56f8540d799a67a81226e11992008cb47e1267a9b3225 \
-    --hash=sha256:4e6c3da13e5a57e4b3dca2de059f243ebec705857522f188f0180ae88badd354 \
-    --hash=sha256:5b24a579123fa884f3a3caadaed7b75eb5715ee2b17ab5c66ac97d29b18fe57f \
-    --hash=sha256:6b0dd04483499d1de9c8f6203f8975caf17a6000b9c0c54630cef02e44ee624e \
-    --hash=sha256:6ea2b2258eff652c82652d5e0f02bd5e0463a6a52abb78e49ac288827aaa1469 \
-    --hash=sha256:7122a99831f9e7fe977dc45784d3b2edc821c172d545e6420c375e5a935f5a1c \
-    --hash=sha256:74f4544f5a6405b90da8ea724d15ac9c36da4d72a738c64685003337401f5c12 \
-    --hash=sha256:75ef0640403f945f3a1f9f6400686560dbfb0fb5b16589ad62cd477043c4eee3 \
-    --hash=sha256:76ac14cd57df0572453543f8f2575e2d01ae9e790c21f57627803f5e79b0d3c3 \
-    --hash=sha256:77d325ed866876c0fa6492598ec01fe30e803272a6e8b10e992288b009cbe149 \
-    --hash=sha256:7c4c17f8157bd520cdb7195f75ddbd31671997cbe10aee559c2d613592e7d7eb \
-    --hash=sha256:7db8539039698ddfb9a524b4dd19508256107568cdad24f3682d5773e60504a2 \
-    --hash=sha256:8272527d08450ab16eb405f47e0f4ef0e5ff5981c3d82afe0efd25dcbef2bcd2 \
-    --hash=sha256:82763b46053727a7168d29c772ed5c870fdae2f61aa8a25994c7984a19b1021f \
-    --hash=sha256:8a9c9b168b3a19e37fe2778c0003359f07822c90fdff8f98d9d2a91b3144d8e0 \
-    --hash=sha256:8de062de550f63185e4c1c54151bdddfc5625e37daf0aa1e75d2a1293e3b7d9a \
-    --hash=sha256:974683d4618c0c7dbf4f69c95a979734bf183d0658611760017f6e70a145af58 \
-    --hash=sha256:9ea2c232deedcb605e853ae1db2cc94f7390ac776743b699b50b071b02bea6fe \
-    --hash=sha256:a0c6a008e91d10a2564edbb6ee5069a9e66df3fbe11c9a005cb411f441fd2c09 \
-    --hash=sha256:a763bc0e58504cc803739e7df040685816145a6f3c8a589787084b54ebc9f16e \
-    --hash=sha256:a7e19150d215c7a13f39eb787d84db274298d3f83d85463e61d277bbd7f401d2 \
-    --hash=sha256:ac7cf6222b29fbda9e3a472b41e6a5538b48f2c8f99261eecd60aafbdb60690c \
-    --hash=sha256:b48b3db6bb6e0a08fa8c83b47bc169623f801e5cc4f24442ab2b6617da3b5313 \
-    --hash=sha256:b58d3795dafa334fc8fd46f7c5dc013e6ad06fd5b9a4cc98cb1456e7d3558bd6 \
-    --hash=sha256:bdbb61dcc365dd9be94e8f7df91975edc9364d6a78c8f7adb69c1cdff318ec93 \
-    --hash=sha256:bf6ba8ebc8ef5792e2337fb0419f8009729335bb400ece005606336b7fd7bab7 \
-    --hash=sha256:c31008598424dfbe52ce8c5b47e0752dca918a4fdc4a2a32004efd9fab41d866 \
-    --hash=sha256:cb61938aec8b0ffb6eef484d480188a1777e67b05d58e41b435c74b9d84e0b9c \
-    --hash=sha256:d2d9f990623f15c0ae7ac608103c33dfe1486d2ed974ac3f40b693bad1a22a7b \
-    --hash=sha256:d352ee8ac1926d6193f602cbe36b1643bbd1bbcb25e3c1a657a4390f3000c9a5 \
-    --hash=sha256:d374d36726746c81a49f3ff8daa2898dccab6596864ebe43d50733275c629175 \
-    --hash=sha256:de817e2f5fc75a9e7dd350c4b0f54617b280e26d1631811a43e7e968fa71e3e9 \
-    --hash=sha256:e724cebe1fadc2b23c6f7415bad5ee6239e00a69f30ee423f319c6af70e2a5c0 \
-    --hash=sha256:e72591bcfe7512353bd609875ab38050efe3d55e18934e2f18950c108334b4ff \
-    --hash=sha256:e76be12658a6fa376fcd331b1ea4e58f5a06fd0220653450f0d415b8fd0fbe20 \
-    --hash=sha256:eb8d384a24778abf29afb8e41d68fdd9a156cf6e5390c04cc07bbc24b89e98b5 \
-    --hash=sha256:ed350d6978d28b92939bfeb1a0570c523f6170efc3f0a0ef1f1df287cd4f4960 \
-    --hash=sha256:eef44224729e9525d5261cc8d28d6b11cafc90e6bd0be2157bde69a52ec83024 \
-    --hash=sha256:f4db56635b58cd1a200b0a23744ff44206ee6aa428185e2b6c4a65b3197abdcd \
-    --hash=sha256:fdf5197a21dd660cf19dfd2a3ce79574588f8f5e2dbf21bda9ee2d2b46924d84
-    # via -r requirements.anki.in
-packaging==24.1 \
-    --hash=sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002 \
-    --hash=sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124
-    # via
-    #   black
-    #   build
-    #   pytest
-pathspec==0.12.1 \
-    --hash=sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08 \
-    --hash=sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712
-    # via black
-pip-system-certs==4.0 \
-    --hash=sha256:47202b9403a6f40783a9674bbc8873f5fc86544ec01a49348fa913e99e2ff68b \
-    --hash=sha256:db8e6a31388d9795ec9139957df1a89fa5274fb66164456fd091a5d3e94c350c
-    # via -r requirements.aqt.in
-pip-tools==7.4.1 \
-    --hash=sha256:4c690e5fbae2f21e87843e89c26191f0d9454f362d8acdbd695716493ec8b3a9 \
-    --hash=sha256:864826f5073864450e24dbeeb85ce3920cdfb09848a3d69ebf537b521f14bcc9
-    # via
-    #   -r requirements.base.in
-    #   -r requirements.dev.in
-platformdirs==4.2.2 \
-    --hash=sha256:2d7a1657e36a80ea911db832a8a6ece5ee53d8de21edd5cc5879af6530b1bfee \
-    --hash=sha256:38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3
-    # via
-    #   black
-    #   pylint
-pluggy==1.5.0 \
-    --hash=sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1 \
-    --hash=sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669
-    # via pytest
-protobuf==5.28.2 \
-    --hash=sha256:2c69461a7fcc8e24be697624c09a839976d82ae75062b11a0972e41fd2cd9132 \
-    --hash=sha256:35cfcb15f213449af7ff6198d6eb5f739c37d7e4f1c09b5d0641babf2cc0c68f \
-    --hash=sha256:52235802093bd8a2811abbe8bf0ab9c5f54cca0a751fdd3f6ac2a21438bffece \
-    --hash=sha256:59379674ff119717404f7454647913787034f03fe7049cbef1d74a97bb4593f0 \
-    --hash=sha256:5e8a95246d581eef20471b5d5ba010d55f66740942b95ba9b872d918c459452f \
-    --hash=sha256:87317e9bcda04a32f2ee82089a204d3a2f0d3c8aeed16568c7daf4756e4f1fe0 \
-    --hash=sha256:8ddc60bf374785fb7cb12510b267f59067fa10087325b8e1855b898a0d81d276 \
-    --hash=sha256:a8b9403fc70764b08d2f593ce44f1d2920c5077bf7d311fefec999f8c40f78b7 \
-    --hash=sha256:c0ea0123dac3399a2eeb1a1443d82b7afc9ff40241433296769f7da42d142ec3 \
-    --hash=sha256:ca53faf29896c526863366a52a8f4d88e69cd04ec9571ed6082fa117fac3ab36 \
-    --hash=sha256:eeea10f3dc0ac7e6b4933d32db20662902b4ab81bf28df12218aa389e9c2102d
-    # via
-    #   -r requirements.anki.in
-    #   mypy-protobuf
-pychromedevtools==1.0.3 \
-    --hash=sha256:a429968bb18d34322da4ed1b727980d35fbd8104d4e764f6d1850b4ffc6e563b
-    # via -r requirements.dev.in
-pylint==3.2.7 \
-    --hash=sha256:02f4aedeac91be69fb3b4bea997ce580a4ac68ce58b89eaefeaf06749df73f4b \
-    --hash=sha256:1b7a721b575eaeaa7d39db076b6e7743c993ea44f57979127c517c6c572c803e
-    # via -r requirements.dev.in
-pyproject-hooks==1.1.0 \
-    --hash=sha256:4b37730834edbd6bd37f26ece6b44802fb1c1ee2ece0e54ddff8bfc06db86965 \
-    --hash=sha256:7ceeefe9aec63a1064c18d939bdc3adf2d8aa1988a510afec15151578b232aa2
-    # via
-    #   build
-    #   pip-tools
-pyrsistent==0.20.0 \
-    --hash=sha256:0724c506cd8b63c69c7f883cc233aac948c1ea946ea95996ad8b1380c25e1d3f \
-    --hash=sha256:09848306523a3aba463c4b49493a760e7a6ca52e4826aa100ee99d8d39b7ad1e \
-    --hash=sha256:0f3b1bcaa1f0629c978b355a7c37acd58907390149b7311b5db1b37648eb6958 \
-    --hash=sha256:21cc459636983764e692b9eba7144cdd54fdec23ccdb1e8ba392a63666c60c34 \
-    --hash=sha256:2e14c95c16211d166f59c6611533d0dacce2e25de0f76e4c140fde250997b3ca \
-    --hash=sha256:2e2c116cc804d9b09ce9814d17df5edf1df0c624aba3b43bc1ad90411487036d \
-    --hash=sha256:4021a7f963d88ccd15b523787d18ed5e5269ce57aa4037146a2377ff607ae87d \
-    --hash=sha256:4c48f78f62ab596c679086084d0dd13254ae4f3d6c72a83ffdf5ebdef8f265a4 \
-    --hash=sha256:4f5c2d012671b7391803263419e31b5c7c21e7c95c8760d7fc35602353dee714 \
-    --hash=sha256:58b8f6366e152092194ae68fefe18b9f0b4f89227dfd86a07770c3d86097aebf \
-    --hash=sha256:59a89bccd615551391f3237e00006a26bcf98a4d18623a19909a2c48b8e986ee \
-    --hash=sha256:5cdd7ef1ea7a491ae70d826b6cc64868de09a1d5ff9ef8d574250d0940e275b8 \
-    --hash=sha256:6288b3fa6622ad8a91e6eb759cfc48ff3089e7c17fb1d4c59a919769314af224 \
-    --hash=sha256:6d270ec9dd33cdb13f4d62c95c1a5a50e6b7cdd86302b494217137f760495b9d \
-    --hash=sha256:79ed12ba79935adaac1664fd7e0e585a22caa539dfc9b7c7c6d5ebf91fb89054 \
-    --hash=sha256:7d29c23bdf6e5438c755b941cef867ec2a4a172ceb9f50553b6ed70d50dfd656 \
-    --hash=sha256:8441cf9616d642c475684d6cf2520dd24812e996ba9af15e606df5f6fd9d04a7 \
-    --hash=sha256:881bbea27bbd32d37eb24dd320a5e745a2a5b092a17f6debc1349252fac85423 \
-    --hash=sha256:8c3aba3e01235221e5b229a6c05f585f344734bd1ad42a8ac51493d74722bbce \
-    --hash=sha256:a14798c3005ec892bbada26485c2eea3b54109cb2533713e355c806891f63c5e \
-    --hash=sha256:b14decb628fac50db5e02ee5a35a9c0772d20277824cfe845c8a8b717c15daa3 \
-    --hash=sha256:b318ca24db0f0518630e8b6f3831e9cba78f099ed5c1d65ffe3e023003043ba0 \
-    --hash=sha256:c1beb78af5423b879edaf23c5591ff292cf7c33979734c99aa66d5914ead880f \
-    --hash=sha256:c55acc4733aad6560a7f5f818466631f07efc001fd023f34a6c203f8b6df0f0b \
-    --hash=sha256:ca52d1ceae015859d16aded12584c59eb3825f7b50c6cfd621d4231a6cc624ce \
-    --hash=sha256:cae40a9e3ce178415040a0383f00e8d68b569e97f31928a3a8ad37e3fde6df6a \
-    --hash=sha256:e78d0c7c1e99a4a45c99143900ea0546025e41bb59ebc10182e947cf1ece9174 \
-    --hash=sha256:ef3992833fbd686ee783590639f4b8343a57f1f75de8633749d984dc0eb16c86 \
-    --hash=sha256:f058a615031eea4ef94ead6456f5ec2026c19fb5bd6bfe86e9665c4158cf802f \
-    --hash=sha256:f5ac696f02b3fc01a710427585c855f65cd9c640e14f52abe52020722bb4906b \
-    --hash=sha256:f920385a11207dc372a028b3f1e1038bb244b3ec38d448e6d8e43c6b3ba20e98 \
-    --hash=sha256:fed2c3216a605dc9a6ea50c7e84c82906e3684c4e80d2908208f662a6cbf9022
-    # via jsonschema
-pysocks==1.7.1 \
-    --hash=sha256:08e69f092cc6dbe92a0fdd16eeb9b9ffbc13cadfe5ca4c7bd92ffb078b293299 \
-    --hash=sha256:2725bd0a9925919b9b51739eea5f9e2bae91e83288108a9ad338b2e3a4435ee5 \
-    --hash=sha256:3f8804571ebe159c380ac6de37643bb4685970655d3bba243530d6558b799aa0
-    # via requests
-pytest==8.3.2 \
-    --hash=sha256:4ba08f9ae7dcf84ded419494d229b48d0903ea6407b030eaec46df5e6a73bba5 \
-    --hash=sha256:c132345d12ce551242c87269de812483f5bcc87cdbb4722e48487ba194f9fdce
-    # via -r requirements.dev.in
-requests==2.32.3 \
-    --hash=sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 \
-    --hash=sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6
-    # via
-    #   -r requirements.anki.in
-    #   -r requirements.aqt.in
-    #   pychromedevtools
-send2trash==1.8.3 \
-    --hash=sha256:0c31227e0bd08961c7665474a3d1ef7193929fedda4233843689baa056be46c9 \
-    --hash=sha256:b18e7a3966d99871aefeb00cfbcfdced55ce4871194810fc71f4aa484b953abf
-    # via -r requirements.aqt.in
-six==1.16.0 \
-    --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
-    --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
-    # via compare-locales
-soupsieve==2.6 \
-    --hash=sha256:e2e68417777af359ec65daac1057404a3c8a5455bb8abc36f1a9866ab1a51abb \
-    --hash=sha256:e72c4ff06e4fb6e4b5a9f0f55fe6e81514581fca1515028625d0f299c602ccc9
-    # via beautifulsoup4
-toml==0.10.2 \
-    --hash=sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b \
-    --hash=sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f
-    # via compare-locales
-tomli==2.0.1 \
-    --hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \
-    --hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f
-    # via
-    #   black
-    #   build
-    #   mypy
-    #   pip-tools
-    #   pylint
-    #   pytest
-tomlkit==0.13.2 \
-    --hash=sha256:7a974427f6e119197f670fbbbeae7bef749a6c14e793db934baefc1b5f03efde \
-    --hash=sha256:fff5fe59a87295b278abd31bec92c15d9bc4a06885ab12bcea52c71119392e79
-    # via pylint
-types-click==7.1.8 \
-    --hash=sha256:8cb030a669e2e927461be9827375f83c16b8178c365852c060a34e24871e7e81 \
-    --hash=sha256:b6604968be6401dc516311ca50708a0a28baa7a0cb840efd7412f0dbbff4e092
-    # via types-flask
-types-decorator==5.1.8.20240310 \
-    --hash=sha256:3af75dc38f5baf65b9b53ea6661ce2056c5ca7d70d620d0b1f620285c1242757 \
-    --hash=sha256:52e316b03783886a8a2abdc228f7071680ba65894545cd2085ebe3cf88684a0e
-    # via -r requirements.dev.in
-types-flask==1.1.6 \
-    --hash=sha256:6ab8a9a5e258b76539d652f6341408867298550b19b81f0e41e916825fc39087 \
-    --hash=sha256:aac777b3abfff9436e6b01f6d08171cf23ea6e5be71cbf773aaabb1c5763e9cf
-    # via -r requirements.dev.in
-types-flask-cors==5.0.0.20240902 \
-    --hash=sha256:595e5f36056cd128ab905832e055f2e5d116fbdc685356eea4490bc77df82137 \
-    --hash=sha256:8921b273bf7cd9636df136b66408efcfa6338a935e5c8f53f5eff1cee03f3394
-    # via -r requirements.dev.in
-types-jinja2==2.11.9 \
-    --hash=sha256:60a1e21e8296979db32f9374d8a239af4cb541ff66447bb915d8ad398f9c63b2 \
-    --hash=sha256:dbdc74a40aba7aed520b7e4d89e8f0fe4286518494208b35123bcf084d4b8c81
-    # via types-flask
-types-markdown==3.7.0.20240822 \
-    --hash=sha256:183557c9f4f865bdefd8f5f96a38145c31819271cde111d35557c3bd2069e78d \
-    --hash=sha256:bec91c410aaf2470ffdb103e38438fbcc53689b00133f19e64869eb138432ad7
-    # via -r requirements.dev.in
-types-markupsafe==1.1.10 \
-    --hash=sha256:85b3a872683d02aea3a5ac2a8ef590193c344092032f58457287fbf8e06711b1 \
-    --hash=sha256:ca2bee0f4faafc45250602567ef38d533e877d2ddca13003b319c551ff5b3cc5
-    # via types-jinja2
-types-orjson==3.6.2 \
-    --hash=sha256:22ee9a79236b6b0bfb35a0684eded62ad930a88a56797fa3c449b026cf7dbfe4 \
-    --hash=sha256:cf9afcc79a86325c7aff251790338109ed6f6b1bab09d2d4262dd18c85a3c638
-    # via -r requirements.dev.in
-types-protobuf==5.27.0.20240626 \
-    --hash=sha256:683ba14043bade6785e3f937a7498f243b37881a91ac8d81b9202ecf8b191e9c \
-    --hash=sha256:688e8f7e8d9295db26bc560df01fb731b27a25b77cbe4c1ce945647f7024f5c1
-    # via
-    #   -r requirements.dev.in
-    #   mypy-protobuf
-types-pywin32==306.0.0.20240822 \
-    --hash=sha256:31a16f7eaf711166e8aec50ee1ddf0f16b4512e19ecc92a019ae7a0860b64bad \
-    --hash=sha256:34d22b58aaa2cc86fe585b6e2e1eda88a60b010badea0e0e4a410ebe28744645
-    # via -r requirements.dev.in
-types-requests==2.32.0.20240712 \
-    --hash=sha256:90c079ff05e549f6bf50e02e910210b98b8ff1ebdd18e19c873cd237737c1358 \
-    --hash=sha256:f754283e152c752e46e70942fa2a146b5bc70393522257bb85bd1ef7e019dcc3
-    # via -r requirements.dev.in
-types-waitress==3.0.0.20240423 \
-    --hash=sha256:7e9f77a3bc3c20436b9b7ef93da88c8fe0d1e2205d5891ae7526cbd93554f5a4 \
-    --hash=sha256:ec3af592b5868ccf151645afc74d2e606cd5dec3ed326c9fd0259691b39430fe
-    # via -r requirements.dev.in
-types-werkzeug==1.0.9 \
-    --hash=sha256:194bd5715a13c598f05c63e8a739328657590943bce941e8a3619a6b5d4a54ec \
-    --hash=sha256:5cc269604c400133d452a40cee6397655f878fc460e03fde291b9e3a5eaa518c
-    # via types-flask
-typing-extensions==4.12.2 \
-    --hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \
-    --hash=sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8
-    # via
-    #   -r requirements.anki.in
-    #   astroid
-    #   black
-    #   fluent-syntax
-    #   mypy
-    #   pylint
-urllib3==2.2.2 \
-    --hash=sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472 \
-    --hash=sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168
-    # via
-    #   requests
-    #   types-requests
-waitress==3.0.1 \
-    --hash=sha256:26cdbc593093a15119351690752c99adc13cbc6786d75f7b6341d1234a3730ac \
-    --hash=sha256:ef0c1f020d9f12a515c4ec65c07920a702613afcad1dbfdc3bcec256b6c072b3
-    # via -r requirements.aqt.in
-websocket-client==1.8.0 \
-    --hash=sha256:17b44cc997f5c498e809b22cdf2d9c7a9e71c02c8cc2b6c56e7c2d1239bfa526 \
-    --hash=sha256:3239df9f44da632f96012472805d40a23281a991027ce11d2f45a6f24ac4c3da
-    # via pychromedevtools
-werkzeug==3.0.6 \
-    --hash=sha256:1bc0c2310d2fbb07b1dd1105eba2f7af72f322e1e455f2f93c993bee8c8a5f17 \
-    --hash=sha256:a8dd59d4de28ca70471a34cba79bed5f7ef2e036a76b3ab0835474246eb41f8d
-    # via
-    #   flask
-    #   flask-cors
-wheel==0.44.0 \
-    --hash=sha256:2376a90c98cc337d18623527a97c31797bd02bad0033d41547043a1cbfbe448f \
-    --hash=sha256:a29c3f2817e95ab89aa4660681ad547c0e9547f20e75b0562fe7723c9a2a9d49
-    # via pip-tools
-wrapt==1.16.0 \
-    --hash=sha256:0d2691979e93d06a95a26257adb7bfd0c93818e89b1406f5a28f36e0d8c1e1fc \
-    --hash=sha256:14d7dc606219cdd7405133c713f2c218d4252f2a469003f8c46bb92d5d095d81 \
-    --hash=sha256:1a5db485fe2de4403f13fafdc231b0dbae5eca4359232d2efc79025527375b09 \
-    --hash=sha256:1acd723ee2a8826f3d53910255643e33673e1d11db84ce5880675954183ec47e \
-    --hash=sha256:1ca9b6085e4f866bd584fb135a041bfc32cab916e69f714a7d1d397f8c4891ca \
-    --hash=sha256:1dd50a2696ff89f57bd8847647a1c363b687d3d796dc30d4dd4a9d1689a706f0 \
-    --hash=sha256:2076fad65c6736184e77d7d4729b63a6d1ae0b70da4868adeec40989858eb3fb \
-    --hash=sha256:2a88e6010048489cda82b1326889ec075a8c856c2e6a256072b28eaee3ccf487 \
-    --hash=sha256:3ebf019be5c09d400cf7b024aa52b1f3aeebeff51550d007e92c3c1c4afc2a40 \
-    --hash=sha256:418abb18146475c310d7a6dc71143d6f7adec5b004ac9ce08dc7a34e2babdc5c \
-    --hash=sha256:43aa59eadec7890d9958748db829df269f0368521ba6dc68cc172d5d03ed8060 \
-    --hash=sha256:44a2754372e32ab315734c6c73b24351d06e77ffff6ae27d2ecf14cf3d229202 \
-    --hash=sha256:490b0ee15c1a55be9c1bd8609b8cecd60e325f0575fc98f50058eae366e01f41 \
-    --hash=sha256:49aac49dc4782cb04f58986e81ea0b4768e4ff197b57324dcbd7699c5dfb40b9 \
-    --hash=sha256:5eb404d89131ec9b4f748fa5cfb5346802e5ee8836f57d516576e61f304f3b7b \
-    --hash=sha256:5f15814a33e42b04e3de432e573aa557f9f0f56458745c2074952f564c50e664 \
-    --hash=sha256:5f370f952971e7d17c7d1ead40e49f32345a7f7a5373571ef44d800d06b1899d \
-    --hash=sha256:66027d667efe95cc4fa945af59f92c5a02c6f5bb6012bff9e60542c74c75c362 \
-    --hash=sha256:66dfbaa7cfa3eb707bbfcd46dab2bc6207b005cbc9caa2199bcbc81d95071a00 \
-    --hash=sha256:685f568fa5e627e93f3b52fda002c7ed2fa1800b50ce51f6ed1d572d8ab3e7fc \
-    --hash=sha256:6906c4100a8fcbf2fa735f6059214bb13b97f75b1a61777fcf6432121ef12ef1 \
-    --hash=sha256:6a42cd0cfa8ffc1915aef79cb4284f6383d8a3e9dcca70c445dcfdd639d51267 \
-    --hash=sha256:6dcfcffe73710be01d90cae08c3e548d90932d37b39ef83969ae135d36ef3956 \
-    --hash=sha256:6f6eac2360f2d543cc875a0e5efd413b6cbd483cb3ad7ebf888884a6e0d2e966 \
-    --hash=sha256:72554a23c78a8e7aa02abbd699d129eead8b147a23c56e08d08dfc29cfdddca1 \
-    --hash=sha256:73870c364c11f03ed072dda68ff7aea6d2a3a5c3fe250d917a429c7432e15228 \
-    --hash=sha256:73aa7d98215d39b8455f103de64391cb79dfcad601701a3aa0dddacf74911d72 \
-    --hash=sha256:75ea7d0ee2a15733684badb16de6794894ed9c55aa5e9903260922f0482e687d \
-    --hash=sha256:7bd2d7ff69a2cac767fbf7a2b206add2e9a210e57947dd7ce03e25d03d2de292 \
-    --hash=sha256:807cc8543a477ab7422f1120a217054f958a66ef7314f76dd9e77d3f02cdccd0 \
-    --hash=sha256:8e9723528b9f787dc59168369e42ae1c3b0d3fadb2f1a71de14531d321ee05b0 \
-    --hash=sha256:9090c9e676d5236a6948330e83cb89969f433b1943a558968f659ead07cb3b36 \
-    --hash=sha256:9153ed35fc5e4fa3b2fe97bddaa7cbec0ed22412b85bcdaf54aeba92ea37428c \
-    --hash=sha256:9159485323798c8dc530a224bd3ffcf76659319ccc7bbd52e01e73bd0241a0c5 \
-    --hash=sha256:941988b89b4fd6b41c3f0bfb20e92bd23746579736b7343283297c4c8cbae68f \
-    --hash=sha256:94265b00870aa407bd0cbcfd536f17ecde43b94fb8d228560a1e9d3041462d73 \
-    --hash=sha256:98b5e1f498a8ca1858a1cdbffb023bfd954da4e3fa2c0cb5853d40014557248b \
-    --hash=sha256:9b201ae332c3637a42f02d1045e1d0cccfdc41f1f2f801dafbaa7e9b4797bfc2 \
-    --hash=sha256:a0ea261ce52b5952bf669684a251a66df239ec6d441ccb59ec7afa882265d593 \
-    --hash=sha256:a33a747400b94b6d6b8a165e4480264a64a78c8a4c734b62136062e9a248dd39 \
-    --hash=sha256:a452f9ca3e3267cd4d0fcf2edd0d035b1934ac2bd7e0e57ac91ad6b95c0c6389 \
-    --hash=sha256:a86373cf37cd7764f2201b76496aba58a52e76dedfaa698ef9e9688bfd9e41cf \
-    --hash=sha256:ac83a914ebaf589b69f7d0a1277602ff494e21f4c2f743313414378f8f50a4cf \
-    --hash=sha256:aefbc4cb0a54f91af643660a0a150ce2c090d3652cf4052a5397fb2de549cd89 \
-    --hash=sha256:b3646eefa23daeba62643a58aac816945cadc0afaf21800a1421eeba5f6cfb9c \
-    --hash=sha256:b47cfad9e9bbbed2339081f4e346c93ecd7ab504299403320bf85f7f85c7d46c \
-    --hash=sha256:b935ae30c6e7400022b50f8d359c03ed233d45b725cfdd299462f41ee5ffba6f \
-    --hash=sha256:bb2dee3874a500de01c93d5c71415fcaef1d858370d405824783e7a8ef5db440 \
-    --hash=sha256:bc57efac2da352a51cc4658878a68d2b1b67dbe9d33c36cb826ca449d80a8465 \
-    --hash=sha256:bf5703fdeb350e36885f2875d853ce13172ae281c56e509f4e6eca049bdfb136 \
-    --hash=sha256:c31f72b1b6624c9d863fc095da460802f43a7c6868c5dda140f51da24fd47d7b \
-    --hash=sha256:c5cd603b575ebceca7da5a3a251e69561bec509e0b46e4993e1cac402b7247b8 \
-    --hash=sha256:d2efee35b4b0a347e0d99d28e884dfd82797852d62fcd7ebdeee26f3ceb72cf3 \
-    --hash=sha256:d462f28826f4657968ae51d2181a074dfe03c200d6131690b7d65d55b0f360f8 \
-    --hash=sha256:d5e49454f19ef621089e204f862388d29e6e8d8b162efce05208913dde5b9ad6 \
-    --hash=sha256:da4813f751142436b075ed7aa012a8778aa43a99f7b36afe9b742d3ed8bdc95e \
-    --hash=sha256:db2e408d983b0e61e238cf579c09ef7020560441906ca990fe8412153e3b291f \
-    --hash=sha256:db98ad84a55eb09b3c32a96c576476777e87c520a34e2519d3e59c44710c002c \
-    --hash=sha256:dbed418ba5c3dce92619656802cc5355cb679e58d0d89b50f116e4a9d5a9603e \
-    --hash=sha256:dcdba5c86e368442528f7060039eda390cc4091bfd1dca41e8046af7c910dda8 \
-    --hash=sha256:decbfa2f618fa8ed81c95ee18a387ff973143c656ef800c9f24fb7e9c16054e2 \
-    --hash=sha256:e4fdb9275308292e880dcbeb12546df7f3e0f96c6b41197e0cf37d2826359020 \
-    --hash=sha256:eb1b046be06b0fce7249f1d025cd359b4b80fc1c3e24ad9eca33e0dcdb2e4a35 \
-    --hash=sha256:eb6e651000a19c96f452c85132811d25e9264d836951022d6e81df2fff38337d \
-    --hash=sha256:ed867c42c268f876097248e05b6117a65bcd1e63b779e916fe2e33cd6fd0d3c3 \
-    --hash=sha256:edfad1d29c73f9b863ebe7082ae9321374ccb10879eeabc84ba3b69f2579d537 \
-    --hash=sha256:f2058f813d4f2b5e3a9eb2eb3faf8f1d99b81c3e51aeda4b168406443e8ba809 \
-    --hash=sha256:f6b2d0c6703c988d334f297aa5df18c45e97b0af3679bb75059e0e0bd8b1069d \
-    --hash=sha256:f8212564d49c50eb4565e502814f694e240c55551a5f1bc841d4fcaabb0a9b8a \
-    --hash=sha256:ffa565331890b90056c01db69c0fe634a776f8019c143a5ae265f9c6bc4bd6d4
-    # via pip-system-certs
-zipp==3.20.1 \
-    --hash=sha256:9960cd8967c8f85a56f920d5d507274e74f9ff813a0ab8889a5b5be2daf44064 \
-    --hash=sha256:c22b14cc4763c5a5b04134207736c107db42e9d3ef2d9779d465f5f1bcba572b
-    # via importlib-metadata
-
-# The following packages are considered to be unsafe in a requirements file:
-pip==24.2 \
-    --hash=sha256:2cd581cf58ab7fcfca4ce8efa6dcacd0de5bf8d0a3eb9ec927e07405f4d9e2a2 \
-    --hash=sha256:5b5e490b5e9cb275c879595064adce9ebd31b854e3e803740b72f9ccf34a45b8
-    # via pip-tools
-setuptools==75.1.0 \
-    --hash=sha256:35ab7fd3bcd95e6b7fd704e4a1539513edad446c097797f2985e0e4b960772f2 \
-    --hash=sha256:d59a21b17a275fb872a9c3dae73963160ae079f1049ed956880cd7c09b120538
-    # via pip-tools

From 7dac2fc4ff3147088022a6ef97bc5f52a2f7ae0a Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Mon, 21 Jul 2025 22:30:25 +0300
Subject: [PATCH 076/133] Add back legacy code as separate screens

---
 qt/aqt/__init__.py           |    2 +
 qt/aqt/addcards.py           |    7 +-
 qt/aqt/addcards_legacy.py    |  414 ++++++++
 qt/aqt/browser/browser.py    |   18 +-
 qt/aqt/editcurrent.py        |    7 +-
 qt/aqt/editcurrent_legacy.py |   94 ++
 qt/aqt/editor.py             |   70 +-
 qt/aqt/editor_legacy.py      | 1790 ++++++++++++++++++++++++++++++++++
 qt/aqt/main.py               |   16 +-
 qt/aqt/mediasrv.py           |   14 +-
 qt/tools/genhooks_gui.py     |   50 +-
 11 files changed, 2383 insertions(+), 99 deletions(-)
 create mode 100644 qt/aqt/addcards_legacy.py
 create mode 100644 qt/aqt/editcurrent_legacy.py
 create mode 100644 qt/aqt/editor_legacy.py

diff --git a/qt/aqt/__init__.py b/qt/aqt/__init__.py
index 53bdc3c92..74c4919a7 100644
--- a/qt/aqt/__init__.py
+++ b/qt/aqt/__init__.py
@@ -125,9 +125,11 @@ from aqt import stats, about, preferences, mediasync  # isort:skip
 class DialogManager:
     _dialogs: dict[str, list] = {
         "AddCards": [addcards.AddCards, None],
+        "NewAddCards": [addcards.NewAddCards, None],
         "AddonsDialog": [addons.AddonsDialog, None],
         "Browser": [browser.Browser, None],
         "EditCurrent": [editcurrent.EditCurrent, None],
+        "NewEditCurrent": [editcurrent.NewEditCurrent, None],
         "FilteredDeckConfigDialog": [filtered_deck.FilteredDeckConfigDialog, None],
         "DeckStats": [stats.DeckStats, None],
         "NewDeckStats": [stats.NewDeckStats, None],
diff --git a/qt/aqt/addcards.py b/qt/aqt/addcards.py
index 3b0421b30..8ea8b808e 100644
--- a/qt/aqt/addcards.py
+++ b/qt/aqt/addcards.py
@@ -14,6 +14,7 @@ from anki.models import NotetypeId
 from anki.notes import Note, NoteId
 from anki.utils import html_to_text_line, is_mac
 from aqt import AnkiQt, gui_hooks
+from aqt.addcards_legacy import *
 from aqt.deckchooser import DeckChooser
 from aqt.notetypechooser import NotetypeChooser
 from aqt.qt import *
@@ -30,7 +31,7 @@ from aqt.utils import (
 )
 
 
-class AddCards(QMainWindow):
+class NewAddCards(QMainWindow):
     def __init__(self, mw: AnkiQt) -> None:
         super().__init__(None, Qt.WindowType.Window)
         self._close_event_has_cleaned_up = False
@@ -79,7 +80,7 @@ class AddCards(QMainWindow):
         self.setAndFocusNote(new_note)
 
     def setupEditor(self) -> None:
-        self.editor = aqt.editor.Editor(
+        self.editor = aqt.editor.NewEditor(
             self.mw,
             self.form.fieldsArea,
             self,
@@ -244,7 +245,7 @@ class AddCards(QMainWindow):
         gui_hooks.operation_did_execute.remove(self.on_operation_did_execute)
         self.mw.maybeReset()
         saveGeom(self, "add")
-        aqt.dialogs.markClosed("AddCards")
+        aqt.dialogs.markClosed("NewAddCards")
         self._close_event_has_cleaned_up = True
         self.mw.deferred_delete_and_garbage_collect(self)
         self.close()
diff --git a/qt/aqt/addcards_legacy.py b/qt/aqt/addcards_legacy.py
new file mode 100644
index 000000000..86e8a25b1
--- /dev/null
+++ b/qt/aqt/addcards_legacy.py
@@ -0,0 +1,414 @@
+# Copyright: Ankitects Pty Ltd and contributors
+# License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+
+from __future__ import annotations
+
+from collections.abc import Callable
+
+import aqt.editor
+import aqt.forms
+from anki._legacy import deprecated
+from anki.collection import OpChanges, SearchNode
+from anki.decks import DeckId
+from anki.models import NotetypeId
+from anki.notes import Note, NoteFieldsCheckResult, NoteId
+from anki.utils import html_to_text_line, is_mac
+from aqt import AnkiQt, gui_hooks
+from aqt.deckchooser import DeckChooser
+from aqt.notetypechooser import NotetypeChooser
+from aqt.operations.note import add_note
+from aqt.qt import *
+from aqt.sound import av_player
+from aqt.utils import (
+    HelpPage,
+    add_close_shortcut,
+    ask_user_dialog,
+    askUser,
+    downArrow,
+    openHelp,
+    restoreGeom,
+    saveGeom,
+    shortcut,
+    showWarning,
+    tooltip,
+    tr,
+)
+
+
+class AddCards(QMainWindow):
+    def __init__(self, mw: AnkiQt) -> None:
+        super().__init__(None, Qt.WindowType.Window)
+        self._close_event_has_cleaned_up = False
+        self.mw = mw
+        self.col = mw.col
+        form = aqt.forms.addcards.Ui_Dialog()
+        form.setupUi(self)
+        self.form = form
+        self.setWindowTitle(tr.actions_add())
+        self.setMinimumHeight(300)
+        self.setMinimumWidth(400)
+        self.setup_choosers()
+        self.setupEditor()
+        add_close_shortcut(self)
+        self._load_new_note()
+        self.setupButtons()
+        self.history: list[NoteId] = []
+        self._last_added_note: Note | None = None
+        gui_hooks.operation_did_execute.append(self.on_operation_did_execute)
+        restoreGeom(self, "add")
+        gui_hooks.add_cards_did_init(self)
+        if not is_mac:
+            self.setMenuBar(None)
+        self.show()
+
+    def set_deck(self, deck_id: DeckId) -> None:
+        self.deck_chooser.selected_deck_id = deck_id
+
+    def set_note_type(self, note_type_id: NotetypeId) -> None:
+        self.notetype_chooser.selected_notetype_id = note_type_id
+
+    def set_note(self, note: Note, deck_id: DeckId | None = None) -> None:
+        """Set tags, field contents and notetype according to `note`. Deck is set
+        to `deck_id` or the deck last used with the notetype.
+        """
+        self.notetype_chooser.selected_notetype_id = note.mid
+        if deck_id or (deck_id := self.col.default_deck_for_notetype(note.mid)):
+            self.deck_chooser.selected_deck_id = deck_id
+
+        new_note = self._new_note()
+        new_note.fields = note.fields[:]
+        new_note.tags = note.tags[:]
+
+        self.editor.orig_note_id = note.id
+        self.setAndFocusNote(new_note)
+
+    def setupEditor(self) -> None:
+        self.editor = aqt.editor.Editor(
+            self.mw,
+            self.form.fieldsArea,
+            self,
+            editor_mode=aqt.editor.EditorMode.ADD_CARDS,
+        )
+
+    def setup_choosers(self) -> None:
+        defaults = self.col.defaults_for_adding(
+            current_review_card=self.mw.reviewer.card
+        )
+
+        self.notetype_chooser = NotetypeChooser(
+            mw=self.mw,
+            widget=self.form.modelArea,
+            starting_notetype_id=NotetypeId(defaults.notetype_id),
+            on_button_activated=self.show_notetype_selector,
+            on_notetype_changed=self.on_notetype_change,
+        )
+        self.deck_chooser = DeckChooser(
+            self.mw,
+            self.form.deckArea,
+            starting_deck_id=DeckId(defaults.deck_id),
+            on_deck_changed=self.on_deck_changed,
+        )
+
+    def reopen(self, mw: AnkiQt) -> None:
+        if not self.editor.fieldsAreBlank():
+            return
+
+        defaults = self.col.defaults_for_adding(
+            current_review_card=self.mw.reviewer.card
+        )
+        self.set_note_type(NotetypeId(defaults.notetype_id))
+        self.set_deck(DeckId(defaults.deck_id))
+
+    def helpRequested(self) -> None:
+        openHelp(HelpPage.ADDING_CARD_AND_NOTE)
+
+    def setupButtons(self) -> None:
+        bb = self.form.buttonBox
+        ar = QDialogButtonBox.ButtonRole.ActionRole
+        # add
+        self.addButton = bb.addButton(tr.actions_add(), ar)
+        qconnect(self.addButton.clicked, self.add_current_note)
+        self.addButton.setShortcut(QKeySequence("Ctrl+Return"))
+        # qt5.14+ doesn't handle numpad enter on Windows
+        self.compat_add_shorcut = QShortcut(QKeySequence("Ctrl+Enter"), self)
+        qconnect(self.compat_add_shorcut.activated, self.addButton.click)
+        self.addButton.setToolTip(shortcut(tr.adding_add_shortcut_ctrlandenter()))
+
+        # close
+        self.closeButton = QPushButton(tr.actions_close())
+        self.closeButton.setAutoDefault(False)
+        bb.addButton(self.closeButton, QDialogButtonBox.ButtonRole.RejectRole)
+        qconnect(self.closeButton.clicked, self.close)
+        # help
+        self.helpButton = QPushButton(tr.actions_help(), clicked=self.helpRequested)  # type: ignore
+        self.helpButton.setAutoDefault(False)
+        bb.addButton(self.helpButton, QDialogButtonBox.ButtonRole.HelpRole)
+        # history
+        b = bb.addButton(f"{tr.adding_history()} {downArrow()}", ar)
+        if is_mac:
+            sc = "Ctrl+Shift+H"
+        else:
+            sc = "Ctrl+H"
+        b.setShortcut(QKeySequence(sc))
+        b.setToolTip(tr.adding_shortcut(val=shortcut(sc)))
+        qconnect(b.clicked, self.onHistory)
+        b.setEnabled(False)
+        self.historyButton = b
+
+    def setAndFocusNote(self, note: Note) -> None:
+        self.editor.set_note(note, focusTo=0)
+
+    def show_notetype_selector(self) -> None:
+        self.editor.call_after_note_saved(self.notetype_chooser.choose_notetype)
+
+    def on_deck_changed(self, deck_id: int) -> None:
+        gui_hooks.add_cards_did_change_deck(deck_id)
+
+    def on_notetype_change(
+        self, notetype_id: NotetypeId, update_deck: bool = True
+    ) -> None:
+        # need to adjust current deck?
+        if update_deck:
+            if deck_id := self.col.default_deck_for_notetype(notetype_id):
+                self.deck_chooser.selected_deck_id = deck_id
+
+        # only used for detecting changed sticky fields on close
+        self._last_added_note = None
+
+        # copy fields into new note with the new notetype
+        old_note = self.editor.note
+        new_note = self._new_note()
+        if old_note:
+            old_field_names = list(old_note.keys())
+            new_field_names = list(new_note.keys())
+            copied_field_names = set()
+            for f in new_note.note_type()["flds"]:
+                field_name = f["name"]
+                # copy identical non-empty fields
+                if field_name in old_field_names and old_note[field_name]:
+                    new_note[field_name] = old_note[field_name]
+                    copied_field_names.add(field_name)
+            new_idx = 0
+            for old_idx, old_field_value in enumerate(old_field_names):
+                # skip previously copied identical fields in new note
+                while (
+                    new_idx < len(new_field_names)
+                    and new_field_names[new_idx] in copied_field_names
+                ):
+                    new_idx += 1
+                if new_idx >= len(new_field_names):
+                    break
+                # copy non-empty old fields
+                if (
+                    old_field_value not in copied_field_names
+                    and old_note.fields[old_idx]
+                ):
+                    new_note.fields[new_idx] = old_note.fields[old_idx]
+                    new_idx += 1
+
+            new_note.tags = old_note.tags
+
+        # and update editor state
+        self.editor.note = new_note
+        self.editor.loadNote(
+            focusTo=min(self.editor.last_field_index or 0, len(new_note.fields) - 1)
+        )
+        gui_hooks.addcards_did_change_note_type(
+            self, old_note.note_type(), new_note.note_type()
+        )
+
+    def _load_new_note(self, sticky_fields_from: Note | None = None) -> None:
+        note = self._new_note()
+        if old_note := sticky_fields_from:
+            flds = note.note_type()["flds"]
+            # copy fields from old note
+            if old_note:
+                for n in range(min(len(note.fields), len(old_note.fields))):
+                    if flds[n]["sticky"]:
+                        note.fields[n] = old_note.fields[n]
+            # and tags
+            note.tags = old_note.tags
+        self.setAndFocusNote(note)
+
+    def on_operation_did_execute(
+        self, changes: OpChanges, handler: object | None
+    ) -> None:
+        if (changes.notetype or changes.deck) and handler is not self.editor:
+            self.on_notetype_change(
+                NotetypeId(
+                    self.col.defaults_for_adding(
+                        current_review_card=self.mw.reviewer.card
+                    ).notetype_id
+                ),
+                update_deck=False,
+            )
+
+    def _new_note(self) -> Note:
+        return self.col.new_note(
+            self.col.models.get(self.notetype_chooser.selected_notetype_id)
+        )
+
+    def addHistory(self, note: Note) -> None:
+        self.history.insert(0, note.id)
+        self.history = self.history[:15]
+        self.historyButton.setEnabled(True)
+
+    def onHistory(self) -> None:
+        m = QMenu(self)
+        for nid in self.history:
+            if self.col.find_notes(self.col.build_search_string(SearchNode(nid=nid))):
+                note = self.col.get_note(nid)
+                fields = note.fields
+                txt = html_to_text_line(", ".join(fields))
+                if len(txt) > 30:
+                    txt = f"{txt[:30]}..."
+                line = tr.adding_edit(val=txt)
+                line = gui_hooks.addcards_will_add_history_entry(line, note)
+                line = line.replace("&", "&&")
+                # In qt action "&i" means "underline i, trigger this line when i is pressed".
+                # except for "&&" which is replaced by a single "&"
+                a = m.addAction(line)
+                qconnect(a.triggered, lambda b, nid=nid: self.editHistory(nid))
+            else:
+                a = m.addAction(tr.adding_note_deleted())
+                a.setEnabled(False)
+        gui_hooks.add_cards_will_show_history_menu(self, m)
+        m.exec(self.historyButton.mapToGlobal(QPoint(0, 0)))
+
+    def editHistory(self, nid: NoteId) -> None:
+        aqt.dialogs.open("Browser", self.mw, search=(SearchNode(nid=nid),))
+
+    def add_current_note(self) -> None:
+        if self.editor.current_notetype_is_image_occlusion():
+            self.editor.update_occlusions_field()
+            self.editor.call_after_note_saved(self._add_current_note)
+            self.editor.reset_image_occlusion()
+        else:
+            self.editor.call_after_note_saved(self._add_current_note)
+
+    def _add_current_note(self) -> None:
+        note = self.editor.note
+
+        if not self._note_can_be_added(note):
+            return
+
+        target_deck_id = self.deck_chooser.selected_deck_id
+
+        def on_success(changes: OpChanges) -> None:
+            # only used for detecting changed sticky fields on close
+            self._last_added_note = note
+
+            self.addHistory(note)
+
+            tooltip(tr.adding_added(), period=500)
+            av_player.stop_and_clear_queue()
+            self._load_new_note(sticky_fields_from=note)
+            gui_hooks.add_cards_did_add_note(note)
+
+        add_note(parent=self, note=note, target_deck_id=target_deck_id).success(
+            on_success
+        ).run_in_background()
+
+    def _note_can_be_added(self, note: Note) -> bool:
+        result = note.fields_check()
+        # no problem, duplicate, and confirmed cloze cases
+        problem = None
+        if result == NoteFieldsCheckResult.EMPTY:
+            if self.editor.current_notetype_is_image_occlusion():
+                problem = tr.notetypes_no_occlusion_created2()
+            else:
+                problem = tr.adding_the_first_field_is_empty()
+        elif result == NoteFieldsCheckResult.MISSING_CLOZE:
+            if not askUser(tr.adding_you_have_a_cloze_deletion_note()):
+                return False
+        elif result == NoteFieldsCheckResult.NOTETYPE_NOT_CLOZE:
+            problem = tr.adding_cloze_outside_cloze_notetype()
+        elif result == NoteFieldsCheckResult.FIELD_NOT_CLOZE:
+            problem = tr.adding_cloze_outside_cloze_field()
+
+        # filter problem through add-ons
+        problem = gui_hooks.add_cards_will_add_note(problem, note)
+        if problem is not None:
+            showWarning(problem, help=HelpPage.ADDING_CARD_AND_NOTE)
+            return False
+
+        optional_problems: list[str] = []
+        gui_hooks.add_cards_might_add_note(optional_problems, note)
+        if not all(askUser(op) for op in optional_problems):
+            return False
+
+        return True
+
+    def keyPressEvent(self, evt: QKeyEvent) -> None:
+        if evt.key() == Qt.Key.Key_Escape:
+            self.close()
+        else:
+            super().keyPressEvent(evt)
+
+    def closeEvent(self, evt: QCloseEvent) -> None:
+        if self._close_event_has_cleaned_up:
+            evt.accept()
+            return
+        self.ifCanClose(self._close)
+        evt.ignore()
+
+    def _close(self) -> None:
+        self.editor.cleanup()
+        self.notetype_chooser.cleanup()
+        self.deck_chooser.cleanup()
+        gui_hooks.operation_did_execute.remove(self.on_operation_did_execute)
+        self.mw.maybeReset()
+        saveGeom(self, "add")
+        aqt.dialogs.markClosed("AddCards")
+        self._close_event_has_cleaned_up = True
+        self.mw.deferred_delete_and_garbage_collect(self)
+        self.close()
+
+    def ifCanClose(self, onOk: Callable) -> None:
+        def callback(choice: int) -> None:
+            if choice == 0:
+                onOk()
+
+        def afterSave() -> None:
+            if self.editor.fieldsAreBlank(self._last_added_note):
+                return onOk()
+
+            ask_user_dialog(
+                tr.adding_discard_current_input(),
+                callback=callback,
+                buttons=[
+                    QMessageBox.StandardButton.Discard,
+                    (tr.adding_keep_editing(), QMessageBox.ButtonRole.RejectRole),
+                ],
+            )
+
+        self.editor.call_after_note_saved(afterSave)
+
+    def closeWithCallback(self, cb: Callable[[], None]) -> None:
+        def doClose() -> None:
+            self._close()
+            cb()
+
+        self.ifCanClose(doClose)
+
+    # legacy aliases
+
+    @property
+    def deckChooser(self) -> DeckChooser:
+        if getattr(self, "form", None):
+            # show this warning only after Qt form has been initialized,
+            # or PyQt's introspection triggers it
+            print("deckChooser is deprecated; use deck_chooser instead")
+        return self.deck_chooser
+
+    addCards = add_current_note
+    _addCards = _add_current_note
+    onModelChange = on_notetype_change
+
+    @deprecated(info="obsolete")
+    def addNote(self, note: Note) -> None:
+        pass
+
+    @deprecated(info="does nothing; will go away")
+    def removeTempNote(self, note: Note) -> None:
+        pass
diff --git a/qt/aqt/browser/browser.py b/qt/aqt/browser/browser.py
index 6e7af72cd..6be4d33de 100644
--- a/qt/aqt/browser/browser.py
+++ b/qt/aqt/browser/browser.py
@@ -27,7 +27,6 @@ from anki.scheduler.base import ScheduleCardsAsNew
 from anki.tags import MARKED_TAG
 from anki.utils import is_mac
 from aqt import AnkiQt, gui_hooks
-from aqt.editor import Editor, EditorWebView
 from aqt.errors import show_exception
 from aqt.exporting import ExportDialog as LegacyExportDialog
 from aqt.import_export.exporting import ExportDialog
@@ -77,7 +76,7 @@ from aqt.utils import (
     tr,
 )
 
-from ..addcards import AddCards
+from ..addcards import NewAddCards as AddCards
 from ..changenotetype import change_notetype_dialog
 from .card_info import BrowserCardInfo
 from .find_and_replace import FindAndReplaceDialog
@@ -111,7 +110,7 @@ class MockModel:
 class Browser(QMainWindow):
     mw: AnkiQt
     col: Collection
-    editor: Editor | None
+    editor: aqt.editor.NewEditor | None
     table: Table
 
     def __init__(
@@ -267,7 +266,7 @@ class Browser(QMainWindow):
         return None
 
     def add_card(self, deck_id: DeckId):
-        add_cards = cast(AddCards, aqt.dialogs.open("AddCards", self.mw))
+        add_cards = cast(AddCards, aqt.dialogs.open("NewAddCards", self.mw))
         add_cards.set_deck(deck_id)
 
         if note_type_id := self.get_active_note_type_id():
@@ -392,7 +391,7 @@ class Browser(QMainWindow):
         add_ellipsis_to_action_label(f.action_forget)
         add_ellipsis_to_action_label(f.action_grade_now)
 
-    def _editor_web_view(self) -> EditorWebView:
+    def _editor_web_view(self) -> aqt.editor.NewEditorWebView:
         assert self.editor is not None
         editor_web_view = self.editor.web
         assert editor_web_view is not None
@@ -592,12 +591,14 @@ class Browser(QMainWindow):
     def setupEditor(self) -> None:
         QShortcut(QKeySequence("Ctrl+Shift+P"), self, self.onTogglePreview)
 
-        def add_preview_button(editor: Editor) -> None:
+        def add_preview_button(
+            editor: aqt.editor.Editor | aqt.editor.NewEditor,
+        ) -> None:
             editor._links["preview"] = lambda _editor: self.onTogglePreview()
             gui_hooks.editor_did_init.remove(add_preview_button)
 
         gui_hooks.editor_did_init.append(add_preview_button)
-        self.editor = aqt.editor.Editor(
+        self.editor = aqt.editor.NewEditor(
             self.mw,
             self.form.fieldsArea,
             self,
@@ -806,7 +807,7 @@ class Browser(QMainWindow):
             assert current_card is not None
 
             deck_id = current_card.current_deck_id()
-            aqt.dialogs.open("AddCards", self.mw).set_note(note, deck_id)
+            aqt.dialogs.open("NewAddCards", self.mw).set_note(note, deck_id)
 
     @no_arg_trigger
     @skip_if_selection_is_empty
@@ -1264,3 +1265,4 @@ class Browser(QMainWindow):
         line_edit = self.form.searchEdit.lineEdit()
         assert line_edit is not None
         return line_edit
+        return line_edit
diff --git a/qt/aqt/editcurrent.py b/qt/aqt/editcurrent.py
index 4cd8dcb0c..1b42c5d83 100644
--- a/qt/aqt/editcurrent.py
+++ b/qt/aqt/editcurrent.py
@@ -7,11 +7,12 @@ from collections.abc import Callable
 import aqt.editor
 from anki.collection import OpChanges
 from aqt import gui_hooks
+from aqt.editcurrent_legacy import *
 from aqt.qt import *
 from aqt.utils import add_close_shortcut, restoreGeom, saveGeom, tr
 
 
-class EditCurrent(QMainWindow):
+class NewEditCurrent(QMainWindow):
     def __init__(self, mw: aqt.AnkiQt) -> None:
         super().__init__(None, Qt.WindowType.Window)
         self.mw = mw
@@ -22,7 +23,7 @@ class EditCurrent(QMainWindow):
         self.setMinimumWidth(250)
         if not is_mac:
             self.setMenuBar(None)
-        self.editor = aqt.editor.Editor(
+        self.editor = aqt.editor.NewEditor(
             self.mw,
             self.form.fieldsArea,
             self,
@@ -46,7 +47,7 @@ class EditCurrent(QMainWindow):
         gui_hooks.operation_did_execute.remove(self.on_operation_did_execute)
         self.editor.cleanup()
         saveGeom(self, "editcurrent")
-        aqt.dialogs.markClosed("EditCurrent")
+        aqt.dialogs.markClosed("NewEditCurrent")
 
     def reopen(self, mw: aqt.AnkiQt) -> None:
         if card := self.mw.reviewer.card:
diff --git a/qt/aqt/editcurrent_legacy.py b/qt/aqt/editcurrent_legacy.py
new file mode 100644
index 000000000..d4e969c21
--- /dev/null
+++ b/qt/aqt/editcurrent_legacy.py
@@ -0,0 +1,94 @@
+# Copyright: Ankitects Pty Ltd and contributors
+# License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+from __future__ import annotations
+
+from collections.abc import Callable
+
+import aqt.editor
+from anki.collection import OpChanges
+from anki.errors import NotFoundError
+from aqt import gui_hooks
+from aqt.qt import *
+from aqt.utils import add_close_shortcut, restoreGeom, saveGeom, tr
+
+
+class EditCurrent(QMainWindow):
+    def __init__(self, mw: aqt.AnkiQt) -> None:
+        super().__init__(None, Qt.WindowType.Window)
+        self.mw = mw
+        self.form = aqt.forms.editcurrent.Ui_Dialog()
+        self.form.setupUi(self)
+        self.setWindowTitle(tr.editing_edit_current())
+        self.setMinimumHeight(400)
+        self.setMinimumWidth(250)
+        if not is_mac:
+            self.setMenuBar(None)
+        self.editor = aqt.editor.Editor(
+            self.mw,
+            self.form.fieldsArea,
+            self,
+            editor_mode=aqt.editor.EditorMode.EDIT_CURRENT,
+        )
+        assert self.mw.reviewer.card is not None
+        self.editor.card = self.mw.reviewer.card
+        self.editor.set_note(self.mw.reviewer.card.note(), focusTo=0)
+        restoreGeom(self, "editcurrent")
+        self.buttonbox = QDialogButtonBox(Qt.Orientation.Horizontal)
+        self.form.verticalLayout.insertWidget(1, self.buttonbox)
+        self.buttonbox.addButton(QDialogButtonBox.StandardButton.Close)
+        qconnect(self.buttonbox.rejected, self.close)
+        close_button = self.buttonbox.button(QDialogButtonBox.StandardButton.Close)
+        assert close_button is not None
+        close_button.setShortcut(QKeySequence("Ctrl+Return"))
+        add_close_shortcut(self)
+        # qt5.14+ doesn't handle numpad enter on Windows
+        self.compat_add_shorcut = QShortcut(QKeySequence("Ctrl+Enter"), self)
+        qconnect(self.compat_add_shorcut.activated, close_button.click)
+        gui_hooks.operation_did_execute.append(self.on_operation_did_execute)
+        self.show()
+
+    def on_operation_did_execute(
+        self, changes: OpChanges, handler: object | None
+    ) -> None:
+        if changes.note_text and handler is not self.editor:
+            # reload note
+            note = self.editor.note
+            try:
+                assert note is not None
+                note.load()
+            except NotFoundError:
+                # note's been deleted
+                self.cleanup()
+                self.close()
+                return
+
+            self.editor.set_note(note)
+
+    def cleanup(self) -> None:
+        gui_hooks.operation_did_execute.remove(self.on_operation_did_execute)
+        self.editor.cleanup()
+        saveGeom(self, "editcurrent")
+        aqt.dialogs.markClosed("EditCurrent")
+
+    def reopen(self, mw: aqt.AnkiQt) -> None:
+        if card := self.mw.reviewer.card:
+            self.editor.card = card
+            self.editor.set_note(card.note())
+
+    def closeEvent(self, evt: QCloseEvent | None) -> None:
+        self.editor.call_after_note_saved(self.cleanup)
+
+    def _saveAndClose(self) -> None:
+        self.cleanup()
+        self.mw.deferred_delete_and_garbage_collect(self)
+        self.close()
+
+    def closeWithCallback(self, onsuccess: Callable[[], None]) -> None:
+        def callback() -> None:
+            self._saveAndClose()
+            onsuccess()
+
+        self.editor.call_after_note_saved(callback)
+
+    onReset = on_operation_did_execute
+    onReset = on_operation_did_execute
diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 5610d64ed..394751065 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -10,7 +10,6 @@ import mimetypes
 import os
 from collections.abc import Callable
 from dataclasses import dataclass
-from enum import Enum
 from random import randrange
 from typing import Any
 
@@ -21,58 +20,16 @@ from anki.models import NotetypeId
 from anki.notes import Note, NoteId
 from anki.utils import is_win
 from aqt import AnkiQt, gui_hooks
+from aqt.editor_legacy import *
 from aqt.qt import *
 from aqt.sound import av_player
 from aqt.utils import shortcut, showWarning
 from aqt.webview import AnkiWebView, AnkiWebViewKind
 
-pics = ("jpg", "jpeg", "png", "gif", "svg", "webp", "ico", "avif")
-audio = (
-    "3gp",
-    "aac",
-    "avi",
-    "flac",
-    "flv",
-    "m4a",
-    "mkv",
-    "mov",
-    "mp3",
-    "mp4",
-    "mpeg",
-    "mpg",
-    "oga",
-    "ogg",
-    "ogv",
-    "ogx",
-    "opus",
-    "spx",
-    "swf",
-    "wav",
-    "webm",
-)
-
-
-class EditorMode(Enum):
-    ADD_CARDS = 0
-    EDIT_CURRENT = 1
-    BROWSER = 2
-
-
-class EditorState(Enum):
-    """
-    Current input state of the editing UI.
-    """
-
-    INITIAL = -1
-    FIELDS = 0
-    IO_PICKER = 1
-    IO_MASKS = 2
-    IO_FIELDS = 3
-
 
 def on_editor_ready(func: Callable) -> Callable:
     @functools.wraps(func)
-    def decorated(self: Editor, *args: Any, **kwargs: Any) -> None:
+    def decorated(self: NewEditor, *args: Any, **kwargs: Any) -> None:
         if self._ready:
             func(self, *args, **kwargs)
         else:
@@ -96,7 +53,7 @@ class NoteInfo:
             self.mid = NotetypeId(int(self.mid))
 
 
-class Editor:
+class NewEditor:
     """The screen that embeds an editing widget should listen for changes via
     the `operation_did_execute` hook, and call set_note() when the editor needs
     redrawing.
@@ -152,7 +109,7 @@ class Editor:
         self.outerLayout = l
 
     def add_webview(self) -> None:
-        self.web = EditorWebView(self.widget, self)
+        self.web = NewEditorWebView(self.widget, self)
         self.web.set_bridge_command(self.onBridgeCmd, self)
         self.web.hide_while_preserving_layout()
         self.outerLayout.addWidget(self.web, 1)
@@ -213,7 +170,7 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
         self,
         icon: str | None,
         cmd: str,
-        func: Callable[[Editor], None],
+        func: Callable[[NewEditor], None],
         tip: str = "",
         label: str = "",
         id: str | None = None,
@@ -224,7 +181,7 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
     ) -> str:
         """Assign func to bridge cmd, register shortcut, return button"""
 
-        def wrapped_func(editor: Editor) -> None:
+        def wrapped_func(editor: NewEditor) -> None:
             self.call_after_note_saved(functools.partial(func, editor), keepFocus=True)
 
         self._links[cmd] = wrapped_func
@@ -553,11 +510,11 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
 
     def _init_links(self) -> None:
         self._links: dict[str, Callable] = dict(
-            fields=Editor.onFields,
-            cards=Editor.onCardLayout,
-            paste=Editor.onPaste,
-            cut=Editor.onCut,
-            copy=Editor.onCopy,
+            fields=NewEditor.onFields,
+            cards=NewEditor.onCardLayout,
+            paste=NewEditor.onPaste,
+            cut=NewEditor.onCut,
+            copy=NewEditor.onCopy,
         )
 
     def get_note_info(self, on_done: Callable[[NoteInfo], None]) -> None:
@@ -571,8 +528,8 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
 ######################################################################
 
 
-class EditorWebView(AnkiWebView):
-    def __init__(self, parent: QWidget, editor: Editor) -> None:
+class NewEditorWebView(AnkiWebView):
+    def __init__(self, parent: QWidget, editor: NewEditor) -> None:
         AnkiWebView.__init__(self, kind=AnkiWebViewKind.EDITOR)
         self.editor = editor
         self.setAcceptDrops(True)
@@ -592,3 +549,4 @@ class EditorWebView(AnkiWebView):
 
     def onPaste(self) -> None:
         self.triggerPageAction(QWebEnginePage.WebAction.Paste)
+        self.triggerPageAction(QWebEnginePage.WebAction.Paste)
diff --git a/qt/aqt/editor_legacy.py b/qt/aqt/editor_legacy.py
new file mode 100644
index 000000000..138deed7a
--- /dev/null
+++ b/qt/aqt/editor_legacy.py
@@ -0,0 +1,1790 @@
+# Copyright: Ankitects Pty Ltd and contributors
+# License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+
+from __future__ import annotations
+
+import base64
+import functools
+import html
+import itertools
+import json
+import mimetypes
+import os
+import re
+import urllib.error
+import urllib.parse
+import urllib.request
+import warnings
+from collections.abc import Callable
+from enum import Enum
+from random import randrange
+from typing import Any, Iterable, Match, cast
+
+import bs4
+import requests
+from bs4 import BeautifulSoup
+
+import aqt
+import aqt.forms
+import aqt.operations
+import aqt.sound
+from anki._legacy import deprecated
+from anki.cards import Card
+from anki.collection import Config, SearchNode
+from anki.consts import MODEL_CLOZE
+from anki.hooks import runFilter
+from anki.httpclient import HttpClient
+from anki.models import NotetypeDict, NotetypeId, StockNotetype
+from anki.notes import Note, NoteFieldsCheckResult, NoteId
+from anki.utils import checksum, is_lin, is_win, namedtmp
+from aqt import AnkiQt, colors, gui_hooks
+from aqt.operations import QueryOp
+from aqt.operations.note import update_note
+from aqt.operations.notetype import update_notetype_legacy
+from aqt.qt import *
+from aqt.sound import av_player
+from aqt.theme import theme_manager
+from aqt.utils import (
+    HelpPage,
+    KeyboardModifiersPressed,
+    disable_help_button,
+    getFile,
+    openFolder,
+    openHelp,
+    qtMenuShortcutWorkaround,
+    restoreGeom,
+    saveGeom,
+    shortcut,
+    show_in_folder,
+    showInfo,
+    showWarning,
+    tooltip,
+    tr,
+)
+from aqt.webview import AnkiWebView, AnkiWebViewKind
+
+pics = ("jpg", "jpeg", "png", "gif", "svg", "webp", "ico", "avif")
+audio = (
+    "3gp",
+    "aac",
+    "avi",
+    "flac",
+    "flv",
+    "m4a",
+    "mkv",
+    "mov",
+    "mp3",
+    "mp4",
+    "mpeg",
+    "mpg",
+    "oga",
+    "ogg",
+    "ogv",
+    "ogx",
+    "opus",
+    "spx",
+    "swf",
+    "wav",
+    "webm",
+)
+
+
+class EditorMode(Enum):
+    ADD_CARDS = 0
+    EDIT_CURRENT = 1
+    BROWSER = 2
+
+
+class EditorState(Enum):
+    """
+    Current input state of the editing UI.
+    """
+
+    INITIAL = -1
+    FIELDS = 0
+    IO_PICKER = 1
+    IO_MASKS = 2
+    IO_FIELDS = 3
+
+
+class Editor:
+    """The screen that embeds an editing widget should listen for changes via
+    the `operation_did_execute` hook, and call set_note() when the editor needs
+    redrawing.
+
+    The editor will cause that hook to be fired when it saves changes. To avoid
+    an unwanted refresh, the parent widget should check if handler
+    corresponds to this editor instance, and ignore the change if it does.
+    """
+
+    def __init__(
+        self,
+        mw: AnkiQt,
+        widget: QWidget,
+        parentWindow: QWidget,
+        addMode: bool | None = None,
+        *,
+        editor_mode: EditorMode = EditorMode.EDIT_CURRENT,
+    ) -> None:
+        self.mw = mw
+        self.widget = widget
+        self.parentWindow = parentWindow
+        self.note: Note | None = None
+        # legacy argument provided?
+        if addMode is not None:
+            editor_mode = EditorMode.ADD_CARDS if addMode else EditorMode.EDIT_CURRENT
+        self.addMode = editor_mode is EditorMode.ADD_CARDS
+        self.editorMode = editor_mode
+        self.currentField: int | None = None
+        # Similar to currentField, but not set to None on a blur. May be
+        # outside the bounds of the current notetype.
+        self.last_field_index: int | None = None
+        # used when creating a copy of an existing note
+        self.orig_note_id: NoteId | None = None
+        # current card, for card layout
+        self.card: Card | None = None
+        self.state: EditorState = EditorState.INITIAL
+        # used for the io mask editor's context menu
+        self.last_io_image_path: str | None = None
+        self._init_links()
+        self.setupOuter()
+        self.add_webview()
+        self.setupWeb()
+        self.setupShortcuts()
+        gui_hooks.editor_did_init(self)
+
+    # Initial setup
+    ############################################################
+
+    def setupOuter(self) -> None:
+        l = QVBoxLayout()
+        l.setContentsMargins(0, 0, 0, 0)
+        l.setSpacing(0)
+        self.widget.setLayout(l)
+        self.outerLayout = l
+
+    def add_webview(self) -> None:
+        self.web = EditorWebView(self.widget, self)
+        self.web.set_bridge_command(self.onBridgeCmd, self)
+        self.outerLayout.addWidget(self.web, 1)
+
+    def setupWeb(self) -> None:
+        if self.editorMode == EditorMode.ADD_CARDS:
+            mode = "add"
+        elif self.editorMode == EditorMode.BROWSER:
+            mode = "browse"
+        else:
+            mode = "review"
+
+        # then load page
+        self.web.stdHtml(
+            "",
+            css=["css/editor.css"],
+            js=[
+                "js/mathjax.js",
+                "js/editor.js",
+            ],
+            context=self,
+            default_css=False,
+        )
+        self.web.eval(f"setupEditor('{mode}')")
+        self.web.show()
+
+        lefttopbtns: list[str] = []
+        gui_hooks.editor_did_init_left_buttons(lefttopbtns, self)
+
+        lefttopbtns_defs = [
+            f"uiPromise.then((noteEditor) => noteEditor.toolbar.notetypeButtons.appendButton({{ component: editorToolbar.Raw, props: {{ html: {json.dumps(button)} }} }}, -1));"
+            for button in lefttopbtns
+        ]
+        lefttopbtns_js = "\n".join(lefttopbtns_defs)
+
+        righttopbtns: list[str] = []
+        gui_hooks.editor_did_init_buttons(righttopbtns, self)
+        # legacy filter
+        righttopbtns = runFilter("setupEditorButtons", righttopbtns, self)
+
+        righttopbtns_defs = ", ".join([json.dumps(button) for button in righttopbtns])
+        righttopbtns_js = (
+            f"""
+require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].toolbar.toolbar.append({{
+    component: editorToolbar.AddonButtons,
+    id: "addons",
+    props: {{ buttons: [ {righttopbtns_defs} ] }},
+}}));
+"""
+            if len(righttopbtns) > 0
+            else ""
+        )
+
+        self.web.eval(f"{lefttopbtns_js} {righttopbtns_js}")
+
+    # Top buttons
+    ######################################################################
+
+    def resourceToData(self, path: str) -> str:
+        """Convert a file (specified by a path) into a data URI."""
+        if not os.path.exists(path):
+            raise FileNotFoundError
+        mime, _ = mimetypes.guess_type(path)
+        with open(path, "rb") as fp:
+            data = fp.read()
+            data64 = b"".join(base64.encodebytes(data).splitlines())
+            return f"data:{mime};base64,{data64.decode('ascii')}"
+
+    def addButton(
+        self,
+        icon: str | None,
+        cmd: str,
+        func: Callable[[Editor], None],
+        tip: str = "",
+        label: str = "",
+        id: str | None = None,
+        toggleable: bool = False,
+        keys: str | None = None,
+        disables: bool = True,
+        rightside: bool = True,
+    ) -> str:
+        """Assign func to bridge cmd, register shortcut, return button"""
+
+        def wrapped_func(editor: Editor) -> None:
+            self.call_after_note_saved(functools.partial(func, editor), keepFocus=True)
+
+        self._links[cmd] = wrapped_func
+
+        if keys:
+
+            def on_activated() -> None:
+                wrapped_func(self)
+
+            if toggleable:
+                # generate a random id for triggering toggle
+                id = id or str(randrange(1_000_000))
+
+                def on_hotkey() -> None:
+                    on_activated()
+                    self.web.eval(
+                        f'toggleEditorButton(document.getElementById("{id}"));'
+                    )
+
+            else:
+                on_hotkey = on_activated
+
+            QShortcut(  # type: ignore
+                QKeySequence(keys),
+                self.widget,
+                activated=on_hotkey,
+            )
+
+        btn = self._addButton(
+            icon,
+            cmd,
+            tip=tip,
+            label=label,
+            id=id,
+            toggleable=toggleable,
+            disables=disables,
+            rightside=rightside,
+        )
+        return btn
+
+    def _addButton(
+        self,
+        icon: str | None,
+        cmd: str,
+        tip: str = "",
+        label: str = "",
+        id: str | None = None,
+        toggleable: bool = False,
+        disables: bool = True,
+        rightside: bool = True,
+    ) -> str:
+        title_attribute = tip
+
+        if icon:
+            if icon.startswith("qrc:/"):
+                iconstr = icon
+            elif os.path.isabs(icon):
+                iconstr = self.resourceToData(icon)
+            else:
+                iconstr = f"/_anki/imgs/{icon}.png"
+            image_element = f'<img class="topbut" src="{iconstr}">'
+        else:
+            image_element = ""
+
+        if not label and icon:
+            label_element = ""
+        elif label:
+            label_element = label
+        else:
+            label_element = cmd
+
+        title_attribute = shortcut(title_attribute)
+        id_attribute_assignment = f"id={id}" if id else ""
+        class_attribute = "linkb" if rightside else "rounded"
+        if not disables:
+            class_attribute += " perm"
+
+        return f"""<button tabindex=-1
+                        {id_attribute_assignment}
+                        class="anki-addon-button {class_attribute}"
+                        type="button"
+                        title="{title_attribute}"
+                        data-cantoggle="{int(toggleable)}"
+                        data-command="{cmd}"
+                >
+                    {image_element}
+                    {label_element}
+                </button>"""
+
+    def setupShortcuts(self) -> None:
+        # if a third element is provided, enable shortcut even when no field selected
+        cuts: list[tuple] = []
+        gui_hooks.editor_did_init_shortcuts(cuts, self)
+        for row in cuts:
+            if len(row) == 2:
+                keys, fn = row
+                fn = self._addFocusCheck(fn)
+            else:
+                keys, fn, _ = row
+            QShortcut(QKeySequence(keys), self.widget, activated=fn)  # type: ignore
+
+    def _addFocusCheck(self, fn: Callable) -> Callable:
+        def checkFocus() -> None:
+            if self.currentField is None:
+                return
+            fn()
+
+        return checkFocus
+
+    def onFields(self) -> None:
+        self.call_after_note_saved(self._onFields)
+
+    def _onFields(self) -> None:
+        from aqt.fields import FieldDialog
+
+        FieldDialog(self.mw, self.note_type(), parent=self.parentWindow)
+
+    def onCardLayout(self) -> None:
+        self.call_after_note_saved(self._onCardLayout)
+
+    def _onCardLayout(self) -> None:
+        from aqt.clayout import CardLayout
+
+        if self.card:
+            ord = self.card.ord
+        else:
+            ord = 0
+
+        assert self.note is not None
+        CardLayout(
+            self.mw,
+            self.note,
+            ord=ord,
+            parent=self.parentWindow,
+            fill_empty=False,
+        )
+        if is_win:
+            self.parentWindow.activateWindow()
+
+    # JS->Python bridge
+    ######################################################################
+
+    def onBridgeCmd(self, cmd: str) -> Any:
+        if not self.note:
+            # shutdown
+            return
+
+        # focus lost or key/button pressed?
+        if cmd.startswith("blur") or cmd.startswith("key"):
+            (type, ord_str, nid_str, txt) = cmd.split(":", 3)
+            ord = int(ord_str)
+            try:
+                nid = int(nid_str)
+            except ValueError:
+                nid = 0
+            if nid != self.note.id:
+                print("ignored late blur")
+                return
+
+            try:
+                self.note.fields[ord] = self.mungeHTML(txt)
+            except IndexError:
+                print("ignored late blur after notetype change")
+                return
+
+            if not self.addMode:
+                self._save_current_note()
+            if type == "blur":
+                self.currentField = None
+                # run any filters
+                if gui_hooks.editor_did_unfocus_field(False, self.note, ord):
+                    # something updated the note; update it after a subsequent focus
+                    # event has had time to fire
+                    self.mw.progress.timer(
+                        100, self.loadNoteKeepingFocus, False, parent=self.widget
+                    )
+                else:
+                    self._check_and_update_duplicate_display_async()
+            else:
+                gui_hooks.editor_did_fire_typing_timer(self.note)
+                self._check_and_update_duplicate_display_async()
+
+        # focused into field?
+        elif cmd.startswith("focus"):
+            (type, num) = cmd.split(":", 1)
+            self.last_field_index = self.currentField = int(num)
+            gui_hooks.editor_did_focus_field(self.note, self.currentField)
+
+        elif cmd.startswith("toggleStickyAll"):
+            model = self.note_type()
+            flds = model["flds"]
+
+            any_sticky = any([fld["sticky"] for fld in flds])
+            result = []
+            for fld in flds:
+                if not any_sticky or fld["sticky"]:
+                    fld["sticky"] = not fld["sticky"]
+
+                result.append(fld["sticky"])
+
+            update_notetype_legacy(parent=self.mw, notetype=model).run_in_background(
+                initiator=self
+            )
+
+            return result
+
+        elif cmd.startswith("toggleSticky"):
+            (type, num) = cmd.split(":", 1)
+            ord = int(num)
+
+            model = self.note_type()
+            fld = model["flds"][ord]
+            new_state = not fld["sticky"]
+            fld["sticky"] = new_state
+
+            update_notetype_legacy(parent=self.mw, notetype=model).run_in_background(
+                initiator=self
+            )
+
+            return new_state
+
+        elif cmd.startswith("lastTextColor"):
+            (_, textColor) = cmd.split(":", 1)
+            assert self.mw.pm.profile is not None
+            self.mw.pm.profile["lastTextColor"] = textColor
+
+        elif cmd.startswith("lastHighlightColor"):
+            (_, highlightColor) = cmd.split(":", 1)
+            assert self.mw.pm.profile is not None
+            self.mw.pm.profile["lastHighlightColor"] = highlightColor
+
+        elif cmd.startswith("saveTags"):
+            (type, tagsJson) = cmd.split(":", 1)
+            self.note.tags = json.loads(tagsJson)
+
+            gui_hooks.editor_did_update_tags(self.note)
+            if not self.addMode:
+                self._save_current_note()
+
+        elif cmd.startswith("setTagsCollapsed"):
+            (type, collapsed_string) = cmd.split(":", 1)
+            collapsed = collapsed_string == "true"
+            self.setTagsCollapsed(collapsed)
+
+        elif cmd.startswith("editorState"):
+            (_, new_state_id, old_state_id) = cmd.split(":", 2)
+            self.signal_state_change(
+                EditorState(int(new_state_id)), EditorState(int(old_state_id))
+            )
+
+        elif cmd.startswith("ioImageLoaded"):
+            (_, path_or_nid_data) = cmd.split(":", 1)
+            path_or_nid = json.loads(path_or_nid_data)
+            if self.addMode:
+                gui_hooks.editor_mask_editor_did_load_image(self, path_or_nid)
+            else:
+                gui_hooks.editor_mask_editor_did_load_image(
+                    self, NoteId(int(path_or_nid))
+                )
+
+        elif cmd in self._links:
+            return self._links[cmd](self)
+
+        else:
+            print("uncaught cmd", cmd)
+
+    def mungeHTML(self, txt: str) -> str:
+        return gui_hooks.editor_will_munge_html(txt, self)
+
+    def signal_state_change(
+        self, new_state: EditorState, old_state: EditorState
+    ) -> None:
+        self.state = new_state
+        gui_hooks.editor_state_did_change(self, new_state, old_state)
+
+    # Setting/unsetting the current note
+    ######################################################################
+
+    def set_note(
+        self,
+        note: Note | None,
+        hide: bool = True,
+        focusTo: int | None = None,
+    ) -> None:
+        "Make NOTE the current note."
+        self.note = note
+        self.currentField = None
+        if self.note:
+            self.loadNote(focusTo=focusTo)
+        elif hide:
+            self.widget.hide()
+
+    def loadNoteKeepingFocus(self) -> None:
+        self.loadNote(self.currentField)
+
+    def set_cloze_button(self) -> None:
+        action = "show" if self.note_type()["type"] == MODEL_CLOZE else "hide"
+        self.web.eval(
+            'require("anki/ui").loaded.then(() =>'
+            f'require("anki/NoteEditor").instances[0].toolbar.toolbar.{action}("cloze")'
+            "); "
+        )
+
+    def set_image_occlusion_button(self) -> None:
+        action = "show" if self.current_notetype_is_image_occlusion() else "hide"
+        self.web.eval(
+            'require("anki/ui").loaded.then(() =>'
+            f'require("anki/NoteEditor").instances[0].toolbar.toolbar.{action}("image-occlusion-button")'
+            "); "
+        )
+
+    def loadNote(self, focusTo: int | None = None) -> None:
+        if not self.note:
+            return
+
+        data = [
+            (fld, self.mw.col.media.escape_media_filenames(val))
+            for fld, val in self.note.items()
+        ]
+
+        note_type = self.note_type()
+        flds = note_type["flds"]
+        collapsed = [fld["collapsed"] for fld in flds]
+        cloze_fields_ords = self.mw.col.models.cloze_fields(self.note.mid)
+        cloze_fields = [ord in cloze_fields_ords for ord in range(len(flds))]
+        plain_texts = [fld.get("plainText", False) for fld in flds]
+        descriptions = [fld.get("description", "") for fld in flds]
+        notetype_meta = {"id": self.note.mid, "modTime": note_type["mod"]}
+
+        self.widget.show()
+
+        note_fields_status = self.note.fields_check()
+
+        def oncallback(arg: Any) -> None:
+            if not self.note:
+                return
+            self.setupForegroundButton()
+            # we currently do this synchronously to ensure we load before the
+            # sidebar on browser startup
+            self._update_duplicate_display(note_fields_status)
+            if focusTo is not None:
+                self.web.setFocus()
+            self.set_cloze_button()
+            self.set_image_occlusion_button()
+            gui_hooks.editor_did_load_note(self)
+
+        assert self.mw.pm.profile is not None
+        text_color = self.mw.pm.profile.get("lastTextColor", "#0000ff")
+        highlight_color = self.mw.pm.profile.get("lastHighlightColor", "#0000ff")
+
+        js = f"""
+            saveSession();
+            setFields({json.dumps(data)});
+            setIsImageOcclusion({json.dumps(self.current_notetype_is_image_occlusion())});
+            setNotetypeMeta({json.dumps(notetype_meta)});
+            setCollapsed({json.dumps(collapsed)});
+            setClozeFields({json.dumps(cloze_fields)});
+            setPlainTexts({json.dumps(plain_texts)});
+            setDescriptions({json.dumps(descriptions)});
+            setFonts({json.dumps(self.fonts())});
+            focusField({json.dumps(focusTo)});
+            setNoteId({json.dumps(self.note.id)});
+            setColorButtons({json.dumps([text_color, highlight_color])});
+            setTags({json.dumps(self.note.tags)});
+            setTagsCollapsed({json.dumps(self.mw.pm.tags_collapsed(self.editorMode))});
+            setMathjaxEnabled({json.dumps(self.mw.col.get_config("renderMathjax", True))});
+            setShrinkImages({json.dumps(self.mw.col.get_config("shrinkEditorImages", True))});
+            setCloseHTMLTags({json.dumps(self.mw.col.get_config("closeHTMLTags", True))});
+            triggerChanges();
+            """
+
+        if self.addMode:
+            sticky = [field["sticky"] for field in self.note_type()["flds"]]
+            js += " setSticky(%s);" % json.dumps(sticky)
+
+        if self.current_notetype_is_image_occlusion():
+            io_field_indices = self.mw.backend.get_image_occlusion_fields(self.note.mid)
+            image_field = self.note.fields[io_field_indices.image]
+            self.last_io_image_path = self.extract_img_path_from_html(image_field)
+
+            if self.editorMode is not EditorMode.ADD_CARDS:
+                io_options = self._create_edit_io_options(note_id=self.note.id)
+                js += " setupMaskEditor(%s);" % json.dumps(io_options)
+            elif orig_note_id := self.orig_note_id:
+                self.orig_note_id = None
+                io_options = self._create_clone_io_options(orig_note_id)
+                js += " setupMaskEditor(%s);" % json.dumps(io_options)
+
+        js = gui_hooks.editor_will_load_note(js, self.note, self)
+        self.web.evalWithCallback(
+            f'require("anki/ui").loaded.then(() => {{ {js} }})', oncallback
+        )
+
+    def _save_current_note(self) -> None:
+        "Call after note is updated with data from webview."
+        if not self.note:
+            return
+
+        update_note(parent=self.widget, note=self.note).run_in_background(
+            initiator=self
+        )
+
+    def fonts(self) -> list[tuple[str, int, bool]]:
+        return [
+            (gui_hooks.editor_will_use_font_for_field(f["font"]), f["size"], f["rtl"])
+            for f in self.note_type()["flds"]
+        ]
+
+    def call_after_note_saved(
+        self, callback: Callable, keepFocus: bool = False
+    ) -> None:
+        "Save unsaved edits then call callback()."
+        if not self.note:
+            # calling code may not expect the callback to fire immediately
+            self.mw.progress.single_shot(10, callback)
+            return
+        self.web.evalWithCallback("saveNow(%d)" % keepFocus, lambda res: callback())
+
+    saveNow = call_after_note_saved
+
+    def _check_and_update_duplicate_display_async(self) -> None:
+        note = self.note
+        if not note:
+            return
+
+        def on_done(result: NoteFieldsCheckResult.V) -> None:
+            if self.note != note:
+                return
+            self._update_duplicate_display(result)
+
+        QueryOp(
+            parent=self.parentWindow,
+            op=lambda _: note.fields_check(),
+            success=on_done,
+        ).run_in_background()
+
+    checkValid = _check_and_update_duplicate_display_async
+
+    def _update_duplicate_display(self, result: NoteFieldsCheckResult.V) -> None:
+        assert self.note is not None
+        cols = [""] * len(self.note.fields)
+        cloze_hint = ""
+        if result == NoteFieldsCheckResult.DUPLICATE:
+            cols[0] = "dupe"
+        elif result == NoteFieldsCheckResult.NOTETYPE_NOT_CLOZE:
+            cloze_hint = tr.adding_cloze_outside_cloze_notetype()
+        elif result == NoteFieldsCheckResult.FIELD_NOT_CLOZE:
+            cloze_hint = tr.adding_cloze_outside_cloze_field()
+
+        self.web.eval(
+            'require("anki/ui").loaded.then(() => {'
+            f"setBackgrounds({json.dumps(cols)});\n"
+            f"setClozeHint({json.dumps(cloze_hint)});\n"
+            "}); "
+        )
+
+    def showDupes(self) -> None:
+        assert self.note is not None
+        aqt.dialogs.open(
+            "Browser",
+            self.mw,
+            search=(
+                SearchNode(
+                    dupe=SearchNode.Dupe(
+                        notetype_id=self.note_type()["id"],
+                        first_field=self.note.fields[0],
+                    )
+                ),
+            ),
+        )
+
+    def fieldsAreBlank(self, previousNote: Note | None = None) -> bool:
+        if not self.note:
+            return True
+        m = self.note_type()
+        for c, f in enumerate(self.note.fields):
+            f = f.replace("<br>", "").strip()
+            notChangedvalues = {"", "<br>"}
+            if previousNote and m["flds"][c]["sticky"]:
+                notChangedvalues.add(previousNote.fields[c].replace("<br>", "").strip())
+            if f not in notChangedvalues:
+                return False
+        return True
+
+    def cleanup(self) -> None:
+        av_player.stop_and_clear_queue_if_caller(self.editorMode)
+        self.set_note(None)
+        # prevent any remaining evalWithCallback() events from firing after C++ object deleted
+        if self.web:
+            self.web.cleanup()
+            self.web = None  # type: ignore
+
+    # legacy
+
+    setNote = set_note
+
+    # Tag handling
+    ######################################################################
+
+    def setupTags(self) -> None:
+        import aqt.tagedit
+
+        g = QGroupBox(self.widget)
+        g.setStyleSheet("border: 0")
+        tb = QGridLayout()
+        tb.setSpacing(12)
+        tb.setContentsMargins(2, 6, 2, 6)
+        # tags
+        l = QLabel(tr.editing_tags())
+        tb.addWidget(l, 1, 0)
+        self.tags = aqt.tagedit.TagEdit(self.widget)
+        qconnect(self.tags.lostFocus, self.on_tag_focus_lost)
+        self.tags.setToolTip(shortcut(tr.editing_jump_to_tags_with_ctrlandshiftandt()))
+        border = theme_manager.var(colors.BORDER)
+        self.tags.setStyleSheet(f"border: 1px solid {border}")
+        tb.addWidget(self.tags, 1, 1)
+        g.setLayout(tb)
+        self.outerLayout.addWidget(g)
+
+    def updateTags(self) -> None:
+        if self.tags.col != self.mw.col:
+            self.tags.setCol(self.mw.col)
+        if not self.tags.text() or not self.addMode:
+            assert self.note is not None
+            self.tags.setText(self.note.string_tags().strip())
+
+    def on_tag_focus_lost(self) -> None:
+        assert self.note is not None
+        self.note.tags = self.mw.col.tags.split(self.tags.text())
+        gui_hooks.editor_did_update_tags(self.note)
+        if not self.addMode:
+            self._save_current_note()
+
+    def blur_tags_if_focused(self) -> None:
+        if not self.note:
+            return
+        if self.tags.hasFocus():
+            self.widget.setFocus()
+
+    def hideCompleters(self) -> None:
+        self.tags.hideCompleter()
+
+    def onFocusTags(self) -> None:
+        self.tags.setFocus()
+
+    # legacy
+
+    def saveAddModeVars(self) -> None:
+        pass
+
+    saveTags = blur_tags_if_focused
+
+    # Audio/video/images
+    ######################################################################
+
+    def onAddMedia(self) -> None:
+        """Show a file selection screen, then add the selected media.
+        This expects initial setup to have been done by TemplateButtons.svelte."""
+        extension_filter = " ".join(
+            f"*.{extension}" for extension in sorted(itertools.chain(pics, audio))
+        )
+        filter = f"{tr.editing_media()} ({extension_filter})"
+
+        def accept(file: str) -> None:
+            self.resolve_media(file)
+
+        getFile(
+            parent=self.widget,
+            title=tr.editing_add_media(),
+            cb=cast(Callable[[Any], None], accept),
+            filter=filter,
+            key="media",
+        )
+
+        self.parentWindow.activateWindow()
+
+    def addMedia(self, path: str, canDelete: bool = False) -> None:
+        """Legacy routine used by add-ons to add a media file and update the current field.
+        canDelete is ignored."""
+
+        try:
+            html = self._addMedia(path)
+        except Exception as e:
+            showWarning(str(e))
+            return
+
+        self.web.eval(f"setFormat('inserthtml', {json.dumps(html)});")
+
+    def resolve_media(self, path: str) -> None:
+        """Finish inserting media into a field.
+        This expects initial setup to have been done by TemplateButtons.svelte."""
+        try:
+            html = self._addMedia(path)
+        except Exception as e:
+            showWarning(str(e))
+            return
+
+        self.web.eval(
+            f'require("anki/TemplateButtons").resolveMedia({json.dumps(html)})'
+        )
+
+    def _addMedia(self, path: str, canDelete: bool = False) -> str:
+        """Add to media folder and return local img or sound tag."""
+        # copy to media folder
+        fname = self.mw.col.media.add_file(path)
+        # return a local html link
+        return self.fnameToLink(fname)
+
+    def _addMediaFromData(self, fname: str, data: bytes) -> str:
+        return self.mw.col.media._legacy_write_data(fname, data)
+
+    def onRecSound(self) -> None:
+        aqt.sound.record_audio(
+            self.parentWindow,
+            self.mw,
+            True,
+            self.resolve_media,
+        )
+
+    # Media downloads
+    ######################################################################
+
+    def urlToLink(self, url: str, allowed_suffixes: Iterable[str] = ()) -> str:
+        fname = (
+            self.urlToFile(url, allowed_suffixes)
+            if allowed_suffixes
+            else self.urlToFile(url)
+        )
+        if not fname:
+            return '<a href="{}">{}</a>'.format(
+                url, html.escape(urllib.parse.unquote(url))
+            )
+        return self.fnameToLink(fname)
+
+    def fnameToLink(self, fname: str) -> str:
+        ext = fname.split(".")[-1].lower()
+        if ext in pics:
+            name = urllib.parse.quote(fname.encode("utf8"))
+            return f'<img src="{name}">'
+        else:
+            av_player.play_file_with_caller(fname, self.editorMode)
+            return f"[sound:{html.escape(fname, quote=False)}]"
+
+    def urlToFile(
+        self, url: str, allowed_suffixes: Iterable[str] = pics + audio
+    ) -> str | None:
+        l = url.lower()
+        for suffix in allowed_suffixes:
+            if l.endswith(f".{suffix}"):
+                return self._retrieveURL(url)
+        # not a supported type
+        return None
+
+    def isURL(self, s: str) -> bool:
+        s = s.lower()
+        return (
+            s.startswith("http://")
+            or s.startswith("https://")
+            or s.startswith("ftp://")
+            or s.startswith("file://")
+        )
+
+    def inlinedImageToFilename(self, txt: str) -> str:
+        prefix = "data:image/"
+        suffix = ";base64,"
+        for ext in ("jpg", "jpeg", "png", "gif"):
+            fullPrefix = prefix + ext + suffix
+            if txt.startswith(fullPrefix):
+                b64data = txt[len(fullPrefix) :].strip()
+                data = base64.b64decode(b64data, validate=True)
+                if ext == "jpeg":
+                    ext = "jpg"
+                return self._addPastedImage(data, ext)
+
+        return ""
+
+    def inlinedImageToLink(self, src: str) -> str:
+        fname = self.inlinedImageToFilename(src)
+        if fname:
+            return self.fnameToLink(fname)
+
+        return ""
+
+    def _pasted_image_filename(self, data: bytes, ext: str) -> str:
+        csum = checksum(data)
+        return f"paste-{csum}.{ext}"
+
+    def _read_pasted_image(self, mime: QMimeData) -> str:
+        image = QImage(mime.imageData())
+        buffer = QBuffer()
+        buffer.open(QBuffer.OpenModeFlag.ReadWrite)
+        if self.mw.col.get_config_bool(Config.Bool.PASTE_IMAGES_AS_PNG):
+            ext = "png"
+            quality = 50
+        else:
+            ext = "jpg"
+            quality = 80
+        image.save(buffer, ext, quality)
+        buffer.reset()
+        data = bytes(buffer.readAll())  # type: ignore
+        fname = self._pasted_image_filename(data, ext)
+        path = namedtmp(fname)
+        with open(path, "wb") as file:
+            file.write(data)
+
+        return path
+
+    def _addPastedImage(self, data: bytes, ext: str) -> str:
+        # hash and write
+        fname = self._pasted_image_filename(data, ext)
+        return self._addMediaFromData(fname, data)
+
+    def _retrieveURL(self, url: str) -> str | None:
+        "Download file into media folder and return local filename or None."
+        local = url.lower().startswith("file://")
+        # fetch it into a temporary folder
+        self.mw.progress.start(immediate=not local, parent=self.parentWindow)
+        content_type = None
+        error_msg: str | None = None
+        try:
+            if local:
+                # urllib doesn't understand percent-escaped utf8, but requires things like
+                # '#' to be escaped.
+                url = urllib.parse.unquote(url)
+                url = url.replace("%", "%25")
+                url = url.replace("#", "%23")
+                req = urllib.request.Request(
+                    url, None, {"User-Agent": "Mozilla/5.0 (compatible; Anki)"}
+                )
+                with urllib.request.urlopen(req) as response:
+                    filecontents = response.read()
+            else:
+                with HttpClient() as client:
+                    client.timeout = 30
+                    with client.get(url) as response:
+                        if response.status_code != 200:
+                            error_msg = tr.qt_misc_unexpected_response_code(
+                                val=response.status_code,
+                            )
+                            return None
+                        filecontents = response.content
+                        content_type = response.headers.get("content-type")
+        except (urllib.error.URLError, requests.exceptions.RequestException) as e:
+            error_msg = tr.editing_an_error_occurred_while_opening(val=str(e))
+            return None
+        finally:
+            self.mw.progress.finish()
+            if error_msg:
+                showWarning(error_msg)
+        # strip off any query string
+        url = re.sub(r"\?.*?$", "", url)
+        fname = os.path.basename(urllib.parse.unquote(url))
+        if not fname.strip():
+            fname = "paste"
+        if content_type:
+            fname = self.mw.col.media.add_extension_based_on_mime(fname, content_type)
+
+        return self.mw.col.media.write_data(fname, filecontents)
+
+    # Paste/drag&drop
+    ######################################################################
+
+    removeTags = ["script", "iframe", "object", "style"]
+
+    def _pastePreFilter(self, html: str, internal: bool) -> str:
+        # https://anki.tenderapp.com/discussions/ankidesktop/39543-anki-is-replacing-the-character-by-when-i-exit-the-html-edit-mode-ctrlshiftx
+        if html.find(">") < 0:
+            return html
+
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", UserWarning)
+            doc = BeautifulSoup(html, "html.parser")
+
+        if not internal:
+            for tag_name in self.removeTags:
+                for node in doc(tag_name):
+                    node.decompose()
+
+            # convert p tags to divs
+            for node in doc("p"):
+                if hasattr(node, "name"):
+                    node.name = "div"
+
+        for element in doc("img"):
+            if not isinstance(element, bs4.Tag):
+                continue
+            tag = element
+            try:
+                src = tag["src"]
+            except KeyError:
+                # for some bizarre reason, mnemosyne removes src elements
+                # from missing media
+                continue
+
+            # in internal pastes, rewrite mediasrv references to relative
+            if internal:
+                m = re.match(r"http://127.0.0.1:\d+/(.*)$", str(src))
+                if m:
+                    tag["src"] = m.group(1)
+            # in external pastes, download remote media
+            elif isinstance(src, str) and self.isURL(src):
+                fname = self._retrieveURL(src)
+                if fname:
+                    tag["src"] = fname
+            elif isinstance(src, str) and src.startswith("data:image/"):
+                # and convert inlined data
+                tag["src"] = self.inlinedImageToFilename(str(src))
+
+        html = str(doc)
+        return html
+
+    def doPaste(self, html: str, internal: bool, extended: bool = False) -> None:
+        html = self._pastePreFilter(html, internal)
+        if extended:
+            ext = "true"
+        else:
+            ext = "false"
+        self.web.eval(f"pasteHTML({json.dumps(html)}, {json.dumps(internal)}, {ext});")
+        gui_hooks.editor_did_paste(self, html, internal, extended)
+
+    def doDrop(
+        self, html: str, internal: bool, extended: bool, cursor_pos: QPoint
+    ) -> None:
+        def pasteIfField(ret: bool) -> None:
+            if ret:
+                self.doPaste(html, internal, extended)
+
+        zoom = self.web.zoomFactor()
+        x, y = int(cursor_pos.x() / zoom), int(cursor_pos.y() / zoom)
+
+        self.web.evalWithCallback(f"focusIfField({x}, {y});", pasteIfField)
+
+    def onPaste(self) -> None:
+        self.web.onPaste()
+
+    def onCutOrCopy(self) -> None:
+        self.web.user_cut_or_copied()
+
+    # Image occlusion
+    ######################################################################
+
+    def current_notetype_is_image_occlusion(self) -> bool:
+        if not self.note:
+            return False
+
+        return (
+            self.note_type().get("originalStockKind", None)
+            == StockNotetype.OriginalStockKind.ORIGINAL_STOCK_KIND_IMAGE_OCCLUSION
+        )
+
+    def setup_mask_editor(self, image_path: str) -> None:
+        try:
+            if self.editorMode == EditorMode.ADD_CARDS:
+                self.setup_mask_editor_for_new_note(
+                    image_path=image_path, notetype_id=0
+                )
+            else:
+                assert self.note is not None
+                self.setup_mask_editor_for_existing_note(
+                    note_id=self.note.id, image_path=image_path
+                )
+        except Exception as e:
+            showWarning(str(e))
+
+    def select_image_and_occlude(self) -> None:
+        """Show a file selection screen, then get selected image path."""
+        extension_filter = " ".join(
+            f"*.{extension}" for extension in sorted(itertools.chain(pics))
+        )
+        filter = f"{tr.editing_media()} ({extension_filter})"
+
+        getFile(
+            parent=self.widget,
+            title=tr.editing_add_media(),
+            cb=cast(Callable[[Any], None], self.setup_mask_editor),
+            filter=filter,
+            key="media",
+        )
+
+        self.parentWindow.activateWindow()
+
+    def extract_img_path_from_html(self, html: str) -> str | None:
+        assert self.note is not None
+        # with allowed_suffixes=pics, all non-pics will be rendered as <a>s and won't be included here
+        if not (images := self.mw.col.media.files_in_str(self.note.mid, html)):
+            return None
+        image_path = urllib.parse.unquote(images[0])
+        return os.path.join(self.mw.col.media.dir(), image_path)
+
+    def select_image_from_clipboard_and_occlude(self) -> None:
+        """Set up the mask editor for the image in the clipboard."""
+
+        clipboard = self.mw.app.clipboard()
+        assert clipboard is not None
+        mime = clipboard.mimeData()
+        assert mime is not None
+        # try checking for urls first, fallback to image data
+        if (
+            (html := self.web._processUrls(mime, allowed_suffixes=pics))
+            and (path := self.extract_img_path_from_html(html))
+        ) or (mime.hasImage() and (path := self._read_pasted_image(mime))):
+            self.setup_mask_editor(path)
+            self.parentWindow.activateWindow()
+        else:
+            showWarning(tr.editing_no_image_found_on_clipboard())
+            return
+
+    def setup_mask_editor_for_new_note(
+        self,
+        image_path: str,
+        notetype_id: NotetypeId | int = 0,
+    ):
+        """Set-up IO mask editor for adding new notes
+        Presupposes that active editor notetype is an image occlusion notetype
+        Args:
+            image_path: Absolute path to image.
+            notetype_id: ID of note type to use. Provided ID must belong to an
+              image occlusion notetype. Set this to 0 to auto-select the first
+              found image occlusion notetype in the user's collection.
+        """
+        image_field_html = self._addMedia(image_path)
+        self.last_io_image_path = self.extract_img_path_from_html(image_field_html)
+        io_options = self._create_add_io_options(
+            image_path=image_path,
+            image_field_html=image_field_html,
+            notetype_id=notetype_id,
+        )
+        self._setup_mask_editor(io_options)
+
+    def setup_mask_editor_for_existing_note(
+        self, note_id: NoteId, image_path: str | None = None
+    ):
+        """Set-up IO mask editor for editing existing notes
+        Presupposes that active editor notetype is an image occlusion notetype
+        Args:
+            note_id: ID of note to edit.
+            image_path: (Optional) Absolute path to image that should replace current
+              image
+        """
+        io_options = self._create_edit_io_options(note_id)
+        if image_path:
+            image_field_html = self._addMedia(image_path)
+            self.last_io_image_path = self.extract_img_path_from_html(image_field_html)
+            self.web.eval(f"resetIOImage({json.dumps(image_path)})")
+            self.web.eval(f"setImageField({json.dumps(image_field_html)})")
+        self._setup_mask_editor(io_options)
+
+    def reset_image_occlusion(self) -> None:
+        self.web.eval("resetIOImageLoaded()")
+
+    def update_occlusions_field(self) -> None:
+        self.web.eval("saveOcclusions()")
+
+    def _setup_mask_editor(self, io_options: dict):
+        self.web.eval(
+            'require("anki/ui").loaded.then(() =>'
+            f"setupMaskEditor({json.dumps(io_options)})"
+            "); "
+        )
+
+    @staticmethod
+    def _create_add_io_options(
+        image_path: str, image_field_html: str, notetype_id: NotetypeId | int = 0
+    ) -> dict:
+        return {
+            "mode": {"kind": "add", "imagePath": image_path, "notetypeId": notetype_id},
+            "html": image_field_html,
+        }
+
+    @staticmethod
+    def _create_clone_io_options(orig_note_id: NoteId) -> dict:
+        return {
+            "mode": {"kind": "add", "clonedNoteId": orig_note_id},
+        }
+
+    @staticmethod
+    def _create_edit_io_options(note_id: NoteId) -> dict:
+        return {"mode": {"kind": "edit", "noteId": note_id}}
+
+    # Legacy editing routines
+    ######################################################################
+
+    _js_legacy = "this routine has been moved into JS, and will be removed soon"
+
+    @deprecated(info=_js_legacy)
+    def onHtmlEdit(self) -> None:
+        field = self.currentField
+        self.call_after_note_saved(lambda: self._onHtmlEdit(field))
+
+    @deprecated(info=_js_legacy)
+    def _onHtmlEdit(self, field: int) -> None:
+        assert self.note is not None
+        d = QDialog(self.widget, Qt.WindowType.Window)
+        form = aqt.forms.edithtml.Ui_Dialog()
+        form.setupUi(d)
+        restoreGeom(d, "htmlEditor")
+        disable_help_button(d)
+        qconnect(
+            form.buttonBox.helpRequested, lambda: openHelp(HelpPage.EDITING_FEATURES)
+        )
+        font = QFont("Courier")
+        font.setStyleHint(QFont.StyleHint.TypeWriter)
+        form.textEdit.setFont(font)
+        form.textEdit.setPlainText(self.note.fields[field])
+        d.show()
+        form.textEdit.moveCursor(QTextCursor.MoveOperation.End)
+        d.exec()
+        html = form.textEdit.toPlainText()
+        if html.find(">") > -1:
+            # filter html through beautifulsoup so we can strip out things like a
+            # leading </div>
+            html_escaped = self.mw.col.media.escape_media_filenames(html)
+            with warnings.catch_warnings():
+                warnings.simplefilter("ignore", UserWarning)
+                html_escaped = str(BeautifulSoup(html_escaped, "html.parser"))
+                html = self.mw.col.media.escape_media_filenames(
+                    html_escaped, unescape=True
+                )
+        self.note.fields[field] = html
+        if not self.addMode:
+            self._save_current_note()
+        self.loadNote(focusTo=field)
+        saveGeom(d, "htmlEditor")
+
+    @deprecated(info=_js_legacy)
+    def toggleBold(self) -> None:
+        self.web.eval("setFormat('bold');")
+
+    @deprecated(info=_js_legacy)
+    def toggleItalic(self) -> None:
+        self.web.eval("setFormat('italic');")
+
+    @deprecated(info=_js_legacy)
+    def toggleUnderline(self) -> None:
+        self.web.eval("setFormat('underline');")
+
+    @deprecated(info=_js_legacy)
+    def toggleSuper(self) -> None:
+        self.web.eval("setFormat('superscript');")
+
+    @deprecated(info=_js_legacy)
+    def toggleSub(self) -> None:
+        self.web.eval("setFormat('subscript');")
+
+    @deprecated(info=_js_legacy)
+    def removeFormat(self) -> None:
+        self.web.eval("setFormat('removeFormat');")
+
+    @deprecated(info=_js_legacy)
+    def onCloze(self) -> None:
+        self.call_after_note_saved(self._onCloze, keepFocus=True)
+
+    @deprecated(info=_js_legacy)
+    def _onCloze(self) -> None:
+        # check that the model is set up for cloze deletion
+        if self.note_type()["type"] != MODEL_CLOZE:
+            if self.addMode:
+                tooltip(tr.editing_warning_cloze_deletions_will_not_work())
+            else:
+                showInfo(tr.editing_to_make_a_cloze_deletion_on())
+                return
+        # find the highest existing cloze
+        highest = 0
+        assert self.note is not None
+        for _, val in list(self.note.items()):
+            m = re.findall(r"\{\{c(\d+)::", val)
+            if m:
+                highest = max(highest, sorted(int(x) for x in m)[-1])
+        # reuse last?
+        if not KeyboardModifiersPressed().alt:
+            highest += 1
+        # must start at 1
+        highest = max(1, highest)
+        self.web.eval("wrap('{{c%d::', '}}');" % highest)
+
+    def setupForegroundButton(self) -> None:
+        assert self.mw.pm.profile is not None
+        self.fcolour = self.mw.pm.profile.get("lastColour", "#00f")
+
+    # use last colour
+    @deprecated(info=_js_legacy)
+    def onForeground(self) -> None:
+        self._wrapWithColour(self.fcolour)
+
+    # choose new colour
+    @deprecated(info=_js_legacy)
+    def onChangeCol(self) -> None:
+        if is_lin:
+            new = QColorDialog.getColor(
+                QColor(self.fcolour),
+                None,
+                None,
+                QColorDialog.ColorDialogOption.DontUseNativeDialog,
+            )
+        else:
+            new = QColorDialog.getColor(QColor(self.fcolour), None)
+        # native dialog doesn't refocus us for some reason
+        self.parentWindow.activateWindow()
+        if new.isValid():
+            self.fcolour = new.name()
+            self.onColourChanged()
+            self._wrapWithColour(self.fcolour)
+
+    @deprecated(info=_js_legacy)
+    def _updateForegroundButton(self) -> None:
+        pass
+
+    @deprecated(info=_js_legacy)
+    def onColourChanged(self) -> None:
+        self._updateForegroundButton()
+        assert self.mw.pm.profile is not None
+        self.mw.pm.profile["lastColour"] = self.fcolour
+
+    @deprecated(info=_js_legacy)
+    def _wrapWithColour(self, colour: str) -> None:
+        self.web.eval(f"setFormat('forecolor', '{colour}')")
+
+    @deprecated(info=_js_legacy)
+    def onAdvanced(self) -> None:
+        m = QMenu(self.mw)
+
+        for text, handler, shortcut in (
+            (tr.editing_mathjax_inline(), self.insertMathjaxInline, "Ctrl+M, M"),
+            (tr.editing_mathjax_block(), self.insertMathjaxBlock, "Ctrl+M, E"),
+            (
+                tr.editing_mathjax_chemistry(),
+                self.insertMathjaxChemistry,
+                "Ctrl+M, C",
+            ),
+            (tr.editing_latex(), self.insertLatex, "Ctrl+T, T"),
+            (tr.editing_latex_equation(), self.insertLatexEqn, "Ctrl+T, E"),
+            (tr.editing_latex_math_env(), self.insertLatexMathEnv, "Ctrl+T, M"),
+            (tr.editing_edit_html(), self.onHtmlEdit, "Ctrl+Shift+X"),
+        ):
+            a = m.addAction(text)
+            assert a is not None
+            qconnect(a.triggered, handler)
+            a.setShortcut(QKeySequence(shortcut))
+
+        qtMenuShortcutWorkaround(m)
+
+        m.exec(QCursor.pos())
+
+    @deprecated(info=_js_legacy)
+    def insertLatex(self) -> None:
+        self.web.eval("wrap('[latex]', '[/latex]');")
+
+    @deprecated(info=_js_legacy)
+    def insertLatexEqn(self) -> None:
+        self.web.eval("wrap('[$]', '[/$]');")
+
+    @deprecated(info=_js_legacy)
+    def insertLatexMathEnv(self) -> None:
+        self.web.eval("wrap('[$$]', '[/$$]');")
+
+    @deprecated(info=_js_legacy)
+    def insertMathjaxInline(self) -> None:
+        self.web.eval("wrap('\\\\(', '\\\\)');")
+
+    @deprecated(info=_js_legacy)
+    def insertMathjaxBlock(self) -> None:
+        self.web.eval("wrap('\\\\[', '\\\\]');")
+
+    @deprecated(info=_js_legacy)
+    def insertMathjaxChemistry(self) -> None:
+        self.web.eval("wrap('\\\\(\\\\ce{', '}\\\\)');")
+
+    def toggleMathjax(self) -> None:
+        self.mw.col.set_config(
+            "renderMathjax", not self.mw.col.get_config("renderMathjax", False)
+        )
+        # hackily redraw the page
+        self.setupWeb()
+        self.loadNoteKeepingFocus()
+
+    def toggleShrinkImages(self) -> None:
+        self.mw.col.set_config(
+            "shrinkEditorImages",
+            not self.mw.col.get_config("shrinkEditorImages", True),
+        )
+
+    def toggleCloseHTMLTags(self) -> None:
+        self.mw.col.set_config(
+            "closeHTMLTags",
+            not self.mw.col.get_config("closeHTMLTags", True),
+        )
+
+    def setTagsCollapsed(self, collapsed: bool) -> None:
+        aqt.mw.pm.set_tags_collapsed(self.editorMode, collapsed)
+
+    # Links from HTML
+    ######################################################################
+
+    def _init_links(self) -> None:
+        self._links: dict[str, Callable] = dict(
+            fields=Editor.onFields,
+            cards=Editor.onCardLayout,
+            bold=Editor.toggleBold,
+            italic=Editor.toggleItalic,
+            underline=Editor.toggleUnderline,
+            super=Editor.toggleSuper,
+            sub=Editor.toggleSub,
+            clear=Editor.removeFormat,
+            colour=Editor.onForeground,
+            changeCol=Editor.onChangeCol,
+            cloze=Editor.onCloze,
+            attach=Editor.onAddMedia,
+            record=Editor.onRecSound,
+            more=Editor.onAdvanced,
+            dupes=Editor.showDupes,
+            paste=Editor.onPaste,
+            cutOrCopy=Editor.onCutOrCopy,
+            htmlEdit=Editor.onHtmlEdit,
+            mathjaxInline=Editor.insertMathjaxInline,
+            mathjaxBlock=Editor.insertMathjaxBlock,
+            mathjaxChemistry=Editor.insertMathjaxChemistry,
+            toggleMathjax=Editor.toggleMathjax,
+            toggleShrinkImages=Editor.toggleShrinkImages,
+            toggleCloseHTMLTags=Editor.toggleCloseHTMLTags,
+            addImageForOcclusion=Editor.select_image_and_occlude,
+            addImageForOcclusionFromClipboard=Editor.select_image_from_clipboard_and_occlude,
+        )
+
+    def note_type(self) -> NotetypeDict:
+        assert self.note is not None
+        note_type = self.note.note_type()
+        assert note_type is not None
+        return note_type
+
+
+# Pasting, drag & drop, and keyboard layouts
+######################################################################
+
+
+class EditorWebView(AnkiWebView):
+    def __init__(self, parent: QWidget, editor: Editor) -> None:
+        AnkiWebView.__init__(self, kind=AnkiWebViewKind.EDITOR)
+        self.editor = editor
+        self.setAcceptDrops(True)
+        self._store_field_content_on_next_clipboard_change = False
+        # when we detect the user copying from a field, we store the content
+        # here, and use it when they paste, so we avoid filtering field content
+        self._internal_field_text_for_paste: str | None = None
+        self._last_known_clipboard_mime: QMimeData | None = None
+        clip = self.editor.mw.app.clipboard()
+        assert clip is not None
+        clip.dataChanged.connect(self._on_clipboard_change)
+        gui_hooks.editor_web_view_did_init(self)
+
+    def user_cut_or_copied(self) -> None:
+        self._store_field_content_on_next_clipboard_change = True
+        self._internal_field_text_for_paste = None
+
+    def _on_clipboard_change(
+        self, mode: QClipboard.Mode = QClipboard.Mode.Clipboard
+    ) -> None:
+        self._last_known_clipboard_mime = self._clipboard().mimeData(mode)
+        if self._store_field_content_on_next_clipboard_change:
+            # if the flag was set, save the field data
+            self._internal_field_text_for_paste = self._get_clipboard_html_for_field(
+                mode
+            )
+            self._store_field_content_on_next_clipboard_change = False
+        elif self._internal_field_text_for_paste != self._get_clipboard_html_for_field(
+            mode
+        ):
+            # if we've previously saved the field, blank it out if the clipboard state has changed
+            self._internal_field_text_for_paste = None
+
+    def _get_clipboard_html_for_field(self, mode: QClipboard.Mode) -> str | None:
+        clip = self._clipboard()
+        if not (mime := clip.mimeData(mode)):
+            return None
+        if not mime.hasHtml():
+            return None
+        return mime.html()
+
+    def onCut(self) -> None:
+        self.triggerPageAction(QWebEnginePage.WebAction.Cut)
+
+    def onCopy(self) -> None:
+        self.triggerPageAction(QWebEnginePage.WebAction.Copy)
+
+    def on_copy_image(self) -> None:
+        self.triggerPageAction(QWebEnginePage.WebAction.CopyImageToClipboard)
+
+    def _opened_context_menu_on_image(self) -> bool:
+        if not hasattr(self, "lastContextMenuRequest"):
+            return False
+        context_menu_request = self.lastContextMenuRequest()
+        assert context_menu_request is not None
+        return (
+            context_menu_request.mediaType()
+            == context_menu_request.MediaType.MediaTypeImage
+        )
+
+    def _wantsExtendedPaste(self) -> bool:
+        strip_html = self.editor.mw.col.get_config_bool(
+            Config.Bool.PASTE_STRIPS_FORMATTING
+        )
+        if KeyboardModifiersPressed().shift:
+            strip_html = not strip_html
+        return not strip_html
+
+    def _onPaste(self, mode: QClipboard.Mode) -> None:
+        # Since _on_clipboard_change doesn't always trigger properly on macOS, we do a double check if any changes were made before pasting
+        clipboard = self._clipboard()
+        if self._last_known_clipboard_mime != clipboard.mimeData(mode):
+            self._on_clipboard_change(mode)
+        extended = self._wantsExtendedPaste()
+        if html := self._internal_field_text_for_paste:
+            print("reuse internal")
+            self.editor.doPaste(html, True, extended)
+        else:
+            if not (mime := clipboard.mimeData(mode=mode)):
+                return
+            print("use clipboard")
+            html, internal = self._processMime(mime, extended)
+            if html:
+                self.editor.doPaste(html, internal, extended)
+
+    def onPaste(self) -> None:
+        self._onPaste(QClipboard.Mode.Clipboard)
+
+    def onMiddleClickPaste(self) -> None:
+        self._onPaste(QClipboard.Mode.Selection)
+
+    def dragEnterEvent(self, evt: QDragEnterEvent | None) -> None:
+        assert evt is not None
+        evt.accept()
+
+    def dropEvent(self, evt: QDropEvent | None) -> None:
+        assert evt is not None
+        extended = self._wantsExtendedPaste()
+        mime = evt.mimeData()
+        assert mime is not None
+
+        if (
+            self.editor.state is EditorState.IO_PICKER
+            and (html := self._processUrls(mime, allowed_suffixes=pics))
+            and (path := self.editor.extract_img_path_from_html(html))
+        ):
+            self.editor.setup_mask_editor(path)
+            return
+
+        evt_pos = evt.position()
+        cursor_pos = QPoint(int(evt_pos.x()), int(evt_pos.y()))
+
+        if evt.source() and mime.hasHtml():
+            # don't filter html from other fields
+            html, internal = mime.html(), True
+        else:
+            html, internal = self._processMime(mime, extended, drop_event=True)
+
+        if not html:
+            return
+
+        self.editor.doDrop(html, internal, extended, cursor_pos)
+
+    # returns (html, isInternal)
+    def _processMime(
+        self, mime: QMimeData, extended: bool = False, drop_event: bool = False
+    ) -> tuple[str, bool]:
+        # print("html=%s image=%s urls=%s txt=%s" % (
+        #     mime.hasHtml(), mime.hasImage(), mime.hasUrls(), mime.hasText()))
+        # print("html", mime.html())
+        # print("urls", mime.urls())
+        # print("text", mime.text())
+
+        internal = False
+
+        mime = gui_hooks.editor_will_process_mime(
+            mime, self, internal, extended, drop_event
+        )
+
+        # try various content types in turn
+        if mime.hasHtml():
+            html_content = mime.html()[11:] if internal else mime.html()
+            return html_content, internal
+
+        # given _processUrls' extra allowed_suffixes kwarg, placate the typechecker
+        def process_url(mime: QMimeData, extended: bool = False) -> str | None:
+            return self._processUrls(mime, extended)
+
+        # favour url if it's a local link
+        if (
+            mime.hasUrls()
+            and (urls := mime.urls())
+            and urls[0].toString().startswith("file://")
+        ):
+            types = (process_url, self._processImage, self._processText)
+        else:
+            types = (self._processImage, process_url, self._processText)
+
+        for fn in types:
+            html = fn(mime, extended)
+            if html:
+                return html, True
+        return "", False
+
+    def _processUrls(
+        self,
+        mime: QMimeData,
+        extended: bool = False,
+        allowed_suffixes: Iterable[str] = (),
+    ) -> str | None:
+        if not mime.hasUrls():
+            return None
+
+        buf = ""
+        for qurl in mime.urls():
+            url = qurl.toString()
+            # chrome likes to give us the URL twice with a \n
+            if lines := url.splitlines():
+                url = lines[0]
+                buf += self.editor.urlToLink(url, allowed_suffixes=allowed_suffixes)
+
+        return buf
+
+    def _processText(self, mime: QMimeData, extended: bool = False) -> str | None:
+        if not mime.hasText():
+            return None
+
+        txt = mime.text()
+        processed = []
+        lines = txt.split("\n")
+
+        for line in lines:
+            for token in re.split(r"(\S+)", line):
+                # inlined data in base64?
+                if extended and token.startswith("data:image/"):
+                    processed.append(self.editor.inlinedImageToLink(token))
+                elif extended and self.editor.isURL(token):
+                    # if the user is pasting an image or sound link, convert it to local, otherwise paste as a hyperlink
+                    link = self.editor.urlToLink(token)
+                    processed.append(link)
+                else:
+                    token = html.escape(token).replace("\t", " " * 4)
+
+                    # if there's more than one consecutive space,
+                    # use non-breaking spaces for the second one on
+                    def repl(match: Match) -> str:
+                        return f"{match.group(1).replace(' ', '&nbsp;')} "
+
+                    token = re.sub(" ( +)", repl, token)
+                    processed.append(token)
+
+            processed.append("<br>")
+        # remove last <br>
+        processed.pop()
+        return "".join(processed)
+
+    def _processImage(self, mime: QMimeData, extended: bool = False) -> str | None:
+        if not mime.hasImage():
+            return None
+        path = self.editor._read_pasted_image(mime)
+        fname = self.editor._addMedia(path)
+
+        return fname
+
+    def contextMenuEvent(self, evt: QContextMenuEvent | None) -> None:
+        m = QMenu(self)
+        if self.hasSelection():
+            self._add_cut_action(m)
+            self._add_copy_action(m)
+        a = m.addAction(tr.editing_paste())
+        assert a is not None
+        qconnect(a.triggered, self.onPaste)
+        if self.editor.state is EditorState.IO_MASKS and (
+            path := self.editor.last_io_image_path
+        ):
+            self._add_image_menu_with_path(m, path)
+        elif self._opened_context_menu_on_image():
+            self._add_image_menu(m)
+        gui_hooks.editor_will_show_context_menu(self, m)
+        m.popup(QCursor.pos())
+
+    def _add_cut_action(self, menu: QMenu) -> None:
+        a = menu.addAction(tr.editing_cut())
+        assert a is not None
+        qconnect(a.triggered, self.onCut)
+
+    def _add_copy_action(self, menu: QMenu) -> None:
+        a = menu.addAction(tr.actions_copy())
+        assert a is not None
+        qconnect(a.triggered, self.onCopy)
+
+    def _add_image_menu(self, menu: QMenu) -> None:
+        a = menu.addAction(tr.editing_copy_image())
+        assert a is not None
+        qconnect(a.triggered, self.on_copy_image)
+
+        context_menu_request = self.lastContextMenuRequest()
+        assert context_menu_request is not None
+        url = context_menu_request.mediaUrl()
+        file_name = url.fileName()
+        path = os.path.join(self.editor.mw.col.media.dir(), file_name)
+        self._add_image_menu_with_path(menu, path)
+
+    def _add_image_menu_with_path(self, menu: QMenu, path: str) -> None:
+        a = menu.addAction(tr.editing_open_image())
+        assert a is not None
+        qconnect(a.triggered, lambda: openFolder(path))
+
+        a = menu.addAction(tr.editing_show_in_folder())
+        assert a is not None
+        qconnect(a.triggered, lambda: show_in_folder(path))
+
+    def _clipboard(self) -> QClipboard:
+        clipboard = self.editor.mw.app.clipboard()
+        assert clipboard is not None
+        return clipboard
+
+
+# QFont returns "Kozuka Gothic Pro L" but WebEngine expects "Kozuka Gothic Pro Light"
+# - there may be other cases like a trailing 'Bold' that need fixing, but will
+# wait for further reports first.
+def fontMungeHack(font: str) -> str:
+    return re.sub(" L$", " Light", font)
+
+
+def munge_html(txt: str, editor: Editor) -> str:
+    return "" if txt in ("<br>", "<div><br></div>") else txt
+
+
+def remove_null_bytes(txt: str, editor: Editor) -> str:
+    # misbehaving apps may include a null byte in the text
+    return txt.replace("\x00", "")
+
+
+def reverse_url_quoting(txt: str, editor: Editor) -> str:
+    # reverse the url quoting we added to get images to display
+    return editor.mw.col.media.escape_media_filenames(txt, unescape=True)
+
+
+gui_hooks.editor_will_use_font_for_field.append(fontMungeHack)
+gui_hooks.editor_will_munge_html.append(munge_html)  # type: ignore
+gui_hooks.editor_will_munge_html.append(remove_null_bytes)  # type: ignore
+gui_hooks.editor_will_munge_html.append(reverse_url_quoting)  # type: ignore
+gui_hooks.editor_will_munge_html.append(reverse_url_quoting)  # type: ignore
diff --git a/qt/aqt/main.py b/qt/aqt/main.py
index c707d1b2a..0ec2aa75c 100644
--- a/qt/aqt/main.py
+++ b/qt/aqt/main.py
@@ -1280,14 +1280,20 @@ title="{}" {}>{}</button>""".format(
     # Other menu operations
     ##########################################################################
 
+    def _open_new_or_legacy_dialog(self, name: str, *args: Any, **kwargs: Any) -> None:
+        want_old = KeyboardModifiersPressed().shift
+        if not want_old:
+            name = f"New{name}"
+        aqt.dialogs.open(name, self, *args, **kwargs)
+
     def onAddCard(self) -> None:
-        aqt.dialogs.open("AddCards", self)
+        self._open_new_or_legacy_dialog("AddCards")
 
     def onBrowse(self) -> None:
         aqt.dialogs.open("Browser", self, card=self.reviewer.card)
 
     def onEditCurrent(self) -> None:
-        aqt.dialogs.open("EditCurrent", self)
+        self._open_new_or_legacy_dialog("EditCurrent")
 
     def onOverview(self) -> None:
         self.moveToState("overview")
@@ -1296,11 +1302,7 @@ title="{}" {}>{}</button>""".format(
         deck = self._selectedDeck()
         if not deck:
             return
-        want_old = KeyboardModifiersPressed().shift
-        if want_old:
-            aqt.dialogs.open("DeckStats", self)
-        else:
-            aqt.dialogs.open("NewDeckStats", self)
+        self._open_new_or_legacy_dialog("DeckStats", self)
 
     def onPrefs(self) -> None:
         aqt.dialogs.open("Preferences", self)
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index 052dac291..4328b1189 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -608,10 +608,10 @@ def editor_op_changes_request(endpoint: str) -> bytes:
     response.ParseFromString(output)
 
     def handle_on_main() -> None:
-        from aqt.editor import Editor
+        from aqt.editor import NewEditor
 
         handler = aqt.mw.app.activeWindow()
-        if handler and isinstance(getattr(handler, "editor", None), Editor):
+        if handler and isinstance(getattr(handler, "editor", None), NewEditor):
             handler = handler.editor  # type: ignore
         on_op_finished(aqt.mw, response, handler)
 
@@ -808,10 +808,10 @@ def close_add_cards() -> bytes:
     req.ParseFromString(request.data)
 
     def handle_on_main() -> None:
-        from aqt.addcards import AddCards
+        from aqt.addcards import NewAddCards
 
         window = aqt.mw.app.activeWindow()
-        if isinstance(window, AddCards):
+        if isinstance(window, NewAddCards):
             window._close_if_user_wants_to_discard_changes(req.val)
 
     aqt.mw.taskman.run_on_main(lambda: QTimer.singleShot(0, handle_on_main))
@@ -820,10 +820,10 @@ def close_add_cards() -> bytes:
 
 def close_edit_current() -> bytes:
     def handle_on_main() -> None:
-        from aqt.editcurrent import EditCurrent
+        from aqt.editcurrent import NewEditCurrent
 
         window = aqt.mw.app.activeWindow()
-        if isinstance(window, EditCurrent):
+        if isinstance(window, NewEditCurrent):
             window.close()
 
     aqt.mw.taskman.run_on_main(lambda: QTimer.singleShot(0, handle_on_main))
@@ -1070,3 +1070,5 @@ def _extract_dynamic_get_request(path: str) -> DynamicRequest | None:
         return legacy_page_data
     else:
         return None
+        return None
+        return None
diff --git a/qt/tools/genhooks_gui.py b/qt/tools/genhooks_gui.py
index 33838c46b..8c3a7f994 100644
--- a/qt/tools/genhooks_gui.py
+++ b/qt/tools/genhooks_gui.py
@@ -1008,12 +1008,15 @@ hooks = [
     ###################
     Hook(
         name="add_cards_will_show_history_menu",
-        args=["addcards: aqt.addcards.AddCards", "menu: QMenu"],
+        args=[
+            "addcards: aqt.addcards.AddCards | aqt.addcards.NewAddCards",
+            "menu: QMenu",
+        ],
         legacy_hook="AddCards.onHistory",
     ),
     Hook(
         name="add_cards_did_init",
-        args=["addcards: aqt.addcards.AddCards"],
+        args=["addcards: aqt.addcards.AddCards | aqt.addcards.NewAddCards"],
     ),
     Hook(
         name="add_cards_did_add_note",
@@ -1068,7 +1071,7 @@ hooks = [
     Hook(
         name="addcards_did_change_note_type",
         args=[
-            "addcards: aqt.addcards.AddCards",
+            "addcards: aqt.addcards.AddCards | aqt.addcards.NewAddCards",
             "old: anki.models.NoteType",
             "new: anki.models.NoteType",
         ],
@@ -1087,20 +1090,26 @@ hooks = [
     ###################
     Hook(
         name="editor_did_init_left_buttons",
-        args=["buttons: list[str]", "editor: aqt.editor.Editor"],
+        args=["buttons: list[str]", "editor: aqt.editor.Editor | aqt.editor.NewEditor"],
     ),
     Hook(
         name="editor_did_init_buttons",
-        args=["buttons: list[str]", "editor: aqt.editor.Editor"],
+        args=["buttons: list[str]", "editor: aqt.editor.Editor | aqt.editor.NewEditor"],
     ),
     Hook(
         name="editor_did_init_shortcuts",
-        args=["shortcuts: list[tuple]", "editor: aqt.editor.Editor"],
+        args=[
+            "shortcuts: list[tuple]",
+            "editor: aqt.editor.Editor | aqt.editor.NewEditor",
+        ],
         legacy_hook="setupEditorShortcuts",
     ),
     Hook(
         name="editor_will_show_context_menu",
-        args=["editor_webview: aqt.editor.EditorWebView", "menu: QMenu"],
+        args=[
+            "editor_webview: aqt.editor.EditorWebView | aqt.editor.NewEditorWebView",
+            "menu: QMenu",
+        ],
         legacy_hook="EditorWebView.contextMenuEvent",
     ),
     Hook(
@@ -1121,7 +1130,7 @@ hooks = [
     ),
     Hook(
         name="editor_did_load_note",
-        args=["editor: aqt.editor.Editor"],
+        args=["editor: aqt.editor.Editor | aqt.editor.NewEditor"],
         legacy_hook="loadNote",
     ),
     Hook(
@@ -1131,7 +1140,7 @@ hooks = [
     ),
     Hook(
         name="editor_will_munge_html",
-        args=["txt: str", "editor: aqt.editor.Editor"],
+        args=["txt: str", "editor: aqt.editor.Editor | aqt.editor.NewEditor"],
         return_type="str",
         doc="""Allows manipulating the text that will be saved by the editor""",
     ),
@@ -1143,15 +1152,21 @@ hooks = [
     ),
     Hook(
         name="editor_web_view_did_init",
-        args=["editor_web_view: aqt.editor.EditorWebView"],
+        args=[
+            "editor_web_view: aqt.editor.EditorWebView | aqt.editor.NewEditorWebView"
+        ],
     ),
     Hook(
         name="editor_did_init",
-        args=["editor: aqt.editor.Editor"],
+        args=["editor: aqt.editor.Editor | aqt.editor.NewEditor"],
     ),
     Hook(
         name="editor_will_load_note",
-        args=["js: str", "note: anki.notes.Note", "editor: aqt.editor.Editor"],
+        args=[
+            "js: str",
+            "note: anki.notes.Note",
+            "editor: aqt.editor.Editor | aqt.editor.NewEditor",
+        ],
         return_type="str",
         doc="""Allows changing the javascript commands to load note before
         executing it and do change in the QT editor.""",
@@ -1159,7 +1174,7 @@ hooks = [
     Hook(
         name="editor_did_paste",
         args=[
-            "editor: aqt.editor.Editor",
+            "editor: aqt.editor.Editor | aqt.editor.NewEditor",
             "html: str",
             "internal: bool",
             "extended: bool",
@@ -1170,7 +1185,7 @@ hooks = [
         name="editor_will_process_mime",
         args=[
             "mime: QMimeData",
-            "editor_web_view: aqt.editor.EditorWebView",
+            "editor_web_view: aqt.editor.EditorWebView | aqt.editor.NewEditorWebView",
             "internal: bool",
             "extended: bool",
             "drop_event: bool",
@@ -1194,7 +1209,7 @@ hooks = [
     Hook(
         name="editor_state_did_change",
         args=[
-            "editor: aqt.editor.Editor",
+            "editor: aqt.editor.Editor | aqt.editor.NewEditor",
             "new_state: aqt.editor.EditorState",
             "old_state: aqt.editor.EditorState",
         ],
@@ -1203,7 +1218,10 @@ hooks = [
     ),
     Hook(
         name="editor_mask_editor_did_load_image",
-        args=["editor: aqt.editor.Editor", "path_or_nid: str | anki.notes.NoteId"],
+        args=[
+            "editor: aqt.editor.Editor | aqt.editor.NewEditor",
+            "path_or_nid: str | anki.notes.NoteId",
+        ],
         doc="""Called when the image occlusion mask editor has completed
         loading an image.
 

From e71f789958f298f1f556d095a40b452e3b277e1b Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 24 Jul 2025 11:31:31 +0300
Subject: [PATCH 077/133] Remove duplicate lines in mediasrv.py again

Turned out to be a race condition when the ruff/black/isort extensions
are installed.

https://github.com/astral-sh/ruff-vscode/issues/651
---
 qt/aqt/mediasrv.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index 4328b1189..132160b61 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -1070,5 +1070,3 @@ def _extract_dynamic_get_request(path: str) -> DynamicRequest | None:
         return legacy_page_data
     else:
         return None
-        return None
-        return None

From a05f3dd38ac16b736dbe7b08c17d69b391aadb24 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 24 Jul 2025 11:49:10 +0300
Subject: [PATCH 078/133] Restore old editor entrypoint

---
 build/configure/src/aqt.rs |  4 ++--
 build/configure/src/web.rs | 28 ++++++++++++++++++++++++++++
 ts/routes/editor/index.ts  | 10 ++++++++++
 3 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 ts/routes/editor/index.ts

diff --git a/build/configure/src/aqt.rs b/build/configure/src/aqt.rs
index cad07ae4d..242c81f57 100644
--- a/build/configure/src/aqt.rs
+++ b/build/configure/src/aqt.rs
@@ -146,7 +146,7 @@ fn build_css(build: &mut Build) -> Result<()> {
             },
         )?;
     }
-    let other_ts_css = build.inputs_with_suffix(inputs![":ts:reviewer:reviewer.css"], ".css");
+    let other_ts_css = build.inputs_with_suffix(inputs![":ts:editor", ":ts:reviewer:reviewer.css"], ".css");
     build.add_action(
         "qt:aqt:data:web:css",
         CopyFiles {
@@ -188,7 +188,7 @@ fn build_js(build: &mut Build) -> Result<()> {
         },
     )?;
     let files_from_ts =
-        build.inputs_with_suffix(inputs![":ts:reviewer:reviewer.js", ":ts:mathjax"], ".js");
+        build.inputs_with_suffix(inputs![":ts:editor", ":ts:reviewer:reviewer.js", ":ts:mathjax"], ".js");
     build.add_action(
         "qt:aqt:data:web:js",
         CopyFiles {
diff --git a/build/configure/src/web.rs b/build/configure/src/web.rs
index 152a1a4d0..9e027fec3 100644
--- a/build/configure/src/web.rs
+++ b/build/configure/src/web.rs
@@ -29,6 +29,7 @@ pub fn build_and_check_web(build: &mut Build) -> Result<()> {
     build_sveltekit(build)?;
     declare_and_check_other_libraries(build)?;
     build_and_check_pages(build)?;
+    build_and_check_editor(build)?;
     build_and_check_reviewer(build)?;
     build_and_check_mathjax(build)?;
     check_web(build)?;
@@ -217,6 +218,33 @@ fn build_and_check_pages(build: &mut Build) -> Result<()> {
     Ok(())
 }
 
+/// Only used for the legacy editor page.
+fn build_and_check_editor(build: &mut Build) -> Result<()> {
+    let editor_deps = inputs![
+        ":ts:lib",
+        ":ts:components",
+        ":ts:domlib",
+        ":ts:sveltelib",
+        ":ts:html-filter",
+        ":sass",
+        ":sveltekit",
+        glob!("ts/lib/editable,routes/{editor,image-occlusion}/**")
+    ];
+
+    build.add_action(
+        "ts:editor",
+        EsbuildScript {
+            script: "ts/bundle_svelte.mjs".into(),
+            entrypoint: "ts/routes/editor/index.ts".into(),
+            output_stem: "ts/editor/editor",
+            deps: editor_deps.clone(),
+            extra_exts: &["css"],
+        },
+    )?;
+
+    Ok(())
+}
+
 fn build_and_check_reviewer(build: &mut Build) -> Result<()> {
     let reviewer_deps = inputs![
         ":ts:lib",
diff --git a/ts/routes/editor/index.ts b/ts/routes/editor/index.ts
new file mode 100644
index 000000000..d3de21cc3
--- /dev/null
+++ b/ts/routes/editor/index.ts
@@ -0,0 +1,10 @@
+// Copyright: Ankitects Pty Ltd and contributors
+// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+
+// Entry point for the legacy editor page.
+
+import { globalExport } from "@tslib/globals";
+
+import * as base from "./base";
+
+globalExport(base);

From 63052e7fb9ea9b4fd3445ece96faffb1d3ff74d0 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 24 Jul 2025 13:14:27 +0300
Subject: [PATCH 079/133] Add a legacy switch to NoteEditor

---
 build/configure/src/aqt.rs                    |  16 +-
 build/configure/src/web.rs                    |  21 +-
 qt/aqt/editcurrent_legacy.py                  |   1 -
 qt/aqt/editor_legacy.py                       |  11 +-
 ts/lib/editable/index.ts                      |   3 +
 ts/routes/editor/NoteEditor.svelte            | 179 ++++++++++++------
 ts/routes/editor/StickyBadge.svelte           |  16 +-
 ts/routes/editor/base.ts                      |   4 +-
 .../editor-toolbar/InlineButtons.svelte       |   2 +
 .../rich-text-input/RichTextInput.svelte      |   2 +
 .../rich-text-input/RichTextStyles.svelte     |  47 +++--
 11 files changed, 208 insertions(+), 94 deletions(-)

diff --git a/build/configure/src/aqt.rs b/build/configure/src/aqt.rs
index 242c81f57..912a1360c 100644
--- a/build/configure/src/aqt.rs
+++ b/build/configure/src/aqt.rs
@@ -146,7 +146,10 @@ fn build_css(build: &mut Build) -> Result<()> {
             },
         )?;
     }
-    let other_ts_css = build.inputs_with_suffix(inputs![":ts:editor", ":ts:reviewer:reviewer.css"], ".css");
+    let other_ts_css = build.inputs_with_suffix(
+        inputs![":ts:editor", ":ts:editable", ":ts:reviewer:reviewer.css"],
+        ".css",
+    );
     build.add_action(
         "qt:aqt:data:web:css",
         CopyFiles {
@@ -187,8 +190,15 @@ fn build_js(build: &mut Build) -> Result<()> {
             inputs: files,
         },
     )?;
-    let files_from_ts =
-        build.inputs_with_suffix(inputs![":ts:editor", ":ts:reviewer:reviewer.js", ":ts:mathjax"], ".js");
+    let files_from_ts = build.inputs_with_suffix(
+        inputs![
+            ":ts:editor",
+            ":ts:editable",
+            ":ts:reviewer:reviewer.js",
+            ":ts:mathjax"
+        ],
+        ".js",
+    );
     build.add_action(
         "qt:aqt:data:web:js",
         CopyFiles {
diff --git a/build/configure/src/web.rs b/build/configure/src/web.rs
index 9e027fec3..0d952dcc6 100644
--- a/build/configure/src/web.rs
+++ b/build/configure/src/web.rs
@@ -203,16 +203,23 @@ fn build_and_check_pages(build: &mut Build) -> Result<()> {
 
         Ok(())
     };
+    // we use the generated .css file separately in the legacy editor
+    build_page(
+        "editable",
+        false,
+        inputs![
+            ":ts:lib",
+            ":ts:components",
+            ":ts:domlib",
+            ":ts:sveltelib",
+            ":sass",
+            ":sveltekit",
+        ],
+    )?;
     build_page(
         "congrats",
         true,
-        inputs![
-            //
-            ":ts:lib",
-            ":ts:components",
-            ":sass",
-            ":sveltekit"
-        ],
+        inputs![":ts:lib", ":ts:components", ":sass", ":sveltekit"],
     )?;
 
     Ok(())
diff --git a/qt/aqt/editcurrent_legacy.py b/qt/aqt/editcurrent_legacy.py
index d4e969c21..b74c0801a 100644
--- a/qt/aqt/editcurrent_legacy.py
+++ b/qt/aqt/editcurrent_legacy.py
@@ -91,4 +91,3 @@ class EditCurrent(QMainWindow):
         self.editor.call_after_note_saved(callback)
 
     onReset = on_operation_did_execute
-    onReset = on_operation_did_execute
diff --git a/qt/aqt/editor_legacy.py b/qt/aqt/editor_legacy.py
index 138deed7a..3f196584e 100644
--- a/qt/aqt/editor_legacy.py
+++ b/qt/aqt/editor_legacy.py
@@ -187,7 +187,7 @@ class Editor:
             context=self,
             default_css=False,
         )
-        self.web.eval(f"setupEditor('{mode}')")
+        self.web.eval(f"setupEditor('{mode}', true)")
         self.web.show()
 
         lefttopbtns: list[str] = []
@@ -563,9 +563,9 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
         if not self.note:
             return
 
-        data = [
-            (fld, self.mw.col.media.escape_media_filenames(val))
-            for fld, val in self.note.items()
+        field_names = self.note.keys()
+        field_values = [
+            self.mw.col.media.escape_media_filenames(val) for val in self.note.values()
         ]
 
         note_type = self.note_type()
@@ -600,7 +600,7 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
 
         js = f"""
             saveSession();
-            setFields({json.dumps(data)});
+            setFields({json.dumps(field_names)}, {json.dumps(field_values)});
             setIsImageOcclusion({json.dumps(self.current_notetype_is_image_occlusion())});
             setNotetypeMeta({json.dumps(notetype_meta)});
             setCollapsed({json.dumps(collapsed)});
@@ -1787,4 +1787,3 @@ gui_hooks.editor_will_use_font_for_field.append(fontMungeHack)
 gui_hooks.editor_will_munge_html.append(munge_html)  # type: ignore
 gui_hooks.editor_will_munge_html.append(remove_null_bytes)  # type: ignore
 gui_hooks.editor_will_munge_html.append(reverse_url_quoting)  # type: ignore
-gui_hooks.editor_will_munge_html.append(reverse_url_quoting)  # type: ignore
diff --git a/ts/lib/editable/index.ts b/ts/lib/editable/index.ts
index 00984a718..277588b5a 100644
--- a/ts/lib/editable/index.ts
+++ b/ts/lib/editable/index.ts
@@ -4,3 +4,6 @@
 import "./editable-base.scss";
 import "./content-editable.scss";
 import "./mathjax.scss";
+/* only imported for the CSS in the legacy editor */
+import "./ContentEditable.svelte";
+import "./Mathjax.svelte";
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index a25bc6d9f..2b7b5d5a8 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -215,18 +215,25 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 
     async function toggleStickyAll() {
-        const values: boolean[] = [];
-        const notetype = await getNotetype({ ntid: notetypeMeta.id });
-        const anySticky = notetype.fields.some((f) => f.config!.sticky);
-        for (const field of notetype.fields) {
-            const sticky = field.config!.sticky;
-            if (!anySticky || sticky) {
-                field.config!.sticky = !sticky;
+        if (isLegacy) {
+            bridgeCommand(
+                "toggleStickyAll",
+                (values: boolean[]) => (stickies = values),
+            );
+        } else {
+            const values: boolean[] = [];
+            const notetype = await getNotetype({ ntid: notetypeMeta.id });
+            const anySticky = notetype.fields.some((f) => f.config!.sticky);
+            for (const field of notetype.fields) {
+                const sticky = field.config!.sticky;
+                if (!anySticky || sticky) {
+                    field.config!.sticky = !sticky;
+                }
+                values.push(field.config!.sticky);
             }
-            values.push(field.config!.sticky);
+            await updateEditorNotetype(notetype);
+            setSticky(values);
         }
-        await updateEditorNotetype(notetype);
-        setSticky(values);
     }
 
     let deregisterSticky: () => void;
@@ -262,9 +269,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         await setMeta(tagsCollapsedMetaKey, collapsed);
     }
 
-    let note: Note;
-    export function setNote(n: Note): void {
-        note = n;
+    function clearCodeMirrorHistory() {
         // TODO this is a hack, because it requires the NoteEditor to know implementation details of the PlainTextInput.
         // It should be refactored once we work on our own Undo stack
         for (const pi of plainTextInputs) {
@@ -272,6 +277,22 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         }
     }
 
+    let noteId: number | null = null;
+    export function setNoteId(ntid: number): void {
+        clearCodeMirrorHistory();
+        noteId = ntid;
+    }
+
+    function getNoteId(): number | null {
+        return noteId;
+    }
+
+    let note: Note;
+    export function setNote(n: Note): void {
+        note = n;
+        clearCodeMirrorHistory();
+    }
+
     let notetypeMeta: NotetypeIdAndModTime;
     function setNotetypeMeta(notetype: Notetype): void {
         notetypeMeta = { id: notetype.id, modTime: notetype.mtimeSecs };
@@ -330,13 +351,15 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     async function transformContentBeforeSave(content: string): Promise<string> {
         content = content.replace(/ data-editor-shrink="(true|false)"/g, "");
-        // misbehaving apps may include a null byte in the text
-        content = content.replaceAll("\0", "");
-        // reverse the url quoting we added to get images to display
-        content = (await decodeIriPaths({ val: content })).val;
+        if (!isLegacy) {
+            // misbehaving apps may include a null byte in the text
+            content = content.replaceAll("\0", "");
+            // reverse the url quoting we added to get images to display
+            content = (await decodeIriPaths({ val: content })).val;
 
-        if (["<br>", "<div><br></div>"].includes(content)) {
-            return "";
+            if (["<br>", "<div><br></div>"].includes(content)) {
+                return "";
+            }
         }
         return content;
     }
@@ -352,10 +375,18 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     async function updateField(index: number, content: string): Promise<void> {
         fieldSave.schedule(async () => {
-            bridgeCommand(`key:${index}`);
-            note!.fields[index] = await transformContentBeforeSave(content);
-            await updateCurrentNote();
-            await updateDuplicateDisplay();
+            if (isLegacy) {
+                bridgeCommand(
+                    `key:${index}:${getNoteId()}:${transformContentBeforeSave(
+                        content,
+                    )}`,
+                );
+            } else {
+                bridgeCommand(`key:${index}`);
+                note!.fields[index] = await transformContentBeforeSave(content);
+                await updateCurrentNote();
+                await updateDuplicateDisplay();
+            }
         }, 600);
     }
 
@@ -640,16 +671,24 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     async function pickIOImage() {
         imageOcclusionMode = undefined;
-        const filename = await openFilePickerForImageOcclusion();
-        if (!filename) {
-            return;
+        if (isLegacy) {
+            bridgeCommand("addImageForOcclusion");
+        } else {
+            const filename = await openFilePickerForImageOcclusion();
+            if (!filename) {
+                return;
+            }
+            setupMaskEditor(filename);
         }
-        setupMaskEditor(filename);
     }
 
     async function pickIOImageFromClipboard() {
         imageOcclusionMode = undefined;
-        await setupMaskEditorFromClipboard();
+        if (isLegacy) {
+            bridgeCommand("addImageForOcclusionFromClipboard");
+        } else {
+            await setupMaskEditorFromClipboard();
+        }
     }
 
     async function handlePickerDrop(event: DragEvent) {
@@ -928,6 +967,19 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         await loadNote(note!.id, notetypeMeta.id, 0, null);
     }
 
+    function checkNonLegacy(value: any): any | undefined {
+        if (isLegacy) {
+            return value;
+        }
+        return undefined;
+    }
+
+    function preventDefaultIfNonLegacy(event: Event) {
+        if (!isLegacy) {
+            event.preventDefault();
+        }
+    }
+
     $: signalEditorState($editorState);
 
     $: $editorState = getEditorState(
@@ -976,6 +1028,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             saveNow,
             closeAddCards,
             focusIfField,
+            getNoteId,
+            setNoteId,
             setNotetypeMeta,
             wrap,
             setMathjaxEnabled,
@@ -1036,6 +1090,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     export let uiResolve: (api: NoteEditorAPI) => void;
     export let mode: EditorMode;
+    export let isLegacy: boolean;
 
     $: if (noteEditor) {
         uiResolve(api as NoteEditorAPI);
@@ -1044,9 +1099,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 <!-- Block Qt's default drag & drop behavior -->
 <svelte:body
-    on:dragenter|preventDefault
-    on:dragover|preventDefault
-    on:drop|preventDefault
+    on:dragenter={preventDefaultIfNonLegacy}
+    on:dragover={preventDefaultIfNonLegacy}
+    on:drop={preventDefaultIfNonLegacy}
 />
 
 <!--
@@ -1059,11 +1114,13 @@ components and functionality for general note editing.
     role="presentation"
     bind:this={noteEditor}
     on:contextmenu={(event) => {
-        contextMenuInput = $focusedInput;
-        onContextMenu(event, api, $focusedInput, contextMenu);
+        if (!isLegacy) {
+            contextMenuInput = $focusedInput;
+            onContextMenu(event, api, $focusedInput, contextMenu);
+        }
     }}
-    on:dragover|preventDefault
-    on:drop={handlePickerDrop}
+    on:dragover={preventDefaultIfNonLegacy}
+    on:drop={checkNonLegacy(handlePickerDrop)}
 >
     <EditorToolbar {size} {wrap} api={toolbar}>
         <svelte:fragment slot="notetypeButtons">
@@ -1122,12 +1179,20 @@ components and functionality for general note editing.
                     on:focusout={async () => {
                         $focusedField = null;
                         setAddonButtonsDisabled(true);
-                        bridgeCommand(`blur:${index}`);
-                        note!.fields[index] = await transformContentBeforeSave(
-                            get(content),
-                        );
-                        await updateCurrentNote();
-                        await updateDuplicateDisplay();
+                        if (isLegacy) {
+                            bridgeCommand(
+                                `blur:${index}:${getNoteId()}:${transformContentBeforeSave(
+                                    get(content),
+                                )}`,
+                            );
+                        } else {
+                            bridgeCommand(`blur:${index}`);
+                            note!.fields[index] = await transformContentBeforeSave(
+                                get(content),
+                            );
+                            await updateCurrentNote();
+                            await updateDuplicateDisplay();
+                        }
                     }}
                     on:mouseenter={() => {
                         $hoveredField = fields[index];
@@ -1160,6 +1225,7 @@ components and functionality for general note editing.
                                         bind:active={stickies[index]}
                                         {index}
                                         {note}
+                                        {isLegacy}
                                         show={fields[index] === $hoveredField ||
                                             fields[index] === $focusedField}
                                     />
@@ -1192,6 +1258,7 @@ components and functionality for general note editing.
                         >
                             <RichTextInput
                                 {hidden}
+                                {isLegacy}
                                 on:focusout={() => {
                                     saveFieldNow();
                                     $focusedInput = null;
@@ -1241,21 +1308,25 @@ components and functionality for general note editing.
         <Collapsible toggleDisplay collapse={$tagsCollapsed}>
             <TagEditor {tags} on:tagsupdate={saveTags} />
         </Collapsible>
-        <ActionButtons {mode} {onClose} {onAdd} />
+        {#if !isLegacy}
+            <ActionButtons {mode} {onClose} {onAdd} />
+        {/if}
     {/if}
 
-    <ContextMenu bind:this={contextMenu}>
-        {#each contextMenuItems as item}
-            <Item
-                click={() => {
-                    item.action();
-                    contextMenuInput?.focus();
-                }}
-            >
-                {item.label}
-            </Item>
-        {/each}
-    </ContextMenu>
+    {#if !isLegacy}
+        <ContextMenu bind:this={contextMenu}>
+            {#each contextMenuItems as item}
+                <Item
+                    click={() => {
+                        item.action();
+                        contextMenuInput?.focus();
+                    }}
+                >
+                    {item.label}
+                </Item>
+            {/each}
+        </ContextMenu>
+    {/if}
 </div>
 
 <style lang="scss">
diff --git a/ts/routes/editor/StickyBadge.svelte b/ts/routes/editor/StickyBadge.svelte
index 426600ba5..2eb4fb84a 100644
--- a/ts/routes/editor/StickyBadge.svelte
+++ b/ts/routes/editor/StickyBadge.svelte
@@ -16,11 +16,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { context as editorFieldContext } from "./EditorField.svelte";
     import type { Note } from "@generated/anki/notes_pb";
     import { getNotetype, updateEditorNotetype } from "@generated/backend";
+    import { bridgeCommand } from "@tslib/bridgecommand";
 
     const animated = !document.body.classList.contains("reduce-motion");
 
     export let active: boolean;
     export let show: boolean;
+    export let isLegacy: boolean;
 
     const editorField = editorFieldContext.get();
     const keyCombination = "F9";
@@ -29,10 +31,16 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export let note: Note;
 
     async function toggle() {
-        active = !active;
-        const notetype = await getNotetype({ ntid: note.notetypeId });
-        notetype.fields[index].config!.sticky = active;
-        await updateEditorNotetype(notetype);
+        if (isLegacy) {
+            bridgeCommand(`toggleSticky:${index}`, (value: boolean) => {
+                active = value;
+            });
+        } else {
+            active = !active;
+            const notetype = await getNotetype({ ntid: note.notetypeId });
+            notetype.fields[index].config!.sticky = active;
+            await updateEditorNotetype(notetype);
+        }
     }
 
     function shortcut(target: HTMLElement): () => void {
diff --git a/ts/routes/editor/base.ts b/ts/routes/editor/base.ts
index a1905c5a4..365dc4eaa 100644
--- a/ts/routes/editor/base.ts
+++ b/ts/routes/editor/base.ts
@@ -53,11 +53,11 @@ export const components = {
 
 export { editorToolbar } from "./editor-toolbar";
 
-export async function setupEditor(mode: EditorMode) {
+export async function setupEditor(mode: EditorMode, isLegacy = false) {
     if (!["add", "browser", "current"].includes(mode)) {
         alert("unexpected editor type");
         return;
     }
     await setupI18n({ modules: editorModules });
-    mount(NoteEditor, { target: document.body, props: { uiResolve, mode } });
+    mount(NoteEditor, { target: document.body, props: { uiResolve, mode, isLegacy } });
 }
diff --git a/ts/routes/editor/editor-toolbar/InlineButtons.svelte b/ts/routes/editor/editor-toolbar/InlineButtons.svelte
index 586137909..0a4dec468 100644
--- a/ts/routes/editor/editor-toolbar/InlineButtons.svelte
+++ b/ts/routes/editor/editor-toolbar/InlineButtons.svelte
@@ -37,6 +37,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     Object.assign(api, {
         setColorButtons,
     });
+    // For legacy editor
+    Object.assign(globalThis, { setColorButtons });
 </script>
 
 <DynamicallySlottable slotHost={Item} {api}>
diff --git a/ts/routes/editor/rich-text-input/RichTextInput.svelte b/ts/routes/editor/rich-text-input/RichTextInput.svelte
index 0d6d0993a..f88b33b6c 100644
--- a/ts/routes/editor/rich-text-input/RichTextInput.svelte
+++ b/ts/routes/editor/rich-text-input/RichTextInput.svelte
@@ -84,6 +84,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { fragmentToStored, storedToFragment } from "./transform";
 
     export let hidden = false;
+    export let isLegacy = false;
     export const focusFlag = new Flag();
     export let isClozeField: boolean;
 
@@ -231,6 +232,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 <div class="rich-text-input" on:focusin={setFocus} on:focusout={removeFocus} {hidden}>
     <RichTextStyles
+        {isLegacy}
         color={$pageTheme.isDark ? "white" : "black"}
         fontFamily={$fontFamily}
         fontSize={$fontSize}
diff --git a/ts/routes/editor/rich-text-input/RichTextStyles.svelte b/ts/routes/editor/rich-text-input/RichTextStyles.svelte
index 87629c347..b8e64bfec 100644
--- a/ts/routes/editor/rich-text-input/RichTextStyles.svelte
+++ b/ts/routes/editor/rich-text-input/RichTextStyles.svelte
@@ -13,6 +13,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     import { mount } from "svelte";
 
+    export let isLegacy = false;
+
     export let callback: (styles: Record<string, any>) => void;
 
     const [userBaseStyle, userBaseResolve] = promiseWithResolver<StyleObject>();
@@ -47,23 +49,34 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     $: setStyling("fontSize", fontSize + "px");
     $: setStyling("direction", direction);
 
-    const styles: StyleLinkType[] = [
-        {
-            id: "editableBaseStyle",
-            type: "link",
-            href: editableBaseCSS,
-        },
-        {
-            id: "contentEditableStyle",
-            type: "link",
-            href: contentEditableCSS,
-        },
-        {
-            id: "mathjaxStyle",
-            type: "link",
-            href: mathjaxCSS,
-        },
-    ];
+    let styles: StyleLinkType[];
+    if (isLegacy) {
+        styles = [
+            {
+                id: "rootStyle",
+                type: "link",
+                href: "./_anki/css/editable.css",
+            },
+        ];
+    } else {
+        styles = [
+            {
+                id: "editableBaseStyle",
+                type: "link",
+                href: editableBaseCSS,
+            },
+            {
+                id: "contentEditableStyle",
+                type: "link",
+                href: contentEditableCSS,
+            },
+            {
+                id: "mathjaxStyle",
+                type: "link",
+                href: mathjaxCSS,
+            },
+        ];
+    }
 
     function attachToShadow(element: Element) {
         const customStyles = mount(CustomStyles, {

From 53095731fc1ed8f0dd50b4a676323231b00f3c59 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 24 Jul 2025 13:36:09 +0300
Subject: [PATCH 080/133] Fix empty field's height in legacy editor

---
 ts/lib/editable/index.ts     | 3 ---
 ts/lib/editable/mathjax.scss | 7 -------
 2 files changed, 10 deletions(-)

diff --git a/ts/lib/editable/index.ts b/ts/lib/editable/index.ts
index 277588b5a..00984a718 100644
--- a/ts/lib/editable/index.ts
+++ b/ts/lib/editable/index.ts
@@ -4,6 +4,3 @@
 import "./editable-base.scss";
 import "./content-editable.scss";
 import "./mathjax.scss";
-/* only imported for the CSS in the legacy editor */
-import "./ContentEditable.svelte";
-import "./Mathjax.svelte";
diff --git a/ts/lib/editable/mathjax.scss b/ts/lib/editable/mathjax.scss
index 30f4c7541..03e118a70 100644
--- a/ts/lib/editable/mathjax.scss
+++ b/ts/lib/editable/mathjax.scss
@@ -11,10 +11,3 @@ img {
     margin: 1rem auto;
     transform: scale(1.1);
 }
-
-.empty {
-    vertical-align: text-bottom;
-
-    width: var(--font-size);
-    height: var(--font-size);
-}

From f2e75042700fb8dba273e2f71053707d40fa0d3c Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 24 Jul 2025 13:40:11 +0300
Subject: [PATCH 081/133] Add missing await

---
 ts/routes/editor/NoteEditor.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 2b7b5d5a8..1416fc115 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -377,7 +377,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         fieldSave.schedule(async () => {
             if (isLegacy) {
                 bridgeCommand(
-                    `key:${index}:${getNoteId()}:${transformContentBeforeSave(
+                    `key:${index}:${getNoteId()}:${await transformContentBeforeSave(
                         content,
                     )}`,
                 );
@@ -1181,7 +1181,7 @@ components and functionality for general note editing.
                         setAddonButtonsDisabled(true);
                         if (isLegacy) {
                             bridgeCommand(
-                                `blur:${index}:${getNoteId()}:${transformContentBeforeSave(
+                                `blur:${index}:${getNoteId()}:${await transformContentBeforeSave(
                                     get(content),
                                 )}`,
                             );

From f379aa742e73ce8b90cddaf05573a47495b11ee6 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Fri, 25 Jul 2025 14:41:27 +0300
Subject: [PATCH 082/133] Implement History button

---
 proto/anki/frontend.proto             |   2 +-
 qt/aqt/mediasrv.py                    |   1 +
 ts/lib/components/icons.ts            |   3 +
 ts/routes/editor/ActionButton.svelte  |   3 +-
 ts/routes/editor/ActionButtons.svelte |   6 +-
 ts/routes/editor/HistoryButton.svelte |  27 ++++
 ts/routes/editor/HistoryModal.svelte  | 208 ++++++++++++++++++++++++++
 ts/routes/editor/NoteEditor.svelte    |  50 ++++++-
 ts/routes/editor/base.ts              |   6 +-
 ts/routes/editor/types.ts             |   5 +
 10 files changed, 301 insertions(+), 10 deletions(-)
 create mode 100644 ts/routes/editor/HistoryButton.svelte
 create mode 100644 ts/routes/editor/HistoryModal.svelte

diff --git a/proto/anki/frontend.proto b/proto/anki/frontend.proto
index 17090fe1e..ac439764a 100644
--- a/proto/anki/frontend.proto
+++ b/proto/anki/frontend.proto
@@ -33,7 +33,7 @@ service FrontendService {
   // Editor
   rpc UpdateEditorNote(notes.UpdateNotesRequest) returns (generic.Empty);
   rpc UpdateEditorNotetype(notetypes.Notetype) returns (generic.Empty);
-  rpc AddEditorNote(notes.AddNoteRequest) returns (generic.Empty);
+  rpc AddEditorNote(notes.AddNoteRequest) returns (notes.AddNoteResponse);
   rpc ConvertPastedImage(ConvertPastedImageRequest)
       returns (ConvertPastedImageResponse);
   rpc RetrieveUrl(generic.String) returns (RetrieveUrlResponse);
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index 132160b61..8149ca560 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -922,6 +922,7 @@ exposed_backend_list = [
     # CardRenderingService
     "encode_iri_paths",
     "decode_iri_paths",
+    "html_to_text_line",
     # ConfigService
     "set_config_json",
     "get_config_bool",
diff --git a/ts/lib/components/icons.ts b/ts/lib/components/icons.ts
index ab07cbf17..7bd28070f 100644
--- a/ts/lib/components/icons.ts
+++ b/ts/lib/components/icons.ts
@@ -149,6 +149,8 @@ import ArrowLeft_ from "bootstrap-icons/icons/arrow-left.svg?component";
 import arrowLeft_ from "bootstrap-icons/icons/arrow-left.svg?url";
 import ArrowRight_ from "bootstrap-icons/icons/arrow-right.svg?component";
 import arrowRight_ from "bootstrap-icons/icons/arrow-right.svg?url";
+import CaretDownFill_ from "bootstrap-icons/icons/caret-down-fill.svg?component";
+import caretDownFill_ from "bootstrap-icons/icons/caret-down-fill.svg?url";
 import Minus_ from "bootstrap-icons/icons/dash-lg.svg?component";
 import minus_ from "bootstrap-icons/icons/dash-lg.svg?url";
 import Eraser_ from "bootstrap-icons/icons/eraser.svg?component";
@@ -285,3 +287,4 @@ export const mdiUngroup = { url: ungroup_, component: Ungroup_ };
 export const mdiVectorPolygonVariant = { url: vectorPolygonVariant_, component: VectorPolygonVariant_ };
 export const incrementClozeIcon = { url: incrementCloze_, component: IncrementCloze_ };
 export const mdiEarth = { url: earth_, component: Earth_ };
+export const caretDownFill = { url: caretDownFill_, component: CaretDownFill_ };
diff --git a/ts/routes/editor/ActionButton.svelte b/ts/routes/editor/ActionButton.svelte
index 1e7826132..14e074bee 100644
--- a/ts/routes/editor/ActionButton.svelte
+++ b/ts/routes/editor/ActionButton.svelte
@@ -5,7 +5,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 <script lang="ts">
     import LabelButton from "$lib/components/LabelButton.svelte";
 
-    const { children, onClick, tooltip } = $props();
+    const { children, onClick, tooltip, disabled = false } = $props();
 </script>
 
 <div class="action-button">
@@ -15,6 +15,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         {tooltip}
         --border-left-radius="5px"
         --border-right-radius="5px"
+        {disabled}
     >
         <div class="action-text">
             {@render children()}
diff --git a/ts/routes/editor/ActionButtons.svelte b/ts/routes/editor/ActionButtons.svelte
index 30b273ff4..289c04e56 100644
--- a/ts/routes/editor/ActionButtons.svelte
+++ b/ts/routes/editor/ActionButtons.svelte
@@ -6,11 +6,14 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import AddButton from "./AddButton.svelte";
     import CloseButton from "./CloseButton.svelte";
     import HelpButton from "./HelpButton.svelte";
-    import type { EditorMode } from "./types";
+    import HistoryButton from "./HistoryButton.svelte";
+    import type { EditorMode, HistoryEntry } from "./types";
 
     export let mode: EditorMode;
     export let onClose: () => void;
     export let onAdd: () => void;
+    export let onHistory: () => void;
+    export let history: HistoryEntry[] = [];
 </script>
 
 <div class="action-buttons d-flex flex-row-reverse">
@@ -21,6 +24,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         <CloseButton {onClose} enableShortcut={mode === "current"} />
     {/if}
     {#if mode === "add"}
+        <HistoryButton {onHistory} {history} />
         <AddButton {onAdd} />
     {/if}
 </div>
diff --git a/ts/routes/editor/HistoryButton.svelte b/ts/routes/editor/HistoryButton.svelte
new file mode 100644
index 000000000..5a07cc8d6
--- /dev/null
+++ b/ts/routes/editor/HistoryButton.svelte
@@ -0,0 +1,27 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+<script lang="ts">
+    import * as tr from "@generated/ftl";
+    import { getPlatformString } from "@tslib/shortcuts";
+    import Shortcut from "$lib/components/Shortcut.svelte";
+    import ActionButton from "./ActionButton.svelte";
+    import type { HistoryEntry } from "./types";
+    import Icon from "$lib/components/Icon.svelte";
+    import { caretDownFill } from "$lib/components/icons";
+
+    export let onHistory: () => void;
+    export let history: HistoryEntry[] = [];
+    const historyKeyCombination = "Control+H";
+</script>
+
+<ActionButton
+    onClick={onHistory}
+    tooltip={getPlatformString(historyKeyCombination)}
+    disabled={history.length === 0}
+>
+    {tr.addingHistory()}
+    <Icon icon={caretDownFill} />
+    <Shortcut keyCombination={historyKeyCombination} on:action={onHistory} />
+</ActionButton>
diff --git a/ts/routes/editor/HistoryModal.svelte b/ts/routes/editor/HistoryModal.svelte
new file mode 100644
index 000000000..29f5b71ae
--- /dev/null
+++ b/ts/routes/editor/HistoryModal.svelte
@@ -0,0 +1,208 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+<script lang="ts">
+    import Modal from "bootstrap/js/dist/modal";
+    import { getContext, onDestroy, onMount } from "svelte";
+    import * as tr from "@generated/ftl";
+
+    import { modalsKey } from "$lib/components/context-keys";
+    import { registerModalClosingHandler } from "$lib/sveltelib/modal-closing";
+    import { pageTheme } from "$lib/sveltelib/theme";
+    import type { HistoryEntry } from "./types";
+    import { searchInBrowser } from "@generated/backend";
+
+    export const modalKey: string = Math.random().toString(36).substring(2);
+    export let history: HistoryEntry[] = [];
+
+    const modals = getContext<Map<string, Modal>>(modalsKey);
+
+    let modalRef: HTMLDivElement;
+    let modal: Modal;
+
+    function onCancelClicked(): void {
+        modal.hide();
+    }
+
+    function onShown(): void {
+        setModalOpen(true);
+    }
+
+    function onHidden() {
+        setModalOpen(false);
+    }
+
+    function onEntryClick(entry: HistoryEntry): void {
+        searchInBrowser({
+            filter: {
+                case: "nids",
+                value: { ids: [entry.noteId] },
+            },
+        });
+        modal.hide();
+    }
+
+    const { set: setModalOpen, remove: removeModalClosingHandler } =
+        registerModalClosingHandler(onCancelClicked);
+
+    onMount(() => {
+        modalRef.addEventListener("shown.bs.modal", onShown);
+        modalRef.addEventListener("hidden.bs.modal", onHidden);
+        modal = new Modal(modalRef, { keyboard: false });
+        modals.set(modalKey, modal);
+    });
+
+    onDestroy(() => {
+        removeModalClosingHandler();
+        modalRef.removeEventListener("shown.bs.modal", onShown);
+        modalRef.removeEventListener("hidden.bs.modal", onHidden);
+    });
+</script>
+
+<div
+    bind:this={modalRef}
+    class="modal fade"
+    class:nightMode={$pageTheme.isDark}
+    tabindex="-1"
+    aria-labelledby="modalLabel"
+    aria-hidden="true"
+>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="modalLabel">{tr.addingHistory()}</h5>
+                <button
+                    type="button"
+                    class="btn-close"
+                    data-bs-dismiss="modal"
+                    aria-label="Close"
+                ></button>
+            </div>
+            <div class="modal-body">
+                <ul class="history-list">
+                    {#each history as entry}
+                        <li>
+                            <button
+                                type="button"
+                                class="history-entry"
+                                on:click={() => onEntryClick(entry)}
+                            >
+                                {entry.text}
+                            </button>
+                        </li>
+                    {/each}
+                </ul>
+            </div>
+            <div class="modal-footer">
+                <button
+                    type="button"
+                    class="btn btn-secondary"
+                    on:click={onCancelClicked}
+                >
+                    Cancel
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<style lang="scss">
+    .modal {
+        --link-color: #007bff;
+        --canvas-elevated-hover: rgba(0, 0, 0, 0.05);
+    }
+
+    .nightMode.modal {
+        --link-color: #4dabf7;
+        --canvas-elevated-hover: rgba(255, 255, 255, 0.1): ;
+    }
+
+    .nightMode .modal-content {
+        background-color: var(--canvas);
+        color: var(--fg);
+    }
+
+    .nightMode .btn-close {
+        filter: invert(1) grayscale(100%) brightness(200%);
+    }
+
+    .history-list {
+        list-style: none;
+        padding: 0;
+        margin: 0;
+        max-height: 400px;
+        overflow-y: auto;
+    }
+
+    .history-list li {
+        margin-bottom: 8px;
+    }
+
+    .history-list li:last-child {
+        margin-bottom: 0;
+    }
+
+    .history-entry {
+        display: block;
+        width: 100%;
+        padding: 12px 16px;
+        background-color: var(--canvas-elevated);
+        border: 1px solid var(--border);
+        border-radius: 6px;
+        transition: all 0.2s ease;
+        font-size: 14px;
+        line-height: 1.4;
+        word-break: break-word;
+        text-align: left;
+        color: var(--fg);
+        text-decoration: none;
+        cursor: pointer;
+        position: relative;
+    }
+
+    .history-entry::after {
+        content: "";
+        position: absolute;
+        bottom: 8px;
+        left: 16px;
+        right: 16px;
+        height: 1px;
+        background-color: var(--link-color);
+        opacity: 0;
+        transition: opacity 0.2s ease;
+    }
+
+    .history-entry:hover {
+        background-color: var(--canvas-elevated-hover);
+        border-color: var(--border-strong);
+        transform: translateY(-1px);
+        box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+        color: var(--link-color);
+    }
+
+    .history-entry:hover::after {
+        opacity: 0.6;
+    }
+
+    .history-entry:active {
+        transform: translateY(0px);
+        box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
+    }
+
+    .history-entry:focus {
+        outline: 2px solid var(--link-color);
+        outline-offset: 2px;
+    }
+
+    .nightMode .history-entry {
+        background-color: var(--canvas-elevated);
+        border-color: var(--border, rgba(255, 255, 255, 0.15));
+        color: var(--fg);
+    }
+
+    .nightMode .history-entry:hover {
+        border-color: var(--border-strong, rgba(255, 255, 255, 0.25));
+        color: var(--link-color);
+    }
+</style>
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 1416fc115..fa5a55fb7 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -15,6 +15,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import LabelName from "./LabelName.svelte";
     import { EditorState, type EditorMode } from "./types";
     import { ContextMenu, Item } from "$lib/context-menu";
+    import type Modal from "bootstrap/js/dist/modal";
+    import { getContext } from "svelte";
+    import { modalsKey } from "$lib/components/context-keys";
 
     export interface NoteEditorAPI {
         fields: EditorFieldAPI[];
@@ -85,7 +88,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import PlainTextBadge from "./PlainTextBadge.svelte";
     import RichTextInput, { editingInputIsRichText } from "./rich-text-input";
     import RichTextBadge from "./RichTextBadge.svelte";
-    import type { NotetypeIdAndModTime, SessionOptions } from "./types";
+    import type { HistoryEntry, NotetypeIdAndModTime, SessionOptions } from "./types";
 
     let contextMenu: ContextMenu;
     const [onContextMenu, contextMenuItems] = setupContextMenu();
@@ -446,6 +449,34 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         await addCurrentNote(1n);
     }
 
+    const modals = getContext<Map<string, Modal>>(modalsKey);
+    let modalKey: string;
+
+    let history: HistoryEntry[] = [];
+
+    export async function addNoteToHistory(note: Note) {
+        let text = (
+            await htmlToTextLine({
+                text: note.fields.join(", "),
+                preserveMediaFilenames: true,
+            })
+        ).val;
+        if (text.length > 30) {
+            text = `${text.slice(0, 30)}...`;
+        }
+        history = [
+            ...history,
+            {
+                text,
+                noteId: note.id,
+            },
+        ];
+    }
+
+    export function onHistory() {
+        modals.get(modalKey)!.show();
+    }
+
     export function saveOnPageHide() {
         if (document.visibilityState === "hidden") {
             // will fire on session close and minimize
@@ -501,10 +532,14 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         if (!(await noteCanBeAdded())) {
             return;
         }
-        await addEditorNote({
-            note: note!,
-            deckId,
-        });
+        const noteId = (
+            await addEditorNote({
+                note: note!,
+                deckId,
+            })
+        ).noteId;
+        note.id = noteId;
+        addNoteToHistory(note!);
         lastAddedNote = note;
         await loadNewNote();
     }
@@ -638,6 +673,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         updateEditorNotetype,
         closeAddCards as closeAddCardsBackend,
         closeEditCurrent as closeEditCurrentBackend,
+        htmlToTextLine,
     } from "@generated/backend";
     import { wrapInternal } from "@tslib/wrap";
     import { getProfileConfig, getMeta, setMeta, getColConfig } from "@tslib/profile";
@@ -662,6 +698,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { setupContextMenu } from "./context-menu.svelte";
     import { registerShortcut } from "@tslib/shortcuts";
     import ActionButtons from "./ActionButtons.svelte";
+    import HistoryModal from "./HistoryModal.svelte";
 
     $: isIOImageLoaded = false;
     $: ioImageLoadedStore.set(isIOImageLoaded);
@@ -1309,7 +1346,8 @@ components and functionality for general note editing.
             <TagEditor {tags} on:tagsupdate={saveTags} />
         </Collapsible>
         {#if !isLegacy}
-            <ActionButtons {mode} {onClose} {onAdd} />
+            <ActionButtons {mode} {onClose} {onAdd} {onHistory} {history} />
+            <HistoryModal bind:modalKey {history} />
         {/if}
     {/if}
 
diff --git a/ts/routes/editor/base.ts b/ts/routes/editor/base.ts
index 365dc4eaa..1c85a1d8f 100644
--- a/ts/routes/editor/base.ts
+++ b/ts/routes/editor/base.ts
@@ -29,6 +29,7 @@ declare global {
     }
 }
 
+import { modalsKey } from "$lib/components/context-keys";
 import { ModuleName } from "@tslib/i18n";
 import { mount } from "svelte";
 import type { EditorMode } from "./types";
@@ -41,6 +42,7 @@ export const editorModules = [
     ModuleName.NOTETYPES,
     ModuleName.IMPORTING,
     ModuleName.UNDO,
+    ModuleName.ADDING,
 ];
 
 export const components = {
@@ -58,6 +60,8 @@ export async function setupEditor(mode: EditorMode, isLegacy = false) {
         alert("unexpected editor type");
         return;
     }
+    const context = new Map();
+    context.set(modalsKey, new Map());
     await setupI18n({ modules: editorModules });
-    mount(NoteEditor, { target: document.body, props: { uiResolve, mode, isLegacy } });
+    mount(NoteEditor, { target: document.body, props: { uiResolve, mode, isLegacy }, context });
 }
diff --git a/ts/routes/editor/types.ts b/ts/routes/editor/types.ts
index 01aa42855..7c24b0375 100644
--- a/ts/routes/editor/types.ts
+++ b/ts/routes/editor/types.ts
@@ -29,3 +29,8 @@ export enum EditorState {
 }
 
 export type EditorMode = "add" | "browser" | "current";
+
+export type HistoryEntry = {
+    text: string;
+    noteId: bigint;
+};

From 1662ff440bb3572954fbe2cc190d4916243960fe Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Fri, 25 Jul 2025 14:43:33 +0300
Subject: [PATCH 083/133] Set a different shortcut for Mac

---
 ts/routes/editor/HistoryButton.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ts/routes/editor/HistoryButton.svelte b/ts/routes/editor/HistoryButton.svelte
index 5a07cc8d6..2e2a47086 100644
--- a/ts/routes/editor/HistoryButton.svelte
+++ b/ts/routes/editor/HistoryButton.svelte
@@ -10,10 +10,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type { HistoryEntry } from "./types";
     import Icon from "$lib/components/Icon.svelte";
     import { caretDownFill } from "$lib/components/icons";
+    import { isApplePlatform } from "@tslib/platform";
 
     export let onHistory: () => void;
     export let history: HistoryEntry[] = [];
-    const historyKeyCombination = "Control+H";
+    const historyKeyCombination = isApplePlatform() ? "Control+Shift+H" : "Control+H";
 </script>
 
 <ActionButton

From d5d298fc3f2895bbbebe4dfa6189a72ad2a9a28c Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Fri, 25 Jul 2025 14:46:25 +0300
Subject: [PATCH 084/133] Remove Qt buttons from new Add screen

---
 qt/aqt/addcards.py | 76 ++--------------------------------------------
 1 file changed, 3 insertions(+), 73 deletions(-)

diff --git a/qt/aqt/addcards.py b/qt/aqt/addcards.py
index 8ea8b808e..a748443f9 100644
--- a/qt/aqt/addcards.py
+++ b/qt/aqt/addcards.py
@@ -5,14 +5,12 @@ from __future__ import annotations
 
 from collections.abc import Callable
 
-import aqt.editor
-import aqt.forms
 from anki._legacy import deprecated
-from anki.collection import OpChanges, SearchNode
+from anki.collection import OpChanges
 from anki.decks import DeckId
 from anki.models import NotetypeId
-from anki.notes import Note, NoteId
-from anki.utils import html_to_text_line, is_mac
+from anki.notes import Note
+from anki.utils import is_mac
 from aqt import AnkiQt, gui_hooks
 from aqt.addcards_legacy import *
 from aqt.deckchooser import DeckChooser
@@ -22,11 +20,9 @@ from aqt.utils import (
     HelpPage,
     add_close_shortcut,
     ask_user_dialog,
-    downArrow,
     openHelp,
     restoreGeom,
     saveGeom,
-    shortcut,
     tr,
 )
 
@@ -48,9 +44,6 @@ class NewAddCards(QMainWindow):
         self.setupEditor()
         add_close_shortcut(self)
         self._load_new_note()
-        self.setupButtons()
-        self.history: list[NoteId] = []
-        self._last_added_note: Note | None = None
         gui_hooks.operation_did_execute.append(self.on_operation_did_execute)
         restoreGeom(self, "add")
         gui_hooks.add_cards_did_init(self)
@@ -116,39 +109,6 @@ class NewAddCards(QMainWindow):
     def helpRequested(self) -> None:
         openHelp(HelpPage.ADDING_CARD_AND_NOTE)
 
-    def setupButtons(self) -> None:
-        bb = self.form.buttonBox
-        ar = QDialogButtonBox.ButtonRole.ActionRole
-        # add
-        self.addButton = bb.addButton(tr.actions_add(), ar)
-        qconnect(self.addButton.clicked, self.add_current_note)
-        self.addButton.setShortcut(QKeySequence("Ctrl+Return"))
-        # qt5.14+ doesn't handle numpad enter on Windows
-        self.compat_add_shorcut = QShortcut(QKeySequence("Ctrl+Enter"), self)
-        qconnect(self.compat_add_shorcut.activated, self.addButton.click)
-        self.addButton.setToolTip(shortcut(tr.adding_add_shortcut_ctrlandenter()))
-
-        # close
-        self.closeButton = QPushButton(tr.actions_close())
-        self.closeButton.setAutoDefault(False)
-        bb.addButton(self.closeButton, QDialogButtonBox.ButtonRole.RejectRole)
-        qconnect(self.closeButton.clicked, self.close)
-        # help
-        self.helpButton = QPushButton(tr.actions_help(), clicked=self.helpRequested)  # type: ignore
-        self.helpButton.setAutoDefault(False)
-        bb.addButton(self.helpButton, QDialogButtonBox.ButtonRole.HelpRole)
-        # history
-        b = bb.addButton(f"{tr.adding_history()} {downArrow()}", ar)
-        if is_mac:
-            sc = "Ctrl+Shift+H"
-        else:
-            sc = "Ctrl+H"
-        b.setShortcut(QKeySequence(sc))
-        b.setToolTip(tr.adding_shortcut(val=shortcut(sc)))
-        qconnect(b.clicked, self.onHistory)
-        b.setEnabled(False)
-        self.historyButton = b
-
     def setAndFocusNote(self, note: Note) -> None:
         self.editor.set_note(note, focusTo=0)
 
@@ -192,36 +152,6 @@ class NewAddCards(QMainWindow):
             self.col.models.get(self.notetype_chooser.selected_notetype_id)
         )
 
-    def addHistory(self, note: Note) -> None:
-        self.history.insert(0, note.id)
-        self.history = self.history[:15]
-        self.historyButton.setEnabled(True)
-
-    def onHistory(self) -> None:
-        m = QMenu(self)
-        for nid in self.history:
-            if self.col.find_notes(self.col.build_search_string(SearchNode(nid=nid))):
-                note = self.col.get_note(nid)
-                fields = note.fields
-                txt = html_to_text_line(", ".join(fields))
-                if len(txt) > 30:
-                    txt = f"{txt[:30]}..."
-                line = tr.adding_edit(val=txt)
-                line = gui_hooks.addcards_will_add_history_entry(line, note)
-                line = line.replace("&", "&&")
-                # In qt action "&i" means "underline i, trigger this line when i is pressed".
-                # except for "&&" which is replaced by a single "&"
-                a = m.addAction(line)
-                qconnect(a.triggered, lambda b, nid=nid: self.editHistory(nid))
-            else:
-                a = m.addAction(tr.adding_note_deleted())
-                a.setEnabled(False)
-        gui_hooks.add_cards_will_show_history_menu(self, m)
-        m.exec(self.historyButton.mapToGlobal(QPoint(0, 0)))
-
-    def editHistory(self, nid: NoteId) -> None:
-        aqt.dialogs.open("Browser", self.mw, search=(SearchNode(nid=nid),))
-
     def add_current_note(self) -> None:
         self.editor.web.eval(f"addCurrentNote({self.deck_chooser.selected_deck_id})")
 

From ae42f5685bf6487c7576f314a48ff098a5c9a554 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sat, 26 Jul 2025 22:29:19 +0300
Subject: [PATCH 085/133] Fix Create Copy

---
 qt/aqt/addcards.py                 | 19 +++++--------------
 qt/aqt/editor.py                   | 13 +++++++------
 qt/aqt/reviewer.py                 |  2 +-
 ts/routes/editor/NoteEditor.svelte |  7 +++++++
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/qt/aqt/addcards.py b/qt/aqt/addcards.py
index a748443f9..4bf44b5dd 100644
--- a/qt/aqt/addcards.py
+++ b/qt/aqt/addcards.py
@@ -65,12 +65,11 @@ class NewAddCards(QMainWindow):
         if deck_id or (deck_id := self.col.default_deck_for_notetype(note.mid)):
             self.deck_chooser.selected_deck_id = deck_id
 
-        new_note = self._new_note()
-        new_note.fields = note.fields[:]
-        new_note.tags = note.tags[:]
-
-        self.editor.orig_note_id = note.id
-        self.setAndFocusNote(new_note)
+        self.editor.load_note(
+            mid=note.mid,
+            original_note_id=note.id,
+            focus_to=0,
+        )
 
     def setupEditor(self) -> None:
         self.editor = aqt.editor.NewEditor(
@@ -109,9 +108,6 @@ class NewAddCards(QMainWindow):
     def helpRequested(self) -> None:
         openHelp(HelpPage.ADDING_CARD_AND_NOTE)
 
-    def setAndFocusNote(self, note: Note) -> None:
-        self.editor.set_note(note, focusTo=0)
-
     def show_notetype_selector(self) -> None:
         self.editor.call_after_note_saved(self.notetype_chooser.choose_notetype)
 
@@ -147,11 +143,6 @@ class NewAddCards(QMainWindow):
                 update_deck=False,
             )
 
-    def _new_note(self) -> Note:
-        return self.col.new_note(
-            self.col.models.get(self.notetype_chooser.selected_notetype_id)
-        )
-
     def add_current_note(self) -> None:
         self.editor.web.eval(f"addCurrentNote({self.deck_chooser.selected_deck_id})")
 
diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 394751065..fd11d1b45 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -13,7 +13,6 @@ from dataclasses import dataclass
 from random import randrange
 from typing import Any
 
-from anki._legacy import deprecated
 from anki.cards import Card
 from anki.hooks import runFilter
 from anki.models import NotetypeId
@@ -85,8 +84,6 @@ class NewEditor:
         # Similar to currentField, but not set to None on a blur. May be
         # outside the bounds of the current notetype.
         self.last_field_index: int | None = None
-        # used when creating a copy of an existing note
-        self.orig_note_id: NoteId | None = None
         # current card, for card layout
         self.card: Card | None = None
         self.state: EditorState = EditorState.INITIAL
@@ -397,7 +394,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
         self.currentField = None
         self.load_note(mid, focus_to=focus_to)
 
-    @deprecated(replaced_by=set_nid)
     def set_note(
         self,
         note: Note | None,
@@ -413,7 +409,12 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             self.widget.hide()
 
     @on_editor_ready
-    def load_note(self, mid: int, focus_to: int | None = None) -> None:
+    def load_note(
+        self,
+        mid: int,
+        original_note_id: NoteId | None = None,
+        focus_to: int | None = None,
+    ) -> None:
         self.widget.show()
 
         def oncallback(arg: Any) -> None:
@@ -426,7 +427,7 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             gui_hooks.editor_did_load_note(self)
 
         assert self.mw.pm.profile is not None
-        js = f"loadNote({json.dumps(self.nid)}, {mid}, {json.dumps(focus_to)}, {json.dumps(self.orig_note_id)});"
+        js = f"loadNote({json.dumps(self.nid)}, {mid}, {json.dumps(focus_to)}, {json.dumps(original_note_id)});"
         self.web.evalWithCallback(
             f'require("anki/ui").loaded.then(() => {{ {js} }})', oncallback
         )
diff --git a/qt/aqt/reviewer.py b/qt/aqt/reviewer.py
index a8839c598..efa113729 100644
--- a/qt/aqt/reviewer.py
+++ b/qt/aqt/reviewer.py
@@ -1167,7 +1167,7 @@ timerStopped = false;
 
     def on_create_copy(self) -> None:
         if self.card:
-            aqt.dialogs.open("AddCards", self.mw).set_note(
+            aqt.dialogs.open("NewAddCards", self.mw).set_note(
                 self.card.note(), self.card.current_deck_id()
             )
 
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index fa5a55fb7..979c8e4b4 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -924,6 +924,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                 }),
             );
         }
+        if (originalNoteId) {
+            const originalNote = await getNote({
+                nid: originalNoteId,
+            });
+            note!.fields = originalNote.fields;
+            note!.tags = originalNote.tags;
+        }
         const fieldValues = (
             await Promise.all(
                 note!.fields.map((field) => encodeIriPaths({ val: field })),

From 26473e6f6cf513ce317bf71653ff898c80c189bd Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sat, 26 Jul 2025 22:31:20 +0300
Subject: [PATCH 086/133] Remove unused add_current_note()

---
 qt/aqt/addcards.py                 | 3 ---
 ts/routes/editor/NoteEditor.svelte | 1 -
 2 files changed, 4 deletions(-)

diff --git a/qt/aqt/addcards.py b/qt/aqt/addcards.py
index 4bf44b5dd..339a7e844 100644
--- a/qt/aqt/addcards.py
+++ b/qt/aqt/addcards.py
@@ -143,9 +143,6 @@ class NewAddCards(QMainWindow):
                 update_deck=False,
             )
 
-    def add_current_note(self) -> None:
-        self.editor.web.eval(f"addCurrentNote({self.deck_chooser.selected_deck_id})")
-
     def keyPressEvent(self, evt: QKeyEvent) -> None:
         if evt.key() == Qt.Key.Key_Escape:
             self.close()
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 979c8e4b4..7ea550695 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -1088,7 +1088,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             resetIOImageLoaded,
             saveOcclusions,
             setSticky,
-            addCurrentNote,
             ...oldEditorAdapter,
         });
 

From 1ce564adf0d93cec07cf72bcd7800bd6f662068a Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sat, 26 Jul 2025 23:23:13 +0300
Subject: [PATCH 087/133] Fix bottom editor buttons not shown in IO editor

Positioning needs to be fixed.
---
 ts/routes/editor/NoteEditor.svelte | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 7ea550695..8896cc0f8 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -1351,10 +1351,11 @@ components and functionality for general note editing.
         <Collapsible toggleDisplay collapse={$tagsCollapsed}>
             <TagEditor {tags} on:tagsupdate={saveTags} />
         </Collapsible>
-        {#if !isLegacy}
-            <ActionButtons {mode} {onClose} {onAdd} {onHistory} {history} />
-            <HistoryModal bind:modalKey {history} />
-        {/if}
+    {/if}
+
+    {#if !isLegacy}
+        <ActionButtons {mode} {onClose} {onAdd} {onHistory} {history} />
+        <HistoryModal bind:modalKey {history} />
     {/if}
 
     {#if !isLegacy}

From 0f062563a6df8d928838cd52ce471289c6556832 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sun, 27 Jul 2025 01:34:21 +0300
Subject: [PATCH 088/133] Add hack for buttons position in IO mode

---
 ts/routes/editor/NoteEditor.svelte           | 4 ----
 ts/routes/image-occlusion/MaskEditor.svelte  | 6 ++----
 ts/routes/image-occlusion/tools/tool-zoom.ts | 4 ++--
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 8896cc0f8..7aa26eff4 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -1381,10 +1381,6 @@ components and functionality for general note editing.
         height: 100%;
     }
 
-    :global(.image-occlusion) {
-        position: fixed;
-    }
-
     :global(.image-occlusion .tab-buttons) {
         display: none !important;
     }
diff --git a/ts/routes/image-occlusion/MaskEditor.svelte b/ts/routes/image-occlusion/MaskEditor.svelte
index 36de4db84..e90239755 100644
--- a/ts/routes/image-occlusion/MaskEditor.svelte
+++ b/ts/routes/image-occlusion/MaskEditor.svelte
@@ -93,14 +93,12 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 <style lang="scss">
     .editor-main {
-        position: absolute;
-        top: 42px;
-        left: 36px;
+        position: relative;
         bottom: 2px;
         right: 2px;
-        border: 1px solid var(--border);
         overflow: auto;
         outline: none !important;
+        height: 90vh;
     }
 
     :global([dir="rtl"]) .editor-main {
diff --git a/ts/routes/image-occlusion/tools/tool-zoom.ts b/ts/routes/image-occlusion/tools/tool-zoom.ts
index a2af9dd79..d59e9f778 100644
--- a/ts/routes/image-occlusion/tools/tool-zoom.ts
+++ b/ts/routes/image-occlusion/tools/tool-zoom.ts
@@ -241,8 +241,8 @@ const fitCanvasVptScale = (canvas: fabric.Canvas) => {
 const getScaleRatio = (boundingBox: Size) => {
     const h1 = boundingBox.height!;
     const w1 = boundingBox.width!;
-    const w2 = innerWidth - 42;
-    let h2 = window.innerHeight;
+    const w2 = innerWidth;
+    let h2 = window.innerHeight * 0.9;
     h2 = isDesktop() ? h2 - 79 : h2 - 48;
     return Math.min(w2 / w1, h2 / h1);
 };

From aa493f82936b326d9d28ee5890bb82c94b19585e Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sun, 27 Jul 2025 17:36:35 +0300
Subject: [PATCH 089/133] Fix Toast component mounting

---
 ts/routes/image-occlusion/mask-editor.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ts/routes/image-occlusion/mask-editor.ts b/ts/routes/image-occlusion/mask-editor.ts
index 7ccc224eb..d3ed6acf8 100644
--- a/ts/routes/image-occlusion/mask-editor.ts
+++ b/ts/routes/image-occlusion/mask-editor.ts
@@ -7,6 +7,7 @@ import * as tr from "@generated/ftl";
 import { fabric } from "fabric";
 import { get } from "svelte/store";
 
+import { mount } from "svelte";
 import { optimumCssSizeForCanvas } from "./canvas-scale";
 import { hideAllGuessOne, notesDataStore, saveNeededStore, tagsWritable, textEditingState } from "./store";
 import Toast from "./Toast.svelte";
@@ -50,13 +51,14 @@ export const setupMaskEditorForEdit = async (
     const clozeNoteResponse = await getImageOcclusionNote({ noteId: BigInt(noteId) });
     const kind = clozeNoteResponse.value?.case;
     if (!kind || kind === "error") {
-        new Toast({
+        mount(Toast, {
             target: document.body,
             props: {
                 message: tr.notetypesErrorGettingImagecloze(),
                 type: "error",
+                showToast: true,
             },
-        }).$set({ showToast: true });
+        });
         throw "error getting cloze";
     }
 

From 986ca6e252ca3a3d00a7d2df56c57141bf952bc3 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sun, 27 Jul 2025 18:24:09 +0300
Subject: [PATCH 090/133] Hide IO toast on note change

---
 ts/routes/image-occlusion/MaskEditor.svelte   |  5 ++++
 ts/routes/image-occlusion/Toast.svelte        |  6 ++--
 .../add-or-update-note.svelte.ts              | 20 ++-----------
 ts/routes/image-occlusion/mask-editor.ts      | 12 ++------
 .../image-occlusion/toast-utils.svelte.ts     | 30 +++++++++++++++++++
 ts/routes/image-occlusion/types.ts            |  6 ++++
 6 files changed, 49 insertions(+), 30 deletions(-)
 create mode 100644 ts/routes/image-occlusion/toast-utils.svelte.ts

diff --git a/ts/routes/image-occlusion/MaskEditor.svelte b/ts/routes/image-occlusion/MaskEditor.svelte
index e90239755..0a3c766ca 100644
--- a/ts/routes/image-occlusion/MaskEditor.svelte
+++ b/ts/routes/image-occlusion/MaskEditor.svelte
@@ -17,12 +17,15 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { MaskEditorAPI } from "./tools/api";
     import { onResize } from "./tools/tool-zoom";
     import { saveNeededStore } from "./store";
+    import { destroyToast, initToast } from "./toast-utils.svelte";
+    import type Toast from "./Toast.svelte";
 
     export let mode: IOMode;
     const iconSize = 80;
     let innerWidth = 0;
     const startingTool = mode.kind === "add" ? "draw-rectangle" : "cursor";
     let canvas: fabric.Canvas | null = null;
+    let toast: Toast | null = null;
 
     $: {
         globalThis.maskEditor = canvas ? new MaskEditorAPI(canvas) : null;
@@ -67,11 +70,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     onMount(() => {
         window.addEventListener("resize", resizeEvent);
+        toast = initToast();
     });
 
     onDestroy(() => {
         window.removeEventListener("resize", resizeEvent);
         unsubscribe();
+        destroyToast(toast);
     });
 
     const resizeEvent = () => {
diff --git a/ts/routes/image-occlusion/Toast.svelte b/ts/routes/image-occlusion/Toast.svelte
index 17a26f558..a18d60928 100644
--- a/ts/routes/image-occlusion/Toast.svelte
+++ b/ts/routes/image-occlusion/Toast.svelte
@@ -6,10 +6,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import Icon from "$lib/components/Icon.svelte";
     import IconButton from "$lib/components/IconButton.svelte";
     import { mdiClose } from "$lib/components/icons";
+    import type { ToastProps } from "./types";
+
+    let { showToast, type, message }: ToastProps = $props();
 
-    export let type: "success" | "error" = "success";
-    export let message;
-    export let showToast = false;
     const closeToast = () => {
         showToast = false;
     };
diff --git a/ts/routes/image-occlusion/add-or-update-note.svelte.ts b/ts/routes/image-occlusion/add-or-update-note.svelte.ts
index 98955f7a5..bbf57204c 100644
--- a/ts/routes/image-occlusion/add-or-update-note.svelte.ts
+++ b/ts/routes/image-occlusion/add-or-update-note.svelte.ts
@@ -6,11 +6,10 @@ import { addImageOcclusionNote, updateImageOcclusionNote } from "@generated/back
 import * as tr from "@generated/ftl";
 import { get } from "svelte/store";
 
-import { mount } from "svelte";
 import type { IOAddingMode, IOMode } from "./lib";
 import { exportShapesToClozeDeletions } from "./shapes/to-cloze";
 import { notesDataStore, tagsWritable } from "./store";
-import Toast from "./Toast.svelte";
+import { showToast } from "./toast-utils.svelte";
 
 export const addOrUpdateNote = async function(
     mode: IOMode,
@@ -54,24 +53,11 @@ export const addOrUpdateNote = async function(
 
 // show toast message
 const showResult = (noteId: bigint | null, result: OpChanges, count: number) => {
-    const props = $state({
-        message: "",
-        type: "error" as "error" | "success",
-        showToast: true,
-    });
-    mount(Toast, {
-        target: document.body,
-        props,
-    });
-
     if (result.note) {
         const msg = noteId ? tr.browsingCardsUpdated({ count: count }) : tr.importingCardsAdded({ count: count });
-        props.message = msg;
-        props.type = "success";
-        props.showToast = true;
+        showToast(msg, "success");
     } else {
         const msg = tr.notetypesErrorGeneratingCloze();
-        props.message = msg;
-        props.showToast = true;
+        showToast(msg, "error");
     }
 };
diff --git a/ts/routes/image-occlusion/mask-editor.ts b/ts/routes/image-occlusion/mask-editor.ts
index d3ed6acf8..4f0282fa6 100644
--- a/ts/routes/image-occlusion/mask-editor.ts
+++ b/ts/routes/image-occlusion/mask-editor.ts
@@ -7,10 +7,9 @@ import * as tr from "@generated/ftl";
 import { fabric } from "fabric";
 import { get } from "svelte/store";
 
-import { mount } from "svelte";
 import { optimumCssSizeForCanvas } from "./canvas-scale";
 import { hideAllGuessOne, notesDataStore, saveNeededStore, tagsWritable, textEditingState } from "./store";
-import Toast from "./Toast.svelte";
+import { showToast } from "./toast-utils.svelte";
 import { addShapesToCanvasFromCloze } from "./tools/add-from-cloze";
 import { enableSelectable, makeShapesRemainInCanvas, moveShapeToCanvasBoundaries } from "./tools/lib";
 import { modifiedPolygon } from "./tools/tool-polygon";
@@ -51,14 +50,7 @@ export const setupMaskEditorForEdit = async (
     const clozeNoteResponse = await getImageOcclusionNote({ noteId: BigInt(noteId) });
     const kind = clozeNoteResponse.value?.case;
     if (!kind || kind === "error") {
-        mount(Toast, {
-            target: document.body,
-            props: {
-                message: tr.notetypesErrorGettingImagecloze(),
-                type: "error",
-                showToast: true,
-            },
-        });
+        showToast(tr.notetypesErrorGettingImagecloze(), "error");
         throw "error getting cloze";
     }
 
diff --git a/ts/routes/image-occlusion/toast-utils.svelte.ts b/ts/routes/image-occlusion/toast-utils.svelte.ts
new file mode 100644
index 000000000..d308c1b4a
--- /dev/null
+++ b/ts/routes/image-occlusion/toast-utils.svelte.ts
@@ -0,0 +1,30 @@
+import { mount, unmount } from "svelte";
+import Toast from "./Toast.svelte";
+import type { ToastProps } from "./types";
+
+const toastProps: ToastProps = $state({
+    showToast: false,
+    type: "success",
+    message: "",
+});
+
+export function initToast(): Toast {
+    return mount(Toast, {
+        target: document.body,
+        props: toastProps,
+    });
+}
+
+export function destroyToast(toast: Toast) {
+    unmount(toast);
+}
+
+export function showToast(message: string, type: "success" | "error") {
+    toastProps.message = message;
+    toastProps.type = type;
+    toastProps.showToast = true;
+}
+
+export function hideToast() {
+    toastProps.showToast = false;
+}
diff --git a/ts/routes/image-occlusion/types.ts b/ts/routes/image-occlusion/types.ts
index 2ade47768..81ee57b4b 100644
--- a/ts/routes/image-occlusion/types.ts
+++ b/ts/routes/image-occlusion/types.ts
@@ -9,3 +9,9 @@ export interface Size {
 export type ConstructorParams<T> = {
     [P in keyof T]?: T[P];
 };
+
+export interface ToastProps {
+    message: string;
+    type: "success" | "error";
+    showToast: boolean;
+}

From 958599ed0900d83fa0fb4ca5ce4ca7664181856f Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sun, 27 Jul 2025 18:43:32 +0300
Subject: [PATCH 091/133] Debounce loadNote() calls

---
 ts/routes/editor/NoteEditor.svelte | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 7aa26eff4..b75ef4f0c 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -89,7 +89,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import RichTextInput, { editingInputIsRichText } from "./rich-text-input";
     import RichTextBadge from "./RichTextBadge.svelte";
     import type { HistoryEntry, NotetypeIdAndModTime, SessionOptions } from "./types";
+    import { CooldownTimer } from "$lib/editable/cooldown-timer";
 
+    const loadDebouncer = new CooldownTimer(200);
     let contextMenu: ContextMenu;
     const [onContextMenu, contextMenuItems] = setupContextMenu();
     let contextMenuInput: EditingInputAPI | null = null;
@@ -897,12 +899,12 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         });
     }
 
-    async function loadNote(
+    async function loadNoteInner(
         nid: bigint | null,
         notetypeId: bigint,
         focusTo: number,
         originalNoteId: bigint | null,
-    ): Promise<bigint> {
+    ) {
         const notetype = await getNotetype({
             ntid: notetypeId,
         });
@@ -1003,8 +1005,17 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         }
         await updateDuplicateDisplay();
         triggerChanges();
+    }
 
-        return note!.id;
+    async function loadNote(
+        nid: bigint | null,
+        notetypeId: bigint,
+        focusTo: number,
+        originalNoteId: bigint | null,
+    ) {
+        loadDebouncer.schedule(async () => {
+            await loadNoteInner(nid, notetypeId, focusTo, originalNoteId);
+        });
     }
 
     async function reloadNote() {

From 0c98a68528b1b948f4c46847ae74e97e0cf92001 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sun, 27 Jul 2025 18:45:50 +0300
Subject: [PATCH 092/133] Fix lint errors

---
 ts/routes/image-occlusion/MaskEditor.svelte     |  2 +-
 ts/routes/image-occlusion/Toast.svelte          | 10 +++++-----
 ts/routes/image-occlusion/toast-utils.svelte.ts |  3 +++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ts/routes/image-occlusion/MaskEditor.svelte b/ts/routes/image-occlusion/MaskEditor.svelte
index 0a3c766ca..199b34d92 100644
--- a/ts/routes/image-occlusion/MaskEditor.svelte
+++ b/ts/routes/image-occlusion/MaskEditor.svelte
@@ -76,7 +76,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     onDestroy(() => {
         window.removeEventListener("resize", resizeEvent);
         unsubscribe();
-        destroyToast(toast);
+        destroyToast(toast!);
     });
 
     const resizeEvent = () => {
diff --git a/ts/routes/image-occlusion/Toast.svelte b/ts/routes/image-occlusion/Toast.svelte
index a18d60928..9c6345161 100644
--- a/ts/routes/image-occlusion/Toast.svelte
+++ b/ts/routes/image-occlusion/Toast.svelte
@@ -8,17 +8,17 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { mdiClose } from "$lib/components/icons";
     import type { ToastProps } from "./types";
 
-    let { showToast, type, message }: ToastProps = $props();
+    const props: ToastProps = $props();
 
     const closeToast = () => {
-        showToast = false;
+        props.showToast = false;
     };
 </script>
 
-{#if showToast}
+{#if props.showToast}
     <div class="toast-container desktop-only">
-        <div class="toast {type === 'success' ? 'success' : 'error'}">
-            {message}
+        <div class="toast {props.type === 'success' ? 'success' : 'error'}">
+            {props.message}
             <IconButton iconSize={96} on:click={closeToast} class="toast-icon">
                 <Icon icon={mdiClose} />
             </IconButton>
diff --git a/ts/routes/image-occlusion/toast-utils.svelte.ts b/ts/routes/image-occlusion/toast-utils.svelte.ts
index d308c1b4a..655a7b03a 100644
--- a/ts/routes/image-occlusion/toast-utils.svelte.ts
+++ b/ts/routes/image-occlusion/toast-utils.svelte.ts
@@ -1,3 +1,6 @@
+// Copyright: Ankitects Pty Ltd and contributors
+// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+
 import { mount, unmount } from "svelte";
 import Toast from "./Toast.svelte";
 import type { ToastProps } from "./types";

From 9a054d69242ba3c99fdeb03f773d2dca35130d6c Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Mon, 28 Jul 2025 10:17:12 +0300
Subject: [PATCH 093/133] Complete noteCanBeAdded()

---
 proto/anki/frontend.proto          |  33 +++++++-
 qt/aqt/mediasrv.py                 | 119 ++++++++++++++++++++++++-----
 ts/routes/editor/NoteEditor.svelte |  29 ++++++-
 3 files changed, 159 insertions(+), 22 deletions(-)

diff --git a/proto/anki/frontend.proto b/proto/anki/frontend.proto
index ac439764a..925e41c1c 100644
--- a/proto/anki/frontend.proto
+++ b/proto/anki/frontend.proto
@@ -12,6 +12,7 @@ import "anki/generic.proto";
 import "anki/search.proto";
 import "anki/notes.proto";
 import "anki/notetypes.proto";
+import "anki/links.proto";
 
 service FrontendService {
   // Returns values from the reviewer
@@ -44,6 +45,8 @@ service FrontendService {
   rpc CloseAddCards(generic.Bool) returns (generic.Empty);
   rpc CloseEditCurrent(generic.Empty) returns (generic.Empty);
   rpc OpenLink(generic.String) returns (generic.Empty);
+  rpc AskUser(AskUserRequest) returns (generic.Bool);
+  rpc ShowMessageBox(ShowMessageBoxRequest) returns (generic.Empty);
 
   // Profile config
   rpc GetProfileConfigJson(generic.String) returns (generic.Json);
@@ -106,4 +109,32 @@ message ReadClipboardResponse {
 
 message WriteClipboardRequest {
   map<string, bytes> data = 1;
-}
\ No newline at end of file
+}
+
+message Help {
+  oneof value {
+    links.HelpPageLinkRequest.HelpPage help_page = 1;
+    string help_link = 2;
+  }
+}
+
+message AskUserRequest {
+  string text = 1;
+  optional Help help = 2;
+  optional string title = 4;
+  optional bool default_no = 5;
+}
+
+enum MessageBoxType {
+  INFO = 0;
+  WARNING = 1;
+  CRITICAL = 2;
+}
+
+message ShowMessageBoxRequest {
+  string text = 1;
+  MessageBoxType type = 2;
+  optional Help help = 3;
+  optional string title = 4;
+  optional string text_format = 5;
+}
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index 8149ca560..2a75751dd 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -17,7 +17,7 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from errno import EPROTOTYPE
 from http import HTTPStatus
-from typing import Any, cast
+from typing import Any, Generic, cast
 
 import flask
 import flask_cors
@@ -40,7 +40,14 @@ from aqt.operations import on_op_finished
 from aqt.operations.deck import update_deck_configs as update_deck_configs_op
 from aqt.progress import ProgressUpdate
 from aqt.qt import *
-from aqt.utils import aqt_data_path, openLink, show_warning, tr
+from aqt.utils import (
+    aqt_data_path,
+    askUser,
+    openLink,
+    show_info,
+    show_warning,
+    tr,
+)
 
 # https://forums.ankiweb.net/t/anki-crash-when-using-a-specific-deck/22266
 waitress.wasyncore._DISCONNECTED = waitress.wasyncore._DISCONNECTED.union({EPROTOTYPE})  # type: ignore
@@ -704,18 +711,34 @@ def retrieve_url() -> bytes:
     ).SerializeToString()
 
 
+AsyncRequestReturnType = TypeVar("AsyncRequestReturnType")
+
+
+class AsyncRequestHandler(Generic[AsyncRequestReturnType]):
+    def __init__(self, callback: Callable[[AsyncRequestHandler], None]) -> None:
+        self.callback = callback
+        self.loop = asyncio.get_event_loop()
+        self.future = self.loop.create_future()
+
+    def run(self) -> None:
+        aqt.mw.taskman.run_on_main(lambda: self.callback(self))
+
+    def set_result(self, result: AsyncRequestReturnType) -> None:
+        self.loop.call_soon_threadsafe(self.future.set_result, result)
+
+    async def get_result(self) -> AsyncRequestReturnType:
+        return await self.future
+
+
 async def open_file_picker() -> bytes:
     req = frontend_pb2.openFilePickerRequest()
     req.ParseFromString(request.data)
 
-    loop = asyncio.get_event_loop()
-    future = loop.create_future()
-
-    def on_main() -> None:
+    def callback(request_handler: AsyncRequestHandler) -> None:
         from aqt.utils import getFile
 
         def cb(filename: str | None) -> None:
-            loop.call_soon_threadsafe(future.set_result, filename)
+            request_handler.set_result(filename)
 
         window = aqt.mw.app.activeWindow()
         assert window is not None
@@ -727,9 +750,9 @@ async def open_file_picker() -> bytes:
             key=req.key,
         )
 
-    aqt.mw.taskman.run_on_main(on_main)
-
-    filename = await future
+    request_handler: AsyncRequestHandler[str | None] = AsyncRequestHandler(callback)
+    request_handler.run()
+    filename = await request_handler.get_result()
 
     return generic_pb2.String(val=filename if filename else "").SerializeToString()
 
@@ -757,22 +780,19 @@ def show_in_media_folder() -> bytes:
 
 
 async def record_audio() -> bytes:
-    loop = asyncio.get_event_loop()
-    future = loop.create_future()
-
-    def on_main() -> None:
+    def callback(request_handler: AsyncRequestHandler) -> None:
         from aqt.sound import record_audio
 
         def cb(path: str | None) -> None:
-            loop.call_soon_threadsafe(future.set_result, path)
+            request_handler.set_result(path)
 
         window = aqt.mw.app.activeWindow()
         assert window is not None
         record_audio(window, aqt.mw, True, cb)
 
-    aqt.mw.taskman.run_on_main(on_main)
-
-    path = await future
+    request_handler: AsyncRequestHandler[str | None] = AsyncRequestHandler(callback)
+    request_handler.run()
+    path = await request_handler.get_result()
 
     return generic_pb2.String(val=path if path else "").SerializeToString()
 
@@ -838,6 +858,67 @@ def open_link() -> bytes:
     return b""
 
 
+async def ask_user() -> bytes:
+    req = frontend_pb2.AskUserRequest()
+    req.ParseFromString(request.data)
+
+    def callback(request_handler: AsyncRequestHandler) -> None:
+        kwargs: dict[str, Any] = dict(text=req.text)
+        if req.HasField("help"):
+            help_arg: Any
+            if req.help.WhichOneof("value") == "help_page":
+                help_arg = req.help.help_page
+            else:
+                help_arg = req.help.help_link
+            kwargs["help"] = help_arg
+        if req.HasField("title"):
+            kwargs["title"] = req.title
+        if req.HasField("default_no"):
+            kwargs["defaultno"] = req.default_no
+        answer = askUser(**kwargs)
+        request_handler.set_result(answer)
+
+    request_handler: AsyncRequestHandler[bool] = AsyncRequestHandler(callback)
+    request_handler.run()
+    answer = await request_handler.get_result()
+
+    return generic_pb2.Bool(val=answer).SerializeToString()
+
+
+async def show_message_box() -> bytes:
+    req = frontend_pb2.ShowMessageBoxRequest()
+    req.ParseFromString(request.data)
+
+    def callback(request_handler: AsyncRequestHandler) -> None:
+        kwargs: dict[str, Any] = dict(text=req.text)
+        if req.type == frontend_pb2.MessageBoxType.INFO:
+            icon = QMessageBox.Icon.Information
+        elif req.type == frontend_pb2.MessageBoxType.WARNING:
+            icon = QMessageBox.Icon.Warning
+        elif req.type == frontend_pb2.MessageBoxType.CRITICAL:
+            icon = QMessageBox.Icon.Critical
+        kwargs["icon"] = icon
+        if req.HasField("help"):
+            help_arg: Any
+            if req.help.WhichOneof("value") == "help_page":
+                help_arg = req.help.help_page
+            else:
+                help_arg = req.help.help_link
+            kwargs["help"] = help_arg
+        if req.HasField("title"):
+            kwargs["title"] = req.title
+        if req.HasField("text_format"):
+            kwargs["text_format"] = req.text_format
+        show_info(**kwargs)
+        request_handler.set_result(True)
+
+    request_handler: AsyncRequestHandler[bool] = AsyncRequestHandler(callback)
+    request_handler.run()
+    answer = await request_handler.get_result()
+
+    return generic_pb2.Bool(val=answer).SerializeToString()
+
+
 post_handler_list = [
     congrats_info,
     get_deck_configs_for_update,
@@ -872,6 +953,8 @@ post_handler_list = [
     close_add_cards,
     close_edit_current,
     open_link,
+    ask_user,
+    show_message_box,
 ]
 
 
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index b75ef4f0c..6b8831085 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -518,8 +518,14 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             }
         }
         if (result.state === NoteFieldsCheckResponse_State.MISSING_CLOZE) {
-            // TODO: askUser(tr.addingYouHaveAClozeDeletionNote())
-            return false;
+            const answer = (
+                await askUser({
+                    text: tr.addingYouHaveAClozeDeletionNote(),
+                })
+            ).val;
+            if (!answer) {
+                return false;
+            }
         }
         if (result.state === NoteFieldsCheckResponse_State.NOTETYPE_NOT_CLOZE) {
             problem = tr.addingClozeOutsideClozeNotetype();
@@ -527,7 +533,20 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         if (result.state === NoteFieldsCheckResponse_State.FIELD_NOT_CLOZE) {
             problem = tr.addingClozeOutsideClozeField();
         }
-        return problem ? false : true;
+        if (problem) {
+            showMessageBox({
+                text: problem,
+                type: MessageBoxType.WARNING,
+                help: {
+                    value: {
+                        case: "helpPage",
+                        value: HelpPageLinkRequest_HelpPage.ADDING_CARD_AND_NOTE,
+                    },
+                },
+            });
+            return false;
+        }
+        return true;
     }
 
     async function addCurrentNoteInner(deckId: bigint) {
@@ -676,6 +695,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         closeAddCards as closeAddCardsBackend,
         closeEditCurrent as closeEditCurrentBackend,
         htmlToTextLine,
+        askUser,
+        showMessageBox,
     } from "@generated/backend";
     import { wrapInternal } from "@tslib/wrap";
     import { getProfileConfig, getMeta, setMeta, getColConfig } from "@tslib/profile";
@@ -701,6 +722,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { registerShortcut } from "@tslib/shortcuts";
     import ActionButtons from "./ActionButtons.svelte";
     import HistoryModal from "./HistoryModal.svelte";
+    import { HelpPageLinkRequest_HelpPage } from "@generated/anki/links_pb";
+    import { MessageBoxType } from "@generated/anki/frontend_pb";
 
     $: isIOImageLoaded = false;
     $: ioImageLoadedStore.set(isIOImageLoaded);

From 3f6d9042362b7a6a0d739832d25167b1fb33a630 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sat, 9 Aug 2025 05:27:51 +0300
Subject: [PATCH 094/133] Reduce duplication across modal components

---
 ts/lib/components/HelpModal.svelte           | 209 +++++++------------
 ts/lib/components/Modal.svelte               |  98 +++++++++
 ts/routes/deck-options/TextInputModal.svelte | 132 ++++--------
 ts/routes/editor/HistoryModal.svelte         | 135 +++---------
 ts/routes/editor/NoteEditor.svelte           |  12 +-
 5 files changed, 249 insertions(+), 337 deletions(-)
 create mode 100644 ts/lib/components/Modal.svelte

diff --git a/ts/lib/components/HelpModal.svelte b/ts/lib/components/HelpModal.svelte
index cf6292537..aa7e24232 100644
--- a/ts/lib/components/HelpModal.svelte
+++ b/ts/lib/components/HelpModal.svelte
@@ -6,16 +6,14 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import * as tr from "@generated/ftl";
     import { renderMarkdown } from "@tslib/helpers";
     import Carousel from "bootstrap/js/dist/carousel";
-    import Modal from "bootstrap/js/dist/modal";
-    import { createEventDispatcher, getContext, onDestroy, onMount } from "svelte";
+    import { createEventDispatcher, onMount } from "svelte";
+    import Modal from "./Modal.svelte";
 
     import { infoCircle } from "$lib/components/icons";
-    import { registerModalClosingHandler } from "$lib/sveltelib/modal-closing";
     import { pageTheme } from "$lib/sveltelib/theme";
 
     import Badge from "./Badge.svelte";
     import Col from "./Col.svelte";
-    import { modalsKey } from "./context-keys";
     import HelpSection from "./HelpSection.svelte";
     import Icon from "./Icon.svelte";
     import Row from "./Row.svelte";
@@ -27,50 +25,20 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export let helpSections: HelpItem[];
     export let fsrs = false;
 
-    export const modalKey: string = Math.random().toString(36).substring(2);
-
-    const modals = getContext<Map<string, Modal>>(modalsKey);
-
-    let modal: Modal;
     let carousel: Carousel;
 
-    let modalRef: HTMLDivElement;
+    let modal: Modal;
     let carouselRef: HTMLDivElement;
 
-    function onOkClicked(): void {
-        modal.hide();
-    }
-
     const dispatch = createEventDispatcher();
 
-    const { set: setModalOpen, remove: removeModalClosingHandler } =
-        registerModalClosingHandler(onOkClicked);
-
-    function onShown() {
-        setModalOpen(true);
-    }
-
-    function onHidden() {
-        setModalOpen(false);
-    }
-
     onMount(() => {
-        modalRef.addEventListener("shown.bs.modal", onShown);
-        modalRef.addEventListener("hidden.bs.modal", onHidden);
-        modal = new Modal(modalRef, { keyboard: false });
         carousel = new Carousel(carouselRef, { interval: false, ride: false });
         /* Bootstrap's Carousel.Event interface doesn't seem to work as a type here */
         carouselRef.addEventListener("slide.bs.carousel", (e: any) => {
             activeIndex = e.to;
         });
         dispatch("mount", { modal: modal, carousel: carousel });
-        modals.set(modalKey, modal);
-    });
-
-    onDestroy(() => {
-        removeModalClosingHandler();
-        modalRef.removeEventListener("shown.bs.modal", onShown);
-        modalRef.removeEventListener("hidden.bs.modal", onHidden);
     });
 
     let activeIndex = startIndex;
@@ -80,119 +48,98 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     <Icon icon={infoCircle} />
 </Badge>
 
-<div
-    bind:this={modalRef}
-    class="modal fade"
-    tabindex="-1"
-    aria-labelledby="modalLabel"
-    aria-hidden="true"
->
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-header">
-                <div style="display: flex;">
-                    <h1 class="modal-title" id="modalLabel">
-                        {title}
-                    </h1>
-                    <button
-                        type="button"
-                        class="btn-close"
-                        class:invert={$pageTheme.isDark}
-                        data-bs-dismiss="modal"
-                        aria-label="Close"
-                    ></button>
-                </div>
-                {#if url}
-                    <div class="chapter-redirect">
-                        {@html renderMarkdown(
-                            tr.helpForMoreInfo({
-                                link: `<a href="${url}" title="${tr.helpOpenManualChapter(
-                                    {
-                                        name: title,
-                                    },
-                                )}">${title}</a>`,
-                            }),
-                        )}
-                    </div>
-                {/if}
+<Modal bind:this={modal} dialogClass="modal-lg">
+    <div slot="header" class="modal-header">
+        <div style="display: flex;">
+            <h1 class="modal-title" id="modalLabel">
+                {title}
+            </h1>
+            <button
+                type="button"
+                class="btn-close"
+                class:invert={$pageTheme.isDark}
+                data-bs-dismiss="modal"
+                aria-label="Close"
+            ></button>
+        </div>
+        {#if url}
+            <div class="chapter-redirect">
+                {@html renderMarkdown(
+                    tr.helpForMoreInfo({
+                        link: `<a href="${url}" title="${tr.helpOpenManualChapter({
+                            name: title,
+                        })}">${title}</a>`,
+                    }),
+                )}
             </div>
-            <div class="modal-body">
-                <Row --cols={4}>
-                    <Col --col-size={1}>
-                        <nav>
-                            <div id="nav">
-                                <ul>
-                                    {#each helpSections as item, i}
-                                        <li>
-                                            <button
-                                                on:click={() => {
-                                                    activeIndex = i;
-                                                    carousel.to(activeIndex);
-                                                }}
-                                                class:active={i == activeIndex}
-                                                class:d-none={fsrs
-                                                    ? item.sched ===
-                                                      HelpItemScheduler.SM2
-                                                    : item.sched ==
-                                                      HelpItemScheduler.FSRS}
-                                            >
-                                                {item.title}
-                                            </button>
-                                        </li>
-                                    {/each}
-                                </ul>
-                            </div>
-                        </nav>
-                    </Col>
-                    <Col --col-size={3}>
-                        <div
-                            id="helpSectionIndicators"
-                            class="carousel slide"
-                            bind:this={carouselRef}
-                        >
-                            <div class="carousel-inner">
-                                {#each helpSections as item, i}
-                                    <div
-                                        class="carousel-item"
-                                        class:active={i == startIndex}
+        {/if}
+    </div>
+    <div slot="body" class="modal-body">
+        <Row --cols={4}>
+            <Col --col-size={1}>
+                <nav>
+                    <div id="nav">
+                        <ul>
+                            {#each helpSections as item, i}
+                                <li>
+                                    <button
+                                        on:click={() => {
+                                            activeIndex = i;
+                                            carousel.to(activeIndex);
+                                        }}
+                                        class:active={i == activeIndex}
                                         class:d-none={fsrs
                                             ? item.sched === HelpItemScheduler.SM2
                                             : item.sched == HelpItemScheduler.FSRS}
                                     >
-                                        <HelpSection {item} />
-                                    </div>
-                                {/each}
+                                        {item.title}
+                                    </button>
+                                </li>
+                            {/each}
+                        </ul>
+                    </div>
+                </nav>
+            </Col>
+            <Col --col-size={3}>
+                <div
+                    id="helpSectionIndicators"
+                    class="carousel slide"
+                    bind:this={carouselRef}
+                >
+                    <div class="carousel-inner">
+                        {#each helpSections as item, i}
+                            <div
+                                class="carousel-item"
+                                class:active={i == startIndex}
+                                class:d-none={fsrs
+                                    ? item.sched === HelpItemScheduler.SM2
+                                    : item.sched == HelpItemScheduler.FSRS}
+                            >
+                                <HelpSection {item} />
                             </div>
-                        </div>
-                    </Col>
-                </Row>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" on:click={onOkClicked}>
-                    {tr.helpOk()}
-                </button>
-            </div>
-        </div>
+                        {/each}
+                    </div>
+                </div>
+            </Col>
+        </Row>
     </div>
-</div>
+    <div slot="footer" class="modal-footer">
+        <button type="button" class="btn btn-primary" on:click={modal.onOkClicked}>
+            {tr.helpOk()}
+        </button>
+    </div>
+</Modal>
 
 <style lang="scss">
     #nav {
         margin-bottom: 1.5rem;
     }
 
-    .modal {
-        z-index: 1066;
-        background-color: rgba($color: black, $alpha: 0.5);
-    }
-
     .modal-title {
         margin-inline-end: 0.75rem;
     }
 
-    .modal-content {
-        background-color: var(--canvas);
-        color: var(--fg);
+    :global(.modal-content) {
         border-radius: var(--border-radius-medium, 10px);
     }
 
diff --git a/ts/lib/components/Modal.svelte b/ts/lib/components/Modal.svelte
new file mode 100644
index 000000000..ca751208c
--- /dev/null
+++ b/ts/lib/components/Modal.svelte
@@ -0,0 +1,98 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+<script lang="ts">
+    import Modal from "bootstrap/js/dist/modal";
+    import { getContext, onDestroy, onMount } from "svelte";
+
+    import { registerModalClosingHandler } from "$lib/sveltelib/modal-closing";
+
+    import { modalsKey } from "./context-keys";
+
+    export let modalKey: string = Math.random().toString(36).substring(2);
+    export const dialogClass: string = "";
+    export const onOkClicked: () => void = () => {};
+    export const onCancelClicked: () => void = () => {};
+    export const onShown: () => void = () => {};
+    export const onHidden: () => void = () => {};
+
+    const modals = getContext<Map<string, Modal>>(modalsKey);
+
+    let modal: Modal;
+    let modalRef: HTMLDivElement;
+
+    function onOkClicked_(): void {
+        modal.hide();
+        onOkClicked();
+    }
+
+    function onCancelClicked_(): void {
+        modal.hide();
+        onCancelClicked();
+    }
+
+    export function show(): void {
+        modal.show();
+    }
+
+    export function hide(): void {
+        modal.hide();
+    }
+
+    export { onOkClicked_ as acceptHandler, onCancelClicked_ as cancelHandler };
+
+    const { set: setModalOpen, remove: removeModalClosingHandler } =
+        registerModalClosingHandler(onOkClicked_);
+
+    function onShown_() {
+        setModalOpen(true);
+        onShown();
+    }
+
+    function onHidden_() {
+        setModalOpen(false);
+        onHidden();
+    }
+
+    onMount(() => {
+        modalRef.addEventListener("shown.bs.modal", onShown_);
+        modalRef.addEventListener("hidden.bs.modal", onHidden_);
+        modal = new Modal(modalRef, { keyboard: false });
+        modals.set(modalKey, modal);
+    });
+
+    onDestroy(() => {
+        removeModalClosingHandler();
+        modalRef.removeEventListener("shown.bs.modal", onShown_);
+        modalRef.removeEventListener("hidden.bs.modal", onHidden_);
+    });
+</script>
+
+<div
+    bind:this={modalRef}
+    class="modal fade"
+    tabindex="-1"
+    aria-labelledby="modalLabel"
+    aria-hidden="true"
+>
+    <div class="modal-dialog {dialogClass}">
+        <div class="modal-content">
+            <slot name="header" />
+            <slot name="body" />
+            <slot name="footer" />
+        </div>
+    </div>
+</div>
+
+<style lang="scss">
+    .modal {
+        z-index: 1066;
+        background-color: rgba($color: black, $alpha: 0.5);
+    }
+
+    .modal-content {
+        background-color: var(--canvas);
+        color: var(--fg);
+    }
+</style>
diff --git a/ts/routes/deck-options/TextInputModal.svelte b/ts/routes/deck-options/TextInputModal.svelte
index 3f43815d6..e40682330 100644
--- a/ts/routes/deck-options/TextInputModal.svelte
+++ b/ts/routes/deck-options/TextInputModal.svelte
@@ -3,11 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import Modal from "bootstrap/js/dist/modal";
-    import { getContext, onDestroy, onMount } from "svelte";
-
-    import { modalsKey } from "$lib/components/context-keys";
-    import { registerModalClosingHandler } from "$lib/sveltelib/modal-closing";
+    import Modal from "$lib/components/Modal.svelte";
     import { pageTheme } from "$lib/sveltelib/theme";
 
     export let title: string;
@@ -16,117 +12,63 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export let onOk: (text: string) => void;
     $: value = initialValue;
 
-    export const modalKey: string = Math.random().toString(36).substring(2);
-
-    const modals = getContext<Map<string, Modal>>(modalsKey);
-
-    let modalRef: HTMLDivElement;
-    let modal: Modal;
-
     let inputRef: HTMLInputElement;
+    let modal: Modal;
+    export let modalKey: string;
 
     function onOkClicked(): void {
         onOk(inputRef.value);
-        modal.hide();
         value = initialValue;
     }
 
     function onCancelClicked(): void {
-        modal.hide();
         value = initialValue;
     }
 
     function onShown(): void {
         inputRef.focus();
-        setModalOpen(true);
     }
-
-    function onHidden() {
-        setModalOpen(false);
-    }
-
-    const { set: setModalOpen, remove: removeModalClosingHandler } =
-        registerModalClosingHandler(onCancelClicked);
-
-    onMount(() => {
-        modalRef.addEventListener("shown.bs.modal", onShown);
-        modalRef.addEventListener("hidden.bs.modal", onHidden);
-        modal = new Modal(modalRef, { keyboard: false });
-        modals.set(modalKey, modal);
-    });
-
-    onDestroy(() => {
-        removeModalClosingHandler();
-        modalRef.removeEventListener("shown.bs.modal", onShown);
-        modalRef.removeEventListener("hidden.bs.modal", onHidden);
-    });
 </script>
 
-<div
-    bind:this={modalRef}
-    class="modal fade"
-    tabindex="-1"
-    aria-labelledby="modalLabel"
-    aria-hidden="true"
->
-    <div class="modal-dialog">
-        <div class="modal-content" class:default-colors={$pageTheme.isDark}>
-            <div class="modal-header">
-                <h5 class="modal-title" id="modalLabel">{title}</h5>
-                <button
-                    type="button"
-                    class="btn-close"
-                    class:invert={$pageTheme.isDark}
-                    data-bs-dismiss="modal"
-                    aria-label="Close"
-                ></button>
-            </div>
-            <div class="modal-body">
-                <form on:submit|preventDefault={onOkClicked}>
-                    <div class="mb-3">
-                        <label for="prompt-input" class="col-form-label">
-                            {prompt}:
-                        </label>
-                        <input
-                            id="prompt-input"
-                            bind:this={inputRef}
-                            type="text"
-                            class:nightMode={$pageTheme.isDark}
-                            class="form-control"
-                            bind:value
-                        />
-                    </div>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <button
-                    type="button"
-                    class="btn btn-secondary"
-                    on:click={onCancelClicked}
-                >
-                    Cancel
-                </button>
-                <button type="button" class="btn btn-primary" on:click={onOkClicked}>
-                    OK
-                </button>
-            </div>
-        </div>
+<Modal bind:this={modal} bind:modalKey {onOkClicked} {onShown} {onCancelClicked}>
+    <div slot="header" class="modal-header">
+        <h5 class="modal-title" id="modalLabel">{title}</h5>
+        <button
+            type="button"
+            class="btn-close"
+            data-bs-dismiss="modal"
+            aria-label="Close"
+        ></button>
     </div>
-</div>
+    <div slot="body" class="modal-body">
+        <form on:submit|preventDefault={modal.acceptHandler}>
+            <div class="mb-3">
+                <label for="prompt-input" class="col-form-label">
+                    {prompt}:
+                </label>
+                <input
+                    id="prompt-input"
+                    bind:this={inputRef}
+                    type="text"
+                    class:nightMode={$pageTheme.isDark}
+                    class="form-control"
+                    bind:value
+                />
+            </div>
+        </form>
+    </div>
+    <div slot="footer" class="modal-footer">
+        <button type="button" class="btn btn-secondary" on:click={modal.cancelHandler}>
+            Cancel
+        </button>
+        <button type="button" class="btn btn-primary" on:click={onOkClicked}>OK</button>
+    </div>
+</Modal>
 
 <style lang="scss">
-    @use "$lib/sass/night-mode" as nightmode;
+    @use "../../lib/sass/night-mode" as nightmode;
 
     .nightMode {
         @include nightmode.input;
     }
-
-    .default-colors {
-        background-color: var(--canvas);
-        color: var(--fg);
-    }
-
-    .invert {
-        filter: invert(1) grayscale(100%) brightness(200%);
-    }
 </style>
diff --git a/ts/routes/editor/HistoryModal.svelte b/ts/routes/editor/HistoryModal.svelte
index 29f5b71ae..fc927df1e 100644
--- a/ts/routes/editor/HistoryModal.svelte
+++ b/ts/routes/editor/HistoryModal.svelte
@@ -3,35 +3,14 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import Modal from "bootstrap/js/dist/modal";
-    import { getContext, onDestroy, onMount } from "svelte";
     import * as tr from "@generated/ftl";
-
-    import { modalsKey } from "$lib/components/context-keys";
-    import { registerModalClosingHandler } from "$lib/sveltelib/modal-closing";
+    import Modal from "$lib/components/Modal.svelte";
     import { pageTheme } from "$lib/sveltelib/theme";
     import type { HistoryEntry } from "./types";
     import { searchInBrowser } from "@generated/backend";
 
-    export const modalKey: string = Math.random().toString(36).substring(2);
     export let history: HistoryEntry[] = [];
-
-    const modals = getContext<Map<string, Modal>>(modalsKey);
-
-    let modalRef: HTMLDivElement;
-    let modal: Modal;
-
-    function onCancelClicked(): void {
-        modal.hide();
-    }
-
-    function onShown(): void {
-        setModalOpen(true);
-    }
-
-    function onHidden() {
-        setModalOpen(false);
-    }
+    export let modal: Modal;
 
     function onEntryClick(entry: HistoryEntry): void {
         searchInBrowser({
@@ -42,91 +21,41 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         });
         modal.hide();
     }
-
-    const { set: setModalOpen, remove: removeModalClosingHandler } =
-        registerModalClosingHandler(onCancelClicked);
-
-    onMount(() => {
-        modalRef.addEventListener("shown.bs.modal", onShown);
-        modalRef.addEventListener("hidden.bs.modal", onHidden);
-        modal = new Modal(modalRef, { keyboard: false });
-        modals.set(modalKey, modal);
-    });
-
-    onDestroy(() => {
-        removeModalClosingHandler();
-        modalRef.removeEventListener("shown.bs.modal", onShown);
-        modalRef.removeEventListener("hidden.bs.modal", onHidden);
-    });
 </script>
 
-<div
-    bind:this={modalRef}
-    class="modal fade"
-    class:nightMode={$pageTheme.isDark}
-    tabindex="-1"
-    aria-labelledby="modalLabel"
-    aria-hidden="true"
->
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="modalLabel">{tr.addingHistory()}</h5>
-                <button
-                    type="button"
-                    class="btn-close"
-                    data-bs-dismiss="modal"
-                    aria-label="Close"
-                ></button>
-            </div>
-            <div class="modal-body">
-                <ul class="history-list">
-                    {#each history as entry}
-                        <li>
-                            <button
-                                type="button"
-                                class="history-entry"
-                                on:click={() => onEntryClick(entry)}
-                            >
-                                {entry.text}
-                            </button>
-                        </li>
-                    {/each}
-                </ul>
-            </div>
-            <div class="modal-footer">
-                <button
-                    type="button"
-                    class="btn btn-secondary"
-                    on:click={onCancelClicked}
-                >
-                    Cancel
-                </button>
-            </div>
-        </div>
+<Modal bind:this={modal}>
+    <div slot="header" class="modal-header">
+        <h5 class="modal-title" id="modalLabel">{tr.addingHistory()}</h5>
+        <button
+            type="button"
+            class="btn-close"
+            data-bs-dismiss="modal"
+            aria-label="Close"
+        ></button>
     </div>
-</div>
+    <div slot="body" class="modal-body" class:nightMode={$pageTheme.isDark}>
+        <ul class="history-list">
+            {#each history as entry}
+                <li>
+                    <button
+                        type="button"
+                        class="history-entry"
+                        on:click={() => onEntryClick(entry)}
+                    >
+                        {entry.text}
+                    </button>
+                </li>
+            {/each}
+        </ul>
+    </div>
+    <div slot="footer" class="modal-footer">
+        <button type="button" class="btn btn-secondary" on:click={modal.cancelHandler}>
+            Cancel
+        </button>
+    </div>
+</Modal>
 
 <style lang="scss">
-    .modal {
-        --link-color: #007bff;
-        --canvas-elevated-hover: rgba(0, 0, 0, 0.05);
-    }
-
-    .nightMode.modal {
-        --link-color: #4dabf7;
-        --canvas-elevated-hover: rgba(255, 255, 255, 0.1): ;
-    }
-
-    .nightMode .modal-content {
-        background-color: var(--canvas);
-        color: var(--fg);
-    }
-
-    .nightMode .btn-close {
-        filter: invert(1) grayscale(100%) brightness(200%);
-    }
-
     .history-list {
         list-style: none;
         padding: 0;
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 6b8831085..8c9b93d65 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -15,9 +15,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import LabelName from "./LabelName.svelte";
     import { EditorState, type EditorMode } from "./types";
     import { ContextMenu, Item } from "$lib/context-menu";
-    import type Modal from "bootstrap/js/dist/modal";
-    import { getContext } from "svelte";
-    import { modalsKey } from "$lib/components/context-keys";
 
     export interface NoteEditorAPI {
         fields: EditorFieldAPI[];
@@ -451,9 +448,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         await addCurrentNote(1n);
     }
 
-    const modals = getContext<Map<string, Modal>>(modalsKey);
-    let modalKey: string;
-
+    let historyModal: Modal;
     let history: HistoryEntry[] = [];
 
     export async function addNoteToHistory(note: Note) {
@@ -476,7 +471,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 
     export function onHistory() {
-        modals.get(modalKey)!.show();
+        historyModal.show();
     }
 
     export function saveOnPageHide() {
@@ -724,6 +719,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import HistoryModal from "./HistoryModal.svelte";
     import { HelpPageLinkRequest_HelpPage } from "@generated/anki/links_pb";
     import { MessageBoxType } from "@generated/anki/frontend_pb";
+    import type Modal from "$lib/components/Modal.svelte";
 
     $: isIOImageLoaded = false;
     $: ioImageLoadedStore.set(isIOImageLoaded);
@@ -1389,7 +1385,7 @@ components and functionality for general note editing.
 
     {#if !isLegacy}
         <ActionButtons {mode} {onClose} {onAdd} {onHistory} {history} />
-        <HistoryModal bind:modalKey {history} />
+        <HistoryModal bind:modal={historyModal} {history} />
     {/if}
 
     {#if !isLegacy}

From e80829f282ec44b19ab18e57ecddacba34810323 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 13 Aug 2025 11:53:33 +0300
Subject: [PATCH 095/133] Fix Modal event handlers not working

---
 ts/lib/components/Modal.svelte | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ts/lib/components/Modal.svelte b/ts/lib/components/Modal.svelte
index ca751208c..443595fc5 100644
--- a/ts/lib/components/Modal.svelte
+++ b/ts/lib/components/Modal.svelte
@@ -12,10 +12,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     export let modalKey: string = Math.random().toString(36).substring(2);
     export const dialogClass: string = "";
-    export const onOkClicked: () => void = () => {};
-    export const onCancelClicked: () => void = () => {};
-    export const onShown: () => void = () => {};
-    export const onHidden: () => void = () => {};
+    export let onOkClicked: (() => void) | undefined = undefined;
+    export let onCancelClicked: (() => void) | undefined = undefined;
+    export let onShown: (() => void) | undefined = undefined;
+    export let onHidden: (() => void) | undefined = undefined;
 
     const modals = getContext<Map<string, Modal>>(modalsKey);
 
@@ -24,12 +24,12 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     function onOkClicked_(): void {
         modal.hide();
-        onOkClicked();
+        onOkClicked?.();
     }
 
     function onCancelClicked_(): void {
         modal.hide();
-        onCancelClicked();
+        onCancelClicked?.();
     }
 
     export function show(): void {
@@ -47,12 +47,12 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     function onShown_() {
         setModalOpen(true);
-        onShown();
+        onShown?.();
     }
 
     function onHidden_() {
         setModalOpen(false);
-        onHidden();
+        onHidden?.();
     }
 
     onMount(() => {

From fbb9e606eb4677d216e1246efb583159d710cfcd Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 13 Aug 2025 11:54:10 +0300
Subject: [PATCH 096/133] Fix TextInputModal not closing when OK is clicked

---
 ts/routes/deck-options/TextInputModal.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ts/routes/deck-options/TextInputModal.svelte b/ts/routes/deck-options/TextInputModal.svelte
index e40682330..c0dd00a41 100644
--- a/ts/routes/deck-options/TextInputModal.svelte
+++ b/ts/routes/deck-options/TextInputModal.svelte
@@ -61,7 +61,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         <button type="button" class="btn btn-secondary" on:click={modal.cancelHandler}>
             Cancel
         </button>
-        <button type="button" class="btn btn-primary" on:click={onOkClicked}>OK</button>
+        <button type="button" class="btn btn-primary" on:click={modal.acceptHandler}>OK</button>
     </div>
 </Modal>
 

From 25f51345d572357ec590ac061fa1bb169d5696f9 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 14 Aug 2025 07:48:02 +0300
Subject: [PATCH 097/133] Implement Deck/Notetype selectors in Svelte

---
 ts/lib/components/DeckChooser.svelte          |  29 +++
 ts/lib/components/ItemChooser.svelte          | 240 ++++++++++++++++++
 ts/lib/components/Modal.svelte                |   2 +-
 ts/lib/components/NotetypeChooser.svelte      |  28 ++
 ts/lib/components/icons.ts                    |   6 +
 ts/routes/deck-options/TextInputModal.svelte  |   4 +-
 ts/routes/editor/NoteEditor.svelte            |   3 +
 .../editor-toolbar/EditorChoosers.svelte      |  33 +++
 8 files changed, 343 insertions(+), 2 deletions(-)
 create mode 100644 ts/lib/components/DeckChooser.svelte
 create mode 100644 ts/lib/components/ItemChooser.svelte
 create mode 100644 ts/lib/components/NotetypeChooser.svelte
 create mode 100644 ts/routes/editor/editor-toolbar/EditorChoosers.svelte

diff --git a/ts/lib/components/DeckChooser.svelte b/ts/lib/components/DeckChooser.svelte
new file mode 100644
index 000000000..28ef49625
--- /dev/null
+++ b/ts/lib/components/DeckChooser.svelte
@@ -0,0 +1,29 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+<script lang="ts">
+    import { mdiBookOutline } from "./icons";
+    import { getDeckNames } from "@generated/backend";
+    import ItemChooser from "./ItemChooser.svelte";
+    import type { DeckNameId } from "@generated/anki/decks_pb";
+
+    let decks: DeckNameId[] = $state([]);
+    let selectedDeck: DeckNameId | null = $state(null);
+
+    $effect(() => {
+        getDeckNames({ skipEmptyDefault: true, includeFiltered: false }).then(
+            (response) => {
+                decks = response.entries;
+            },
+        );
+    });
+</script>
+
+<ItemChooser
+    title="Choose Deck"
+    searchPlaceholder="Search decks..."
+    bind:selectedItem={selectedDeck}
+    items={decks}
+    icon={mdiBookOutline}
+/>
diff --git a/ts/lib/components/ItemChooser.svelte b/ts/lib/components/ItemChooser.svelte
new file mode 100644
index 000000000..19aea4ba7
--- /dev/null
+++ b/ts/lib/components/ItemChooser.svelte
@@ -0,0 +1,240 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+<script lang="ts">
+    import { magnifyIcon, mdiClose } from "./icons";
+    import Icon from "./Icon.svelte";
+    import IconConstrain from "./IconConstrain.svelte";
+    import LabelButton from "./LabelButton.svelte";
+    import Modal from "./Modal.svelte";
+    import type { IconData } from "./types";
+
+    interface Item {
+        id: bigint;
+        name: string;
+    }
+
+    interface Props {
+        title: string;
+        searchPlaceholder: string;
+        selectedItem?: Item | null;
+        items: Item[];
+        icon: IconData;
+        onChange?: (item: Item) => void;
+    }
+
+    let { title, searchPlaceholder, onChange, icon, items, selectedItem = $bindable(null) }: Props = $props();
+    let modal: Modal | null = $state(null);
+    let searchQuery = $state("");
+
+    const filteredItems = $derived(
+        searchQuery.trim() === ""
+            ? items
+            : items.filter((item) =>
+                  item.name.toLowerCase().includes(searchQuery.toLowerCase()),
+              ),
+    );
+
+    function onSelect(item: Item) {
+        selectedItem = item;
+        onChange?.(item);
+        modal?.hide();
+    }
+
+    function openModal() {
+        searchQuery = "";
+        modal?.show();
+    }
+
+    $effect(() => {
+        if (!selectedItem && items.length > 0) {
+            selectedItem = items[0];
+            onChange?.(selectedItem);
+        }
+    });
+</script>
+
+<LabelButton on:click={openModal} class="chooser-button">
+    {selectedItem?.name ?? "…"}
+</LabelButton>
+
+<Modal bind:this={modal} dialogClass="modal-lg">
+    <div slot="header" class="modal-header">
+        <IconConstrain iconSize={90}>
+            <Icon {icon} />
+        </IconConstrain>
+        <h5 class="modal-title">{title}</h5>
+        <button
+            type="button"
+            class="btn-close"
+            data-bs-dismiss="modal"
+            aria-label="Close"
+        ></button>
+    </div>
+
+    <div slot="body" class="modal-body">
+        <div class="search-container">
+            <div class="search-input-wrapper">
+                <div class="search-icon">
+                    <IconConstrain iconSize={70}>
+                        <Icon icon={magnifyIcon} />
+                    </IconConstrain>
+                </div>
+                <input
+                    type="text"
+                    class="search-input"
+                    placeholder={searchPlaceholder}
+                    bind:value={searchQuery}
+                />
+                {#if searchQuery}
+                    <button
+                        type="button"
+                        class="clear-search"
+                        onclick={() => (searchQuery = "")}
+                        aria-label="Clear search"
+                    >
+                        <IconConstrain iconSize={60}>
+                            <Icon icon={mdiClose} />
+                        </IconConstrain>
+                    </button>
+                {/if}
+            </div>
+        </div>
+        <div class="item-grid">
+            {#each filteredItems as item (item.id)}
+                <button
+                    class="item-card"
+                    class:selected={selectedItem?.id === item.id}
+                    onclick={() => onSelect(item)}
+                    aria-label="Select {item.name}"
+                >
+                    <h6 class="item-title">{item.name}</h6>
+                </button>
+            {/each}
+        </div>
+    </div>
+</Modal>
+
+<style lang="scss">
+    @use "../sass/button-mixins" as button;
+
+    :global(.label-button.chooser-button) {
+        width: 100%;
+    }
+
+    .modal-header {
+        display: flex;
+        align-items: center;
+        gap: 0.75rem;
+
+        .modal-title {
+            margin: 0;
+            font-weight: 600;
+            color: var(--fg);
+        }
+    }
+
+    .search-input-wrapper {
+        position: relative;
+        display: flex;
+        align-items: center;
+        background: var(--canvas);
+        border: 1px solid var(--border-subtle);
+        border-radius: 0.375rem;
+        transition: border-color 0.2s ease;
+
+        &:focus-within {
+            border-color: var(--border-strong);
+        }
+    }
+
+    .search-icon {
+        padding: 0.5rem 0.75rem;
+        color: var(--fg-subtle);
+        pointer-events: none;
+    }
+
+    .search-input {
+        flex: 1;
+        padding: 0.5rem 0.75rem 0.5rem 0;
+        border: none;
+        background: transparent;
+        color: var(--fg);
+        font-size: 0.9rem;
+        outline: none;
+
+        &::placeholder {
+            color: var(--fg-subtle);
+        }
+    }
+
+    .clear-search {
+        padding: 0.25rem;
+        margin-right: 0.5rem;
+        border: none;
+        background: transparent;
+        color: var(--fg-subtle);
+        border-radius: 0.25rem;
+
+        &:hover {
+            background: var(--canvas-inset);
+            color: var(--fg);
+        }
+    }
+
+    .item-grid {
+        display: grid;
+        grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
+        gap: 1rem;
+        padding: 0.5rem 0;
+    }
+
+    :global(.item-card) {
+        @include button.base(
+            $border: true,
+            $with-hover: true,
+            $with-active: true,
+            $with-disabled: false
+        );
+        @include button.border-radius;
+
+        padding: 1rem;
+        text-align: start;
+        background: var(--canvas-elevated);
+        border: 1px solid var(--border-subtle);
+
+        &:hover {
+            background: var(--canvas-inset);
+            border-color: var(--border);
+            transform: translateY(-1px);
+            box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+        }
+
+        &.selected {
+            border-color: var(--border-focus);
+        }
+    }
+
+    .item-title {
+        margin: 0 0 0.25rem 0;
+        font-size: 1rem;
+        font-weight: 600;
+        color: inherit;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
+
+    .modal-body {
+        padding: 1.5rem;
+        max-height: 80vh;
+        overflow-y: auto;
+    }
+
+    .modal-header {
+        padding: 1.5rem;
+        border-bottom: 1px solid var(--border-subtle);
+        background: var(--canvas-elevated);
+    }
+</style>
diff --git a/ts/lib/components/Modal.svelte b/ts/lib/components/Modal.svelte
index 443595fc5..42ff38a93 100644
--- a/ts/lib/components/Modal.svelte
+++ b/ts/lib/components/Modal.svelte
@@ -11,7 +11,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { modalsKey } from "./context-keys";
 
     export let modalKey: string = Math.random().toString(36).substring(2);
-    export const dialogClass: string = "";
+    export let dialogClass: string = "";
     export let onOkClicked: (() => void) | undefined = undefined;
     export let onCancelClicked: (() => void) | undefined = undefined;
     export let onShown: (() => void) | undefined = undefined;
diff --git a/ts/lib/components/NotetypeChooser.svelte b/ts/lib/components/NotetypeChooser.svelte
new file mode 100644
index 000000000..b1ac76d06
--- /dev/null
+++ b/ts/lib/components/NotetypeChooser.svelte
@@ -0,0 +1,28 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+<script lang="ts">
+    import type { NotetypeNameId } from "@generated/anki/notetypes_pb";
+
+    import { mdiNewspaper } from "./icons";
+    import { getNotetypeNames } from "@generated/backend";
+    import ItemChooser from "./ItemChooser.svelte";
+
+    let notetypes: NotetypeNameId[] = $state([]);
+    let selectedNotetype: NotetypeNameId | null = $state(null);
+
+    $effect(() => {
+        getNotetypeNames({}).then((response) => {
+            notetypes = response.entries;
+        });
+    });
+</script>
+
+<ItemChooser
+    title="Choose Note Type"
+    searchPlaceholder="Search note types..."
+    bind:selectedItem={selectedNotetype}
+    items={notetypes}
+    icon={mdiNewspaper}
+/>
diff --git a/ts/lib/components/icons.ts b/ts/lib/components/icons.ts
index 7bd28070f..3dc8f5837 100644
--- a/ts/lib/components/icons.ts
+++ b/ts/lib/components/icons.ts
@@ -15,6 +15,8 @@ import AlignVerticalCenter_ from "@mdi/svg/svg/align-vertical-center.svg?compone
 import alignVerticalCenter_ from "@mdi/svg/svg/align-vertical-center.svg?url";
 import AlignVerticalTop_ from "@mdi/svg/svg/align-vertical-top.svg?component";
 import alignVerticalTop_ from "@mdi/svg/svg/align-vertical-top.svg?url";
+import BookOutline_ from "@mdi/svg/svg/book-outline.svg?component";
+import bookOutline_ from "@mdi/svg/svg/book-outline.svg?url";
 import CheckCircle_ from "@mdi/svg/svg/check-circle.svg?component";
 import checkCircle_ from "@mdi/svg/svg/check-circle.svg?url";
 import ChevronDown_ from "@mdi/svg/svg/chevron-down.svg?component";
@@ -111,6 +113,8 @@ import Math_ from "@mdi/svg/svg/math-integral-box.svg?component";
 import math_ from "@mdi/svg/svg/math-integral-box.svg?url";
 import NewBox_ from "@mdi/svg/svg/new-box.svg?component";
 import newBox_ from "@mdi/svg/svg/new-box.svg?url";
+import Newspaper_ from "@mdi/svg/svg/newspaper.svg?component";
+import newspaper_ from "@mdi/svg/svg/newspaper.svg?url";
 import Paperclip_ from "@mdi/svg/svg/paperclip.svg?component";
 import paperclip_ from "@mdi/svg/svg/paperclip.svg?url";
 import RectangleOutline_ from "@mdi/svg/svg/rectangle-outline.svg?component";
@@ -288,3 +292,5 @@ export const mdiVectorPolygonVariant = { url: vectorPolygonVariant_, component:
 export const incrementClozeIcon = { url: incrementCloze_, component: IncrementCloze_ };
 export const mdiEarth = { url: earth_, component: Earth_ };
 export const caretDownFill = { url: caretDownFill_, component: CaretDownFill_ };
+export const mdiNewspaper = { url: newspaper_, component: Newspaper_ };
+export const mdiBookOutline = { url: bookOutline_, component: BookOutline_ };
diff --git a/ts/routes/deck-options/TextInputModal.svelte b/ts/routes/deck-options/TextInputModal.svelte
index c0dd00a41..318977e55 100644
--- a/ts/routes/deck-options/TextInputModal.svelte
+++ b/ts/routes/deck-options/TextInputModal.svelte
@@ -61,7 +61,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         <button type="button" class="btn btn-secondary" on:click={modal.cancelHandler}>
             Cancel
         </button>
-        <button type="button" class="btn btn-primary" on:click={modal.acceptHandler}>OK</button>
+        <button type="button" class="btn btn-primary" on:click={modal.acceptHandler}>
+            OK
+        </button>
     </div>
 </Modal>
 
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 8c9b93d65..29816ef20 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -720,6 +720,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { HelpPageLinkRequest_HelpPage } from "@generated/anki/links_pb";
     import { MessageBoxType } from "@generated/anki/frontend_pb";
     import type Modal from "$lib/components/Modal.svelte";
+    import EditorChoosers from "./editor-toolbar/EditorChoosers.svelte";
 
     $: isIOImageLoaded = false;
     $: ioImageLoadedStore.set(isIOImageLoaded);
@@ -1195,6 +1196,8 @@ components and functionality for general note editing.
     on:dragover={preventDefaultIfNonLegacy}
     on:drop={checkNonLegacy(handlePickerDrop)}
 >
+    <EditorChoosers />
+
     <EditorToolbar {size} {wrap} api={toolbar}>
         <svelte:fragment slot="notetypeButtons">
             {#if mode === "browser"}
diff --git a/ts/routes/editor/editor-toolbar/EditorChoosers.svelte b/ts/routes/editor/editor-toolbar/EditorChoosers.svelte
new file mode 100644
index 000000000..a27a37988
--- /dev/null
+++ b/ts/routes/editor/editor-toolbar/EditorChoosers.svelte
@@ -0,0 +1,33 @@
+<!--
+Copyright: Ankitects Pty Ltd and contributors
+License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+-->
+
+<script lang="ts">
+    import NotetypeChooser from "$lib/components/NotetypeChooser.svelte";
+    import DeckChooser from "$lib/components/DeckChooser.svelte";
+</script>
+
+<div class="top-bar">
+    <p>Type</p>
+    <div class="notetype-chooser">
+        <NotetypeChooser />
+    </div>
+    <p>Deck</p>
+    <div class="deck-chooser">
+        <DeckChooser />
+    </div>
+</div>
+
+<style>
+    .top-bar {
+        display: flex;
+        gap: 0.5rem;
+        margin-bottom: 0.5rem;
+    }
+
+    .notetype-chooser,
+    .deck-chooser {
+        flex: 1;
+    }
+</style>

From 7e021a94083a7bcc9dc7bab0e038e57534028ba8 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 14 Aug 2025 07:59:48 +0300
Subject: [PATCH 098/133] Disable prefer-const for Svelte for now

https://github.com/sveltejs/eslint-plugin-svelte/issues/818#issuecomment-2570986849
---
 .eslintrc.cjs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 2c5502f64..52e708c6b 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -46,6 +46,9 @@ module.exports = {
                 "svelte/no-at-html-tags": "off",
                 "svelte/valid-compile": ["error", { "ignoreWarnings": true }],
                 "@typescript-eslint/no-explicit-any": "off",
+                "prefer-const": "off",
+                // TODO: enable this when we update to eslint-plugin-svelte 3
+                // "svelte/prefer-const": "warn",
             },
         },
     ],

From d054e0f078bade33fc64b88df2c829ec0f0037c3 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 14 Aug 2025 08:29:01 +0300
Subject: [PATCH 099/133] Use translations

---
 ts/lib/components/DeckChooser.svelte                  |  4 ++--
 ts/lib/components/ItemChooser.svelte                  |  7 +++----
 ts/lib/components/NotetypeChooser.svelte              |  4 ++--
 ts/routes/editor/base.ts                              |  2 ++
 ts/routes/editor/editor-toolbar/EditorChoosers.svelte | 10 ++++++----
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/ts/lib/components/DeckChooser.svelte b/ts/lib/components/DeckChooser.svelte
index 28ef49625..d4cac952b 100644
--- a/ts/lib/components/DeckChooser.svelte
+++ b/ts/lib/components/DeckChooser.svelte
@@ -7,6 +7,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { getDeckNames } from "@generated/backend";
     import ItemChooser from "./ItemChooser.svelte";
     import type { DeckNameId } from "@generated/anki/decks_pb";
+    import * as tr from "@generated/ftl";
 
     let decks: DeckNameId[] = $state([]);
     let selectedDeck: DeckNameId | null = $state(null);
@@ -21,8 +22,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 </script>
 
 <ItemChooser
-    title="Choose Deck"
-    searchPlaceholder="Search decks..."
+    title={tr.qtMiscChooseDeck()}
     bind:selectedItem={selectedDeck}
     items={decks}
     icon={mdiBookOutline}
diff --git a/ts/lib/components/ItemChooser.svelte b/ts/lib/components/ItemChooser.svelte
index 19aea4ba7..f2fd43e3a 100644
--- a/ts/lib/components/ItemChooser.svelte
+++ b/ts/lib/components/ItemChooser.svelte
@@ -9,7 +9,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import LabelButton from "./LabelButton.svelte";
     import Modal from "./Modal.svelte";
     import type { IconData } from "./types";
-
+    import * as tr from "@generated/ftl";
     interface Item {
         id: bigint;
         name: string;
@@ -17,14 +17,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     interface Props {
         title: string;
-        searchPlaceholder: string;
         selectedItem?: Item | null;
         items: Item[];
         icon: IconData;
         onChange?: (item: Item) => void;
     }
 
-    let { title, searchPlaceholder, onChange, icon, items, selectedItem = $bindable(null) }: Props = $props();
+    let { title, onChange, icon, items, selectedItem = $bindable(null) }: Props = $props();
     let modal: Modal | null = $state(null);
     let searchQuery = $state("");
 
@@ -84,7 +83,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                 <input
                     type="text"
                     class="search-input"
-                    placeholder={searchPlaceholder}
+                    placeholder={tr.actionsSearch()}
                     bind:value={searchQuery}
                 />
                 {#if searchQuery}
diff --git a/ts/lib/components/NotetypeChooser.svelte b/ts/lib/components/NotetypeChooser.svelte
index b1ac76d06..10002f2d8 100644
--- a/ts/lib/components/NotetypeChooser.svelte
+++ b/ts/lib/components/NotetypeChooser.svelte
@@ -8,6 +8,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { mdiNewspaper } from "./icons";
     import { getNotetypeNames } from "@generated/backend";
     import ItemChooser from "./ItemChooser.svelte";
+    import * as tr from "@generated/ftl";
 
     let notetypes: NotetypeNameId[] = $state([]);
     let selectedNotetype: NotetypeNameId | null = $state(null);
@@ -20,8 +21,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 </script>
 
 <ItemChooser
-    title="Choose Note Type"
-    searchPlaceholder="Search note types..."
+    title={tr.qtMiscChooseNoteType()}
     bind:selectedItem={selectedNotetype}
     items={notetypes}
     icon={mdiNewspaper}
diff --git a/ts/routes/editor/base.ts b/ts/routes/editor/base.ts
index 1c85a1d8f..30b5b17d9 100644
--- a/ts/routes/editor/base.ts
+++ b/ts/routes/editor/base.ts
@@ -43,6 +43,8 @@ export const editorModules = [
     ModuleName.IMPORTING,
     ModuleName.UNDO,
     ModuleName.ADDING,
+    ModuleName.QT_MISC,
+    ModuleName.DECKS,
 ];
 
 export const components = {
diff --git a/ts/routes/editor/editor-toolbar/EditorChoosers.svelte b/ts/routes/editor/editor-toolbar/EditorChoosers.svelte
index a27a37988..f65a98e7a 100644
--- a/ts/routes/editor/editor-toolbar/EditorChoosers.svelte
+++ b/ts/routes/editor/editor-toolbar/EditorChoosers.svelte
@@ -6,16 +6,18 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 <script lang="ts">
     import NotetypeChooser from "$lib/components/NotetypeChooser.svelte";
     import DeckChooser from "$lib/components/DeckChooser.svelte";
+    import * as tr from "@generated/ftl";
+
 </script>
 
 <div class="top-bar">
-    <p>Type</p>
+    <p>{tr.notetypesType()}</p>
     <div class="notetype-chooser">
-        <NotetypeChooser />
+        <NotetypeChooser/>
     </div>
-    <p>Deck</p>
+    <p>{tr.decksDeck()}</p>
     <div class="deck-chooser">
-        <DeckChooser />
+        <DeckChooser/>
     </div>
 </div>
 

From b17bfb26584ffc0fe97db202846a6afd436969c0 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 14 Aug 2025 08:50:38 +0300
Subject: [PATCH 100/133] Pass selected notetype/deck to editor

---
 ts/lib/components/DeckChooser.svelte           |  7 ++++++-
 ts/lib/components/ItemChooser.svelte           |  6 +-----
 ts/lib/components/NotetypeChooser.svelte       |  7 ++++++-
 ts/routes/editor/NoteEditor.svelte             | 18 +++++++++++++++---
 .../editor-toolbar/EditorChoosers.svelte       | 14 ++++++++++++--
 5 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/ts/lib/components/DeckChooser.svelte b/ts/lib/components/DeckChooser.svelte
index d4cac952b..030318b60 100644
--- a/ts/lib/components/DeckChooser.svelte
+++ b/ts/lib/components/DeckChooser.svelte
@@ -9,8 +9,12 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type { DeckNameId } from "@generated/anki/decks_pb";
     import * as tr from "@generated/ftl";
 
+    interface Props {
+        selectedDeck: DeckNameId | null;
+        onChange?: (deck: DeckNameId) => void;
+    }
+    let {selectedDeck = $bindable(null), onChange}: Props = $props();
     let decks: DeckNameId[] = $state([]);
-    let selectedDeck: DeckNameId | null = $state(null);
 
     $effect(() => {
         getDeckNames({ skipEmptyDefault: true, includeFiltered: false }).then(
@@ -24,6 +28,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 <ItemChooser
     title={tr.qtMiscChooseDeck()}
     bind:selectedItem={selectedDeck}
+    {onChange}
     items={decks}
     icon={mdiBookOutline}
 />
diff --git a/ts/lib/components/ItemChooser.svelte b/ts/lib/components/ItemChooser.svelte
index f2fd43e3a..30de6b05a 100644
--- a/ts/lib/components/ItemChooser.svelte
+++ b/ts/lib/components/ItemChooser.svelte
@@ -2,7 +2,7 @@
 Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
-<script lang="ts">
+<script lang="ts" generics="Item extends { id: bigint, name: string }">
     import { magnifyIcon, mdiClose } from "./icons";
     import Icon from "./Icon.svelte";
     import IconConstrain from "./IconConstrain.svelte";
@@ -10,10 +10,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import Modal from "./Modal.svelte";
     import type { IconData } from "./types";
     import * as tr from "@generated/ftl";
-    interface Item {
-        id: bigint;
-        name: string;
-    }
 
     interface Props {
         title: string;
diff --git a/ts/lib/components/NotetypeChooser.svelte b/ts/lib/components/NotetypeChooser.svelte
index 10002f2d8..d35a184cb 100644
--- a/ts/lib/components/NotetypeChooser.svelte
+++ b/ts/lib/components/NotetypeChooser.svelte
@@ -10,8 +10,12 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import ItemChooser from "./ItemChooser.svelte";
     import * as tr from "@generated/ftl";
 
+    interface Props {
+        selectedNotetype: NotetypeNameId | null;
+        onChange?: (notetype: NotetypeNameId) => void;
+    }
+    let {selectedNotetype = $bindable(null), onChange}: Props = $props();
     let notetypes: NotetypeNameId[] = $state([]);
-    let selectedNotetype: NotetypeNameId | null = $state(null);
 
     $effect(() => {
         getNotetypeNames({}).then((response) => {
@@ -23,6 +27,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 <ItemChooser
     title={tr.qtMiscChooseNoteType()}
     bind:selectedItem={selectedNotetype}
+    {onChange}
     items={notetypes}
     icon={mdiNewspaper}
 />
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 29816ef20..4fcf54cef 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -15,6 +15,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import LabelName from "./LabelName.svelte";
     import { EditorState, type EditorMode } from "./types";
     import { ContextMenu, Item } from "$lib/context-menu";
+    import type { NotetypeNameId } from "@generated/anki/notetypes_pb";
+    import type { DeckNameId } from "@generated/anki/decks_pb";
 
     export interface NoteEditorAPI {
         fields: EditorFieldAPI[];
@@ -295,6 +297,17 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         clearCodeMirrorHistory();
     }
 
+    export let selectedNotetype: NotetypeNameId | null = null;
+    export let selectedDeck: DeckNameId | null = null;
+
+
+    function onNotetypeChange(notetype: NotetypeNameId) {
+        loadNote(0n, notetype.id, 0, null);
+    }
+
+    function onDeckChange(deck: DeckNameId) {
+        selectedDeck = deck;
+    }
     let notetypeMeta: NotetypeIdAndModTime;
     function setNotetypeMeta(notetype: Notetype): void {
         notetypeMeta = { id: notetype.id, modTime: notetype.mtimeSecs };
@@ -444,8 +457,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 
     async function onAdd() {
-        // TODO get selected deck
-        await addCurrentNote(1n);
+        await addCurrentNote(selectedDeck!.id);
     }
 
     let historyModal: Modal;
@@ -1196,7 +1208,7 @@ components and functionality for general note editing.
     on:dragover={preventDefaultIfNonLegacy}
     on:drop={checkNonLegacy(handlePickerDrop)}
 >
-    <EditorChoosers />
+    <EditorChoosers bind:selectedNotetype bind:selectedDeck onNotetypeChange={onNotetypeChange} />
 
     <EditorToolbar {size} {wrap} api={toolbar}>
         <svelte:fragment slot="notetypeButtons">
diff --git a/ts/routes/editor/editor-toolbar/EditorChoosers.svelte b/ts/routes/editor/editor-toolbar/EditorChoosers.svelte
index f65a98e7a..ea66956e4 100644
--- a/ts/routes/editor/editor-toolbar/EditorChoosers.svelte
+++ b/ts/routes/editor/editor-toolbar/EditorChoosers.svelte
@@ -6,18 +6,28 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 <script lang="ts">
     import NotetypeChooser from "$lib/components/NotetypeChooser.svelte";
     import DeckChooser from "$lib/components/DeckChooser.svelte";
+    import type { NotetypeNameId } from "@generated/anki/notetypes_pb";
+    import type { DeckNameId } from "@generated/anki/decks_pb";
     import * as tr from "@generated/ftl";
 
+    interface Props {
+        selectedNotetype: NotetypeNameId | null;
+        selectedDeck: DeckNameId | null;
+        onNotetypeChange?: (notetype: NotetypeNameId) => void;
+        onDeckChange?: (deck: DeckNameId) => void;
+    }
+    let {selectedNotetype = $bindable(null), selectedDeck = $bindable(null), onNotetypeChange, onDeckChange}: Props = $props();
+
 </script>
 
 <div class="top-bar">
     <p>{tr.notetypesType()}</p>
     <div class="notetype-chooser">
-        <NotetypeChooser/>
+        <NotetypeChooser bind:selectedNotetype onChange={onNotetypeChange} />
     </div>
     <p>{tr.decksDeck()}</p>
     <div class="deck-chooser">
-        <DeckChooser/>
+        <DeckChooser bind:selectedDeck onChange={onDeckChange} />
     </div>
 </div>
 

From 0137ca6c2733270605506b89994d27027054613b Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 14 Aug 2025 08:52:11 +0300
Subject: [PATCH 101/133] Only show selectors in Add mode

---
 ts/routes/editor/NoteEditor.svelte | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 4fcf54cef..198568c03 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -1208,7 +1208,9 @@ components and functionality for general note editing.
     on:dragover={preventDefaultIfNonLegacy}
     on:drop={checkNonLegacy(handlePickerDrop)}
 >
-    <EditorChoosers bind:selectedNotetype bind:selectedDeck onNotetypeChange={onNotetypeChange} />
+    {#if mode === "add"}
+        <EditorChoosers bind:selectedNotetype bind:selectedDeck onNotetypeChange={onNotetypeChange} />
+    {/if}
 
     <EditorToolbar {size} {wrap} api={toolbar}>
         <svelte:fragment slot="notetypeButtons">

From 4444942b46092d5f2acdbe6bb994a798bc37bcba Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 14 Aug 2025 08:57:03 +0300
Subject: [PATCH 102/133] Add selector shortcuts

---
 ts/lib/components/DeckChooser.svelte     | 1 +
 ts/lib/components/ItemChooser.svelte     | 5 ++++-
 ts/lib/components/Modal.svelte           | 4 ++++
 ts/lib/components/NotetypeChooser.svelte | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ts/lib/components/DeckChooser.svelte b/ts/lib/components/DeckChooser.svelte
index 030318b60..543dcfd8e 100644
--- a/ts/lib/components/DeckChooser.svelte
+++ b/ts/lib/components/DeckChooser.svelte
@@ -31,4 +31,5 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     {onChange}
     items={decks}
     icon={mdiBookOutline}
+    keyCombination="Control+D"
 />
diff --git a/ts/lib/components/ItemChooser.svelte b/ts/lib/components/ItemChooser.svelte
index 30de6b05a..f0493b4dd 100644
--- a/ts/lib/components/ItemChooser.svelte
+++ b/ts/lib/components/ItemChooser.svelte
@@ -10,16 +10,18 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import Modal from "./Modal.svelte";
     import type { IconData } from "./types";
     import * as tr from "@generated/ftl";
+    import Shortcut from "./Shortcut.svelte";
 
     interface Props {
         title: string;
         selectedItem?: Item | null;
         items: Item[];
         icon: IconData;
+        keyCombination: string;
         onChange?: (item: Item) => void;
     }
 
-    let { title, onChange, icon, items, selectedItem = $bindable(null) }: Props = $props();
+    let { title, onChange, icon, items, selectedItem = $bindable(null), keyCombination }: Props = $props();
     let modal: Modal | null = $state(null);
     let searchQuery = $state("");
 
@@ -54,6 +56,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     {selectedItem?.name ?? "…"}
 </LabelButton>
 
+<Shortcut keyCombination={keyCombination} on:action={() => modal?.toggle()} />
 <Modal bind:this={modal} dialogClass="modal-lg">
     <div slot="header" class="modal-header">
         <IconConstrain iconSize={90}>
diff --git a/ts/lib/components/Modal.svelte b/ts/lib/components/Modal.svelte
index 42ff38a93..435dc3ad3 100644
--- a/ts/lib/components/Modal.svelte
+++ b/ts/lib/components/Modal.svelte
@@ -40,6 +40,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         modal.hide();
     }
 
+    export function toggle(): void {
+        modal.toggle();
+    }
+
     export { onOkClicked_ as acceptHandler, onCancelClicked_ as cancelHandler };
 
     const { set: setModalOpen, remove: removeModalClosingHandler } =
diff --git a/ts/lib/components/NotetypeChooser.svelte b/ts/lib/components/NotetypeChooser.svelte
index d35a184cb..65e1b2fb3 100644
--- a/ts/lib/components/NotetypeChooser.svelte
+++ b/ts/lib/components/NotetypeChooser.svelte
@@ -30,4 +30,5 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     {onChange}
     items={notetypes}
     icon={mdiNewspaper}
+    keyCombination="Control+N"
 />

From c7a94713433d542b4a935b1a82a964644b4d57f6 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 14 Aug 2025 09:00:02 +0300
Subject: [PATCH 103/133] Add selector tooltips

---
 ts/lib/components/DeckChooser.svelte     | 1 +
 ts/lib/components/ItemChooser.svelte     | 5 +++--
 ts/lib/components/NotetypeChooser.svelte | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ts/lib/components/DeckChooser.svelte b/ts/lib/components/DeckChooser.svelte
index 543dcfd8e..58880e86e 100644
--- a/ts/lib/components/DeckChooser.svelte
+++ b/ts/lib/components/DeckChooser.svelte
@@ -32,4 +32,5 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     items={decks}
     icon={mdiBookOutline}
     keyCombination="Control+D"
+    tooltip={tr.qtMiscTargetDeckCtrlandd()}
 />
diff --git a/ts/lib/components/ItemChooser.svelte b/ts/lib/components/ItemChooser.svelte
index f0493b4dd..fb12eeba7 100644
--- a/ts/lib/components/ItemChooser.svelte
+++ b/ts/lib/components/ItemChooser.svelte
@@ -18,10 +18,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         items: Item[];
         icon: IconData;
         keyCombination: string;
+        tooltip: string;
         onChange?: (item: Item) => void;
     }
 
-    let { title, onChange, icon, items, selectedItem = $bindable(null), keyCombination }: Props = $props();
+    let { title, onChange, icon, items, selectedItem = $bindable(null), keyCombination, tooltip }: Props = $props();
     let modal: Modal | null = $state(null);
     let searchQuery = $state("");
 
@@ -52,7 +53,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     });
 </script>
 
-<LabelButton on:click={openModal} class="chooser-button">
+<LabelButton {tooltip} on:click={openModal} class="chooser-button">
     {selectedItem?.name ?? "…"}
 </LabelButton>
 
diff --git a/ts/lib/components/NotetypeChooser.svelte b/ts/lib/components/NotetypeChooser.svelte
index 65e1b2fb3..4241145ac 100644
--- a/ts/lib/components/NotetypeChooser.svelte
+++ b/ts/lib/components/NotetypeChooser.svelte
@@ -31,4 +31,5 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     items={notetypes}
     icon={mdiNewspaper}
     keyCombination="Control+N"
+    tooltip={tr.qtMiscChangeNoteTypeCtrlandn()}
 />

From 2e573727edb80e79d2c2b50b720b54acc27986bc Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 14 Aug 2025 09:14:22 +0300
Subject: [PATCH 104/133] Do not show selectors in legacy mode

---
 ts/routes/editor/NoteEditor.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 198568c03..5cab396ad 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -1208,7 +1208,7 @@ components and functionality for general note editing.
     on:dragover={preventDefaultIfNonLegacy}
     on:drop={checkNonLegacy(handlePickerDrop)}
 >
-    {#if mode === "add"}
+    {#if mode === "add" && !isLegacy}
         <EditorChoosers bind:selectedNotetype bind:selectedDeck onNotetypeChange={onNotetypeChange} />
     {/if}
 

From 9d1ecc3ed9acf061b42b918bd8f6e9f4e67346bf Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 14 Aug 2025 09:34:33 +0300
Subject: [PATCH 105/133] Fix lint errors

---
 .eslintrc.cjs                                        |  3 +++
 ts/lib/components/DeckChooser.svelte                 |  2 +-
 ts/lib/components/ItemChooser.svelte                 | 12 ++++++++++--
 ts/lib/components/NotetypeChooser.svelte             |  2 +-
 ts/routes/editor/NoteEditor.svelte                   |  6 +-----
 .../editor/editor-toolbar/EditorChoosers.svelte      |  8 ++++++--
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 52e708c6b..2f7580621 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -41,6 +41,9 @@ module.exports = {
             parser: "svelte-eslint-parser",
             parserOptions: {
                 parser: "@typescript-eslint/parser",
+                svelteFeatures: {
+                    experimentalGenerics: true,
+                },
             },
             rules: {
                 "svelte/no-at-html-tags": "off",
diff --git a/ts/lib/components/DeckChooser.svelte b/ts/lib/components/DeckChooser.svelte
index 58880e86e..d79543ff0 100644
--- a/ts/lib/components/DeckChooser.svelte
+++ b/ts/lib/components/DeckChooser.svelte
@@ -13,7 +13,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         selectedDeck: DeckNameId | null;
         onChange?: (deck: DeckNameId) => void;
     }
-    let {selectedDeck = $bindable(null), onChange}: Props = $props();
+    let { selectedDeck = $bindable(null), onChange }: Props = $props();
     let decks: DeckNameId[] = $state([]);
 
     $effect(() => {
diff --git a/ts/lib/components/ItemChooser.svelte b/ts/lib/components/ItemChooser.svelte
index fb12eeba7..8075f611f 100644
--- a/ts/lib/components/ItemChooser.svelte
+++ b/ts/lib/components/ItemChooser.svelte
@@ -22,7 +22,15 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         onChange?: (item: Item) => void;
     }
 
-    let { title, onChange, icon, items, selectedItem = $bindable(null), keyCombination, tooltip }: Props = $props();
+    let {
+        title,
+        onChange,
+        icon,
+        items,
+        selectedItem = $bindable(null),
+        keyCombination,
+        tooltip,
+    }: Props = $props();
     let modal: Modal | null = $state(null);
     let searchQuery = $state("");
 
@@ -57,7 +65,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     {selectedItem?.name ?? "…"}
 </LabelButton>
 
-<Shortcut keyCombination={keyCombination} on:action={() => modal?.toggle()} />
+<Shortcut {keyCombination} on:action={() => modal?.toggle()} />
 <Modal bind:this={modal} dialogClass="modal-lg">
     <div slot="header" class="modal-header">
         <IconConstrain iconSize={90}>
diff --git a/ts/lib/components/NotetypeChooser.svelte b/ts/lib/components/NotetypeChooser.svelte
index 4241145ac..1feb82c99 100644
--- a/ts/lib/components/NotetypeChooser.svelte
+++ b/ts/lib/components/NotetypeChooser.svelte
@@ -14,7 +14,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         selectedNotetype: NotetypeNameId | null;
         onChange?: (notetype: NotetypeNameId) => void;
     }
-    let {selectedNotetype = $bindable(null), onChange}: Props = $props();
+    let { selectedNotetype = $bindable(null), onChange }: Props = $props();
     let notetypes: NotetypeNameId[] = $state([]);
 
     $effect(() => {
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 5cab396ad..6e0f1b7dd 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -300,14 +300,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export let selectedNotetype: NotetypeNameId | null = null;
     export let selectedDeck: DeckNameId | null = null;
 
-
     function onNotetypeChange(notetype: NotetypeNameId) {
         loadNote(0n, notetype.id, 0, null);
     }
 
-    function onDeckChange(deck: DeckNameId) {
-        selectedDeck = deck;
-    }
     let notetypeMeta: NotetypeIdAndModTime;
     function setNotetypeMeta(notetype: Notetype): void {
         notetypeMeta = { id: notetype.id, modTime: notetype.mtimeSecs };
@@ -1209,7 +1205,7 @@ components and functionality for general note editing.
     on:drop={checkNonLegacy(handlePickerDrop)}
 >
     {#if mode === "add" && !isLegacy}
-        <EditorChoosers bind:selectedNotetype bind:selectedDeck onNotetypeChange={onNotetypeChange} />
+        <EditorChoosers bind:selectedNotetype bind:selectedDeck {onNotetypeChange} />
     {/if}
 
     <EditorToolbar {size} {wrap} api={toolbar}>
diff --git a/ts/routes/editor/editor-toolbar/EditorChoosers.svelte b/ts/routes/editor/editor-toolbar/EditorChoosers.svelte
index ea66956e4..815c1fbdc 100644
--- a/ts/routes/editor/editor-toolbar/EditorChoosers.svelte
+++ b/ts/routes/editor/editor-toolbar/EditorChoosers.svelte
@@ -16,8 +16,12 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         onNotetypeChange?: (notetype: NotetypeNameId) => void;
         onDeckChange?: (deck: DeckNameId) => void;
     }
-    let {selectedNotetype = $bindable(null), selectedDeck = $bindable(null), onNotetypeChange, onDeckChange}: Props = $props();
-
+    let {
+        selectedNotetype = $bindable(null),
+        selectedDeck = $bindable(null),
+        onNotetypeChange,
+        onDeckChange,
+    }: Props = $props();
 </script>
 
 <div class="top-bar">

From 829da5a84af80eb12f56ffbf9aeb64bf1e818060 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sat, 16 Aug 2025 20:39:21 +0300
Subject: [PATCH 106/133] Use defaults_for_adding()

---
 qt/aqt/editor.py                              |  2 +-
 qt/aqt/mediasrv.py                            |  1 +
 ts/lib/components/DeckChooser.svelte          |  6 +++
 ts/lib/components/ItemChooser.svelte          |  5 +++
 ts/lib/components/NotetypeChooser.svelte      |  6 +++
 ts/routes/editor/NoteEditor.svelte            | 41 +++++++++++++++++--
 .../editor-toolbar/EditorChoosers.svelte      | 18 ++++++--
 7 files changed, 72 insertions(+), 7 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index fd11d1b45..08b3dc44d 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -427,7 +427,7 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             gui_hooks.editor_did_load_note(self)
 
         assert self.mw.pm.profile is not None
-        js = f"loadNote({json.dumps(self.nid)}, {mid}, {json.dumps(focus_to)}, {json.dumps(original_note_id)});"
+        js = f"loadNote({json.dumps(self.nid)}, {mid}, {json.dumps(focus_to)}, {json.dumps(original_note_id)}, {json.dumps(self.mw.reviewer.card.id if self.mw.reviewer.card else None)});"
         self.web.evalWithCallback(
             f'require("anki/ui").loaded.then(() => {{ {js} }})', oncallback
         )
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index 4ab3971ad..af9ab60ef 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -973,6 +973,7 @@ exposed_backend_list = [
     "get_note",
     "new_note",
     "note_fields_check",
+    "defaults_for_adding",
     # NotetypesService
     "get_notetype",
     "get_notetype_names",
diff --git a/ts/lib/components/DeckChooser.svelte b/ts/lib/components/DeckChooser.svelte
index d79543ff0..59ca750a4 100644
--- a/ts/lib/components/DeckChooser.svelte
+++ b/ts/lib/components/DeckChooser.svelte
@@ -15,6 +15,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
     let { selectedDeck = $bindable(null), onChange }: Props = $props();
     let decks: DeckNameId[] = $state([]);
+    let itemChooser: ItemChooser<DeckNameId> | null = $state(null);
+
+    export function select(notetypeId: bigint) {
+        itemChooser?.select(notetypeId);
+    }
 
     $effect(() => {
         getDeckNames({ skipEmptyDefault: true, includeFiltered: false }).then(
@@ -26,6 +31,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 </script>
 
 <ItemChooser
+    bind:this={itemChooser}
     title={tr.qtMiscChooseDeck()}
     bind:selectedItem={selectedDeck}
     {onChange}
diff --git a/ts/lib/components/ItemChooser.svelte b/ts/lib/components/ItemChooser.svelte
index 8075f611f..13b4a56c8 100644
--- a/ts/lib/components/ItemChooser.svelte
+++ b/ts/lib/components/ItemChooser.svelte
@@ -53,6 +53,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         modal?.show();
     }
 
+    export function select(itemId: bigint) {
+        const item = items.find((item) => item.id === itemId);
+        selectedItem = item ? item : null;
+    }
+
     $effect(() => {
         if (!selectedItem && items.length > 0) {
             selectedItem = items[0];
diff --git a/ts/lib/components/NotetypeChooser.svelte b/ts/lib/components/NotetypeChooser.svelte
index 1feb82c99..4820bdd92 100644
--- a/ts/lib/components/NotetypeChooser.svelte
+++ b/ts/lib/components/NotetypeChooser.svelte
@@ -16,6 +16,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
     let { selectedNotetype = $bindable(null), onChange }: Props = $props();
     let notetypes: NotetypeNameId[] = $state([]);
+    let itemChooser: ItemChooser<NotetypeNameId> | null = $state(null);
+
+    export function select(notetypeId: bigint) {
+        itemChooser?.select(notetypeId);
+    }
 
     $effect(() => {
         getNotetypeNames({}).then((response) => {
@@ -25,6 +30,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 </script>
 
 <ItemChooser
+    bind:this={itemChooser}
     title={tr.qtMiscChooseNoteType()}
     bind:selectedItem={selectedNotetype}
     {onChange}
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 6e0f1b7dd..a55910a72 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -297,11 +297,16 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         clearCodeMirrorHistory();
     }
 
+    let reviewerCard: Card | null = null;
+
+    export let notetypeChooser: NotetypeChooser;
     export let selectedNotetype: NotetypeNameId | null = null;
+    export let deckChooser: DeckChooser;
     export let selectedDeck: DeckNameId | null = null;
 
     function onNotetypeChange(notetype: NotetypeNameId) {
-        loadNote(0n, notetype.id, 0, null);
+        loadNote(0n, notetype.id, 0, null, null);
+        // TODO default_deck_for_notetype
     }
 
     let notetypeMeta: NotetypeIdAndModTime;
@@ -700,6 +705,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         htmlToTextLine,
         askUser,
         showMessageBox,
+        getCard,
+        defaultsForAdding,
     } from "@generated/backend";
     import { wrapInternal } from "@tslib/wrap";
     import { getProfileConfig, getMeta, setMeta, getColConfig } from "@tslib/profile";
@@ -729,6 +736,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { MessageBoxType } from "@generated/anki/frontend_pb";
     import type Modal from "$lib/components/Modal.svelte";
     import EditorChoosers from "./editor-toolbar/EditorChoosers.svelte";
+    import type { Card } from "@generated/anki/cards_pb";
+    import NotetypeChooser from "$lib/components/NotetypeChooser.svelte";
+    import DeckChooser from "$lib/components/DeckChooser.svelte";
 
     $: isIOImageLoaded = false;
     $: ioImageLoadedStore.set(isIOImageLoaded);
@@ -932,6 +942,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         notetypeId: bigint,
         focusTo: number,
         originalNoteId: bigint | null,
+        reviewerCardId: bigint | null,
     ) {
         const notetype = await getNotetype({
             ntid: notetypeId,
@@ -961,6 +972,17 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             note!.fields = originalNote.fields;
             note!.tags = originalNote.tags;
         }
+        let homeDeckId = 0n;
+        if (reviewerCardId) {
+            reviewerCard = await getCard({ cid: reviewerCardId });
+            homeDeckId = reviewerCard.originalDeckId || reviewerCard.deckId;
+        }
+        const chooserDefaults = await defaultsForAdding({
+            homeDeckOfCurrentReviewCard: homeDeckId,
+        });
+        notetypeChooser.select(chooserDefaults.notetypeId);
+        deckChooser.select(chooserDefaults.deckId);
+
         const fieldValues = (
             await Promise.all(
                 note!.fields.map((field) => encodeIriPaths({ val: field })),
@@ -1040,9 +1062,16 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         notetypeId: bigint,
         focusTo: number,
         originalNoteId: bigint | null,
+        reviewerCardId: bigint | null,
     ) {
         loadDebouncer.schedule(async () => {
-            await loadNoteInner(nid, notetypeId, focusTo, originalNoteId);
+            await loadNoteInner(
+                nid,
+                notetypeId,
+                focusTo,
+                originalNoteId,
+                reviewerCardId,
+            );
         });
     }
 
@@ -1205,7 +1234,13 @@ components and functionality for general note editing.
     on:drop={checkNonLegacy(handlePickerDrop)}
 >
     {#if mode === "add" && !isLegacy}
-        <EditorChoosers bind:selectedNotetype bind:selectedDeck {onNotetypeChange} />
+        <EditorChoosers
+            bind:notetypeChooser
+            bind:deckChooser
+            bind:selectedNotetype
+            bind:selectedDeck
+            {onNotetypeChange}
+        />
     {/if}
 
     <EditorToolbar {size} {wrap} api={toolbar}>
diff --git a/ts/routes/editor/editor-toolbar/EditorChoosers.svelte b/ts/routes/editor/editor-toolbar/EditorChoosers.svelte
index 815c1fbdc..c706990a8 100644
--- a/ts/routes/editor/editor-toolbar/EditorChoosers.svelte
+++ b/ts/routes/editor/editor-toolbar/EditorChoosers.svelte
@@ -12,13 +12,17 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     interface Props {
         selectedNotetype: NotetypeNameId | null;
-        selectedDeck: DeckNameId | null;
+        selectedDeck?: DeckNameId | null;
+        notetypeChooser?: NotetypeChooser;
+        deckChooser?: DeckChooser;
         onNotetypeChange?: (notetype: NotetypeNameId) => void;
         onDeckChange?: (deck: DeckNameId) => void;
     }
     let {
         selectedNotetype = $bindable(null),
         selectedDeck = $bindable(null),
+        notetypeChooser = $bindable(),
+        deckChooser = $bindable(),
         onNotetypeChange,
         onDeckChange,
     }: Props = $props();
@@ -27,11 +31,19 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 <div class="top-bar">
     <p>{tr.notetypesType()}</p>
     <div class="notetype-chooser">
-        <NotetypeChooser bind:selectedNotetype onChange={onNotetypeChange} />
+        <NotetypeChooser
+            bind:this={notetypeChooser}
+            bind:selectedNotetype
+            onChange={onNotetypeChange}
+        />
     </div>
     <p>{tr.decksDeck()}</p>
     <div class="deck-chooser">
-        <DeckChooser bind:selectedDeck onChange={onDeckChange} />
+        <DeckChooser
+            bind:this={deckChooser}
+            bind:selectedDeck
+            onChange={onDeckChange}
+        />
     </div>
 </div>
 

From 18d3400cbbe30b8754cd43f9ef9123d57303e070 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sat, 16 Aug 2025 20:46:56 +0300
Subject: [PATCH 107/133] Add missing loadNewNote arg

---
 ts/routes/editor/NoteEditor.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index a55910a72..1359a2ce4 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -512,7 +512,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 
     async function loadNewNote() {
-        await loadNote(0n, notetypeMeta.id, 0, null);
+        await loadNote(0n, notetypeMeta.id, 0, null, null);
     }
 
     async function noteCanBeAdded(): Promise<boolean> {

From b4f14cf29bf74cdffd468e1892f017d3a1dd5951 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sat, 16 Aug 2025 20:47:56 +0300
Subject: [PATCH 108/133] Use default_deck_for_notetype()

---
 ts/routes/editor/NoteEditor.svelte | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 1359a2ce4..645325957 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -304,9 +304,16 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export let deckChooser: DeckChooser;
     export let selectedDeck: DeckNameId | null = null;
 
-    function onNotetypeChange(notetype: NotetypeNameId) {
+    async function onNotetypeChange(notetype: NotetypeNameId) {
         loadNote(0n, notetype.id, 0, null, null);
-        // TODO default_deck_for_notetype
+        if (
+            !(await getConfigBool({
+                key: ConfigKey_Bool.ADDING_DEFAULTS_TO_CURRENT_DECK,
+            }))
+        ) {
+            const deckId = await defaultDeckForNotetype({ ntid: notetype.id });
+            deckChooser.select(deckId.did);
+        }
     }
 
     let notetypeMeta: NotetypeIdAndModTime;
@@ -707,6 +714,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         showMessageBox,
         getCard,
         defaultsForAdding,
+        getConfigBool,
+        defaultDeckForNotetype,
     } from "@generated/backend";
     import { wrapInternal } from "@tslib/wrap";
     import { getProfileConfig, getMeta, setMeta, getColConfig } from "@tslib/profile";
@@ -739,6 +748,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type { Card } from "@generated/anki/cards_pb";
     import NotetypeChooser from "$lib/components/NotetypeChooser.svelte";
     import DeckChooser from "$lib/components/DeckChooser.svelte";
+    import { ConfigKey_Bool } from "@generated/anki/config_pb";
 
     $: isIOImageLoaded = false;
     $: ioImageLoadedStore.set(isIOImageLoaded);

From c1a44ce867dd284b5e2741ec4b706eefda484953 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 27 Aug 2025 02:00:37 +0300
Subject: [PATCH 109/133] Remove legacy addcards selectors from new screen

---
 qt/aqt/addcards.py | 100 +++------------------------------------------
 1 file changed, 5 insertions(+), 95 deletions(-)

diff --git a/qt/aqt/addcards.py b/qt/aqt/addcards.py
index 339a7e844..629f81679 100644
--- a/qt/aqt/addcards.py
+++ b/qt/aqt/addcards.py
@@ -5,16 +5,11 @@ from __future__ import annotations
 
 from collections.abc import Callable
 
-from anki._legacy import deprecated
-from anki.collection import OpChanges
 from anki.decks import DeckId
-from anki.models import NotetypeId
 from anki.notes import Note
 from anki.utils import is_mac
 from aqt import AnkiQt, gui_hooks
 from aqt.addcards_legacy import *
-from aqt.deckchooser import DeckChooser
-from aqt.notetypechooser import NotetypeChooser
 from aqt.qt import *
 from aqt.utils import (
     HelpPage,
@@ -40,31 +35,19 @@ class NewAddCards(QMainWindow):
         self.setWindowTitle(tr.actions_add())
         self.setMinimumHeight(300)
         self.setMinimumWidth(400)
-        self.setup_choosers()
         self.setupEditor()
         add_close_shortcut(self)
         self._load_new_note()
-        gui_hooks.operation_did_execute.append(self.on_operation_did_execute)
         restoreGeom(self, "add")
         gui_hooks.add_cards_did_init(self)
         if not is_mac:
             self.setMenuBar(None)
         self.show()
 
-    def set_deck(self, deck_id: DeckId) -> None:
-        self.deck_chooser.selected_deck_id = deck_id
-
-    def set_note_type(self, note_type_id: NotetypeId) -> None:
-        self.notetype_chooser.selected_notetype_id = note_type_id
-
     def set_note(self, note: Note, deck_id: DeckId | None = None) -> None:
         """Set tags, field contents and notetype according to `note`. Deck is set
         to `deck_id` or the deck last used with the notetype.
         """
-        self.notetype_chooser.selected_notetype_id = note.mid
-        if deck_id or (deck_id := self.col.default_deck_for_notetype(note.mid)):
-            self.deck_chooser.selected_deck_id = deck_id
-
         self.editor.load_note(
             mid=note.mid,
             original_note_id=note.id,
@@ -79,70 +62,18 @@ class NewAddCards(QMainWindow):
             editor_mode=aqt.editor.EditorMode.ADD_CARDS,
         )
 
-    def setup_choosers(self) -> None:
-        defaults = self.col.defaults_for_adding(
-            current_review_card=self.mw.reviewer.card
-        )
-
-        self.notetype_chooser = NotetypeChooser(
-            mw=self.mw,
-            widget=self.form.modelArea,
-            starting_notetype_id=NotetypeId(defaults.notetype_id),
-            on_button_activated=self.show_notetype_selector,
-            on_notetype_changed=self.on_notetype_change,
-        )
-        self.deck_chooser = DeckChooser(
-            self.mw,
-            self.form.deckArea,
-            starting_deck_id=DeckId(defaults.deck_id),
-            on_deck_changed=self.on_deck_changed,
-        )
-
     def reopen(self, mw: AnkiQt) -> None:
-        defaults = self.col.defaults_for_adding(
-            current_review_card=self.mw.reviewer.card
-        )
-        self.set_note_type(NotetypeId(defaults.notetype_id))
-        self.set_deck(DeckId(defaults.deck_id))
+        self.editor.reload_note()
 
     def helpRequested(self) -> None:
         openHelp(HelpPage.ADDING_CARD_AND_NOTE)
 
-    def show_notetype_selector(self) -> None:
-        self.editor.call_after_note_saved(self.notetype_chooser.choose_notetype)
-
-    def on_deck_changed(self, deck_id: int) -> None:
-        gui_hooks.add_cards_did_change_deck(deck_id)
-
-    def on_notetype_change(
-        self, notetype_id: NotetypeId, update_deck: bool = True
-    ) -> None:
-        # need to adjust current deck?
-        if update_deck:
-            if deck_id := self.col.default_deck_for_notetype(notetype_id):
-                self.deck_chooser.selected_deck_id = deck_id
-
-        if notetype_id:
-            self.editor.set_nid(None, mid=notetype_id, focus_to=0)
-
-    def _load_new_note(self, sticky_fields_from: Note | None = None) -> None:
-        self.editor.set_nid(
-            None, mid=self.notetype_chooser.selected_notetype_id, focus_to=0
+    def _load_new_note(self) -> None:
+        self.editor.load_note(
+            mid=self.mw.col.models.current()["id"],
+            focus_to=0,
         )
 
-    def on_operation_did_execute(
-        self, changes: OpChanges, handler: object | None
-    ) -> None:
-        if (changes.notetype or changes.deck) and handler is not self.editor:
-            self.on_notetype_change(
-                NotetypeId(
-                    self.col.defaults_for_adding(
-                        current_review_card=self.mw.reviewer.card
-                    ).notetype_id
-                ),
-                update_deck=False,
-            )
-
     def keyPressEvent(self, evt: QKeyEvent) -> None:
         if evt.key() == Qt.Key.Key_Escape:
             self.close()
@@ -158,9 +89,6 @@ class NewAddCards(QMainWindow):
 
     def _close(self) -> None:
         self.editor.cleanup()
-        self.notetype_chooser.cleanup()
-        self.deck_chooser.cleanup()
-        gui_hooks.operation_did_execute.remove(self.on_operation_did_execute)
         self.mw.maybeReset()
         saveGeom(self, "add")
         aqt.dialogs.markClosed("NewAddCards")
@@ -196,21 +124,3 @@ class NewAddCards(QMainWindow):
             cb()
 
         self.ifCanClose(doClose)
-
-    # legacy aliases
-
-    @property
-    def deckChooser(self) -> DeckChooser:
-        if getattr(self, "form", None):
-            # show this warning only after Qt form has been initialized,
-            # or PyQt's introspection triggers it
-            print("deckChooser is deprecated; use deck_chooser instead")
-        return self.deck_chooser
-
-    @deprecated(info="obsolete")
-    def addNote(self, note: Note) -> None:
-        pass
-
-    @deprecated(info="does nothing; will go away")
-    def removeTempNote(self, note: Note) -> None:
-        pass

From ba881d4e90bf461beca608a23dd434857d5bf2a2 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 27 Aug 2025 02:01:10 +0300
Subject: [PATCH 110/133] Fix selected notetype/deck reverting back to defaults

---
 qt/aqt/editor.py                   |  2 +-
 ts/routes/editor/NoteEditor.svelte | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 08b3dc44d..3cc171b91 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -427,7 +427,7 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             gui_hooks.editor_did_load_note(self)
 
         assert self.mw.pm.profile is not None
-        js = f"loadNote({json.dumps(self.nid)}, {mid}, {json.dumps(focus_to)}, {json.dumps(original_note_id)}, {json.dumps(self.mw.reviewer.card.id if self.mw.reviewer.card else None)});"
+        js = f"loadNote({json.dumps(self.nid)}, {mid}, {json.dumps(focus_to)}, {json.dumps(original_note_id)}, {json.dumps(self.mw.reviewer.card.id if self.mw.reviewer.card else None)}, true);"
         self.web.evalWithCallback(
             f'require("anki/ui").loaded.then(() => {{ {js} }})', oncallback
         )
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 645325957..e8ed2ad47 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -305,7 +305,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export let selectedDeck: DeckNameId | null = null;
 
     async function onNotetypeChange(notetype: NotetypeNameId) {
-        loadNote(0n, notetype.id, 0, null, null);
+        loadNote(0n, notetype.id, 0, null, reviewerCard?.id ?? null);
         if (
             !(await getConfigBool({
                 key: ConfigKey_Bool.ADDING_DEFAULTS_TO_CURRENT_DECK,
@@ -519,7 +519,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 
     async function loadNewNote() {
-        await loadNote(0n, notetypeMeta.id, 0, null, null);
+        await loadNote(0n, notetypeMeta.id, 0, null, reviewerCard?.id ?? null);
     }
 
     async function noteCanBeAdded(): Promise<boolean> {
@@ -953,6 +953,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         focusTo: number,
         originalNoteId: bigint | null,
         reviewerCardId: bigint | null,
+        initial: boolean = false,
     ) {
         const notetype = await getNotetype({
             ntid: notetypeId,
@@ -987,11 +988,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             reviewerCard = await getCard({ cid: reviewerCardId });
             homeDeckId = reviewerCard.originalDeckId || reviewerCard.deckId;
         }
-        const chooserDefaults = await defaultsForAdding({
-            homeDeckOfCurrentReviewCard: homeDeckId,
-        });
-        notetypeChooser.select(chooserDefaults.notetypeId);
-        deckChooser.select(chooserDefaults.deckId);
+        if (initial) {
+            const chooserDefaults = await defaultsForAdding({
+                homeDeckOfCurrentReviewCard: homeDeckId,
+            });
+            notetypeChooser.select(chooserDefaults.notetypeId);
+            deckChooser.select(chooserDefaults.deckId);
+        }
 
         const fieldValues = (
             await Promise.all(
@@ -1073,6 +1076,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         focusTo: number,
         originalNoteId: bigint | null,
         reviewerCardId: bigint | null,
+        initial: boolean = false,
     ) {
         loadDebouncer.schedule(async () => {
             await loadNoteInner(
@@ -1081,12 +1085,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                 focusTo,
                 originalNoteId,
                 reviewerCardId,
+                initial,
             );
         });
     }
 
     async function reloadNote() {
-        await loadNote(note!.id, notetypeMeta.id, 0, null);
+        await loadNote(note!.id, notetypeMeta.id, 0, null, reviewerCard?.id ?? null);
     }
 
     function checkNonLegacy(value: any): any | undefined {

From efe76a24dc150ae8b708fa5fc3c2727262d4f726 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 27 Aug 2025 02:08:27 +0300
Subject: [PATCH 111/133] Only reload note on reopen if empty

---
 qt/aqt/addcards.py                 | 2 +-
 qt/aqt/editor.py                   | 3 +++
 ts/routes/editor/NoteEditor.svelte | 8 ++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/qt/aqt/addcards.py b/qt/aqt/addcards.py
index 629f81679..53f1cdd12 100644
--- a/qt/aqt/addcards.py
+++ b/qt/aqt/addcards.py
@@ -63,7 +63,7 @@ class NewAddCards(QMainWindow):
         )
 
     def reopen(self, mw: AnkiQt) -> None:
-        self.editor.reload_note()
+        self.editor.reload_note_if_empty()
 
     def helpRequested(self) -> None:
         openHelp(HelpPage.ADDING_CARD_AND_NOTE)
diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 3cc171b91..9db3fed36 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -435,6 +435,9 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
     def reload_note(self) -> None:
         self.web.eval("reloadNote();")
 
+    def reload_note_if_empty(self) -> None:
+        self.web.eval("reloadNoteIfEmpty();")
+
     def call_after_note_saved(
         self, callback: Callable, keepFocus: bool = False
     ) -> None:
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index e8ed2ad47..0b1885dc5 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -1094,6 +1094,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         await loadNote(note!.id, notetypeMeta.id, 0, null, reviewerCard?.id ?? null);
     }
 
+    async function reloadNoteIfEmpty() {
+        const isEmpty = (await noteFieldsCheck(note!)).state == NoteFieldsCheckResponse_State.EMPTY;
+        if (isEmpty) {
+            await loadNote(note!.id, notetypeMeta.id, 0, null, reviewerCard?.id ?? null, true);
+        }
+    }
+
     function checkNonLegacy(value: any): any | undefined {
         if (isLegacy) {
             return value;
@@ -1139,6 +1146,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         Object.assign(globalThis, {
             loadNote,
             reloadNote,
+            reloadNoteIfEmpty,
             saveSession,
             setFields,
             setCollapsed,

From 800144dc67c62cccf0121595fdb9dfc051da35bc Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 27 Aug 2025 02:26:13 +0300
Subject: [PATCH 112/133] Do not fire initial onChange

This causes the note type to revert back to the first item after initial
note load
---
 ts/lib/components/ItemChooser.svelte | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ts/lib/components/ItemChooser.svelte b/ts/lib/components/ItemChooser.svelte
index 13b4a56c8..7d0babd4a 100644
--- a/ts/lib/components/ItemChooser.svelte
+++ b/ts/lib/components/ItemChooser.svelte
@@ -61,7 +61,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     $effect(() => {
         if (!selectedItem && items.length > 0) {
             selectedItem = items[0];
-            onChange?.(selectedItem);
         }
     });
 </script>

From 8b144ca2380aea38c7b33617b67a50ea40b1a8df Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 27 Aug 2025 02:32:42 +0300
Subject: [PATCH 113/133] Fix default_deck_for_notetype handling

---
 qt/aqt/mediasrv.py                 | 1 +
 ts/routes/editor/NoteEditor.svelte | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index af9ab60ef..c26651b85 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -974,6 +974,7 @@ exposed_backend_list = [
     "new_note",
     "note_fields_check",
     "defaults_for_adding",
+    "default_deck_for_notetype",
     # NotetypesService
     "get_notetype",
     "get_notetype_names",
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 0b1885dc5..df67ca852 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -309,7 +309,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         if (
             !(await getConfigBool({
                 key: ConfigKey_Bool.ADDING_DEFAULTS_TO_CURRENT_DECK,
-            }))
+            })).val
         ) {
             const deckId = await defaultDeckForNotetype({ ntid: notetype.id });
             deckChooser.select(deckId.did);

From 466306a0f6a3af08a3b2bab208df66a7317a2257 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 27 Aug 2025 02:33:37 +0300
Subject: [PATCH 114/133] Move defaultsForAdding handling to start of loadNote

---
 ts/routes/editor/NoteEditor.svelte | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index df67ca852..629d0f463 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -955,6 +955,20 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         reviewerCardId: bigint | null,
         initial: boolean = false,
     ) {
+        let homeDeckId = 0n;
+        if (reviewerCardId) {
+            reviewerCard = await getCard({ cid: reviewerCardId });
+            homeDeckId = reviewerCard.originalDeckId || reviewerCard.deckId;
+        }
+        if (initial) {
+            const chooserDefaults = await defaultsForAdding({
+                homeDeckOfCurrentReviewCard: homeDeckId,
+            });
+            notetypeChooser.select(chooserDefaults.notetypeId);
+            deckChooser.select(chooserDefaults.deckId);
+            notetypeId = chooserDefaults.notetypeId;
+        }
+
         const notetype = await getNotetype({
             ntid: notetypeId,
         });
@@ -983,18 +997,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             note!.fields = originalNote.fields;
             note!.tags = originalNote.tags;
         }
-        let homeDeckId = 0n;
-        if (reviewerCardId) {
-            reviewerCard = await getCard({ cid: reviewerCardId });
-            homeDeckId = reviewerCard.originalDeckId || reviewerCard.deckId;
-        }
-        if (initial) {
-            const chooserDefaults = await defaultsForAdding({
-                homeDeckOfCurrentReviewCard: homeDeckId,
-            });
-            notetypeChooser.select(chooserDefaults.notetypeId);
-            deckChooser.select(chooserDefaults.deckId);
-        }
 
         const fieldValues = (
             await Promise.all(

From f57c41bf3c09f351b82ee9867acd6ed63df54f8c Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 27 Aug 2025 02:36:39 +0300
Subject: [PATCH 115/133] Clear lastAddedNote on notetype change

---
 ts/routes/editor/NoteEditor.svelte | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 629d0f463..0a1c6d654 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -314,6 +314,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             const deckId = await defaultDeckForNotetype({ ntid: notetype.id });
             deckChooser.select(deckId.did);
         }
+        lastAddedNote = null;
     }
 
     let notetypeMeta: NotetypeIdAndModTime;

From 6b5729ce18f4207fc54761852d0a7a0108dade40 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 27 Aug 2025 03:05:49 +0300
Subject: [PATCH 116/133] Implement field copying on notetype change

---
 ts/routes/editor/NoteEditor.svelte | 50 ++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 0a1c6d654..4796a8959 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -955,6 +955,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         originalNoteId: bigint | null,
         reviewerCardId: bigint | null,
         initial: boolean = false,
+        copyFromNote: Note | null = null,
     ) {
         let homeDeckId = 0n;
         if (reviewerCardId) {
@@ -999,6 +1000,53 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             note!.tags = originalNote.tags;
         }
 
+        if (copyFromNote) {
+            const oldFieldNames = (
+                await getFieldNames({
+                    ntid: copyFromNote.notetypeId,
+                })
+            ).vals;
+            const newFieldNames = fieldNames;
+            const copiedFieldNames = new Set<string>();
+
+            // Copy identical non-empty fields by name
+            for (const fieldName of newFieldNames) {
+                const oldFieldIndex = oldFieldNames.indexOf(fieldName);
+                const newFieldIndex = newFieldNames.indexOf(fieldName);
+                if (oldFieldIndex >= 0 && copyFromNote.fields[oldFieldIndex]) {
+                    note!.fields[newFieldIndex] = copyFromNote.fields[oldFieldIndex];
+                    copiedFieldNames.add(fieldName);
+                }
+            }
+
+            // Copy remaining non-empty fields by position
+            let newIdx = 0;
+            for (let oldIdx = 0; oldIdx < oldFieldNames.length; oldIdx++) {
+                const oldFieldName = oldFieldNames[oldIdx];
+
+                // Skip previously copied identical fields in new note
+                while (
+                    newIdx < newFieldNames.length &&
+                    copiedFieldNames.has(newFieldNames[newIdx])
+                ) {
+                    newIdx++;
+                }
+                if (newIdx >= newFieldNames.length) {
+                    break;
+                }
+
+                // Copy non-empty old fields
+                if (
+                    !copiedFieldNames.has(oldFieldName) &&
+                    copyFromNote.fields[oldIdx]
+                ) {
+                    note!.fields[newIdx] = copyFromNote.fields[oldIdx];
+                    newIdx++;
+                }
+            }
+            note!.tags = copyFromNote.tags;
+        }
+
         const fieldValues = (
             await Promise.all(
                 note!.fields.map((field) => encodeIriPaths({ val: field })),
@@ -1080,6 +1128,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         originalNoteId: bigint | null,
         reviewerCardId: bigint | null,
         initial: boolean = false,
+        copyFromNote: Note | null = null,
     ) {
         loadDebouncer.schedule(async () => {
             await loadNoteInner(
@@ -1089,6 +1138,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                 originalNoteId,
                 reviewerCardId,
                 initial,
+                copyFromNote,
             );
         });
     }

From 2ff2ad6bcae8e32d276e08d8f89e683f2d16c4af Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 27 Aug 2025 03:06:01 +0300
Subject: [PATCH 117/133] Formatting

---
 ts/routes/editor/NoteEditor.svelte | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 4796a8959..a2b5e27f5 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -305,11 +305,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export let selectedDeck: DeckNameId | null = null;
 
     async function onNotetypeChange(notetype: NotetypeNameId) {
-        loadNote(0n, notetype.id, 0, null, reviewerCard?.id ?? null);
+        loadNote(0n, notetype.id, 0, null, reviewerCard?.id ?? null, false, note);
         if (
-            !(await getConfigBool({
-                key: ConfigKey_Bool.ADDING_DEFAULTS_TO_CURRENT_DECK,
-            })).val
+            !(
+                await getConfigBool({
+                    key: ConfigKey_Bool.ADDING_DEFAULTS_TO_CURRENT_DECK,
+                })
+            ).val
         ) {
             const deckId = await defaultDeckForNotetype({ ntid: notetype.id });
             deckChooser.select(deckId.did);
@@ -1148,9 +1150,17 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 
     async function reloadNoteIfEmpty() {
-        const isEmpty = (await noteFieldsCheck(note!)).state == NoteFieldsCheckResponse_State.EMPTY;
+        const isEmpty =
+            (await noteFieldsCheck(note!)).state == NoteFieldsCheckResponse_State.EMPTY;
         if (isEmpty) {
-            await loadNote(note!.id, notetypeMeta.id, 0, null, reviewerCard?.id ?? null, true);
+            await loadNote(
+                note!.id,
+                notetypeMeta.id,
+                0,
+                null,
+                reviewerCard?.id ?? null,
+                true,
+            );
         }
     }
 

From becac3f76406bed3e93adc389cd5c1cf2a6b9780 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 27 Aug 2025 03:30:19 +0300
Subject: [PATCH 118/133] Simplify loadNote() arg passing

---
 qt/aqt/editor.py                   | 10 +++-
 ts/routes/editor/NoteEditor.svelte | 75 +++++++++++++++---------------
 2 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 9db3fed36..8b74f6301 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -427,7 +427,15 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             gui_hooks.editor_did_load_note(self)
 
         assert self.mw.pm.profile is not None
-        js = f"loadNote({json.dumps(self.nid)}, {mid}, {json.dumps(focus_to)}, {json.dumps(original_note_id)}, {json.dumps(self.mw.reviewer.card.id if self.mw.reviewer.card else None)}, true);"
+        load_args = dict(
+            nid=self.nid,
+            mid=mid,
+            focusTo=focus_to,
+            originalNoteId=original_note_id,
+            reviewerCardId=self.mw.reviewer.card.id if self.mw.reviewer.card else None,
+            initial=True,
+        )
+        js = f"loadNote({json.dumps(load_args)});"
         self.web.evalWithCallback(
             f'require("anki/ui").loaded.then(() => {{ {js} }})', oncallback
         )
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index a2b5e27f5..9d8657a22 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -28,6 +28,16 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         lastIOImagePath: Writable<string | null>;
     }
 
+    interface LoadNoteArgs {
+        nid: bigint | null;
+        notetypeId: bigint | null;
+        focusTo: number;
+        originalNoteId: bigint | null;
+        reviewerCardId: bigint | null;
+        initial: boolean;
+        copyFromNote: Note | null;
+    }
+
     import { registerPackage } from "@tslib/runtime-require";
     import {
         filenameToLink,
@@ -305,7 +315,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export let selectedDeck: DeckNameId | null = null;
 
     async function onNotetypeChange(notetype: NotetypeNameId) {
-        loadNote(0n, notetype.id, 0, null, reviewerCard?.id ?? null, false, note);
+        loadNote({ notetypeId: notetype.id, copyFromNote: note });
         if (
             !(
                 await getConfigBool({
@@ -319,7 +329,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         lastAddedNote = null;
     }
 
-    let notetypeMeta: NotetypeIdAndModTime;
+    let notetypeMeta: NotetypeIdAndModTime | null = null;
     function setNotetypeMeta(notetype: Notetype): void {
         notetypeMeta = { id: notetype.id, modTime: notetype.mtimeSecs };
         // Discard the saved state of the fields if the notetype has been modified.
@@ -521,10 +531,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         setClozeHint(hint);
     }
 
-    async function loadNewNote() {
-        await loadNote(0n, notetypeMeta.id, 0, null, reviewerCard?.id ?? null);
-    }
-
     async function noteCanBeAdded(): Promise<boolean> {
         let problem: string | null = null;
         const result = await noteFieldsCheck(note!);
@@ -580,7 +586,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         note.id = noteId;
         addNoteToHistory(note!);
         lastAddedNote = note;
-        await loadNewNote();
+        await loadNote();
     }
 
     export async function addCurrentNote(deckId: bigint) {
@@ -622,7 +628,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export function getNoteInfo() {
         return {
             id: note.id.toString() ?? null,
-            mid: notetypeMeta.id.toString(),
+            mid: notetypeMeta!.id.toString(),
             fields: note.fields ?? [],
         };
     }
@@ -837,7 +843,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             mode: {
                 kind: "add",
                 imagePath: imagePath,
-                notetypeId: notetypeMeta.id,
+                notetypeId: notetypeMeta!.id,
             },
         });
     }
@@ -950,15 +956,15 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         });
     }
 
-    async function loadNoteInner(
-        nid: bigint | null,
-        notetypeId: bigint,
-        focusTo: number,
-        originalNoteId: bigint | null,
-        reviewerCardId: bigint | null,
-        initial: boolean = false,
-        copyFromNote: Note | null = null,
-    ) {
+    async function loadNoteInner({
+        nid,
+        notetypeId,
+        focusTo,
+        originalNoteId,
+        reviewerCardId,
+        initial,
+        copyFromNote,
+    }: LoadNoteArgs) {
         let homeDeckId = 0n;
         if (reviewerCardId) {
             reviewerCard = await getCard({ cid: reviewerCardId });
@@ -1123,17 +1129,17 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         triggerChanges();
     }
 
-    async function loadNote(
-        nid: bigint | null,
-        notetypeId: bigint,
-        focusTo: number,
-        originalNoteId: bigint | null,
-        reviewerCardId: bigint | null,
-        initial: boolean = false,
-        copyFromNote: Note | null = null,
-    ) {
+    async function loadNote({
+        nid = note?.id,
+        notetypeId = notetypeMeta?.id,
+        focusTo = 0,
+        originalNoteId = null,
+        reviewerCardId = reviewerCard ? reviewerCard.id : null,
+        initial = false,
+        copyFromNote = null,
+    }: Partial<LoadNoteArgs> = {}) {
         loadDebouncer.schedule(async () => {
-            await loadNoteInner(
+            await loadNoteInner({
                 nid,
                 notetypeId,
                 focusTo,
@@ -1141,26 +1147,19 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                 reviewerCardId,
                 initial,
                 copyFromNote,
-            );
+            });
         });
     }
 
     async function reloadNote() {
-        await loadNote(note!.id, notetypeMeta.id, 0, null, reviewerCard?.id ?? null);
+        await loadNote();
     }
 
     async function reloadNoteIfEmpty() {
         const isEmpty =
             (await noteFieldsCheck(note!)).state == NoteFieldsCheckResponse_State.EMPTY;
         if (isEmpty) {
-            await loadNote(
-                note!.id,
-                notetypeMeta.id,
-                0,
-                null,
-                reviewerCard?.id ?? null,
-                true,
-            );
+            await loadNote({ initial: true });
         }
     }
 

From 60f7df721002a8a6e5e5942533a34c11002dae6e Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 27 Aug 2025 03:39:20 +0300
Subject: [PATCH 119/133] Fix wrong arg name

---
 qt/aqt/editor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index 8b74f6301..e8807b01e 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -429,7 +429,7 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
         assert self.mw.pm.profile is not None
         load_args = dict(
             nid=self.nid,
-            mid=mid,
+            notetypeId=mid,
             focusTo=focus_to,
             originalNoteId=original_note_id,
             reviewerCardId=self.mw.reviewer.card.id if self.mw.reviewer.card else None,

From 603b12967cdc87c357484fb9bd2f9213fdc5a20c Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 27 Aug 2025 03:53:04 +0300
Subject: [PATCH 120/133] Alow passing deck/notetype ID on AddCards init

---
 qt/aqt/addcards.py                 | 25 +++++++++++++++++++------
 qt/aqt/browser/browser.py          | 10 ++++------
 qt/aqt/editor.py                   | 13 ++++++++++---
 ts/routes/editor/NoteEditor.svelte | 23 ++++++++++++++++-------
 4 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/qt/aqt/addcards.py b/qt/aqt/addcards.py
index 53f1cdd12..12bdf3d12 100644
--- a/qt/aqt/addcards.py
+++ b/qt/aqt/addcards.py
@@ -23,7 +23,12 @@ from aqt.utils import (
 
 
 class NewAddCards(QMainWindow):
-    def __init__(self, mw: AnkiQt) -> None:
+    def __init__(
+        self,
+        mw: AnkiQt,
+        deck_id: DeckId | None = None,
+        notetype_id: NotetypeId | None = None,
+    ) -> None:
         super().__init__(None, Qt.WindowType.Window)
         self._close_event_has_cleaned_up = False
         self._close_callback: Callable[[], None] = self._close
@@ -37,7 +42,7 @@ class NewAddCards(QMainWindow):
         self.setMinimumWidth(400)
         self.setupEditor()
         add_close_shortcut(self)
-        self._load_new_note()
+        self._load_new_note(deck_id, notetype_id)
         restoreGeom(self, "add")
         gui_hooks.add_cards_did_init(self)
         if not is_mac:
@@ -62,15 +67,23 @@ class NewAddCards(QMainWindow):
             editor_mode=aqt.editor.EditorMode.ADD_CARDS,
         )
 
-    def reopen(self, mw: AnkiQt) -> None:
-        self.editor.reload_note_if_empty()
+    def reopen(
+        self,
+        mw: AnkiQt,
+        deck_id: DeckId | None = None,
+        notetype_id: NotetypeId | None = None,
+    ) -> None:
+        self.editor.reload_note_if_empty(deck_id, notetype_id)
 
     def helpRequested(self) -> None:
         openHelp(HelpPage.ADDING_CARD_AND_NOTE)
 
-    def _load_new_note(self) -> None:
+    def _load_new_note(
+        self, deck_id: DeckId | None = None, notetype_id: NotetypeId | None = None
+    ) -> None:
         self.editor.load_note(
-            mid=self.mw.col.models.current()["id"],
+            mid=notetype_id,
+            deck_id=deck_id,
             focus_to=0,
         )
 
diff --git a/qt/aqt/browser/browser.py b/qt/aqt/browser/browser.py
index 8e582f4e2..e62089836 100644
--- a/qt/aqt/browser/browser.py
+++ b/qt/aqt/browser/browser.py
@@ -8,7 +8,7 @@ import json
 import math
 import re
 from collections.abc import Callable, Sequence
-from typing import Any, cast
+from typing import Any
 
 from markdown import markdown
 
@@ -79,7 +79,6 @@ from aqt.utils import (
     tr,
 )
 
-from ..addcards import NewAddCards as AddCards
 from ..changenotetype import change_notetype_dialog
 from .card_info import BrowserCardInfo
 from .find_and_replace import FindAndReplaceDialog
@@ -269,11 +268,10 @@ class Browser(QMainWindow):
         return None
 
     def add_card(self, deck_id: DeckId):
-        add_cards = cast(AddCards, aqt.dialogs.open("NewAddCards", self.mw))
-        add_cards.set_deck(deck_id)
-
+        args = [self.mw, deck_id]
         if note_type_id := self.get_active_note_type_id():
-            add_cards.set_note_type(note_type_id)
+            args.append(note_type_id)
+        aqt.dialogs.open("NewAddCards", *args)
 
     # If in the Browser we open Preview and press Ctrl+W there,
     # both Preview and Browser windows get closed by Qt out of the box.
diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index e8807b01e..d6e0562e4 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -14,6 +14,7 @@ from random import randrange
 from typing import Any
 
 from anki.cards import Card
+from anki.decks import DeckId
 from anki.hooks import runFilter
 from anki.models import NotetypeId
 from anki.notes import Note, NoteId
@@ -411,7 +412,8 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
     @on_editor_ready
     def load_note(
         self,
-        mid: int,
+        mid: int | None = None,
+        deck_id: DeckId | None = None,
         original_note_id: NoteId | None = None,
         focus_to: int | None = None,
     ) -> None:
@@ -433,6 +435,7 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
             focusTo=focus_to,
             originalNoteId=original_note_id,
             reviewerCardId=self.mw.reviewer.card.id if self.mw.reviewer.card else None,
+            deckId=deck_id,
             initial=True,
         )
         js = f"loadNote({json.dumps(load_args)});"
@@ -443,8 +446,12 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
     def reload_note(self) -> None:
         self.web.eval("reloadNote();")
 
-    def reload_note_if_empty(self) -> None:
-        self.web.eval("reloadNoteIfEmpty();")
+    def reload_note_if_empty(
+        self, deck_id: DeckId | None = None, notetype_id: NotetypeId | None = None
+    ) -> None:
+        self.web.eval(
+            f"reloadNoteIfEmpty({json.dumps(deck_id)}, {json.dumps(notetype_id)});"
+        )
 
     def call_after_note_saved(
         self, callback: Callable, keepFocus: bool = False
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 9d8657a22..62c7f651e 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -31,6 +31,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     interface LoadNoteArgs {
         nid: bigint | null;
         notetypeId: bigint | null;
+        deckId: bigint | null;
         focusTo: number;
         originalNoteId: bigint | null;
         reviewerCardId: bigint | null;
@@ -959,6 +960,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     async function loadNoteInner({
         nid,
         notetypeId,
+        deckId,
         focusTo,
         originalNoteId,
         reviewerCardId,
@@ -970,13 +972,18 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             reviewerCard = await getCard({ cid: reviewerCardId });
             homeDeckId = reviewerCard.originalDeckId || reviewerCard.deckId;
         }
-        if (initial) {
+        if (initial && mode === "add") {
             const chooserDefaults = await defaultsForAdding({
                 homeDeckOfCurrentReviewCard: homeDeckId,
             });
-            notetypeChooser.select(chooserDefaults.notetypeId);
-            deckChooser.select(chooserDefaults.deckId);
-            notetypeId = chooserDefaults.notetypeId;
+            if (!deckId) {
+                deckId = chooserDefaults.deckId;
+            }
+            if (!notetypeId) {
+                notetypeId = chooserDefaults.notetypeId;
+            }
+            deckChooser.select(deckId);
+            notetypeChooser.select(notetypeId);
         }
 
         const notetype = await getNotetype({
@@ -1131,7 +1138,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     async function loadNote({
         nid = note?.id,
-        notetypeId = notetypeMeta?.id,
+        notetypeId = notetypeMeta ? notetypeMeta.id : null,
+        deckId = null,
         focusTo = 0,
         originalNoteId = null,
         reviewerCardId = reviewerCard ? reviewerCard.id : null,
@@ -1142,6 +1150,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             await loadNoteInner({
                 nid,
                 notetypeId,
+                deckId,
                 focusTo,
                 originalNoteId,
                 reviewerCardId,
@@ -1155,11 +1164,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         await loadNote();
     }
 
-    async function reloadNoteIfEmpty() {
+    async function reloadNoteIfEmpty(deckId: bigint | null, notetypeId: bigint | null) {
         const isEmpty =
             (await noteFieldsCheck(note!)).state == NoteFieldsCheckResponse_State.EMPTY;
         if (isEmpty) {
-            await loadNote({ initial: true });
+            await loadNote({ initial: true, deckId, notetypeId });
         }
     }
 

From 6ea64bcac51345d6a72763e7071ce60ce7549c1c Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 27 Aug 2025 03:55:21 +0300
Subject: [PATCH 121/133] Fix TS errors

---
 ts/routes/editor/NoteEditor.svelte | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 62c7f651e..8bc571ca1 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -159,7 +159,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     let fieldsCollapsed: boolean[] = [];
     export function setCollapsed(defaultCollapsed: boolean[]): void {
         fieldsCollapsed =
-            sessionOptions[notetypeMeta?.id?.toString()]?.fieldsCollapsed ??
+            sessionOptions[notetypeMeta!.id?.toString()]?.fieldsCollapsed ??
             defaultCollapsed;
     }
     let clozeFields: boolean[] = [];
@@ -172,7 +172,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     let plainTextDefaults: boolean[] = [];
 
     export function setPlainTexts(defaultPlainTexts: boolean[]): void {
-        const states = sessionOptions[notetypeMeta?.id?.toString()]?.fieldStates;
+        const states = sessionOptions[notetypeMeta!.id?.toString()]?.fieldStates;
         if (states) {
             richTextsHidden = states.richTextsHidden;
             plainTextsHidden = states.plainTextsHidden;
@@ -237,7 +237,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             );
         } else {
             const values: boolean[] = [];
-            const notetype = await getNotetype({ ntid: notetypeMeta.id });
+            const notetype = await getNotetype({ ntid: notetypeMeta!.id });
             const anySticky = notetype.fields.some((f) => f.config!.sticky);
             for (const field of notetype.fields) {
                 const sticky = field.config!.sticky;
@@ -987,7 +987,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         }
 
         const notetype = await getNotetype({
-            ntid: notetypeId,
+            ntid: notetypeId!,
         });
         const fieldNames = (
             await getFieldNames({

From 1cb733da2925d4758c4a49d9c32465ae734e1f27 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 27 Aug 2025 04:08:17 +0300
Subject: [PATCH 122/133] Ensure bigint

---
 ts/routes/editor/NoteEditor.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 8bc571ca1..dbab5b37a 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -982,8 +982,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             if (!notetypeId) {
                 notetypeId = chooserDefaults.notetypeId;
             }
-            deckChooser.select(deckId);
-            notetypeChooser.select(notetypeId);
+            deckChooser.select(BigInt(deckId));
+            notetypeChooser.select(BigInt(notetypeId));
         }
 
         const notetype = await getNotetype({

From 7a98aa0644b18dd084592c5d3d1f54b02e79ac59 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 27 Aug 2025 04:15:43 +0300
Subject: [PATCH 123/133] Fix lints

---
 ts/routes/editor/NoteEditor.svelte | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index dbab5b37a..88a5ee684 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -310,10 +310,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     let reviewerCard: Card | null = null;
 
-    export let notetypeChooser: NotetypeChooser;
-    export let selectedNotetype: NotetypeNameId | null = null;
-    export let deckChooser: DeckChooser;
-    export let selectedDeck: DeckNameId | null = null;
+    let notetypeChooser: NotetypeChooser;
+    let selectedNotetype: NotetypeNameId | null = null;
+    let deckChooser: DeckChooser;
+    let selectedDeck: DeckNameId | null = null;
 
     async function onNotetypeChange(notetype: NotetypeNameId) {
         loadNote({ notetypeId: notetype.id, copyFromNote: note });
@@ -756,8 +756,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type Modal from "$lib/components/Modal.svelte";
     import EditorChoosers from "./editor-toolbar/EditorChoosers.svelte";
     import type { Card } from "@generated/anki/cards_pb";
-    import NotetypeChooser from "$lib/components/NotetypeChooser.svelte";
-    import DeckChooser from "$lib/components/DeckChooser.svelte";
+    import type NotetypeChooser from "$lib/components/NotetypeChooser.svelte";
+    import type DeckChooser from "$lib/components/DeckChooser.svelte";
     import { ConfigKey_Bool } from "@generated/anki/config_pb";
 
     $: isIOImageLoaded = false;

From a3bf14500715e07913859b642b47b9263b59fa04 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 28 Aug 2025 03:07:46 +0300
Subject: [PATCH 124/133] Copy sticky fields

---
 ts/routes/editor/NoteEditor.svelte | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 88a5ee684..1b42aecd4 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -37,6 +37,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         reviewerCardId: bigint | null;
         initial: boolean;
         copyFromNote: Note | null;
+        stickyFieldsFrom: Note | null;
     }
 
     import { registerPackage } from "@tslib/runtime-require";
@@ -587,7 +588,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         note.id = noteId;
         addNoteToHistory(note!);
         lastAddedNote = note;
-        await loadNote();
+        await loadNote({ stickyFieldsFrom: note });
     }
 
     export async function addCurrentNote(deckId: bigint) {
@@ -966,6 +967,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         reviewerCardId,
         initial,
         copyFromNote,
+        stickyFieldsFrom,
     }: LoadNoteArgs) {
         let homeDeckId = 0n;
         if (reviewerCardId) {
@@ -1062,6 +1064,15 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             note!.tags = copyFromNote.tags;
         }
 
+        if (stickyFieldsFrom) {
+            for (let i = 0; i < notetype.fields.length; i++) {
+                if (notetype.fields[i].config?.sticky && stickyFieldsFrom.fields[i]) {
+                    note!.fields[i] = stickyFieldsFrom.fields[i];
+                }
+            }
+            note!.tags = stickyFieldsFrom.tags;
+        }
+
         const fieldValues = (
             await Promise.all(
                 note!.fields.map((field) => encodeIriPaths({ val: field })),
@@ -1145,6 +1156,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         reviewerCardId = reviewerCard ? reviewerCard.id : null,
         initial = false,
         copyFromNote = null,
+        stickyFieldsFrom = null,
     }: Partial<LoadNoteArgs> = {}) {
         loadDebouncer.schedule(async () => {
             await loadNoteInner({
@@ -1156,6 +1168,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                 reviewerCardId,
                 initial,
                 copyFromNote,
+                stickyFieldsFrom,
             });
         });
     }

From 3eb99c8a3e45761ba3b05813748db731a3e69f75 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 28 Aug 2025 03:32:03 +0300
Subject: [PATCH 125/133] Focus selector's search input

---
 ts/lib/components/ItemChooser.svelte | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ts/lib/components/ItemChooser.svelte b/ts/lib/components/ItemChooser.svelte
index 7d0babd4a..9418e67d3 100644
--- a/ts/lib/components/ItemChooser.svelte
+++ b/ts/lib/components/ItemChooser.svelte
@@ -33,6 +33,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }: Props = $props();
     let modal: Modal | null = $state(null);
     let searchQuery = $state("");
+    let searchInput: HTMLInputElement | null = $state(null);
 
     const filteredItems = $derived(
         searchQuery.trim() === ""
@@ -70,7 +71,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 </LabelButton>
 
 <Shortcut {keyCombination} on:action={() => modal?.toggle()} />
-<Modal bind:this={modal} dialogClass="modal-lg">
+<Modal bind:this={modal} onShown={() => searchInput?.focus()} dialogClass="modal-lg">
     <div slot="header" class="modal-header">
         <IconConstrain iconSize={90}>
             <Icon {icon} />
@@ -97,6 +98,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                     class="search-input"
                     placeholder={tr.actionsSearch()}
                     bind:value={searchQuery}
+                    bind:this={searchInput}
                 />
                 {#if searchQuery}
                     <button

From e3bd3eda4f3d419313b1f0e99677e18fe74f9c77 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 28 Aug 2025 03:33:13 +0300
Subject: [PATCH 126/133] Clear search on selector toggle

---
 ts/lib/components/ItemChooser.svelte | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ts/lib/components/ItemChooser.svelte b/ts/lib/components/ItemChooser.svelte
index 9418e67d3..233b1145b 100644
--- a/ts/lib/components/ItemChooser.svelte
+++ b/ts/lib/components/ItemChooser.svelte
@@ -54,6 +54,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         modal?.show();
     }
 
+    function toggleModal() {
+        modal?.toggle();
+        searchQuery = "";
+    }
+
     export function select(itemId: bigint) {
         const item = items.find((item) => item.id === itemId);
         selectedItem = item ? item : null;
@@ -70,7 +75,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     {selectedItem?.name ?? "…"}
 </LabelButton>
 
-<Shortcut {keyCombination} on:action={() => modal?.toggle()} />
+<Shortcut {keyCombination} on:action={toggleModal} />
 <Modal bind:this={modal} onShown={() => searchInput?.focus()} dialogClass="modal-lg">
     <div slot="header" class="modal-header">
         <IconConstrain iconSize={90}>

From 06d322aca44dabdebe7802dbdf9745546f946f6c Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Thu, 28 Aug 2025 03:40:49 +0300
Subject: [PATCH 127/133] Preserve focused field

---
 ts/routes/editor/NoteEditor.svelte | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 1b42aecd4..5c23e400e 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -1151,7 +1151,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         nid = note?.id,
         notetypeId = notetypeMeta ? notetypeMeta.id : null,
         deckId = null,
-        focusTo = 0,
+        focusTo = focusedFieldIndex,
         originalNoteId = null,
         reviewerCardId = reviewerCard ? reviewerCard.id : null,
         initial = false,
@@ -1287,6 +1287,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     const hoveredField: NoteEditorAPI["hoveredField"] = writable(null);
     const focusedField: NoteEditorAPI["focusedField"] = writable(null);
     const focusedInput: NoteEditorAPI["focusedInput"] = writable(null);
+    let focusedFieldIndex = 0;
 
     const api: NoteEditorAPI = {
         ...apiPartial,
@@ -1401,11 +1402,13 @@ components and functionality for general note editing.
                     api={fields[index]}
                     on:focusin={() => {
                         $focusedField = fields[index];
+                        focusedFieldIndex = index;
                         setAddonButtonsDisabled(false);
                         bridgeCommand(`focus:${index}`);
                     }}
                     on:focusout={async () => {
                         $focusedField = null;
+                        focusedFieldIndex = 0;
                         setAddonButtonsDisabled(true);
                         if (isLegacy) {
                             bridgeCommand(

From 8cf3dee351b3b436e58cb69699b6ff4b1ad613e3 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sat, 30 Aug 2025 16:06:55 +0300
Subject: [PATCH 128/133] Fix browser error on deleted notes

---
 ts/routes/editor/NoteEditor.svelte | 32 +++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 5c23e400e..60b03c1de 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -404,10 +404,17 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     async function updateCurrentNote() {
         if (mode !== "add") {
-            await updateEditorNote({
-                notes: [note!],
-                skipUndoEntry: false,
-            });
+            try {
+                await updateEditorNote(
+                    {
+                        notes: [note!],
+                        skipUndoEntry: false,
+                    },
+                    { alertOnError: false },
+                );
+            } catch {
+                console.log("Note deleted", note!.id);
+            }
         }
     }
 
@@ -1003,11 +1010,18 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         if (mode === "add") {
             setNote(await newNote({ ntid: notetype.id }));
         } else {
-            setNote(
-                await getNote({
-                    nid: nid!,
-                }),
-            );
+            try {
+                let n = await getNote(
+                    {
+                        nid: nid!,
+                    },
+                    { alertOnError: false },
+                );
+                setNote(n);
+            } catch {
+                console.log("Note deleted", nid);
+                return;
+            }
         }
         if (originalNoteId) {
             const originalNote = await getNote({

From 68f0e6e9926ffc22a92938c5ebb61ba1390547a1 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sat, 30 Aug 2025 16:07:39 +0300
Subject: [PATCH 129/133] Remove repeated line

---
 qt/aqt/browser/browser.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qt/aqt/browser/browser.py b/qt/aqt/browser/browser.py
index e62089836..0d4b1f2e9 100644
--- a/qt/aqt/browser/browser.py
+++ b/qt/aqt/browser/browser.py
@@ -1268,4 +1268,3 @@ class Browser(QMainWindow):
         line_edit = self.form.searchEdit.lineEdit()
         assert line_edit is not None
         return line_edit
-        return line_edit

From 018a9db57b39d02280ecafe918e490b3f2d3013a Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sat, 30 Aug 2025 16:16:50 +0300
Subject: [PATCH 130/133] Fix getCard() not allowed

---
 qt/aqt/mediasrv.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index 85911cc7c..8e0deef52 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -1017,6 +1017,8 @@ exposed_backend_list = [
     "add_media_from_path",
     "get_absolute_media_path",
     "extract_media_files",
+    # CardsService
+    "get_card",
 ]
 
 

From b79014814df3568c99ea1a6969682e595883ab9f Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Sat, 30 Aug 2025 16:22:52 +0300
Subject: [PATCH 131/133] Fix legacy DuplicateLink handling

---
 ts/routes/editor/DuplicateLink.svelte | 9 +++++++--
 ts/routes/editor/NoteEditor.svelte    | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ts/routes/editor/DuplicateLink.svelte b/ts/routes/editor/DuplicateLink.svelte
index d58083af3..b07bf6fcb 100644
--- a/ts/routes/editor/DuplicateLink.svelte
+++ b/ts/routes/editor/DuplicateLink.svelte
@@ -6,11 +6,15 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { searchInBrowser } from "@generated/backend";
     import * as tr from "@generated/ftl";
     import type { Note } from "@generated/anki/notes_pb";
+    import { bridgeCommand } from "@tslib/bridgecommand";
 
     export let note: Note | null = null;
+    export let isLegacy: boolean;
 
-    function showDupes() {
-        if (note) {
+    function showDupes(event: MouseEvent) {
+        if (isLegacy) {
+            bridgeCommand("dupes");
+        } else if (note) {
             searchInBrowser({
                 filter: {
                     case: "dupe",
@@ -21,6 +25,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                 },
             });
         }
+        event.preventDefault();
     }
 </script>
 
diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 60b03c1de..7e49dee49 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -1463,7 +1463,7 @@ components and functionality for general note editing.
                             </svelte:fragment>
                             <FieldState>
                                 {#if cols[index] === "dupe"}
-                                    <DuplicateLink {note} />
+                                    <DuplicateLink {note} {isLegacy} />
                                 {/if}
                                 {#if mode === "add"}
                                     <StickyBadge

From 5fe532d5d20f51c9a418781cbde8a0f2a61d9153 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Wed, 3 Sep 2025 00:01:04 +0300
Subject: [PATCH 132/133] Show number of added cards

---
 ts/routes/editor/NoteEditor.svelte            | 24 ++++++++++++++-----
 ts/routes/image-occlusion/MaskEditor.svelte   |  5 ----
 ts/routes/image-occlusion/Toast.svelte        | 18 +++++++++-----
 .../image-occlusion/toast-utils.svelte.ts     | 16 +++++++++----
 ts/routes/image-occlusion/types.ts            |  1 +
 5 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/ts/routes/editor/NoteEditor.svelte b/ts/routes/editor/NoteEditor.svelte
index 7e49dee49..04088d65d 100644
--- a/ts/routes/editor/NoteEditor.svelte
+++ b/ts/routes/editor/NoteEditor.svelte
@@ -586,12 +586,16 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         if (!(await noteCanBeAdded())) {
             return;
         }
-        const noteId = (
-            await addEditorNote({
-                note: note!,
-                deckId,
-            })
-        ).noteId;
+        const response = await addEditorNote({
+            note: note!,
+            deckId,
+        });
+        showToast(
+            tr.importingCardsAdded({ count: response.changes!.count }),
+            "success",
+            500,
+        );
+        const noteId = response.noteId;
         note.id = noteId;
         addNoteToHistory(note!);
         lastAddedNote = note;
@@ -767,6 +771,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type NotetypeChooser from "$lib/components/NotetypeChooser.svelte";
     import type DeckChooser from "$lib/components/DeckChooser.svelte";
     import { ConfigKey_Bool } from "@generated/anki/config_pb";
+    import {
+        destroyToast,
+        initToast,
+        showToast,
+    } from "../image-occlusion/toast-utils.svelte";
 
     $: isIOImageLoaded = false;
     $: ioImageLoadedStore.set(isIOImageLoaded);
@@ -1231,6 +1240,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             deregisterSticky = registerShortcut(toggleStickyAll, "Shift+F9");
         }
 
+        initToast();
+
         function wrap(before: string, after: string): void {
             if (!$focusedInput || !editingInputIsRichText($focusedInput)) {
                 return;
@@ -1293,6 +1304,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     onDestroy(() => {
         deregisterSticky();
+        destroyToast();
     });
 
     let apiPartial: Partial<NoteEditorAPI> = {};
diff --git a/ts/routes/image-occlusion/MaskEditor.svelte b/ts/routes/image-occlusion/MaskEditor.svelte
index 199b34d92..e90239755 100644
--- a/ts/routes/image-occlusion/MaskEditor.svelte
+++ b/ts/routes/image-occlusion/MaskEditor.svelte
@@ -17,15 +17,12 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { MaskEditorAPI } from "./tools/api";
     import { onResize } from "./tools/tool-zoom";
     import { saveNeededStore } from "./store";
-    import { destroyToast, initToast } from "./toast-utils.svelte";
-    import type Toast from "./Toast.svelte";
 
     export let mode: IOMode;
     const iconSize = 80;
     let innerWidth = 0;
     const startingTool = mode.kind === "add" ? "draw-rectangle" : "cursor";
     let canvas: fabric.Canvas | null = null;
-    let toast: Toast | null = null;
 
     $: {
         globalThis.maskEditor = canvas ? new MaskEditorAPI(canvas) : null;
@@ -70,13 +67,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     onMount(() => {
         window.addEventListener("resize", resizeEvent);
-        toast = initToast();
     });
 
     onDestroy(() => {
         window.removeEventListener("resize", resizeEvent);
         unsubscribe();
-        destroyToast(toast!);
     });
 
     const resizeEvent = () => {
diff --git a/ts/routes/image-occlusion/Toast.svelte b/ts/routes/image-occlusion/Toast.svelte
index 9c6345161..3f31021db 100644
--- a/ts/routes/image-occlusion/Toast.svelte
+++ b/ts/routes/image-occlusion/Toast.svelte
@@ -8,17 +8,23 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { mdiClose } from "$lib/components/icons";
     import type { ToastProps } from "./types";
 
-    const props: ToastProps = $props();
+    let { showToast, type, message, timeout }: ToastProps = $props();
 
     const closeToast = () => {
-        props.showToast = false;
+        showToast = false;
     };
+
+    $effect(() => {
+        if (timeout) {
+            setTimeout(closeToast, timeout);
+        }
+    });
 </script>
 
-{#if props.showToast}
-    <div class="toast-container desktop-only">
-        <div class="toast {props.type === 'success' ? 'success' : 'error'}">
-            {props.message}
+{#if showToast}
+    <div class="toast-container">
+        <div class="toast {type === 'success' ? 'success' : 'error'}">
+            {message}
             <IconButton iconSize={96} on:click={closeToast} class="toast-icon">
                 <Icon icon={mdiClose} />
             </IconButton>
diff --git a/ts/routes/image-occlusion/toast-utils.svelte.ts b/ts/routes/image-occlusion/toast-utils.svelte.ts
index 655a7b03a..7ee9348f0 100644
--- a/ts/routes/image-occlusion/toast-utils.svelte.ts
+++ b/ts/routes/image-occlusion/toast-utils.svelte.ts
@@ -11,21 +11,27 @@ const toastProps: ToastProps = $state({
     message: "",
 });
 
-export function initToast(): Toast {
-    return mount(Toast, {
+let toast: Toast | null = null;
+
+export function initToast() {
+    toast = mount(Toast, {
         target: document.body,
         props: toastProps,
     });
 }
 
-export function destroyToast(toast: Toast) {
-    unmount(toast);
+export function destroyToast() {
+    if (toast) {
+        unmount(toast);
+        toast = null;
+    }
 }
 
-export function showToast(message: string, type: "success" | "error") {
+export function showToast(message: string, type: "success" | "error", timeout?: number) {
     toastProps.message = message;
     toastProps.type = type;
     toastProps.showToast = true;
+    toastProps.timeout = timeout;
 }
 
 export function hideToast() {
diff --git a/ts/routes/image-occlusion/types.ts b/ts/routes/image-occlusion/types.ts
index 81ee57b4b..060009d38 100644
--- a/ts/routes/image-occlusion/types.ts
+++ b/ts/routes/image-occlusion/types.ts
@@ -14,4 +14,5 @@ export interface ToastProps {
     message: string;
     type: "success" | "error";
     showToast: boolean;
+    timeout?: number;
 }

From 6f93bfa13a78cf833a1875959d024a00c1fa2c19 Mon Sep 17 00:00:00 2001
From: Abdo <abdo@abdnh.net>
Date: Mon, 8 Sep 2025 00:31:34 +0300
Subject: [PATCH 133/133] Move retrieve_url to backend

---
 proto/anki/frontend.proto                     |   6 -
 proto/anki/media.proto                        |  13 +-
 qt/aqt/mediasrv.py                            |  14 +--
 qt/aqt/utils.py                               |  46 -------
 rslib/src/backend/media.rs                    |  40 ++++++
 rslib/src/backend/mod.rs                      |   1 +
 rslib/src/editor.rs                           | 117 ++++++++++++++++++
 rslib/src/lib.rs                              |   1 +
 .../editor/rich-text-input/data-transfer.ts   |   7 +-
 9 files changed, 175 insertions(+), 70 deletions(-)
 create mode 100644 rslib/src/backend/media.rs
 create mode 100644 rslib/src/editor.rs

diff --git a/proto/anki/frontend.proto b/proto/anki/frontend.proto
index 925e41c1c..3a54774ee 100644
--- a/proto/anki/frontend.proto
+++ b/proto/anki/frontend.proto
@@ -37,7 +37,6 @@ service FrontendService {
   rpc AddEditorNote(notes.AddNoteRequest) returns (notes.AddNoteResponse);
   rpc ConvertPastedImage(ConvertPastedImageRequest)
       returns (ConvertPastedImageResponse);
-  rpc RetrieveUrl(generic.String) returns (RetrieveUrlResponse);
   rpc OpenFilePicker(openFilePickerRequest) returns (generic.String);
   rpc OpenMedia(generic.String) returns (generic.Empty);
   rpc ShowInMediaFolder(generic.String) returns (generic.Empty);
@@ -82,11 +81,6 @@ message ConvertPastedImageResponse {
   bytes data = 1;
 }
 
-message RetrieveUrlResponse {
-  string filename = 1;
-  string error = 2;
-}
-
 message SetSettingJsonRequest {
   string key = 1;
   bytes value_json = 2;
diff --git a/proto/anki/media.proto b/proto/anki/media.proto
index ee2fb5e1d..58f481379 100644
--- a/proto/anki/media.proto
+++ b/proto/anki/media.proto
@@ -25,7 +25,9 @@ service MediaService {
 
 // Implicitly includes any of the above methods that are not listed in the
 // backend service.
-service BackendMediaService {}
+service BackendMediaService {
+  rpc AddMediaFromUrl(AddMediaFromUrlRequest) returns (AddMediaFromUrlResponse);
+}
 
 message CheckMediaResponse {
   repeated string unused = 1;
@@ -47,3 +49,12 @@ message AddMediaFileRequest {
 message AddMediaFromPathRequest {
   string path = 1;
 }
+
+message AddMediaFromUrlRequest {
+  string url = 1;
+}
+
+message AddMediaFromUrlResponse {
+  optional string filename = 1;
+  optional string error = 2;
+}
diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py
index 8e0deef52..911d5056e 100644
--- a/qt/aqt/mediasrv.py
+++ b/qt/aqt/mediasrv.py
@@ -699,18 +699,6 @@ def convert_pasted_image() -> bytes:
     return frontend_pb2.ConvertPastedImageResponse(data=data).SerializeToString()
 
 
-def retrieve_url() -> bytes:
-    from aqt.utils import retrieve_url
-
-    req = generic_pb2.String()
-    req.ParseFromString(request.data)
-    url = req.val
-    filename, error = retrieve_url(url)
-    return frontend_pb2.RetrieveUrlResponse(
-        filename=filename, error=error
-    ).SerializeToString()
-
-
 AsyncRequestReturnType = TypeVar("AsyncRequestReturnType")
 
 
@@ -943,7 +931,6 @@ post_handler_list = [
     set_meta_json,
     get_config_json,
     convert_pasted_image,
-    retrieve_url,
     open_file_picker,
     open_media,
     show_in_media_folder,
@@ -1015,6 +1002,7 @@ exposed_backend_list = [
     # MediaService
     "add_media_file",
     "add_media_from_path",
+    "add_media_from_url",
     "get_absolute_media_path",
     "extract_media_files",
     # CardsService
diff --git a/qt/aqt/utils.py b/qt/aqt/utils.py
index 5d882aad1..43efc513f 100644
--- a/qt/aqt/utils.py
+++ b/qt/aqt/utils.py
@@ -9,19 +9,16 @@ import re
 import shutil
 import subprocess
 import sys
-import urllib
 from collections.abc import Callable, Sequence
 from functools import partial, wraps
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Literal, Union
 
-import requests
 from send2trash import send2trash
 
 import aqt
 from anki._legacy import DeprecatedNamesMixinForModule
 from anki.collection import Collection, HelpPage
-from anki.httpclient import HttpClient
 from anki.lang import TR, tr_legacyglobal  # noqa: F401
 from anki.utils import (
     call,
@@ -128,49 +125,6 @@ def openLink(link: str | QUrl) -> None:
         QDesktopServices.openUrl(QUrl(link))
 
 
-def retrieve_url(url: str) -> tuple[str, str]:
-    "Download file into media folder and return local filename or None."
-
-    local = url.lower().startswith("file://")
-    content_type = None
-    error_msg: str | None = None
-    try:
-        if local:
-            # urllib doesn't understand percent-escaped utf8, but requires things like
-            # '#' to be escaped.
-            url = urllib.parse.unquote(url)
-            url = url.replace("%", "%25")
-            url = url.replace("#", "%23")
-            req = urllib.request.Request(
-                url, None, {"User-Agent": "Mozilla/5.0 (compatible; Anki)"}
-            )
-            with urllib.request.urlopen(req) as response:
-                filecontents = response.read()
-        else:
-            with HttpClient() as client:
-                client.timeout = 30
-                with client.get(url) as response:
-                    if response.status_code != 200:
-                        error_msg = tr.qt_misc_unexpected_response_code(
-                            val=response.status_code,
-                        )
-                        return "", error_msg
-                    filecontents = response.content
-                    content_type = response.headers.get("content-type")
-    except (urllib.error.URLError, requests.exceptions.RequestException) as e:
-        error_msg = tr.editing_an_error_occurred_while_opening(val=str(e))
-        return "", error_msg
-    # strip off any query string
-    url = re.sub(r"\?.*?$", "", url)
-    fname = os.path.basename(urllib.parse.unquote(url))
-    if not fname.strip():
-        fname = "paste"
-    if content_type:
-        fname = aqt.mw.col.media.add_extension_based_on_mime(fname, content_type)
-
-    return aqt.mw.col.media.write_data(fname, filecontents), ""
-
-
 class MessageBox(QMessageBox):
     def __init__(
         self,
diff --git a/rslib/src/backend/media.rs b/rslib/src/backend/media.rs
new file mode 100644
index 000000000..8b2f6a394
--- /dev/null
+++ b/rslib/src/backend/media.rs
@@ -0,0 +1,40 @@
+// Copyright: Ankitects Pty Ltd and contributors
+// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+
+use anki_proto::media::AddMediaFromUrlRequest;
+use anki_proto::media::AddMediaFromUrlResponse;
+
+use crate::backend::Backend;
+use crate::editor::retrieve_url;
+use crate::error;
+
+impl crate::services::BackendMediaService for Backend {
+    fn add_media_from_url(
+        &self,
+        input: AddMediaFromUrlRequest,
+    ) -> error::Result<AddMediaFromUrlResponse> {
+        let rt = self.runtime_handle();
+        let mut guard = self.col.lock().unwrap();
+        let col = guard.as_mut().unwrap();
+        let media = col.media()?;
+        let fut = async move {
+            let response = match retrieve_url(&input.url).await {
+                Ok((filename, data)) => {
+                    media
+                        .add_file(&filename, &data)
+                        .map(|fname| fname.to_string())?;
+                    AddMediaFromUrlResponse {
+                        filename: Some(filename),
+                        error: None,
+                    }
+                }
+                Err(e) => AddMediaFromUrlResponse {
+                    filename: None,
+                    error: Some(e.message(col.tr())),
+                },
+            };
+            Ok(response)
+        };
+        rt.block_on(fut)
+    }
+}
diff --git a/rslib/src/backend/mod.rs b/rslib/src/backend/mod.rs
index d15652675..ce4e72683 100644
--- a/rslib/src/backend/mod.rs
+++ b/rslib/src/backend/mod.rs
@@ -12,6 +12,7 @@ pub(crate) mod dbproxy;
 mod error;
 mod i18n;
 mod import_export;
+mod media;
 mod ops;
 mod sync;
 
diff --git a/rslib/src/editor.rs b/rslib/src/editor.rs
new file mode 100644
index 000000000..4503a28c9
--- /dev/null
+++ b/rslib/src/editor.rs
@@ -0,0 +1,117 @@
+// Copyright: Ankitects Pty Ltd and contributors
+// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+
+use std::path::Path;
+use std::time::Duration;
+
+use percent_encoding_iri::percent_decode_str;
+use reqwest::Client;
+use reqwest::Url;
+
+use crate::error::AnkiError;
+use crate::error::Result;
+use crate::invalid_input;
+
+/// Download file from URL.
+/// Returns (filename, file_contents) tuple.
+pub async fn retrieve_url(url: &str) -> Result<(String, Vec<u8>)> {
+    let is_local = url.to_lowercase().starts_with("file://");
+    let (file_contents, content_type) = if is_local {
+        download_local_file(url).await?
+    } else {
+        download_remote_file(url).await?
+    };
+
+    let mut parsed_url = match Url::parse(url) {
+        Ok(url) => url,
+        Err(e) => invalid_input!("Invalid URL: {}", e),
+    };
+    parsed_url.set_query(None);
+    let mut filename = parsed_url
+        .path_segments()
+        .and_then(|mut segments| segments.next_back())
+        .unwrap_or("")
+        .to_string();
+
+    filename = match percent_decode_str(&filename).decode_utf8() {
+        Ok(decoded) => decoded.to_string(),
+        Err(e) => invalid_input!("Failed to decode filename: {}", e),
+    };
+
+    if filename.trim().is_empty() {
+        filename = "paste".to_string();
+    }
+
+    if let Some(mime_type) = content_type {
+        filename = add_extension_based_on_mime(&filename, &mime_type);
+    }
+
+    Ok((filename.to_string(), file_contents))
+}
+
+async fn download_local_file(url: &str) -> Result<(Vec<u8>, Option<String>)> {
+    let decoded_url = match percent_decode_str(url).decode_utf8() {
+        Ok(url) => url,
+        Err(e) => invalid_input!("Failed to decode file URL: {}", e),
+    };
+
+    let parsed_url = match Url::parse(&decoded_url) {
+        Ok(url) => url,
+        Err(e) => invalid_input!("Invalid file URL: {}", e),
+    };
+
+    let file_path = match parsed_url.to_file_path() {
+        Ok(path) => path,
+        Err(_) => invalid_input!("Invalid file path in URL"),
+    };
+
+    let file_contents = std::fs::read(&file_path).map_err(|e| AnkiError::FileIoError {
+        source: anki_io::FileIoError {
+            path: file_path.clone(),
+            op: anki_io::FileOp::Read,
+            source: e,
+        },
+    })?;
+
+    Ok((file_contents, None))
+}
+
+async fn download_remote_file(url: &str) -> Result<(Vec<u8>, Option<String>)> {
+    let client = Client::builder()
+        .timeout(Duration::from_secs(30))
+        .user_agent("Mozilla/5.0 (compatible; Anki)")
+        .build()?;
+
+    let response = client.get(url).send().await?.error_for_status()?;
+    let content_type = response
+        .headers()
+        .get("content-type")
+        .and_then(|ct| ct.to_str().ok())
+        .map(|s| s.to_string());
+
+    let file_contents = response.bytes().await?.to_vec();
+
+    Ok((file_contents, content_type))
+}
+
+fn add_extension_based_on_mime(filename: &str, content_type: &str) -> String {
+    let mut extension = "";
+    if Path::new(filename).extension().is_none() {
+        extension = match content_type {
+            "audio/mpeg" => ".mp3",
+            "audio/ogg" => ".oga",
+            "audio/opus" => ".opus",
+            "audio/wav" => ".wav",
+            "audio/webm" => ".weba",
+            "audio/aac" => ".aac",
+            "image/jpeg" => ".jpg",
+            "image/png" => ".png",
+            "image/svg+xml" => ".svg",
+            "image/webp" => ".webp",
+            "image/avif" => ".avif",
+            _ => "",
+        };
+    };
+
+    filename.to_string() + extension
+}
diff --git a/rslib/src/lib.rs b/rslib/src/lib.rs
index 2258c3592..3af7e968b 100644
--- a/rslib/src/lib.rs
+++ b/rslib/src/lib.rs
@@ -16,6 +16,7 @@ pub mod config;
 pub mod dbcheck;
 pub mod deckconfig;
 pub mod decks;
+pub mod editor;
 pub mod error;
 pub mod findreplace;
 pub mod i18n;
diff --git a/ts/routes/editor/rich-text-input/data-transfer.ts b/ts/routes/editor/rich-text-input/data-transfer.ts
index de4aef0f1..37bda4624 100644
--- a/ts/routes/editor/rich-text-input/data-transfer.ts
+++ b/ts/routes/editor/rich-text-input/data-transfer.ts
@@ -5,13 +5,13 @@ import { ConfigKey_Bool } from "@generated/anki/config_pb";
 import type { ReadClipboardResponse } from "@generated/anki/frontend_pb";
 import {
     addMediaFile,
+    addMediaFromUrl,
     convertPastedImage,
     extractMediaFiles,
     getAbsoluteMediaPath,
     getConfigBool,
     openFilePicker,
     readClipboard,
-    retrieveUrl as retrieveUrlBackend,
     writeClipboard,
 } from "@generated/backend";
 import * as tr from "@generated/ftl";
@@ -125,13 +125,12 @@ async function getImageData(data: DataTransfer | ReadClipboardResponse): Promise
 }
 
 async function retrieveUrl(url: string): Promise<string | null> {
-    const response = await retrieveUrlBackend({ val: url });
+    const response = await addMediaFromUrl({ url });
     if (response.error) {
         alert(response.error);
         return null;
     }
-
-    return response.filename;
+    return response.filename!;
 }
 
 async function urlToFile(url: string, allowedSuffixes = mediaSuffixes): Promise<string | null> {