From 3a4b942aae3d0ea2f8fc02948c95f13ba7ea520c Mon Sep 17 00:00:00 2001
From: Kaz Wesley <kaz@lambdaverse.org>
Date: Wed, 7 Aug 2024 10:49:24 -0400
Subject: [PATCH 01/23] Help tab (#10771)

Add context sensitive help to right side panel; implements #10582.

https://github.com/user-attachments/assets/0d6bce44-735a-4deb-86c9-72a088ab1d59

# Important Notes
- The rightmost (i.e. current) breadcrumb is no longer clickable.
---
 app/dashboard/src/layouts/TabBar.tsx          | 49 ++---------
 .../{docPanel.spec.ts => rightPanel.spec.ts}  | 21 +++++
 app/gui2/src/components/ComponentBrowser.vue  | 15 +---
 .../src/components/ComponentDocumentation.vue | 50 +++++++++++
 app/gui2/src/components/DockPanel.vue         | 81 ++++++++++++-----
 .../src/components/DocumentationEditor.vue    | 45 ++++++++--
 .../DocumentationPanel.vue                    |  4 +-
 .../DocumentationPanel/DocsBreadcrumb.vue     |  3 +-
 .../DocumentationPanel/DocsBreadcrumbs.vue    |  8 +-
 app/gui2/src/components/GraphEditor.vue       | 73 ++++++++-------
 .../src/components/GraphEditor/GraphNode.vue  |  2 +-
 .../components/GraphEditor/NodeWidgetTree.vue |  2 +-
 app/gui2/src/composables/selection.ts         | 13 +++
 app/gui2/src/stores/graph/graphDatabase.ts    | 18 ++--
 app/ide-desktop/common/package.json           |  7 +-
 .../utilities/style/__tests__/tabBar.test.ts  | 50 +++++++++++
 .../common/src/utilities/style/tabBar.ts      | 88 +++++++++++++++++++
 pnpm-lock.yaml                                |  3 +
 18 files changed, 397 insertions(+), 135 deletions(-)
 rename app/gui2/e2e/{docPanel.spec.ts => rightPanel.spec.ts} (69%)
 create mode 100644 app/gui2/src/components/ComponentDocumentation.vue
 rename app/gui2/src/components/{ComponentBrowser => }/DocumentationPanel.vue (98%)
 create mode 100644 app/ide-desktop/common/src/utilities/style/__tests__/tabBar.test.ts
 create mode 100644 app/ide-desktop/common/src/utilities/style/tabBar.ts

diff --git a/app/dashboard/src/layouts/TabBar.tsx b/app/dashboard/src/layouts/TabBar.tsx
index 9246e9c5f410..ff6e82c14de5 100644
--- a/app/dashboard/src/layouts/TabBar.tsx
+++ b/app/dashboard/src/layouts/TabBar.tsx
@@ -5,6 +5,7 @@ import * as reactQuery from '@tanstack/react-query'
 import invariant from 'tiny-invariant'
 
 import type * as text from 'enso-common/src/text'
+import * as tabBar from 'enso-common/src/utilities/style/tabBar'
 
 import * as projectHooks from '#/hooks/projectHooks'
 
@@ -82,39 +83,10 @@ export default function TabBar(props: TabBarProps) {
           selectedTabRef.current = element
           const bounds = element.getBoundingClientRect()
           const rootBounds = backgroundElement.getBoundingClientRect()
-          const tabLeft = bounds.left - rootBounds.left + TAB_RADIUS_PX
-          const tabRight = bounds.right - rootBounds.left - TAB_RADIUS_PX
-          const rightSegments = [
-            'M 0 0',
-            `L ${rootBounds.width + window.outerWidth} 0`,
-            `L ${rootBounds.width + window.outerWidth} ${rootBounds.height}`,
-            `L ${tabRight + TAB_RADIUS_PX} ${rootBounds.height}`,
-            `A ${TAB_RADIUS_PX} ${TAB_RADIUS_PX} 0 0 1 ${tabRight} ${rootBounds.height - TAB_RADIUS_PX}`,
-          ]
-          const leftSegments = [
-            `A ${TAB_RADIUS_PX} ${TAB_RADIUS_PX} 0 0 1 ${tabLeft - TAB_RADIUS_PX} ${rootBounds.height}`,
-            `L 0 ${rootBounds.height}`,
-            'Z',
-          ]
-          const segments = [
-            ...rightSegments,
-            `L ${tabRight} ${TAB_RADIUS_PX}`,
-            `A ${TAB_RADIUS_PX} ${TAB_RADIUS_PX} 0 0 0 ${tabRight - TAB_RADIUS_PX} 0`,
-            `L ${tabLeft + TAB_RADIUS_PX} 0`,
-            `A ${TAB_RADIUS_PX} ${TAB_RADIUS_PX} 0 0 0 ${tabLeft} ${TAB_RADIUS_PX}`,
-            `L ${tabLeft} ${rootBounds.height - TAB_RADIUS_PX}`,
-            ...leftSegments,
-          ]
-          backgroundElement.style.clipPath = `path("${segments.join(' ')}")`
-          const rootSegments = [
-            ...rightSegments,
-            `A ${TAB_RADIUS_PX} ${TAB_RADIUS_PX} 0 0 1 ${tabRight - TAB_RADIUS_PX} ${rootBounds.height}`,
-            `L ${tabLeft + TAB_RADIUS_PX} ${rootBounds.height}`,
-            `A ${TAB_RADIUS_PX} ${TAB_RADIUS_PX} 0 0 1 ${tabLeft} ${rootBounds.height - TAB_RADIUS_PX}`,
-            ...leftSegments,
-          ]
+          const { clipPath, rootClipPath } = tabBar.barClipPath(bounds, rootBounds, TAB_RADIUS_PX)
+          backgroundElement.style.clipPath = clipPath
           if (rootElement) {
-            rootElement.style.clipPath = `path("${rootSegments.join(' ')}")`
+            rootElement.style.clipPath = rootClipPath
           }
         }
       }
@@ -214,18 +186,7 @@ export function Tab(props: InternalTabProps) {
       const element = ref.current
       if (element) {
         const bounds = element.getBoundingClientRect()
-        const segments = [
-          `M 0 ${bounds.height}`,
-          `A ${TAB_RADIUS_PX} ${TAB_RADIUS_PX} 0 0 0 ${TAB_RADIUS_PX} ${bounds.height - TAB_RADIUS_PX}`,
-          `L ${TAB_RADIUS_PX} ${TAB_RADIUS_PX}`,
-          `A ${TAB_RADIUS_PX} ${TAB_RADIUS_PX} 0 0 1 ${TAB_RADIUS_PX * 2} 0`,
-          `L ${bounds.width - TAB_RADIUS_PX * 2} 0`,
-          `A ${TAB_RADIUS_PX} ${TAB_RADIUS_PX} 0 0 1 ${bounds.width - TAB_RADIUS_PX} ${TAB_RADIUS_PX}`,
-          `L ${bounds.width - TAB_RADIUS_PX} ${bounds.height - TAB_RADIUS_PX}`,
-          `A ${TAB_RADIUS_PX} ${TAB_RADIUS_PX} 0 0 0 ${bounds.width} ${bounds.height}`,
-          'Z',
-        ]
-        element.style.clipPath = `path("${segments.join(' ')}")`
+        element.style.clipPath = tabBar.tabClipPath(bounds, TAB_RADIUS_PX)
       }
     }
   })
diff --git a/app/gui2/e2e/docPanel.spec.ts b/app/gui2/e2e/rightPanel.spec.ts
similarity index 69%
rename from app/gui2/e2e/docPanel.spec.ts
rename to app/gui2/e2e/rightPanel.spec.ts
index b1ee73b4baba..d8cc94aa4649 100644
--- a/app/gui2/e2e/docPanel.spec.ts
+++ b/app/gui2/e2e/rightPanel.spec.ts
@@ -1,5 +1,6 @@
 import { expect, test } from 'playwright/test'
 import * as actions from './actions'
+import { mockMethodCallInfo } from './expressionUpdates'
 import { CONTROL_KEY } from './keyboard'
 import * as locate from './locate'
 
@@ -48,3 +49,23 @@ test('Doc panel focus (regression #10471)', async ({ page }) => {
   expect(content.includes('The main TEST method')).toBe(true)
   await expect(locate.rightDock(page)).toContainText('The main TEST method')
 })
+
+test('Component help', async ({ page }) => {
+  await actions.goToGraph(page, false)
+  await locate.rightDock(page).getByRole('button', { name: 'Help' }).click()
+  await expect(locate.rightDock(page)).toHaveText(/Select a single component/)
+
+  await locate.graphNodeByBinding(page, 'final').click()
+  await expect(locate.rightDock(page)).toHaveText(/No documentation available/)
+
+  await mockMethodCallInfo(page, 'data', {
+    methodPointer: {
+      module: 'Standard.Base.Data',
+      definedOnType: 'Standard.Base.Data',
+      name: 'read',
+    },
+    notAppliedArguments: [0, 1, 2],
+  })
+  await locate.graphNodeByBinding(page, 'data').click()
+  await expect(locate.rightDock(page)).toHaveText(/Reads a file into Enso/)
+})
diff --git a/app/gui2/src/components/ComponentBrowser.vue b/app/gui2/src/components/ComponentBrowser.vue
index 0f803fa95403..c50539caca96 100644
--- a/app/gui2/src/components/ComponentBrowser.vue
+++ b/app/gui2/src/components/ComponentBrowser.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import { componentBrowserBindings } from '@/bindings'
-import ComponentEditor from '@/components/ComponentBrowser/ComponentEditor.vue'
-import { default as DocumentationPanel } from '@/components/ComponentBrowser/DocumentationPanel.vue'
 import { makeComponentList, type Component } from '@/components/ComponentBrowser/component'
+import ComponentEditor from '@/components/ComponentBrowser/ComponentEditor.vue'
 import { Filtering } from '@/components/ComponentBrowser/filtering'
 import { useComponentBrowserInput, type Usage } from '@/components/ComponentBrowser/input'
 import { useScrolling } from '@/components/ComponentBrowser/scrolling'
+import DocumentationPanel from '@/components/DocumentationPanel.vue'
 import GraphVisualization from '@/components/GraphEditor/GraphVisualization.vue'
 import SvgIcon from '@/components/SvgIcon.vue'
 import ToggleIcon from '@/components/ToggleIcon.vue'
@@ -390,15 +390,7 @@ function updateScroll() {
 
 const docsVisible = ref(true)
 
-const displayedDocs: Ref<Opt<SuggestionId>> = ref(null)
-const docEntry = computed({
-  get() {
-    return displayedDocs.value
-  },
-  set(value) {
-    displayedDocs.value = value
-  },
-})
+const docEntry: Ref<Opt<SuggestionId>> = ref(null)
 
 watch(selectedSuggestionId, (id) => {
   docEntry.value = id
@@ -603,6 +595,7 @@ const handler = componentBrowserBindings.handler({
   --list-height: 0px;
   --radius-default: 20px;
   --background-color: #eaeaea;
+  --doc-panel-bottom-clip: 4px;
   width: fit-content;
   color: rgba(0, 0, 0, 0.6);
   font-size: 11.5px;
diff --git a/app/gui2/src/components/ComponentDocumentation.vue b/app/gui2/src/components/ComponentDocumentation.vue
new file mode 100644
index 000000000000..c729559eb0d9
--- /dev/null
+++ b/app/gui2/src/components/ComponentDocumentation.vue
@@ -0,0 +1,50 @@
+<script setup lang="ts">
+import DocumentationPanel from '@/components/DocumentationPanel.vue'
+import { injectGraphSelection } from '@/providers/graphSelection'
+import { useGraphStore } from '@/stores/graph'
+import type { SuggestionId } from 'shared/languageServerTypes/suggestions'
+import { Err, Ok, type Result } from 'shared/util/data/result'
+import { ref, watchEffect } from 'vue'
+
+const selection = injectGraphSelection()
+const graphStore = useGraphStore()
+
+const displayedDocs = ref<Result<SuggestionId>>()
+
+function docsForSelection() {
+  const selected = selection.tryGetSoleSelection()
+  if (!selected.ok) return Err('Select a single component to display help')
+  const suggestionId = graphStore.db.nodeMainSuggestionId.lookup(selected.value)
+  if (suggestionId == null) return Err('No documentation available for selected component')
+  return Ok(suggestionId)
+}
+watchEffect(() => (displayedDocs.value = docsForSelection()))
+</script>
+
+<template>
+  <DocumentationPanel
+    v-if="displayedDocs?.ok"
+    :selectedEntry="displayedDocs.value"
+    @update:selectedEntry="displayedDocs = Ok($event)"
+  />
+  <div v-else-if="displayedDocs?.ok === false" class="help-placeholder">
+    {{ displayedDocs.error.payload }}.
+  </div>
+</template>
+
+<style scoped>
+.DocumentationPanel {
+  --list-height: 0px;
+  --radius-default: 20px;
+  --background-color: #fff;
+  --group-color-fallback: var(--color-dim);
+}
+
+.help-placeholder {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+</style>
diff --git a/app/gui2/src/components/DockPanel.vue b/app/gui2/src/components/DockPanel.vue
index 41e676c32e23..2ef0d06c1632 100644
--- a/app/gui2/src/components/DockPanel.vue
+++ b/app/gui2/src/components/DockPanel.vue
@@ -6,15 +6,21 @@ import ToggleIcon from '@/components/ToggleIcon.vue'
 import { useResizeObserver } from '@/composables/events'
 import { Rect } from '@/util/data/rect'
 import { Vec2 } from '@/util/data/vec2'
+import { tabClipPath } from 'enso-common/src/utilities/style/tabBar'
 import { computed, ref } from 'vue'
 
 const MIN_DOCK_SIZE_PX = 200
+const TAB_EDGE_MARGIN_PX = 4
+const TAB_SIZE_PX = { width: 48 - TAB_EDGE_MARGIN_PX, height: 48 }
+const TAB_RADIUS_PX = 8
 
-const toolbarElement = ref<HTMLElement>()
-const slideInPanel = ref<HTMLElement>()
+type Tab = 'docs' | 'help'
 
 const show = defineModel<boolean>('show', { required: true })
 const size = defineModel<number | undefined>('size')
+const tab = defineModel<Tab>('tab')
+
+const slideInPanel = ref<HTMLElement>()
 
 const computedSize = useResizeObserver(slideInPanel)
 const computedBounds = computed(() => new Rect(Vec2.Zero, computedSize.value))
@@ -26,6 +32,14 @@ function clampSize(size: number) {
 const style = computed(() => ({
   width: size.value != null ? `${clampSize(size.value)}px` : 'var(--right-dock-default-width)',
 }))
+
+const tabStyle = {
+  clipPath: tabClipPath(TAB_SIZE_PX, TAB_RADIUS_PX, 'right'),
+  width: `${TAB_SIZE_PX.width}px`,
+  height: `${TAB_SIZE_PX.height}px`,
+  margin: `${-TAB_RADIUS_PX}px ${TAB_EDGE_MARGIN_PX}px ${-TAB_RADIUS_PX}px 0`,
+  paddingLeft: `${TAB_EDGE_MARGIN_PX / 2}px`,
+}
 </script>
 
 <template>
@@ -38,9 +52,25 @@ const style = computed(() => ({
   <SizeTransition width :duration="100">
     <div v-if="show" ref="slideInPanel" :style="style" class="DockPanel" data-testid="rightDock">
       <div class="content">
-        <div ref="toolbarElement" class="toolbar"></div>
-        <div class="scrollArea">
-          <slot :toolbar="toolbarElement" />
+        <slot v-if="tab == 'docs'" name="docs" />
+        <slot v-else-if="tab == 'help'" name="help" />
+      </div>
+      <div class="tabBar">
+        <div class="tab" :style="tabStyle">
+          <ToggleIcon
+            :modelValue="tab == 'docs'"
+            @update:modelValue="tab = 'docs'"
+            title="Documentation Editor"
+            icon="text"
+          />
+        </div>
+        <div class="tab" :style="tabStyle">
+          <ToggleIcon
+            :modelValue="tab == 'help'"
+            @update:modelValue="tab = 'help'"
+            title="Component Help"
+            icon="help"
+          />
         </div>
       </div>
       <ResizeHandles left :modelValue="computedBounds" @update:modelValue="size = $event.width" />
@@ -50,36 +80,45 @@ const style = computed(() => ({
 
 <style scoped>
 .DockPanel {
-  background-color: rgb(255, 255, 255);
   position: relative;
+  --icon-margin: 16px;
+  --icon-size: 16px;
+  display: flex;
+  flex-direction: row;
+  justify-content: stretch;
 }
 
 .content {
   width: 100%;
   height: 100%;
-  display: flex;
-  flex-direction: column;
+  background-color: #fff;
+  min-width: 0;
 }
 
-.scrollArea {
-  width: 100%;
-  overflow-y: auto;
-  padding-left: 10px;
-  /* Prevent touchpad back gesture, which can be triggered while panning. */
-  overscroll-behavior-x: none;
-  flex-grow: 1;
+.tabBar {
+  flex: none;
+  width: calc(2 * var(--icon-margin) + var(--icon-size));
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 8px;
+  padding-top: calc(2 * var(--icon-margin) + var(--icon-size));
 }
 
-.toolbar {
-  height: 48px;
-  padding-left: 4px;
-  flex-shrink: 0;
+.tab {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  &:has(.toggledOn) {
+    background-color: #fff;
+  }
 }
 
 .toggleDock {
+  --icon-margin: 16px; /* Must match `--icon-margin` defined above, which is not in scope because of the teleport. */
   z-index: 1;
   position: absolute;
-  right: 16px;
-  top: 16px;
+  right: var(--icon-margin);
+  top: var(--icon-margin);
 }
 </style>
diff --git a/app/gui2/src/components/DocumentationEditor.vue b/app/gui2/src/components/DocumentationEditor.vue
index fcdb7e657037..3355bb347e74 100644
--- a/app/gui2/src/components/DocumentationEditor.vue
+++ b/app/gui2/src/components/DocumentationEditor.vue
@@ -6,12 +6,12 @@ import { useProjectStore } from '@/stores/project'
 import type { ToValue } from '@/util/reactivity'
 import type { Path } from 'shared/languageServerTypes'
 import { Err, Ok, mapOk, withContext, type Result } from 'shared/util/data/result'
-import { toRef, toValue } from 'vue'
+import { ref, toRef, toValue } from 'vue'
 
 const documentation = defineModel<string>({ required: true })
-const _props = defineProps<{
-  toolbarContainer: HTMLElement | undefined
-}>()
+const _props = defineProps<{}>()
+
+const toolbarElement = ref<HTMLElement>()
 
 const graphStore = useGraphStore()
 const projectStore = useProjectStore()
@@ -69,9 +69,36 @@ function useDocumentationImages(
 </script>
 
 <template>
-  <MarkdownEditor
-    v-model="documentation"
-    :transformImageUrl="transformImageUrl"
-    :toolbarContainer="toolbarContainer"
-  />
+  <div class="DocumentationEditor">
+    <div ref="toolbarElement" class="toolbar"></div>
+    <div class="scrollArea">
+      <MarkdownEditor
+        v-model="documentation"
+        :transformImageUrl="transformImageUrl"
+        :toolbarContainer="toolbarElement"
+      />
+    </div>
+  </div>
 </template>
+
+<style scoped>
+.DocumentationEditor {
+  display: flex;
+  flex-direction: column;
+}
+
+.scrollArea {
+  width: 100%;
+  overflow-y: auto;
+  padding-left: 10px;
+  /* Prevent touchpad back gesture, which can be triggered while panning. */
+  overscroll-behavior-x: none;
+  flex-grow: 1;
+}
+
+.toolbar {
+  height: 48px;
+  padding-left: 4px;
+  flex-shrink: 0;
+}
+</style>
diff --git a/app/gui2/src/components/ComponentBrowser/DocumentationPanel.vue b/app/gui2/src/components/DocumentationPanel.vue
similarity index 98%
rename from app/gui2/src/components/ComponentBrowser/DocumentationPanel.vue
rename to app/gui2/src/components/DocumentationPanel.vue
index 25beb686b263..4b29062546b3 100644
--- a/app/gui2/src/components/ComponentBrowser/DocumentationPanel.vue
+++ b/app/gui2/src/components/DocumentationPanel.vue
@@ -189,9 +189,9 @@ function openDocs(url: string) {
   line-height: 160%;
   color: var(--enso-docs-text-color);
   background-color: var(--enso-docs-background-color);
-  padding: 4px 12px 4px 4px;
+  padding: 4px 12px var(--doc-panel-bottom-clip, 0) 4px;
   white-space: normal;
-  clip-path: inset(0 0 4px 0);
+  clip-path: inset(0 0 var(--doc-panel-bottom-clip, 0) 0);
   height: 100%;
   overflow-y: auto;
   display: flex;
diff --git a/app/gui2/src/components/DocumentationPanel/DocsBreadcrumb.vue b/app/gui2/src/components/DocumentationPanel/DocsBreadcrumb.vue
index 5102f0262d04..e21050485583 100644
--- a/app/gui2/src/components/DocumentationPanel/DocsBreadcrumb.vue
+++ b/app/gui2/src/components/DocumentationPanel/DocsBreadcrumb.vue
@@ -3,11 +3,10 @@ import SvgIcon from '@/components/SvgIcon.vue'
 import type { Icon } from '@/util/iconName'
 
 const props = defineProps<{ text: string; icon?: Icon | undefined }>()
-const emit = defineEmits<{ click: [] }>()
 </script>
 
 <template>
-  <div class="Breadcrumb clickable" @click.stop="emit('click')">
+  <div class="Breadcrumb">
     <SvgIcon v-if="props.icon" :name="props.icon || ''" />
     <span v-text="props.text"></span>
   </div>
diff --git a/app/gui2/src/components/DocumentationPanel/DocsBreadcrumbs.vue b/app/gui2/src/components/DocumentationPanel/DocsBreadcrumbs.vue
index bee37089b8ef..722d6a263bd9 100644
--- a/app/gui2/src/components/DocumentationPanel/DocsBreadcrumbs.vue
+++ b/app/gui2/src/components/DocumentationPanel/DocsBreadcrumbs.vue
@@ -44,7 +44,9 @@ function shrinkFactor(index: number): number {
           :text="breadcrumb.label"
           :icon="index === props.breadcrumbs.length - 1 ? props.icon : undefined"
           :style="{ 'flex-shrink': shrinkFactor(index) }"
-          @click="emit('click', index)"
+          :class="{ nonInteractive: index === props.breadcrumbs.length - 1 }"
+          class="clickable"
+          @click.stop="emit('click', index)"
         />
       </template>
     </TransitionGroup>
@@ -81,4 +83,8 @@ function shrinkFactor(index: number): number {
 .breadcrumbs-enter-from {
   opacity: 0;
 }
+
+.nonInteractive {
+  pointer-events: none;
+}
 </style>
diff --git a/app/gui2/src/components/GraphEditor.vue b/app/gui2/src/components/GraphEditor.vue
index 03ab94c39ad1..8b2c691f9907 100644
--- a/app/gui2/src/components/GraphEditor.vue
+++ b/app/gui2/src/components/GraphEditor.vue
@@ -11,6 +11,7 @@ import CodeEditor from '@/components/CodeEditor.vue'
 import ComponentBrowser from '@/components/ComponentBrowser.vue'
 import { type Usage } from '@/components/ComponentBrowser/input'
 import { usePlacement } from '@/components/ComponentBrowser/placement'
+import ComponentDocumentation from '@/components/ComponentDocumentation.vue'
 import DockPanel from '@/components/DockPanel.vue'
 import DocumentationEditor from '@/components/DocumentationEditor.vue'
 import GraphEdges from '@/components/GraphEditor/GraphEdges.vue'
@@ -24,6 +25,7 @@ import GraphMouse from '@/components/GraphMouse.vue'
 import PlusButton from '@/components/PlusButton.vue'
 import SceneScroller from '@/components/SceneScroller.vue'
 import TopBar from '@/components/TopBar.vue'
+import { builtinWidgets } from '@/components/widgets'
 import { useAstDocumentation } from '@/composables/astDocumentation'
 import { useDoubleClick } from '@/composables/doubleClick'
 import { keyboardBusy, keyboardBusyExceptIn, unrefElement, useEvent } from '@/composables/events'
@@ -37,6 +39,7 @@ import { provideGraphSelection } from '@/providers/graphSelection'
 import { provideStackNavigator } from '@/providers/graphStackNavigator'
 import { provideInteractionHandler } from '@/providers/interactionHandler'
 import { provideKeyboard } from '@/providers/keyboard'
+import { injectVisibility } from '@/providers/visibility'
 import { provideWidgetRegistry } from '@/providers/widgetRegistry'
 import { provideGraphStore, type NodeId } from '@/stores/graph'
 import type { RequiredImport } from '@/stores/graph/imports'
@@ -50,7 +53,7 @@ import { colorFromString } from '@/util/colors'
 import { partition } from '@/util/data/array'
 import { every, filterDefined } from '@/util/data/iterable'
 import { Rect } from '@/util/data/rect'
-import { unwrapOr } from '@/util/data/result'
+import { Err, Ok, unwrapOr, type Result } from '@/util/data/result'
 import { Vec2 } from '@/util/data/vec2'
 import { computedFallback } from '@/util/reactivity'
 import { until } from '@vueuse/core'
@@ -70,9 +73,6 @@ import {
   type ComponentInstance,
 } from 'vue'
 
-import { builtinWidgets } from '@/components/widgets'
-import { injectVisibility } from '@/providers/visibility'
-
 const keyboard = provideKeyboard()
 const projectStore = useProjectStore()
 const suggestionDb = provideSuggestionDbStore(projectStore)
@@ -101,7 +101,8 @@ const graphNavigator: GraphNavigator = provideGraphNavigator(viewportNode, keybo
 
 // === Client saved state ===
 
-const storedShowDocumentationEditor = ref()
+const storedShowRightDock = ref()
+const storedRightDockTab = ref()
 const rightDockWidth = ref<number>()
 
 /**
@@ -119,6 +120,8 @@ interface GraphStoredState {
   s: number
   /** Whether or not the documentation panel is open. */
   doc: boolean
+  /** The selected tab in the right-side panel. */
+  rtab: string
   /** Width of the right dock. */
   rwidth: number | null
 }
@@ -145,7 +148,8 @@ useSyncLocalStorage<GraphStoredState>({
       x: graphNavigator.targetCenter.x,
       y: graphNavigator.targetCenter.y,
       s: graphNavigator.targetScale,
-      doc: storedShowDocumentationEditor.value,
+      doc: storedShowRightDock.value,
+      rtab: storedRightDockTab.value,
       rwidth: rightDockWidth.value ?? null,
     }
   },
@@ -154,7 +158,8 @@ useSyncLocalStorage<GraphStoredState>({
       const pos = new Vec2(restored.x ?? 0, restored.y ?? 0)
       const scale = restored.s ?? 1
       graphNavigator.setCenterAndScale(pos, scale)
-      storedShowDocumentationEditor.value = restored.doc ?? undefined
+      storedShowRightDock.value = restored.doc ?? undefined
+      storedRightDockTab.value = restored.rtab ?? undefined
       rightDockWidth.value = restored.rwidth ?? undefined
     } else {
       await until(visibleAreasReady).toBe(true)
@@ -352,27 +357,22 @@ const graphBindingsHandler = graphBindings.handler({
     showColorPicker.value = true
   },
   openDocumentation() {
-    const failure = 'Unable to show node documentation'
-    const selected = getSoleSelectionOrToast(failure)
-    if (selected == null) return
-    const suggestion = graphStore.db.nodeMainSuggestion.lookup(selected)
-    const documentation = suggestion && suggestionDocumentationUrl(suggestion)
-    if (documentation) {
-      window.open(documentation, '_blank')
-    } else {
-      toasts.userActionFailed.show(`${failure}: no documentation available for selected node.`)
+    const result = tryGetSelectionDocUrl()
+    if (!result.ok) {
+      toasts.userActionFailed.show(result.error.message('Unable to show node documentation'))
+      return
     }
+    window.open(result.value, '_blank')
   },
 })
 
-function getSoleSelectionOrToast(context: string) {
-  if (nodeSelection.selected.size === 0) {
-    toasts.userActionFailed.show(`${context}: no node selected.`)
-  } else if (nodeSelection.selected.size > 1) {
-    toasts.userActionFailed.show(`${context}: multiple nodes selected.`)
-  } else {
-    return set.first(nodeSelection.selected)
-  }
+function tryGetSelectionDocUrl() {
+  const selected = nodeSelection.tryGetSoleSelection()
+  if (!selected.ok) return selected
+  const suggestion = graphStore.db.getNodeMainSuggestion(selected.value)
+  const documentation = suggestion && suggestionDocumentationUrl(suggestion)
+  if (!documentation) return Err('No external documentation available for selected component')
+  return Ok(documentation)
 }
 
 const { handleClick } = useDoubleClick(
@@ -405,15 +405,16 @@ const codeEditorHandler = codeEditorBindings.handler({
 
 const docEditor = shallowRef<ComponentInstance<typeof DocumentationEditor>>()
 const documentationEditorArea = computed(() => unrefElement(docEditor))
-const showDocumentationEditor = computedFallback(
-  storedShowDocumentationEditor,
+const showRightDock = computedFallback(
+  storedShowRightDock,
   // Show documentation editor when documentation exists on first graph visit.
   () => !!documentation.state.value,
 )
+const rightDockTab = computedFallback(storedRightDockTab, () => 'docs')
 
 const documentationEditorHandler = documentationEditorBindings.handler({
   toggle() {
-    showDocumentationEditor.value = !showDocumentationEditor.value
+    showRightDock.value = !showRightDock.value
   },
 })
 
@@ -662,6 +663,7 @@ const groupColors = computed(() => {
   <div
     class="GraphEditor"
     :class="{ draggingEdge: graphStore.mouseEditedEdge != null }"
+    :style="groupColors"
     @dragover.prevent
     @drop.prevent="handleFileDrop($event)"
   >
@@ -669,7 +671,6 @@ const groupColors = computed(() => {
       <div
         ref="viewportNode"
         class="viewport"
-        :style="groupColors"
         v-on.="graphNavigator.pointerEvents"
         v-on..="nodeSelection.events"
         @click="handleClick"
@@ -696,10 +697,10 @@ const groupColors = computed(() => {
           v-model:recordMode="projectStore.recordMode"
           v-model:showColorPicker="showColorPicker"
           v-model:showCodeEditor="showCodeEditor"
-          v-model:showDocumentationEditor="showDocumentationEditor"
+          v-model:showDocumentationEditor="showRightDock"
           :zoomLevel="100.0 * graphNavigator.targetScale"
           :componentsSelected="nodeSelection.selected.size"
-          :class="{ extraRightSpace: !showDocumentationEditor }"
+          :class="{ extraRightSpace: !showRightDock }"
           @fitToAllClicked="zoomToSelected"
           @zoomIn="graphNavigator.stepZoom(+1)"
           @zoomOut="graphNavigator.stepZoom(-1)"
@@ -719,15 +720,21 @@ const groupColors = computed(() => {
         </Suspense>
       </BottomPanel>
     </div>
-    <DockPanel v-model:show="showDocumentationEditor" v-model:size="rightDockWidth">
-      <template #default="{ toolbar }">
+    <DockPanel
+      v-model:show="showRightDock"
+      v-model:size="rightDockWidth"
+      v-model:tab="rightDockTab"
+    >
+      <template #docs>
         <DocumentationEditor
           ref="docEditor"
           :modelValue="documentation.state.value"
-          :toolbarContainer="toolbar"
           @update:modelValue="documentation.set"
         />
       </template>
+      <template #help>
+        <ComponentDocumentation />
+      </template>
     </DockPanel>
   </div>
 </template>
diff --git a/app/gui2/src/components/GraphEditor/GraphNode.vue b/app/gui2/src/components/GraphEditor/GraphNode.vue
index 5cf6cbfbbe62..39655a688051 100644
--- a/app/gui2/src/components/GraphEditor/GraphNode.vue
+++ b/app/gui2/src/components/GraphEditor/GraphNode.vue
@@ -291,7 +291,7 @@ const isRecordingOverridden = computed({
 
 const expressionInfo = computed(() => graph.db.getExpressionInfo(props.node.innerExpr.externalId))
 const executionState = computed(() => expressionInfo.value?.payload.type ?? 'Unknown')
-const suggestionEntry = computed(() => graph.db.nodeMainSuggestion.lookup(nodeId.value))
+const suggestionEntry = computed(() => graph.db.getNodeMainSuggestion(nodeId.value))
 const color = computed(() => graph.db.getNodeColorStyle(nodeId.value))
 const documentationUrl = computed(
   () => suggestionEntry.value && suggestionDocumentationUrl(suggestionEntry.value),
diff --git a/app/gui2/src/components/GraphEditor/NodeWidgetTree.vue b/app/gui2/src/components/GraphEditor/NodeWidgetTree.vue
index cf400affe976..a8a35f73a141 100644
--- a/app/gui2/src/components/GraphEditor/NodeWidgetTree.vue
+++ b/app/gui2/src/components/GraphEditor/NodeWidgetTree.vue
@@ -101,7 +101,7 @@ const widgetTree = provideWidgetTree(
 )
 
 const expressionInfo = computed(() => graph.db.getExpressionInfo(props.ast.externalId))
-const suggestionEntry = computed(() => graph.db.nodeMainSuggestion.lookup(props.nodeId))
+const suggestionEntry = computed(() => graph.db.getNodeMainSuggestion(props.nodeId))
 const topLevelIcon = computed(() => {
   switch (props.nodeType) {
     default:
diff --git a/app/gui2/src/composables/selection.ts b/app/gui2/src/composables/selection.ts
index 0667d46e5580..4dd8271eea1d 100644
--- a/app/gui2/src/composables/selection.ts
+++ b/app/gui2/src/composables/selection.ts
@@ -9,6 +9,7 @@ import { intersectionSize } from '@/util/data/set'
 import type { Vec2 } from '@/util/data/vec2'
 import { dataAttribute, elementHierarchy } from '@/util/dom'
 import * as set from 'lib0/set'
+import { Err, Ok, type Result } from 'shared/util/data/result'
 import { computed, ref, shallowReactive, shallowRef } from 'vue'
 
 interface BaseSelectionOptions<T> {
@@ -119,6 +120,17 @@ function useSelectionImpl<T, PackedT>(
     setSelection(newSelection)
   }
 
+  /** Returns the single selected component, or an error. */
+  function tryGetSoleSelection(): Result<T, string> {
+    if (selected.value.size === 0) {
+      return Err('No component selected')
+    } else if (selected.value.size > 1) {
+      return Err('Multiple components selected')
+    } else {
+      return Ok(set.first(selected.value)!)
+    }
+  }
+
   const selectionEventHandler = selectionMouseBindings.handler({
     replace() {
       setSelection(elementsToSelect.value)
@@ -215,6 +227,7 @@ function useSelectionImpl<T, PackedT>(
     },
     committedSelection,
     setSelection,
+    tryGetSoleSelection,
     // === Selection changes ===
     anchor,
     isChanging,
diff --git a/app/gui2/src/stores/graph/graphDatabase.ts b/app/gui2/src/stores/graph/graphDatabase.ts
index 3bd7429d02ef..b82b21decab3 100644
--- a/app/gui2/src/stores/graph/graphDatabase.ts
+++ b/app/gui2/src/stores/graph/graphDatabase.ts
@@ -207,20 +207,24 @@ export class GraphDb {
     return Array.from(ports, (port) => [id, port])
   })
 
-  nodeMainSuggestion = new ReactiveMapping(this.nodeIdToNode, (_id, entry) => {
+  nodeMainSuggestionId = new ReactiveMapping(this.nodeIdToNode, (_id, entry) => {
     const expressionInfo = this.getExpressionInfo(entry.innerExpr.id)
     const method = expressionInfo?.methodCall?.methodPointer
     if (method == null) return
-    const suggestionId = this.suggestionDb.findByMethodPointer(method)
+    return this.suggestionDb.findByMethodPointer(method)
+  })
+
+  getNodeMainSuggestion(id: NodeId) {
+    const suggestionId = this.nodeMainSuggestionId.lookup(id)
     if (suggestionId == null) return
     return this.suggestionDb.get(suggestionId)
-  })
+  }
 
   nodeColor = new ReactiveMapping(this.nodeIdToNode, (id, entry) => {
     if (entry.colorOverride != null) return entry.colorOverride
     return computeNodeColor(
       () => entry.type,
-      () => tryGetIndex(this.groups.value, this.nodeMainSuggestion.lookup(id)?.groupIndex),
+      () => tryGetIndex(this.groups.value, this.getNodeMainSuggestion(id)?.groupIndex),
       () => this.getExpressionInfo(id)?.typename,
     )
   })
@@ -291,11 +295,7 @@ export class GraphDb {
   }
 
   getMethodCallInfo(id: AstId): MethodCallInfo | undefined {
-    const info = this.getExpressionInfo(id)
-    if (info == null) return
-    const payloadFuncSchema =
-      info.payload.type === 'Value' ? info.payload.functionSchema : undefined
-    const methodCall = info.methodCall ?? payloadFuncSchema
+    const methodCall = this.getMethodCall(id)
     if (methodCall == null) return
     const suggestionId = this.suggestionDb.findByMethodPointer(methodCall.methodPointer)
     if (suggestionId == null) return
diff --git a/app/ide-desktop/common/package.json b/app/ide-desktop/common/package.json
index 6e6374376eb0..08965d8c1b66 100644
--- a/app/ide-desktop/common/package.json
+++ b/app/ide-desktop/common/package.json
@@ -17,12 +17,16 @@
     "./src/utilities/data/dateTime": "./src/utilities/data/dateTime.ts",
     "./src/utilities/data/newtype": "./src/utilities/data/newtype.ts",
     "./src/utilities/data/object": "./src/utilities/data/object.ts",
+    "./src/utilities/style/tabBar": "./src/utilities/style/tabBar.ts",
     "./src/utilities/uniqueString": "./src/utilities/uniqueString.ts",
     "./src/text": "./src/text/index.ts",
     "./src/utilities/permissions": "./src/utilities/permissions.ts",
     "./src/services/Backend": "./src/services/Backend.ts",
     "./src/types": "./src/types.d.ts"
   },
+  "scripts": {
+    "test": "vitest run"
+  },
   "peerDependencies": {
     "@tanstack/query-core": "5.45.0",
     "@tanstack/vue-query": ">= 5.45.0 < 5.46.0"
@@ -32,6 +36,7 @@
     "react": "^18.3.1",
     "@tanstack/query-persist-client-core": "^5.45.0",
     "@tanstack/vue-query": ">= 5.45.0 < 5.46.0",
-    "vue": "^3.4.19"
+    "vue": "^3.4.19",
+    "vitest": "^1.3.1"
   }
 }
diff --git a/app/ide-desktop/common/src/utilities/style/__tests__/tabBar.test.ts b/app/ide-desktop/common/src/utilities/style/__tests__/tabBar.test.ts
new file mode 100644
index 000000000000..75101edc7638
--- /dev/null
+++ b/app/ide-desktop/common/src/utilities/style/__tests__/tabBar.test.ts
@@ -0,0 +1,50 @@
+import * as v from 'vitest'
+
+import * as tabBar from '../tabBar'
+
+interface TabClipPathInput {
+  bounds: { width: number; height: number }
+  radius: number
+  side?: 'top' | 'right'
+}
+
+const dashboardTabCases = [
+  {
+    input: {
+      bounds: { width: 164.2109375, height: 48 },
+      radius: 24,
+    },
+    expected:
+      'path("M 0 48 A 24 24 0 0 0 24 24 L 24 24 A 24 24 0 0 1 48 0 L 116.2109375 0 A 24 24 0 0 1 140.2109375 24 L 140.2109375 24 A 24 24 0 0 0 164.2109375 48 M 0 0")',
+  },
+  {
+    input: {
+      bounds: { width: 209.6171875, height: 48 },
+      radius: 24,
+    },
+    expected:
+      'path("M 0 48 A 24 24 0 0 0 24 24 L 24 24 A 24 24 0 0 1 48 0 L 161.6171875 0 A 24 24 0 0 1 185.6171875 24 L 185.6171875 24 A 24 24 0 0 0 209.6171875 48 M 0 0")',
+  },
+]
+
+const guiTabCases = [
+  {
+    input: {
+      bounds: { width: 44, height: 48 },
+      radius: 8,
+      side: 'right',
+    },
+    expected:
+      'path("M 0 0 A 8 8 0 0 0 8 8 L 36 8 A 8 8 0 0 1 44 16 L 44 32 A 8 8 0 0 1 36 40 L 8 40 A 8 8 0 0 0 0 48 M 44 0")',
+  },
+]
+
+v.test.each([
+  { group: 'Dashboard', cases: dashboardTabCases },
+  { group: 'GUI', cases: guiTabCases },
+])('Tab clip path: $group', ({ group, cases }) => {
+  cases.forEach(({ input, expected }) => {
+    const result = tabBar.tabClipPath(input.bounds, input.radius, (input as TabClipPathInput)?.side)
+    v.expect(result).toBe(expected)
+  })
+})
diff --git a/app/ide-desktop/common/src/utilities/style/tabBar.ts b/app/ide-desktop/common/src/utilities/style/tabBar.ts
new file mode 100644
index 000000000000..3888a8ff896d
--- /dev/null
+++ b/app/ide-desktop/common/src/utilities/style/tabBar.ts
@@ -0,0 +1,88 @@
+/** Functions that generate CSS to render the shapes in a tab bar. */
+
+// ===========
+// === Tab ===
+// ===========
+
+/** Returns a CSS clip-path for a tab of the specified dimensions. */
+export function tabClipPath(
+  bounds: Readonly<{ width: number; height: number }>,
+  radiusPx: number,
+  side: 'top' | 'right' = 'top',
+) {
+  console.log('bounds', JSON.stringify(bounds))
+  console.log('radiusPx', JSON.stringify(radiusPx))
+  console.log('side', JSON.stringify(side))
+  const sweep0 = 0
+  const sweep1 = 1
+  const xIndex = side === 'top' ? 0 : 1
+  const x1 = [bounds.width, bounds.height][xIndex]!
+  const y1 = [bounds.width, bounds.height][1 - xIndex]!
+  const orient =
+    side === 'top' ? (x: number, y: number) => [x, y] : (x: number, y: number) => [y1 - y, x]
+  const pt = (x: number, y: number) => orient(x, y).join(' ')
+  const result = path([
+    `M ${pt(0, y1)}`,
+    `A ${radiusPx} ${radiusPx} 0 0 ${sweep0} ${pt(radiusPx, y1 - radiusPx)}`,
+    `L ${pt(radiusPx, radiusPx)}`,
+    `A ${radiusPx} ${radiusPx} 0 0 ${sweep1} ${pt(radiusPx * 2, 0)}`,
+    `L ${pt(x1 - radiusPx * 2, 0)}`,
+    `A ${radiusPx} ${radiusPx} 0 0 ${sweep1} ${pt(x1 - radiusPx, radiusPx)}`,
+    `L ${pt(x1 - radiusPx, y1 - radiusPx)}`,
+    `A ${radiusPx} ${radiusPx} 0 0 ${sweep0} ${pt(x1, y1)}`,
+    `M ${pt(0, 0)}`,
+  ])
+  console.log('result', JSON.stringify(result))
+  return result
+}
+
+// ===============
+// === Tab Bar ===
+// ===============
+
+/** Returns a CSS clip-path for a tab bar of the specified dimensions and parent dimensions. */
+export function barClipPath(
+  bounds: DOMRectReadOnly,
+  rootBounds: DOMRectReadOnly,
+  radiusPx: number,
+) {
+  const tabLeft = bounds.left - rootBounds.left + radiusPx
+  const tabRight = bounds.right - rootBounds.left - radiusPx
+  const rightSegments = [
+    'M 0 0',
+    `L ${rootBounds.width + window.outerWidth} 0`,
+    `L ${rootBounds.width + window.outerWidth} ${rootBounds.height}`,
+    `L ${tabRight + radiusPx} ${rootBounds.height}`,
+    `A ${radiusPx} ${radiusPx} 0 0 1 ${tabRight} ${rootBounds.height - radiusPx}`,
+  ]
+  const leftSegments = [
+    `A ${radiusPx} ${radiusPx} 0 0 1 ${tabLeft - radiusPx} ${rootBounds.height}`,
+    `L 0 ${rootBounds.height}`,
+    'Z',
+  ]
+  const clipPath = path([
+    ...rightSegments,
+    `L ${tabRight} ${radiusPx}`,
+    `A ${radiusPx} ${radiusPx} 0 0 0 ${tabRight - radiusPx} 0`,
+    `L ${tabLeft + radiusPx} 0`,
+    `A ${radiusPx} ${radiusPx} 0 0 0 ${tabLeft} ${radiusPx}`,
+    `L ${tabLeft} ${rootBounds.height - radiusPx}`,
+    ...leftSegments,
+  ])
+  const rootClipPath = path([
+    ...rightSegments,
+    `A ${radiusPx} ${radiusPx} 0 0 1 ${tabRight - radiusPx} ${rootBounds.height}`,
+    `L ${tabLeft + radiusPx} ${rootBounds.height}`,
+    `A ${radiusPx} ${radiusPx} 0 0 1 ${tabLeft} ${rootBounds.height - radiusPx}`,
+    ...leftSegments,
+  ])
+  return { clipPath, rootClipPath }
+}
+
+// ===============
+// === Helpers ===
+// ===============
+
+function path(segments: string[]) {
+  return `path("${segments.join(' ')}")`
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c1dc1bd5aeca..cea26abd2aea 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -700,6 +700,9 @@ importers:
       react:
         specifier: ^18.3.1
         version: 18.3.1
+      vitest:
+        specifier: ^1.3.1
+        version: 1.6.0(@types/node@20.11.21)(jsdom@24.1.0)(lightningcss@1.25.1)
       vue:
         specifier: ^3.4.19
         version: 3.4.31(typescript@5.5.3)

From c2c6712b77cf8fc7aba8a478e6169ee1dceb23ce Mon Sep 17 00:00:00 2001
From: Pavel Marek <pavel.marek@enso.org>
Date: Wed, 7 Aug 2024 17:29:57 +0200
Subject: [PATCH 02/23] WithWarnings uses EnsoHashMap to speed things up
 (#10555)

Majority of warnings handling is now done via newly introduced nodes. Moreover, the underlying representation of warnings storage in `WithWarnings` was changed from `Warning[]` to `EnsoHashMap`.

# Important Notes
- Remove `ArrayRope`.
---
 build.sbt                                     |   1 +
 .../Standard/Base/0.0.0-dev/src/Warning.enso  |  30 --
 .../dsl/test/InliningBuiltinsTest.java        | 165 ++++----
 .../org/enso/compiler/benchmarks/Utils.java   |   2 +-
 .../semantic/WarningBenchmarks.java           |  47 ++-
 .../instrument/job/VisualizationResult.java   |   2 +-
 .../job/ProgramExecutionSupport.scala         |  21 +-
 .../enso/interpreter/test/WarningsTest.java   |  44 +--
 .../callable/IndirectInvokeCallableNode.java  |  12 +-
 .../IndirectInvokeConversionNode.java         |  21 +-
 .../callable/IndirectInvokeMethodNode.java    |  21 +-
 .../node/callable/InvokeCallableNode.java     |  17 +-
 .../node/callable/InvokeConversionNode.java   |  22 +-
 .../node/callable/InvokeMethodNode.java       |  33 +-
 .../callable/dispatch/CallOptimiserNode.java  |   4 +-
 .../dispatch/LoopingCallOptimiserNode.java    |  23 +-
 .../dispatch/SimpleCallOptimiserNode.java     |   4 +-
 .../node/controlflow/caseexpr/CaseNode.java   |  11 +-
 .../interop/syntax/HostValueToEnsoNode.java   |  11 +-
 .../expression/builtin/io/PrintlnNode.java    |   2 +-
 .../builtin/meta/EqualsComplexNode.java       |   2 +-
 .../builtin/meta/EqualsSimpleNode.java        |   2 +-
 .../expression/builtin/meta/HashCodeNode.java |   2 +-
 .../builtin/ordering/LessThanNode.java        |   2 +-
 .../builtin/ordering/SortVectorNode.java      |  21 +-
 .../builtin/text/util/ExpectStringNode.java   |   2 +-
 .../runtime/control/TailCallException.java    |  16 +-
 .../interpreter/runtime/data/ArrayRope.java   | 123 ------
 .../interpreter/runtime/data/atom/Atom.java   |   2 +-
 .../runtime/data/atom/InstantiateNode.java    |  23 +-
 .../runtime/data/hash/EnsoHashMap.java        |   1 +
 .../runtime/data/hash/EnsoHashMapBuilder.java |  72 +++-
 .../data/hash/HashMapInsertAllNode.java       |  73 ++++
 .../runtime/data/hash/HashMapInsertNode.java  |   4 +
 .../runtime/data/hash/HashMapSizeNode.java    |   4 +
 .../runtime/data/vector/Array.java            | 132 +++++--
 .../runtime/data/vector/ArrayBuilder.java     |  33 +-
 .../runtime/data/vector/ArrayLikeAtNode.java  |  10 +-
 .../runtime/data/vector/ArrayLikeHelpers.java |   4 +-
 .../data/vector/ArrayLikeLengthNode.java      |   2 +
 .../runtime/data/vector/ArraySlice.java       |  21 +-
 .../runtime/data/vector/Vector.java           |  30 +-
 .../interpreter/runtime/error/Warning.java    | 258 ------------
 .../runtime/error/WithWarnings.java           | 374 ------------------
 .../runtime/library/dispatch/TypeOfNode.java  |   6 +-
 .../enso/interpreter/runtime/type/Types.java  |   6 +-
 .../runtime/warning/AppendWarningNode.java    | 209 ++++++++++
 .../runtime/warning/GetAllWarningsNode.java   |  70 ++++
 .../runtime/warning/LimitReachedNode.java     |  32 ++
 .../runtime/warning/SetWarningsNode.java      | 118 ++++++
 .../interpreter/runtime/warning/Warning.java  | 134 +++++++
 .../{error => warning}/WarningsLibrary.java   |  13 +-
 .../runtime/warning/WithWarnings.java         | 282 +++++++++++++
 .../enso/interpreter/dsl/AcceptsWarning.java  |   6 +-
 .../enso/interpreter/dsl/BuiltinMethod.java   |   2 +-
 .../enso/interpreter/dsl/MethodProcessor.java |  75 ++--
 .../builtins/SpecializedMethodParameter.java  |   2 +-
 .../builtins/SpecializedMethodsGenerator.java |  17 +-
 .../src/Semantic/Warnings_Spec.enso           |  25 --
 59 files changed, 1540 insertions(+), 1163 deletions(-)
 delete mode 100644 engine/runtime/src/main/java/org/enso/interpreter/runtime/data/ArrayRope.java
 create mode 100644 engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/HashMapInsertAllNode.java
 delete mode 100644 engine/runtime/src/main/java/org/enso/interpreter/runtime/error/Warning.java
 delete mode 100644 engine/runtime/src/main/java/org/enso/interpreter/runtime/error/WithWarnings.java
 create mode 100644 engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/AppendWarningNode.java
 create mode 100644 engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/GetAllWarningsNode.java
 create mode 100644 engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/LimitReachedNode.java
 create mode 100644 engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/SetWarningsNode.java
 create mode 100644 engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/Warning.java
 rename engine/runtime/src/main/java/org/enso/interpreter/runtime/{error => warning}/WarningsLibrary.java (85%)
 create mode 100644 engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/WithWarnings.java

diff --git a/build.sbt b/build.sbt
index eb62bc316551..5158291b3eb0 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1422,6 +1422,7 @@ lazy val `interpreter-dsl-test` =
     )
     .dependsOn(`interpreter-dsl`)
     .dependsOn(`runtime`)
+    .dependsOn(`test-utils`)
 
 // ============================================================================
 // === Sub-Projects ===========================================================
diff --git a/distribution/lib/Standard/Base/0.0.0-dev/src/Warning.enso b/distribution/lib/Standard/Base/0.0.0-dev/src/Warning.enso
index b4bae445f414..213aec0af397 100644
--- a/distribution/lib/Standard/Base/0.0.0-dev/src/Warning.enso
+++ b/distribution/lib/Standard/Base/0.0.0-dev/src/Warning.enso
@@ -255,36 +255,6 @@ type Warning
     origin : Vector Stack_Trace_Element
     origin self = @Builtin_Method "Warning.origin"
 
-    ## PRIVATE
-       ADVANCED
-
-       A list of locations where the warning was reassigned in the order of
-       latest-first.
-
-       Warnings are reassigned whenever they interact with specific language
-       elements:
-       - When pattern matching, the warnings of the scrutinee will be reassigned
-         to the `case` expression result.
-       - When calling a method, warnings assigned to `self` will be reassigned to
-         the method return value.
-       - When calling a polyglot function or method, warnings assigned to any
-         arguments will be accumulated in the return value.
-       - The standard library methods reassign warnings such that their dataflow
-         nature is preserved.
-    reassignments : Vector Stack_Trace_Element
-    reassignments self =
-        Vector.from_polyglot_array self.get_reassignments . map r->
-            loc = case Polyglot.has_source_location r of
-                False -> Nothing
-                True -> Source_Location.Value (Polyglot.get_source_location r)
-            Stack_Trace_Element.Value (Polyglot.get_executable_name r) loc
-
-    ## PRIVATE
-
-       Builtin method for getting the list of locations where the warnings was reassigned.
-       Should use `Warning.reassignments` instead.
-    get_reassignments : Array Any
-    get_reassignments self = @Builtin_Method "Warning.get_reassignments"
 
 ## PRIVATE
 
diff --git a/engine/interpreter-dsl-test/src/test/java/org/enso/interpreter/dsl/test/InliningBuiltinsTest.java b/engine/interpreter-dsl-test/src/test/java/org/enso/interpreter/dsl/test/InliningBuiltinsTest.java
index cf56ef64fae4..1f1ed3cd285f 100644
--- a/engine/interpreter-dsl-test/src/test/java/org/enso/interpreter/dsl/test/InliningBuiltinsTest.java
+++ b/engine/interpreter-dsl-test/src/test/java/org/enso/interpreter/dsl/test/InliningBuiltinsTest.java
@@ -8,6 +8,7 @@
 import com.oracle.truffle.api.nodes.RootNode;
 import org.enso.interpreter.node.InlineableNode;
 import org.enso.interpreter.runtime.callable.function.Function;
+import org.enso.test.utils.ContextUtils;
 import org.junit.Test;
 
 public class InliningBuiltinsTest {
@@ -17,26 +18,33 @@ public class InliningBuiltinsTest {
    */
   @Test
   public void executeWithoutVirtualFrame() {
-    var fn = InliningBuiltinsInMethodGen.makeFunction(null);
-    if (fn.getCallTarget().getRootNode() instanceof InlineableNode.Root root) {
-      var call = root.createInlineableNode();
-      var clazz = call.getClass();
-      assertEquals("InlineableNode", clazz.getSuperclass().getSimpleName());
-      assertEquals(
-          "org.enso.interpreter.node.InlineableNode$Root",
-          clazz.getEnclosingClass().getInterfaces()[0].getName());
+    try (var ctx = ContextUtils.createDefaultContext()) {
+      ContextUtils.executeInContext(
+          ctx,
+          () -> {
+            var fn = InliningBuiltinsInMethodGen.makeFunction(null);
+            if (fn.getCallTarget().getRootNode() instanceof InlineableNode.Root root) {
+              var call = root.createInlineableNode();
+              var clazz = call.getClass();
+              assertEquals("InlineableNode", clazz.getSuperclass().getSimpleName());
+              assertEquals(
+                  "org.enso.interpreter.node.InlineableNode$Root",
+                  clazz.getEnclosingClass().getInterfaces()[0].getName());
 
-      var res =
-          WithFrame.invoke(
-              (frame) -> {
-                return call.call(
-                    frame,
-                    Function.ArgumentsHelper.buildArguments(
-                        null, null, new Object[] {null, 5L, 7L}));
-              });
-      assertEquals(12L, res);
-    } else {
-      fail("It is inlineable: " + fn.getCallTarget().getRootNode());
+              var res =
+                  WithFrame.invoke(
+                      (frame) -> {
+                        return call.call(
+                            frame,
+                            Function.ArgumentsHelper.buildArguments(
+                                null, null, new Object[] {null, 5L, 7L}));
+                      });
+              assertEquals(12L, res);
+            } else {
+              fail("It is inlineable: " + fn.getCallTarget().getRootNode());
+            }
+            return null;
+          });
     }
   }
 
@@ -45,22 +53,29 @@ public void executeWithoutVirtualFrame() {
    */
   @Test
   public void executeWithVirtualFrame() {
-    var fn = InliningBuiltinsOutMethodGen.makeFunction(null);
-    if (fn.getCallTarget().getRootNode() instanceof InlineableNode.Root root) {
-      fail("The node isn't inlineable: " + fn.getCallTarget().getRootNode());
-    } else {
-      var call = DirectCallNode.create(fn.getCallTarget());
-      var clazz = call.getClass().getSuperclass();
-      assertEquals("com.oracle.truffle.api.nodes.DirectCallNode", clazz.getName());
+    try (var ctx = ContextUtils.createDefaultContext()) {
+      ContextUtils.executeInContext(
+          ctx,
+          () -> {
+            var fn = InliningBuiltinsOutMethodGen.makeFunction(null);
+            if (fn.getCallTarget().getRootNode() instanceof InlineableNode.Root root) {
+              fail("The node isn't inlineable: " + fn.getCallTarget().getRootNode());
+            } else {
+              var call = DirectCallNode.create(fn.getCallTarget());
+              var clazz = call.getClass().getSuperclass();
+              assertEquals("com.oracle.truffle.api.nodes.DirectCallNode", clazz.getName());
 
-      var res =
-          WithFrame.invoke(
-              (frame) -> {
-                return call.call(
-                    Function.ArgumentsHelper.buildArguments(
-                        null, null, new Object[] {null, 3L, 9L}));
-              });
-      assertEquals(12L, res);
+              var res =
+                  WithFrame.invoke(
+                      (frame) -> {
+                        return call.call(
+                            Function.ArgumentsHelper.buildArguments(
+                                null, null, new Object[] {null, 3L, 9L}));
+                      });
+              assertEquals(12L, res);
+            }
+            return null;
+          });
     }
   }
 
@@ -69,22 +84,29 @@ public void executeWithVirtualFrame() {
    */
   @Test
   public void executeWhenNeedsVirtualFrame() {
-    var fn = InliningBuiltinsNeedsMethodGen.makeFunction(null);
-    if (fn.getCallTarget().getRootNode() instanceof InlineableNode.Root root) {
-      fail("The node isn't inlineable: " + fn.getCallTarget().getRootNode());
-    } else {
-      var call = DirectCallNode.create(fn.getCallTarget());
-      var clazz = call.getClass().getSuperclass();
-      assertEquals("com.oracle.truffle.api.nodes.DirectCallNode", clazz.getName());
+    try (var ctx = ContextUtils.createDefaultContext()) {
+      ContextUtils.executeInContext(
+          ctx,
+          () -> {
+            var fn = InliningBuiltinsNeedsMethodGen.makeFunction(null);
+            if (fn.getCallTarget().getRootNode() instanceof InlineableNode.Root root) {
+              fail("The node isn't inlineable: " + fn.getCallTarget().getRootNode());
+            } else {
+              var call = DirectCallNode.create(fn.getCallTarget());
+              var clazz = call.getClass().getSuperclass();
+              assertEquals("com.oracle.truffle.api.nodes.DirectCallNode", clazz.getName());
 
-      var res =
-          WithFrame.invoke(
-              (frame) -> {
-                return call.call(
-                    Function.ArgumentsHelper.buildArguments(
-                        null, null, new Object[] {null, 3L, 9L}));
-              });
-      assertEquals(12L, res);
+              var res =
+                  WithFrame.invoke(
+                      (frame) -> {
+                        return call.call(
+                            Function.ArgumentsHelper.buildArguments(
+                                null, null, new Object[] {null, 3L, 9L}));
+                      });
+              assertEquals(12L, res);
+            }
+            return null;
+          });
     }
   }
 
@@ -93,26 +115,33 @@ public void executeWhenNeedsVirtualFrame() {
    */
   @Test
   public void executeWhenNeedNotVirtualFrame() {
-    var fn = InliningBuiltinsNeedNotMethodGen.makeFunction(null);
-    if (fn.getCallTarget().getRootNode() instanceof InlineableNode.Root root) {
-      var call = root.createInlineableNode();
-      var clazz = call.getClass();
-      assertEquals("InlineableNode", clazz.getSuperclass().getSimpleName());
-      assertEquals(
-          "org.enso.interpreter.node.InlineableNode$Root",
-          clazz.getEnclosingClass().getInterfaces()[0].getName());
+    try (var ctx = ContextUtils.createDefaultContext()) {
+      ContextUtils.executeInContext(
+          ctx,
+          () -> {
+            var fn = InliningBuiltinsNeedNotMethodGen.makeFunction(null);
+            if (fn.getCallTarget().getRootNode() instanceof InlineableNode.Root root) {
+              var call = root.createInlineableNode();
+              var clazz = call.getClass();
+              assertEquals("InlineableNode", clazz.getSuperclass().getSimpleName());
+              assertEquals(
+                  "org.enso.interpreter.node.InlineableNode$Root",
+                  clazz.getEnclosingClass().getInterfaces()[0].getName());
 
-      var res =
-          WithFrame.invoke(
-              (frame) -> {
-                return call.call(
-                    frame,
-                    Function.ArgumentsHelper.buildArguments(
-                        null, null, new Object[] {null, 5L, 7L}));
-              });
-      assertEquals(12L, res);
-    } else {
-      fail("It is inlineable: " + fn.getCallTarget().getRootNode());
+              var res =
+                  WithFrame.invoke(
+                      (frame) -> {
+                        return call.call(
+                            frame,
+                            Function.ArgumentsHelper.buildArguments(
+                                null, null, new Object[] {null, 5L, 7L}));
+                      });
+              assertEquals(12L, res);
+            } else {
+              fail("It is inlineable: " + fn.getCallTarget().getRootNode());
+            }
+            return null;
+          });
     }
   }
 
diff --git a/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/Utils.java b/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/Utils.java
index 56205100db1b..720213bf7416 100644
--- a/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/Utils.java
+++ b/engine/runtime-benchmarks/src/main/java/org/enso/compiler/benchmarks/Utils.java
@@ -27,7 +27,7 @@ public static Context.Builder createDefaultContextBuilder() {
         .option(
             RuntimeOptions.LANGUAGE_HOME_OVERRIDE,
             Paths.get("../../distribution/component").toFile().getAbsolutePath())
-        .option(RuntimeOptions.LOG_LEVEL, Level.WARNING.getName())
+        .option(RuntimeOptions.LOG_LEVEL, Level.INFO.getName())
         .option(RuntimeOptions.DISABLE_IR_CACHES, "true")
         .option(RuntimeOptions.STRICT_ERRORS, "true")
         .option("engine.CompilationFailureAction", "Print")
diff --git a/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/WarningBenchmarks.java b/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/WarningBenchmarks.java
index 24196a4dd268..b6b78b018166 100644
--- a/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/WarningBenchmarks.java
+++ b/engine/runtime-benchmarks/src/main/java/org/enso/interpreter/bench/benchmarks/semantic/WarningBenchmarks.java
@@ -73,29 +73,34 @@ public void initializeBench(BenchmarkParams params) throws IOException {
 
     benchmarkName = SrcUtil.findName(params);
 
-    var code =
-        new StringBuilder(
-            """
+    var benchCode =
+        """
         from Standard.Base import all
 
         vec_sum_bench : Vector Integer -> Integer
         vec_sum_bench vec =
             vec.fold 0 (x->y->x+y)
+        """;
+
+    var setupCode =
+        new StringBuilder(
+            """
+        from Standard.Base import all
 
-        create_vec size elem =
+        create_vec size elem = Runtime.no_inline <|
             Vector.fill size elem
 
         elem =
             42
 
-        elem_const_with_warning =
+        elem_const_with_warning = Runtime.no_inline <|
             x = 42
             Warning.attach "Foo!" x
 
-        elem_with_warning v =
+        elem_with_warning v = Runtime.no_inline <|
             Warning.attach "Foo!" v
 
-        map_vector_with_warnings vec =
+        map_vector_with_warnings vec = Runtime.no_inline <|
             vec.map (e-> elem_with_warning e)
         """);
 
@@ -103,31 +108,37 @@ public void initializeBench(BenchmarkParams params) throws IOException {
     var randomIntVectorName = "vector_with_random_values";
     var vectorWithRandomValues =
         generateRandomVector(random, randomIntVectorName, INPUT_DIFF_VEC_SIZE, 3_000);
-    code.append(vectorWithRandomValues.repr());
+    setupCode.append(vectorWithRandomValues.repr());
     randomVectorSum = vectorWithRandomValues.sum();
 
-    var src = SrcUtil.source(benchmarkName, code.toString());
-    Value module = ctx.eval(src);
-    vecSumBench =
-        Objects.requireNonNull(
-            module.invokeMember(MethodNames.Module.EVAL_EXPRESSION, "vec_sum_bench"));
+    var setupSrc = SrcUtil.source(benchmarkName + "_Setup", setupCode.toString());
+    Value setupModule = ctx.eval(setupSrc);
     createVec =
         Objects.requireNonNull(
-            module.invokeMember(MethodNames.Module.EVAL_EXPRESSION, "create_vec"));
+            setupModule.invokeMember(MethodNames.Module.EVAL_EXPRESSION, "create_vec"));
     mapVecWithWarnings =
         Objects.requireNonNull(
-            module.invokeMember(MethodNames.Module.EVAL_EXPRESSION, "map_vector_with_warnings"));
+            setupModule.invokeMember(
+                MethodNames.Module.EVAL_EXPRESSION, "map_vector_with_warnings"));
     constElem =
-        Objects.requireNonNull(module.invokeMember(MethodNames.Module.EVAL_EXPRESSION, "elem"));
+        Objects.requireNonNull(
+            setupModule.invokeMember(MethodNames.Module.EVAL_EXPRESSION, "elem"));
     constElemWithWarning =
         Objects.requireNonNull(
-            module.invokeMember(MethodNames.Module.EVAL_EXPRESSION, "elem_const_with_warning"));
+            setupModule.invokeMember(
+                MethodNames.Module.EVAL_EXPRESSION, "elem_const_with_warning"));
     noWarningsVec = createVec.execute(INPUT_VEC_SIZE, constElem);
     sameWarningVec = createVec.execute(INPUT_VEC_SIZE, constElemWithWarning);
     randomVec =
         Objects.requireNonNull(
-            module.invokeMember(MethodNames.Module.EVAL_EXPRESSION, randomIntVectorName));
+            setupModule.invokeMember(MethodNames.Module.EVAL_EXPRESSION, randomIntVectorName));
     randomElemsWithWarningsVec = mapVecWithWarnings.execute(randomVec);
+
+    var benchSrc = SrcUtil.source(benchmarkName + "_Bench", benchCode);
+    Value benchModule = ctx.eval(benchSrc);
+    vecSumBench =
+        Objects.requireNonNull(
+            benchModule.invokeMember(MethodNames.Module.EVAL_EXPRESSION, "vec_sum_bench"));
   }
 
   @TearDown
diff --git a/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/job/VisualizationResult.java b/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/job/VisualizationResult.java
index 11db29b25452..7b03f23894ab 100644
--- a/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/job/VisualizationResult.java
+++ b/engine/runtime-instrument-common/src/main/java/org/enso/interpreter/instrument/job/VisualizationResult.java
@@ -5,7 +5,7 @@
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import java.nio.charset.StandardCharsets;
 import org.enso.interpreter.runtime.data.text.Text;
-import org.enso.interpreter.runtime.error.WithWarnings;
+import org.enso.interpreter.runtime.warning.WithWarnings;
 
 public final class VisualizationResult {
   private VisualizationResult() {}
diff --git a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/ProgramExecutionSupport.scala b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/ProgramExecutionSupport.scala
index d555e336cbaa..17d4c65c696e 100644
--- a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/ProgramExecutionSupport.scala
+++ b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/ProgramExecutionSupport.scala
@@ -22,12 +22,7 @@ import org.enso.interpreter.runtime.`type`.{Types, TypesGen}
 import org.enso.interpreter.runtime.data.atom.AtomConstructor
 import org.enso.interpreter.runtime.callable.function.Function
 import org.enso.interpreter.runtime.control.ThreadInterruptedException
-import org.enso.interpreter.runtime.error.{
-  DataflowError,
-  PanicSentinel,
-  WarningsLibrary,
-  WithWarnings
-}
+import org.enso.interpreter.runtime.error.{DataflowError, PanicSentinel}
 import org.enso.interpreter.service.ExecutionService.{
   ExpressionCall,
   ExpressionValue,
@@ -41,6 +36,11 @@ import org.enso.interpreter.service.error.{
   VisualizationException
 }
 import org.enso.common.LanguageInfo
+import org.enso.interpreter.runtime.warning.{
+  Warning,
+  WarningsLibrary,
+  WithWarnings
+}
 import org.enso.polyglot.debugger.ExecutedVisualization
 import org.enso.polyglot.runtime.Runtime.Api
 import org.enso.polyglot.runtime.Runtime.Api.{ContextId, ExecutionResult}
@@ -419,12 +419,9 @@ object ProgramExecutionSupport {
                 value.getValue
               )
             ) {
-              val warnings =
-                WarningsLibrary.getUncached.getWarnings(
-                  value.getValue,
-                  null,
-                  false
-                )
+              val warnsMap =
+                WarningsLibrary.getUncached.getWarnings(value.getValue, false)
+              val warnings      = Warning.fromMapToArray(warnsMap)
               val warningsCount = warnings.length
               val warning =
                 if (warningsCount > 0) {
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/WarningsTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/WarningsTest.java
index 47156b88e99c..fd0138607c64 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/WarningsTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/WarningsTest.java
@@ -6,12 +6,11 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import org.enso.common.LanguageInfo;
 import org.enso.common.MethodNames;
 import org.enso.interpreter.runtime.EnsoContext;
-import org.enso.interpreter.runtime.error.Warning;
-import org.enso.interpreter.runtime.error.WarningsLibrary;
-import org.enso.interpreter.runtime.error.WithWarnings;
+import org.enso.interpreter.runtime.warning.AppendWarningNode;
+import org.enso.interpreter.runtime.warning.Warning;
+import org.enso.interpreter.runtime.warning.WithWarnings;
 import org.enso.test.utils.ContextUtils;
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.PolyglotException;
@@ -33,11 +32,7 @@ public class WarningsTest {
   public static void initEnsoContext() {
     ctx = ContextUtils.createDefaultContext();
     generator = ValuesGenerator.create(ctx, ValuesGenerator.Language.ENSO);
-    ensoContext =
-        (EnsoContext)
-            ctx.getBindings(LanguageInfo.ID)
-                .invokeMember(MethodNames.TopScope.LEAK_CONTEXT)
-                .asHostObject();
+    ensoContext = ContextUtils.leakContext(ctx);
     var module =
         ctx.eval(
             "enso",
@@ -57,19 +52,22 @@ public static void disposeContext() {
 
   @Test
   public void doubleWithWarningsWrap() {
-    var warn1 = Warning.create(ensoContext, "w1", this);
-    var warn2 = Warning.create(ensoContext, "w2", this);
-    var value = 42L;
-
-    var with1 = WithWarnings.wrap(ensoContext, value, warn1);
-    var with2 = WithWarnings.wrap(ensoContext, with1, warn2);
-
-    assertEquals(value, with1.getValue());
-    assertEquals(value, with2.getValue());
-    Assert.assertArrayEquals(
-        new Object[] {warn1}, with1.getWarningsArray(WarningsLibrary.getUncached(), false));
-    Assert.assertArrayEquals(
-        new Object[] {warn1, warn2}, with2.getWarningsArray(WarningsLibrary.getUncached(), false));
+    ContextUtils.executeInContext(
+        ctx,
+        () -> {
+          var warn1 = Warning.create(ensoContext, "w1", this);
+          var warn2 = Warning.create(ensoContext, "w2", this);
+          var value = 42L;
+
+          var with1 = AppendWarningNode.getUncached().executeAppend(null, value, warn1);
+          var with2 = AppendWarningNode.getUncached().executeAppend(null, with1, warn2);
+
+          assertEquals(value, with1.getValue());
+          assertEquals(value, with2.getValue());
+          Assert.assertArrayEquals(new Object[] {warn1}, with1.getWarningsArray(false));
+          Assert.assertArrayEquals(new Object[] {warn1, warn2}, with2.getWarningsArray(false));
+          return null;
+        });
   }
 
   @Test
@@ -77,7 +75,7 @@ public void wrapAndUnwrap() {
     var value = 42;
     WithWarnings without;
     try {
-      without = WithWarnings.wrap(ensoContext, 42, new Warning[0]);
+      without = AppendWarningNode.getUncached().executeAppend(null, 42, new Warning[0]);
     } catch (AssertionError e) {
       // OK
       return;
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/callable/IndirectInvokeCallableNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/callable/IndirectInvokeCallableNode.java
index 91511cc4a5a3..82678222e409 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/callable/IndirectInvokeCallableNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/callable/IndirectInvokeCallableNode.java
@@ -22,10 +22,9 @@
 import org.enso.interpreter.runtime.error.DataflowError;
 import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.error.PanicSentinel;
-import org.enso.interpreter.runtime.error.Warning;
-import org.enso.interpreter.runtime.error.WarningsLibrary;
-import org.enso.interpreter.runtime.error.WithWarnings;
 import org.enso.interpreter.runtime.state.State;
+import org.enso.interpreter.runtime.warning.AppendWarningNode;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
 
 /**
  * Invokes any callable with given arguments.
@@ -74,7 +73,8 @@ Object invokeWithWarnings(
       InvokeCallableNode.ArgumentsExecutionMode argumentsExecutionMode,
       BaseNode.TailStatus isTail,
       @Cached IndirectInvokeCallableNode invokeCallableNode,
-      @CachedLibrary(limit = "3") WarningsLibrary warnings) {
+      @CachedLibrary(limit = "3") WarningsLibrary warnings,
+      @Cached AppendWarningNode appendWarningNode) {
     try {
       var result =
           invokeCallableNode.execute(
@@ -87,8 +87,8 @@ Object invokeWithWarnings(
               argumentsExecutionMode,
               isTail);
 
-      Warning[] extracted = warnings.getWarnings(warning, null, false);
-      return WithWarnings.wrap(EnsoContext.get(this), result, extracted);
+      var extracted = warnings.getWarnings(warning, false);
+      return appendWarningNode.executeAppend(null, result, extracted);
     } catch (UnsupportedMessageException e) {
       var ctx = EnsoContext.get(this);
       throw ctx.raiseAssertionPanic(this, null, e);
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/callable/IndirectInvokeConversionNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/callable/IndirectInvokeConversionNode.java
index c9d729a07ec8..3b1da776660b 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/callable/IndirectInvokeConversionNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/callable/IndirectInvokeConversionNode.java
@@ -1,5 +1,6 @@
 package org.enso.interpreter.node.callable;
 
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.GenerateUncached;
@@ -19,15 +20,16 @@
 import org.enso.interpreter.runtime.callable.UnresolvedConversion;
 import org.enso.interpreter.runtime.callable.argument.CallArgumentInfo;
 import org.enso.interpreter.runtime.callable.function.Function;
-import org.enso.interpreter.runtime.data.ArrayRope;
 import org.enso.interpreter.runtime.data.Type;
+import org.enso.interpreter.runtime.data.hash.EnsoHashMap;
 import org.enso.interpreter.runtime.data.text.Text;
 import org.enso.interpreter.runtime.error.DataflowError;
 import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.error.PanicSentinel;
-import org.enso.interpreter.runtime.error.Warning;
-import org.enso.interpreter.runtime.error.WithWarnings;
 import org.enso.interpreter.runtime.library.dispatch.TypeOfNode;
+import org.enso.interpreter.runtime.warning.AppendWarningNode;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
+import org.enso.interpreter.runtime.warning.WithWarnings;
 
 @GenerateUncached
 @ReportPolymorphism
@@ -157,9 +159,16 @@ Object doWarning(
       InvokeCallableNode.ArgumentsExecutionMode argumentsExecutionMode,
       BaseNode.TailStatus isTail,
       int thatArgumentPosition,
-      @Cached IndirectInvokeConversionNode childDispatch) {
+      @Cached IndirectInvokeConversionNode childDispatch,
+      @Cached AppendWarningNode appendWarningNode,
+      @CachedLibrary(limit = "3") WarningsLibrary warnsLib) {
     arguments[thatArgumentPosition] = that.getValue();
-    ArrayRope<Warning> warnings = that.getReassignedWarningsAsRope(this, false);
+    EnsoHashMap warnings;
+    try {
+      warnings = warnsLib.getWarnings(that, false);
+    } catch (UnsupportedMessageException e) {
+      throw CompilerDirectives.shouldNotReachHere(e);
+    }
     Object result =
         childDispatch.execute(
             frame,
@@ -173,7 +182,7 @@ Object doWarning(
             argumentsExecutionMode,
             isTail,
             thatArgumentPosition);
-    return WithWarnings.appendTo(EnsoContext.get(this), result, warnings);
+    return appendWarningNode.executeAppend(null, result, warnings);
   }
 
   @Specialization(guards = "interop.isString(that)")
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/callable/IndirectInvokeMethodNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/callable/IndirectInvokeMethodNode.java
index d1ca1e58722f..5512e7dcea5e 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/callable/IndirectInvokeMethodNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/callable/IndirectInvokeMethodNode.java
@@ -1,5 +1,6 @@
 package org.enso.interpreter.node.callable;
 
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
@@ -24,14 +25,15 @@
 import org.enso.interpreter.runtime.callable.UnresolvedSymbol;
 import org.enso.interpreter.runtime.callable.argument.CallArgumentInfo;
 import org.enso.interpreter.runtime.callable.function.Function;
-import org.enso.interpreter.runtime.data.ArrayRope;
+import org.enso.interpreter.runtime.data.hash.EnsoHashMap;
 import org.enso.interpreter.runtime.data.text.Text;
 import org.enso.interpreter.runtime.error.DataflowError;
 import org.enso.interpreter.runtime.error.PanicSentinel;
-import org.enso.interpreter.runtime.error.Warning;
-import org.enso.interpreter.runtime.error.WithWarnings;
 import org.enso.interpreter.runtime.library.dispatch.TypesLibrary;
 import org.enso.interpreter.runtime.state.State;
+import org.enso.interpreter.runtime.warning.AppendWarningNode;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
+import org.enso.interpreter.runtime.warning.WithWarnings;
 
 @GenerateUncached
 @ReportPolymorphism
@@ -129,9 +131,16 @@ Object doWarning(
       InvokeCallableNode.ArgumentsExecutionMode argumentsExecutionMode,
       BaseNode.TailStatus isTail,
       int thisArgumentPosition,
-      @Cached IndirectInvokeMethodNode childDispatch) {
+      @Cached IndirectInvokeMethodNode childDispatch,
+      @Cached AppendWarningNode appendWarningNode,
+      @CachedLibrary(limit = "3") WarningsLibrary warnsLib) {
     arguments[thisArgumentPosition] = self.getValue();
-    ArrayRope<Warning> warnings = self.getReassignedWarningsAsRope(this, false);
+    EnsoHashMap warnings;
+    try {
+      warnings = warnsLib.getWarnings(self, false);
+    } catch (UnsupportedMessageException e) {
+      throw CompilerDirectives.shouldNotReachHere(e);
+    }
     Object result =
         childDispatch.execute(
             frame,
@@ -144,7 +153,7 @@ Object doWarning(
             argumentsExecutionMode,
             isTail,
             thisArgumentPosition);
-    return WithWarnings.appendTo(EnsoContext.get(this), result, warnings);
+    return appendWarningNode.executeAppend(null, result, warnings);
   }
 
   @Specialization
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/callable/InvokeCallableNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/callable/InvokeCallableNode.java
index fb85d1542c78..b58140afbda3 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/callable/InvokeCallableNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/callable/InvokeCallableNode.java
@@ -19,7 +19,6 @@
 import java.util.concurrent.locks.Lock;
 import org.enso.interpreter.Constants;
 import org.enso.interpreter.node.BaseNode;
-import org.enso.interpreter.node.BaseNode.TailStatus;
 import org.enso.interpreter.node.callable.dispatch.InvokeFunctionNode;
 import org.enso.interpreter.node.callable.thunk.ThunkExecutorNode;
 import org.enso.interpreter.runtime.EnsoContext;
@@ -31,14 +30,14 @@
 import org.enso.interpreter.runtime.control.TailCallException;
 import org.enso.interpreter.runtime.data.atom.Atom;
 import org.enso.interpreter.runtime.data.atom.AtomConstructor;
+import org.enso.interpreter.runtime.data.hash.EnsoHashMap;
 import org.enso.interpreter.runtime.error.DataflowError;
 import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.error.PanicSentinel;
-import org.enso.interpreter.runtime.error.Warning;
-import org.enso.interpreter.runtime.error.WarningsLibrary;
-import org.enso.interpreter.runtime.error.WithWarnings;
 import org.enso.interpreter.runtime.library.dispatch.TypesLibrary;
 import org.enso.interpreter.runtime.state.State;
+import org.enso.interpreter.runtime.warning.AppendWarningNode;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
 
 /**
  * This class is responsible for performing the actual invocation of a given callable with its
@@ -287,12 +286,12 @@ public Object invokeWarnings(
       VirtualFrame callerFrame,
       State state,
       Object[] arguments,
-      @Shared("warnings") @CachedLibrary(limit = "3") WarningsLibrary warnings) {
-
-    Warning[] extracted;
+      @Shared("warnings") @CachedLibrary(limit = "3") WarningsLibrary warnings,
+      @Cached AppendWarningNode appendWarningNode) {
+    EnsoHashMap extracted;
     Object callable;
     try {
-      extracted = warnings.getWarnings(warning, null, false);
+      extracted = warnings.getWarnings(warning, false);
       callable = warnings.removeWarnings(warning);
     } catch (UnsupportedMessageException e) {
       var ctx = EnsoContext.get(this);
@@ -325,7 +324,7 @@ public Object invokeWarnings(
       if (result instanceof DataflowError) {
         return result;
       } else {
-        return WithWarnings.wrap(EnsoContext.get(this), result, extracted);
+        return appendWarningNode.executeAppend(null, result, extracted);
       }
     } catch (TailCallException e) {
       throw new TailCallException(e, extracted);
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/callable/InvokeConversionNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/callable/InvokeConversionNode.java
index f8d9a2b57714..ab68a53316ca 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/callable/InvokeConversionNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/callable/InvokeConversionNode.java
@@ -20,17 +20,18 @@
 import org.enso.interpreter.runtime.callable.argument.CallArgumentInfo;
 import org.enso.interpreter.runtime.callable.function.Function;
 import org.enso.interpreter.runtime.control.TailCallException;
-import org.enso.interpreter.runtime.data.ArrayRope;
 import org.enso.interpreter.runtime.data.EnsoMultiValue;
 import org.enso.interpreter.runtime.data.Type;
+import org.enso.interpreter.runtime.data.hash.EnsoHashMap;
 import org.enso.interpreter.runtime.data.text.Text;
 import org.enso.interpreter.runtime.error.DataflowError;
 import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.error.PanicSentinel;
-import org.enso.interpreter.runtime.error.Warning;
-import org.enso.interpreter.runtime.error.WithWarnings;
 import org.enso.interpreter.runtime.library.dispatch.TypeOfNode;
 import org.enso.interpreter.runtime.state.State;
+import org.enso.interpreter.runtime.warning.AppendWarningNode;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
+import org.enso.interpreter.runtime.warning.WithWarnings;
 
 public abstract class InvokeConversionNode extends BaseNode {
   private @Child InvokeFunctionNode invokeFunctionNode;
@@ -198,7 +199,9 @@ Object doWarning(
       UnresolvedConversion conversion,
       Object self,
       WithWarnings that,
-      Object[] arguments) {
+      Object[] arguments,
+      @Cached AppendWarningNode appendWarningNode,
+      @CachedLibrary(limit = "3") WarningsLibrary warnsLib) {
     // Cannot use @Cached for childDispatch, because we need to call notifyInserted.
     if (childDispatch == null) {
       CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -223,12 +226,17 @@ Object doWarning(
     }
     Object value = that.getValue();
     arguments[thatArgumentPosition] = value;
-    ArrayRope<Warning> warnings = that.getReassignedWarningsAsRope(this, false);
+    EnsoHashMap warnings;
+    try {
+      warnings = warnsLib.getWarnings(that, false);
+    } catch (UnsupportedMessageException e) {
+      throw CompilerDirectives.shouldNotReachHere(e);
+    }
     try {
       Object result = childDispatch.execute(frame, state, conversion, self, value, arguments);
-      return WithWarnings.appendTo(EnsoContext.get(this), result, warnings);
+      return appendWarningNode.executeAppend(null, result, warnings);
     } catch (TailCallException e) {
-      throw new TailCallException(e, warnings.toArray(Warning[]::new));
+      throw new TailCallException(e, warnings);
     }
   }
 
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/callable/InvokeMethodNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/callable/InvokeMethodNode.java
index c06bee97df69..b7a2b19496db 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/callable/InvokeMethodNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/callable/InvokeMethodNode.java
@@ -43,7 +43,6 @@
 import org.enso.interpreter.runtime.callable.function.Function;
 import org.enso.interpreter.runtime.callable.function.FunctionSchema;
 import org.enso.interpreter.runtime.control.TailCallException;
-import org.enso.interpreter.runtime.data.ArrayRope;
 import org.enso.interpreter.runtime.data.EnsoDate;
 import org.enso.interpreter.runtime.data.EnsoDateTime;
 import org.enso.interpreter.runtime.data.EnsoDuration;
@@ -51,15 +50,16 @@
 import org.enso.interpreter.runtime.data.EnsoTimeOfDay;
 import org.enso.interpreter.runtime.data.EnsoTimeZone;
 import org.enso.interpreter.runtime.data.Type;
+import org.enso.interpreter.runtime.data.hash.EnsoHashMap;
+import org.enso.interpreter.runtime.data.hash.HashMapInsertAllNode;
 import org.enso.interpreter.runtime.data.text.Text;
 import org.enso.interpreter.runtime.error.DataflowError;
 import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.error.PanicSentinel;
-import org.enso.interpreter.runtime.error.Warning;
-import org.enso.interpreter.runtime.error.WarningsLibrary;
-import org.enso.interpreter.runtime.error.WithWarnings;
 import org.enso.interpreter.runtime.library.dispatch.TypesLibrary;
 import org.enso.interpreter.runtime.state.State;
+import org.enso.interpreter.runtime.warning.AppendWarningNode;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
 
 @ImportStatic({HostMethodCallNode.PolyglotCallType.class, HostMethodCallNode.class})
 public abstract class InvokeMethodNode extends BaseNode {
@@ -436,12 +436,13 @@ Object doWarning(
       UnresolvedSymbol symbol,
       Object self,
       Object[] arguments,
-      @Shared("warnings") @CachedLibrary(limit = "10") WarningsLibrary warnings) {
+      @Shared("warnings") @CachedLibrary(limit = "10") WarningsLibrary warnings,
+      @Shared @Cached AppendWarningNode appendWarningNode) {
     Object selfWithoutWarnings;
-    Warning[] arrOfWarnings;
+    EnsoHashMap warnsMap;
     try {
       selfWithoutWarnings = warnings.removeWarnings(self);
-      arrOfWarnings = warnings.getWarnings(self, this, false);
+      warnsMap = warnings.getWarnings(self, false);
     } catch (UnsupportedMessageException e) {
       var ctx = EnsoContext.get(this);
       throw ctx.raiseAssertionPanic(this, null, e);
@@ -475,9 +476,10 @@ Object doWarning(
 
     try {
       Object result = childDispatch.execute(frame, state, symbol, selfWithoutWarnings, arguments);
-      return WithWarnings.appendTo(EnsoContext.get(this), result, arrOfWarnings);
+      return appendWarningNode.executeAppend(null, result, warnsMap);
     } catch (TailCallException e) {
-      throw new TailCallException(e, arrOfWarnings);
+      CompilerDirectives.transferToInterpreter();
+      throw new TailCallException(e, warnsMap);
     }
   }
 
@@ -505,10 +507,13 @@ Object doPolyglot(
       @Cached(value = "buildProfiles()", dimensions = 1) BranchProfile[] profiles,
       @Cached(value = "buildProfiles()", dimensions = 1) BranchProfile[] warningProfiles,
       @Cached BranchProfile anyWarningsProfile,
-      @Cached HostMethodCallNode hostMethodCallNode) {
+      @Cached HostMethodCallNode hostMethodCallNode,
+      @Shared @Cached AppendWarningNode appendWarningNode,
+      @Cached HashMapInsertAllNode mapInsertAllNode) {
     Object[] args = new Object[argExecutors.length];
     boolean anyWarnings = false;
-    ArrayRope<Warning> accumulatedWarnings = new ArrayRope<>();
+    var accumulatedWarnings = EnsoHashMap.empty();
+    var maxWarnings = EnsoContext.get(this).getWarningsLimit();
     for (int i = 0; i < argExecutors.length; i++) {
       var r = argExecutors[i].executeThunk(frame, arguments[i + 1], state, TailStatus.NOT_TAIL);
       if (r instanceof DataflowError) {
@@ -518,7 +523,9 @@ Object doPolyglot(
         warningProfiles[i].enter();
         anyWarnings = true;
         try {
-          accumulatedWarnings = accumulatedWarnings.append(warnings.getWarnings(r, this, false));
+          EnsoHashMap rWarnsMap = warnings.getWarnings(r, false);
+          accumulatedWarnings =
+              mapInsertAllNode.executeInsertAll(frame, accumulatedWarnings, rWarnsMap, maxWarnings);
           args[i] = warnings.removeWarnings(r);
         } catch (UnsupportedMessageException e) {
           var ctx = EnsoContext.get(this);
@@ -531,7 +538,7 @@ Object doPolyglot(
     Object res = hostMethodCallNode.execute(polyglotCallType, symbol.getName(), self, args);
     if (anyWarnings) {
       anyWarningsProfile.enter();
-      res = WithWarnings.appendTo(EnsoContext.get(this), res, accumulatedWarnings);
+      res = appendWarningNode.executeAppend(null, res, accumulatedWarnings);
     }
     return res;
   }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/callable/dispatch/CallOptimiserNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/callable/dispatch/CallOptimiserNode.java
index f2d259eb1b7f..d81794d983ab 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/callable/dispatch/CallOptimiserNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/callable/dispatch/CallOptimiserNode.java
@@ -5,7 +5,7 @@
 import com.oracle.truffle.api.nodes.NodeInfo;
 import org.enso.interpreter.runtime.callable.CallerInfo;
 import org.enso.interpreter.runtime.callable.function.Function;
-import org.enso.interpreter.runtime.error.Warning;
+import org.enso.interpreter.runtime.data.hash.EnsoHashMap;
 import org.enso.interpreter.runtime.state.State;
 
 /**
@@ -43,5 +43,5 @@ public abstract Object executeDispatch(
       CallerInfo callerInfo,
       State state,
       Object[] arguments,
-      Warning[] warnings);
+      EnsoHashMap warnings);
 }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/callable/dispatch/LoopingCallOptimiserNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/callable/dispatch/LoopingCallOptimiserNode.java
index 7508db56209d..3da492ea5d3d 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/callable/dispatch/LoopingCallOptimiserNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/callable/dispatch/LoopingCallOptimiserNode.java
@@ -17,13 +17,12 @@
 import com.oracle.truffle.api.nodes.RepeatingNode;
 import org.enso.interpreter.node.callable.ExecuteCallNode;
 import org.enso.interpreter.node.callable.ExecuteCallNodeGen;
-import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.interpreter.runtime.callable.CallerInfo;
 import org.enso.interpreter.runtime.callable.function.Function;
 import org.enso.interpreter.runtime.control.TailCallException;
-import org.enso.interpreter.runtime.error.Warning;
-import org.enso.interpreter.runtime.error.WithWarnings;
+import org.enso.interpreter.runtime.data.hash.EnsoHashMap;
 import org.enso.interpreter.runtime.state.State;
+import org.enso.interpreter.runtime.warning.AppendWarningNode;
 
 /**
  * A version of {@link CallOptimiserNode} that is fully prepared to handle tail calls. Tail calls
@@ -65,7 +64,7 @@ public Object cachedDispatch(
       CallerInfo callerInfo,
       State state,
       Object[] arguments,
-      Warning[] warnings,
+      EnsoHashMap warnings,
       @Shared("loopNode") @Cached(value = "createLoopNode()") LoopNode loopNode) {
     return dispatch(function, callerInfo, state, arguments, loopNode);
   }
@@ -76,10 +75,11 @@ public Object cachedDispatchWarnings(
       CallerInfo callerInfo,
       State state,
       Object[] arguments,
-      Warning[] warnings,
-      @Shared("loopNode") @Cached(value = "createLoopNode()") LoopNode loopNode) {
+      EnsoHashMap warnings,
+      @Shared("loopNode") @Cached(value = "createLoopNode()") LoopNode loopNode,
+      @Shared @Cached AppendWarningNode appendWarningNode) {
     Object result = dispatch(function, callerInfo, state, arguments, loopNode);
-    return WithWarnings.appendTo(EnsoContext.get(this), result, warnings);
+    return appendWarningNode.executeAppend(null, result, warnings);
   }
 
   private Object dispatch(
@@ -104,7 +104,7 @@ public Object uncachedDispatch(
       CallerInfo callerInfo,
       State state,
       Object[] arguments,
-      Warning[] warnings,
+      EnsoHashMap warnings,
       @Shared("executeCallNode") @Cached ExecuteCallNode executeCallNode) {
     return loopUntilCompletion(frame, function, callerInfo, state, arguments, executeCallNode);
   }
@@ -117,11 +117,12 @@ public Object uncachedDispatchWarnings(
       CallerInfo callerInfo,
       State state,
       Object[] arguments,
-      Warning[] warnings,
-      @Shared("executeCallNode") @Cached ExecuteCallNode executeCallNode) {
+      EnsoHashMap warnings,
+      @Shared("executeCallNode") @Cached ExecuteCallNode executeCallNode,
+      @Shared @Cached AppendWarningNode appendWarningNode) {
     Object result =
         loopUntilCompletion(frame, function, callerInfo, state, arguments, executeCallNode);
-    return WithWarnings.appendTo(EnsoContext.get(this), result, warnings);
+    return appendWarningNode.executeAppend(null, result, warnings);
   }
 
   private Object loopUntilCompletion(
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/callable/dispatch/SimpleCallOptimiserNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/callable/dispatch/SimpleCallOptimiserNode.java
index 70496d9c0352..d2d417860761 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/callable/dispatch/SimpleCallOptimiserNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/callable/dispatch/SimpleCallOptimiserNode.java
@@ -9,7 +9,7 @@
 import org.enso.interpreter.runtime.callable.CallerInfo;
 import org.enso.interpreter.runtime.callable.function.Function;
 import org.enso.interpreter.runtime.control.TailCallException;
-import org.enso.interpreter.runtime.error.Warning;
+import org.enso.interpreter.runtime.data.hash.EnsoHashMap;
 import org.enso.interpreter.runtime.state.State;
 
 /**
@@ -51,7 +51,7 @@ public Object executeDispatch(
       CallerInfo callerInfo,
       State state,
       Object[] arguments,
-      Warning[] warnings) {
+      EnsoHashMap warnings) {
     try {
       return executeCallNode.executeCall(frame, function, callerInfo, state, arguments);
     } catch (TailCallException e) {
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/controlflow/caseexpr/CaseNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/controlflow/caseexpr/CaseNode.java
index 7afbdbaff02f..0967739a28d6 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/controlflow/caseexpr/CaseNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/controlflow/caseexpr/CaseNode.java
@@ -1,6 +1,7 @@
 package org.enso.interpreter.node.controlflow.caseexpr;
 
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -16,6 +17,8 @@
 import org.enso.interpreter.runtime.error.*;
 import org.enso.interpreter.runtime.state.State;
 import org.enso.interpreter.runtime.type.TypesGen;
+import org.enso.interpreter.runtime.warning.AppendWarningNode;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
 
 /**
  * A node representing a pattern match on an arbitrary runtime value.
@@ -82,12 +85,12 @@ public Object doPanicSentinel(VirtualFrame frame, PanicSentinel sentinel) {
   Object doWarning(
       VirtualFrame frame,
       Object object,
-      @Shared("warnsLib") @CachedLibrary(limit = "3") WarningsLibrary warnings) {
+      @Shared("warnsLib") @CachedLibrary(limit = "3") WarningsLibrary warnings,
+      @Cached AppendWarningNode appendWarningNode) {
     try {
-      EnsoContext ctx = EnsoContext.get(this);
-      Warning[] ws = warnings.getWarnings(object, this, false);
+      var ws = warnings.getWarnings(object, false);
       Object result = doMatch(frame, warnings.removeWarnings(object), warnings);
-      return WithWarnings.wrap(ctx, result, ws);
+      return appendWarningNode.executeAppend(null, result, ws);
     } catch (UnsupportedMessageException e) {
       throw EnsoContext.get(this).raiseAssertionPanic(this, null, e);
     }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/interop/syntax/HostValueToEnsoNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/interop/syntax/HostValueToEnsoNode.java
index c59b2e90e8f6..60714b96ee31 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/interop/syntax/HostValueToEnsoNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/interop/syntax/HostValueToEnsoNode.java
@@ -13,8 +13,8 @@
 import com.oracle.truffle.api.profiles.CountingConditionProfile;
 import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.interpreter.runtime.data.text.Text;
-import org.enso.interpreter.runtime.error.WarningsLibrary;
-import org.enso.interpreter.runtime.error.WithWarnings;
+import org.enso.interpreter.runtime.warning.AppendWarningNode;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
 
 /**
  * Converts a value returned by a polyglot call back to a value that can be further used within Enso
@@ -75,13 +75,14 @@ Object doNull(
       Object value,
       @CachedLibrary(limit = "3") InteropLibrary iop,
       @CachedLibrary(limit = "3") WarningsLibrary warningsLibrary,
-      @Cached CountingConditionProfile nullWarningProfile) {
+      @Cached CountingConditionProfile nullWarningProfile,
+      @Cached AppendWarningNode appendWarningNode) {
     var ctx = EnsoContext.get(this);
     var nothing = ctx.getBuiltins().nothing();
     if (nothing != value && nullWarningProfile.profile(warningsLibrary.hasWarnings(value))) {
       try {
-        var attachedWarnings = warningsLibrary.getWarnings(value, null, false);
-        return WithWarnings.wrap(ctx, nothing, attachedWarnings);
+        var attachedWarnings = warningsLibrary.getWarnings(value, false);
+        return appendWarningNode.executeAppend(null, nothing, attachedWarnings);
       } catch (UnsupportedMessageException e) {
         return nothing;
       }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/io/PrintlnNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/io/PrintlnNode.java
index a24aeac7f408..9afb7869c751 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/io/PrintlnNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/io/PrintlnNode.java
@@ -17,8 +17,8 @@
 import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.interpreter.runtime.callable.UnresolvedSymbol;
 import org.enso.interpreter.runtime.callable.argument.CallArgumentInfo;
-import org.enso.interpreter.runtime.error.WarningsLibrary;
 import org.enso.interpreter.runtime.state.State;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
 
 @BuiltinMethod(
     type = "IO",
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsComplexNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsComplexNode.java
index bada651826ad..6ce3da80068f 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsComplexNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsComplexNode.java
@@ -27,9 +27,9 @@
 import org.enso.interpreter.runtime.data.EnsoFile;
 import org.enso.interpreter.runtime.data.Type;
 import org.enso.interpreter.runtime.data.atom.Atom;
-import org.enso.interpreter.runtime.error.WarningsLibrary;
 import org.enso.interpreter.runtime.library.dispatch.TypesLibrary;
 import org.enso.interpreter.runtime.scope.ModuleScope;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
 
 @GenerateUncached
 public abstract class EqualsComplexNode extends Node {
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsSimpleNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsSimpleNode.java
index b18d30ad7967..459fc90fa3bd 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsSimpleNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/EqualsSimpleNode.java
@@ -21,8 +21,8 @@
 import org.enso.interpreter.runtime.data.atom.Atom;
 import org.enso.interpreter.runtime.data.atom.AtomConstructor;
 import org.enso.interpreter.runtime.data.text.Text;
-import org.enso.interpreter.runtime.error.WarningsLibrary;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
 import org.enso.polyglot.common_utils.Core_Text_Utils;
 
 @GenerateUncached
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/HashCodeNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/HashCodeNode.java
index 3e832fd330e6..88aeb124ab35 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/HashCodeNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/HashCodeNode.java
@@ -45,11 +45,11 @@
 import org.enso.interpreter.runtime.data.atom.AtomConstructor;
 import org.enso.interpreter.runtime.data.atom.StructsLibrary;
 import org.enso.interpreter.runtime.data.text.Text;
-import org.enso.interpreter.runtime.error.WarningsLibrary;
 import org.enso.interpreter.runtime.library.dispatch.TypesLibrary;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 import org.enso.interpreter.runtime.scope.ModuleScope;
 import org.enso.interpreter.runtime.state.State;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
 import org.enso.polyglot.common_utils.Core_Text_Utils;
 
 /**
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/ordering/LessThanNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/ordering/LessThanNode.java
index faa4ab4a1ad5..c0ff59f90a5c 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/ordering/LessThanNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/ordering/LessThanNode.java
@@ -21,8 +21,8 @@
 import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.interpreter.runtime.data.EnsoObject;
 import org.enso.interpreter.runtime.data.text.Text;
-import org.enso.interpreter.runtime.error.WarningsLibrary;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
 
 @BuiltinMethod(
     type = "Default_Comparator",
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/ordering/SortVectorNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/ordering/SortVectorNode.java
index 7ae3fa735929..65f7bd860a14 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/ordering/SortVectorNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/ordering/SortVectorNode.java
@@ -39,12 +39,13 @@
 import org.enso.interpreter.runtime.data.vector.ArrayLikeLengthNode;
 import org.enso.interpreter.runtime.error.DataflowError;
 import org.enso.interpreter.runtime.error.PanicException;
-import org.enso.interpreter.runtime.error.Warning;
-import org.enso.interpreter.runtime.error.WarningsLibrary;
-import org.enso.interpreter.runtime.error.WithWarnings;
 import org.enso.interpreter.runtime.library.dispatch.TypeOfNode;
 import org.enso.interpreter.runtime.library.dispatch.TypesLibrary;
 import org.enso.interpreter.runtime.state.State;
+import org.enso.interpreter.runtime.warning.AppendWarningNode;
+import org.enso.interpreter.runtime.warning.Warning;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
+import org.enso.interpreter.runtime.warning.WithWarnings;
 
 /**
  * Sorts a vector with elements that have only Default_Comparator, thus, only elements with a
@@ -66,7 +67,7 @@ public static SortVectorNode build() {
    * @param self Vector that has elements with only Default_Comparator, that are elements with
    *     builtin types.
    * @param ascending -1 for descending, 1 for ascending
-   * @param comparators Vector of comparators, with the same length of self. This is gather in the
+   * @param comparators Vector of comparators, with the same length of self. This is gathered in the
    *     Enso code, because doing that in this builtin would be difficult. If {@code onFunc}
    *     parameter is not {@code Nothing}, comparators are gathered from the result of {@code
    *     onFunc} projection.
@@ -354,7 +355,8 @@ private Object attachWarnings(Object vector, Set<String> warnings) {
             .map(text -> Warning.create(ctx, text, this))
             .limit(MAX_SORT_WARNINGS)
             .toArray(Warning[]::new);
-    return WithWarnings.appendTo(ctx, vector, warnArray.length < warnings.size(), warnArray);
+    var reachedMaxCount = warnArray.length < warnings.size();
+    return WithWarnings.create(vector, MAX_SORT_WARNINGS, reachedMaxCount, warnArray);
   }
 
   private Object attachDifferentComparatorsWarning(Object vector, List<Group> groups) {
@@ -366,8 +368,13 @@ private Object attachDifferentComparatorsWarning(Object vector, List<Group> grou
               .collect(Collectors.joining(", "));
       var text = Text.create("Different comparators: [" + diffCompsMsg + "]");
       var ctx = EnsoContext.get(this);
-      var warn = Warning.create(ctx, text, this);
-      return WithWarnings.appendTo(ctx, vector, false, warn);
+      var warnsLib = WarningsLibrary.getUncached();
+      if (warnsLib.hasWarnings(vector) && warnsLib.isLimitReached(vector)) {
+        return vector;
+      } else {
+        var warn = Warning.create(ctx, text, this);
+        return AppendWarningNode.getUncached().executeAppend(null, vector, warn);
+      }
     } else {
       return vector;
     }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/text/util/ExpectStringNode.java b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/text/util/ExpectStringNode.java
index 54bbd31ceab9..0d124b07e5e3 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/text/util/ExpectStringNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/text/util/ExpectStringNode.java
@@ -13,7 +13,7 @@
 import org.enso.interpreter.runtime.data.atom.Atom;
 import org.enso.interpreter.runtime.data.text.Text;
 import org.enso.interpreter.runtime.error.PanicException;
-import org.enso.interpreter.runtime.error.WarningsLibrary;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
 
 public abstract class ExpectStringNode extends Node {
   private @Child InteropLibrary library = InteropLibrary.getFactory().createDispatched(10);
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/control/TailCallException.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/control/TailCallException.java
index 7dd33919868e..ab2dc581361b 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/control/TailCallException.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/control/TailCallException.java
@@ -3,7 +3,7 @@
 import com.oracle.truffle.api.nodes.ControlFlowException;
 import org.enso.interpreter.runtime.callable.CallerInfo;
 import org.enso.interpreter.runtime.callable.function.Function;
-import org.enso.interpreter.runtime.error.Warning;
+import org.enso.interpreter.runtime.data.hash.EnsoHashMap;
 
 /**
  * Used to model the switch of control-flow from standard stack-based execution to looping.
@@ -14,7 +14,13 @@ public class TailCallException extends ControlFlowException {
   private final Function function;
   private final CallerInfo callerInfo;
   private final Object[] arguments;
-  private final Warning[] warnings;
+
+  /**
+   * May be null.
+   *
+   * @see org.enso.interpreter.runtime.warning.WithWarnings#warnings
+   */
+  private final EnsoHashMap warnings;
 
   /**
    * Creates a new exception containing the necessary data to continue computation.
@@ -31,7 +37,7 @@ public TailCallException(Function function, CallerInfo callerInfo, Object[] argu
   }
 
   private TailCallException(
-      Function function, CallerInfo callerInfo, Object[] arguments, Warning[] warnings) {
+      Function function, CallerInfo callerInfo, Object[] arguments, EnsoHashMap warnings) {
     this.function = function;
     this.callerInfo = callerInfo;
     this.arguments = arguments;
@@ -44,7 +50,7 @@ private TailCallException(
    * @param origin the original tail call exception
    * @param warnings warnings to be associated with the tail call exception
    */
-  public TailCallException(TailCallException origin, Warning[] warnings) {
+  public TailCallException(TailCallException origin, EnsoHashMap warnings) {
     this(origin.getFunction(), origin.getCallerInfo(), origin.getArguments(), warnings);
   }
 
@@ -80,7 +86,7 @@ public CallerInfo getCallerInfo() {
    *
    * @return the warnings to be appended to the result of the call, or null if empty
    */
-  public Warning[] getWarnings() {
+  public EnsoHashMap getWarnings() {
     return warnings;
   }
 }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/ArrayRope.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/ArrayRope.java
deleted file mode 100644
index bde559e42a0d..000000000000
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/ArrayRope.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.enso.interpreter.runtime.data;
-
-import com.oracle.truffle.api.CompilerDirectives;
-import java.util.Arrays;
-import java.util.function.Function;
-
-public final class ArrayRope<T> {
-  private final ArrayRopeSegment<T> segment;
-
-  private ArrayRope(ArrayRopeSegment<T> segment) {
-    this.segment = segment;
-  }
-
-  @SafeVarargs
-  public ArrayRope(T... elements) {
-    segment = new ArraySegment<>(elements);
-  }
-
-  public ArrayRope<T> append(ArrayRope<T> that) {
-    return new ArrayRope<>(new ConcatSegment<>(this.segment, that.segment));
-  }
-
-  @SafeVarargs
-  public final ArrayRope<T> append(T... items) {
-    return new ArrayRope<>(new ConcatSegment<>(this.segment, new ArraySegment<>(items)));
-  }
-
-  public ArrayRope<T> prepend(ArrayRope<T> that) {
-    return new ArrayRope<>(new ConcatSegment<>(that.segment, this.segment));
-  }
-
-  @SafeVarargs
-  public final ArrayRope<T> prepend(T... items) {
-    return new ArrayRope<>(new ConcatSegment<>(new ArraySegment<>(items), this.segment));
-  }
-
-  @CompilerDirectives.TruffleBoundary
-  public T[] toArray(Function<Integer, T[]> genArray) {
-    T[] res = genArray.apply(size());
-    writeArray(res);
-    return res;
-  }
-
-  public void writeArray(T[] arr) {
-    segment.appendTo(arr, 0);
-  }
-
-  public int size() {
-    return segment.size();
-  }
-
-  @Override
-  public String toString() {
-    return "ArrayRope{" + "segment=" + segment + '}';
-  }
-
-  private interface ArrayRopeSegment<T> {
-    void appendTo(T[] builder, int start);
-
-    int size();
-  }
-
-  private static final class ArraySegment<T> implements ArrayRopeSegment<T> {
-    private final T[] elements;
-
-    public ArraySegment(T[] elements) {
-      this.elements = elements;
-    }
-
-    @Override
-    public void appendTo(T[] builder, int start) {
-      System.arraycopy(elements, 0, builder, start, elements.length);
-    }
-
-    @Override
-    public int size() {
-      return elements.length;
-    }
-
-    @Override
-    public String toString() {
-      return "ArraySegment{" + "elements=" + Arrays.toString(elements) + '}';
-    }
-  }
-
-  private static final class ConcatSegment<T> implements ArrayRopeSegment<T> {
-    private final ArrayRopeSegment<T> left;
-    private final ArrayRopeSegment<T> right;
-    private int cachedSize = UNKNOWN;
-    private static final int UNKNOWN = -1;
-
-    public ConcatSegment(ArrayRopeSegment<T> left, ArrayRopeSegment<T> right) {
-      this.left = left;
-      this.right = right;
-    }
-
-    @Override
-    public void appendTo(T[] builder, int start) {
-      left.appendTo(builder, start);
-      right.appendTo(builder, start + left.size());
-    }
-
-    @Override
-    public int size() {
-      if (cachedSize == UNKNOWN) {
-        cachedSize = left.size() + right.size();
-      }
-      return cachedSize;
-    }
-
-    @Override
-    public String toString() {
-      return "ConcatSegment{"
-          + "left="
-          + left
-          + ", right="
-          + right
-          + ", cachedSize="
-          + cachedSize
-          + '}';
-    }
-  }
-}
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/atom/Atom.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/atom/Atom.java
index c3ebb4e77257..4d5fd5a54442 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/atom/Atom.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/atom/Atom.java
@@ -26,9 +26,9 @@
 import org.enso.interpreter.runtime.data.text.Text;
 import org.enso.interpreter.runtime.data.vector.ArrayLikeHelpers;
 import org.enso.interpreter.runtime.error.PanicException;
-import org.enso.interpreter.runtime.error.WarningsLibrary;
 import org.enso.interpreter.runtime.library.dispatch.TypesLibrary;
 import org.enso.interpreter.runtime.type.TypesGen;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
 
 /** A runtime representation of an Atom in Enso. */
 @ExportLibrary(InteropLibrary.class)
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/atom/InstantiateNode.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/atom/InstantiateNode.java
index fc27f568c848..6a62efca6d4a 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/atom/InstantiateNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/atom/InstantiateNode.java
@@ -11,11 +11,11 @@
 import com.oracle.truffle.api.profiles.CountingConditionProfile;
 import org.enso.interpreter.node.ExpressionNode;
 import org.enso.interpreter.runtime.EnsoContext;
-import org.enso.interpreter.runtime.data.ArrayRope;
-import org.enso.interpreter.runtime.error.Warning;
-import org.enso.interpreter.runtime.error.WarningsLibrary;
-import org.enso.interpreter.runtime.error.WithWarnings;
+import org.enso.interpreter.runtime.data.hash.EnsoHashMap;
+import org.enso.interpreter.runtime.data.hash.HashMapInsertAllNode;
 import org.enso.interpreter.runtime.type.TypesGen;
+import org.enso.interpreter.runtime.warning.AppendWarningNode;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
 
 /**
  * A node instantiating a constant {@link AtomConstructor} with values computed based on the
@@ -66,10 +66,13 @@ public static InstantiateNode build(AtomConstructor constructor, ExpressionNode[
   @ExplodeLoop
   Object doExecute(
       VirtualFrame frame,
-      @Cached(parameters = {"constructor"}) AtomConstructorInstanceNode createInstanceNode) {
+      @Cached(parameters = {"constructor"}) AtomConstructorInstanceNode createInstanceNode,
+      @Cached AppendWarningNode appendWarningNode,
+      @Cached HashMapInsertAllNode mapInsertAllNode) {
     Object[] argumentValues = new Object[arguments.length];
     boolean anyWarnings = false;
-    ArrayRope<Warning> accumulatedWarnings = new ArrayRope<>();
+    var accumulatedWarnings = EnsoHashMap.empty();
+    var maxWarnings = EnsoContext.get(this).getWarningsLimit();
     for (int i = 0; i < arguments.length; i++) {
       CountingConditionProfile profile = profiles[i];
       CountingConditionProfile warningProfile = warningProfiles[i];
@@ -80,8 +83,10 @@ Object doExecute(
       } else if (warningProfile.profile(warnings.hasWarnings(argument))) {
         anyWarnings = true;
         try {
+          var argumentWarnsMap = warnings.getWarnings(argument, false);
           accumulatedWarnings =
-              accumulatedWarnings.append(warnings.getWarnings(argument, this, false));
+              mapInsertAllNode.executeInsertAll(
+                  frame, accumulatedWarnings, argumentWarnsMap, maxWarnings);
           argumentValues[i] = warnings.removeWarnings(argument);
         } catch (UnsupportedMessageException e) {
           throw EnsoContext.get(this).raiseAssertionPanic(this, null, e);
@@ -94,8 +99,8 @@ Object doExecute(
       }
     }
     if (anyWarningsProfile.profile(anyWarnings)) {
-      return WithWarnings.appendTo(
-          EnsoContext.get(this), createInstanceNode.execute(argumentValues), accumulatedWarnings);
+      return appendWarningNode.executeAppend(
+          frame, createInstanceNode.execute(argumentValues), accumulatedWarnings);
     } else {
       return createInstanceNode.execute(argumentValues);
     }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/EnsoHashMap.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/EnsoHashMap.java
index 076dbbebb0bf..2c761b1e214a 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/EnsoHashMap.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/EnsoHashMap.java
@@ -66,6 +66,7 @@ EnsoHashMapBuilder getMapBuilder(
     }
   }
 
+  /** Slow version of {@link #getCachedVectorRepresentation(ConditionProfile)}. */
   Object getCachedVectorRepresentation() {
     return getCachedVectorRepresentation(ConditionProfile.getUncached());
   }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/EnsoHashMapBuilder.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/EnsoHashMapBuilder.java
index 61a0da2e4634..5a69d250d645 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/EnsoHashMapBuilder.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/EnsoHashMapBuilder.java
@@ -3,6 +3,7 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import java.util.Arrays;
+import java.util.Iterator;
 import org.enso.interpreter.node.expression.builtin.meta.EqualsNode;
 import org.enso.interpreter.node.expression.builtin.meta.HashCodeNode;
 
@@ -48,17 +49,22 @@ private EnsoHashMapBuilder(int initialCapacity) {
   }
 
   /** Create a new builder with default size being {@code 11}. */
-  public static EnsoHashMapBuilder create() {
+  static EnsoHashMapBuilder create() {
     return new EnsoHashMapBuilder(11);
   }
 
+  static EnsoHashMapBuilder createWithCapacity(int capacity) {
+    assert capacity > 0;
+    return new EnsoHashMapBuilder(capacity);
+  }
+
   /** Returns count of elements in the storage. */
-  public int generation() {
+  int generation() {
     return generation;
   }
 
   /** Returns the actual number of visible elements in current generation. */
-  public int size() {
+  int size() {
     return actualSize;
   }
 
@@ -66,7 +72,7 @@ public int size() {
    * Provides access to all {@code StorageEntry} in this builder at given {@code atGeneration}.
    * Classical usage is to {@code for (var e : this) if (e.isVisible(atGeneration) operation(e))}.
    */
-  public StorageEntry[] getEntries(int atGeneration, int size) {
+  StorageEntry[] getEntries(int atGeneration, int size) {
     var arr = new StorageEntry[size];
     var at = 0;
     for (var i = 0; i < byHash.length; i++) {
@@ -82,12 +88,57 @@ public StorageEntry[] getEntries(int atGeneration, int size) {
     }
   }
 
+  record Entry(Object key, Object value) {}
+
+  Iterator<Entry> getEntriesIterator(int atGeneration) {
+    return new EntriesIterator(atGeneration);
+  }
+
+  final class EntriesIterator implements Iterator<Entry> {
+    private final int atGeneration;
+    private int nextVisibleEntryIdx = -1;
+
+    EntriesIterator(int atGeneration) {
+      this.atGeneration = atGeneration;
+      skipToNextVisibleEntry();
+    }
+
+    @Override
+    public boolean hasNext() {
+      if (nextVisibleEntryIdx >= byHash.length) {
+        return false;
+      }
+      var entry = byHash[nextVisibleEntryIdx];
+      return entry != null && entry.isVisible(atGeneration);
+    }
+
+    @Override
+    public Entry next() {
+      var entry = byHash[nextVisibleEntryIdx];
+      skipToNextVisibleEntry();
+      return new Entry(entry.key(), entry.value());
+    }
+
+    private void skipToNextVisibleEntry() {
+      while (true) {
+        nextVisibleEntryIdx++;
+        if (nextVisibleEntryIdx == byHash.length) {
+          break;
+        }
+        var entry = byHash[nextVisibleEntryIdx];
+        if (entry != null && entry.isVisible(atGeneration)) {
+          break;
+        }
+      }
+    }
+  }
+
   /**
    * Prepares a builder ready for modification at given generation. It may return {@code this} if
    * the {@code atGeneration == this.generation} and the {@code byHash} array is less than 75% full.
    * Otherwise it may return new builder suitable for additions.
    */
-  public EnsoHashMapBuilder asModifiable(
+  EnsoHashMapBuilder asModifiable(
       VirtualFrame frame, int atGeneration, HashCodeNode hashCodeNode, EqualsNode equalsNode) {
     if (atGeneration != generation || generation * 4 > byHash.length * 3) {
       var newSize = Math.max(actualSize * 2, byHash.length);
@@ -103,7 +154,7 @@ public EnsoHashMapBuilder asModifiable(
    * equal key, it marks it as removed, if it hasn't been removed yet. Once it finds an empty slot,
    * it puts there a new entry with the next generation.
    */
-  public void put(
+  void put(
       VirtualFrame frame,
       Object key,
       Object value,
@@ -139,7 +190,7 @@ public void put(
    * Finds storage entry for given key or {@code null}. Searches only entries that are visible for
    * given {@code generation}.
    */
-  public StorageEntry get(
+  StorageEntry get(
       VirtualFrame frame,
       Object key,
       int generation,
@@ -175,8 +226,7 @@ private int findWhereToStart(Object key, HashCodeNode hashCodeNode) {
    *
    * @return true if the removal was successful false otherwise.
    */
-  public boolean remove(
-      VirtualFrame frame, Object key, HashCodeNode hashCodeNode, EqualsNode equalsNode) {
+  boolean remove(VirtualFrame frame, Object key, HashCodeNode hashCodeNode, EqualsNode equalsNode) {
     assert actualSize <= generation;
     var at = findWhereToStart(key, hashCodeNode);
     var nextGeneration = ++generation;
@@ -225,11 +275,11 @@ private EnsoHashMapBuilder rehash(
    * are in the storage as of this moment, i.e., all the entries with their indexes lesser than
    * {@code generation}.
    *
-   * <p>Should be called where most once for a particular {@code generation}.
+   * <p>Should be called at most once for a particular {@code generation}.
    *
    * @return A new hash map snapshot.
    */
-  public EnsoHashMap build() {
+  EnsoHashMap build() {
     return EnsoHashMap.createWithBuilder(this);
   }
 
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/HashMapInsertAllNode.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/HashMapInsertAllNode.java
new file mode 100644
index 000000000000..0f870a0e9116
--- /dev/null
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/HashMapInsertAllNode.java
@@ -0,0 +1,73 @@
+package org.enso.interpreter.runtime.data.hash;
+
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.GenerateUncached;
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.NodeInfo;
+import org.enso.common.LanguageInfo;
+import org.enso.interpreter.node.expression.builtin.meta.EqualsNode;
+import org.enso.interpreter.node.expression.builtin.meta.HashCodeNode;
+
+@GenerateUncached
+@NodeInfo(
+    shortName = "MapInsertAll",
+    description = "Inserts all elements from the given container into a hash map",
+    language = LanguageInfo.ID)
+public abstract class HashMapInsertAllNode extends Node {
+
+  public static HashMapInsertAllNode build() {
+    return HashMapInsertAllNodeGen.create();
+  }
+
+  public static HashMapInsertAllNode getUncached() {
+    return HashMapInsertAllNodeGen.getUncached();
+  }
+
+  /**
+   * Insert all the elements from the given container into the given map.
+   *
+   * @param self A map to insert into.
+   * @param container Either a map, or a list of pairs to insert into the map.
+   * @param maxItems Maximum number of items to insert into the map from the container.
+   */
+  public abstract EnsoHashMap executeInsertAll(
+      VirtualFrame frame, EnsoHashMap self, EnsoHashMap container, int maxItems);
+
+  @Specialization
+  EnsoHashMap doEnsoHashMaps(
+      VirtualFrame frame,
+      EnsoHashMap self,
+      EnsoHashMap other,
+      int maxItems,
+      @Cached HashCodeNode hashCodeNode,
+      @Cached EqualsNode equalsNode) {
+    assert maxItems > 0;
+    var selfSize = self.getHashSize();
+    var otherSize = other.getHashSize();
+    if (otherSize == 0) {
+      return self;
+    }
+    var mapBuilder = EnsoHashMapBuilder.createWithCapacity(selfSize + otherSize);
+
+    var selfMapBuilder = self.getMapBuilder(frame, true, hashCodeNode, equalsNode);
+    var selfEntriesIt = selfMapBuilder.getEntriesIterator(selfMapBuilder.generation());
+    while (selfEntriesIt.hasNext()) {
+      var selfEntry = selfEntriesIt.next();
+      mapBuilder.put(frame, selfEntry.key(), selfEntry.value(), hashCodeNode, equalsNode);
+    }
+    var otherMapBuilder = other.getMapBuilder(frame, true, hashCodeNode, equalsNode);
+    var otherEntriesIt = otherMapBuilder.getEntriesIterator(otherMapBuilder.generation());
+    var itemsInserted = 0;
+    while (otherEntriesIt.hasNext()) {
+      if (itemsInserted >= maxItems) {
+        break;
+      }
+      var entry = otherEntriesIt.next();
+      mapBuilder.put(frame, entry.key(), entry.value(), hashCodeNode, equalsNode);
+      itemsInserted++;
+    }
+    return mapBuilder.build();
+  }
+}
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/HashMapInsertNode.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/HashMapInsertNode.java
index 4111414eec02..b73ad9d8dda0 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/HashMapInsertNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/HashMapInsertNode.java
@@ -3,6 +3,7 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
+import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.InteropLibrary;
@@ -25,6 +26,7 @@
         Returns newly created hash map with the given key value mapping.
         """,
     autoRegister = false)
+@GenerateUncached
 public abstract class HashMapInsertNode extends Node {
 
   public static HashMapInsertNode build() {
@@ -41,6 +43,7 @@ EnsoHashMap doEnsoHashMap(
       Object value,
       @Shared("hash") @Cached HashCodeNode hashCodeNode,
       @Shared("equals") @Cached EqualsNode equalsNode) {
+    assert value != null;
     var mapBuilder = hashMap.getMapBuilder(frame, false, hashCodeNode, equalsNode);
     mapBuilder.put(frame, key, value, hashCodeNode, equalsNode);
     var newMap = mapBuilder.build();
@@ -61,6 +64,7 @@ EnsoHashMap doForeign(
       @CachedLibrary(limit = "3") InteropLibrary iteratorInterop,
       @Shared("hash") @Cached HashCodeNode hashCodeNode,
       @Shared("equals") @Cached EqualsNode equalsNode) {
+    assert valueToInsert != null;
     var mapBuilder = EnsoHashMapBuilder.create();
     try {
       Object entriesIterator = mapInterop.getHashEntriesIterator(foreignMap);
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/HashMapSizeNode.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/HashMapSizeNode.java
index 4cf6f794d8a3..c71bd1335994 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/HashMapSizeNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/hash/HashMapSizeNode.java
@@ -23,6 +23,10 @@ public static HashMapSizeNode build() {
     return HashMapSizeNodeGen.create();
   }
 
+  public static HashMapSizeNode getUncached() {
+    return HashMapSizeNodeGen.getUncached();
+  }
+
   public abstract long execute(Object self);
 
   @Specialization(guards = "interop.hasHashEntries(hashMap)", limit = "3")
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/Array.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/Array.java
index 99f9917740dd..abebac6de618 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/Array.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/Array.java
@@ -13,15 +13,19 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import java.util.Arrays;
+import java.util.Comparator;
 import org.enso.interpreter.dsl.Builtin;
 import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.interpreter.runtime.data.EnsoObject;
 import org.enso.interpreter.runtime.data.Type;
-import org.enso.interpreter.runtime.error.Warning;
-import org.enso.interpreter.runtime.error.WarningsLibrary;
-import org.enso.interpreter.runtime.error.WithWarnings;
+import org.enso.interpreter.runtime.data.hash.EnsoHashMap;
+import org.enso.interpreter.runtime.data.hash.HashMapInsertAllNode;
+import org.enso.interpreter.runtime.data.hash.HashMapInsertNode;
+import org.enso.interpreter.runtime.data.hash.HashMapSizeNode;
 import org.enso.interpreter.runtime.library.dispatch.TypesLibrary;
-import org.graalvm.collections.EconomicSet;
+import org.enso.interpreter.runtime.warning.AppendWarningNode;
+import org.enso.interpreter.runtime.warning.Warning;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
 
 /** A primitive boxed array type for use in the runtime. */
 @ExportLibrary(InteropLibrary.class)
@@ -30,9 +34,13 @@
 @Builtin(pkg = "mutable", stdlibName = "Standard.Base.Data.Array.Array")
 final class Array implements EnsoObject {
   private final Object[] items;
+
+  /** If true, some elements contain warning, and thus, this Array contains warning. */
   private Boolean withWarnings;
-  private Warning[] cachedWarningsWrapped;
-  private Warning[] cachedWarningsUnwrapped;
+
+  private EnsoHashMap cachedWarningsWrapped;
+
+  private EnsoHashMap cachedWarningsUnwrapped;
 
   /**
    * Creates a new array
@@ -91,7 +99,12 @@ Object readArrayElement(
       long index,
       @CachedLibrary(limit = "3") WarningsLibrary warnings,
       @Cached BranchProfile errProfile,
-      @Cached BranchProfile hasWarningsProfile)
+      @Cached BranchProfile hasWarningsProfile,
+      @Cached HashMapInsertNode mapInsertNode,
+      @Cached AppendWarningNode appendWarningNode,
+      @Cached BranchProfile shouldWrapProfile,
+      @Cached HashMapSizeNode mapSizeNode,
+      @Cached HashMapInsertAllNode mapInsertAllNode)
       throws InvalidArrayIndexException, UnsupportedMessageException {
     if (index >= items.length || index < 0) {
       errProfile.enter();
@@ -101,11 +114,13 @@ Object readArrayElement(
     var v = items[(int) index];
     if (this.hasWarnings(warnings)) {
       hasWarningsProfile.enter();
-      Warning[] extracted = this.getWarnings(null, false, warnings);
+      var extractedWarnsMap =
+          this.getWarnings(
+              false, warnings, mapInsertNode, shouldWrapProfile, mapSizeNode, mapInsertAllNode);
       if (warnings.hasWarnings(v)) {
         v = warnings.removeWarnings(v);
       }
-      return WithWarnings.wrap(EnsoContext.get(warnings), v, extracted);
+      return appendWarningNode.executeAppend(null, v, extractedWarnsMap);
     }
 
     return v;
@@ -180,48 +195,81 @@ boolean hasWarnings(@Shared("warnsLib") @CachedLibrary(limit = "3") WarningsLibr
   }
 
   @ExportMessage
-  Warning[] getWarnings(
-      Node location,
+  EnsoHashMap getWarnings(
       boolean shouldWrap,
-      @Shared("warnsLib") @CachedLibrary(limit = "3") WarningsLibrary warnings)
+      @Shared("warnsLib") @CachedLibrary(limit = "3") WarningsLibrary warnings,
+      @Shared("mapInsertNode") @Cached HashMapInsertNode mapInsertNode,
+      @Shared @Cached BranchProfile shouldWrapProfile,
+      @Shared @Cached HashMapSizeNode mapSizeNode,
+      @Shared @Cached HashMapInsertAllNode mapInsertAllNode)
       throws UnsupportedMessageException {
-    Warning[] cache = shouldWrap ? cachedWarningsWrapped : cachedWarningsUnwrapped;
+    var cache = shouldWrap ? cachedWarningsWrapped : cachedWarningsUnwrapped;
     if (cache == null) {
-      cache = Warning.fromSetToArray(collectAllWarnings(warnings, location, shouldWrap));
+      var warnLimit = EnsoContext.get(warnings).getWarningsLimit();
+      var allWarnsMap =
+          collectAllWarnings(
+              warnings,
+              mapInsertNode,
+              shouldWrap,
+              mapInsertAllNode,
+              warnLimit,
+              shouldWrapProfile,
+              mapSizeNode);
       if (shouldWrap) {
-        cachedWarningsWrapped = cache;
+        cachedWarningsWrapped = allWarnsMap;
+        cache = cachedWarningsWrapped;
       } else {
-        cachedWarningsUnwrapped = cache;
+        cachedWarningsUnwrapped = allWarnsMap;
+        cache = cachedWarningsUnwrapped;
       }
     }
+    assert cache != null;
     return cache;
   }
 
-  @CompilerDirectives.TruffleBoundary
-  private EconomicSet<Warning> collectAllWarnings(
-      WarningsLibrary warningsLib, Node location, boolean shouldWrap)
+  private EnsoHashMap collectAllWarnings(
+      WarningsLibrary warningsLib,
+      HashMapInsertNode mapInsertNode,
+      boolean shouldWrap,
+      HashMapInsertAllNode mapInsertAllNode,
+      int warnLimit,
+      BranchProfile shouldWrapProfile,
+      HashMapSizeNode mapSizeNode)
       throws UnsupportedMessageException {
-    EconomicSet<Warning> setOfWarnings = EconomicSet.create(new WithWarnings.WarningEquivalence());
-    for (int i = 0; i < this.items.length; i++) {
-      final int finalIndex = i;
-      Object item = this.items[i];
+    var warnsSet = EnsoHashMap.empty();
+    for (int itemIdx = 0; itemIdx < this.items.length; itemIdx++) {
+      Object item = this.items[itemIdx];
+      var warnsCnt = (int) mapSizeNode.execute(warnsSet);
+      if (warnsCnt == warnLimit) {
+        break;
+      }
       if (warningsLib.hasWarnings(item)) {
-        Warning[] warnings = warningsLib.getWarnings(item, location, shouldWrap);
-        Warning[] wrappedWarningsMaybe;
-
-        if (shouldWrap) {
-          wrappedWarningsMaybe =
-              Arrays.stream(warnings)
-                  .map(warning -> Warning.wrapMapError(warningsLib, warning, finalIndex))
-                  .toArray(Warning[]::new);
+        var itemWarnsMap = warningsLib.getWarnings(item, shouldWrap);
+        assert mapSizeNode.execute(itemWarnsMap) <= warnLimit;
+
+        if (!shouldWrap) {
+          warnsSet =
+              mapInsertAllNode.executeInsertAll(null, warnsSet, itemWarnsMap, warnLimit - warnsCnt);
         } else {
-          wrappedWarningsMaybe = warnings;
+          shouldWrapProfile.enter();
+          CompilerDirectives.transferToInterpreter();
+          // warnings need to be sorted such that at the first index, there is the oldest warning.
+          // This is because we are creating new warnings by wrapping the previous one, and we need
+          // to
+          // do that in the same creation order.
+          var warnings = Warning.fromMapToArray(itemWarnsMap);
+          Arrays.sort(warnings, Comparator.comparing(Warning::getSequenceId));
+          for (int i = 0; i < Math.min(warnings.length, warnLimit); i++) {
+            var warn = warnings[i];
+            var wrappedWarn = Warning.wrapMapError(warningsLib, warn, itemIdx);
+            warnsSet =
+                mapInsertNode.execute(null, warnsSet, wrappedWarn.getSequenceId(), wrappedWarn);
+          }
         }
-
-        setOfWarnings.addAll(Arrays.asList(wrappedWarningsMaybe));
       }
     }
-    return setOfWarnings;
+    assert mapSizeNode.execute(warnsSet) <= warnLimit;
+    return warnsSet;
   }
 
   @ExportMessage
@@ -239,10 +287,18 @@ Array removeWarnings(@Shared("warnsLib") @CachedLibrary(limit = "3") WarningsLib
   }
 
   @ExportMessage
-  boolean isLimitReached(@Shared("warnsLib") @CachedLibrary(limit = "3") WarningsLibrary warnings) {
+  boolean isLimitReached(
+      @Shared("warnsLib") @CachedLibrary(limit = "3") WarningsLibrary warnsLib,
+      @Shared("mapInsertNode") @Cached HashMapInsertNode mapInsertNode,
+      @Shared @Cached HashMapInsertAllNode mapInsertAllNode,
+      @Shared @Cached HashMapSizeNode mapSizeNode,
+      @Shared @Cached BranchProfile shouldWrapProfile) {
     try {
-      int limit = EnsoContext.get(warnings).getWarningsLimit();
-      return getWarnings(null, false, warnings).length >= limit;
+      int limit = EnsoContext.get(warnsLib).getWarningsLimit();
+      var ourWarnings =
+          getWarnings(
+              false, warnsLib, mapInsertNode, shouldWrapProfile, mapSizeNode, mapInsertAllNode);
+      return (int) mapSizeNode.execute(ourWarnings) >= limit;
     } catch (UnsupportedMessageException e) {
       return false;
     }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayBuilder.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayBuilder.java
index cda3cf51812f..c15ab12d5567 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayBuilder.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayBuilder.java
@@ -12,7 +12,7 @@
 import com.oracle.truffle.api.nodes.Node;
 import java.util.Arrays;
 import org.enso.interpreter.runtime.data.EnsoObject;
-import org.enso.interpreter.runtime.error.WarningsLibrary;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
 
 @ExportLibrary(InteropLibrary.class)
 final class ArrayBuilder implements EnsoObject {
@@ -142,14 +142,31 @@ private Object get(int index, Node node) {
     }
   }
 
+  private static boolean checkArraySize(boolean mustBeExact, int real, int expected) {
+    if (real == expected) {
+      return true;
+    } else {
+      if (mustBeExact) {
+        CompilerDirectives.transferToInterpreter();
+      }
+      return false;
+    }
+  }
+
   /** Returns the current array of the builder. */
-  private Object toArray() {
+  private Object toArray(boolean mustBeExact) {
     if (objectArray != null) {
-      return objectArray.length == size ? objectArray : Arrays.copyOf(objectArray, size);
+      return checkArraySize(mustBeExact, objectArray.length, size)
+          ? objectArray
+          : Arrays.copyOf(objectArray, size);
     } else if (primitiveArray instanceof long[] longArray) {
-      return longArray.length == size ? longArray : Arrays.copyOf(longArray, size);
+      return checkArraySize(mustBeExact, longArray.length, size)
+          ? longArray
+          : Arrays.copyOf(longArray, size);
     } else if (primitiveArray instanceof double[] doubleArray) {
-      return doubleArray.length == size ? doubleArray : Arrays.copyOf(doubleArray, size);
+      return checkArraySize(mustBeExact, doubleArray.length, size)
+          ? doubleArray
+          : Arrays.copyOf(doubleArray, size);
     } else {
       return null;
     }
@@ -195,7 +212,7 @@ Object invokeMember(
         yield get(index, iop);
       }
       case "getSize" -> getSize();
-      case "toArray" -> asVector();
+      case "toArray" -> asVector(false);
       default -> throw UnknownIdentifierException.create(name);
     };
   }
@@ -225,8 +242,8 @@ String toDisplayString(boolean ignore) {
     return "Array_Builder";
   }
 
-  Object asVector() {
-    var res = toArray();
+  Object asVector(boolean mustBeExact) {
+    var res = toArray(mustBeExact);
     if (res instanceof long[] longs) {
       return Vector.fromLongArray(longs);
     }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayLikeAtNode.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayLikeAtNode.java
index 5c097d24d4f1..a74c0b907f80 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayLikeAtNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayLikeAtNode.java
@@ -1,6 +1,7 @@
 package org.enso.interpreter.runtime.data.vector;
 
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.NeverDefault;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.exception.AbstractTruffleException;
@@ -10,8 +11,10 @@
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.nodes.Node;
 import org.enso.interpreter.node.expression.builtin.interop.syntax.HostValueToEnsoNode;
-import org.enso.interpreter.runtime.error.WarningsLibrary;
+import org.enso.interpreter.runtime.warning.AppendWarningNode;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
 
+@GenerateUncached
 public abstract class ArrayLikeAtNode extends Node {
   public abstract Object executeAt(Object arrayLike, long index) throws InvalidArrayIndexException;
 
@@ -57,10 +60,11 @@ Object vectorAt(
       long index,
       @Cached.Exclusive @CachedLibrary(limit = "3") InteropLibrary interop,
       @Cached.Exclusive @CachedLibrary(limit = "3") WarningsLibrary warnings,
-      @Cached.Exclusive @Cached HostValueToEnsoNode convert)
+      @Cached.Exclusive @Cached HostValueToEnsoNode convert,
+      @Cached AppendWarningNode appendWarningNode)
       throws InvalidArrayIndexException {
     try {
-      return self.readArrayElement(index, interop, warnings, convert);
+      return self.readArrayElement(index, interop, warnings, convert, appendWarningNode);
     } catch (UnsupportedMessageException ex) {
       throw ArrayPanics.notAnArrayPanic(this, self);
     }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayLikeHelpers.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayLikeHelpers.java
index 0e93ae4680c4..ce59def7643f 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayLikeHelpers.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayLikeHelpers.java
@@ -11,8 +11,8 @@
 import org.enso.interpreter.runtime.callable.function.Function;
 import org.enso.interpreter.runtime.data.EnsoObject;
 import org.enso.interpreter.runtime.error.DataflowError;
-import org.enso.interpreter.runtime.error.WarningsLibrary;
 import org.enso.interpreter.runtime.state.State;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
 
 /** Publicly available operations on array-like classes. */
 @Builtin(pkg = "immutable", stdlibName = "Standard.Base.Internal.Array_Like_Helpers")
@@ -97,7 +97,7 @@ public static Object vectorFromFunction(
       }
       target.add(value, warnings);
     }
-    return target.asVector();
+    return target.asVector(true);
   }
 
   @Builtin.Method(
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayLikeLengthNode.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayLikeLengthNode.java
index 38a5ce9daaf3..87adc35f4b94 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayLikeLengthNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArrayLikeLengthNode.java
@@ -2,6 +2,7 @@
 
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.Fallback;
+import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.NeverDefault;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.interop.InteropLibrary;
@@ -9,6 +10,7 @@
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.nodes.Node;
 
+@GenerateUncached
 public abstract class ArrayLikeLengthNode extends Node {
   public abstract long executeLength(Object arrayLike);
 
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArraySlice.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArraySlice.java
index 95ab97945622..03d0c2018c70 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArraySlice.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/ArraySlice.java
@@ -15,10 +15,10 @@
 import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.interpreter.runtime.data.EnsoObject;
 import org.enso.interpreter.runtime.data.Type;
-import org.enso.interpreter.runtime.error.Warning;
-import org.enso.interpreter.runtime.error.WarningsLibrary;
-import org.enso.interpreter.runtime.error.WithWarnings;
+import org.enso.interpreter.runtime.data.hash.EnsoHashMap;
 import org.enso.interpreter.runtime.library.dispatch.TypesLibrary;
+import org.enso.interpreter.runtime.warning.AppendWarningNode;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
 
 @ExportLibrary(TypesLibrary.class)
 @ExportLibrary(InteropLibrary.class)
@@ -91,7 +91,8 @@ public Object readArrayElement(
       long index,
       @Shared("interop") @CachedLibrary(limit = "3") InteropLibrary interop,
       @CachedLibrary(limit = "3") WarningsLibrary warnings,
-      @Cached HostValueToEnsoNode toEnso)
+      @Cached HostValueToEnsoNode toEnso,
+      @Cached AppendWarningNode appendWarningNode)
       throws InvalidArrayIndexException, UnsupportedMessageException {
     if (index < 0 || index >= getArraySize(interop)) {
       throw InvalidArrayIndexException.create(index);
@@ -99,11 +100,11 @@ public Object readArrayElement(
 
     var v = interop.readArrayElement(storage, start + index);
     if (this.hasWarnings(warnings)) {
-      Warning[] extracted = this.getWarnings(null, false, warnings);
+      var extracted = this.getWarnings(false, warnings);
       if (warnings.hasWarnings(v)) {
         v = warnings.removeWarnings(v);
       }
-      return WithWarnings.wrap(EnsoContext.get(warnings), toEnso.execute(v), extracted);
+      return appendWarningNode.executeAppend(null, toEnso.execute(v), extracted);
     }
     return toEnso.execute(v);
   }
@@ -155,12 +156,10 @@ boolean hasWarnings(@Shared("warnsLib") @CachedLibrary(limit = "3") WarningsLibr
   }
 
   @ExportMessage
-  Warning[] getWarnings(
-      Node location,
-      boolean shouldWrap,
-      @Shared("warnsLib") @CachedLibrary(limit = "3") WarningsLibrary warnings)
+  EnsoHashMap getWarnings(
+      boolean shouldWrap, @Shared("warnsLib") @CachedLibrary(limit = "3") WarningsLibrary warnings)
       throws UnsupportedMessageException {
-    return warnings.getWarnings(this.storage, location, shouldWrap);
+    return warnings.getWarnings(this.storage, shouldWrap);
   }
 
   @ExportMessage
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/Vector.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/Vector.java
index 40b8cd5d052c..ee80dd21fb1f 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/Vector.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/data/vector/Vector.java
@@ -15,10 +15,10 @@
 import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.interpreter.runtime.data.EnsoObject;
 import org.enso.interpreter.runtime.data.Type;
-import org.enso.interpreter.runtime.error.Warning;
-import org.enso.interpreter.runtime.error.WarningsLibrary;
-import org.enso.interpreter.runtime.error.WithWarnings;
+import org.enso.interpreter.runtime.data.hash.EnsoHashMap;
 import org.enso.interpreter.runtime.library.dispatch.TypesLibrary;
+import org.enso.interpreter.runtime.warning.AppendWarningNode;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
 
 @ExportLibrary(InteropLibrary.class)
 @ExportLibrary(TypesLibrary.class)
@@ -178,8 +178,8 @@ boolean hasWarnings() {
     }
 
     @ExportMessage
-    Warning[] getWarnings(Node location, boolean shouldWrap) throws UnsupportedMessageException {
-      return new Warning[0];
+    EnsoHashMap getWarnings(boolean shouldWrap) {
+      return EnsoHashMap.empty();
     }
 
     @ExportMessage
@@ -249,15 +249,16 @@ Object readArrayElement(
         long index,
         @Cached.Shared(value = "interop") @CachedLibrary(limit = "3") InteropLibrary interop,
         @CachedLibrary(limit = "3") WarningsLibrary warnings,
-        @Cached HostValueToEnsoNode toEnso)
+        @Cached HostValueToEnsoNode toEnso,
+        @Cached AppendWarningNode appendWarningNode)
         throws InvalidArrayIndexException, UnsupportedMessageException {
       var v = interop.readArrayElement(this.storage, index);
       if (warnings.hasWarnings(this.storage)) {
-        Warning[] extracted = warnings.getWarnings(this.storage, null, false);
+        var extracted = warnings.getWarnings(this.storage, false);
         if (warnings.hasWarnings(v)) {
           v = warnings.removeWarnings(v);
         }
-        return WithWarnings.wrap(EnsoContext.get(interop), toEnso.execute(v), extracted);
+        return appendWarningNode.executeAppend(null, toEnso.execute(v), extracted);
       }
       return toEnso.execute(v);
     }
@@ -287,12 +288,11 @@ boolean hasWarnings(
     }
 
     @ExportMessage
-    Warning[] getWarnings(
-        Node location,
+    EnsoHashMap getWarnings(
         boolean shouldWrap,
         @Cached.Shared(value = "warnsLib") @CachedLibrary(limit = "3") WarningsLibrary warnings)
         throws UnsupportedMessageException {
-      return warnings.getWarnings(this.storage, location, shouldWrap);
+      return warnings.getWarnings(this.storage, shouldWrap);
     }
 
     @ExportMessage
@@ -357,8 +357,8 @@ boolean hasWarnings() {
     }
 
     @ExportMessage
-    Warning[] getWarnings(Node location, boolean shouldWrap) throws UnsupportedMessageException {
-      return new Warning[0];
+    EnsoHashMap getWarnings(boolean shouldWrap) {
+      return EnsoHashMap.empty();
     }
 
     @ExportMessage
@@ -407,8 +407,8 @@ boolean hasWarnings() {
     }
 
     @ExportMessage
-    Warning[] getWarnings(Node location, boolean shouldWrap) throws UnsupportedMessageException {
-      return new Warning[0];
+    EnsoHashMap getWarnings(boolean shouldWrap) {
+      return EnsoHashMap.empty();
     }
 
     @ExportMessage
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/Warning.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/Warning.java
deleted file mode 100644
index e1ff24d35c94..000000000000
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/Warning.java
+++ /dev/null
@@ -1,258 +0,0 @@
-package org.enso.interpreter.runtime.error;
-
-import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.dsl.Bind;
-import com.oracle.truffle.api.interop.InteropLibrary;
-import com.oracle.truffle.api.interop.InvalidArrayIndexException;
-import com.oracle.truffle.api.interop.UnsupportedMessageException;
-import com.oracle.truffle.api.library.ExportLibrary;
-import com.oracle.truffle.api.library.ExportMessage;
-import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.nodes.RootNode;
-import com.oracle.truffle.api.source.SourceSection;
-import java.util.Arrays;
-import java.util.Comparator;
-import org.enso.interpreter.dsl.Builtin;
-import org.enso.interpreter.runtime.EnsoContext;
-import org.enso.interpreter.runtime.data.ArrayRope;
-import org.enso.interpreter.runtime.data.EnsoObject;
-import org.enso.interpreter.runtime.data.Type;
-import org.enso.interpreter.runtime.data.vector.ArrayLikeHelpers;
-import org.enso.interpreter.runtime.library.dispatch.TypesLibrary;
-import org.graalvm.collections.EconomicSet;
-
-@Builtin(pkg = "error", stdlibName = "Standard.Base.Warning.Warning")
-@ExportLibrary(TypesLibrary.class)
-public final class Warning implements EnsoObject {
-  private final Object value;
-  private final Object origin;
-  private final ArrayRope<Reassignment> reassignments;
-  private final long sequenceId;
-
-  private Warning(Object value, Object origin, long sequenceId) {
-    this(value, origin, sequenceId, new ArrayRope<>());
-  }
-
-  private Warning(
-      Object value, Object origin, long sequenceId, ArrayRope<Reassignment> reassignments) {
-    this.value = value;
-    this.origin = origin;
-    this.reassignments = reassignments;
-    this.sequenceId = sequenceId;
-  }
-
-  @Builtin.Method(name = "value", description = "Gets the payload of the warning.")
-  @SuppressWarnings("generic-enso-builtin-type")
-  public Object getValue() {
-    return value;
-  }
-
-  @Builtin.Method(name = "origin", description = "Gets the payload of the warning.")
-  @SuppressWarnings("generic-enso-builtin-type")
-  public Object getOrigin() {
-    return origin;
-  }
-
-  @Builtin.Method(
-      name = "create",
-      description = "Creates a new instance of the primitive warning value.",
-      autoRegister = false)
-  @Builtin.Specialize
-  public static Warning create(EnsoContext ctx, Object payload, Object origin) {
-    return new Warning(payload, origin, ctx.nextSequenceId());
-  }
-
-  @Builtin.Method(description = "Gets the list of locations where the warnings was reassigned.")
-  public EnsoObject getReassignments() {
-    Warning.Reassignment[] reassignmentsArray = reassignments.toArray(Warning.Reassignment[]::new);
-    return ArrayLikeHelpers.wrapEnsoObjects(reassignmentsArray);
-  }
-
-  @Builtin.Method(
-      name = "attach_with_stacktrace",
-      description = "Attaches the given warning to the value.",
-      autoRegister = false)
-  @Builtin.Specialize
-  public static WithWarnings attach(
-      EnsoContext ctx, WithWarnings value, Object warning, Object origin) {
-    return value.append(ctx, new Warning(warning, origin, ctx.nextSequenceId()));
-  }
-
-  @Builtin.Method(
-      name = "attach_with_stacktrace",
-      description = "Attaches the given warning to the value.",
-      autoRegister = false)
-  @Builtin.Specialize(fallback = true)
-  public static WithWarnings attach(EnsoContext ctx, Object value, Object warning, Object origin) {
-    return WithWarnings.wrap(ctx, value, new Warning(warning, origin, ctx.nextSequenceId()));
-  }
-
-  @Builtin.Method(
-      name = "get_all_vector",
-      description = "Gets all the warnings associated with the value.",
-      autoRegister = false)
-  @Builtin.Specialize
-  @CompilerDirectives.TruffleBoundary
-  public static EnsoObject getAll(
-      WithWarnings value, boolean shouldWrap, WarningsLibrary warningsLib) {
-    Warning[] warnings = value.getWarningsArray(warningsLib, shouldWrap);
-    sortArray(warnings);
-    return ArrayLikeHelpers.asVectorEnsoObjects(warnings);
-  }
-
-  @Builtin.Method(
-      name = "get_all_vector",
-      description = "Gets all the warnings associated with the value.",
-      autoRegister = false)
-  @Builtin.Specialize(fallback = true)
-  public static EnsoObject getAll(Object value, boolean shouldWrap, WarningsLibrary warningsLib) {
-    if (warningsLib.hasWarnings(value)) {
-      try {
-        Warning[] warnings = warningsLib.getWarnings(value, null, shouldWrap);
-        sortArray(warnings);
-        return ArrayLikeHelpers.asVectorEnsoObjects(warnings);
-      } catch (UnsupportedMessageException e) {
-        throw EnsoContext.get(warningsLib).raiseAssertionPanic(warningsLib, null, e);
-      }
-    } else {
-      return ArrayLikeHelpers.asVectorEmpty();
-    }
-  }
-
-  @Builtin.Method(
-      description =
-          "Returns `true` if the maximal number of warnings has been reached, `false` otherwise.",
-      autoRegister = false)
-  @Builtin.Specialize
-  public static boolean limitReached(WithWarnings value, WarningsLibrary warnings) {
-    return value.isLimitReached();
-  }
-
-  @Builtin.Method(
-      description =
-          "Returns `true` if the maximal number of warnings has been reached, `false` otherwise.",
-      autoRegister = false)
-  @Builtin.Specialize(fallback = true)
-  public static boolean limitReached(Object value, WarningsLibrary warnings) {
-    return warnings.hasWarnings(value) ? warnings.isLimitReached(value) : false;
-  }
-
-  @CompilerDirectives.TruffleBoundary
-  private static void sortArray(Warning[] arr) {
-    Arrays.sort(arr, Comparator.comparing(Warning::getSequenceId).reversed());
-  }
-
-  /** Converts set to an array behing a truffle boundary. */
-  @CompilerDirectives.TruffleBoundary
-  public static Warning[] fromSetToArray(EconomicSet<Warning> set) {
-    return set.toArray(new Warning[set.size()]);
-  }
-
-  @Builtin.Method(
-      name = "set_array",
-      description = "Sets all the warnings associated with the value.",
-      autoRegister = false)
-  @Builtin.Specialize
-  @SuppressWarnings("generic-enso-builtin-type")
-  public static Object set(
-      EnsoContext ctx, WithWarnings value, Object warnings, InteropLibrary interop) {
-    return setGeneric(ctx, value.getValue(), interop, warnings);
-  }
-
-  @Builtin.Method(
-      name = "set_array",
-      description = "Sets all the warnings associated with the value.",
-      autoRegister = false)
-  @SuppressWarnings("generic-enso-builtin-type")
-  @Builtin.Specialize(fallback = true)
-  public static Object set(EnsoContext ctx, Object value, Object warnings, InteropLibrary interop) {
-    return setGeneric(ctx, value, interop, warnings);
-  }
-
-  private static Object setGeneric(
-      EnsoContext ctx, Object value, InteropLibrary interop, Object warnings) {
-    try {
-      var size = interop.getArraySize(warnings);
-      if (size == 0) {
-        return value;
-      }
-      Warning[] warningsCast = new Warning[(int) size];
-      for (int i = 0; i < warningsCast.length; i++) {
-        warningsCast[i] = (Warning) interop.readArrayElement(warnings, i);
-      }
-      return WithWarnings.wrap(ctx, value, warningsCast);
-    } catch (UnsupportedMessageException | InvalidArrayIndexException ex) {
-      throw EnsoContext.get(interop).raiseAssertionPanic(interop, null, ex);
-    }
-  }
-
-  @CompilerDirectives.TruffleBoundary
-  @Override
-  public String toString() {
-    return value.toString();
-  }
-
-  @ExportLibrary(InteropLibrary.class)
-  public static final class Reassignment implements EnsoObject {
-    private final String methodName;
-    private final SourceSection location;
-
-    public Reassignment(String methodName, SourceSection location) {
-      this.methodName = methodName;
-      this.location = location;
-    }
-
-    @ExportMessage
-    boolean hasExecutableName() {
-      return true;
-    }
-
-    @ExportMessage
-    String getExecutableName() {
-      return methodName;
-    }
-
-    @ExportMessage
-    boolean hasSourceLocation() {
-      return location != null;
-    }
-
-    @ExportMessage
-    SourceSection getSourceLocation() throws UnsupportedMessageException {
-      if (location == null) {
-        throw UnsupportedMessageException.create();
-      }
-      return location;
-    }
-  }
-
-  public long getSequenceId() {
-    return sequenceId;
-  }
-
-  @CompilerDirectives.TruffleBoundary
-  public Warning reassign(Node location) {
-    RootNode root = location.getRootNode();
-    SourceSection section = location.getEncapsulatingSourceSection();
-    Reassignment reassignment = new Reassignment(root == null ? "" : root.getName(), section);
-    return new Warning(value, origin, sequenceId, reassignments.prepend(reassignment));
-  }
-
-  @ExportMessage
-  boolean hasType() {
-    return true;
-  }
-
-  @ExportMessage
-  Type getType(@Bind("$node") Node node) {
-    return EnsoContext.get(node).getBuiltins().warning();
-  }
-
-  public static Warning wrapMapError(WarningsLibrary warningsLib, Warning warning, long index) {
-    var ctx = EnsoContext.get(warningsLib);
-    var error = warning.getValue();
-    var wrappedError = ctx.getBuiltins().error().makeMapError(index, error);
-    var wrappedWarning = Warning.create(ctx, wrappedError, warning.getOrigin());
-    return wrappedWarning;
-  }
-}
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/WithWarnings.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/WithWarnings.java
deleted file mode 100644
index 2968eaf4198a..000000000000
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/WithWarnings.java
+++ /dev/null
@@ -1,374 +0,0 @@
-package org.enso.interpreter.runtime.error;
-
-import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.dsl.Bind;
-import com.oracle.truffle.api.dsl.Cached.Shared;
-import com.oracle.truffle.api.interop.ArityException;
-import com.oracle.truffle.api.interop.InteropLibrary;
-import com.oracle.truffle.api.interop.TruffleObject;
-import com.oracle.truffle.api.interop.UnsupportedMessageException;
-import com.oracle.truffle.api.library.CachedLibrary;
-import com.oracle.truffle.api.library.ExportLibrary;
-import com.oracle.truffle.api.library.ExportMessage;
-import com.oracle.truffle.api.library.Message;
-import com.oracle.truffle.api.library.ReflectionLibrary;
-import com.oracle.truffle.api.nodes.Node;
-import org.enso.interpreter.node.callable.InteropMethodCallNode;
-import org.enso.interpreter.runtime.EnsoContext;
-import org.enso.interpreter.runtime.callable.UnresolvedSymbol;
-import org.enso.interpreter.runtime.data.ArrayRope;
-import org.enso.interpreter.runtime.data.EnsoObject;
-import org.enso.interpreter.runtime.data.Type;
-import org.enso.interpreter.runtime.data.text.Text;
-import org.enso.interpreter.runtime.library.dispatch.TypesLibrary;
-import org.enso.interpreter.runtime.state.State;
-import org.graalvm.collections.EconomicSet;
-import org.graalvm.collections.Equivalence;
-
-/**
- * Represents a typical Enso <em>value with warnings</em>. As much of care as possible is taken to
- * delegate all operations to the underlaying {@code value}. Warnings are considered {@link
- * InteropLibrary#isException exceptional values} - e.g. one can check for them in Java polyglot
- * code as:
- *
- * <pre>
- *  Value value = ...;
- *  if (value.fitsInLong() && value.isException()) {
- *    // probably an Integer with a warning
- *    try {
- *      warningMulti.throwException();
- *    } catch (PolyglotException ex) {
- *      System.out.println("Warnings attached to " + value.asLong() + " are " + ex.getMessage());
- *    }
- *  }
- * </pre>
- */
-@ExportLibrary(TypesLibrary.class)
-@ExportLibrary(WarningsLibrary.class)
-@ExportLibrary(ReflectionLibrary.class)
-@ExportLibrary(value = InteropLibrary.class, delegateTo = "value")
-public final class WithWarnings implements EnsoObject {
-  final Object value;
-  private final EconomicSet<Warning> warnings;
-
-  private final boolean limitReached;
-  private final int maxWarnings;
-
-  /**
-   * Creates a new instance of value wrapped in warnings. `limitReached` parameter allows for
-   * indicating if some custom warnings filtering on `warnings` have already been performed.
-   *
-   * @param value value to be wrapped in warnings
-   * @param maxWarnings maximal number of warnings allowed to be attached to the value
-   * @param limitReached if `true`, indicates that `warnings` have already been limited for a
-   *     custom-method, `false` otherwise
-   * @param warnings non-empty warnings to be attached to a value
-   */
-  private WithWarnings(Object value, int maxWarnings, boolean limitReached, Warning... warnings) {
-    assert isAcceptableValue(value);
-    this.warnings = createSetFromArray(maxWarnings, warnings);
-    assert this.warnings.size() > 0;
-    this.value = value;
-    this.limitReached = limitReached || this.warnings.size() >= maxWarnings;
-    this.maxWarnings = maxWarnings;
-  }
-
-  private WithWarnings(Object value, int maxWarnings, Warning... warnings) {
-    this(value, maxWarnings, false, warnings);
-  }
-
-  /**
-   * Creates a new instance of value wrapped in warnings. `limitReached` parameter allows for
-   * indicating if some custom warnings filtering on `additionalWarnings` have already been
-   * performed.
-   *
-   * @param value value to be wrapped in warnings
-   * @param maxWarnings maximal number of warnings allowed to be attached to the value
-   * @param warnings warnings originally attached to a value
-   * @param limitReached if `true`, indicates that `warnings` have already been limited for a
-   *     custom-method, `false` otherwise
-   * @param additionalWarnings additional warnings to be appended to the list of `warnings`
-   */
-  private WithWarnings(
-      Object value,
-      int maxWarnings,
-      EconomicSet<Warning> warnings,
-      boolean limitReached,
-      Warning... additionalWarnings) {
-    assert isAcceptableValue(value);
-    this.warnings = cloneSetAndAppend(maxWarnings, warnings, additionalWarnings);
-    assert this.warnings.size() > 0;
-    this.value = value;
-    this.limitReached = limitReached || this.warnings.size() >= maxWarnings;
-    this.maxWarnings = maxWarnings;
-  }
-
-  private WithWarnings(
-      Object value, int maxWarnings, EconomicSet<Warning> warnings, Warning... additionalWarnings) {
-    this(value, maxWarnings, warnings, false, additionalWarnings);
-  }
-
-  private static boolean isAcceptableValue(Object value) {
-    assert value != null;
-    assert !(value instanceof WithWarnings) : "Trying to double wrap WithWarnings " + value;
-    boolean goodValue =
-        value instanceof TruffleObject
-            || value instanceof Long
-            || value instanceof Double
-            || value instanceof Boolean;
-    assert goodValue : "Unexpected value floating around " + value + " type: " + value.getClass();
-    return goodValue;
-  }
-
-  public static WithWarnings wrap(EnsoContext ctx, Object value, Warning... warnings) {
-    if (value instanceof WithWarnings with) {
-      return with.append(ctx, warnings);
-    } else {
-      return new WithWarnings(value, ctx.getWarningsLimit(), warnings);
-    }
-  }
-
-  public Object getValue() {
-    return value;
-  }
-
-  public WithWarnings append(EnsoContext ctx, boolean limitReached, Warning... newWarnings) {
-    return new WithWarnings(value, ctx.getWarningsLimit(), warnings, limitReached, newWarnings);
-  }
-
-  public WithWarnings append(EnsoContext ctx, Warning... newWarnings) {
-    return new WithWarnings(value, ctx.getWarningsLimit(), warnings, newWarnings);
-  }
-
-  public WithWarnings append(EnsoContext ctx, ArrayRope<Warning> newWarnings) {
-    return new WithWarnings(
-        value, ctx.getWarningsLimit(), warnings, newWarnings.toArray(Warning[]::new));
-  }
-
-  // Ignore the warnings cache in .value and re-fetch them using the WarningsLibrary.
-  // This is only used for shouldWrap=true.
-  private Warning[] getWarningsNoCache(WarningsLibrary warningsLibrary) {
-    if (warningsLibrary != null && warningsLibrary.hasWarnings(value)) {
-      try {
-        return warningsLibrary.getWarnings(value, null, true);
-      } catch (UnsupportedMessageException e) {
-        throw EnsoContext.get(warningsLibrary).raiseAssertionPanic(warningsLibrary, null, e);
-      }
-    } else {
-      return Warning.fromSetToArray(warnings);
-    }
-  }
-
-  public Warning[] getWarningsArray(WarningsLibrary warningsLibrary, boolean shouldWrap) {
-    Warning[] allWarnings;
-    if (warningsLibrary != null && warningsLibrary.hasWarnings(value)) {
-      try {
-        Warning[] valueWarnings = warningsLibrary.getWarnings(value, null, shouldWrap);
-        EconomicSet<Warning> tmp = cloneSetAndAppend(maxWarnings, warnings, valueWarnings);
-        allWarnings = Warning.fromSetToArray(tmp);
-      } catch (UnsupportedMessageException e) {
-        throw EnsoContext.get(warningsLibrary).raiseAssertionPanic(warningsLibrary, null, e);
-      }
-    } else {
-      allWarnings = Warning.fromSetToArray(warnings);
-    }
-    return allWarnings;
-  }
-
-  /**
-   * @return the number of warnings.
-   */
-  public int getWarningsCount() {
-    return warnings.size();
-  }
-
-  public ArrayRope<Warning> getReassignedWarningsAsRope(Node location, boolean shouldWrap) {
-    return new ArrayRope<>(getReassignedWarnings(location, shouldWrap, null));
-  }
-
-  public Warning[] getReassignedWarnings(
-      Node location, boolean shouldWrap, WarningsLibrary warningsLibrary) {
-    Warning[] warnings = getWarningsArray(warningsLibrary, shouldWrap);
-    for (int i = 0; i < warnings.length; i++) {
-      warnings[i] = warnings[i].reassign(location);
-    }
-    return warnings;
-  }
-
-  public static WithWarnings appendTo(EnsoContext ctx, Object target, ArrayRope<Warning> warnings) {
-    if (target instanceof WithWarnings) {
-      return ((WithWarnings) target).append(ctx, warnings.toArray(Warning[]::new));
-    } else {
-      return new WithWarnings(target, ctx.getWarningsLimit(), warnings.toArray(Warning[]::new));
-    }
-  }
-
-  public static WithWarnings appendTo(EnsoContext ctx, Object target, Warning... warnings) {
-    return appendTo(ctx, target, false, warnings);
-  }
-
-  public static WithWarnings appendTo(
-      EnsoContext ctx, Object target, boolean reachedMaxCount, Warning... warnings) {
-    if (target instanceof WithWarnings) {
-      return ((WithWarnings) target).append(ctx, reachedMaxCount, warnings);
-    } else {
-      return new WithWarnings(target, ctx.getWarningsLimit(), reachedMaxCount, warnings);
-    }
-  }
-
-  @CompilerDirectives.TruffleBoundary
-  private PanicException asException(Node where) {
-    var rawWarn = this.getWarnings(where, false, WarningsLibrary.getUncached());
-    var ctx = EnsoContext.get(where);
-    var scopeOfAny = ctx.getBuiltins().any().getDefinitionScope();
-    var toText = UnresolvedSymbol.build("to_text", scopeOfAny);
-    var node = InteropMethodCallNode.getUncached();
-    var state = State.create(ctx);
-
-    var text = Text.empty();
-    for (var w : rawWarn) {
-      try {
-        var wText = node.execute(toText, state, new Object[] {w});
-        if (wText instanceof Text t) {
-          text = text.add(t);
-        }
-      } catch (ArityException e) {
-        throw ctx.raiseAssertionPanic(where, null, e);
-      }
-    }
-    return new PanicException(text, where);
-  }
-
-  @ExportMessage
-  Object send(Message message, Object[] args, @CachedLibrary(limit = "3") ReflectionLibrary lib)
-      throws Exception {
-    return lib.send(value, message, args);
-  }
-
-  @ExportMessage
-  boolean hasWarnings() {
-    return true;
-  }
-
-  @ExportMessage
-  Warning[] getWarnings(
-      Node location,
-      boolean shouldWrap,
-      @Shared("warnsLib") @CachedLibrary(limit = "3") WarningsLibrary warningsLibrary) {
-    if (location != null) {
-      return getReassignedWarnings(location, shouldWrap, warningsLibrary);
-    } else {
-      if (shouldWrap) {
-        // In the wrapping case, we don't use the local cache in .values, since
-        // it contains unwrapped warnings. Instead, we fetch them again.
-        return getWarningsNoCache(warningsLibrary);
-      } else {
-        return Warning.fromSetToArray(warnings);
-      }
-    }
-  }
-
-  @ExportMessage
-  Object removeWarnings(@Shared("warnsLib") @CachedLibrary(limit = "3") WarningsLibrary warnings)
-      throws UnsupportedMessageException {
-    if (warnings.hasWarnings(value)) {
-      return warnings.removeWarnings(value);
-    } else {
-      return value;
-    }
-  }
-
-  @ExportMessage
-  public boolean isLimitReached() {
-    return limitReached;
-  }
-
-  @ExportMessage
-  boolean hasType(@Shared("typesLib") @CachedLibrary(limit = "3") TypesLibrary types) {
-    return types.hasType(value);
-  }
-
-  @ExportMessage
-  Type getType(@Shared("typesLib") @CachedLibrary(limit = "3") TypesLibrary types) {
-    return types.getType(value);
-  }
-
-  @ExportMessage
-  boolean hasSpecialDispatch() {
-    return true;
-  }
-
-  @ExportMessage
-  boolean isException() {
-    return true;
-  }
-
-  @ExportMessage
-  RuntimeException throwException(@Bind("$node") Node node) throws UnsupportedMessageException {
-    throw asException(node);
-  }
-
-  public static class WarningEquivalence extends Equivalence {
-
-    @Override
-    public boolean equals(Object a, Object b) {
-      if (a instanceof Warning thisObj && b instanceof Warning thatObj) {
-        return thisObj.getSequenceId() == thatObj.getSequenceId();
-      }
-      return false;
-    }
-
-    @Override
-    public int hashCode(Object o) {
-      return (int) ((Warning) o).getSequenceId();
-    }
-  }
-
-  @CompilerDirectives.TruffleBoundary
-  private EconomicSet<Warning> createSetFromArray(int maxWarnings, Warning[] entries) {
-    EconomicSet<Warning> set = EconomicSet.create(new WarningEquivalence());
-    for (int i = 0; i < entries.length; i++) {
-      if (set.size() == maxWarnings) {
-        return set;
-      }
-      set.add(entries[i]);
-    }
-    return set;
-  }
-
-  private EconomicSet<Warning> cloneSetAndAppend(
-      int maxWarnings, EconomicSet<Warning> initial, Warning[] entries) {
-    return initial.size() == maxWarnings
-        ? initial
-        : cloneSetAndAppendSlow(maxWarnings, initial, entries);
-  }
-
-  @CompilerDirectives.TruffleBoundary
-  private EconomicSet<Warning> cloneSetAndAppendSlow(
-      int maxWarnings, EconomicSet<Warning> initial, Warning[] entries) {
-    EconomicSet<Warning> set = EconomicSet.create(new WarningEquivalence());
-    for (Warning warning : initial) {
-      if (set.size() == maxWarnings) {
-        return set;
-      }
-      set.add(warning);
-    }
-    for (int i = 0; i < entries.length; i++) {
-      if (set.size() == maxWarnings) {
-        return set;
-      }
-      set.add(entries[i]);
-    }
-    return set;
-  }
-
-  @Override
-  public String toString() {
-    return "WithWarnings{"
-        + value
-        + " has "
-        + warnings.size()
-        + " warnings"
-        + (limitReached ? " (warnings limit reached)}" : "}");
-  }
-}
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/library/dispatch/TypeOfNode.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/library/dispatch/TypeOfNode.java
index 60a4d5fd6113..e7641ff02435 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/library/dispatch/TypeOfNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/library/dispatch/TypeOfNode.java
@@ -20,8 +20,8 @@
 import org.enso.interpreter.runtime.error.DataflowError;
 import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.error.PanicSentinel;
-import org.enso.interpreter.runtime.error.WithWarnings;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
+import org.enso.interpreter.runtime.warning.WithWarnings;
 
 @GenerateUncached
 public abstract class TypeOfNode extends Node {
@@ -70,8 +70,8 @@ Object doPanicSentinel(PanicSentinel value) {
   }
 
   @Specialization
-  Object doWarning(WithWarnings value) {
-    return execute(value.getValue());
+  Object doWarning(WithWarnings value, @Cached TypeOfNode withoutWarning) {
+    return withoutWarning.execute(value.getValue());
   }
 
   static boolean isWithoutType(Object value, TypesLibrary types) {
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/type/Types.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/type/Types.java
index fa3484b543d2..0f5a65f12a18 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/type/Types.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/type/Types.java
@@ -22,9 +22,11 @@
 import org.enso.interpreter.runtime.error.DataflowError;
 import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.error.PanicSentinel;
-import org.enso.interpreter.runtime.error.Warning;
 import org.enso.interpreter.runtime.number.EnsoBigInteger;
 import org.enso.interpreter.runtime.scope.ModuleScope;
+import org.enso.interpreter.runtime.warning.Warning;
+import org.enso.interpreter.runtime.warning.WarningsLibrary;
+import org.enso.interpreter.runtime.warning.WithWarnings;
 import org.enso.polyglot.data.TypeGraph;
 
 /**
@@ -57,6 +59,8 @@
   PanicSentinel.class,
   EnsoHashMap.class,
   Warning.class,
+  WithWarnings.class,
+  WarningsLibrary.class,
   EnsoFile.class,
   EnsoDate.class,
   EnsoDateTime.class,
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/AppendWarningNode.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/AppendWarningNode.java
new file mode 100644
index 000000000000..dc4df5749bc7
--- /dev/null
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/AppendWarningNode.java
@@ -0,0 +1,209 @@
+package org.enso.interpreter.runtime.warning;
+
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Cached.Shared;
+import com.oracle.truffle.api.dsl.GenerateUncached;
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.InvalidArrayIndexException;
+import com.oracle.truffle.api.library.CachedLibrary;
+import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.profiles.ConditionProfile;
+import org.enso.interpreter.runtime.EnsoContext;
+import org.enso.interpreter.runtime.data.hash.EnsoHashMap;
+import org.enso.interpreter.runtime.data.hash.HashMapInsertAllNode;
+import org.enso.interpreter.runtime.data.hash.HashMapInsertNode;
+import org.enso.interpreter.runtime.data.hash.HashMapSizeNode;
+import org.enso.interpreter.runtime.data.vector.ArrayLikeAtNode;
+import org.enso.interpreter.runtime.data.vector.ArrayLikeLengthNode;
+
+@GenerateUncached
+public abstract class AppendWarningNode extends Node {
+
+  public static AppendWarningNode build() {
+    return AppendWarningNodeGen.create();
+  }
+
+  public static AppendWarningNode getUncached() {
+    return AppendWarningNodeGen.getUncached();
+  }
+
+  /**
+   * Appends a warning to the given object.
+   *
+   * @param object Object that will have the warning appended
+   * @param warnings Either an array-like object containing warnings to append, or a single warning.
+   *     It is expected that all the elements in the container are of {@link Warning} class.
+   * @return A wrapped object with warnings
+   */
+  public abstract WithWarnings executeAppend(VirtualFrame frame, Object object, Object warnings);
+
+  @Specialization
+  WithWarnings doSingleWarning(
+      VirtualFrame frame,
+      Object object,
+      Warning warning,
+      @Shared @Cached HashMapInsertNode mapInsertNode,
+      @Shared @Cached HashMapSizeNode mapSizeNode,
+      @Shared @Cached ConditionProfile isWithWarnsProfile) {
+    EnsoHashMap warnsMap;
+    int warnsLimit;
+    Object value;
+    if (isWithWarnsProfile.profile(object instanceof WithWarnings)) {
+      warnsMap = ((WithWarnings) object).warnings;
+      value = ((WithWarnings) object).value;
+      warnsLimit = ((WithWarnings) object).maxWarnings;
+    } else {
+      warnsMap = EnsoHashMap.empty();
+      value = object;
+      warnsLimit = EnsoContext.get(this).getWarningsLimit();
+    }
+    boolean isLimitReached;
+    if ((int) mapSizeNode.execute(warnsMap) < warnsLimit) {
+      warnsMap = mapInsertNode.execute(frame, warnsMap, warning.getSequenceId(), warning);
+      isLimitReached = false;
+    } else {
+      isLimitReached = true;
+    }
+    return new WithWarnings(value, warnsLimit, isLimitReached, warnsMap);
+  }
+
+  @Specialization
+  WithWarnings doMultipleWarningsArray(
+      VirtualFrame frame,
+      Object object,
+      Warning[] warnings,
+      @Shared @Cached HashMapInsertNode mapInsertNode,
+      @Shared @Cached HashMapSizeNode mapSizeNode,
+      @Shared @Cached ConditionProfile isWithWarnsProfile) {
+    EnsoHashMap warnsMap;
+    int warnsLimit;
+    Object value;
+    if (isWithWarnsProfile.profile(object instanceof WithWarnings)) {
+      warnsMap = ((WithWarnings) object).warnings;
+      warnsLimit = ((WithWarnings) object).maxWarnings;
+      value = ((WithWarnings) object).value;
+    } else {
+      warnsMap = EnsoHashMap.empty();
+      warnsLimit = EnsoContext.get(this).getWarningsLimit();
+      value = object;
+    }
+    var isLimitReached = false;
+    for (var warn : warnings) {
+      if (mapSizeNode.execute(warnsMap) < warnsLimit) {
+        warnsMap = mapInsertNode.execute(frame, warnsMap, warn.getSequenceId(), warn);
+      } else {
+        isLimitReached = true;
+        break;
+      }
+    }
+    return new WithWarnings(value, warnsLimit, isLimitReached, warnsMap);
+  }
+
+  /**
+   * This specialization should be the most frequent - just wrapping the given {@code object} with
+   * warnings hash map
+   */
+  @Specialization(guards = {"!isWithWarns(object)"})
+  WithWarnings doObjectMultipleWarningsHashMap(
+      VirtualFrame frame,
+      Object object,
+      EnsoHashMap newWarnsMap,
+      @Shared @Cached HashMapSizeNode mapSizeNode) {
+    assert !(object instanceof WithWarnings);
+    int warnsLimit = EnsoContext.get(this).getWarningsLimit();
+    var limitReached = mapSizeNode.execute(newWarnsMap) >= warnsLimit;
+    return new WithWarnings(object, warnsLimit, limitReached, newWarnsMap);
+  }
+
+  @Specialization
+  WithWarnings doWithWarnMultipleWarningsHashMap(
+      VirtualFrame frame,
+      WithWarnings withWarnings,
+      EnsoHashMap newWarnsMap,
+      @Cached HashMapInsertAllNode mapInsertAllNode,
+      @Shared @Cached HashMapSizeNode mapSizeNode) {
+    if (withWarnings.isLimitReached()) {
+      return withWarnings;
+    }
+    var maxWarns = withWarnings.maxWarnings;
+    var warnsMap = withWarnings.warnings;
+    var curWarnsCnt = (int) mapSizeNode.execute(warnsMap);
+    warnsMap =
+        mapInsertAllNode.executeInsertAll(frame, warnsMap, newWarnsMap, maxWarns - curWarnsCnt);
+    var isLimitReached =
+        mapSizeNode.execute(withWarnings.warnings) + mapSizeNode.execute(newWarnsMap) >= maxWarns;
+    return new WithWarnings(withWarnings.value, withWarnings.maxWarnings, isLimitReached, warnsMap);
+  }
+
+  @Specialization(guards = {"interop.hasArrayElements(warnings)", "!isWarnArray(warnings)"})
+  WithWarnings doMultipleWarningsInterop(
+      VirtualFrame frame,
+      Object object,
+      Object warnings,
+      @CachedLibrary(limit = "3") InteropLibrary interop,
+      @Shared @Cached HashMapInsertNode mapInsertNode,
+      @Cached ArrayLikeAtNode atNode,
+      @Cached ArrayLikeLengthNode lengthNode,
+      @Shared @Cached HashMapSizeNode mapSizeNode,
+      @Shared @Cached ConditionProfile isWithWarnsProfile) {
+    assert !(warnings instanceof Warning[]);
+    EnsoHashMap warnsMap;
+    int warnsLimit;
+    Object value;
+    if (isWithWarnsProfile.profile(object instanceof WithWarnings)) {
+      value = ((WithWarnings) object).value;
+      warnsLimit = ((WithWarnings) object).maxWarnings;
+      warnsMap = ((WithWarnings) object).warnings;
+    } else {
+      value = object;
+      warnsLimit = EnsoContext.get(this).getWarningsLimit();
+      warnsMap = EnsoHashMap.empty();
+    }
+    var currWarnsCnt = mapSizeNode.execute(warnsMap);
+    var resWarningMap =
+        insertToWarningMap(
+            frame, warnsMap, warnings, warnsLimit, lengthNode, atNode, mapInsertNode, mapSizeNode);
+    var newWarnsCnt = lengthNode.executeLength(warnings);
+    var isLimitReached = currWarnsCnt + newWarnsCnt >= warnsLimit;
+    return new WithWarnings(value, warnsLimit, isLimitReached, resWarningMap);
+  }
+
+  /** Inserts all {@code warnings} to the {@code initialWarningMap}. */
+  private EnsoHashMap insertToWarningMap(
+      VirtualFrame frame,
+      EnsoHashMap initialWarningMap,
+      Object warnings,
+      int warnsLimit,
+      ArrayLikeLengthNode lengthNode,
+      ArrayLikeAtNode atNode,
+      HashMapInsertNode mapInsertNode,
+      HashMapSizeNode mapSizeNode) {
+    EnsoHashMap resWarningMap = initialWarningMap;
+    for (long i = 0; i < lengthNode.executeLength(warnings); i++) {
+      Warning warn;
+      try {
+        warn = (Warning) atNode.executeAt(warnings, i);
+      } catch (InvalidArrayIndexException e) {
+        throw CompilerDirectives.shouldNotReachHere(e);
+      } catch (ClassCastException e) {
+        throw EnsoContext.get(this).raiseAssertionPanic(this, "Expected warning object", e);
+      }
+      if (mapSizeNode.execute(resWarningMap) >= warnsLimit) {
+        return resWarningMap;
+      }
+      resWarningMap = mapInsertNode.execute(frame, resWarningMap, warn.getSequenceId(), warn);
+    }
+    return resWarningMap;
+  }
+
+  protected static boolean isWarnArray(Object obj) {
+    return obj instanceof Warning[];
+  }
+
+  protected static boolean isWithWarns(Object obj) {
+    return obj instanceof WithWarnings;
+  }
+}
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/GetAllWarningsNode.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/GetAllWarningsNode.java
new file mode 100644
index 000000000000..0210faae19c3
--- /dev/null
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/GetAllWarningsNode.java
@@ -0,0 +1,70 @@
+package org.enso.interpreter.runtime.warning;
+
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Cached.Shared;
+import com.oracle.truffle.api.dsl.Fallback;
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
+import com.oracle.truffle.api.library.CachedLibrary;
+import com.oracle.truffle.api.nodes.Node;
+import java.util.Arrays;
+import java.util.Comparator;
+import org.enso.interpreter.dsl.AcceptsWarning;
+import org.enso.interpreter.dsl.BuiltinMethod;
+import org.enso.interpreter.runtime.EnsoContext;
+import org.enso.interpreter.runtime.data.hash.HashMapInsertAllNode;
+import org.enso.interpreter.runtime.data.vector.ArrayLikeHelpers;
+
+@BuiltinMethod(
+    type = "Warning",
+    name = "get_all_vector",
+    description = "Gets all the warnings associated with the value.",
+    autoRegister = false)
+public abstract class GetAllWarningsNode extends Node {
+
+  public static GetAllWarningsNode build() {
+    return GetAllWarningsNodeGen.create();
+  }
+
+  public abstract Object execute(@AcceptsWarning Object value, boolean shouldWrap);
+
+  @Specialization
+  Object doWithWarn(
+      WithWarnings value,
+      boolean shouldWrap,
+      @Shared @CachedLibrary(limit = "3") WarningsLibrary warningsLib,
+      @Shared @CachedLibrary(limit = "3") InteropLibrary interop,
+      @Cached HashMapInsertAllNode mapInsertAllNode) {
+    var warns = value.getWarningsArray(shouldWrap, warningsLib, mapInsertAllNode, interop);
+    sortArray(warns);
+    return ArrayLikeHelpers.asVectorEnsoObjects(warns);
+  }
+
+  @Fallback
+  Object doGeneric(
+      Object value,
+      boolean shouldWrap,
+      @Shared @CachedLibrary(limit = "3") WarningsLibrary warningsLib,
+      @Shared @CachedLibrary(limit = "3") InteropLibrary interop) {
+    assert !(value instanceof WithWarnings);
+    if (warningsLib.hasWarnings(value)) {
+      try {
+        var warnsMap = warningsLib.getWarnings(value, shouldWrap);
+        var warnings = Warning.fromMapToArray(warnsMap, interop);
+        sortArray(warnings);
+        return ArrayLikeHelpers.asVectorEnsoObjects(warnings);
+      } catch (UnsupportedMessageException e) {
+        throw EnsoContext.get(warningsLib).raiseAssertionPanic(warningsLib, null, e);
+      }
+    } else {
+      return ArrayLikeHelpers.asVectorEmpty();
+    }
+  }
+
+  @TruffleBoundary
+  private static void sortArray(Warning[] arr) {
+    Arrays.sort(arr, Comparator.comparing(Warning::getSequenceId).reversed());
+  }
+}
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/LimitReachedNode.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/LimitReachedNode.java
new file mode 100644
index 000000000000..430b20f27051
--- /dev/null
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/LimitReachedNode.java
@@ -0,0 +1,32 @@
+package org.enso.interpreter.runtime.warning;
+
+import com.oracle.truffle.api.dsl.Fallback;
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.library.CachedLibrary;
+import com.oracle.truffle.api.nodes.Node;
+import org.enso.interpreter.dsl.AcceptsWarning;
+import org.enso.interpreter.dsl.BuiltinMethod;
+
+@BuiltinMethod(
+    type = "Warning",
+    name = "limit_reached",
+    description =
+        "Returns `true` if the maximal number of warnings has been reached, `false` otherwise.",
+    autoRegister = false)
+public abstract class LimitReachedNode extends Node {
+  public static LimitReachedNode build() {
+    return LimitReachedNodeGen.create();
+  }
+
+  public abstract boolean execute(@AcceptsWarning Object value);
+
+  @Specialization
+  boolean doWithWarns(WithWarnings withWarns) {
+    return withWarns.isLimitReached();
+  }
+
+  @Fallback
+  boolean doGeneric(Object value, @CachedLibrary(limit = "3") WarningsLibrary warnsLib) {
+    return warnsLib.hasWarnings(value) && warnsLib.isLimitReached(value);
+  }
+}
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/SetWarningsNode.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/SetWarningsNode.java
new file mode 100644
index 000000000000..b6653e76ed88
--- /dev/null
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/SetWarningsNode.java
@@ -0,0 +1,118 @@
+package org.enso.interpreter.runtime.warning;
+
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Cached.Shared;
+import com.oracle.truffle.api.dsl.GenerateUncached;
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.InvalidArrayIndexException;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
+import com.oracle.truffle.api.library.CachedLibrary;
+import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.profiles.ConditionProfile;
+import org.enso.interpreter.dsl.AcceptsWarning;
+import org.enso.interpreter.dsl.BuiltinMethod;
+import org.enso.interpreter.runtime.EnsoContext;
+import org.enso.interpreter.runtime.data.hash.EnsoHashMap;
+import org.enso.interpreter.runtime.data.hash.HashMapInsertNode;
+
+@BuiltinMethod(
+    type = "Warning",
+    name = "set_array",
+    description = "Sets all the warnings associated with the value.",
+    autoRegister = false)
+@GenerateUncached
+public abstract class SetWarningsNode extends Node {
+
+  public static SetWarningsNode build() {
+    return SetWarningsNodeGen.create();
+  }
+
+  public abstract Object execute(VirtualFrame frame, @AcceptsWarning Object value, Object warnings);
+
+  @Specialization(guards = "isEmpty(warnings, interop)")
+  Object doEmpty(
+      VirtualFrame frame,
+      Object object,
+      Object warnings,
+      @Shared @CachedLibrary(limit = "3") InteropLibrary interop,
+      @Shared @Cached ConditionProfile isWithWarnsProfile) {
+    if (isWithWarnsProfile.profile(object instanceof WithWarnings)) {
+      return ((WithWarnings) object).value;
+    } else {
+      return object;
+    }
+  }
+
+  @Specialization(guards = "!isEmpty(warnings, interop)")
+  Object doSetArray(
+      VirtualFrame frame,
+      Object object,
+      Warning[] warnings,
+      @Shared @CachedLibrary(limit = "3") InteropLibrary interop,
+      @Shared @Cached HashMapInsertNode mapInsertNode,
+      @Shared @Cached ConditionProfile isWithWarnsProfile) {
+    var warnMap = EnsoHashMap.empty();
+    for (var warn : warnings) {
+      warnMap = mapInsertNode.execute(frame, warnMap, warn.getSequenceId(), warn);
+    }
+    var maxWarns = EnsoContext.get(this).getWarningsLimit();
+    var isLimitReached = warnings.length >= maxWarns;
+    if (isWithWarnsProfile.profile(object instanceof WithWarnings)) {
+      return new WithWarnings(((WithWarnings) object).value, maxWarns, isLimitReached, warnMap);
+    } else {
+      return new WithWarnings(object, maxWarns, isLimitReached, warnMap);
+    }
+  }
+
+  @Specialization(guards = {"!isEmpty(warnings, interop)", "!isWarnArray(warnings)"})
+  Object doSetInteropArray(
+      VirtualFrame frame,
+      Object object,
+      Object warnings,
+      @Shared @CachedLibrary(limit = "3") InteropLibrary interop,
+      @Shared @Cached HashMapInsertNode mapInsertNode,
+      @Shared @Cached ConditionProfile isWithWarnsProfile) {
+    assert !(warnings instanceof Warning[]);
+    var warnMap = EnsoHashMap.empty();
+    var ctx = EnsoContext.get(this);
+    try {
+      var size = interop.getArraySize(warnings);
+      for (long i = 0; i < interop.getArraySize(warnings); i++) {
+        var warn = (Warning) interop.readArrayElement(warnings, i);
+        warnMap = mapInsertNode.execute(frame, warnMap, warn.getSequenceId(), warn);
+      }
+      var maxWarns = ctx.getWarningsLimit();
+      var isLimitReached = size >= maxWarns;
+      if (isWithWarnsProfile.profile(object instanceof WithWarnings)) {
+        return new WithWarnings(((WithWarnings) object).value, maxWarns, isLimitReached, warnMap);
+      } else {
+        return new WithWarnings(object, maxWarns, isLimitReached, warnMap);
+      }
+    } catch (UnsupportedMessageException | InvalidArrayIndexException e) {
+      throw CompilerDirectives.shouldNotReachHere(e);
+    } catch (ClassCastException e) {
+      throw ctx.raiseAssertionPanic(this, "Expected Warning, got something else", e);
+    }
+  }
+
+  protected static boolean isEmpty(Object warns, InteropLibrary interop) {
+    if (warns instanceof Warning[] warnsArray) {
+      return warnsArray.length == 0;
+    }
+    if (interop.hasArrayElements(warns)) {
+      try {
+        return interop.getArraySize(warns) == 0;
+      } catch (UnsupportedMessageException e) {
+        throw CompilerDirectives.shouldNotReachHere(e);
+      }
+    }
+    return false;
+  }
+
+  protected static boolean isWarnArray(Object obj) {
+    return obj instanceof Warning[];
+  }
+}
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/Warning.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/Warning.java
new file mode 100644
index 000000000000..2c94a82dac70
--- /dev/null
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/Warning.java
@@ -0,0 +1,134 @@
+package org.enso.interpreter.runtime.warning;
+
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.dsl.Bind;
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.StopIterationException;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
+import com.oracle.truffle.api.library.ExportLibrary;
+import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.nodes.Node;
+import org.enso.interpreter.dsl.Builtin;
+import org.enso.interpreter.runtime.EnsoContext;
+import org.enso.interpreter.runtime.data.EnsoObject;
+import org.enso.interpreter.runtime.data.Type;
+import org.enso.interpreter.runtime.data.hash.EnsoHashMap;
+import org.enso.interpreter.runtime.data.hash.HashMapInsertNode;
+import org.enso.interpreter.runtime.library.dispatch.TypesLibrary;
+
+@Builtin(pkg = "error", stdlibName = "Standard.Base.Warning.Warning")
+@ExportLibrary(TypesLibrary.class)
+public final class Warning implements EnsoObject {
+  private final Object value;
+  private final Object origin;
+  private final long sequenceId;
+
+  private Warning(Object value, Object origin, long sequenceId) {
+    this.value = value;
+    this.origin = origin;
+    this.sequenceId = sequenceId;
+  }
+
+  @Builtin.Method(name = "value", description = "Gets the payload of the warning.")
+  @SuppressWarnings("generic-enso-builtin-type")
+  public Object getValue() {
+    return value;
+  }
+
+  @Builtin.Method(name = "origin", description = "Gets the payload of the warning.")
+  @SuppressWarnings("generic-enso-builtin-type")
+  public Object getOrigin() {
+    return origin;
+  }
+
+  @Builtin.Method(
+      name = "create",
+      description = "Creates a new instance of the primitive warning value.",
+      autoRegister = false)
+  @Builtin.Specialize
+  public static Warning create(EnsoContext ctx, Object payload, Object origin) {
+    return new Warning(payload, origin, ctx.nextSequenceId());
+  }
+
+  @Builtin.Method(
+      name = "attach_with_stacktrace",
+      description = "Attaches the given warning to the value.",
+      autoRegister = false)
+  @Builtin.Specialize
+  public static WithWarnings attach(
+      EnsoContext ctx,
+      Object value,
+      Object warning,
+      Object origin,
+      @Cached AppendWarningNode appendWarningNode) {
+    var warn = new Warning(warning, origin, ctx.nextSequenceId());
+    return appendWarningNode.executeAppend(null, value, warn);
+  }
+
+  /** Slow version of {@link #fromMapToArray(EnsoHashMap, InteropLibrary)}. */
+  @TruffleBoundary
+  public static Warning[] fromMapToArray(EnsoHashMap map) {
+    return fromMapToArray(map, InteropLibrary.getUncached());
+  }
+
+  public static Warning[] fromMapToArray(EnsoHashMap map, InteropLibrary interop) {
+    assert interop.hasHashEntries(map);
+    Warning[] warns = null;
+    try {
+      long mapSize = interop.getHashSize(map);
+      assert mapSize < Integer.MAX_VALUE;
+      warns = new Warning[(int) mapSize];
+      var hashValuesIt = interop.getHashValuesIterator(map);
+      assert interop.isIterator(hashValuesIt);
+      int warnsIdx = 0;
+      while (interop.hasIteratorNextElement(hashValuesIt)) {
+        var value = interop.getIteratorNextElement(hashValuesIt);
+        warns[warnsIdx] = (Warning) value;
+        warnsIdx++;
+      }
+      return warns;
+    } catch (UnsupportedMessageException | ClassCastException | ArrayIndexOutOfBoundsException e) {
+      throw CompilerDirectives.shouldNotReachHere(e);
+    } catch (StopIterationException e) {
+      assert warns != null;
+      return warns;
+    }
+  }
+
+  public static EnsoHashMap fromArrayToMap(Warning[] warnings, HashMapInsertNode mapInsertNode) {
+    var map = EnsoHashMap.empty();
+    for (var warn : warnings) {
+      map = mapInsertNode.execute(null, map, warn.getSequenceId(), warn);
+    }
+    return map;
+  }
+
+  @CompilerDirectives.TruffleBoundary
+  @Override
+  public String toString() {
+    return value.toString();
+  }
+
+  public long getSequenceId() {
+    return sequenceId;
+  }
+
+  @ExportMessage
+  boolean hasType() {
+    return true;
+  }
+
+  @ExportMessage
+  Type getType(@Bind("$node") Node node) {
+    return EnsoContext.get(node).getBuiltins().warning();
+  }
+
+  public static Warning wrapMapError(WarningsLibrary warningsLib, Warning warning, long index) {
+    var ctx = EnsoContext.get(warningsLib);
+    var error = warning.getValue();
+    var wrappedError = ctx.getBuiltins().error().makeMapError(index, error);
+    return Warning.create(ctx, wrappedError, warning.getOrigin());
+  }
+}
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/WarningsLibrary.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/WarningsLibrary.java
similarity index 85%
rename from engine/runtime/src/main/java/org/enso/interpreter/runtime/error/WarningsLibrary.java
rename to engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/WarningsLibrary.java
index 32eabe8e8f71..004065e4ae33 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/error/WarningsLibrary.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/WarningsLibrary.java
@@ -1,10 +1,10 @@
-package org.enso.interpreter.runtime.error;
+package org.enso.interpreter.runtime.warning;
 
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.GenerateLibrary;
 import com.oracle.truffle.api.library.Library;
 import com.oracle.truffle.api.library.LibraryFactory;
-import com.oracle.truffle.api.nodes.Node;
+import org.enso.interpreter.runtime.data.hash.EnsoHashMap;
 
 @GenerateLibrary
 public abstract class WarningsLibrary extends Library {
@@ -44,15 +44,14 @@ public boolean hasWarnings(Object receiver) {
   /**
    * Returns all unique warnings associated with the receiver.
    *
-   * @param receiver the receiver to analyze
-   * @param location optional parameter specifying the node to which the warnings should be
-   *     reassigned to
+   * @param receiver the receiver to get the warnings from
    * @param shouldWrap if true, warnings attached to elements in array-likes are wrapped in
    *     Map_Error
-   * @return the associated warnings
+   * @return the associated warnings as map - keys are {@code sequenceId} and values are warnings.
+   *     Not null
    */
   @GenerateLibrary.Abstract(ifExported = {"hasWarnings"})
-  public Warning[] getWarnings(Object receiver, Node location, boolean shouldWrap)
+  public EnsoHashMap getWarnings(Object receiver, boolean shouldWrap)
       throws UnsupportedMessageException {
     throw UnsupportedMessageException.create();
   }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/WithWarnings.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/WithWarnings.java
new file mode 100644
index 000000000000..5bd99c29db4a
--- /dev/null
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/WithWarnings.java
@@ -0,0 +1,282 @@
+package org.enso.interpreter.runtime.warning;
+
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.dsl.Bind;
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Cached.Shared;
+import com.oracle.truffle.api.interop.ArityException;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
+import com.oracle.truffle.api.library.CachedLibrary;
+import com.oracle.truffle.api.library.ExportLibrary;
+import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.library.Message;
+import com.oracle.truffle.api.library.ReflectionLibrary;
+import com.oracle.truffle.api.nodes.Node;
+import org.enso.interpreter.node.callable.InteropMethodCallNode;
+import org.enso.interpreter.runtime.EnsoContext;
+import org.enso.interpreter.runtime.callable.UnresolvedSymbol;
+import org.enso.interpreter.runtime.data.EnsoObject;
+import org.enso.interpreter.runtime.data.Type;
+import org.enso.interpreter.runtime.data.hash.EnsoHashMap;
+import org.enso.interpreter.runtime.data.hash.HashMapInsertAllNode;
+import org.enso.interpreter.runtime.data.hash.HashMapInsertNodeGen;
+import org.enso.interpreter.runtime.data.hash.HashMapSizeNode;
+import org.enso.interpreter.runtime.data.text.Text;
+import org.enso.interpreter.runtime.data.vector.ArrayLikeAtNode;
+import org.enso.interpreter.runtime.data.vector.ArrayLikeAtNodeGen;
+import org.enso.interpreter.runtime.data.vector.ArrayLikeLengthNode;
+import org.enso.interpreter.runtime.data.vector.ArrayLikeLengthNodeGen;
+import org.enso.interpreter.runtime.error.PanicException;
+import org.enso.interpreter.runtime.library.dispatch.TypesLibrary;
+import org.enso.interpreter.runtime.state.State;
+
+/**
+ * Represents a typical Enso <em>value with warnings</em>. As much of care as possible is taken to
+ * delegate all operations to the underlaying {@code value}. Warnings are considered {@link
+ * InteropLibrary#isException exceptional values} - e.g. one can check for them in Java polyglot
+ * code as:
+ *
+ * <pre>
+ *  Value value = ...;
+ *  if (value.fitsInLong() && value.isException()) {
+ *    // probably an Integer with a warning
+ *    try {
+ *      warningMulti.throwException();
+ *    } catch (PolyglotException ex) {
+ *      System.out.println("Warnings attached to " + value.asLong() + " are " + ex.getMessage());
+ *    }
+ *  }
+ * </pre>
+ */
+@ExportLibrary(TypesLibrary.class)
+@ExportLibrary(WarningsLibrary.class)
+@ExportLibrary(ReflectionLibrary.class)
+@ExportLibrary(value = InteropLibrary.class, delegateTo = "value")
+public final class WithWarnings implements EnsoObject {
+  final Object value;
+
+  /**
+   * Internal storage for warnings is a PE-friendly hash map. The key is a sequence ID (gathered
+   * from {@link EnsoContext#nextSequenceId()} and the value is the warning itself. Note that it is
+   * essential that sequenceId is the key so that the warnings are not duplicated.
+   */
+  final EnsoHashMap warnings;
+
+  private final boolean limitReached;
+  final int maxWarnings;
+
+  /**
+   * Creates a new instance of value wrapped in warnings.
+   *
+   * @param value value to be wrapped in warnings
+   * @param maxWarnings maximal number of warnings allowed to be attached to the value
+   * @param warningsMap warnings originally attached to a value
+   * @param limitReached if `true`, indicates that `warnings` have already been limited for a
+   *     custom-method, `false` otherwise
+   */
+  WithWarnings(Object value, int maxWarnings, boolean limitReached, EnsoHashMap warningsMap) {
+    assert isAcceptableValue(value);
+    var mapSizeNode = HashMapSizeNode.getUncached();
+    assert mapSizeNode.execute(warningsMap) <= maxWarnings;
+    if (limitReached) {
+      assert mapSizeNode.execute(warningsMap) == maxWarnings;
+    }
+    this.value = value;
+    this.maxWarnings = maxWarnings;
+    this.limitReached = limitReached || mapSizeNode.execute(warningsMap) >= maxWarnings;
+    this.warnings = warningsMap;
+  }
+
+  /**
+   * Explicit creation of WithWarnings. Allows to set a specific {@code maxWarnings} count, which
+   * cannot be achieved by using warning-handling nodes like {@link AppendWarningNode}. If {@code
+   * maxWarnings} does not need to be set explicitly, use nodes to create WithWarning objects
+   * instead.
+   *
+   * @param value value to be wrapped in warnings
+   * @param maxWarnings maximal number of warnings allowed to be attached to the value
+   * @param limitReached if `true`, no other warnings will be attached to the {@code value}.
+   * @param warnings array of warnings to be attached to the {@code value}
+   */
+  public static WithWarnings create(
+      Object value, int maxWarnings, boolean limitReached, Warning[] warnings) {
+    assert warnings.length <= maxWarnings;
+    if (limitReached) {
+      assert warnings.length == maxWarnings;
+    }
+    var warnMap = Warning.fromArrayToMap(warnings, HashMapInsertNodeGen.getUncached());
+    return new WithWarnings(value, maxWarnings, limitReached, warnMap);
+  }
+
+  private static boolean isAcceptableValue(Object value) {
+    assert value != null;
+    assert !(value instanceof WithWarnings) : "Trying to double wrap WithWarnings " + value;
+    boolean goodValue =
+        value instanceof TruffleObject
+            || value instanceof Long
+            || value instanceof Double
+            || value instanceof Boolean;
+    assert goodValue : "Unexpected value floating around " + value + " type: " + value.getClass();
+    return goodValue;
+  }
+
+  public Object getValue() {
+    return value;
+  }
+
+  // Ignore the warnings cache in .value and re-fetch them using the WarningsLibrary.
+  // This is only used for shouldWrap=true.
+  private EnsoHashMap getWarningsNoCache(
+      WarningsLibrary warningsLibrary, ArrayLikeLengthNode lengthNode, ArrayLikeAtNode atNode) {
+    assert warningsLibrary != null;
+    if (warningsLibrary.hasWarnings(value)) {
+      try {
+        return warningsLibrary.getWarnings(value, true);
+      } catch (UnsupportedMessageException e) {
+        throw EnsoContext.get(warningsLibrary).raiseAssertionPanic(warningsLibrary, null, e);
+      }
+    } else {
+      return warnings;
+    }
+  }
+
+  /**
+   * Slow version of {@link #getWarningsArray(boolean, WarningsLibrary, HashMapInsertAllNode,
+   * InteropLibrary)} that uses uncached version of nodes and libraries parameters.
+   */
+  public Warning[] getWarningsArray(boolean shouldWrap) {
+    return getWarningsArray(
+        shouldWrap,
+        WarningsLibrary.getUncached(),
+        HashMapInsertAllNode.getUncached(),
+        InteropLibrary.getUncached());
+  }
+
+  public Warning[] getWarningsArray(
+      boolean shouldWrap,
+      WarningsLibrary warningsLibrary,
+      HashMapInsertAllNode mapInsertAllNode,
+      InteropLibrary interop) {
+    Warning[] allWarnsArray;
+    if (warningsLibrary != null && warningsLibrary.hasWarnings(value)) {
+      try {
+        var valueWarnings = warningsLibrary.getWarnings(value, shouldWrap);
+        var allWarns =
+            mapInsertAllNode.executeInsertAll(null, warnings, valueWarnings, maxWarnings);
+        allWarnsArray = Warning.fromMapToArray(allWarns, interop);
+      } catch (UnsupportedMessageException e) {
+        throw EnsoContext.get(warningsLibrary).raiseAssertionPanic(warningsLibrary, null, e);
+      }
+    } else {
+      allWarnsArray = Warning.fromMapToArray(warnings, interop);
+    }
+    return allWarnsArray;
+  }
+
+  @CompilerDirectives.TruffleBoundary
+  private PanicException asException(Node where) {
+    var warnsMap =
+        this.getWarnings(
+            false,
+            WarningsLibrary.getUncached(),
+            ArrayLikeAtNodeGen.getUncached(),
+            ArrayLikeLengthNodeGen.getUncached());
+    var warns = Warning.fromMapToArray(warnsMap);
+    var ctx = EnsoContext.get(where);
+    var scopeOfAny = ctx.getBuiltins().any().getDefinitionScope();
+    var toText = UnresolvedSymbol.build("to_text", scopeOfAny);
+    var node = InteropMethodCallNode.getUncached();
+    var state = State.create(ctx);
+
+    var text = Text.empty();
+    for (var w : warns) {
+      try {
+        var wText = node.execute(toText, state, new Object[] {w});
+        if (wText instanceof Text t) {
+          text = text.add(t);
+        }
+      } catch (ArityException e) {
+        throw ctx.raiseAssertionPanic(where, null, e);
+      }
+    }
+    return new PanicException(text, where);
+  }
+
+  @ExportMessage
+  Object send(Message message, Object[] args, @CachedLibrary(limit = "3") ReflectionLibrary lib)
+      throws Exception {
+    return lib.send(value, message, args);
+  }
+
+  @ExportMessage
+  boolean hasWarnings() {
+    return true;
+  }
+
+  @ExportMessage
+  EnsoHashMap getWarnings(
+      boolean shouldWrap,
+      @Shared("warnsLib") @CachedLibrary(limit = "3") WarningsLibrary warningsLibrary,
+      @Cached ArrayLikeAtNode atNode,
+      @Cached ArrayLikeLengthNode lengthNode) {
+    if (shouldWrap) {
+      // In the wrapping case, we don't use the local cache in .values, since
+      // it contains unwrapped warnings. Instead, we fetch them again.
+      return getWarningsNoCache(warningsLibrary, lengthNode, atNode);
+    } else {
+      return warnings;
+    }
+  }
+
+  @ExportMessage
+  Object removeWarnings(@Shared("warnsLib") @CachedLibrary(limit = "3") WarningsLibrary warnings)
+      throws UnsupportedMessageException {
+    if (warnings.hasWarnings(value)) {
+      return warnings.removeWarnings(value);
+    } else {
+      return value;
+    }
+  }
+
+  @ExportMessage
+  public boolean isLimitReached() {
+    return limitReached;
+  }
+
+  @ExportMessage
+  boolean hasType(@Shared("typesLib") @CachedLibrary(limit = "3") TypesLibrary types) {
+    return types.hasType(value);
+  }
+
+  @ExportMessage
+  Type getType(@Shared("typesLib") @CachedLibrary(limit = "3") TypesLibrary types) {
+    return types.getType(value);
+  }
+
+  @ExportMessage
+  boolean hasSpecialDispatch() {
+    return true;
+  }
+
+  @ExportMessage
+  boolean isException() {
+    return true;
+  }
+
+  @ExportMessage
+  RuntimeException throwException(@Bind("$node") Node node) {
+    throw asException(node);
+  }
+
+  @Override
+  public String toString() {
+    return "WithWarnings{"
+        + value
+        + " has "
+        + HashMapSizeNode.getUncached().execute(warnings)
+        + " warnings"
+        + (limitReached ? " (warnings limit reached)}" : "}");
+  }
+}
diff --git a/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/AcceptsWarning.java b/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/AcceptsWarning.java
index 3728d3ceb869..73b0f882662d 100644
--- a/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/AcceptsWarning.java
+++ b/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/AcceptsWarning.java
@@ -5,7 +5,11 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/** An interface marking an argument as allowing it to accept a WithWarnings. */
+/**
+ * An interface marking an argument as allowing it to accept a WithWarnings. Parameters annotated
+ * with this annotation will not have their warnings stripped, so if it is of type {@link
+ * org.enso.interpreter.runtime.warning.WithWarnings} it will not be unwrapped.
+ */
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.SOURCE)
 public @interface AcceptsWarning {}
diff --git a/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/BuiltinMethod.java b/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/BuiltinMethod.java
index fd6c4aeb8e1d..4a16abfd854c 100644
--- a/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/BuiltinMethod.java
+++ b/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/BuiltinMethod.java
@@ -16,7 +16,7 @@
 @Retention(RetentionPolicy.SOURCE)
 public @interface BuiltinMethod {
   /**
-   * @return the language-level type of {@code self} argument.
+   * @return the language-level type of {@code self} argument. Not a fully-qualified name.
    */
   String type();
 
diff --git a/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/MethodProcessor.java b/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/MethodProcessor.java
index f5d52d0c1eee..891a5ab0fa6e 100644
--- a/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/MethodProcessor.java
+++ b/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/MethodProcessor.java
@@ -130,6 +130,8 @@ private void handleTypeElement(TypeElement element, RoundEnvironment roundEnv, B
           "com.oracle.truffle.api.CompilerDirectives",
           "com.oracle.truffle.api.dsl.UnsupportedSpecializationException",
           "com.oracle.truffle.api.frame.VirtualFrame",
+          "com.oracle.truffle.api.interop.InteropLibrary",
+          "com.oracle.truffle.api.interop.UnsupportedMessageException",
           "com.oracle.truffle.api.nodes.ControlFlowException",
           "com.oracle.truffle.api.nodes.Node",
           "com.oracle.truffle.api.nodes.NodeInfo",
@@ -146,14 +148,18 @@ private void handleTypeElement(TypeElement element, RoundEnvironment roundEnv, B
           "org.enso.interpreter.runtime.callable.function.FunctionSchema",
           "org.enso.interpreter.runtime.EnsoContext",
           "org.enso.interpreter.runtime.builtin.Builtins",
-          "org.enso.interpreter.runtime.data.ArrayRope",
+          "org.enso.interpreter.runtime.data.hash.EnsoHashMap",
+          "org.enso.interpreter.runtime.data.hash.HashMapInsertNode",
+          "org.enso.interpreter.runtime.data.hash.HashMapInsertAllNode",
           "org.enso.interpreter.runtime.data.text.Text",
           "org.enso.interpreter.runtime.error.DataflowError",
           "org.enso.interpreter.runtime.error.PanicException",
-          "org.enso.interpreter.runtime.error.Warning",
-          "org.enso.interpreter.runtime.error.WithWarnings",
           "org.enso.interpreter.runtime.state.State",
-          "org.enso.interpreter.runtime.type.TypesGen");
+          "org.enso.interpreter.runtime.type.TypesGen",
+          "org.enso.interpreter.runtime.warning.Warning",
+          "org.enso.interpreter.runtime.warning.WarningsLibrary",
+          "org.enso.interpreter.runtime.warning.WithWarnings",
+          "org.enso.interpreter.runtime.warning.AppendWarningNode");
 
   /** List of exception types that should be caught from the builtin's execute method. */
   private static final List<String> handleExceptionTypes =
@@ -190,6 +196,13 @@ private void generateCode(MethodDefinition methodDefinition) throws IOException
                 + " extends BuiltinRootNode implements InlineableNode.Root {");
       }
       out.println("  private @Child " + methodDefinition.getOriginalClassName() + " bodyNode;");
+      out.println(
+          "  private @Child AppendWarningNode appendWarningNode = AppendWarningNode.build();");
+      out.println(
+          "  private @Child WarningsLibrary warnLib ="
+              + " WarningsLibrary.getFactory().createDispatched(5);");
+      out.println(
+          "  private @Child HashMapInsertAllNode mapInsertAllNode = HashMapInsertAllNode.build();");
       out.println();
       out.println("  private static final class Internals {");
       out.println("    Internals(boolean s) {");
@@ -282,27 +295,44 @@ private void generateCode(MethodDefinition methodDefinition) throws IOException
                 + " body = "
                 + methodDefinition.getConstructorExpression()
                 + ";");
+        out.println(
+            "      private @Child AppendWarningNode appendWarningNode ="
+                + " AppendWarningNode.build();");
+        out.println(
+            "      private @Child WarningsLibrary warnLib ="
+                + " WarningsLibrary.getFactory().createDispatched(5);");
+        out.println(
+            "      private @Child HashMapInsertAllNode mapInsertAllNode ="
+                + " HashMapInsertAllNode.build();");
+        out.println();
         out.println("      @Override");
         out.println("      public Object call(VirtualFrame frame, Object[] args) {");
-        out.println("        return handleExecute(frame, extra, body, args);");
+        out.println(
+            "        return handleExecute(frame, extra, body, appendWarningNode, warnLib,"
+                + " mapInsertAllNode, args);");
         out.println("      }");
         out.println("    }");
+        out.println();
         out.println("    return new Inlineable();");
         out.println("  }");
       }
 
+      out.println();
+
       out.println("  @Override");
       out.println("  public Object execute(VirtualFrame frame) {");
       if (methodDefinition.needsFrame()) {
         out.println("    var args = frame.getArguments();");
       } else {
         out.println(
-            "    return handleExecute(frame, this.internals, bodyNode, frame.getArguments());");
+            "    return handleExecute(frame, this.internals, bodyNode, this.appendWarningNode,"
+                + " this.warnLib, this.mapInsertAllNode, frame.getArguments());");
         out.println("  }");
         out.println(
             "  private static Object handleExecute(VirtualFrame frame, Internals internals, "
                 + methodDefinition.getOriginalClassName()
-                + " bodyNode, Object[] args) {");
+                + " bodyNode, AppendWarningNode appendWarningNode, WarningsLibrary warnLib,"
+                + " HashMapInsertAllNode mapInsertAllNode, Object[] args) {");
       }
       out.println("    var prefix = internals.staticOfInstanceMethod ? 1 : 0;");
       out.println("    State state = Function.ArgumentsHelper.getState(args);");
@@ -346,8 +376,8 @@ private void generateCode(MethodDefinition methodDefinition) throws IOException
         out.println("      internals.anyWarningsProfile.enter();");
         out.println("      Object result;");
         out.println(wrapInTryCatch("result = " + executeCall + ";", 6));
-        out.println("      EnsoContext ctx = EnsoContext.get(bodyNode);");
-        out.println("      return WithWarnings.appendTo(ctx, result, gatheredWarnings);");
+        out.println(
+            "      return appendWarningNode.executeAppend(frame, result, gatheredWarnings);");
         out.println("    } else {");
         out.println(wrapInTryCatch("return " + executeCall + ";", 6));
         out.println("    }");
@@ -598,28 +628,27 @@ private boolean generateWarningsCheck(
       return false;
     } else {
       out.println("    boolean anyWarnings = false;");
-      out.println("    ArrayRope<Warning> gatheredWarnings = new ArrayRope<>();");
+      out.println("    int maxWarnings = EnsoContext.get(bodyNode).getWarningsLimit();");
+      out.println("    EnsoHashMap gatheredWarnings = EnsoHashMap.empty();");
       for (var arg : argsToCheck) {
+        String argCode = arrayRead(argumentsArray, arg.getPosition());
         out.println(
             "    if ("
                 + arrayRead(argumentsArray, arg.getPosition())
-                + " instanceof WithWarnings) {");
+                + " instanceof WithWarnings withWarnings) {");
         out.println(
             "      internals." + mkArgumentInternalVarName(arg) + WARNING_PROFILE + ".enter();");
         out.println("      anyWarnings = true;");
+        out.println("      try {"); // begin try
+        out.println("        var warns = warnLib.getWarnings(withWarnings, false);");
+        out.println("        " + argCode + " = withWarnings.getValue();");
         out.println(
-            "      WithWarnings withWarnings = (WithWarnings) "
-                + arrayRead(argumentsArray, arg.getPosition())
-                + ";");
-        out.println(
-            "      "
-                + arrayRead(argumentsArray, arg.getPosition())
-                + " = withWarnings.getValue();");
-        out.print(
-            """
-            gatheredWarnings = gatheredWarnings.prepend(withWarnings.getReassignedWarningsAsRope(bodyNode, false));
-      """);
-        out.println("    }");
+            "        gatheredWarnings = mapInsertAllNode.executeInsertAll(frame, gatheredWarnings,"
+                + " warns, maxWarnings);");
+        out.println("      } catch (UnsupportedMessageException e) {"); // end try
+        out.println("        throw CompilerDirectives.shouldNotReachHere(e);");
+        out.println("      }"); // end catch
+        out.println("    }"); // end hasWarnings
       }
       return true;
     }
diff --git a/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/builtins/SpecializedMethodParameter.java b/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/builtins/SpecializedMethodParameter.java
index 4070c9876f55..ab2bdd81fb65 100644
--- a/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/builtins/SpecializedMethodParameter.java
+++ b/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/builtins/SpecializedMethodParameter.java
@@ -122,7 +122,7 @@ public Stream<String> declaredParameter() {
 
   public static final String INTEROP_LIBRARY = "com.oracle.truffle.api.interop.InteropLibrary";
   public static final String WARNINGS_LIBRARY =
-      "org.enso.interpreter.runtime.error.WarningsLibrary";
+      "org.enso.interpreter.runtime.warning.WarningsLibrary";
 }
 
 class InjectedMethodParameter extends SpecializedMethodParameter {
diff --git a/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/builtins/SpecializedMethodsGenerator.java b/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/builtins/SpecializedMethodsGenerator.java
index fef6ddeb4803..7023d5fb725b 100644
--- a/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/builtins/SpecializedMethodsGenerator.java
+++ b/lib/scala/interpreter-dsl/src/main/java/org/enso/interpreter/dsl/builtins/SpecializedMethodsGenerator.java
@@ -14,6 +14,7 @@
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.VariableElement;
 import javax.tools.Diagnostic;
+import javax.tools.Diagnostic.Kind;
 import org.apache.commons.lang3.StringUtils;
 import org.enso.interpreter.dsl.AcceptsWarning;
 import org.enso.interpreter.dsl.Builtin;
@@ -160,12 +161,16 @@ private SpecializationMeta inferExecuteParameters(ProcessingEnvironment processi
     paramss.forEach(
         (k, v) -> {
           if (v.size() != elements.size()) {
-            throw new RuntimeException(
-                "Restriction: Specialized methods have to have equal number of parameters.\n"
-                    + "Expected "
-                    + elements.size()
-                    + ", got "
-                    + v.size());
+            processingEnv
+                .getMessager()
+                .printMessage(
+                    Kind.ERROR,
+                    "Restriction: Specialized methods have to have equal number of parameters.\n"
+                        + "Expected "
+                        + elements.size()
+                        + ", got "
+                        + v.size(),
+                    elements.get(0));
           }
 
           MethodParameter p = v.get(0);
diff --git a/test/Base_Tests/src/Semantic/Warnings_Spec.enso b/test/Base_Tests/src/Semantic/Warnings_Spec.enso
index e857eb92925f..aca9c4778eac 100644
--- a/test/Base_Tests/src/Semantic/Warnings_Spec.enso
+++ b/test/Base_Tests/src/Semantic/Warnings_Spec.enso
@@ -46,16 +46,6 @@ get_foo x = x.foo
 
 unwrap x = Integer.from x
 
-reassign_test x =
-    consed = Wrap.Value x
-    reconsed = rewrap consed
-    i = unwrap reconsed
-    rereconsed = Wrap.Value i
-    x1 = get_foo rereconsed
-    prim_sum = 1 + x1
-    r = poly_sum prim_sum 1
-    r
-
 baz value = Warning.attach value "I have warned you"
 bar value = baz value
 foo value = bar value
@@ -165,21 +155,6 @@ add_specs suite_builder = suite_builder.group "Dataflow Warnings" group_builder-
         relevant = warning_stack . drop (..Last current.length)
         relevant.map .name . should_equal (['baz', 'bar', 'foo'].map ('Warnings_Spec.'+))
 
-    group_builder.specify "should attach reassignment info in the last-reassigned-first order" <|
-        x = Warning.attach "warn!" 1
-        r = reassign_test x
-        warn = Warning.get_all r . first
-        reassignments = warn.reassignments.map .name
-        expected_stack = []
-            + [ 'Warnings_Spec.poly_sum' ]
-            + [ 'Integer.+' ]
-            + [ 'Warnings_Spec.get_foo' ]
-            + [ 'Wrap.Value' ]
-            + [ 'Integer.from' ]
-            + [ 'Warnings_Spec.rewrap' ]
-            + [ 'Wrap.Value' ]
-        reassignments.should_equal expected_stack.to_vector
-
     group_builder.specify "should allow to set all warnings" <|
         warned = Warning.attach 1 <| Warning.attach 2 <| Warning.attach 3 <| Warning.attach 4 "foo"
         warnings = Warning.get_all warned

From 12d690079ce8c8040a46f875df1ea75b23aeb68b Mon Sep 17 00:00:00 2001
From: Kaz Wesley <kaz@lambdaverse.org>
Date: Wed, 7 Aug 2024 11:43:26 -0400
Subject: [PATCH 03/23] Fix doc editor sync (#10766)

Fixes #10527.
---
 app/gui2/src/components/MarkdownEditor/markdown.ts | 2 +-
 app/gui2/src/components/PlainTextEditor.vue        | 2 +-
 app/gui2/src/components/lexical/sync.ts            | 6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/gui2/src/components/MarkdownEditor/markdown.ts b/app/gui2/src/components/MarkdownEditor/markdown.ts
index 3d20fe3bdfb7..9974c4be39a2 100644
--- a/app/gui2/src/components/MarkdownEditor/markdown.ts
+++ b/app/gui2/src/components/MarkdownEditor/markdown.ts
@@ -64,6 +64,6 @@ const markdownSyncPlugin = (model: Ref<string>, transformers: Transformer[]): Le
       },
     )
     watch(model, (newContent) => content.set(newContent), { immediate: true })
-    watch(content.state, (newContent) => (model.value = newContent))
+    watch(content.editedContent, (newContent) => (model.value = newContent))
   },
 })
diff --git a/app/gui2/src/components/PlainTextEditor.vue b/app/gui2/src/components/PlainTextEditor.vue
index d01dbfe1aa54..abdd420c256c 100644
--- a/app/gui2/src/components/PlainTextEditor.vue
+++ b/app/gui2/src/components/PlainTextEditor.vue
@@ -20,7 +20,7 @@ const textSync: LexicalPlugin = {
   register: (editor) => {
     const { content } = useLexicalStringSync(editor)
     watch(text, (newContent) => content.set(newContent), { immediate: true })
-    watch(content.state, (newContent) => (text.value = newContent))
+    watch(content.editedContent, (newContent) => (text.value = newContent))
   },
 }
 
diff --git a/app/gui2/src/components/lexical/sync.ts b/app/gui2/src/components/lexical/sync.ts
index 3c36b45bf826..a6c39f4828f7 100644
--- a/app/gui2/src/components/lexical/sync.ts
+++ b/app/gui2/src/components/lexical/sync.ts
@@ -32,13 +32,11 @@ export function useLexicalSync<T>(
     state.value = editorState
   })
 
-  const getContent = computed(() => {
-    return state.value.read($read)
-  })
+  const getContent = () => editor.getEditorState().read($read)
 
   return {
     content: {
-      state: getContent,
+      editedContent: computed(() => state.value.read($read)),
       set: (content: T) => {
         editor.update(() => $write(content, getContent), {
           discrete: true,

From b286adaae4d5784c72ffc04fe8195f7a18102ffa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Grabarz?= <frizi09@gmail.com>
Date: Thu, 8 Aug 2024 14:12:05 +0200
Subject: [PATCH 04/23] Split ydoc server into separate module (#10735)

# Important Notes
The command to run the gui dev environment has been changed. Invoking the old command will print a message about that.
From now on, use `pnpm dev:gui2` in repository root.
---
 .github/workflows/gui-tests.yml               |   6 +-
 .github/workflows/gui.yml                     |   6 +-
 .gitignore                                    |   2 +
 .pnpmfile.cjs                                 |  21 +
 .prettierignore                               |   3 +-
 Cargo.toml                                    |   2 +-
 app/dashboard/e2e/README.md                   |  16 +-
 app/dashboard/e2e/actions.ts                  |   2 +-
 app/dashboard/e2e/assetSearchBar.spec.ts      |   9 +-
 app/dashboard/e2e/labels.spec.ts              |  18 +-
 app/dashboard/package.json                    |   9 +-
 app/dashboard/playwright.config.ts            |   2 +-
 .../src/components/dashboard/AssetRow.tsx     |   1 +
 app/eslint.config.mjs                         |   3 +-
 app/gui2/e2e/expressionUpdates.ts             |   2 +-
 app/gui2/e2e/setup.ts                         |   2 +-
 app/gui2/env.d.ts                             |   1 -
 app/gui2/env.story.d.ts                       |   1 -
 app/gui2/eslint.config.js                     |  11 +-
 app/gui2/mock/MockFSWrapper.vue               |   2 +-
 app/gui2/mock/MockProjectStoreWrapper.vue     |   2 +-
 app/gui2/mock/dataServer.ts                   |   6 +-
 app/gui2/mock/engine.ts                       |  17 +-
 app/gui2/package.json                         |  44 +-
 app/gui2/parser-codegen/index.ts              |  17 -
 app/gui2/playwright.config.ts                 |   4 +-
 app/gui2/shared/ast/ffi.ts                    |  45 -
 app/gui2/shared/ast/ffiPolyglot.ts            |  29 -
 .../util/net/ReconnectingWSTransport.ts       |  91 --
 app/gui2/src/App.vue                          |   3 -
 app/gui2/src/asyncApp.ts                      |   5 +-
 app/gui2/src/components/CodeEditor.vue        |   6 +-
 .../src/components/CodeEditor/codemirror.ts   |   6 +-
 app/gui2/src/components/ColorPickerMenu.vue   |   2 +-
 app/gui2/src/components/ColorRing/gradient.ts |   2 +-
 app/gui2/src/components/ComponentBrowser.vue  |   4 +-
 .../__tests__/filtering.test.ts               |   3 -
 .../ComponentBrowser/__tests__/input.test.ts  | 196 ++---
 .../src/components/ComponentBrowser/ai.ts     |   6 +-
 .../src/components/ComponentBrowser/input.ts  |   2 +-
 .../src/components/ComponentDocumentation.vue |   4 +-
 .../src/components/DocumentationEditor.vue    |   4 +-
 .../DocumentationPanel/DocsList.vue           |   5 +-
 .../src/components/DocumentationPanel/ir.ts   |   2 +-
 app/gui2/src/components/GraphEditor.vue       |   6 +-
 .../src/components/GraphEditor/GraphNode.vue  |   2 +-
 .../GraphEditor/GraphNodeOutputPorts.vue      |   2 +-
 .../src/components/GraphEditor/GraphNodes.vue |   2 +-
 .../GraphEditor/GraphVisualization.vue        |   4 +-
 .../GraphEditor/__tests__/clipboard.test.ts   |  12 +-
 .../GraphEditor/__tests__/collapsing.test.ts  |   5 -
 .../src/components/GraphEditor/clipboard.ts   |   2 +-
 app/gui2/src/components/GraphEditor/upload.ts |  10 +-
 .../widgets/WidgetArgumentName.vue            |   2 +-
 .../GraphEditor/widgets/WidgetFileBrowser.vue |   2 +-
 .../GraphEditor/widgets/WidgetFunction.vue    |   2 +-
 .../__tests__/widgetFunctionCallInfo.test.ts  |   2 +-
 .../WidgetFunction/widgetFunctionCallInfo.ts  |   4 +-
 .../widgets/WidgetFunctionName.vue            |   4 +-
 .../GraphEditor/widgets/WidgetPort.vue        |   2 +-
 .../widgets/WidgetSelectionArrow.vue          |   2 +-
 .../GraphEditor/widgets/WidgetVector.vue      |   2 +-
 .../ImagePlugin/LexicalImage.vue              |   2 +-
 .../MarkdownEditor/ImagePlugin/imageNode.ts   |  18 +-
 .../MarkdownEditor/ImagePlugin/index.ts       |   2 +-
 .../MarkdownEditor/imageUrlTransformer.ts     |   2 +-
 .../src/components/VisualizationSelector.vue  |   2 +-
 .../lexical/LinkPlugin/autoMatcher.ts         |   2 +-
 app/gui2/src/components/lexical/index.ts      |   2 +-
 .../src/components/widgets/ListWidget.vue     |   2 +-
 .../components/widgets/NumericInputWidget.vue |   2 +-
 .../composables/__tests__/navigator.test.ts   |  15 +-
 .../__tests__/nodeCreation.test.ts            |   5 +-
 app/gui2/src/composables/animation.ts         |   1 +
 app/gui2/src/composables/astDocumentation.ts  |   2 +-
 app/gui2/src/composables/nodeCreation.ts      |   4 +-
 app/gui2/src/composables/selection.ts         |   2 +-
 app/gui2/src/composables/stackNavigator.ts    |   2 +-
 app/gui2/src/composables/syncLocalStorage.ts  |   4 +-
 app/gui2/src/e2e-entrypoint.ts                |   4 +-
 app/gui2/src/entrypoint.ts                    |   2 +-
 .../__tests__/widgetRegistry.test.ts          |   3 -
 app/gui2/src/providers/graphSelection.ts      |   2 +-
 app/gui2/src/providers/visualizationConfig.ts |   2 +-
 app/gui2/src/providers/widgetRegistry.ts      |   4 +-
 .../__tests__/editHandler.test.ts             |   2 +-
 .../providers/widgetRegistry/editHandler.ts   |   8 +-
 app/gui2/src/stores/awareness.ts              |   2 +-
 .../graph/__tests__/graphDatabase.test.ts     |   9 +-
 .../stores/graph/__tests__/imports.test.ts    |   3 -
 app/gui2/src/stores/graph/graphDatabase.ts    |  12 +-
 app/gui2/src/stores/graph/index.ts            |  24 +-
 app/gui2/src/stores/graph/unconnectedEdges.ts |   2 +-
 .../stores/project/computedValueRegistry.ts   |   4 +-
 .../src/stores/project/executionContext.ts    |  10 +-
 app/gui2/src/stores/project/index.ts          |  26 +-
 .../project/visualizationDataRegistry.ts      |   6 +-
 .../__tests__/documentation.test.ts           |   3 -
 .../__tests__/lsUpdate.test.ts                |   5 +-
 .../src/stores/suggestionDatabase/entry.ts    |   6 +-
 .../src/stores/suggestionDatabase/index.ts    |   6 +-
 .../src/stores/suggestionDatabase/lsUpdate.ts |   2 +-
 .../visualization/__tests__/metadata.test.ts  |   2 +-
 .../stores/visualization/compilerMessaging.ts |   4 +-
 app/gui2/src/stores/visualization/index.ts    |   6 +-
 app/gui2/src/stores/visualization/metadata.ts |   2 +-
 app/gui2/src/util/__tests__/callTree.test.ts  |   7 +-
 .../src/util/__tests__/qualifiedName.test.ts  |   3 -
 app/gui2/src/util/assert.ts                   |   2 +-
 .../src/util/ast/__tests__/abstract.test.ts   |   3 -
 .../util/ast/__tests__/abstractFileIo.test.ts |   7 +-
 .../util/ast/__tests__/aliasAnalysis.test.ts  |   5 +-
 app/gui2/src/util/ast/__tests__/match.test.ts |   3 -
 app/gui2/src/util/ast/__tests__/node.test.ts  |   6 +-
 app/gui2/src/util/ast/__tests__/opr.test.ts   |   3 -
 .../src/util/ast/__tests__/prefixes.test.ts   |   3 -
 app/gui2/src/util/ast/__tests__/raw.test.ts   |   7 +-
 .../util/ast/__tests__/sourceDocument.test.ts |   9 +-
 app/gui2/src/util/ast/abstract.ts             |   6 +-
 app/gui2/src/util/ast/aliasAnalysis.ts        |   4 +-
 app/gui2/src/util/ast/extended.ts             |   8 +-
 app/gui2/src/util/ast/index.ts                |   2 +-
 app/gui2/src/util/ast/node.ts                 |  17 +-
 app/gui2/src/util/ast/raw.ts                  |  14 +-
 app/gui2/src/util/autoBlur.ts                 |   2 +-
 app/gui2/src/util/callTree.ts                 |   4 +-
 app/gui2/src/util/data/iterable.ts            |   2 +-
 app/gui2/src/util/data/opt.ts                 |   2 +-
 app/gui2/src/util/data/result.ts              |   2 +-
 app/gui2/src/util/docParser.ts                |   2 +-
 app/gui2/src/util/getIconName.ts              |   2 +-
 app/gui2/src/util/net.ts                      |  68 +-
 app/gui2/src/util/net/dataServer.ts           |  12 +-
 app/gui2/src/util/testing.ts                  |  21 +
 app/gui2/stories/CircularMenu.story.vue       |  19 +-
 app/gui2/stories/ComponentBrowser.story.vue   |   4 +-
 app/gui2/stories/GraphNode.story.vue          |   6 +-
 app/gui2/stories/NavigatorWrapper.vue         |   4 +-
 app/gui2/stories/SelectionBrush.story.vue     |   2 +-
 app/gui2/stories/SelectionBrushWrapper.vue    |   4 +-
 app/gui2/stories/TopBar.story.vue             |  27 +-
 .../UserDefinedVisualization.story.vue        |   4 +-
 .../stories/VisualizationSelector.story.vue   |   2 +-
 app/gui2/stories/Widgets.story.vue            |   6 +-
 app/gui2/stories/setup.ts                     |  32 +-
 app/gui2/tsconfig.app.json                    |  21 +-
 app/gui2/tsconfig.app.vitest.json             |   1 -
 app/gui2/tsconfig.json                        |  17 +-
 app/gui2/tsconfig.node.json                   |   7 +-
 app/gui2/tsconfig.server.json                 |  13 -
 app/gui2/tsconfig.server.vitest.json          |   8 -
 app/gui2/tsconfig.story.json                  |  38 -
 app/gui2/vite.config.ts                       |  31 +-
 app/gui2/vite.ydoc-server-polyglot.config.ts  |  56 --
 app/gui2/vitest.config.ts                     |   3 -
 app/gui2/ydoc-server/index.ts                 |  73 --
 app/gui2/ydoc-server/indexPolyglot.ts         |  37 -
 app/ide-desktop/client/esbuildConfig.ts       |  13 +-
 app/ide-desktop/client/package.json           |  14 +-
 app/ide-desktop/client/src/cjs-shim.ts        |  14 +
 app/ide-desktop/client/src/globals.d.ts       |   2 -
 app/ide-desktop/client/src/index.ts           |   8 +-
 app/ide-desktop/client/src/preload.ts         |   9 +-
 app/ide-desktop/client/src/server.ts          |  53 +-
 app/ide-desktop/client/tsconfig.json          |   5 +-
 app/ide-desktop/client/watch.ts               |   4 +-
 app/ide-desktop/common/src/appConfig.js       |   2 +-
 .../common/src/services/Backend.ts            |   4 +-
 .../common/src/utilities/style/tabBar.ts      |   4 -
 app/{gui2 => }/rust-ffi/Cargo.toml            |   4 +-
 app/rust-ffi/package.json                     |  14 +
 app/{gui2 => }/rust-ffi/src/lib.rs            |   0
 app/tsconfig.json                             |   5 +-
 app/ydoc-server-nodejs/build.mjs              |  21 +
 app/ydoc-server-nodejs/package.json           |  30 +
 app/ydoc-server-nodejs/src/cjs-shim.ts        |  14 +
 app/ydoc-server-nodejs/src/main.ts            |  30 +
 app/ydoc-server-nodejs/tsconfig.json          |  13 +
 app/ydoc-server-polyglot/build.mjs            |  48 ++
 app/ydoc-server-polyglot/package.json         |  29 +
 app/ydoc-server-polyglot/src/ffiPolyglot.ts   |  16 +
 app/ydoc-server-polyglot/src/main.ts          |  22 +
 app/ydoc-server-polyglot/src/polyglot.d.ts    |  20 +
 app/ydoc-server-polyglot/tsconfig.json        |  12 +
 app/ydoc-server/package.json                  |  41 +
 .../src}/__tests__/edits.bench.ts             |   0
 .../src}/__tests__/edits.test.ts              |   6 +-
 .../ydoc-server => ydoc-server/src}/auth.ts   |   0
 .../.gitkeep => ydoc-server/src/debug.ts}     |   0
 .../ydoc-server => ydoc-server/src}/edits.ts  |  33 +-
 .../src}/fileFormat.ts                        |  10 +-
 app/ydoc-server/src/index.ts                  |  90 ++
 .../src}/languageServerSession.ts             |  94 +--
 .../src}/serialization.ts                     |   2 +-
 .../ydoc-server => ydoc-server/src}/ydoc.ts   |   7 +-
 app/ydoc-server/tsconfig.json                 |  13 +
 app/ydoc-server/vitest.config.ts              |  15 +
 app/ydoc-shared/package.json                  |  60 ++
 .../parser-codegen/codegen.ts                 |  14 +-
 app/ydoc-shared/parser-codegen/index.ts       |  57 ++
 .../parser-codegen/schema.ts                  |   0
 .../parser-codegen/serialization.ts           |   4 +-
 app/ydoc-shared/parser-codegen/tsconfig.json  |  15 +
 .../parser-codegen/util.ts                    |   2 +-
 .../src}/__tests__/ensoFile.test.ts           |   4 +-
 .../src}/__tests__/mutableModule.test.ts      |   2 +-
 .../src}/__tests__/yjsModel.test.ts           |   2 +-
 .../shared => ydoc-shared/src}/ast/debug.ts   |   2 +-
 app/ydoc-shared/src/ast/ffi.ts                |  19 +
 app/ydoc-shared/src/ast/generated/.gitkeep    |   0
 .../shared => ydoc-shared/src}/ast/index.ts   |   2 +-
 .../src}/ast/mutableModule.ts                 |   4 +-
 .../shared => ydoc-shared/src}/ast/parse.ts   |  22 +-
 .../src}/ast/parserSupport.ts                 |   2 +-
 .../src}/ast/sourceDocument.ts                |   2 +-
 .../shared => ydoc-shared/src}/ast/text.ts    |   0
 .../shared => ydoc-shared/src}/ast/token.ts   |   3 +-
 .../shared => ydoc-shared/src}/ast/tree.ts    |  76 +-
 .../src}/binaryProtocol.ts                    |   0
 .../shared => ydoc-shared/src}/ensoFile.ts    |   0
 .../src}/languageServer.ts                    |  38 +-
 .../src}/languageServer/files.ts              |   2 +-
 .../src}/languageServerTypes.ts               |   0
 .../src}/languageServerTypes/suggestions.ts   |   2 +-
 .../src}/util/__tests__/net.test.ts           |   4 +-
 .../shared => ydoc-shared/src}/util/assert.ts |   2 +-
 .../src}/util/data/__tests__/iterable.test.ts |   2 +-
 .../src}/util/data/__tests__/text.test.ts     |   3 +-
 .../src}/util/data/graph.ts                   |   0
 .../src}/util/data/iterable.ts                |   0
 .../src}/util/data/opt.ts                     |   0
 .../src}/util/data/result.ts                  |   4 +-
 .../src}/util/data/text.ts                    |  10 +-
 .../shared => ydoc-shared/src}/util/detect.ts |   0
 .../shared => ydoc-shared/src}/util/net.ts    |  34 +-
 .../src/util/net/MockWSTransport.ts           |  75 ++
 .../src/util/net/ReconnectingWSTransport.ts   |  54 ++
 .../shared => ydoc-shared/src}/util/types.ts  |   0
 app/{gui2/shared => ydoc-shared/src}/uuid.ts  |   0
 .../shared => ydoc-shared/src}/yjsModel.ts    |   2 +-
 app/ydoc-shared/tsconfig.json                 |  11 +
 app/ydoc-shared/vitest.config.ts              |  15 +
 build/build/src/ci_gen.rs                     |   6 +-
 build/build/src/ci_gen/job.rs                 |  12 +-
 build/build/src/ide/web.rs                    |  46 +-
 build/build/src/project/gui.rs                | 110 +--
 build/build/src/web.rs                        |  33 +-
 build/ci-gen/src/main.rs                      |   2 +-
 build/ci_utils/src/programs/node.rs           |   5 +
 build/cli/src/arg.rs                          |   2 +-
 build/cli/src/arg/gui.rs                      |   8 +-
 build/cli/src/lib.rs                          |  48 +-
 .../src/main/java/org/enso/ydoc/Ydoc.java     |   8 +-
 lib/rust/parser/schema/src/lib.rs             |  14 +-
 package.json                                  |  27 +-
 pnpm-lock.yaml                                | 797 ++++++++++++++----
 pnpm-workspace.yaml                           |   5 +
 project/Ydoc.scala                            |  22 +-
 258 files changed, 2252 insertions(+), 1726 deletions(-)
 create mode 100644 .pnpmfile.cjs
 delete mode 100644 app/gui2/env.story.d.ts
 delete mode 100644 app/gui2/parser-codegen/index.ts
 delete mode 100644 app/gui2/shared/ast/ffi.ts
 delete mode 100644 app/gui2/shared/ast/ffiPolyglot.ts
 delete mode 100644 app/gui2/shared/util/net/ReconnectingWSTransport.ts
 create mode 100644 app/gui2/src/util/testing.ts
 delete mode 100644 app/gui2/tsconfig.server.json
 delete mode 100644 app/gui2/tsconfig.server.vitest.json
 delete mode 100644 app/gui2/tsconfig.story.json
 delete mode 100644 app/gui2/vite.ydoc-server-polyglot.config.ts
 delete mode 100644 app/gui2/ydoc-server/index.ts
 delete mode 100644 app/gui2/ydoc-server/indexPolyglot.ts
 create mode 100644 app/ide-desktop/client/src/cjs-shim.ts
 rename app/{gui2 => }/rust-ffi/Cargo.toml (71%)
 create mode 100644 app/rust-ffi/package.json
 rename app/{gui2 => }/rust-ffi/src/lib.rs (100%)
 create mode 100644 app/ydoc-server-nodejs/build.mjs
 create mode 100644 app/ydoc-server-nodejs/package.json
 create mode 100644 app/ydoc-server-nodejs/src/cjs-shim.ts
 create mode 100644 app/ydoc-server-nodejs/src/main.ts
 create mode 100644 app/ydoc-server-nodejs/tsconfig.json
 create mode 100644 app/ydoc-server-polyglot/build.mjs
 create mode 100644 app/ydoc-server-polyglot/package.json
 create mode 100644 app/ydoc-server-polyglot/src/ffiPolyglot.ts
 create mode 100644 app/ydoc-server-polyglot/src/main.ts
 create mode 100644 app/ydoc-server-polyglot/src/polyglot.d.ts
 create mode 100644 app/ydoc-server-polyglot/tsconfig.json
 create mode 100644 app/ydoc-server/package.json
 rename app/{gui2/ydoc-server => ydoc-server/src}/__tests__/edits.bench.ts (100%)
 rename app/{gui2/ydoc-server => ydoc-server/src}/__tests__/edits.test.ts (96%)
 rename app/{gui2/ydoc-server => ydoc-server/src}/auth.ts (100%)
 rename app/{gui2/shared/ast/generated/.gitkeep => ydoc-server/src/debug.ts} (100%)
 rename app/{gui2/ydoc-server => ydoc-server/src}/edits.ts (89%)
 rename app/{gui2/ydoc-server => ydoc-server/src}/fileFormat.ts (95%)
 create mode 100644 app/ydoc-server/src/index.ts
 rename app/{gui2/ydoc-server => ydoc-server/src}/languageServerSession.ts (91%)
 rename app/{gui2/ydoc-server => ydoc-server/src}/serialization.ts (95%)
 rename app/{gui2/ydoc-server => ydoc-server/src}/ydoc.ts (97%)
 create mode 100644 app/ydoc-server/tsconfig.json
 create mode 100644 app/ydoc-server/vitest.config.ts
 create mode 100644 app/ydoc-shared/package.json
 rename app/{gui2 => ydoc-shared}/parser-codegen/codegen.ts (97%)
 create mode 100644 app/ydoc-shared/parser-codegen/index.ts
 rename app/{gui2 => ydoc-shared}/parser-codegen/schema.ts (100%)
 rename app/{gui2 => ydoc-shared}/parser-codegen/serialization.ts (99%)
 create mode 100644 app/ydoc-shared/parser-codegen/tsconfig.json
 rename app/{gui2 => ydoc-shared}/parser-codegen/util.ts (97%)
 rename app/{gui2/shared => ydoc-shared/src}/__tests__/ensoFile.test.ts (68%)
 rename app/{gui2/shared => ydoc-shared/src}/__tests__/mutableModule.test.ts (86%)
 rename app/{gui2/shared => ydoc-shared/src}/__tests__/yjsModel.test.ts (98%)
 rename app/{gui2/shared => ydoc-shared/src}/ast/debug.ts (96%)
 create mode 100644 app/ydoc-shared/src/ast/ffi.ts
 create mode 100644 app/ydoc-shared/src/ast/generated/.gitkeep
 rename app/{gui2/shared => ydoc-shared/src}/ast/index.ts (98%)
 rename app/{gui2/shared => ydoc-shared/src}/ast/mutableModule.ts (98%)
 rename app/{gui2/shared => ydoc-shared/src}/ast/parse.ts (98%)
 rename app/{gui2/shared => ydoc-shared/src}/ast/parserSupport.ts (99%)
 rename app/{gui2/shared => ydoc-shared/src}/ast/sourceDocument.ts (99%)
 rename app/{gui2/shared => ydoc-shared/src}/ast/text.ts (100%)
 rename app/{gui2/shared => ydoc-shared/src}/ast/token.ts (98%)
 rename app/{gui2/shared => ydoc-shared/src}/ast/tree.ts (97%)
 rename app/{gui2/shared => ydoc-shared/src}/binaryProtocol.ts (100%)
 rename app/{gui2/shared => ydoc-shared/src}/ensoFile.ts (100%)
 rename app/{gui2/shared => ydoc-shared/src}/languageServer.ts (96%)
 rename app/{gui2/shared => ydoc-shared/src}/languageServer/files.ts (94%)
 rename app/{gui2/shared => ydoc-shared/src}/languageServerTypes.ts (100%)
 rename app/{gui2/shared => ydoc-shared/src}/languageServerTypes/suggestions.ts (99%)
 rename app/{gui2/shared => ydoc-shared/src}/util/__tests__/net.test.ts (95%)
 rename app/{gui2/shared => ydoc-shared/src}/util/assert.ts (99%)
 rename app/{gui2/shared => ydoc-shared/src}/util/data/__tests__/iterable.test.ts (77%)
 rename app/{gui2/shared => ydoc-shared/src}/util/data/__tests__/text.test.ts (97%)
 rename app/{gui2/shared => ydoc-shared/src}/util/data/graph.ts (100%)
 rename app/{gui2/shared => ydoc-shared/src}/util/data/iterable.ts (100%)
 rename app/{gui2/shared => ydoc-shared/src}/util/data/opt.ts (100%)
 rename app/{gui2/shared => ydoc-shared/src}/util/data/result.ts (95%)
 rename app/{gui2/shared => ydoc-shared/src}/util/data/text.ts (95%)
 rename app/{gui2/shared => ydoc-shared/src}/util/detect.ts (100%)
 rename app/{gui2/shared => ydoc-shared/src}/util/net.ts (86%)
 create mode 100644 app/ydoc-shared/src/util/net/MockWSTransport.ts
 create mode 100644 app/ydoc-shared/src/util/net/ReconnectingWSTransport.ts
 rename app/{gui2/shared => ydoc-shared/src}/util/types.ts (100%)
 rename app/{gui2/shared => ydoc-shared/src}/uuid.ts (100%)
 rename app/{gui2/shared => ydoc-shared/src}/yjsModel.ts (99%)
 create mode 100644 app/ydoc-shared/tsconfig.json
 create mode 100644 app/ydoc-shared/vitest.config.ts

diff --git a/.github/workflows/gui-tests.yml b/.github/workflows/gui-tests.yml
index a7eeebb47c47..e422a03b9031 100644
--- a/.github/workflows/gui-tests.yml
+++ b/.github/workflows/gui-tests.yml
@@ -1,7 +1,7 @@
 # This file is auto-generated. Do not edit it manually!
 # Edit the enso_build::ci_gen module instead and run `cargo run --package enso-build-ci-gen`.
 
-name: GUI Tests
+name: GUI Check
 on:
   push:
     branches:
@@ -27,7 +27,7 @@ jobs:
           access_token: ${{ github.token }}
     permissions:
       actions: write
-  enso-build-ci-gen-job-gui-test-linux-x86_64:
+  enso-build-ci-gen-job-gui-check-linux-x86_64:
     name: GUI tests (linux, x86_64)
     runs-on:
       - self-hosted
@@ -56,7 +56,7 @@ jobs:
         run: ./run git-clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - run: ./run gui test
+      - run: ./run gui check
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - if: failure() && runner.os == 'Windows'
diff --git a/.github/workflows/gui.yml b/.github/workflows/gui.yml
index 20320b417273..cd4e0a35f654 100644
--- a/.github/workflows/gui.yml
+++ b/.github/workflows/gui.yml
@@ -155,7 +155,7 @@ jobs:
           access_token: ${{ github.token }}
     permissions:
       actions: write
-  enso-build-ci-gen-job-new-gui-build-linux-x86_64:
+  enso-build-ci-gen-job-gui-build-linux-x86_64:
     name: GUI build (linux, x86_64)
     runs-on:
       - self-hosted
@@ -210,7 +210,7 @@ jobs:
         run: ./run git-clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  enso-build-ci-gen-job-new-gui-build-macos-x86_64:
+  enso-build-ci-gen-job-gui-build-macos-x86_64:
     name: GUI build (macos, x86_64)
     runs-on:
       - macos-12
@@ -264,7 +264,7 @@ jobs:
         run: ./run git-clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  enso-build-ci-gen-job-new-gui-build-windows-x86_64:
+  enso-build-ci-gen-job-gui-build-windows-x86_64:
     name: GUI build (windows, x86_64)
     runs-on:
       - self-hosted
diff --git a/.gitignore b/.gitignore
index ce2d01a6bce2..6f6542d25cb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,6 +73,8 @@ node_modules/
 .metals
 tools/performance/engine-benchmarks/generated_site
 *.tsbuildinfo
+vite.config.ts.timestamp-*.mjs
+vitest.config.ts.timestamp-*.mjs
 
 ############################
 ## Rendered Documentation ##
diff --git a/.pnpmfile.cjs b/.pnpmfile.cjs
new file mode 100644
index 000000000000..a2b91cba5e66
--- /dev/null
+++ b/.pnpmfile.cjs
@@ -0,0 +1,21 @@
+const IGNORED_DEPS = ['react-native-url-polyfill', 'react-native-get-random-values']
+
+const unusedIgnores = new Set(IGNORED_DEPS)
+module.exports.hooks = {
+  readPackage: (pkg, context) => {
+    for (const ignored of IGNORED_DEPS) {
+      if (pkg.dependencies[ignored]) {
+        delete pkg.dependencies[ignored]
+        context.log(`Ignoring dependency ${ignored} in ${pkg.name}`)
+        unusedIgnores.delete(ignored)
+      }
+    }
+    return pkg
+  },
+  afterAllResolved(lockfile, context) {
+    if (unusedIgnores.size > 0) {
+      context.log(`Unused dependency ignore declarations: ${Array.from(unusedIgnores).join(', ')}`)
+    }
+    return lockfile
+  },
+}
diff --git a/.prettierignore b/.prettierignore
index 4c63858056d1..0e2f83fa81fc 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -38,8 +38,7 @@ app/ide-desktop/lib/dashboard/playwright-report/
 app/ide-desktop/lib/dashboard/playwright/.cache/
 app/ide-desktop/lib/dashboard/dist/
 app/gui/view/documentation/assets/stylesheet.css
-app/gui2/rust-ffi/pkg
-app/gui2/rust-ffi/node-pkg
+app/rust-ffi/pkg
 app/gui2/src/assets/font-*.css
 Cargo.lock
 build.json
diff --git a/Cargo.toml b/Cargo.toml
index af211e4b9cee..3184943284ae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ resolver = "2"
 # path, e.g. `lib/rust/ensogl/examples`, or `app/gui/view/examples`; this is used to optimize the application for
 # loading the IDE.
 members = [
-    "app/gui2/rust-ffi",
+    "app/rust-ffi",
     "build/cli",
     "build/macros/proc-macro",
     "build/ci-gen",
diff --git a/app/dashboard/e2e/README.md b/app/dashboard/e2e/README.md
index 168e8eddeb12..0917914fe44b 100644
--- a/app/dashboard/e2e/README.md
+++ b/app/dashboard/e2e/README.md
@@ -6,20 +6,20 @@ Execute all commands from the parent directory.
 
 ```sh
 # Run tests normally
-npm run test:e2e
+pnpm run test:e2e
 # Open UI to run tests
-npm run test:e2e:debug
+pnpm run test:e2e:debug
 # Run tests in a specific file only
-npm run test:e2e -- e2e/file-name-here.spec.ts
-npm run test:e2e:debug -- e2e/file-name-here.spec.ts
+pnpm run test:e2e -- e2e/file-name-here.spec.ts
+pnpm run test:e2e:debug -- e2e/file-name-here.spec.ts
 # Compile the entire app before running the tests.
 # DOES NOT hot reload the tests.
 # Prefer not using this when you are trying to fix a test;
 # prefer using this when you just want to know which tests are failing (if any).
-PROD=1 npm run test:e2e
-PROD=1 npm run test:e2e:debug
-PROD=1 npm run test:e2e -- e2e/file-name-here.spec.ts
-PROD=1 npm run test:e2e:debug -- e2e/file-name-here.spec.ts
+PROD=1 pnpm run test:e2e
+PROD=1 pnpm run test:e2e:debug
+PROD=1 pnpm run test:e2e -- e2e/file-name-here.spec.ts
+PROD=1 pnpm run test:e2e:debug -- e2e/file-name-here.spec.ts
 ```
 
 ## Getting started
diff --git a/app/dashboard/e2e/actions.ts b/app/dashboard/e2e/actions.ts
index 53cfefdef5f3..6a21950e2e00 100644
--- a/app/dashboard/e2e/actions.ts
+++ b/app/dashboard/e2e/actions.ts
@@ -325,7 +325,7 @@ export function locateAssetsTable(page: test.Page) {
 
 /** Find assets table rows (if any) on the current page. */
 export function locateAssetRows(page: test.Page) {
-  return locateAssetsTable(page).locator('tbody').getByRole('row')
+  return locateAssetsTable(page).getByTestId('asset-row')
 }
 
 /** Find the name column of the given asset row. */
diff --git a/app/dashboard/e2e/assetSearchBar.spec.ts b/app/dashboard/e2e/assetSearchBar.spec.ts
index 666e7a3d027a..408f50a7773c 100644
--- a/app/dashboard/e2e/assetSearchBar.spec.ts
+++ b/app/dashboard/e2e/assetSearchBar.spec.ts
@@ -36,12 +36,9 @@ test.test('labels', async ({ page }) => {
     page,
     setupAPI: (api) => {
       api.addLabel('aaaa', backend.COLORS[0])
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      api.addLabel('bbbb', backend.COLORS[1]!)
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      api.addLabel('cccc', backend.COLORS[2]!)
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      api.addLabel('dddd', backend.COLORS[3]!)
+      api.addLabel('bbbb', backend.COLORS[1])
+      api.addLabel('cccc', backend.COLORS[2])
+      api.addLabel('dddd', backend.COLORS[3])
     },
   })
   const searchBarInput = actions.locateSearchBarInput(page)
diff --git a/app/dashboard/e2e/labels.spec.ts b/app/dashboard/e2e/labels.spec.ts
index 92fb3892edb7..0683b296e261 100644
--- a/app/dashboard/e2e/labels.spec.ts
+++ b/app/dashboard/e2e/labels.spec.ts
@@ -11,12 +11,9 @@ test.test('drag labels onto single row', async ({ page }) => {
     page,
     setupAPI: (api) => {
       api.addLabel(label, backend.COLORS[0])
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      api.addLabel('bbbb', backend.COLORS[1]!)
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      api.addLabel('cccc', backend.COLORS[2]!)
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      api.addLabel('dddd', backend.COLORS[3]!)
+      api.addLabel('bbbb', backend.COLORS[1])
+      api.addLabel('cccc', backend.COLORS[2])
+      api.addLabel('dddd', backend.COLORS[3])
       api.addDirectory('foo')
       api.addSecret('bar')
       api.addFile('baz')
@@ -41,12 +38,9 @@ test.test('drag labels onto multiple rows', async ({ page }) => {
     page,
     setupAPI: (api) => {
       api.addLabel(label, backend.COLORS[0])
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      api.addLabel('bbbb', backend.COLORS[1]!)
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      api.addLabel('cccc', backend.COLORS[2]!)
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      api.addLabel('dddd', backend.COLORS[3]!)
+      api.addLabel('bbbb', backend.COLORS[1])
+      api.addLabel('cccc', backend.COLORS[2])
+      api.addLabel('dddd', backend.COLORS[3])
       api.addDirectory('foo')
       api.addSecret('bar')
       api.addFile('baz')
diff --git a/app/dashboard/package.json b/app/dashboard/package.json
index fc8df720b002..1bd447c99121 100644
--- a/app/dashboard/package.json
+++ b/app/dashboard/package.json
@@ -15,16 +15,17 @@
   },
   "scripts": {
     "compile": "tsc",
-    "typecheck": "tsc --noEmit",
+    "typecheck": "tsc",
     "build": "vite build",
+    "lint": "eslint .",
     "dev": "vite",
     "dev:e2e": "vite -c vite.test.config.ts",
     "dev:e2e:ci": "vite -c vite.test.config.ts build && vite preview --port 8080 --strictPort",
-    "test": "npm run test:unit && npm run test:e2e",
+    "test": "corepack pnpm run /^^^^test:.*/",
     "test:unit": "vitest run",
-    "test:unit:debug": "vitest",
+    "test-dev:unit": "vitest",
     "test:e2e": "cross-env NODE_ENV=production playwright test",
-    "test:e2e:debug": "cross-env NODE_ENV=production playwright test --ui"
+    "test-dev:e2e": "cross-env NODE_ENV=production playwright test --ui"
   },
   "dependencies": {
     "@aws-amplify/auth": "5.6.5",
diff --git a/app/dashboard/playwright.config.ts b/app/dashboard/playwright.config.ts
index dd9597fc053e..f0bf92b3fcfc 100644
--- a/app/dashboard/playwright.config.ts
+++ b/app/dashboard/playwright.config.ts
@@ -57,7 +57,7 @@ export default test.defineConfig({
     },
   },
   webServer: {
-    command: process.env.CI || process.env.PROD ? 'npm run dev:e2e:ci' : 'npm run dev:e2e',
+    command: `corepack pnpm run ${process.env.CI || process.env.PROD ? 'dev:e2e:ci' : 'dev:e2e'}`,
     port: 8080,
     reuseExistingServer: false,
   },
diff --git a/app/dashboard/src/components/dashboard/AssetRow.tsx b/app/dashboard/src/components/dashboard/AssetRow.tsx
index ebf5eacd2ed4..9395494b88f6 100644
--- a/app/dashboard/src/components/dashboard/AssetRow.tsx
+++ b/app/dashboard/src/components/dashboard/AssetRow.tsx
@@ -742,6 +742,7 @@ export default function AssetRow(props: AssetRowProps) {
           {!hidden && (
             <FocusRing>
               <tr
+                data-testid="asset-row"
                 tabIndex={0}
                 ref={(element) => {
                   rootRef.current = element
diff --git a/app/eslint.config.mjs b/app/eslint.config.mjs
index 8fc75503dda1..9d656a8cf094 100644
--- a/app/eslint.config.mjs
+++ b/app/eslint.config.mjs
@@ -196,7 +196,7 @@ export default [
   eslintJs.configs.recommended,
   {
     // Playwright build cache and Vite build directory.
-    ignores: ['**/.cache/**', '**/playwright-report', '**/dist'],
+    ignores: ['**/.cache/**', '**/playwright-report', '**/dist', '**/build.mjs'],
   },
   {
     settings: {
@@ -403,6 +403,7 @@ export default [
   },
   {
     files: ['**/*.js', '**/*.jsx', '**/*.cjs', '**/*.mjs'],
+    ignores: ['**/build.mjs'],
     rules: {
       '@typescript-eslint/no-var-requires': 'off',
       // Parameter types must be specified using JSDoc in JS files.
diff --git a/app/gui2/e2e/expressionUpdates.ts b/app/gui2/e2e/expressionUpdates.ts
index 540a6e828dcd..5846ef888f14 100644
--- a/app/gui2/e2e/expressionUpdates.ts
+++ b/app/gui2/e2e/expressionUpdates.ts
@@ -1,5 +1,5 @@
 import type { Page } from '@playwright/test'
-import type { ExpressionUpdate, MethodCall } from 'shared/languageServerTypes'
+import type { ExpressionUpdate, MethodCall } from 'ydoc-shared/languageServerTypes'
 
 export type ExpressionLocator = string | { binding: string; expr: string }
 
diff --git a/app/gui2/e2e/setup.ts b/app/gui2/e2e/setup.ts
index a9a5cd83a1b5..72b1b2c2b588 100644
--- a/app/gui2/e2e/setup.ts
+++ b/app/gui2/e2e/setup.ts
@@ -18,7 +18,7 @@ export default function setup() {
           id: 'websocket',
           udp: true,
           ipv6: true,
-          port: 30535,
+          port: 30536,
           middleware: [],
         },
       },
diff --git a/app/gui2/env.d.ts b/app/gui2/env.d.ts
index 0ffbb98be199..321e2e395a7f 100644
--- a/app/gui2/env.d.ts
+++ b/app/gui2/env.d.ts
@@ -2,7 +2,6 @@
 
 declare const PROJECT_MANAGER_URL: string
 declare const YDOC_SERVER_URL: string
-declare const RUNNING_VITEST: boolean
 declare const IS_CLOUD_BUILD: boolean
 
 interface Document {
diff --git a/app/gui2/env.story.d.ts b/app/gui2/env.story.d.ts
deleted file mode 100644
index cbd6e23731fb..000000000000
--- a/app/gui2/env.story.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-/// <reference types="@histoire/plugin-vue/components" />
diff --git a/app/gui2/eslint.config.js b/app/gui2/eslint.config.js
index 53f1341c1198..a9ed1aeb7bc1 100644
--- a/app/gui2/eslint.config.js
+++ b/app/gui2/eslint.config.js
@@ -10,8 +10,6 @@ const DIR_NAME = path.dirname(url.fileURLToPath(import.meta.url))
 const conf = [
   {
     ignores: [
-      'rust-ffi/pkg',
-      'rust-ffi/node-pkg',
       'dist',
       'shared/ast/generated',
       'templates',
@@ -30,14 +28,7 @@ const conf = [
       parserOptions: {
         tsconfigRootDir: DIR_NAME,
         ecmaVersion: 'latest',
-        project: [
-          './tsconfig.app.json',
-          './tsconfig.node.json',
-          './tsconfig.server.json',
-          './tsconfig.app.vitest.json',
-          './tsconfig.server.vitest.json',
-          './tsconfig.story.json',
-        ],
+        project: ['./tsconfig.app.json', './tsconfig.node.json', './tsconfig.app.vitest.json'],
       },
     },
     rules: {
diff --git a/app/gui2/mock/MockFSWrapper.vue b/app/gui2/mock/MockFSWrapper.vue
index b3da3db7a14e..3f2949192145 100644
--- a/app/gui2/mock/MockFSWrapper.vue
+++ b/app/gui2/mock/MockFSWrapper.vue
@@ -2,8 +2,8 @@
 import { useProjectStore } from '@/stores/project'
 import { mockFsDirectoryHandle } from '@/util/convert/fsAccess'
 import { MockWebSocket, type WebSocketHandler } from '@/util/net'
-import { type Path as LSPath } from 'shared/languageServerTypes'
 import { watchEffect } from 'vue'
+import { type Path as LSPath } from 'ydoc-shared/languageServerTypes'
 import { mockDataWSHandler } from './dataServer'
 
 const projectStore = useProjectStore()
diff --git a/app/gui2/mock/MockProjectStoreWrapper.vue b/app/gui2/mock/MockProjectStoreWrapper.vue
index d44663234c24..cb88726f2145 100644
--- a/app/gui2/mock/MockProjectStoreWrapper.vue
+++ b/app/gui2/mock/MockProjectStoreWrapper.vue
@@ -5,8 +5,8 @@
 
 import { useProjectStore } from '@/stores/project'
 import { Ast } from '@/util/ast'
-import { SourceDocument } from 'shared/ast/sourceDocument'
 import { reactive, watch } from 'vue'
+import { SourceDocument } from 'ydoc-shared/ast/sourceDocument'
 
 const props = defineProps<{ modelValue: string }>()
 const emit = defineEmits<{ 'update:modelValue': [modelValue: string] }>()
diff --git a/app/gui2/mock/dataServer.ts b/app/gui2/mock/dataServer.ts
index 822b3afdb9d5..cb67a4788533 100644
--- a/app/gui2/mock/dataServer.ts
+++ b/app/gui2/mock/dataServer.ts
@@ -27,9 +27,9 @@ import {
   type AnyOutboundPayload,
   type Offset,
   type Table,
-} from 'shared/binaryProtocol'
-import { LanguageServerErrorCode } from 'shared/languageServerTypes'
-import { uuidToBits } from 'shared/uuid'
+} from 'ydoc-shared/binaryProtocol'
+import { LanguageServerErrorCode } from 'ydoc-shared/languageServerTypes'
+import { uuidToBits } from 'ydoc-shared/uuid'
 
 const sha3 = createSHA3(224)
 
diff --git a/app/gui2/mock/engine.ts b/app/gui2/mock/engine.ts
index 2adc5dc7b0e7..0879aa60f86e 100644
--- a/app/gui2/mock/engine.ts
+++ b/app/gui2/mock/engine.ts
@@ -1,7 +1,9 @@
 import { Pattern } from '@/util/ast/match'
 import type { MockYdocProviderImpl } from '@/util/crdt'
+import type { WebSocketHandler } from '@/util/net'
+import type { QualifiedName } from '@/util/qualifiedName'
 import * as random from 'lib0/random'
-import * as Ast from 'shared/ast'
+import * as Ast from 'ydoc-shared/ast'
 import {
   Builder,
   EnsoUUID,
@@ -9,8 +11,8 @@ import {
   OutboundPayload,
   VisualizationContext,
   VisualizationUpdate,
-} from 'shared/binaryProtocol'
-import { ErrorCode } from 'shared/languageServer'
+} from 'ydoc-shared/binaryProtocol'
+import { ErrorCode } from 'ydoc-shared/languageServer'
 import type {
   ContextId,
   ExpressionId,
@@ -19,11 +21,10 @@ import type {
   Uuid,
   VisualizationConfiguration,
   response,
-} from 'shared/languageServerTypes'
-import type { SuggestionEntry } from 'shared/languageServerTypes/suggestions'
-import { uuidToBits } from 'shared/uuid'
-import type { MockTransportData, WebSocketHandler } from 'src/util/net'
-import type { QualifiedName } from 'src/util/qualifiedName'
+} from 'ydoc-shared/languageServerTypes'
+import type { SuggestionEntry } from 'ydoc-shared/languageServerTypes/suggestions'
+import type { MockTransportData } from 'ydoc-shared/util/net'
+import { uuidToBits } from 'ydoc-shared/uuid'
 import * as Y from 'yjs'
 import { mockFsDirectoryHandle, type FileTree } from '../src/util/convert/fsAccess'
 import mockDb from '../stories/mockSuggestions.json' assert { type: 'json' }
diff --git a/app/gui2/package.json b/app/gui2/package.json
index ec9146f96efb..c39edf0ff127 100644
--- a/app/gui2/package.json
+++ b/app/gui2/package.json
@@ -8,27 +8,25 @@
     "email": "contact@enso.org"
   },
   "scripts": {
-    "dev": "vite",
-    "build": "npm --workspace enso-dashboard run compile && run-p typecheck build-only",
-    "build:cloud": "cross-env CLOUD_BUILD=true npm run build",
+    "dev": "echo DEPRECATED! Use `pnpm dev:gui` in workspace root directory.",
+    "dev:vite": "vite",
+    "build": "corepack pnpm -r --filter enso-dashboard run compile && corepack pnpm run build:vite",
+    "build-cloud": "cross-env CLOUD_BUILD=true corepack pnpm run build",
     "preview": "vite preview",
-    "test": "vitest run && playwright test",
-    "test:unit": "vitest",
+    "test": "corepack pnpm run /^^^^test:.*/",
+    "test:unit": "vitest run",
+    "test-dev:unit": "vitest",
     "test:e2e": "playwright test",
+    "test-dev:e2e": "playwright test --ui",
     "story:dev": "histoire dev",
     "story:build": "histoire build",
     "story:preview": "histoire preview",
-    "build-only": "vite build",
-    "build-ydoc-server-polyglot": "vite build --config vite.ydoc-server-polyglot.config.ts",
-    "compile-server": "tsc -p tsconfig.server.json",
-    "typecheck": "vue-tsc --noEmit -p tsconfig.app.json --composite false",
+    "build:vite": "vite build",
+    "typecheck": "vue-tsc --noEmit -p tsconfig.app.json",
     "lint": "eslint .",
     "format": "prettier --version && prettier --write src/ && eslint . --fix",
-    "clean-old-generated-directory": "rimraf src/generated",
     "build-rust-ffi": "wasm-pack build ./rust-ffi --release --target web && wasm-pack build ./rust-ffi --out-dir node-pkg --target nodejs",
-    "generate-ast-schema": "cargo run -p enso-parser-schema > shared/ast/generated/ast-schema.json",
-    "generate-ast-types": "tsx ./parser-codegen/index.ts shared/ast/generated/ast-schema.json shared/ast/generated/ast.ts",
-    "preinstall": "npm run clean-old-generated-directory && npm run build-rust-ffi && npm run generate-ast-schema && npm run generate-ast-types && npm run generate-metadata && npm run download-fonts",
+    "preinstall": "corepack pnpm run generate-metadata && corepack pnpm run download-fonts",
     "postinstall": "playwright install",
     "generate-metadata": "node scripts/generateIconMetadata.js",
     "download-fonts": "node scripts/downloadFonts.js"
@@ -62,8 +60,7 @@
     "@lexical/utils": "^0.16.0",
     "@lezer/common": "^1.1.0",
     "@lezer/highlight": "^1.1.6",
-    "@noble/hashes": "^1.3.2",
-    "@open-rpc/client-js": "^1.8.1",
+    "@noble/hashes": "^1.4.0",
     "@tanstack/vue-query": ">= 5.45.0 < 5.46.0",
     "@vueuse/core": "^10.4.1",
     "ag-grid-community": "^30.2.1",
@@ -72,7 +69,6 @@
     "culori": "^3.2.0",
     "enso-dashboard": "workspace:*",
     "events": "^3.3.0",
-    "fast-diff": "^1.3.0",
     "hash-sum": "^2.0.0",
     "install": "^0.13.0",
     "isomorphic-ws": "^5.0.0",
@@ -80,23 +76,22 @@
     "lib0": "^0.2.85",
     "magic-string": "^0.30.3",
     "murmurhash": "^2.0.1",
-    "partysocket": "^1.0.1",
     "postcss-inline-svg": "^6.0.0",
     "postcss-nesting": "^12.0.1",
     "react-toastify": "^9.1.3",
-    "rimraf": "^5.0.5",
     "sucrase": "^3.34.0",
     "veaury": "^2.3.18",
     "vue": "^3.4.19",
-    "ws": "^8.13.0",
     "y-codemirror.next": "^0.3.2",
     "y-protocols": "^1.0.5",
     "y-textarea": "^1.0.0",
     "y-websocket": "^1.5.0",
+    "ydoc-shared": "workspace:*",
     "yjs": "^13.6.7",
-    "zod": "^3.22.4"
+    "zod": "^3.23.8"
   },
   "devDependencies": {
+    "@codemirror/theme-one-dark": "^6.1.2",
     "@danmarshall/deckgl-typings": "^4.9.28",
     "@eslint/eslintrc": "^3.0.2",
     "@eslint/js": "^8.57.0",
@@ -104,7 +99,7 @@
     "@open-rpc/server-js": "^1.9.4",
     "@playwright/test": "^1.40.0",
     "@rushstack/eslint-patch": "^1.3.2",
-    "@tsconfig/node18": "^18.2.0",
+    "@tsconfig/node20": "^20.1.4",
     "@types/css.escape": "^1.5.2",
     "@types/culori": "^2.0.1",
     "@types/d3": "^7.4.0",
@@ -124,7 +119,6 @@
     "@vue/eslint-config-typescript": "^13.0.0",
     "@vue/test-utils": "^2.4.6",
     "@vue/tsconfig": "^0.5.1",
-    "change-case": "^4.1.2",
     "cross-env": "^7.0.3",
     "css.escape": "^1.5.1",
     "d3": "^7.4.0",
@@ -132,7 +126,7 @@
     "eslint": "^8.49.0",
     "eslint-plugin-vue": "^9.22.0",
     "floating-vue": "^2.0.0-beta.24",
-    "hash-wasm": "^4.10.0",
+    "hash-wasm": "^4.11.0",
     "histoire": "^0.17.2",
     "jsdom": "^24.1.0",
     "playwright": "^1.39.0",
@@ -150,9 +144,11 @@
     "unbzip2-stream": "^1.4.3",
     "vite": "^5.3.5",
     "vite-plugin-vue-devtools": "7.3.7",
+    "vite-plugin-wasm": "^3.3.0",
     "vitest": "^1.3.1",
     "vue-react-wrapper": "^0.3.1",
     "vue-tsc": "^2.0.24",
-    "yaml": "^2.4.5"
+    "yaml": "^2.4.5",
+    "ydoc-server": "workspace:*"
   }
 }
diff --git a/app/gui2/parser-codegen/index.ts b/app/gui2/parser-codegen/index.ts
deleted file mode 100644
index ab06131db292..000000000000
--- a/app/gui2/parser-codegen/index.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import * as fs from 'node:fs'
-import * as process from 'node:process'
-import * as codegen from './codegen.js'
-import * as Schema from './schema.js'
-
-const schemaPath = process.argv[2]
-const outputPath = process.argv[3]
-
-if (!schemaPath || !outputPath) {
-  console.error('Usage: parser-codegen <schemaPath> <outputPath>')
-  process.exit(1)
-}
-
-console.log(`Generating ${outputPath} from ${schemaPath}.`)
-const schema: Schema.Schema = JSON.parse(fs.readFileSync(schemaPath, 'utf8'))
-const code = codegen.implement(schema)
-fs.writeFileSync(outputPath, code)
diff --git a/app/gui2/playwright.config.ts b/app/gui2/playwright.config.ts
index 475883126712..ba778fe6eff0 100644
--- a/app/gui2/playwright.config.ts
+++ b/app/gui2/playwright.config.ts
@@ -114,8 +114,8 @@ export default defineConfig({
     },
     command:
       process.env.CI || process.env.PROD ?
-        `npx vite build && npx vite preview --port ${PORT} --strictPort`
-      : `npx vite dev --port ${PORT}`,
+        `corepack pnpm build && corepack pnpm exec vite preview --port ${PORT} --strictPort`
+      : `corepack pnpm exec vite dev --port ${PORT}`,
     // Build from scratch apparently can take a while on CI machines.
     timeout: 120 * 1000,
     port: PORT,
diff --git a/app/gui2/shared/ast/ffi.ts b/app/gui2/shared/ast/ffi.ts
deleted file mode 100644
index d0903325f9f4..000000000000
--- a/app/gui2/shared/ast/ffi.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * @file Provides the Rust ffi interface. The interface should be kept in sync with polyglot ffi inteface {@link module:ffiPolyglot}.
- *
- * @module ffi
- */
-
-import { createXXHash128 } from 'hash-wasm'
-import type { IDataType } from 'hash-wasm/dist/lib/util'
-import init, {
-  is_ident_or_operator,
-  is_numeric_literal,
-  parse,
-  parse_doc_to_json,
-} from '../../rust-ffi/pkg/rust_ffi'
-import { assertDefined } from '../util/assert'
-import { isNode } from '../util/detect'
-
-let xxHasher128: Awaited<ReturnType<typeof createXXHash128>> | undefined
-export function xxHash128(input: IDataType) {
-  assertDefined(xxHasher128, 'Module should have been loaded with `initializeFFI`.')
-  xxHasher128.init()
-  xxHasher128.update(input)
-  return xxHasher128.digest()
-}
-
-export async function initializeFFI(path?: string | undefined) {
-  if (xxHasher128 != null) return
-  if (isNode) {
-    const fs = await import('node:fs/promises')
-    const { fileURLToPath, URL: nodeURL } = await import('node:url')
-    const buffer = fs.readFile(
-      path ?? fileURLToPath(new nodeURL('../../rust-ffi/pkg/rust_ffi_bg.wasm', import.meta.url)),
-    )
-    await init(buffer)
-  } else {
-    await init()
-  }
-  xxHasher128 = await createXXHash128()
-}
-
-// TODO[ao]: We cannot to that, because the ffi is used by cjs modules.
-// await initializeFFI()
-
-/* eslint-disable-next-line camelcase */
-export { is_ident_or_operator, is_numeric_literal, parse_doc_to_json, parse as parse_tree }
diff --git a/app/gui2/shared/ast/ffiPolyglot.ts b/app/gui2/shared/ast/ffiPolyglot.ts
deleted file mode 100644
index de2285bdee16..000000000000
--- a/app/gui2/shared/ast/ffiPolyglot.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * @file This file is used as ffi {@link module:ffi} interface for building the polyglot ydoc server.
- * All the exported methods are provided by the ydoc server implementation.
- * The interface should be kept in sync with Rust ffi interface {@link module:ffi}.
- *
- * @module ffiPolyglot
- */
-
-import type { IDataType } from 'hash-wasm/dist/lib/util'
-
-declare global {
-  function parse_tree(code: string): Uint8Array
-  function parse_doc_to_json(docs: string): string
-  function is_ident_or_operator(code: string): number
-  function is_numeric_literal(code: string): boolean
-  function xxHash128(input: IDataType): string
-}
-
-export async function initializeFFI(_path?: string | undefined) {}
-
-/* eslint-disable camelcase */
-export const {
-  is_ident_or_operator,
-  is_numeric_literal,
-  parse_doc_to_json,
-  parse_tree,
-  xxHash128,
-} = globalThis
-/* eslint-enable camelcase */
diff --git a/app/gui2/shared/util/net/ReconnectingWSTransport.ts b/app/gui2/shared/util/net/ReconnectingWSTransport.ts
deleted file mode 100644
index 8a961b5979b6..000000000000
--- a/app/gui2/shared/util/net/ReconnectingWSTransport.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * This file is modified version of open-rpc/client-js WebSocketTransport implementation
- * (https://github.com/open-rpc/client-js/blob/master/src/transports/WebSocketTransport.ts)
- * which uses the automatically reconnecting websocket.
- */
-
-import { ERR_UNKNOWN, JSONRPCError } from '@open-rpc/client-js/build/Error'
-import {
-  getBatchRequests,
-  getNotifications,
-  type JSONRPCRequestData,
-} from '@open-rpc/client-js/build/Request'
-import { Transport } from '@open-rpc/client-js/build/transports/Transport'
-import WS from 'isomorphic-ws'
-import { WebSocket } from 'partysocket'
-import { type WebSocketEventMap } from 'partysocket/ws'
-
-export interface AddEventListenerOptions {
-  capture?: boolean
-  once?: boolean
-  passive?: boolean
-  signal?: AbortSignal
-}
-
-class ReconnectingWebSocketTransport extends Transport {
-  public connection: WebSocket
-  public uri: string
-
-  constructor(uri: string) {
-    super()
-    this.uri = uri
-    this.connection = new WebSocket(uri, undefined, { WebSocket: WS })
-  }
-
-  public connect(): Promise<any> {
-    return new Promise<void>((resolve) => {
-      this.connection.addEventListener('open', () => resolve(), { once: true })
-      this.connection.addEventListener('message', ({ data }: { data: string }) => {
-        this.transportRequestManager.resolveResponse(data)
-      })
-    })
-  }
-
-  public reconnect() {
-    this.connection.reconnect()
-  }
-
-  public async sendData(data: JSONRPCRequestData, timeout: number | null = 5000): Promise<any> {
-    let promise = this.transportRequestManager.addRequest(data, timeout)
-    const notifications = getNotifications(data)
-    try {
-      this.connection.send(JSON.stringify(this.parseData(data)))
-      this.transportRequestManager.settlePendingRequest(notifications)
-    } catch (err) {
-      const jsonError = new JSONRPCError((err as any).message, ERR_UNKNOWN, err)
-
-      this.transportRequestManager.settlePendingRequest(notifications, jsonError)
-      this.transportRequestManager.settlePendingRequest(getBatchRequests(data), jsonError)
-
-      promise = Promise.reject(jsonError)
-    }
-
-    return promise
-  }
-
-  public close(): void {
-    this.connection.close()
-  }
-
-  on<K extends keyof WebSocketEventMap>(
-    type: K,
-    cb: (
-      event: WebSocketEventMap[K] extends Event ? WebSocketEventMap[K] : never,
-    ) => WebSocketEventMap[K] extends Event ? void : never,
-    options?: AddEventListenerOptions,
-  ): void {
-    this.connection.addEventListener(type, cb, options)
-  }
-
-  off<K extends keyof WebSocketEventMap>(
-    type: K,
-    cb: (
-      event: WebSocketEventMap[K] extends Event ? WebSocketEventMap[K] : never,
-    ) => WebSocketEventMap[K] extends Event ? void : never,
-    options?: AddEventListenerOptions,
-  ): void {
-    this.connection.removeEventListener(type, cb, options)
-  }
-}
-
-export default ReconnectingWebSocketTransport
diff --git a/app/gui2/src/App.vue b/app/gui2/src/App.vue
index 30c3e6cfcdc2..1d3f5736059d 100644
--- a/app/gui2/src/App.vue
+++ b/app/gui2/src/App.vue
@@ -19,7 +19,6 @@ import { computed, markRaw, toRaw, toRef, watch } from 'vue'
 import TooltipDisplayer from './components/TooltipDisplayer.vue'
 import { provideTooltipRegistry } from './providers/tooltipState'
 import { provideVisibility } from './providers/visibility'
-import { initializePrefixes } from './util/ast/node'
 import { urlParams } from './util/urlParams'
 
 const props = defineProps<{
@@ -37,8 +36,6 @@ provideBackend(() => markRaw(toRaw(props.backend)))
 const classSet = provideAppClassSet()
 const appTooltips = provideTooltipRegistry()
 
-initializePrefixes()
-
 const logger = provideEventLogger(toRef(props, 'logEvent'), toRef(props, 'projectId'))
 watch(
   toRef(props, 'projectId'),
diff --git a/app/gui2/src/asyncApp.ts b/app/gui2/src/asyncApp.ts
index e9992f8e82e6..3500bcba1020 100644
--- a/app/gui2/src/asyncApp.ts
+++ b/app/gui2/src/asyncApp.ts
@@ -1,9 +1,6 @@
 import '@/assets/base.css'
 
 export async function AsyncApp() {
-  const [_, app] = await Promise.all([
-    import('shared/ast/ffi').then((mod) => mod.initializeFFI()),
-    import('@/App.vue'),
-  ])
+  const app = await import('@/App.vue')
   return app
 }
diff --git a/app/gui2/src/components/CodeEditor.vue b/app/gui2/src/components/CodeEditor.vue
index e6880dbb36f6..42423ead74c0 100644
--- a/app/gui2/src/components/CodeEditor.vue
+++ b/app/gui2/src/components/CodeEditor.vue
@@ -9,10 +9,10 @@ import { unwrap } from '@/util/data/result'
 import { qnJoin, tryQualifiedName } from '@/util/qualifiedName'
 import { EditorSelection } from '@codemirror/state'
 import { createDebouncer } from 'lib0/eventloop'
-import { MutableModule } from 'shared/ast'
-import { textChangeToEdits, type SourceRangeEdit } from 'shared/util/data/text'
-import { rangeEncloses, type Origin } from 'shared/yjsModel'
 import { computed, onMounted, onUnmounted, ref, shallowRef, watch, watchEffect } from 'vue'
+import { MutableModule } from 'ydoc-shared/ast'
+import { textChangeToEdits, type SourceRangeEdit } from 'ydoc-shared/util/data/text'
+import { rangeEncloses, type Origin } from 'ydoc-shared/yjsModel'
 
 // Use dynamic imports to aid code splitting. The codemirror dependency is quite large.
 const {
diff --git a/app/gui2/src/components/CodeEditor/codemirror.ts b/app/gui2/src/components/CodeEditor/codemirror.ts
index aba0562e0166..a350c0f6434b 100644
--- a/app/gui2/src/components/CodeEditor/codemirror.ts
+++ b/app/gui2/src/components/CodeEditor/codemirror.ts
@@ -43,9 +43,9 @@ import {
 } from '@lezer/common'
 import { styleTags, tags } from '@lezer/highlight'
 import { EditorView } from 'codemirror'
-import type { Diagnostic as LSDiagnostic } from 'shared/languageServerTypes'
-import { tryGetSoleValue } from 'shared/util/data/iterable'
-import type { SourceRangeEdit } from 'shared/util/data/text'
+import type { Diagnostic as LSDiagnostic } from 'ydoc-shared/languageServerTypes'
+import { tryGetSoleValue } from 'ydoc-shared/util/data/iterable'
+import type { SourceRangeEdit } from 'ydoc-shared/util/data/text'
 
 export function lsDiagnosticsToCMDiagnostics(
   source: string,
diff --git a/app/gui2/src/components/ColorPickerMenu.vue b/app/gui2/src/components/ColorPickerMenu.vue
index ebd5559022f3..20f5842bb483 100644
--- a/app/gui2/src/components/ColorPickerMenu.vue
+++ b/app/gui2/src/components/ColorPickerMenu.vue
@@ -4,8 +4,8 @@ import { injectNodeColors } from '@/providers/graphNodeColors'
 import { injectGraphSelection } from '@/providers/graphSelection'
 import { useGraphStore, type NodeId } from '@/stores/graph'
 import { filterDefined } from '@/util/data/iterable'
-import { tryGetSoleValue } from 'shared/util/data/iterable'
 import { ref } from 'vue'
+import { tryGetSoleValue } from 'ydoc-shared/util/data/iterable'
 
 const emit = defineEmits<{
   close: []
diff --git a/app/gui2/src/components/ColorRing/gradient.ts b/app/gui2/src/components/ColorRing/gradient.ts
index d5d0df1c8f33..6c691d144d33 100644
--- a/app/gui2/src/components/ColorRing/gradient.ts
+++ b/app/gui2/src/components/ColorRing/gradient.ts
@@ -1,5 +1,5 @@
 import { ensoColor, formatCssColor, normalizeHue } from '@/util/colors'
-import { Resumable } from 'shared/util/data/iterable'
+import { Resumable } from 'ydoc-shared/util/data/iterable'
 
 export interface FixedRange {
   start: number
diff --git a/app/gui2/src/components/ComponentBrowser.vue b/app/gui2/src/components/ComponentBrowser.vue
index c50539caca96..32184a2d32ca 100644
--- a/app/gui2/src/components/ComponentBrowser.vue
+++ b/app/gui2/src/components/ComponentBrowser.vue
@@ -29,10 +29,10 @@ import { Rect } from '@/util/data/rect'
 import { Vec2 } from '@/util/data/vec2'
 import { DEFAULT_ICON, suggestionEntryToIcon } from '@/util/getIconName'
 import { debouncedGetter } from '@/util/reactivity'
-import type { SuggestionId } from 'shared/languageServerTypes/suggestions'
-import type { VisualizationIdentifier } from 'shared/yjsModel'
 import type { ComponentInstance, Ref } from 'vue'
 import { computed, onMounted, onUnmounted, reactive, ref, watch, watchEffect } from 'vue'
+import type { SuggestionId } from 'ydoc-shared/languageServerTypes/suggestions'
+import type { VisualizationIdentifier } from 'ydoc-shared/yjsModel'
 import LoadingSpinner from './LoadingSpinner.vue'
 
 const ITEM_SIZE = 32
diff --git a/app/gui2/src/components/ComponentBrowser/__tests__/filtering.test.ts b/app/gui2/src/components/ComponentBrowser/__tests__/filtering.test.ts
index 9c52ebbd4207..bc782b3b895c 100644
--- a/app/gui2/src/components/ComponentBrowser/__tests__/filtering.test.ts
+++ b/app/gui2/src/components/ComponentBrowser/__tests__/filtering.test.ts
@@ -13,9 +13,6 @@ import {
 } from '@/stores/suggestionDatabase/entry'
 import { unwrap } from '@/util/data/result'
 import { tryQualifiedName, type QualifiedName } from '@/util/qualifiedName'
-import { initializeFFI } from 'shared/ast/ffi'
-
-await initializeFFI()
 
 test.each([
   { ...makeModuleMethod('Standard.Base.Data.read'), groupIndex: 0 },
diff --git a/app/gui2/src/components/ComponentBrowser/__tests__/input.test.ts b/app/gui2/src/components/ComponentBrowser/__tests__/input.test.ts
index 3c7445be0038..b1313bb6fc4c 100644
--- a/app/gui2/src/components/ComponentBrowser/__tests__/input.test.ts
+++ b/app/gui2/src/components/ComponentBrowser/__tests__/input.test.ts
@@ -16,11 +16,9 @@ import {
 } from '@/stores/suggestionDatabase/entry'
 import { unwrap } from '@/util/data/result'
 import { tryIdentifier, tryQualifiedName } from '@/util/qualifiedName'
-import { initializeFFI } from 'shared/ast/ffi'
-import { assertUnreachable } from 'shared/util/assert'
+import { withSetup } from '@/util/testing'
 import { expect, test } from 'vitest'
-
-await initializeFFI()
+import { assertUnreachable } from 'ydoc-shared/util/assert'
 
 const aiMock = { query: assertUnreachable }
 const operator1Id = '3d0e9b96-3ca0-4c35-a820-7d3a1649de55' as NodeId
@@ -113,30 +111,32 @@ test.each([
       selfArg?: { type: string; typename?: string }
     },
   ) => {
-    const input = useComponentBrowserInput(mockGraphDb(), new SuggestionDb(), aiMock)
-    input.content.value = { text: code, selection: { start: cursorPos, end: cursorPos } }
-    const context = input.context.value
-    const filter = input.filter.value
-    expect(context.type).toStrictEqual(expContext.type)
-    switch (context.type) {
-      case 'insert':
-        expect(context.position).toStrictEqual(expContext.position)
-        expect(
-          context.oprApp != null ? Array.from(context.oprApp.componentsReprs()) : undefined,
-        ).toStrictEqual(expContext.oprApp)
-        break
-      case 'changeIdentifier':
-        expect(context.identifier.repr()).toStrictEqual(expContext.identifier)
-        expect(
-          context.oprApp != null ? Array.from(context.oprApp.componentsReprs()) : undefined,
-        ).toStrictEqual(expContext.oprApp)
-        break
-      case 'changeLiteral':
-        expect(context.literal.repr()).toStrictEqual(expContext.literal)
-    }
-    expect(filter.pattern).toStrictEqual(expFiltering.pattern)
-    expect(filter.qualifiedNamePattern).toStrictEqual(expFiltering.qualifiedNamePattern)
-    expect(filter.selfArg).toStrictEqual(expFiltering.selfArg)
+    withSetup(() => {
+      const input = useComponentBrowserInput(mockGraphDb(), new SuggestionDb(), aiMock)
+      input.content.value = { text: code, selection: { start: cursorPos, end: cursorPos } }
+      const context = input.context.value
+      const filter = input.filter.value
+      expect(context.type).toStrictEqual(expContext.type)
+      switch (context.type) {
+        case 'insert':
+          expect(context.position).toStrictEqual(expContext.position)
+          expect(
+            context.oprApp != null ? Array.from(context.oprApp.componentsReprs()) : undefined,
+          ).toStrictEqual(expContext.oprApp)
+          break
+        case 'changeIdentifier':
+          expect(context.identifier.repr()).toStrictEqual(expContext.identifier)
+          expect(
+            context.oprApp != null ? Array.from(context.oprApp.componentsReprs()) : undefined,
+          ).toStrictEqual(expContext.oprApp)
+          break
+        case 'changeLiteral':
+          expect(context.literal.repr()).toStrictEqual(expContext.literal)
+      }
+      expect(filter.pattern).toStrictEqual(expFiltering.pattern)
+      expect(filter.qualifiedNamePattern).toStrictEqual(expFiltering.qualifiedNamePattern)
+      expect(filter.selfArg).toStrictEqual(expFiltering.selfArg)
+    })
   },
 )
 
@@ -263,7 +263,7 @@ const insideBracketsCases = makeComplexCase('(', ')')
 const insideListCases = makeComplexCase('[foo, ', ', bar]')
 
 test.each([
-  ...baseCases,
+  ...simpleCases,
   ...insideInfixCases,
   ...insideBracketsCases,
   ...insideListCases,
@@ -281,19 +281,21 @@ test.each([
 ])(
   'Applying suggestion $suggestion.name to $code',
   ({ code, cursorPos, suggestion, expected, expectedCursorPos }) => {
-    cursorPos = cursorPos ?? code.length
-    expectedCursorPos = expectedCursorPos ?? expected.length
-    const db = new SuggestionDb()
-    const dummyId = 1
-    db.set(dummyId, suggestion)
-    const graphMock = GraphDb.Mock()
-    const input = useComponentBrowserInput(graphMock, db, aiMock)
-    input.content.value = { text: code, selection: { start: cursorPos, end: cursorPos } }
-    input.applySuggestion(dummyId)
-    expect(input.code.value).toEqual(expected)
-    expect(input.selection.value).toStrictEqual({
-      start: expectedCursorPos,
-      end: expectedCursorPos,
+    withSetup(() => {
+      cursorPos = cursorPos ?? code.length
+      expectedCursorPos = expectedCursorPos ?? expected.length
+      const db = new SuggestionDb()
+      const dummyId = 1
+      db.set(dummyId, suggestion)
+      const graphMock = GraphDb.Mock()
+      const input = useComponentBrowserInput(graphMock, db, aiMock)
+      input.content.value = { text: code, selection: { start: cursorPos, end: cursorPos } }
+      input.applySuggestion(dummyId)
+      expect(input.code.value).toEqual(expected)
+      expect(input.selection.value).toStrictEqual({
+        start: expectedCursorPos,
+        end: expectedCursorPos,
+      })
     })
   },
 )
@@ -344,23 +346,25 @@ test.each([
 ] as ImportsCase[])(
   '$description',
   ({ suggestionId, initialCode, manuallyEditedCode, expectedCode, expectedImports }) => {
-    initialCode = initialCode ?? ''
-    const db = new SuggestionDb()
-    db.set(1, makeModule('Standard.Base'))
-    db.set(2, makeType('Standard.Base.Table'))
-    db.set(3, makeConstructor('Standard.Base.Table.new'))
-    const graphMock = GraphDb.Mock(undefined, db)
-    const input = useComponentBrowserInput(graphMock, db, aiMock)
-    input.content.value = {
-      text: initialCode,
-      selection: { start: initialCode.length, end: initialCode.length },
-    }
-    input.applySuggestion(suggestionId)
-    if (manuallyEditedCode != null) {
-      input.content.value = { ...input.content.value, text: manuallyEditedCode }
-    }
-    expect(input.code.value).toEqual(expectedCode)
-    expect(input.importsToAdd()).toEqual(expectedImports)
+    withSetup(() => {
+      initialCode = initialCode ?? ''
+      const db = new SuggestionDb()
+      db.set(1, makeModule('Standard.Base'))
+      db.set(2, makeType('Standard.Base.Table'))
+      db.set(3, makeConstructor('Standard.Base.Table.new'))
+      const graphMock = GraphDb.Mock(undefined, db)
+      const input = useComponentBrowserInput(graphMock, db, aiMock)
+      input.content.value = {
+        text: initialCode,
+        selection: { start: initialCode.length, end: initialCode.length },
+      }
+      input.applySuggestion(suggestionId)
+      if (manuallyEditedCode != null) {
+        input.content.value = { ...input.content.value, text: manuallyEditedCode }
+      }
+      expect(input.code.value).toEqual(expectedCode)
+      expect(input.importsToAdd()).toEqual(expectedImports)
+    })
   },
 )
 test.each`
@@ -370,45 +374,49 @@ test.each`
   ${'+'}   | ${'operator1 +'}
   ${'>='}  | ${'operator1 >='}
 `('Initialize input for new node and type $typed', ({ typed, finalCodeWithSourceNode }) => {
-  const mockDb = mockGraphDb()
-  const sourceNode = operator1Id
-  const sourcePort = mockDb.getNodeFirstOutputPort(asNodeId(sourceNode))
-  const input = useComponentBrowserInput(mockDb, new SuggestionDb(), aiMock)
+  withSetup(() => {
+    const mockDb = mockGraphDb()
+    const sourceNode = operator1Id
+    const sourcePort = mockDb.getNodeFirstOutputPort(asNodeId(sourceNode))
+    const input = useComponentBrowserInput(mockDb, new SuggestionDb(), aiMock)
 
-  // Without source node
-  input.reset({ type: 'newNode' })
-  expect(input.code.value).toBe('')
-  expect(input.selection.value).toEqual({ start: 0, end: 0 })
-  expect(input.anyChange.value).toBeFalsy()
-  input.content.value = { text: typed, selection: { start: typed.length, end: typed.length } }
-  expect(input.code.value).toBe(typed)
-  expect(input.selection.value).toEqual({ start: typed.length, end: typed.length })
-  expect(input.anyChange.value).toBeTruthy()
+    // Without source node
+    input.reset({ type: 'newNode' })
+    expect(input.code.value).toBe('')
+    expect(input.selection.value).toEqual({ start: 0, end: 0 })
+    expect(input.anyChange.value).toBeFalsy()
+    input.content.value = { text: typed, selection: { start: typed.length, end: typed.length } }
+    expect(input.code.value).toBe(typed)
+    expect(input.selection.value).toEqual({ start: typed.length, end: typed.length })
+    expect(input.anyChange.value).toBeTruthy()
 
-  // With source node
-  input.reset({ type: 'newNode', sourcePort })
-  expect(input.code.value).toBe('operator1.')
-  expect(input.text.value).toBe('')
-  expect(input.selection.value).toEqual({ start: 0, end: 0 })
-  expect(input.anyChange.value).toBeFalsy()
-  input.content.value = { text: typed, selection: { start: typed.length, end: typed.length } }
-  expect(input.code.value).toBe(finalCodeWithSourceNode)
-  expect(input.selection.value).toEqual({
-    start: input.text.value.length,
-    end: input.text.value.length,
+    // With source node
+    input.reset({ type: 'newNode', sourcePort })
+    expect(input.code.value).toBe('operator1.')
+    expect(input.text.value).toBe('')
+    expect(input.selection.value).toEqual({ start: 0, end: 0 })
+    expect(input.anyChange.value).toBeFalsy()
+    input.content.value = { text: typed, selection: { start: typed.length, end: typed.length } }
+    expect(input.code.value).toBe(finalCodeWithSourceNode)
+    expect(input.selection.value).toEqual({
+      start: input.text.value.length,
+      end: input.text.value.length,
+    })
+    expect(input.anyChange.value).toBeTruthy()
   })
-  expect(input.anyChange.value).toBeTruthy()
 })
 
 test('Initialize input for edited node', () => {
-  const input = useComponentBrowserInput(mockGraphDb(), new SuggestionDb(), aiMock)
-  input.reset({ type: 'editNode', node: asNodeId(operator1Id), cursorPos: 4 })
-  expect(input.code.value).toBe('Data.read')
-  expect(input.selection.value).toEqual({ start: 4, end: 4 })
-  expect(input.anyChange.value).toBeFalsy()
-  // Typing anything should not affected existing code (in contrary to new node creation)
-  input.content.value = { text: `Data.+.read`, selection: { start: 5, end: 5 } }
-  expect(input.code.value).toEqual('Data.+.read')
-  expect(input.selection.value).toEqual({ start: 5, end: 5 })
-  expect(input.anyChange.value).toBeTruthy()
+  withSetup(() => {
+    const input = useComponentBrowserInput(mockGraphDb(), new SuggestionDb(), aiMock)
+    input.reset({ type: 'editNode', node: asNodeId(operator1Id), cursorPos: 4 })
+    expect(input.code.value).toBe('Data.read')
+    expect(input.selection.value).toEqual({ start: 4, end: 4 })
+    expect(input.anyChange.value).toBeFalsy()
+    // Typing anything should not affected existing code (in contrary to new node creation)
+    input.content.value = { text: `Data.+.read`, selection: { start: 5, end: 5 } }
+    expect(input.code.value).toEqual('Data.+.read')
+    expect(input.selection.value).toEqual({ start: 5, end: 5 })
+    expect(input.anyChange.value).toBeTruthy()
+  })
 })
diff --git a/app/gui2/src/components/ComponentBrowser/ai.ts b/app/gui2/src/components/ComponentBrowser/ai.ts
index 838bb5f586df..c03d5b8fc4d7 100644
--- a/app/gui2/src/components/ComponentBrowser/ai.ts
+++ b/app/gui2/src/components/ComponentBrowser/ai.ts
@@ -1,9 +1,9 @@
 import { useGraphStore } from '@/stores/graph'
 import type { GraphDb } from '@/stores/graph/graphDatabase'
 import { useProjectStore } from '@/stores/project'
-import type { LanguageServer } from 'shared/languageServer'
-import { Err, Ok, withContext, type Result } from 'shared/util/data/result'
-import type { ExternalId } from 'shared/yjsModel'
+import type { LanguageServer } from 'ydoc-shared/languageServer'
+import { Err, Ok, withContext, type Result } from 'ydoc-shared/util/data/result'
+import type { ExternalId } from 'ydoc-shared/yjsModel'
 
 const AI_GOAL_PLACEHOLDER = '__$$GOAL$$__'
 const AI_STOP_SEQUENCE = '`'
diff --git a/app/gui2/src/components/ComponentBrowser/input.ts b/app/gui2/src/components/ComponentBrowser/input.ts
index 5b6cbbf35dc9..e51d9da2213b 100644
--- a/app/gui2/src/components/ComponentBrowser/input.ts
+++ b/app/gui2/src/components/ComponentBrowser/input.ts
@@ -26,8 +26,8 @@ import {
 } from '@/util/qualifiedName'
 import { useToast } from '@/util/toast'
 import { equalFlat } from 'lib0/array'
-import { sourceRangeKey, type SourceRange } from 'shared/yjsModel'
 import { computed, readonly, ref, type ComputedRef } from 'vue'
+import { sourceRangeKey, type SourceRange } from 'ydoc-shared/yjsModel'
 import { useAI } from './ai'
 
 /** Information how the component browser is used, needed for proper input initializing. */
diff --git a/app/gui2/src/components/ComponentDocumentation.vue b/app/gui2/src/components/ComponentDocumentation.vue
index c729559eb0d9..9a8055a1df63 100644
--- a/app/gui2/src/components/ComponentDocumentation.vue
+++ b/app/gui2/src/components/ComponentDocumentation.vue
@@ -2,9 +2,9 @@
 import DocumentationPanel from '@/components/DocumentationPanel.vue'
 import { injectGraphSelection } from '@/providers/graphSelection'
 import { useGraphStore } from '@/stores/graph'
-import type { SuggestionId } from 'shared/languageServerTypes/suggestions'
-import { Err, Ok, type Result } from 'shared/util/data/result'
 import { ref, watchEffect } from 'vue'
+import type { SuggestionId } from 'ydoc-shared/languageServerTypes/suggestions'
+import { Err, Ok, type Result } from 'ydoc-shared/util/data/result'
 
 const selection = injectGraphSelection()
 const graphStore = useGraphStore()
diff --git a/app/gui2/src/components/DocumentationEditor.vue b/app/gui2/src/components/DocumentationEditor.vue
index 3355bb347e74..788e8889ce88 100644
--- a/app/gui2/src/components/DocumentationEditor.vue
+++ b/app/gui2/src/components/DocumentationEditor.vue
@@ -4,9 +4,9 @@ import { fetcherUrlTransformer } from '@/components/MarkdownEditor/imageUrlTrans
 import { useGraphStore } from '@/stores/graph'
 import { useProjectStore } from '@/stores/project'
 import type { ToValue } from '@/util/reactivity'
-import type { Path } from 'shared/languageServerTypes'
-import { Err, Ok, mapOk, withContext, type Result } from 'shared/util/data/result'
 import { ref, toRef, toValue } from 'vue'
+import type { Path } from 'ydoc-shared/languageServerTypes'
+import { Err, Ok, mapOk, withContext, type Result } from 'ydoc-shared/util/data/result'
 
 const documentation = defineModel<string>({ required: true })
 const _props = defineProps<{}>()
diff --git a/app/gui2/src/components/DocumentationPanel/DocsList.vue b/app/gui2/src/components/DocumentationPanel/DocsList.vue
index e6b838bf54fa..af8e1c26c6c9 100644
--- a/app/gui2/src/components/DocumentationPanel/DocsList.vue
+++ b/app/gui2/src/components/DocumentationPanel/DocsList.vue
@@ -2,8 +2,11 @@
 import type { FunctionDocs, TypeDocs } from '@/components/DocumentationPanel/ir'
 import type { Doc } from '@/util/docParser'
 import { qnSplit } from '@/util/qualifiedName'
-import type { SuggestionEntryArgument, SuggestionId } from 'shared/languageServerTypes/suggestions'
 import { computed } from 'vue'
+import type {
+  SuggestionEntryArgument,
+  SuggestionId,
+} from 'ydoc-shared/languageServerTypes/suggestions'
 
 const props = defineProps<{ items: ListItems }>()
 const emit = defineEmits<{ linkClicked: [id: SuggestionId] }>()
diff --git a/app/gui2/src/components/DocumentationPanel/ir.ts b/app/gui2/src/components/DocumentationPanel/ir.ts
index 0836a1047058..c38f5b9b48c3 100644
--- a/app/gui2/src/components/DocumentationPanel/ir.ts
+++ b/app/gui2/src/components/DocumentationPanel/ir.ts
@@ -3,7 +3,7 @@ import type { SuggestionEntry, SuggestionId } from '@/stores/suggestionDatabase/
 import { SuggestionKind, entryQn } from '@/stores/suggestionDatabase/entry'
 import type { Doc } from '@/util/docParser'
 import type { QualifiedName } from '@/util/qualifiedName'
-import type { SuggestionEntryArgument } from 'shared/languageServerTypes/suggestions'
+import type { SuggestionEntryArgument } from 'ydoc-shared/languageServerTypes/suggestions'
 
 // === Types ===
 
diff --git a/app/gui2/src/components/GraphEditor.vue b/app/gui2/src/components/GraphEditor.vue
index 8b2c691f9907..091a85ab673f 100644
--- a/app/gui2/src/components/GraphEditor.vue
+++ b/app/gui2/src/components/GraphEditor.vue
@@ -58,9 +58,6 @@ import { Vec2 } from '@/util/data/vec2'
 import { computedFallback } from '@/util/reactivity'
 import { until } from '@vueuse/core'
 import { encoding, set } from 'lib0'
-import { encodeMethodPointer } from 'shared/languageServerTypes'
-import * as iterable from 'shared/util/data/iterable'
-import { isDevMode } from 'shared/util/detect'
 import {
   computed,
   onMounted,
@@ -72,6 +69,9 @@ import {
   watch,
   type ComponentInstance,
 } from 'vue'
+import { encodeMethodPointer } from 'ydoc-shared/languageServerTypes'
+import * as iterable from 'ydoc-shared/util/data/iterable'
+import { isDevMode } from 'ydoc-shared/util/detect'
 
 const keyboard = provideKeyboard()
 const projectStore = useProjectStore()
diff --git a/app/gui2/src/components/GraphEditor/GraphNode.vue b/app/gui2/src/components/GraphEditor/GraphNode.vue
index 39655a688051..d871698ef425 100644
--- a/app/gui2/src/components/GraphEditor/GraphNode.vue
+++ b/app/gui2/src/components/GraphEditor/GraphNode.vue
@@ -34,8 +34,8 @@ import { prefixes } from '@/util/ast/node'
 import type { Opt } from '@/util/data/opt'
 import { Rect } from '@/util/data/rect'
 import { Vec2 } from '@/util/data/vec2'
-import type { ExternalId, VisualizationIdentifier } from 'shared/yjsModel'
 import { computed, onUnmounted, ref, shallowRef, watch, watchEffect } from 'vue'
+import type { ExternalId, VisualizationIdentifier } from 'ydoc-shared/yjsModel'
 
 const MAXIMUM_CLICK_LENGTH_MS = 300
 const MAXIMUM_CLICK_DISTANCE_SQ = 50
diff --git a/app/gui2/src/components/GraphEditor/GraphNodeOutputPorts.vue b/app/gui2/src/components/GraphEditor/GraphNodeOutputPorts.vue
index ee530a2d3cec..269369ba6491 100644
--- a/app/gui2/src/components/GraphEditor/GraphNodeOutputPorts.vue
+++ b/app/gui2/src/components/GraphEditor/GraphNodeOutputPorts.vue
@@ -4,7 +4,6 @@ import { useDoubleClick } from '@/composables/doubleClick'
 import { useGraphStore, type NodeId } from '@/stores/graph'
 import { isDef } from '@vueuse/core'
 import { setIfUndefined } from 'lib0/map'
-import type { AstId } from 'shared/ast'
 import {
   computed,
   effectScope,
@@ -14,6 +13,7 @@ import {
   watchEffect,
   type EffectScope,
 } from 'vue'
+import type { AstId } from 'ydoc-shared/ast'
 
 const props = defineProps<{ nodeId: NodeId; forceVisible: boolean }>()
 
diff --git a/app/gui2/src/components/GraphEditor/GraphNodes.vue b/app/gui2/src/components/GraphEditor/GraphNodes.vue
index 8b62b70cdc4e..e3963ba3e555 100644
--- a/app/gui2/src/components/GraphEditor/GraphNodes.vue
+++ b/app/gui2/src/components/GraphEditor/GraphNodes.vue
@@ -12,8 +12,8 @@ import { useProjectStore } from '@/stores/project'
 import type { AstId } from '@/util/ast/abstract'
 import type { Vec2 } from '@/util/data/vec2'
 import { set } from 'lib0'
-import { stackItemsEqual } from 'shared/languageServerTypes'
 import { computed, shallowRef, toRaw } from 'vue'
+import { stackItemsEqual } from 'ydoc-shared/languageServerTypes'
 
 const emit = defineEmits<{
   nodeOutputPortDoubleClick: [portId: AstId]
diff --git a/app/gui2/src/components/GraphEditor/GraphVisualization.vue b/app/gui2/src/components/GraphEditor/GraphVisualization.vue
index f0db89ec99ca..b6da4b1ccc83 100644
--- a/app/gui2/src/components/GraphEditor/GraphVisualization.vue
+++ b/app/gui2/src/components/GraphEditor/GraphVisualization.vue
@@ -23,8 +23,6 @@ import type { URLString } from '@/util/data/urlString'
 import { Vec2 } from '@/util/data/vec2'
 import type { Icon } from '@/util/iconName'
 import { computedAsync } from '@vueuse/core'
-import { isIdentifier } from 'shared/ast'
-import { visIdentifierEquals, type VisualizationIdentifier } from 'shared/yjsModel'
 import {
   computed,
   nextTick,
@@ -36,6 +34,8 @@ import {
   watchEffect,
   type ShallowRef,
 } from 'vue'
+import { isIdentifier } from 'ydoc-shared/ast'
+import { visIdentifierEquals, type VisualizationIdentifier } from 'ydoc-shared/yjsModel'
 
 /** The minimum width must be at least the total width of:
  * - both of toolbars that are always visible (32px + 60px), and
diff --git a/app/gui2/src/components/GraphEditor/__tests__/clipboard.test.ts b/app/gui2/src/components/GraphEditor/__tests__/clipboard.test.ts
index 64e69acdeefe..329e1c46fd4e 100644
--- a/app/gui2/src/components/GraphEditor/__tests__/clipboard.test.ts
+++ b/app/gui2/src/components/GraphEditor/__tests__/clipboard.test.ts
@@ -7,15 +7,11 @@ import {
 } from '@/components/GraphEditor/clipboard'
 import { type Node } from '@/stores/graph'
 import { Ast } from '@/util/ast'
-import { initializePrefixes, nodeFromAst } from '@/util/ast/node'
+import { nodeFromAst } from '@/util/ast/node'
 import { Blob } from 'node:buffer'
-import { initializeFFI } from 'shared/ast/ffi'
-import { assertDefined } from 'shared/util/assert'
-import { type VisualizationMetadata } from 'shared/yjsModel'
 import { expect, test } from 'vitest'
-
-await initializeFFI()
-initializePrefixes()
+import { assertDefined } from 'ydoc-shared/util/assert'
+import { type VisualizationMetadata } from 'ydoc-shared/yjsModel'
 
 test.each([
   {
@@ -74,7 +70,7 @@ const testNodeInputs: {
 const testNodes = testNodeInputs.map(({ code, visualization, colorOverride }) => {
   const root = Ast.Ast.parse(code)
   root.setNodeMetadata({ visualization, colorOverride })
-  const node = nodeFromAst(root)
+  const node = nodeFromAst(root, false)
   assertDefined(node)
   // `nodesToClipboardData` only needs the `NodeDataFromAst` fields of `Node`, because it reads the metadata directly
   // from the AST.
diff --git a/app/gui2/src/components/GraphEditor/__tests__/collapsing.test.ts b/app/gui2/src/components/GraphEditor/__tests__/collapsing.test.ts
index 422541606d8b..ad6adcae040f 100644
--- a/app/gui2/src/components/GraphEditor/__tests__/collapsing.test.ts
+++ b/app/gui2/src/components/GraphEditor/__tests__/collapsing.test.ts
@@ -2,15 +2,10 @@ import { prepareCollapsedInfo } from '@/components/GraphEditor/collapsing'
 import { GraphDb, type NodeId } from '@/stores/graph/graphDatabase'
 import { assert } from '@/util/assert'
 import { Ast, RawAst } from '@/util/ast'
-import { initializePrefixes } from '@/util/ast/node'
 import { unwrap } from '@/util/data/result'
 import { tryIdentifier } from '@/util/qualifiedName'
-import { initializeFFI } from 'shared/ast/ffi'
 import { expect, test } from 'vitest'
 
-await initializeFFI()
-initializePrefixes()
-
 function setupGraphDb(code: string, graphDb: GraphDb) {
   const { root, toRaw, getSpan } = Ast.parseExtended(code)
   const expressions = Array.from(root.statements())
diff --git a/app/gui2/src/components/GraphEditor/clipboard.ts b/app/gui2/src/components/GraphEditor/clipboard.ts
index f277ee0389c6..8c923d27412f 100644
--- a/app/gui2/src/components/GraphEditor/clipboard.ts
+++ b/app/gui2/src/components/GraphEditor/clipboard.ts
@@ -5,8 +5,8 @@ import { Pattern } from '@/util/ast/match'
 import { filterDefined } from '@/util/data/iterable'
 import { Vec2 } from '@/util/data/vec2'
 import type { ToValue } from '@/util/reactivity'
-import type { NodeMetadataFields } from 'shared/ast'
 import { computed, toValue } from 'vue'
+import type { NodeMetadataFields } from 'ydoc-shared/ast'
 
 // MIME type in *vendor tree*; see https://www.rfc-editor.org/rfc/rfc6838#section-3.2
 // The `web ` prefix is required by Chromium:
diff --git a/app/gui2/src/components/GraphEditor/upload.ts b/app/gui2/src/components/GraphEditor/upload.ts
index f470f445968a..f8e616022aca 100644
--- a/app/gui2/src/components/GraphEditor/upload.ts
+++ b/app/gui2/src/components/GraphEditor/upload.ts
@@ -4,12 +4,12 @@ import type { DataServer } from '@/util/net/dataServer'
 import { Keccak, sha3_224 as SHA3 } from '@noble/hashes/sha3'
 import type { Hash } from '@noble/hashes/utils'
 import { bytesToHex } from '@noble/hashes/utils'
-import { escapeTextLiteral } from 'shared/ast'
-import type { LanguageServer } from 'shared/languageServer'
-import { ErrorCode, RemoteRpcError } from 'shared/languageServer'
-import type { Path, StackItem, Uuid } from 'shared/languageServerTypes'
-import { Err, Ok, withContext, type Result } from 'shared/util/data/result'
 import { markRaw, toRaw } from 'vue'
+import { escapeTextLiteral } from 'ydoc-shared/ast/text'
+import type { LanguageServer } from 'ydoc-shared/languageServer'
+import { ErrorCode, RemoteRpcError } from 'ydoc-shared/languageServer'
+import type { Path, StackItem, Uuid } from 'ydoc-shared/languageServerTypes'
+import { Err, Ok, withContext, type Result } from 'ydoc-shared/util/data/result'
 
 // === Constants ===
 
diff --git a/app/gui2/src/components/GraphEditor/widgets/WidgetArgumentName.vue b/app/gui2/src/components/GraphEditor/widgets/WidgetArgumentName.vue
index 4be45f864695..27a17493edaf 100644
--- a/app/gui2/src/components/GraphEditor/widgets/WidgetArgumentName.vue
+++ b/app/gui2/src/components/GraphEditor/widgets/WidgetArgumentName.vue
@@ -4,8 +4,8 @@ import { injectPortInfo } from '@/providers/portInfo'
 import { Score, WidgetInput, defineWidget, widgetProps } from '@/providers/widgetRegistry'
 import { Ast } from '@/util/ast'
 import { ApplicationKind, ArgumentInfoKey, ArgumentPlaceholder } from '@/util/callTree'
-import type { SuggestionEntryArgument } from 'shared/languageServerTypes/suggestions'
 import { computed } from 'vue'
+import type { SuggestionEntryArgument } from 'ydoc-shared/languageServerTypes/suggestions'
 
 const props = defineProps(widgetProps(widgetDefinition))
 
diff --git a/app/gui2/src/components/GraphEditor/widgets/WidgetFileBrowser.vue b/app/gui2/src/components/GraphEditor/widgets/WidgetFileBrowser.vue
index f2ea7beea327..dca99c1d5ca0 100644
--- a/app/gui2/src/components/GraphEditor/widgets/WidgetFileBrowser.vue
+++ b/app/gui2/src/components/GraphEditor/widgets/WidgetFileBrowser.vue
@@ -10,8 +10,8 @@ import type { RequiredImport } from '@/stores/graph/imports'
 import { Ast } from '@/util/ast'
 import { Pattern } from '@/util/ast/match'
 import { ArgumentInfoKey } from '@/util/callTree'
-import { TextLiteral } from 'shared/ast'
 import { computed } from 'vue'
+import { TextLiteral } from 'ydoc-shared/ast'
 
 const props = defineProps(widgetProps(widgetDefinition))
 const graph = useGraphStore()
diff --git a/app/gui2/src/components/GraphEditor/widgets/WidgetFunction.vue b/app/gui2/src/components/GraphEditor/widgets/WidgetFunction.vue
index 022b29834f53..5c2181e845f9 100644
--- a/app/gui2/src/components/GraphEditor/widgets/WidgetFunction.vue
+++ b/app/gui2/src/components/GraphEditor/widgets/WidgetFunction.vue
@@ -25,8 +25,8 @@ import {
 } from '@/util/callTree'
 import { partitionPoint } from '@/util/data/array'
 import { isIdentifier } from '@/util/qualifiedName.ts'
-import { methodPointerEquals, type MethodPointer } from 'shared/languageServerTypes'
 import { computed, proxyRefs } from 'vue'
+import { methodPointerEquals, type MethodPointer } from 'ydoc-shared/languageServerTypes'
 
 const props = defineProps(widgetProps(widgetDefinition))
 const graph = useGraphStore()
diff --git a/app/gui2/src/components/GraphEditor/widgets/WidgetFunction/__tests__/widgetFunctionCallInfo.test.ts b/app/gui2/src/components/GraphEditor/widgets/WidgetFunction/__tests__/widgetFunctionCallInfo.test.ts
index b6eda7638042..1d9c71ded6b8 100644
--- a/app/gui2/src/components/GraphEditor/widgets/WidgetFunction/__tests__/widgetFunctionCallInfo.test.ts
+++ b/app/gui2/src/components/GraphEditor/widgets/WidgetFunction/__tests__/widgetFunctionCallInfo.test.ts
@@ -9,9 +9,9 @@ import {
   makeStaticMethod,
 } from '@/stores/suggestionDatabase/entry'
 import { assert } from '@/util/assert'
-import type { Opt } from 'shared/util/data/opt'
 import { expect, test } from 'vitest'
 import { ref, type Ref } from 'vue'
+import type { Opt } from 'ydoc-shared/util/data/opt'
 import {
   GET_WIDGETS_METHOD,
   WIDGETS_ENSO_MODULE,
diff --git a/app/gui2/src/components/GraphEditor/widgets/WidgetFunction/widgetFunctionCallInfo.ts b/app/gui2/src/components/GraphEditor/widgets/WidgetFunction/widgetFunctionCallInfo.ts
index d93aba828303..f51f9b66e0af 100644
--- a/app/gui2/src/components/GraphEditor/widgets/WidgetFunction/widgetFunctionCallInfo.ts
+++ b/app/gui2/src/components/GraphEditor/widgets/WidgetFunction/widgetFunctionCallInfo.ts
@@ -17,9 +17,9 @@ import {
 } from '@/util/callTree'
 import type { Result } from '@/util/data/result'
 import type { ToValue } from '@/util/reactivity'
-import type { Opt } from 'shared/util/data/opt'
-import type { ExternalId } from 'shared/yjsModel'
 import { computed, toValue, type Ref } from 'vue'
+import type { Opt } from 'ydoc-shared/util/data/opt'
+import type { ExternalId } from 'ydoc-shared/yjsModel'
 
 export const WIDGETS_ENSO_MODULE = 'Standard.Visualization.Widgets'
 export const GET_WIDGETS_METHOD = 'get_widget_json'
diff --git a/app/gui2/src/components/GraphEditor/widgets/WidgetFunctionName.vue b/app/gui2/src/components/GraphEditor/widgets/WidgetFunctionName.vue
index 75910cc56fd8..8cd359343c4b 100644
--- a/app/gui2/src/components/GraphEditor/widgets/WidgetFunctionName.vue
+++ b/app/gui2/src/components/GraphEditor/widgets/WidgetFunctionName.vue
@@ -5,9 +5,9 @@ import { useProjectStore } from '@/stores/project'
 import { Ast } from '@/util/ast'
 import { Err, Ok, type Result } from '@/util/data/result'
 import { useToast } from '@/util/toast'
-import { PropertyAccess } from 'shared/ast'
-import type { ExpressionId } from 'shared/languageServerTypes'
 import { computed, ref, watchEffect } from 'vue'
+import { PropertyAccess } from 'ydoc-shared/ast'
+import type { ExpressionId } from 'ydoc-shared/languageServerTypes'
 import NodeWidget from '../NodeWidget.vue'
 
 const props = defineProps(widgetProps(widgetDefinition))
diff --git a/app/gui2/src/components/GraphEditor/widgets/WidgetPort.vue b/app/gui2/src/components/GraphEditor/widgets/WidgetPort.vue
index c6a619afe0c8..0a9f6f1ed6b9 100644
--- a/app/gui2/src/components/GraphEditor/widgets/WidgetPort.vue
+++ b/app/gui2/src/components/GraphEditor/widgets/WidgetPort.vue
@@ -14,7 +14,6 @@ import { Ast } from '@/util/ast'
 import { ArgumentInfoKey } from '@/util/callTree'
 import { Rect } from '@/util/data/rect'
 import { cachedGetter } from '@/util/reactivity'
-import { isUuid } from 'shared/yjsModel'
 import {
   computed,
   nextTick,
@@ -26,6 +25,7 @@ import {
   watch,
   watchEffect,
 } from 'vue'
+import { isUuid } from 'ydoc-shared/yjsModel'
 
 const props = defineProps(widgetProps(widgetDefinition))
 
diff --git a/app/gui2/src/components/GraphEditor/widgets/WidgetSelectionArrow.vue b/app/gui2/src/components/GraphEditor/widgets/WidgetSelectionArrow.vue
index 1f7f175362d2..97a8afce4b63 100644
--- a/app/gui2/src/components/GraphEditor/widgets/WidgetSelectionArrow.vue
+++ b/app/gui2/src/components/GraphEditor/widgets/WidgetSelectionArrow.vue
@@ -3,8 +3,8 @@ import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
 import { injectSelectionArrow } from '@/providers/selectionArrow'
 import { Score, WidgetInput, defineWidget, widgetProps } from '@/providers/widgetRegistry'
 import { Ast } from '@/util/ast'
-import { assert } from 'shared/util/assert'
 import { computed, onMounted, onUnmounted, ref } from 'vue'
+import { assert } from 'ydoc-shared/util/assert'
 import { ArgumentNameShownKey } from './WidgetArgumentName.vue'
 
 const props = defineProps(widgetProps(widgetDefinition))
diff --git a/app/gui2/src/components/GraphEditor/widgets/WidgetVector.vue b/app/gui2/src/components/GraphEditor/widgets/WidgetVector.vue
index 4282f5d2f932..6a77bf335228 100644
--- a/app/gui2/src/components/GraphEditor/widgets/WidgetVector.vue
+++ b/app/gui2/src/components/GraphEditor/widgets/WidgetVector.vue
@@ -6,8 +6,8 @@ import type { PortId } from '@/providers/portInfo'
 import { Score, WidgetInput, defineWidget, widgetProps } from '@/providers/widgetRegistry'
 import { WidgetEditHandler } from '@/providers/widgetRegistry/editHandler'
 import { Ast } from '@/util/ast'
-import { isAstId } from 'shared/ast'
 import { computed, shallowRef, toRef, toValue, watchEffect, type WatchSource } from 'vue'
+import { isAstId } from 'ydoc-shared/ast'
 
 const props = defineProps(widgetProps(widgetDefinition))
 
diff --git a/app/gui2/src/components/MarkdownEditor/ImagePlugin/LexicalImage.vue b/app/gui2/src/components/MarkdownEditor/ImagePlugin/LexicalImage.vue
index 2123ca5a382c..299c6211368b 100644
--- a/app/gui2/src/components/MarkdownEditor/ImagePlugin/LexicalImage.vue
+++ b/app/gui2/src/components/MarkdownEditor/ImagePlugin/LexicalImage.vue
@@ -4,8 +4,8 @@ import {
   type TransformUrlResult,
 } from '@/components/MarkdownEditor/imageUrlTransformer'
 import { computedAsync } from '@vueuse/core'
-import { Ok } from 'shared/util/data/result'
 import { computed, onUnmounted, type Ref } from 'vue'
+import { Ok } from 'ydoc-shared/util/data/result'
 
 const DEFAULT_ALT_TEXT = 'Image'
 
diff --git a/app/gui2/src/components/MarkdownEditor/ImagePlugin/imageNode.ts b/app/gui2/src/components/MarkdownEditor/ImagePlugin/imageNode.ts
index 9fa4ba532f4f..5830d7736230 100644
--- a/app/gui2/src/components/MarkdownEditor/ImagePlugin/imageNode.ts
+++ b/app/gui2/src/components/MarkdownEditor/ImagePlugin/imageNode.ts
@@ -43,15 +43,15 @@ export class ImageNode extends DecoratorNode<Component> {
   __src: string
   __altText: string
 
-  static getType(): string {
+  static override getType(): string {
     return 'image'
   }
 
-  static clone(node: ImageNode): ImageNode {
+  static override clone(node: ImageNode): ImageNode {
     return new ImageNode(node.__src, node.__altText, node.__key)
   }
 
-  static importJSON(serializedNode: SerializedImageNode): ImageNode {
+  static override importJSON(serializedNode: SerializedImageNode): ImageNode {
     const { altText, src } = serializedNode
     return $createImageNode({
       altText,
@@ -59,7 +59,7 @@ export class ImageNode extends DecoratorNode<Component> {
     })
   }
 
-  static importDOM(): DOMConversionMap | null {
+  static override importDOM(): DOMConversionMap | null {
     return {
       img: (_node: Node) => ({
         conversion: $convertImageElement,
@@ -74,14 +74,14 @@ export class ImageNode extends DecoratorNode<Component> {
     this.__altText = altText
   }
 
-  exportDOM(): DOMExportOutput {
+  override exportDOM(): DOMExportOutput {
     const element = document.createElement('img')
     element.setAttribute('src', this.__src)
     element.setAttribute('alt', this.__altText)
     return { element }
   }
 
-  exportJSON(): SerializedImageNode {
+  override exportJSON(): SerializedImageNode {
     return {
       altText: this.getAltText(),
       src: this.getSrc(),
@@ -113,7 +113,7 @@ export class ImageNode extends DecoratorNode<Component> {
 
   // View
 
-  createDOM(config: EditorConfig): HTMLElement {
+  override createDOM(config: EditorConfig): HTMLElement {
     const span = document.createElement('span')
     const className = config.theme.image
     if (className !== undefined) {
@@ -122,7 +122,7 @@ export class ImageNode extends DecoratorNode<Component> {
     return span
   }
 
-  updateDOM(_prevNode: ImageNode, dom: HTMLElement, config: EditorConfig): false {
+  override updateDOM(_prevNode: ImageNode, dom: HTMLElement, config: EditorConfig): false {
     const className = config.theme.image
     if (className !== undefined) {
       dom.className = className
@@ -130,7 +130,7 @@ export class ImageNode extends DecoratorNode<Component> {
     return false
   }
 
-  decorate(): Component {
+  override decorate(): Component {
     return h(LexicalImage, {
       src: this.__src,
       alt: this.__altText,
diff --git a/app/gui2/src/components/MarkdownEditor/ImagePlugin/index.ts b/app/gui2/src/components/MarkdownEditor/ImagePlugin/index.ts
index 0f2be112c38b..be18cff854d2 100644
--- a/app/gui2/src/components/MarkdownEditor/ImagePlugin/index.ts
+++ b/app/gui2/src/components/MarkdownEditor/ImagePlugin/index.ts
@@ -6,7 +6,7 @@ import {
 import type { LexicalMarkdownPlugin } from '@/components/MarkdownEditor/markdown'
 import type { TextMatchTransformer } from '@lexical/markdown'
 import type { LexicalEditor } from 'lexical'
-import { assertDefined } from 'shared/util/assert'
+import { assertDefined } from 'ydoc-shared/util/assert'
 
 export const IMAGE: TextMatchTransformer = {
   dependencies: [ImageNode],
diff --git a/app/gui2/src/components/MarkdownEditor/imageUrlTransformer.ts b/app/gui2/src/components/MarkdownEditor/imageUrlTransformer.ts
index 15714b548f1b..fee1e6e36c47 100644
--- a/app/gui2/src/components/MarkdownEditor/imageUrlTransformer.ts
+++ b/app/gui2/src/components/MarkdownEditor/imageUrlTransformer.ts
@@ -1,7 +1,7 @@
 import { createContextStore } from '@/providers'
 import type { ToValue } from '@/util/reactivity'
-import { mapOk, Ok, type Result } from 'shared/util/data/result'
 import { toValue } from 'vue'
+import { mapOk, Ok, type Result } from 'ydoc-shared/util/data/result'
 
 export type TransformUrlResult = Result<{ url: string; dispose?: () => void }>
 export type UrlTransformer = (url: string) => Promise<TransformUrlResult>
diff --git a/app/gui2/src/components/VisualizationSelector.vue b/app/gui2/src/components/VisualizationSelector.vue
index 4aaed6b0a76b..3a11f32d465c 100644
--- a/app/gui2/src/components/VisualizationSelector.vue
+++ b/app/gui2/src/components/VisualizationSelector.vue
@@ -2,8 +2,8 @@
 import SvgIcon from '@/components/SvgIcon.vue'
 import { useVisualizationStore } from '@/stores/visualization'
 import { useAutoBlur } from '@/util/autoBlur'
-import { visIdentifierEquals, type VisualizationIdentifier } from 'shared/yjsModel'
 import { onMounted, ref } from 'vue'
+import { visIdentifierEquals, type VisualizationIdentifier } from 'ydoc-shared/yjsModel'
 
 const props = defineProps<{
   types: Iterable<VisualizationIdentifier>
diff --git a/app/gui2/src/components/lexical/LinkPlugin/autoMatcher.ts b/app/gui2/src/components/lexical/LinkPlugin/autoMatcher.ts
index f6cbffa6e03f..448dde192610 100644
--- a/app/gui2/src/components/lexical/LinkPlugin/autoMatcher.ts
+++ b/app/gui2/src/components/lexical/LinkPlugin/autoMatcher.ts
@@ -22,7 +22,7 @@ import {
   COMMAND_PRIORITY_LOW,
   TextNode,
 } from 'lexical'
-import { assert } from 'shared/util/assert'
+import { assert } from 'ydoc-shared/util/assert'
 
 type ChangeHandler = (url: string | null, prevUrl: string | null) => void
 
diff --git a/app/gui2/src/components/lexical/index.ts b/app/gui2/src/components/lexical/index.ts
index 45c71eccf45f..f1ececb0016f 100644
--- a/app/gui2/src/components/lexical/index.ts
+++ b/app/gui2/src/components/lexical/index.ts
@@ -7,8 +7,8 @@ import type {
   LexicalNodeReplacement,
 } from 'lexical'
 import { createEditor } from 'lexical'
-import { assertDefined } from 'shared/util/assert'
 import { markRaw, onMounted, type Ref } from 'vue'
+import { assertDefined } from 'ydoc-shared/util/assert'
 
 type NodeDefinition = KlassConstructor<typeof LexicalNode> | LexicalNodeReplacement
 
diff --git a/app/gui2/src/components/widgets/ListWidget.vue b/app/gui2/src/components/widgets/ListWidget.vue
index 2efb04d02784..f521eaec3ed2 100644
--- a/app/gui2/src/components/widgets/ListWidget.vue
+++ b/app/gui2/src/components/widgets/ListWidget.vue
@@ -6,7 +6,7 @@ import { useAppClass } from '@/providers/appClass'
 import { Range } from '@/util/data/range'
 import { Vec2 } from '@/util/data/vec2'
 import { uuidv4 } from 'lib0/random'
-import { computed, nextTick, ref, shallowReactive, watchEffect, watchPostEffect } from 'vue'
+import { computed, ref, shallowReactive, watchEffect, watchPostEffect } from 'vue'
 </script>
 
 <script setup lang="ts" generic="T">
diff --git a/app/gui2/src/components/widgets/NumericInputWidget.vue b/app/gui2/src/components/widgets/NumericInputWidget.vue
index ae01ef15ad19..82abc9cac432 100644
--- a/app/gui2/src/components/widgets/NumericInputWidget.vue
+++ b/app/gui2/src/components/widgets/NumericInputWidget.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { usePointer } from '@/composables/events'
-import { isNumericLiteral } from 'shared/ast/tree'
 import { computed, ref, watch, type CSSProperties, type ComponentInstance } from 'vue'
+import { isNumericLiteral } from 'ydoc-shared/ast/tree'
 import AutoSizedInput from './AutoSizedInput.vue'
 
 const props = defineProps<{
diff --git a/app/gui2/src/composables/__tests__/navigator.test.ts b/app/gui2/src/composables/__tests__/navigator.test.ts
index 262a02352809..83d9332b6bbc 100644
--- a/app/gui2/src/composables/__tests__/navigator.test.ts
+++ b/app/gui2/src/composables/__tests__/navigator.test.ts
@@ -1,25 +1,20 @@
 import { useNavigator } from '@/composables/navigator'
 import { Rect } from '@/util/data/rect'
 import { Vec2 } from '@/util/data/vec2'
-import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
-import { effectScope, ref } from 'vue'
+import { withSetup } from '@/util/testing'
+import { describe, expect, test, vi } from 'vitest'
+import { ref } from 'vue'
 import { useKeyboard } from '../keyboard'
 
 describe('useNavigator', async () => {
-  let scope = effectScope()
-  beforeEach(() => {
-    scope = effectScope()
-  })
-  afterEach(() => scope.stop())
-
   function makeTestNavigator() {
-    return scope.run(() => {
+    return withSetup(() => {
       const node = document.createElement('div')
       vi.spyOn(node, 'getBoundingClientRect').mockReturnValue(new DOMRect(150, 150, 800, 400))
       const viewportNode = ref(node)
       const keyboard = useKeyboard()
       return useNavigator(viewportNode, keyboard)
-    })!
+    })[0]!
   }
 
   test('initializes with centered non-zoomed viewport', () => {
diff --git a/app/gui2/src/composables/__tests__/nodeCreation.test.ts b/app/gui2/src/composables/__tests__/nodeCreation.test.ts
index d990b06b228a..4cb6de4281d1 100644
--- a/app/gui2/src/composables/__tests__/nodeCreation.test.ts
+++ b/app/gui2/src/composables/__tests__/nodeCreation.test.ts
@@ -1,10 +1,7 @@
 import { insertNodeStatements } from '@/composables/nodeCreation'
 import { Ast } from '@/util/ast'
-import { identifier } from 'shared/ast'
-import { initializeFFI } from 'shared/ast/ffi'
 import { expect, test } from 'vitest'
-
-await initializeFFI()
+import { identifier } from 'ydoc-shared/ast'
 
 test.each([
   ['node1 = 123', '*'],
diff --git a/app/gui2/src/composables/animation.ts b/app/gui2/src/composables/animation.ts
index e89c6429d15c..8d00c0b85cc7 100644
--- a/app/gui2/src/composables/animation.ts
+++ b/app/gui2/src/composables/animation.ts
@@ -63,6 +63,7 @@ export function useRaf(
     },
     { immediate: true },
   )
+  console.log('onScopeDispose(unmountRaf)?')
   onScopeDispose(unmountRaf)
 }
 
diff --git a/app/gui2/src/composables/astDocumentation.ts b/app/gui2/src/composables/astDocumentation.ts
index d1da6206f2a0..02a392cb9e54 100644
--- a/app/gui2/src/composables/astDocumentation.ts
+++ b/app/gui2/src/composables/astDocumentation.ts
@@ -1,7 +1,7 @@
 import { type GraphStore } from '@/stores/graph'
 import { type ToValue } from '@/util/reactivity'
-import type { Ast } from 'shared/ast'
 import { computed, toValue } from 'vue'
+import type { Ast } from 'ydoc-shared/ast'
 
 export function useAstDocumentation(graphStore: GraphStore, ast: ToValue<Ast | undefined>) {
   return {
diff --git a/app/gui2/src/composables/nodeCreation.ts b/app/gui2/src/composables/nodeCreation.ts
index 3cc7f720662d..3104881a2b2d 100644
--- a/app/gui2/src/composables/nodeCreation.ts
+++ b/app/gui2/src/composables/nodeCreation.ts
@@ -17,9 +17,9 @@ import { Rect } from '@/util/data/rect'
 import { Vec2 } from '@/util/data/vec2'
 import { qnLastSegment, tryQualifiedName } from '@/util/qualifiedName'
 import type { ToValue } from '@/util/reactivity'
-import { assert, assertNever } from 'shared/util/assert'
-import { mustExtend } from 'shared/util/types'
 import { toValue } from 'vue'
+import { assert, assertNever } from 'ydoc-shared/util/assert'
+import { mustExtend } from 'ydoc-shared/util/types'
 
 export type NodeCreation = ReturnType<typeof useNodeCreation>
 
diff --git a/app/gui2/src/composables/selection.ts b/app/gui2/src/composables/selection.ts
index 4dd8271eea1d..5bfe4117ea65 100644
--- a/app/gui2/src/composables/selection.ts
+++ b/app/gui2/src/composables/selection.ts
@@ -9,8 +9,8 @@ import { intersectionSize } from '@/util/data/set'
 import type { Vec2 } from '@/util/data/vec2'
 import { dataAttribute, elementHierarchy } from '@/util/dom'
 import * as set from 'lib0/set'
-import { Err, Ok, type Result } from 'shared/util/data/result'
 import { computed, ref, shallowReactive, shallowRef } from 'vue'
+import { Err, Ok, type Result } from 'ydoc-shared/util/data/result'
 
 interface BaseSelectionOptions<T> {
   margin?: number
diff --git a/app/gui2/src/composables/stackNavigator.ts b/app/gui2/src/composables/stackNavigator.ts
index 6a0caf395166..2b8f9db7a6b4 100644
--- a/app/gui2/src/composables/stackNavigator.ts
+++ b/app/gui2/src/composables/stackNavigator.ts
@@ -2,8 +2,8 @@ import type { BreadcrumbItem } from '@/components/NavBreadcrumbs.vue'
 import { type GraphStore, type NodeId } from '@/stores/graph'
 import { type ProjectStore } from '@/stores/project'
 import { qnLastSegment, tryQualifiedName } from '@/util/qualifiedName'
-import { methodPointerEquals, type StackItem } from 'shared/languageServerTypes'
 import { computed, onMounted, ref } from 'vue'
+import { methodPointerEquals, type StackItem } from 'ydoc-shared/languageServerTypes'
 
 export function useStackNavigator(projectStore: ProjectStore, graphStore: GraphStore) {
   const breadcrumbs = ref<StackItem[]>([])
diff --git a/app/gui2/src/composables/syncLocalStorage.ts b/app/gui2/src/composables/syncLocalStorage.ts
index 2f228e6eb1ad..ff32011a0133 100644
--- a/app/gui2/src/composables/syncLocalStorage.ts
+++ b/app/gui2/src/composables/syncLocalStorage.ts
@@ -1,9 +1,9 @@
 import { useAbortScope } from '@/util/net'
 import { debouncedWatch, useLocalStorage } from '@vueuse/core'
 import { encoding } from 'lib0'
-import { xxHash128 } from 'shared/ast/ffi'
-import { AbortScope } from 'shared/util/net'
 import { computed, getCurrentInstance, ref, watch, withCtx } from 'vue'
+import { xxHash128 } from 'ydoc-shared/ast/ffi'
+import { AbortScope } from 'ydoc-shared/util/net'
 
 export interface SyncLocalStorageOptions<StoredState> {
   /**
diff --git a/app/gui2/src/e2e-entrypoint.ts b/app/gui2/src/e2e-entrypoint.ts
index 4694ed87548b..2d07b64cb2a6 100644
--- a/app/gui2/src/e2e-entrypoint.ts
+++ b/app/gui2/src/e2e-entrypoint.ts
@@ -5,14 +5,14 @@
  */
 
 import { MockYdocProvider } from '@/util/crdt'
-import { MockTransport, MockWebSocket } from '@/util/net'
+import { MockWebSocket, MockWebSocketTransport } from '@/util/net'
 import { mockDataHandler, mockLSHandler, mockYdocProvider } from '../mock/engine'
 
 import 'enso-dashboard/src/tailwind.css'
 import { createApp } from 'vue'
 import { AsyncApp } from './asyncApp'
 
-MockTransport.addMock('engine', mockLSHandler)
+MockWebSocketTransport.addMock('engine', mockLSHandler)
 MockWebSocket.addMock('data', mockDataHandler)
 MockYdocProvider.addMock('engine', mockYdocProvider)
 
diff --git a/app/gui2/src/entrypoint.ts b/app/gui2/src/entrypoint.ts
index 00ded7e25878..f233b3464cb1 100644
--- a/app/gui2/src/entrypoint.ts
+++ b/app/gui2/src/entrypoint.ts
@@ -5,7 +5,6 @@ import { isOnLinux } from 'enso-common/src/detect'
 import * as commonQuery from 'enso-common/src/queryClient'
 import * as dashboard from 'enso-dashboard'
 import 'enso-dashboard/src/tailwind.css'
-import { isDevMode } from 'shared/util/detect'
 import { lazyVueInReact } from 'veaury'
 import { type App } from 'vue'
 
@@ -14,6 +13,7 @@ import { AsyncApp } from './asyncApp'
 
 const INITIAL_URL_KEY = `Enso-initial-url`
 const SCAM_WARNING_TIMEOUT = 1000
+export const isDevMode = process.env.NODE_ENV === 'development'
 
 function printScamWarning() {
   if (isDevMode) return
diff --git a/app/gui2/src/providers/__tests__/widgetRegistry.test.ts b/app/gui2/src/providers/__tests__/widgetRegistry.test.ts
index 906ec6481120..ea5db7ffa22e 100644
--- a/app/gui2/src/providers/__tests__/widgetRegistry.test.ts
+++ b/app/gui2/src/providers/__tests__/widgetRegistry.test.ts
@@ -9,14 +9,11 @@ import {
 import { GraphDb } from '@/stores/graph/graphDatabase'
 import { Ast } from '@/util/ast'
 import { ApplicationKind, ArgumentInfoKey } from '@/util/callTree'
-import { initializeFFI } from 'shared/ast/ffi'
 import { describe, expect, test } from 'vitest'
 import { defineComponent } from 'vue'
 import type { PortId } from '../portInfo'
 import { DisplayMode, argsWidgetConfigurationSchema } from '../widgetRegistry/configuration'
 
-await initializeFFI()
-
 describe('WidgetRegistry', () => {
   function makeMockWidget<T extends WidgetInput>(
     name: string,
diff --git a/app/gui2/src/providers/graphSelection.ts b/app/gui2/src/providers/graphSelection.ts
index 99628268d9c1..2d672d7b5312 100644
--- a/app/gui2/src/providers/graphSelection.ts
+++ b/app/gui2/src/providers/graphSelection.ts
@@ -3,8 +3,8 @@ import { useGraphHover, useSelection, type SelectionOptions } from '@/composable
 import { createContextStore } from '@/providers'
 import { type NodeId } from '@/stores/graph'
 import type { Rect } from '@/util/data/rect'
-import type { ExternalId } from 'shared/yjsModel'
 import { proxyRefs } from 'vue'
+import type { ExternalId } from 'ydoc-shared/yjsModel'
 
 const SELECTION_BRUSH_MARGIN_PX = 6
 
diff --git a/app/gui2/src/providers/visualizationConfig.ts b/app/gui2/src/providers/visualizationConfig.ts
index 7db212abe7cd..ca4d550a2ca3 100644
--- a/app/gui2/src/providers/visualizationConfig.ts
+++ b/app/gui2/src/providers/visualizationConfig.ts
@@ -3,8 +3,8 @@ import { createContextStore } from '@/providers'
 import type { URLString } from '@/util/data/urlString'
 import { Vec2 } from '@/util/data/vec2'
 import type { Icon } from '@/util/iconName'
-import type { VisualizationIdentifier } from 'shared/yjsModel'
 import { reactive } from 'vue'
+import type { VisualizationIdentifier } from 'ydoc-shared/yjsModel'
 
 export interface VisualizationConfig {
   background?: string
diff --git a/app/gui2/src/providers/widgetRegistry.ts b/app/gui2/src/providers/widgetRegistry.ts
index 88d8fd1e53ed..1553470da3f3 100644
--- a/app/gui2/src/providers/widgetRegistry.ts
+++ b/app/gui2/src/providers/widgetRegistry.ts
@@ -4,8 +4,8 @@ import type { WidgetConfiguration } from '@/providers/widgetRegistry/configurati
 import type { GraphDb } from '@/stores/graph/graphDatabase'
 import type { Typename } from '@/stores/suggestionDatabase/entry'
 import { Ast } from '@/util/ast'
-import { MutableModule } from '@/util/ast/abstract.ts'
-import type { ViteHotContext } from 'vite/types/hot'
+import { MutableModule } from '@/util/ast/abstract'
+import { ViteHotContext } from 'vite/types/hot.js'
 import { computed, shallowReactive, type Component, type PropType } from 'vue'
 import type { WidgetEditHandlerParent } from './widgetRegistry/editHandler'
 
diff --git a/app/gui2/src/providers/widgetRegistry/__tests__/editHandler.test.ts b/app/gui2/src/providers/widgetRegistry/__tests__/editHandler.test.ts
index accc3ad01244..47a406e04853 100644
--- a/app/gui2/src/providers/widgetRegistry/__tests__/editHandler.test.ts
+++ b/app/gui2/src/providers/widgetRegistry/__tests__/editHandler.test.ts
@@ -2,9 +2,9 @@ import type { GraphNavigator } from '@/providers/graphNavigator'
 import { InteractionHandler } from '@/providers/interactionHandler'
 import type { PortId } from '@/providers/portInfo'
 import { useCurrentEdit, type CurrentEdit } from '@/providers/widgetTree'
-import { assert } from 'shared/util/assert'
 import { expect, test, vi, type Mock } from 'vitest'
 import { proxyRefs } from 'vue'
+import { assert } from 'ydoc-shared/util/assert'
 import { WidgetEditHandler, type WidgetEditHooks } from '../editHandler'
 
 // If widget's name is a prefix of another widget's name, then it is its ancestor.
diff --git a/app/gui2/src/providers/widgetRegistry/editHandler.ts b/app/gui2/src/providers/widgetRegistry/editHandler.ts
index 7a063cfdbe93..c313b35b9281 100644
--- a/app/gui2/src/providers/widgetRegistry/editHandler.ts
+++ b/app/gui2/src/providers/widgetRegistry/editHandler.ts
@@ -6,8 +6,8 @@ import type { WidgetInput } from '@/providers/widgetRegistry'
 import { injectWidgetTree, type CurrentEdit } from '@/providers/widgetTree'
 import type { Ast } from '@/util/ast'
 import { ArgumentInfoKey } from '@/util/callTree'
-import { assertDefined } from 'shared/util/assert'
 import { computed, markRaw, onBeforeUnmount, shallowRef, type ShallowRef } from 'vue'
+import { assertDefined } from 'ydoc-shared/util/assert'
 
 declare const brandWidgetId: unique symbol
 /** Uniquely identifies a widget type. */
@@ -162,15 +162,15 @@ export class WidgetEditHandlerRoot extends WidgetEditHandlerParent implements In
     this.onEnd()
   }
 
-  pointerdown(event: PointerEvent, navigator: GraphNavigator) {
+  override pointerdown(event: PointerEvent, navigator: GraphNavigator) {
     return super.pointerdown(event, navigator)
   }
 
-  protected root() {
+  protected override root() {
     return this
   }
 
-  isActive() {
+  override isActive() {
     return this.interactionHandler.isActive(this)
   }
 
diff --git a/app/gui2/src/stores/awareness.ts b/app/gui2/src/stores/awareness.ts
index 6fb4c401172b..6bd06d9f4f98 100644
--- a/app/gui2/src/stores/awareness.ts
+++ b/app/gui2/src/stores/awareness.ts
@@ -1,7 +1,7 @@
 import { Vec2 } from '@/util/data/vec2'
-import type { StackItem } from 'shared/languageServerTypes'
 import { reactive } from 'vue'
 import { Awareness as YjsAwareness } from 'y-protocols/awareness'
+import type { StackItem } from 'ydoc-shared/languageServerTypes'
 import * as Y from 'yjs'
 
 // === Public types ===
diff --git a/app/gui2/src/stores/graph/__tests__/graphDatabase.test.ts b/app/gui2/src/stores/graph/__tests__/graphDatabase.test.ts
index 84a181a637a9..6ac103488578 100644
--- a/app/gui2/src/stores/graph/__tests__/graphDatabase.test.ts
+++ b/app/gui2/src/stores/graph/__tests__/graphDatabase.test.ts
@@ -1,14 +1,9 @@
 import { asNodeId, GraphDb } from '@/stores/graph/graphDatabase'
 import { Ast, RawAst } from '@/util/ast'
-import { initializePrefixes } from '@/util/ast/node'
 import assert from 'assert'
-import type { AstId } from 'shared/ast'
-import { initializeFFI } from 'shared/ast/ffi'
-import { IdMap, type ExternalId, type SourceRange } from 'shared/yjsModel'
 import { expect, test } from 'vitest'
-
-await initializeFFI()
-initializePrefixes()
+import type { AstId } from 'ydoc-shared/ast'
+import { IdMap, type ExternalId, type SourceRange } from 'ydoc-shared/yjsModel'
 
 export function parseWithSpans<T extends Record<string, SourceRange>>(code: string, spans: T) {
   const nameToEid = new Map<keyof T, ExternalId>()
diff --git a/app/gui2/src/stores/graph/__tests__/imports.test.ts b/app/gui2/src/stores/graph/__tests__/imports.test.ts
index d9f309d4abb0..c7f83afa5e10 100644
--- a/app/gui2/src/stores/graph/__tests__/imports.test.ts
+++ b/app/gui2/src/stores/graph/__tests__/imports.test.ts
@@ -20,11 +20,8 @@ import {
 import { Ast } from '@/util/ast'
 import { unwrap } from '@/util/data/result'
 import { tryIdentifier, tryQualifiedName } from '@/util/qualifiedName'
-import { initializeFFI } from 'shared/ast/ffi'
 import { expect, test } from 'vitest'
 
-await initializeFFI()
-
 test.each([
   {
     description: 'Direct import of a module',
diff --git a/app/gui2/src/stores/graph/graphDatabase.ts b/app/gui2/src/stores/graph/graphDatabase.ts
index b82b21decab3..0e4503281d86 100644
--- a/app/gui2/src/stores/graph/graphDatabase.ts
+++ b/app/gui2/src/stores/graph/graphDatabase.ts
@@ -14,11 +14,15 @@ import { Vec2 } from '@/util/data/vec2'
 import { ReactiveDb, ReactiveIndex, ReactiveMapping } from '@/util/database/reactiveDb'
 import { syncSet } from '@/util/reactivity'
 import * as set from 'lib0/set'
-import { methodPointerEquals, type MethodCall, type StackItem } from 'shared/languageServerTypes'
-import type { Opt } from 'shared/util/data/opt'
-import type { ExternalId, SourceRange, VisualizationMetadata } from 'shared/yjsModel'
-import { isUuid, sourceRangeKey, visMetadataEquals } from 'shared/yjsModel'
 import { reactive, ref, type Ref } from 'vue'
+import {
+  methodPointerEquals,
+  type MethodCall,
+  type StackItem,
+} from 'ydoc-shared/languageServerTypes'
+import type { Opt } from 'ydoc-shared/util/data/opt'
+import type { ExternalId, SourceRange, VisualizationMetadata } from 'ydoc-shared/yjsModel'
+import { isUuid, sourceRangeKey, visMetadataEquals } from 'ydoc-shared/yjsModel'
 
 export interface MethodCallInfo {
   methodCall: MethodCall
diff --git a/app/gui2/src/stores/graph/index.ts b/app/gui2/src/stores/graph/index.ts
index fae15b2dc4f8..07d7e84b402b 100644
--- a/app/gui2/src/stores/graph/index.ts
+++ b/app/gui2/src/stores/graph/index.ts
@@ -28,16 +28,6 @@ import { normalizeQualifiedName, tryQualifiedName } from '@/util/qualifiedName'
 import { computedAsync } from '@vueuse/core'
 import { map, set } from 'lib0'
 import { iteratorFilter } from 'lib0/iterator'
-import { SourceDocument } from 'shared/ast/sourceDocument'
-import type { ExpressionUpdate, Path as LsPath, MethodPointer } from 'shared/languageServerTypes'
-import { reachable } from 'shared/util/data/graph'
-import type {
-  LocalUserActionOrigin,
-  Origin,
-  SourceRangeKey,
-  VisualizationMetadata,
-} from 'shared/yjsModel'
-import { defaultLocalOrigin, sourceRangeKey, visMetadataEquals } from 'shared/yjsModel'
 import {
   computed,
   markRaw,
@@ -50,6 +40,20 @@ import {
   type Ref,
   type ShallowRef,
 } from 'vue'
+import { SourceDocument } from 'ydoc-shared/ast/sourceDocument'
+import type {
+  ExpressionUpdate,
+  Path as LsPath,
+  MethodPointer,
+} from 'ydoc-shared/languageServerTypes'
+import { reachable } from 'ydoc-shared/util/data/graph'
+import type {
+  LocalUserActionOrigin,
+  Origin,
+  SourceRangeKey,
+  VisualizationMetadata,
+} from 'ydoc-shared/yjsModel'
+import { defaultLocalOrigin, sourceRangeKey, visMetadataEquals } from 'ydoc-shared/yjsModel'
 
 const FALLBACK_BINDING_PREFIX = 'node'
 
diff --git a/app/gui2/src/stores/graph/unconnectedEdges.ts b/app/gui2/src/stores/graph/unconnectedEdges.ts
index 5802f4f835fb..7fd602abdb4e 100644
--- a/app/gui2/src/stores/graph/unconnectedEdges.ts
+++ b/app/gui2/src/stores/graph/unconnectedEdges.ts
@@ -2,8 +2,8 @@ import type { PortId } from '@/providers/portInfo'
 import type { ConnectedEdge } from '@/stores/graph/index'
 import { filterDefined } from '@/util/data/iterable'
 import { Vec2 } from '@/util/data/vec2'
-import type { AstId } from 'shared/ast'
 import { computed, ref, watch, type WatchSource } from 'vue'
+import type { AstId } from 'ydoc-shared/ast'
 
 export type UnconnectedEdgeAnchor = { type: 'mouse' } | { type: 'fixed'; scenePos: Vec2 }
 
diff --git a/app/gui2/src/stores/project/computedValueRegistry.ts b/app/gui2/src/stores/project/computedValueRegistry.ts
index 71bde46d607f..cd624c9d86f0 100644
--- a/app/gui2/src/stores/project/computedValueRegistry.ts
+++ b/app/gui2/src/stores/project/computedValueRegistry.ts
@@ -1,13 +1,13 @@
 import type { ExecutionContext } from '@/stores/project/executionContext'
 import { ReactiveDb, ReactiveIndex } from '@/util/database/reactiveDb'
+import { markRaw } from 'vue'
 import type {
   ExpressionId,
   ExpressionUpdate,
   ExpressionUpdatePayload,
   MethodCall,
   ProfilingInfo,
-} from 'shared/languageServerTypes'
-import { markRaw } from 'vue'
+} from 'ydoc-shared/languageServerTypes'
 
 export interface ExpressionInfo {
   typename: string | undefined
diff --git a/app/gui2/src/stores/project/executionContext.ts b/app/gui2/src/stores/project/executionContext.ts
index 42ac2a6747a7..95dc0976fd52 100644
--- a/app/gui2/src/stores/project/executionContext.ts
+++ b/app/gui2/src/stores/project/executionContext.ts
@@ -12,7 +12,8 @@ import * as array from 'lib0/array'
 import * as object from 'lib0/object'
 import { ObservableV2 } from 'lib0/observable'
 import * as random from 'lib0/random'
-import type { LanguageServer } from 'shared/languageServer'
+import { reactive } from 'vue'
+import type { LanguageServer } from 'ydoc-shared/languageServer'
 import {
   stackItemsEqual,
   type ContextId,
@@ -24,10 +25,9 @@ import {
   type StackItem,
   type Uuid,
   type VisualizationConfiguration,
-} from 'shared/languageServerTypes'
-import { exponentialBackoff } from 'shared/util/net'
-import type { ExternalId } from 'shared/yjsModel'
-import { reactive } from 'vue'
+} from 'ydoc-shared/languageServerTypes'
+import { exponentialBackoff } from 'ydoc-shared/util/net'
+import type { ExternalId } from 'ydoc-shared/yjsModel'
 
 // This constant should be synchronized with EXECUTION_ENVIRONMENT constant in
 // engine/runtime/src/main/java/org/enso/interpreter/EnsoLanguage.java
diff --git a/app/gui2/src/stores/project/index.ts b/app/gui2/src/stores/project/index.ts
index 7177d6a3dda4..860d5851c12c 100644
--- a/app/gui2/src/stores/project/index.ts
+++ b/app/gui2/src/stores/project/index.ts
@@ -17,16 +17,6 @@ import { DataServer } from '@/util/net/dataServer'
 import { tryQualifiedName } from '@/util/qualifiedName'
 import { computedAsync } from '@vueuse/core'
 import * as random from 'lib0/random'
-import { Error as DataError, OutboundPayload, VisualizationUpdate } from 'shared/binaryProtocol'
-import { LanguageServer } from 'shared/languageServer'
-import type { Diagnostic, ExpressionId, MethodPointer, Path } from 'shared/languageServerTypes'
-import { type AbortScope } from 'shared/util/net'
-import {
-  DistributedProject,
-  localUserActionOrigins,
-  type ExternalId,
-  type Uuid,
-} from 'shared/yjsModel'
 import {
   computed,
   markRaw,
@@ -40,6 +30,20 @@ import {
   type WatchSource,
   type WritableComputedRef,
 } from 'vue'
+import {
+  Error as DataError,
+  OutboundPayload,
+  VisualizationUpdate,
+} from 'ydoc-shared/binaryProtocol'
+import { LanguageServer } from 'ydoc-shared/languageServer'
+import type { Diagnostic, ExpressionId, MethodPointer, Path } from 'ydoc-shared/languageServerTypes'
+import { type AbortScope } from 'ydoc-shared/util/net'
+import {
+  DistributedProject,
+  localUserActionOrigins,
+  type ExternalId,
+  type Uuid,
+} from 'ydoc-shared/yjsModel'
 import * as Y from 'yjs'
 
 interface LsUrls {
@@ -78,7 +82,7 @@ function resolveLsUrl(config: GuiConfig): LsUrls {
 
 function createLsRpcConnection(clientId: Uuid, url: string, abort: AbortScope): LanguageServer {
   const transport = createRpcTransport(url)
-  const connection = new LanguageServer(clientId, transport, false)
+  const connection = new LanguageServer(clientId, transport)
   abort.onAbort(() => {
     connection.stopReconnecting()
     connection.release()
diff --git a/app/gui2/src/stores/project/visualizationDataRegistry.ts b/app/gui2/src/stores/project/visualizationDataRegistry.ts
index 7a10c5ddb202..0e2e940adeff 100644
--- a/app/gui2/src/stores/project/visualizationDataRegistry.ts
+++ b/app/gui2/src/stores/project/visualizationDataRegistry.ts
@@ -1,7 +1,8 @@
 import type { ExecutionContext } from '@/stores/project/executionContext'
 import { Err, Ok, type Result } from '@/util/data/result'
 import type { DataServer } from '@/util/net/dataServer'
-import { OutboundPayload, VisualizationUpdate } from 'shared/binaryProtocol'
+import { reactive } from 'vue'
+import { OutboundPayload, VisualizationUpdate } from 'ydoc-shared/binaryProtocol'
 import type {
   Diagnostic,
   ExpressionId,
@@ -9,8 +10,7 @@ import type {
   MethodCall,
   ProfilingInfo,
   Uuid,
-} from 'shared/languageServerTypes'
-import { reactive } from 'vue'
+} from 'ydoc-shared/languageServerTypes'
 
 export interface ExpressionInfo {
   typename: string | undefined
diff --git a/app/gui2/src/stores/suggestionDatabase/__tests__/documentation.test.ts b/app/gui2/src/stores/suggestionDatabase/__tests__/documentation.test.ts
index 7995ba2ab188..af292b631a76 100644
--- a/app/gui2/src/stores/suggestionDatabase/__tests__/documentation.test.ts
+++ b/app/gui2/src/stores/suggestionDatabase/__tests__/documentation.test.ts
@@ -2,11 +2,8 @@ import { getGroupIndex, tagValue } from '@/stores/suggestionDatabase/documentati
 import { unwrap } from '@/util/data/result'
 import { parseDocs } from '@/util/docParser'
 import { tryQualifiedName } from '@/util/qualifiedName'
-import { initializeFFI } from 'shared/ast/ffi'
 import { expect, test } from 'vitest'
 
-await initializeFFI()
-
 test.each([
   ['ALIAS Bar', 'Bar'],
   ['Some one section\n   But not tags here', null],
diff --git a/app/gui2/src/stores/suggestionDatabase/__tests__/lsUpdate.test.ts b/app/gui2/src/stores/suggestionDatabase/__tests__/lsUpdate.test.ts
index f1c2a66c2111..ab1c5fae9962 100644
--- a/app/gui2/src/stores/suggestionDatabase/__tests__/lsUpdate.test.ts
+++ b/app/gui2/src/stores/suggestionDatabase/__tests__/lsUpdate.test.ts
@@ -4,11 +4,8 @@ import { applyUpdates } from '@/stores/suggestionDatabase/lsUpdate'
 import { unwrap } from '@/util/data/result'
 import { parseDocs } from '@/util/docParser'
 import { tryIdentifier, tryQualifiedName, type QualifiedName } from '@/util/qualifiedName'
-import { initializeFFI } from 'shared/ast/ffi'
-import * as lsTypes from 'shared/languageServerTypes/suggestions'
 import { expect, test } from 'vitest'
-
-await initializeFFI()
+import * as lsTypes from 'ydoc-shared/languageServerTypes/suggestions'
 
 test('Adding suggestion database entries', () => {
   const test = new Fixture()
diff --git a/app/gui2/src/stores/suggestionDatabase/entry.ts b/app/gui2/src/stores/suggestionDatabase/entry.ts
index 85e2140302c9..298d1d8376a5 100644
--- a/app/gui2/src/stores/suggestionDatabase/entry.ts
+++ b/app/gui2/src/stores/suggestionDatabase/entry.ts
@@ -11,16 +11,16 @@ import {
   qnSegments,
   qnSplit,
 } from '@/util/qualifiedName'
-import type { MethodPointer } from 'shared/languageServerTypes'
+import type { MethodPointer } from 'ydoc-shared/languageServerTypes'
 import type {
   SuggestionEntryArgument,
   SuggestionEntryScope,
-} from 'shared/languageServerTypes/suggestions'
+} from 'ydoc-shared/languageServerTypes/suggestions'
 export type {
   SuggestionEntryArgument,
   SuggestionEntryScope,
   SuggestionId,
-} from 'shared/languageServerTypes/suggestions'
+} from 'ydoc-shared/languageServerTypes/suggestions'
 
 /** An alias type for typename (for entry fields like `returnType`).
  *
diff --git a/app/gui2/src/stores/suggestionDatabase/index.ts b/app/gui2/src/stores/suggestionDatabase/index.ts
index 99c1e1b90a1e..64d48fef00ad 100644
--- a/app/gui2/src/stores/suggestionDatabase/index.ts
+++ b/app/gui2/src/stores/suggestionDatabase/index.ts
@@ -11,10 +11,10 @@ import {
   tryQualifiedName,
   type QualifiedName,
 } from '@/util/qualifiedName'
-import { LanguageServer } from 'shared/languageServer'
-import type { MethodPointer } from 'shared/languageServerTypes'
-import { exponentialBackoff } from 'shared/util/net'
 import { markRaw, proxyRefs, ref, type Ref } from 'vue'
+import { LanguageServer } from 'ydoc-shared/languageServer'
+import type { MethodPointer } from 'ydoc-shared/languageServerTypes'
+import { exponentialBackoff } from 'ydoc-shared/util/net'
 
 export class SuggestionDb extends ReactiveDb<SuggestionId, SuggestionEntry> {
   nameToId = new ReactiveIndex(this, (id, entry) => [[entryQn(entry), id]])
diff --git a/app/gui2/src/stores/suggestionDatabase/lsUpdate.ts b/app/gui2/src/stores/suggestionDatabase/lsUpdate.ts
index 3eeea10cf665..03d754469037 100644
--- a/app/gui2/src/stores/suggestionDatabase/lsUpdate.ts
+++ b/app/gui2/src/stores/suggestionDatabase/lsUpdate.ts
@@ -24,7 +24,7 @@ import {
   type IdentifierOrOperatorIdentifier,
   type QualifiedName,
 } from '@/util/qualifiedName'
-import * as lsTypes from 'shared/languageServerTypes/suggestions'
+import * as lsTypes from 'ydoc-shared/languageServerTypes/suggestions'
 
 interface UnfinishedEntry {
   kind: SuggestionKind
diff --git a/app/gui2/src/stores/visualization/__tests__/metadata.test.ts b/app/gui2/src/stores/visualization/__tests__/metadata.test.ts
index 615235c04549..3fb6c60cfdda 100644
--- a/app/gui2/src/stores/visualization/__tests__/metadata.test.ts
+++ b/app/gui2/src/stores/visualization/__tests__/metadata.test.ts
@@ -6,7 +6,7 @@ import {
   toVisualizationId,
   VisualizationMetadataDb,
 } from '@/stores/visualization/metadata'
-import type { VisualizationIdentifier } from 'shared/yjsModel'
+import type { VisualizationIdentifier } from 'ydoc-shared/yjsModel'
 
 test.prop({
   kind: fc.oneof(
diff --git a/app/gui2/src/stores/visualization/compilerMessaging.ts b/app/gui2/src/stores/visualization/compilerMessaging.ts
index 2f2d23e268b9..081e224bb1ec 100644
--- a/app/gui2/src/stores/visualization/compilerMessaging.ts
+++ b/app/gui2/src/stores/visualization/compilerMessaging.ts
@@ -21,9 +21,9 @@ import { toError } from '@/util/data/error'
 import type { Opt } from '@/util/data/opt'
 import type { DataServer } from '@/util/net/dataServer'
 import * as builtins from '@/util/visualizationBuiltins'
-import { Error as DataError } from 'shared/binaryProtocol'
-import type { Uuid } from 'shared/languageServerTypes'
 import * as vue from 'vue'
+import { Error as DataError } from 'ydoc-shared/binaryProtocol'
+import type { Uuid } from 'ydoc-shared/languageServerTypes'
 
 /** The custom URL protocol used internally for project-local assets. */
 export const currentProjectProtocol = 'enso-current-project:'
diff --git a/app/gui2/src/stores/visualization/index.ts b/app/gui2/src/stores/visualization/index.ts
index e1df6c117b4d..7d942bf71ee6 100644
--- a/app/gui2/src/stores/visualization/index.ts
+++ b/app/gui2/src/stores/visualization/index.ts
@@ -25,10 +25,10 @@ import type { VisualizationModule } from '@/stores/visualization/runtimeTypes'
 import type { Opt } from '@/util/data/opt'
 import { isUrlString } from '@/util/data/urlString'
 import { isIconName } from '@/util/iconName'
-import { ErrorCode, LsRpcError, RemoteRpcError } from 'shared/languageServer'
-import type { Event as LSEvent, VisualizationConfiguration } from 'shared/languageServerTypes'
-import type { ExternalId, VisualizationIdentifier } from 'shared/yjsModel'
 import { computed, reactive } from 'vue'
+import { ErrorCode, LsRpcError, RemoteRpcError } from 'ydoc-shared/languageServer'
+import type { Event as LSEvent, VisualizationConfiguration } from 'ydoc-shared/languageServerTypes'
+import type { ExternalId, VisualizationIdentifier } from 'ydoc-shared/yjsModel'
 
 /** The directory in the project under which custom visualizations can be found. */
 const customVisualizationsDirectory = 'visualizations'
diff --git a/app/gui2/src/stores/visualization/metadata.ts b/app/gui2/src/stores/visualization/metadata.ts
index a1207fbe89a1..acdae444ce79 100644
--- a/app/gui2/src/stores/visualization/metadata.ts
+++ b/app/gui2/src/stores/visualization/metadata.ts
@@ -1,7 +1,7 @@
 import type { VisualizationModule } from '@/stores/visualization/runtimeTypes'
 import type { Opt } from '@/util/data/opt'
 import { ReactiveDb, ReactiveIndex } from '@/util/database/reactiveDb'
-import type { VisualizationIdentifier } from 'shared/yjsModel'
+import type { VisualizationIdentifier } from 'ydoc-shared/yjsModel'
 
 export interface VisualizationMetadata
   extends Pick<VisualizationModule, 'name' | 'inputType' | 'icon'> {}
diff --git a/app/gui2/src/util/__tests__/callTree.test.ts b/app/gui2/src/util/__tests__/callTree.test.ts
index b7383330862f..5bff218583b8 100644
--- a/app/gui2/src/util/__tests__/callTree.test.ts
+++ b/app/gui2/src/util/__tests__/callTree.test.ts
@@ -21,12 +21,9 @@ import {
   interpretCall,
 } from '@/util/callTree'
 import { fail } from 'assert'
-import { initializeFFI } from 'shared/ast/ffi'
-import type { ExpressionUpdatePayload, MethodCall } from 'shared/languageServerTypes'
-import { assertEqual, assertNotEqual } from 'shared/util/assert'
 import { assert, expect, test } from 'vitest'
-
-await initializeFFI()
+import type { ExpressionUpdatePayload, MethodCall } from 'ydoc-shared/languageServerTypes'
+import { assertEqual, assertNotEqual } from 'ydoc-shared/util/assert'
 
 const prefixFixture = {
   allowInfix: false,
diff --git a/app/gui2/src/util/__tests__/qualifiedName.test.ts b/app/gui2/src/util/__tests__/qualifiedName.test.ts
index abf17034eda7..47b627ca446f 100644
--- a/app/gui2/src/util/__tests__/qualifiedName.test.ts
+++ b/app/gui2/src/util/__tests__/qualifiedName.test.ts
@@ -13,11 +13,8 @@ import {
   type IdentifierOrOperatorIdentifier,
   type QualifiedName,
 } from '@/util/qualifiedName'
-import { initializeFFI } from 'shared/ast/ffi'
 import { expect, test } from 'vitest'
 
-await initializeFFI()
-
 const validIdentifiers = [
   'A',
   'a',
diff --git a/app/gui2/src/util/assert.ts b/app/gui2/src/util/assert.ts
index a223c842f92d..3d2c3be37602 100644
--- a/app/gui2/src/util/assert.ts
+++ b/app/gui2/src/util/assert.ts
@@ -1 +1 @@
-export * from 'shared/util/assert'
+export * from 'ydoc-shared/util/assert'
diff --git a/app/gui2/src/util/ast/__tests__/abstract.test.ts b/app/gui2/src/util/ast/__tests__/abstract.test.ts
index a7f80983daee..3da4dedb2f60 100644
--- a/app/gui2/src/util/ast/__tests__/abstract.test.ts
+++ b/app/gui2/src/util/ast/__tests__/abstract.test.ts
@@ -12,12 +12,9 @@ import {
   type Identifier,
 } from '@/util/ast/abstract'
 import { fc, test } from '@fast-check/vitest'
-import { initializeFFI } from 'shared/ast/ffi'
 import { describe, expect } from 'vitest'
 import { findExpressions, testCase, tryFindExpressions } from './testCase'
 
-await initializeFFI()
-
 test('Raw block abstracts to Ast.BodyBlock', () => {
   const code = 'value = 2 + 2'
   const rawBlock = Ast.parseEnso(code)
diff --git a/app/gui2/src/util/ast/__tests__/abstractFileIo.test.ts b/app/gui2/src/util/ast/__tests__/abstractFileIo.test.ts
index 70c9336903f1..5b2e902de715 100644
--- a/app/gui2/src/util/ast/__tests__/abstractFileIo.test.ts
+++ b/app/gui2/src/util/ast/__tests__/abstractFileIo.test.ts
@@ -1,14 +1,11 @@
 import { Ast } from '@/util/ast'
 import * as fs from 'fs'
-import { initializeFFI } from 'shared/ast/ffi'
-import { splitFileContents } from 'shared/ensoFile'
 import { expect, test } from 'vitest'
+import { splitFileContents } from 'ydoc-shared/ensoFile'
 
 // FIXME: This test pulls parts of the server code to read a fixture file. Move necessary parts of
 // file format handling to shared and create a test utility for easy *.enso file fixture loading.
-import { deserializeIdMap } from '../../../../ydoc-server/serialization'
-
-await initializeFFI()
+import { deserializeIdMap } from 'ydoc-server'
 
 test('full file IdMap round trip', () => {
   const content = fs.readFileSync(__dirname + '/fixtures/stargazers.enso').toString()
diff --git a/app/gui2/src/util/ast/__tests__/aliasAnalysis.test.ts b/app/gui2/src/util/ast/__tests__/aliasAnalysis.test.ts
index e4bae401eeb5..120f150c67b8 100644
--- a/app/gui2/src/util/ast/__tests__/aliasAnalysis.test.ts
+++ b/app/gui2/src/util/ast/__tests__/aliasAnalysis.test.ts
@@ -28,11 +28,8 @@
 import { assertDefined } from '@/util/assert'
 import { AliasAnalyzer } from '@/util/ast/aliasAnalysis'
 import { MappedKeyMap, MappedSet } from '@/util/containers'
-import { initializeFFI } from 'shared/ast/ffi'
-import { sourceRangeKey, type SourceRange } from 'shared/yjsModel'
 import { expect, test } from 'vitest'
-
-await initializeFFI()
+import { sourceRangeKey, type SourceRange } from 'ydoc-shared/yjsModel'
 
 /** The type of annotation. */
 enum AnnotationType {
diff --git a/app/gui2/src/util/ast/__tests__/match.test.ts b/app/gui2/src/util/ast/__tests__/match.test.ts
index 168722e2afb9..dad897734c8d 100644
--- a/app/gui2/src/util/ast/__tests__/match.test.ts
+++ b/app/gui2/src/util/ast/__tests__/match.test.ts
@@ -1,11 +1,8 @@
 import { Ast } from '@/util/ast'
 import { Pattern } from '@/util/ast/match'
-import { initializeFFI } from 'shared/ast/ffi'
 import { expect, test } from 'vitest'
 import { MutableModule } from '../abstract'
 
-await initializeFFI()
-
 test.each([
   { target: 'a.b', pattern: '__', extracted: ['a.b'] },
   { target: 'a.b', pattern: 'a.__', extracted: ['b'] },
diff --git a/app/gui2/src/util/ast/__tests__/node.test.ts b/app/gui2/src/util/ast/__tests__/node.test.ts
index 9ff9d7e9fd6d..6eaa5b3daf3e 100644
--- a/app/gui2/src/util/ast/__tests__/node.test.ts
+++ b/app/gui2/src/util/ast/__tests__/node.test.ts
@@ -1,12 +1,8 @@
 import { assert } from '@/util/assert'
 import { Ast } from '@/util/ast'
-import { initializePrefixes, nodeFromAst, primaryApplicationSubject } from '@/util/ast/node'
-import { initializeFFI } from 'shared/ast/ffi'
+import { nodeFromAst, primaryApplicationSubject } from '@/util/ast/node'
 import { expect, test } from 'vitest'
 
-await initializeFFI()
-initializePrefixes()
-
 test.each`
   line                               | pattern      | rootExpr   | documentation
   ${'2 + 2'}                         | ${undefined} | ${'2 + 2'} | ${undefined}
diff --git a/app/gui2/src/util/ast/__tests__/opr.test.ts b/app/gui2/src/util/ast/__tests__/opr.test.ts
index bad84b5f571b..3dbd98197653 100644
--- a/app/gui2/src/util/ast/__tests__/opr.test.ts
+++ b/app/gui2/src/util/ast/__tests__/opr.test.ts
@@ -2,11 +2,8 @@ import { assert } from '@/util/assert'
 import { RawAstExtended } from '@/util/ast/extended'
 import { GeneralOprApp, operandsOfLeftAssocOprChain, type OperatorChain } from '@/util/ast/opr'
 import { RawAst } from '@/util/ast/raw'
-import { initializeFFI } from 'shared/ast/ffi'
 import { expect, test } from 'vitest'
 
-await initializeFFI()
-
 test.each([
   { code: '2 + 3', result: ['2', '+', '3'] },
   { code: '2 + 4 + 5', result: ['2 + 4', '+', '5'] },
diff --git a/app/gui2/src/util/ast/__tests__/prefixes.test.ts b/app/gui2/src/util/ast/__tests__/prefixes.test.ts
index ed7be7a530d7..c191b9564746 100644
--- a/app/gui2/src/util/ast/__tests__/prefixes.test.ts
+++ b/app/gui2/src/util/ast/__tests__/prefixes.test.ts
@@ -1,10 +1,7 @@
 import { Ast } from '@/util/ast/abstract'
 import { Prefixes } from '@/util/ast/prefixes'
-import { initializeFFI } from 'shared/ast/ffi'
 import { expect, test } from 'vitest'
 
-await initializeFFI()
-
 test.each([
   {
     prefixes: {
diff --git a/app/gui2/src/util/ast/__tests__/raw.test.ts b/app/gui2/src/util/ast/__tests__/raw.test.ts
index 0cd7bde25875..b85ce0e0ad48 100644
--- a/app/gui2/src/util/ast/__tests__/raw.test.ts
+++ b/app/gui2/src/util/ast/__tests__/raw.test.ts
@@ -9,12 +9,9 @@ import {
   readTokenSpan,
   walkRecursive,
 } from '@/util/ast/raw'
-import { initializeFFI } from 'shared/ast/ffi'
-import { Token, Tree } from 'shared/ast/generated/ast'
-import type { LazyObject } from 'shared/ast/parserSupport'
 import { assert, expect, test } from 'vitest'
-
-await initializeFFI()
+import { Token, Tree } from 'ydoc-shared/ast/generated/ast'
+import type { LazyObject } from 'ydoc-shared/ast/parserSupport'
 
 function validateSpans(obj: LazyObject, initialPos?: number): number {
   const state = { pos: initialPos ?? 0 }
diff --git a/app/gui2/src/util/ast/__tests__/sourceDocument.test.ts b/app/gui2/src/util/ast/__tests__/sourceDocument.test.ts
index ea2d93af2a31..e8130ab95d54 100644
--- a/app/gui2/src/util/ast/__tests__/sourceDocument.test.ts
+++ b/app/gui2/src/util/ast/__tests__/sourceDocument.test.ts
@@ -1,13 +1,10 @@
 import { Ast } from '@/util/ast'
-import { MutableModule } from 'shared/ast'
-import { initializeFFI } from 'shared/ast/ffi'
-import { SourceDocument } from 'shared/ast/sourceDocument'
-import { applyTextEdits } from 'shared/util/data/text'
 import { expect, test } from 'vitest'
+import { MutableModule } from 'ydoc-shared/ast'
+import { SourceDocument } from 'ydoc-shared/ast/sourceDocument'
+import { applyTextEdits } from 'ydoc-shared/util/data/text'
 import * as Y from 'yjs'
 
-await initializeFFI()
-
 test('Test SourceDocument', () => {
   const syncModule = new MutableModule(new Y.Doc())
   const sourceDoc = SourceDocument.Empty()
diff --git a/app/gui2/src/util/ast/abstract.ts b/app/gui2/src/util/ast/abstract.ts
index a53c4c025182..28b559110d58 100644
--- a/app/gui2/src/util/ast/abstract.ts
+++ b/app/gui2/src/util/ast/abstract.ts
@@ -9,7 +9,7 @@ import type {
   QualifiedName,
   TokenId,
   TokenKey,
-} from 'shared/ast'
+} from 'ydoc-shared/ast'
 import {
   Ast,
   BodyBlock,
@@ -25,8 +25,8 @@ import {
   Token,
   isTokenId,
   print,
-} from 'shared/ast'
-export * from 'shared/ast'
+} from 'ydoc-shared/ast'
+export * from 'ydoc-shared/ast'
 
 export function deserialize(serialized: string): Owned {
   const parsed: SerializedPrintedSource = JSON.parse(serialized)
diff --git a/app/gui2/src/util/ast/aliasAnalysis.ts b/app/gui2/src/util/ast/aliasAnalysis.ts
index dd7b926c821e..68c4e91274a8 100644
--- a/app/gui2/src/util/ast/aliasAnalysis.ts
+++ b/app/gui2/src/util/ast/aliasAnalysis.ts
@@ -8,8 +8,8 @@ import {
   readTokenSpan,
 } from '@/util/ast/raw'
 import { MappedKeyMap, MappedSet, NonEmptyStack } from '@/util/containers'
-import type { LazyObject } from 'shared/ast/parserSupport'
-import { rangeIsBefore, sourceRangeKey, type SourceRange } from 'shared/yjsModel'
+import type { LazyObject } from 'ydoc-shared/ast/parserSupport'
+import { rangeIsBefore, sourceRangeKey, type SourceRange } from 'ydoc-shared/yjsModel'
 
 const ACCESSOR_OPERATOR = '.'
 
diff --git a/app/gui2/src/util/ast/extended.ts b/app/gui2/src/util/ast/extended.ts
index 796689b1cc91..9d3fd328d737 100644
--- a/app/gui2/src/util/ast/extended.ts
+++ b/app/gui2/src/util/ast/extended.ts
@@ -12,11 +12,11 @@ import type { Opt } from '@/util/data/opt'
 import * as encoding from 'lib0/encoding'
 import * as sha256 from 'lib0/hash/sha256'
 import * as map from 'lib0/map'
-import * as Ast from 'shared/ast/generated/ast'
-import { Token, Tree } from 'shared/ast/generated/ast'
-import { tryGetSoleValue } from 'shared/util/data/iterable'
-import type { ExternalId, IdMap, SourceRange } from 'shared/yjsModel'
 import { markRaw } from 'vue'
+import * as Ast from 'ydoc-shared/ast/generated/ast'
+import { Token, Tree } from 'ydoc-shared/ast/generated/ast'
+import { tryGetSoleValue } from 'ydoc-shared/util/data/iterable'
+import type { ExternalId, IdMap, SourceRange } from 'ydoc-shared/yjsModel'
 
 export { AstExtended as RawAstExtended }
 
diff --git a/app/gui2/src/util/ast/index.ts b/app/gui2/src/util/ast/index.ts
index c91be2d11001..8a67b9a3d065 100644
--- a/app/gui2/src/util/ast/index.ts
+++ b/app/gui2/src/util/ast/index.ts
@@ -1,2 +1,2 @@
 export * as Ast from '@/util/ast/abstract'
-export * as RawAst from 'shared/ast/generated/ast'
+export * as RawAst from 'ydoc-shared/ast/generated/ast'
diff --git a/app/gui2/src/util/ast/node.ts b/app/gui2/src/util/ast/node.ts
index dbc3f30b3e78..1a367fcabcb1 100644
--- a/app/gui2/src/util/ast/node.ts
+++ b/app/gui2/src/util/ast/node.ts
@@ -2,19 +2,10 @@ import type { NodeDataFromAst } from '@/stores/graph'
 import { Ast } from '@/util/ast'
 import { Prefixes } from '@/util/ast/prefixes'
 
-export let prefixes!: ReturnType<typeof makePrefixes>
-
-function makePrefixes() {
-  return Prefixes.FromLines({
-    enableRecording:
-      'Standard.Base.Runtime.with_enabled_context Standard.Base.Runtime.Context.Output __ <| __',
-  })
-}
-
-/** MUST be called after `initializeFFI`. */
-export function initializePrefixes() {
-  prefixes = prefixes ?? makePrefixes()
-}
+export const prefixes = Prefixes.FromLines({
+  enableRecording:
+    'Standard.Base.Runtime.with_enabled_context Standard.Base.Runtime.Context.Output __ <| __',
+})
 
 export function nodeFromAst(ast: Ast.Ast, isLastLine: boolean): NodeDataFromAst | undefined {
   const { nodeCode, documentation } =
diff --git a/app/gui2/src/util/ast/raw.ts b/app/gui2/src/util/ast/raw.ts
index 59b7ad32130b..723e1f554ba6 100644
--- a/app/gui2/src/util/ast/raw.ts
+++ b/app/gui2/src/util/ast/raw.ts
@@ -1,11 +1,11 @@
-import { assert, assertDefined } from '@/util/assert'
+import { assertDefined } from '@/util/assert'
 import * as map from 'lib0/map'
-import * as RawAst from 'shared/ast/generated/ast'
-import { parseEnso } from 'shared/ast/parse'
-import { LazyObject, LazySequence } from 'shared/ast/parserSupport'
-import { tryGetSoleValue } from 'shared/util/data/iterable'
-import { isResult, mapOk } from 'shared/util/data/result'
-import type { SourceRange } from 'shared/yjsModel'
+import * as RawAst from 'ydoc-shared/ast/generated/ast'
+import { parseEnso } from 'ydoc-shared/ast/parse'
+import { LazyObject, LazySequence } from 'ydoc-shared/ast/parserSupport'
+import { tryGetSoleValue } from 'ydoc-shared/util/data/iterable'
+import { isResult, mapOk } from 'ydoc-shared/util/data/result'
+import type { SourceRange } from 'ydoc-shared/yjsModel'
 
 export { parseEnso, RawAst }
 
diff --git a/app/gui2/src/util/autoBlur.ts b/app/gui2/src/util/autoBlur.ts
index a5e42ce6ff06..85ac22d0d983 100644
--- a/app/gui2/src/util/autoBlur.ts
+++ b/app/gui2/src/util/autoBlur.ts
@@ -1,8 +1,8 @@
 import { unrefElement, useEvent } from '@/composables/events'
 import { injectInteractionHandler, type Interaction } from '@/providers/interactionHandler'
 import type { VueInstance } from '@vueuse/core'
-import type { Opt } from 'shared/util/data/opt'
 import { watchEffect, type Ref } from 'vue'
+import type { Opt } from 'ydoc-shared/util/data/opt'
 
 /** Automatically `blur` the currently active element on any mouse click outside of `root`.
  * It is useful when other elements may capture pointer events, preventing default browser behavior for focus change. */
diff --git a/app/gui2/src/util/callTree.ts b/app/gui2/src/util/callTree.ts
index f2b46c951412..65ff1d60e261 100644
--- a/app/gui2/src/util/callTree.ts
+++ b/app/gui2/src/util/callTree.ts
@@ -8,7 +8,7 @@ import type { SuggestionEntry, SuggestionEntryArgument } from '@/stores/suggesti
 import { Ast } from '@/util/ast'
 import type { AstId } from '@/util/ast/abstract'
 import { findLastIndex, tryGetIndex } from '@/util/data/array'
-import type { ExternalId } from 'shared/yjsModel'
+import type { ExternalId } from 'ydoc-shared/yjsModel'
 import { assert } from './assert'
 
 export const enum ApplicationKind {
@@ -109,7 +109,7 @@ export class ArgumentPlaceholder extends Argument {
     return this.argInfo.defaultValue
   }
 
-  get hideByDefault(): boolean {
+  override get hideByDefault(): boolean {
     return this.argInfo.hasDefault && this.dynamicConfig?.display !== DisplayMode.Always
   }
 }
diff --git a/app/gui2/src/util/data/iterable.ts b/app/gui2/src/util/data/iterable.ts
index 8157ed4e5613..b2dc6378b513 100644
--- a/app/gui2/src/util/data/iterable.ts
+++ b/app/gui2/src/util/data/iterable.ts
@@ -1,4 +1,4 @@
-export * from 'shared/util/data/iterable'
+export * from 'ydoc-shared/util/data/iterable'
 
 export function* filterDefined<T>(iterable: Iterable<T | undefined>): IterableIterator<T> {
   for (const value of iterable) {
diff --git a/app/gui2/src/util/data/opt.ts b/app/gui2/src/util/data/opt.ts
index 764aac23746f..e76c65dd9aaf 100644
--- a/app/gui2/src/util/data/opt.ts
+++ b/app/gui2/src/util/data/opt.ts
@@ -1 +1 @@
-export * from 'shared/util/data/opt'
+export * from 'ydoc-shared/util/data/opt'
diff --git a/app/gui2/src/util/data/result.ts b/app/gui2/src/util/data/result.ts
index e1cd8123effa..b5a7a39f0486 100644
--- a/app/gui2/src/util/data/result.ts
+++ b/app/gui2/src/util/data/result.ts
@@ -1 +1 @@
-export * from 'shared/util/data/result'
+export * from 'ydoc-shared/util/data/result'
diff --git a/app/gui2/src/util/docParser.ts b/app/gui2/src/util/docParser.ts
index bf30dc012112..e054fe7a851e 100644
--- a/app/gui2/src/util/docParser.ts
+++ b/app/gui2/src/util/docParser.ts
@@ -1,4 +1,4 @@
-import { parse_doc_to_json } from 'shared/ast/ffi'
+import { parse_doc_to_json } from 'ydoc-shared/ast/ffi'
 
 export function parseDocs(docs: string): Doc.Section[] {
   const json = parse_doc_to_json(docs)
diff --git a/app/gui2/src/util/getIconName.ts b/app/gui2/src/util/getIconName.ts
index b353cc9663b7..50f9c4327eab 100644
--- a/app/gui2/src/util/getIconName.ts
+++ b/app/gui2/src/util/getIconName.ts
@@ -4,7 +4,7 @@ import {
   type Typename,
 } from '@/stores/suggestionDatabase/entry'
 import type { Icon } from '@/util/iconName'
-import type { MethodPointer } from 'shared/languageServerTypes'
+import type { MethodPointer } from 'ydoc-shared/languageServerTypes'
 
 const typeNameToIconLookup: Record<string, Icon> = {
   'Standard.Base.Data.Text.Text': 'text_input',
diff --git a/app/gui2/src/util/net.ts b/app/gui2/src/util/net.ts
index 2f7f32173f43..3f4fb1a849f1 100644
--- a/app/gui2/src/util/net.ts
+++ b/app/gui2/src/util/net.ts
@@ -1,22 +1,17 @@
-import type {
-  IJSONRPCNotificationResponse,
-  JSONRPCRequestData,
-} from '@open-rpc/client-js/build/Request'
-import { Transport } from '@open-rpc/client-js/build/transports/Transport'
-import { type ArgumentsType } from '@vueuse/core'
-import { WebSocket as ReconnectingWebSocket } from 'partysocket'
-import { type WebSocketEventMap } from 'partysocket/ws'
-import type { Notifications } from 'shared/languageServerTypes'
-import { AbortScope, type ReconnectingTransportWithWebsocketEvents } from 'shared/util/net'
-import ReconnectingWebSocketTransport from 'shared/util/net/ReconnectingWSTransport'
 import { onScopeDispose } from 'vue'
+import {
+  AbortScope,
+  MockWebSocketTransport,
+  ReconnectingWebSocket,
+  ReconnectingWebSocketTransport,
+} from 'ydoc-shared/util/net'
 
-export { AbortScope } from 'shared/util/net'
+export { AbortScope, MockWebSocketTransport }
 
-export function createRpcTransport(url: string): ReconnectingTransportWithWebsocketEvents {
+export function createRpcTransport(url: string): ReconnectingWebSocketTransport {
   if (url.startsWith('mock://')) {
     const mockName = url.slice('mock://'.length)
-    return new MockTransport(mockName)
+    return new MockWebSocketTransport(mockName)
   } else {
     const transport = new ReconnectingWebSocketTransport(url)
     return transport
@@ -35,51 +30,6 @@ export function createDataWebsocket(url: string, binaryType: 'arraybuffer' | 'bl
   }
 }
 
-export interface MockTransportData<Methods extends string = string> {
-  (method: Methods, params: any, transport: MockTransport): Promise<any>
-}
-
-export class MockTransport extends Transport {
-  static mocks: Map<string, MockTransportData> = new Map()
-  private openEventListeners = new Set<(event: WebSocketEventMap['open']) => void>()
-  constructor(public name: string) {
-    super()
-  }
-
-  static addMock<Methods extends string>(name: string, data: MockTransportData<Methods>) {
-    MockTransport.mocks.set(name, data as any)
-  }
-  connect(): Promise<any> {
-    for (const listener of this.openEventListeners) listener(new Event('open'))
-    return Promise.resolve()
-  }
-  reconnect() {}
-  close(): void {}
-  sendData(data: JSONRPCRequestData, timeout?: number | null): Promise<any> {
-    if (Array.isArray(data)) return Promise.all(data.map((d) => this.sendData(d.request, timeout)))
-    return (
-      MockTransport.mocks.get(this.name)?.(data.request.method, data.request.params, this) ??
-      Promise.reject()
-    )
-  }
-  emit<N extends keyof Notifications>(method: N, params: ArgumentsType<Notifications[N]>[0]): void {
-    this.transportRequestManager.transportEventChannel.emit('notification', {
-      jsonrpc: '2.0',
-      method,
-      params,
-    } as IJSONRPCNotificationResponse)
-  }
-
-  on<K extends keyof WebSocketEventMap>(type: K, cb: (event: WebSocketEventMap[K]) => void): void {
-    if (type === 'open')
-      this.openEventListeners.add(cb as (event: WebSocketEventMap['open']) => void)
-  }
-  off<K extends keyof WebSocketEventMap>(type: K, cb: (event: WebSocketEventMap[K]) => void): void {
-    if (type === 'open')
-      this.openEventListeners.delete(cb as (event: WebSocketEventMap['open']) => void)
-  }
-}
-
 export interface WebSocketHandler {
   (
     data: string | ArrayBufferLike | Blob | ArrayBufferView,
diff --git a/app/gui2/src/util/net/dataServer.ts b/app/gui2/src/util/net/dataServer.ts
index c3a8e75e9594..48fa452b1ff3 100644
--- a/app/gui2/src/util/net/dataServer.ts
+++ b/app/gui2/src/util/net/dataServer.ts
@@ -27,12 +27,12 @@ import {
   type AnyInboundPayload,
   type Offset,
   type Table,
-} from 'shared/binaryProtocol'
-import type { Path as LSPath } from 'shared/languageServerTypes'
-import { Err, Ok, type Result } from 'shared/util/data/result'
-import { exponentialBackoff, type AbortScope } from 'shared/util/net'
-import { uuidFromBits, uuidToBits } from 'shared/uuid'
-import type { Uuid } from 'shared/yjsModel'
+} from 'ydoc-shared/binaryProtocol'
+import type { Path as LSPath } from 'ydoc-shared/languageServerTypes'
+import { Err, Ok, type Result } from 'ydoc-shared/util/data/result'
+import { exponentialBackoff, type AbortScope } from 'ydoc-shared/util/net'
+import { uuidFromBits, uuidToBits } from 'ydoc-shared/uuid'
+import type { Uuid } from 'ydoc-shared/yjsModel'
 
 const PAYLOAD_CONSTRUCTOR = {
   [OutboundPayload.NONE]: None,
diff --git a/app/gui2/src/util/testing.ts b/app/gui2/src/util/testing.ts
new file mode 100644
index 000000000000..2ccec744f804
--- /dev/null
+++ b/app/gui2/src/util/testing.ts
@@ -0,0 +1,21 @@
+import { type App, createApp } from 'vue'
+
+/**
+ * An utility for testing composables that actually depend on vue's `setup` environment.
+ * The code is taken straight from vue documentation, modified only to add typings:
+ * https://vuejs.org/guide/scaling-up/testing.html#testing-composables
+ */
+export function withSetup<T>(composable: () => T): [T | undefined, App] {
+  let result: T | undefined
+  const app = createApp({
+    setup() {
+      result = composable()
+      // suppress missing template warning
+      return () => {}
+    },
+  })
+  app.mount(document.createElement('div'))
+  // return the result and the app instance
+  // for testing provide/unmount
+  return [result, app]
+}
diff --git a/app/gui2/stories/CircularMenu.story.vue b/app/gui2/stories/CircularMenu.story.vue
index 644a3211328f..109791c7b847 100644
--- a/app/gui2/stories/CircularMenu.story.vue
+++ b/app/gui2/stories/CircularMenu.story.vue
@@ -4,9 +4,11 @@ import { ref } from 'vue'
 
 import CircularMenu from '@/components/CircularMenu.vue'
 
-const isAutoEvaluationDisabled = ref(false)
+const isRecordingOverridden = ref(false)
 const isDocsVisible = ref(false)
 const isVisualizationVisible = ref(false)
+
+const emptySet = new Set<string>()
 </script>
 
 <template>
@@ -19,10 +21,15 @@ const isVisualizationVisible = ref(false)
     <div style="height: 76px">
       <div style="position: absolute; left: 32px">
         <CircularMenu
-          v-model:is-auto-evaluation-disabled="isAutoEvaluationDisabled"
-          v-model:is-docs-visible="isDocsVisible"
-          v-model:is-visualization-enabled="isVisualizationVisible"
-          @update:isAutoEvaluationDisabled="logEvent('update:isAutoEvaluationDisabled', [$event])"
+          v-model:isRecordingOverridden="isRecordingOverridden"
+          v-model:isDocsVisible="isDocsVisible"
+          v-model:isVisualizationEnabled="isVisualizationVisible"
+          :isRecordingEnabledGlobally="true"
+          :isFullMenuVisible="true"
+          :isRemovable="true"
+          :matchableNodeColors="emptySet"
+          :documentationUrl="undefined"
+          @update:isRecordingOverridden="logEvent('update:isRecordingOverridden', [$event])"
           @update:isDocsVisible="logEvent('update:isDocsVisible', [$event])"
           @update:isVisualizationVisible="logEvent('update:isVisualizationVisible', [$event])"
         />
@@ -30,7 +37,7 @@ const isVisualizationVisible = ref(false)
     </div>
 
     <template #controls>
-      <HstCheckbox v-model="isAutoEvaluationDisabled" title="isAutoEvaluationDisabled" />
+      <HstCheckbox v-model="isRecordingOverridden" title="isRecordingOverridden" />
       <HstCheckbox v-model="isDocsVisible" title="isDocsVisible" />
       <HstCheckbox v-model="isVisualizationVisible" title="isVisualizationVisible" />
     </template>
diff --git a/app/gui2/stories/ComponentBrowser.story.vue b/app/gui2/stories/ComponentBrowser.story.vue
index 51b205112fbf..50241c962c6b 100644
--- a/app/gui2/stories/ComponentBrowser.story.vue
+++ b/app/gui2/stories/ComponentBrowser.story.vue
@@ -2,12 +2,14 @@
 import { logEvent } from 'histoire/client'
 
 import ComponentBrowser from '@/components/ComponentBrowser.vue'
+import { Usage } from '@/components/ComponentBrowser/input'
 import { useSuggestionDbStore } from '@/stores/suggestionDatabase'
 import { Vec2 } from '@/util/data/vec2'
 import GroupColorsWrapper from './GroupColorsWrapper.vue'
 import NavigatorWrapper from './NavigatorWrapper.vue'
 
 const position = new Vec2(-329.5, 0)
+const usage: Usage = { type: 'newNode' }
 </script>
 
 <template>
@@ -29,7 +31,7 @@ const position = new Vec2(-329.5, 0)
           <ComponentBrowser
             :nodePosition="position"
             :navigator="navigator"
-            :initialContent="''"
+            :usage="usage"
             :sourcePort="null"
             :initialCaretPosition="[0, 0]"
             @finished="logEvent('finished', [])"
diff --git a/app/gui2/stories/GraphNode.story.vue b/app/gui2/stories/GraphNode.story.vue
index 55e1897b65ac..0d002ef9691b 100644
--- a/app/gui2/stories/GraphNode.story.vue
+++ b/app/gui2/stories/GraphNode.story.vue
@@ -8,8 +8,8 @@ import { Ast } from '@/util/ast'
 import { Rect } from '@/util/data/rect'
 import { Vec2 } from '@/util/data/vec2'
 import { logEvent } from 'histoire/client'
-import { type SourceRange } from 'shared/yjsModel'
 import { computed, reactive, ref, watchEffect } from 'vue'
+import { type SourceRange } from 'ydoc-shared/yjsModel'
 import { createSetupComponent } from './histoire/utils'
 
 const nodeBinding = ref('binding')
@@ -47,6 +47,7 @@ const node = computed((): Node => {
     vis: undefined,
     documentation: undefined,
     conditionalPorts: new Set(),
+    type: 'component',
   }
 })
 
@@ -64,7 +65,7 @@ const keyboard = useKeyboard()
 const navigator = useNavigator(ref(), keyboard)
 const allPortsEnabled = () => true
 const SetupStory = createSetupComponent((app) => {
-  const selection = provideGraphSelection._mock([navigator, mockRects, allPortsEnabled], app)
+  const selection = provideGraphSelection._mock([navigator, mockRects, allPortsEnabled, {}], app)
   watchEffect(() => {
     if (selected.value) {
       selection.selectAll()
@@ -82,6 +83,7 @@ const SetupStory = createSetupComponent((app) => {
       <GraphNode
         :edited="false"
         :node="node"
+        :graphNodeSelections="undefined"
         @movePosition="
           (nodeX += $event.x),
             (nodeY += $event.y),
diff --git a/app/gui2/stories/NavigatorWrapper.vue b/app/gui2/stories/NavigatorWrapper.vue
index 5462a117e0f9..fad509c36fe0 100644
--- a/app/gui2/stories/NavigatorWrapper.vue
+++ b/app/gui2/stories/NavigatorWrapper.vue
@@ -1,11 +1,13 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 
+import { useKeyboard } from '@/composables/keyboard'
 import { useNavigator } from '@/composables/navigator'
 
 const viewportNode = ref<HTMLElement>()
 
-const navigator = useNavigator(viewportNode)
+const keyboard = useKeyboard()
+const navigator = useNavigator(viewportNode, keyboard)
 </script>
 
 <template>
diff --git a/app/gui2/stories/SelectionBrush.story.vue b/app/gui2/stories/SelectionBrush.story.vue
index 77ae263e38ff..300b404da9d7 100644
--- a/app/gui2/stories/SelectionBrush.story.vue
+++ b/app/gui2/stories/SelectionBrush.story.vue
@@ -17,7 +17,7 @@ import SelectionBrushWrapper from './SelectionBrushWrapper.vue'
           v-if="scaledMousePos"
           :position="scaledMousePos"
           :anchor="scaledSelectionAnchor"
-          :style="{ transform: navigator.prescaledTransform }"
+          :transform="navigator.prescaledTransform"
         />
       </template>
     </SelectionBrushWrapper>
diff --git a/app/gui2/stories/SelectionBrushWrapper.vue b/app/gui2/stories/SelectionBrushWrapper.vue
index 93f328367a1f..739a09df8c79 100644
--- a/app/gui2/stories/SelectionBrushWrapper.vue
+++ b/app/gui2/stories/SelectionBrushWrapper.vue
@@ -2,12 +2,14 @@
 import { computed, ref, shallowRef } from 'vue'
 
 import { usePointer } from '@/composables/events'
+import { useKeyboard } from '@/composables/keyboard'
 import { useNavigator } from '@/composables/navigator'
 import type { Vec2 } from '@/util/data/vec2'
 
 const viewportNode = ref<HTMLElement>()
 
-const navigator = useNavigator(viewportNode)
+const keyboard = useKeyboard()
+const navigator = useNavigator(viewportNode, keyboard)
 
 const selectionAnchor = shallowRef<Vec2>()
 
diff --git a/app/gui2/stories/TopBar.story.vue b/app/gui2/stories/TopBar.story.vue
index 5418110066f7..0f2e6efed7dc 100644
--- a/app/gui2/stories/TopBar.story.vue
+++ b/app/gui2/stories/TopBar.story.vue
@@ -1,33 +1,24 @@
 <script setup lang="ts">
-import { logEvent } from 'histoire/client'
 import { ref } from 'vue'
 
 import TopBar from '@/components/TopBar.vue'
 
-const title = ref('Mock Project')
-const recordMode = ref(true)
-const breadcrumbs = ref(['main', 'ad_analytics'])
+const showColorPicker = ref(false)
+const showCodeEditor = ref(false)
+const showDocumentationEditor = ref(false)
 </script>
 
 <template>
   <Story title="Top Bar" group="graph" :layout="{ type: 'grid', width: 500 }" autoPropsDisabled>
     <div style="height: 48px">
       <TopBar
-        :title="title"
-        :recordMode="recordMode"
-        :breadcrumbs="breadcrumbs"
-        @back="logEvent('back', [])"
-        @forward="logEvent('forward', [])"
-        @recordOnce="logEvent('recordOnce', [])"
-        @breadcrumbClick="logEvent('breadcrumbClick', [$event])"
-        @update:recordMode="logEvent('update:recordMode', [$event]), (recordMode = $event)"
+        v-model:showColorPicker="showColorPicker"
+        v-model:showCodeEditor="showCodeEditor"
+        v-model:showDocumentationEditor="showDocumentationEditor"
+        :zoomLevel="1"
+        :componentsSelected="1"
       />
     </div>
-
-    <template #controls>
-      <HstText v-model="title" title="title" />
-      <HstJson v-model="recordMode" title="recordMode" />
-      <HstJson v-model="breadcrumbs" title="breadcrumbs" />
-    </template>
+    <template #controls></template>
   </Story>
 </template>
diff --git a/app/gui2/stories/UserDefinedVisualization.story.vue b/app/gui2/stories/UserDefinedVisualization.story.vue
index b2609c1ca1ea..f8c44b79e75e 100644
--- a/app/gui2/stories/UserDefinedVisualization.story.vue
+++ b/app/gui2/stories/UserDefinedVisualization.story.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import GraphVisualization from '@/components/GraphEditor/GraphVisualization.vue'
 import { Vec2 } from '@/util/data/vec2'
-import type { VisualizationIdentifier } from 'shared/yjsModel'
 import { computed, ref } from 'vue'
+import type { VisualizationIdentifier } from 'ydoc-shared/yjsModel'
 import MockFSWrapper from '../mock/MockFSWrapper.vue'
 import HstCode from './histoire/HstCode.vue'
 import HstDirectory from './histoire/HstDirectory.vue'
@@ -45,6 +45,7 @@ const props = defineProps<{ data: unknown }>()
 \x3c/style>`)
 
 const width = ref(0)
+const height = ref(500)
 const data = ref<any>({
   axis: {
     x: { label: 'x-axis label', scale: 'linear' },
@@ -84,6 +85,7 @@ const mockFsWrapperProps = computed(() => ({
           :currentType="currentType"
           :dataSource="{ type: 'raw', data }"
           :width="width"
+          :height="height"
           :scale="1"
           :nodePosition="nodePosition"
           :nodeSize="nodeSize"
diff --git a/app/gui2/stories/VisualizationSelector.story.vue b/app/gui2/stories/VisualizationSelector.story.vue
index cc6140082d12..e727568856e1 100644
--- a/app/gui2/stories/VisualizationSelector.story.vue
+++ b/app/gui2/stories/VisualizationSelector.story.vue
@@ -3,7 +3,7 @@ import { ref } from 'vue'
 
 import VisualizationSelector from '@/components/VisualizationSelector.vue'
 import { logEvent } from 'histoire/client'
-import type { VisualizationIdentifier } from 'shared/yjsModel'
+import type { VisualizationIdentifier } from 'ydoc-shared/yjsModel'
 
 const type = ref<VisualizationIdentifier>({
   module: { kind: 'Builtin' },
diff --git a/app/gui2/stories/Widgets.story.vue b/app/gui2/stories/Widgets.story.vue
index 08447404ba42..9186cff869cc 100644
--- a/app/gui2/stories/Widgets.story.vue
+++ b/app/gui2/stories/Widgets.story.vue
@@ -30,6 +30,9 @@ const color = ref('#357ab9')
 const backgroundColor = ref('#4778b4')
 const selectedValue = ref('location')
 const values = ref(['address', 'age', 'id', 'language', 'location', 'workplace'])
+const entries = computed(() =>
+  values.value.map((v) => ({ value: v, selected: selectedValue.value === v })),
+)
 </script>
 
 <template>
@@ -61,8 +64,7 @@ const values = ref(['address', 'age', 'id', 'language', 'location', 'workplace']
         <div style="position: relative">
           <DropdownWidget
             :color="color"
-            :values="values"
-            :selectedValue="selectedValue"
+            :entries="entries"
             @click="(selectedValue = values[$event]!), logEvent('click', [$event])"
           />
         </div>
diff --git a/app/gui2/stories/setup.ts b/app/gui2/stories/setup.ts
index b796bd135693..67bb0f6f77b6 100644
--- a/app/gui2/stories/setup.ts
+++ b/app/gui2/stories/setup.ts
@@ -2,16 +2,16 @@ import '@/assets/base.css'
 import { provideGuiConfig } from '@/providers/guiConfig'
 import { provideVisualizationConfig } from '@/providers/visualizationConfig'
 import { Vec2 } from '@/util/data/vec2'
-import { MockTransport } from '@/util/net'
+import { MockWebSocketTransport } from '@/util/net'
 import type { QualifiedName } from '@/util/qualifiedName'
 import { defineSetupVue3 } from '@histoire/plugin-vue'
 import * as random from 'lib0/random'
-import type { LibraryComponentGroup, Uuid, response } from 'shared/languageServerTypes'
+import { ref } from 'vue'
+import type { LibraryComponentGroup, Uuid, response } from 'ydoc-shared/languageServerTypes'
 import type {
   SuggestionEntry,
   SuggestionsDatabaseUpdate,
-} from 'shared/languageServerTypes/suggestions'
-import { ref } from 'vue'
+} from 'ydoc-shared/languageServerTypes/suggestions'
 import CustomBackground from './histoire/CustomBackground.vue'
 import mockDb from './mockSuggestions.json' assert { type: 'json' }
 import './story.css'
@@ -31,7 +31,7 @@ export function placeholderGroups(): LibraryComponentGroup[] {
   ]
 }
 
-MockTransport.addMock('engine', async (method, data, transport) => {
+MockWebSocketTransport.addMock('engine', async (method, data, transport) => {
   switch (method) {
     case 'session/initProtocolConnection':
       return {
@@ -81,7 +81,21 @@ export const setupVue3 = defineSetupVue3(({ app, addWrapper }) => {
         project: 'Mock Project',
         displayedProjectName: 'Mock Project',
       },
-      engine: { rpcUrl: 'mock://engine', dataUrl: 'mock://data' },
+      engine: {
+        rpcUrl: 'mock://engine',
+        dataUrl: 'mock://data',
+        ydocUrl: 'mock://ydoc',
+        namespace: 'local',
+        projectManagerUrl: 'mock://projectmanager',
+      },
+      window: {
+        topBarOffset: 96,
+        vibrancy: false,
+      },
+      authentication: {
+        enabled: false,
+        email: '',
+      },
     }),
     app,
   )
@@ -116,7 +130,11 @@ export const setupVue3 = defineSetupVue3(({ app, addWrapper }) => {
         },
       ],
       updateType() {},
-      addNode() {},
+      createNodes() {},
+      isFocused: false,
+      isPreview: false,
+      nodePosition: Vec2.Zero,
+      nodeType: 'component',
     },
     app,
   )
diff --git a/app/gui2/tsconfig.app.json b/app/gui2/tsconfig.app.json
index a26205c4faa1..8ee1f37ca449 100644
--- a/app/gui2/tsconfig.app.json
+++ b/app/gui2/tsconfig.app.json
@@ -1,32 +1,25 @@
 {
-  "extends": "@vue/tsconfig/tsconfig.dom.json",
+  "extends": "./tsconfig.json",
   "include": [
     "env.d.ts",
     "lib0-ext.d.ts",
     "src/**/*",
     "src/**/*.vue",
-    "shared/**/*",
-    "shared/**/*.vue",
+    "src/**/*.ts",
     "src/util/theme.json",
-    "stories/mockSuggestions.json",
     "mock/**/*",
     "mock/**/*.vue",
+    "stories/**/*",
+    "stories/**/*.json",
+    "stories/**/*.vue",
     "src/**/__tests__/*.json"
   ],
-  "exclude": ["src/**/__tests__/*", "shared/**/__tests__/*", "public/**/__tests__/*"],
+  "exclude": ["src/**/__tests__/*", "public/**/__tests__/*"],
   "compilerOptions": {
-    "lib": ["ES2021", "DOM", "DOM.Iterable"],
-    "resolvePackageJsonExports": false,
-    "composite": true,
-    "outDir": "../../node_modules/.cache/tsc",
-    "baseUrl": ".",
     "noEmit": true,
-    "strict": true,
     "allowImportingTsExtensions": true,
-    "noUncheckedIndexedAccess": true,
-    "exactOptionalPropertyTypes": true,
     "types": ["vitest/importMeta"],
     "paths": { "@/*": ["./src/*"] }
   },
-  "references": [{ "path": "../dashboard" }]
+  "references": [{ "path": "../dashboard" }, { "path": "../ydoc-shared" }]
 }
diff --git a/app/gui2/tsconfig.app.vitest.json b/app/gui2/tsconfig.app.vitest.json
index 2ea7a76c9cf4..46d159a56a01 100644
--- a/app/gui2/tsconfig.app.vitest.json
+++ b/app/gui2/tsconfig.app.vitest.json
@@ -2,7 +2,6 @@
   "extends": "./tsconfig.app.json",
   "exclude": [],
   "compilerOptions": {
-    "lib": [],
     "types": ["node", "jsdom", "vitest/importMeta"]
   }
 }
diff --git a/app/gui2/tsconfig.json b/app/gui2/tsconfig.json
index d5e03708b95a..2a89cd9daf86 100644
--- a/app/gui2/tsconfig.json
+++ b/app/gui2/tsconfig.json
@@ -1,13 +1,20 @@
 {
+  "extends": "../tsconfig.json",
   "files": [],
   "references": [
-    { "path": "../dashboard" },
     { "path": "./tsconfig.node.json" },
     { "path": "./tsconfig.app.json" },
     { "path": "./tsconfig.app.vitest.json" },
-    { "path": "./tsconfig.server.json" },
-    { "path": "./tsconfig.server.vitest.json" },
-    { "path": "./tsconfig.story.json" },
     { "path": "./tsconfig.scripts.json" }
-  ]
+  ],
+  "compilerOptions": {
+    "module": "Preserve",
+    "moduleResolution": "Bundler",
+    "customConditions": ["source"],
+    "composite": true,
+    "strict": true,
+    "strictNullChecks": true,
+    "noUncheckedIndexedAccess": true,
+    "exactOptionalPropertyTypes": true
+  }
 }
diff --git a/app/gui2/tsconfig.node.json b/app/gui2/tsconfig.node.json
index e7fd31f4b443..e989d33223d8 100644
--- a/app/gui2/tsconfig.node.json
+++ b/app/gui2/tsconfig.node.json
@@ -1,8 +1,9 @@
 {
-  "extends": "@tsconfig/node18/tsconfig.json",
+  "extends": "./tsconfig.json",
   "include": [
     "vite.config.*",
     "vitest.config.*",
+    "project-manager-shim-middleware/*.ts",
     "playwright.config.*",
     "eslint.config.js",
     "histoire.config.ts",
@@ -14,11 +15,7 @@
   "compilerOptions": {
     "baseUrl": ".",
     "module": "ESNext",
-    "moduleResolution": "Bundler",
-    "noUncheckedIndexedAccess": true,
-    "exactOptionalPropertyTypes": true,
     "verbatimModuleSyntax": true,
-    "outDir": "../../node_modules/.cache/tsc",
     "types": ["node", "vitest/importMeta"]
   }
 }
diff --git a/app/gui2/tsconfig.server.json b/app/gui2/tsconfig.server.json
deleted file mode 100644
index c536472f3824..000000000000
--- a/app/gui2/tsconfig.server.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "@tsconfig/node18/tsconfig.json",
-  "include": ["ydoc-server/**/*", "shared/**/*"],
-  "exclude": ["ydoc-server/**/__tests__/*", "shared/**/__tests__/*"],
-  "compilerOptions": {
-    "baseUrl": ".",
-    "module": "ESNext",
-    "moduleResolution": "Bundler",
-    "composite": true,
-    "outDir": "../../node_modules/.cache/tsc",
-    "types": ["node", "vitest/importMeta"]
-  }
-}
diff --git a/app/gui2/tsconfig.server.vitest.json b/app/gui2/tsconfig.server.vitest.json
deleted file mode 100644
index a700c2f90c56..000000000000
--- a/app/gui2/tsconfig.server.vitest.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "extends": "./tsconfig.server.json",
-  "exclude": [],
-  "compilerOptions": {
-    "lib": [],
-    "types": ["node", "vitest/importMeta"]
-  }
-}
diff --git a/app/gui2/tsconfig.story.json b/app/gui2/tsconfig.story.json
deleted file mode 100644
index 2d4046f9de43..000000000000
--- a/app/gui2/tsconfig.story.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "extends": "@vue/tsconfig/tsconfig.dom.json",
-  "include": [
-    "env.d.ts",
-    "lib0-ext.d.ts",
-    "env.story.d.ts",
-    "src/**/*",
-    "src/**/*.json",
-    "src/**/*.vue",
-    "shared/**/*",
-    "shared/**/*.vue",
-    "public/**/*",
-    "public/**/*.vue",
-    "mock/**/*",
-    "mock/**/*.vue",
-    "stories/**/*",
-    "stories/**/*.json",
-    "stories/**/*.vue"
-  ],
-  "exclude": ["src/**/__tests__/*"],
-  "compilerOptions": {
-    "lib": ["ES2021", "DOM", "DOM.Iterable"],
-    "resolvePackageJsonExports": false,
-    "composite": true,
-    "outDir": "../../node_modules/.cache/tsc",
-    "baseUrl": ".",
-    "noEmit": true,
-    "strict": true,
-    "allowImportingTsExtensions": true,
-    "noUncheckedIndexedAccess": true,
-    "exactOptionalPropertyTypes": true,
-    "types": ["vitest/importMeta"],
-    "paths": {
-      "@/*": ["./src/*"]
-    }
-  },
-  "references": [{ "path": "../dashboard" }]
-}
diff --git a/app/gui2/vite.config.ts b/app/gui2/vite.config.ts
index 4a4c5004254b..42bdc33a91cb 100644
--- a/app/gui2/vite.config.ts
+++ b/app/gui2/vite.config.ts
@@ -3,20 +3,19 @@
 import react from '@vitejs/plugin-react'
 import vue from '@vitejs/plugin-vue'
 import { getDefines, readEnvironmentFromFile } from 'enso-common/src/appConfig'
+import * as tailwindConfig from 'enso-dashboard/tailwind.config'
 import { fileURLToPath } from 'node:url'
 import postcssNesting from 'postcss-nesting'
 import tailwindcss from 'tailwindcss'
 import tailwindcssNesting from 'tailwindcss/nesting'
 import { defineConfig, type Plugin } from 'vite'
 import VueDevTools from 'vite-plugin-vue-devtools'
-// @ts-expect-error
-import * as tailwindConfig from 'enso-dashboard/tailwind.config'
-import { createGatewayServer } from './ydoc-server'
-const projectManagerUrl = 'ws://127.0.0.1:30535'
+import wasm from 'vite-plugin-wasm'
+const projectManagerUrl =
+  process.env.E2E === 'true' ? 'ws://127.0.0.1:30536' : 'ws://127.0.0.1:30535'
 
 const IS_CLOUD_BUILD = process.env.CLOUD_BUILD === 'true'
-const POLYGLOT_YDOC_SERVER = process.env.ENSO_POLYGLOT_YDOC_SERVER
-const YDOC_LS_DEBUG = process.env.ENSO_YDOC_LS_DEBUG
+const YDOC_SERVER_URL = process.env.ENSO_POLYGLOT_YDOC_SERVER ?? 'ws://localhost:5976'
 
 await readEnvironmentFromFile()
 
@@ -29,13 +28,13 @@ export default defineConfig({
   publicDir: fileURLToPath(new URL('./public', import.meta.url)),
   envDir: fileURLToPath(new URL('.', import.meta.url)),
   plugins: [
+    wasm(),
     VueDevTools(),
     vue(),
     react({
       include: fileURLToPath(new URL('../dashboard/**/*.tsx', import.meta.url)),
       babel: { plugins: ['@babel/plugin-syntax-import-attributes'] },
     }),
-    gatewayServer(),
     ...(process.env.NODE_ENV === 'development' ? [await projectManagerShim()] : []),
   ],
   optimizeDeps: {
@@ -48,6 +47,7 @@ export default defineConfig({
     },
   },
   resolve: {
+    conditions: ['source'],
     alias: {
       '/src/entrypoint.ts': fileURLToPath(new URL(entrypoint, import.meta.url)),
       shared: fileURLToPath(new URL('./shared', import.meta.url)),
@@ -58,14 +58,16 @@ export default defineConfig({
     ...getDefines(),
     IS_CLOUD_BUILD: JSON.stringify(IS_CLOUD_BUILD),
     PROJECT_MANAGER_URL: JSON.stringify(projectManagerUrl),
-    YDOC_SERVER_URL: JSON.stringify(POLYGLOT_YDOC_SERVER),
-    RUNNING_VITEST: false,
+    YDOC_SERVER_URL: JSON.stringify(YDOC_SERVER_URL),
     'import.meta.vitest': false,
     // Single hardcoded usage of `global` in aws-amplify.
     'global.TYPED_ARRAY_SUPPORT': true,
   },
   esbuild: {
     dropLabels: process.env.NODE_ENV === 'development' ? [] : ['DEV'],
+    supported: {
+      'top-level-await': true,
+    },
   },
   assetsInclude: ['**/*.yaml', '**/*.svg'],
   css: {
@@ -86,17 +88,6 @@ export default defineConfig({
     chunkSizeWarningLimit: 700,
   },
 })
-
-function gatewayServer(): Plugin {
-  return {
-    name: 'gateway-server',
-    configureServer({ httpServer }) {
-      if (httpServer == null || POLYGLOT_YDOC_SERVER != undefined) return
-      createGatewayServer(httpServer, undefined, YDOC_LS_DEBUG === 'true')
-    },
-  }
-}
-
 async function projectManagerShim(): Promise<Plugin> {
   const module = await import('./project-manager-shim-middleware')
   return {
diff --git a/app/gui2/vite.ydoc-server-polyglot.config.ts b/app/gui2/vite.ydoc-server-polyglot.config.ts
deleted file mode 100644
index 1c876b29e7c3..000000000000
--- a/app/gui2/vite.ydoc-server-polyglot.config.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import * as fs from 'node:fs'
-import { fileURLToPath } from 'node:url'
-import { defineConfig, type Plugin } from 'vite'
-import defaultConfig from './vite.config'
-
-const root = defaultConfig.root
-const cacheDir = defaultConfig.cacheDir
-const publicDir = defaultConfig.publicDir
-const envDir = defaultConfig.envDir
-const resolve = defaultConfig.resolve
-
-export default defineConfig({
-  root,
-  cacheDir,
-  publicDir,
-  envDir,
-  resolve,
-  plugins: [usePolyglotFfi()],
-  define: {
-    ...defaultConfig.define,
-    self: 'globalThis',
-  },
-  build: {
-    minify: false, // For debugging
-    emptyOutDir: true,
-    outDir: '../../lib/java/ydoc-server/target/ydoc-server-bundle',
-    rollupOptions: {
-      input: {
-        ydocServer: fileURLToPath(new URL('ydoc-server/indexPolyglot.ts', import.meta.url)),
-      },
-      output: {
-        entryFileNames: `assets/[name].js`,
-      },
-    },
-  },
-})
-
-/**
- * Use `ffiPolyglot` module as `ffi` interface during the build.
- */
-function usePolyglotFfi(): Plugin {
-  const ffiPolyglot = fileURLToPath(new URL('./shared/ast/ffiPolyglot.ts', import.meta.url))
-  const ffiBackup = fileURLToPath(new URL('./shared/ast/ffiBackup.ts', import.meta.url))
-  const ffi = fileURLToPath(new URL('./shared/ast/ffi.ts', import.meta.url))
-
-  return {
-    name: 'use-polyglot-ffi',
-    options: () => {
-      fs.renameSync(ffi, ffiBackup)
-      fs.copyFileSync(ffiPolyglot, ffi)
-    },
-    buildEnd: () => {
-      fs.renameSync(ffiBackup, ffi)
-    },
-  }
-}
diff --git a/app/gui2/vitest.config.ts b/app/gui2/vitest.config.ts
index 8df4885ef3a9..e85c2271f6e7 100644
--- a/app/gui2/vitest.config.ts
+++ b/app/gui2/vitest.config.ts
@@ -12,9 +12,6 @@ const config = mergeConfig(
       root: fileURLToPath(new URL('./', import.meta.url)),
       restoreMocks: true,
     },
-    define: {
-      RUNNING_VITEST: true,
-    },
   }),
 )
 config.esbuild.dropLabels = config.esbuild.dropLabels.filter((label: string) => label != 'DEV')
diff --git a/app/gui2/ydoc-server/index.ts b/app/gui2/ydoc-server/index.ts
deleted file mode 100644
index 62818b274148..000000000000
--- a/app/gui2/ydoc-server/index.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * @file An entry point for the Yjs gateway server. The gateway server is a WebSocket server that
- * synchronizes document requests and updates between language server and clients connected to the
- * Yjs document mesh. It also serves as a central point for synchronizing document data and
- * awareness updates between clients.
- *
- * Currently, this server is being run automatically in background as part of the vite development
- * server. It is not yet deployed to any other environment.
- */
-
-import type { Server } from 'http'
-import type { Http2SecureServer } from 'http2'
-import { IncomingMessage } from 'node:http'
-import { parse } from 'url'
-import { WebSocket, WebSocketServer } from 'ws'
-import { initializeFFI } from '../shared/ast/ffi'
-import { ConnectionData, docName } from './auth'
-import { setupGatewayClient } from './ydoc'
-
-export async function createGatewayServer(
-  httpServer: Server | Http2SecureServer,
-  rustFFIPath: string | undefined,
-  debug: boolean,
-) {
-  await initializeFFI(rustFFIPath)
-  const wss = new WebSocketServer({ noServer: true })
-  wss.on('connection', (ws: WebSocket, _request: IncomingMessage, data: ConnectionData) => {
-    ws.on('error', onWebSocketError)
-    setupGatewayClient(ws, data.lsUrl, data.doc, debug)
-  })
-
-  httpServer.on('upgrade', (request, socket, head) => {
-    socket.on('error', onHttpSocketError)
-    authenticate(request, function next(err, data) {
-      if (err != null) {
-        socket.write('HTTP/1.1 401 Unauthorized\r\n\r\n')
-        socket.destroy()
-        return
-      }
-      socket.removeListener('error', onHttpSocketError)
-      if (data != null) {
-        wss.handleUpgrade(request, socket, head, function done(ws) {
-          wss.emit('connection', ws, request, data)
-        })
-      }
-    })
-  })
-}
-
-function onWebSocketError(err: Error) {
-  console.log('WebSocket error:', err)
-}
-
-function onHttpSocketError(err: Error) {
-  console.log('HTTP socket error:', err)
-}
-
-function authenticate(
-  request: IncomingMessage,
-  callback: (err: Error | null, authData: ConnectionData | null) => void,
-) {
-  // FIXME: Stub. We don't implement authentication for now. Need to be implemented in combination
-  // with the language server.
-  const user = 'mock-user'
-
-  if (request.url == null) return callback(null, null)
-  const { pathname, query } = parse(request.url, true)
-  if (pathname == null) return callback(null, null)
-  const doc = docName(pathname)
-  const lsUrl = query.ls
-  const data = doc != null && typeof lsUrl === 'string' ? { lsUrl, doc, user } : null
-  callback(null, data)
-}
diff --git a/app/gui2/ydoc-server/indexPolyglot.ts b/app/gui2/ydoc-server/indexPolyglot.ts
deleted file mode 100644
index 8c86b84a16d1..000000000000
--- a/app/gui2/ydoc-server/indexPolyglot.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @file An entry point for polyglot Yjs gateway server.
- */
-
-import { docName } from './auth'
-import { setupGatewayClient } from './ydoc'
-
-declare global {
-  class WebSocketServer {
-    constructor(config: any)
-    onconnect: ((socket: any, url: any) => any) | null
-    start(): void
-  }
-
-  const YDOC_HOST: string | undefined
-  const YDOC_PORT: number | undefined
-  const YDOC_LS_DEBUG: boolean | undefined
-}
-
-const host = YDOC_HOST ?? 'localhost'
-const port = YDOC_PORT ?? 1234
-const debug = YDOC_LS_DEBUG ?? false
-
-const wss = new WebSocketServer({ host, port })
-
-wss.onconnect = (socket, url) => {
-  const doc = docName(url.pathname)
-  const ls = url.searchParams.get('ls')
-  if (doc != null && ls != null) {
-    console.log('setupGatewayClient', ls, doc)
-    setupGatewayClient(socket, ls, doc, debug)
-  } else {
-    console.log('Failed to authenticate user', ls, doc)
-  }
-}
-
-wss.start()
diff --git a/app/ide-desktop/client/esbuildConfig.ts b/app/ide-desktop/client/esbuildConfig.ts
index d82b1b45c782..a3acddb076e8 100644
--- a/app/ide-desktop/client/esbuildConfig.ts
+++ b/app/ide-desktop/client/esbuildConfig.ts
@@ -3,7 +3,7 @@ import * as path from 'node:path'
 import { fileURLToPath } from 'node:url'
 
 import type * as esbuild from 'esbuild'
-import esbuildPluginYaml from 'esbuild-plugin-yaml'
+import { wasmLoader } from 'esbuild-plugin-wasm'
 
 import * as appConfig from 'enso-common/src/appConfig'
 import * as paths from './paths'
@@ -45,12 +45,11 @@ export function bundlerOptions(
     outdir,
     entryPoints: ['src/index.ts', 'src/preload.ts'],
     outbase: 'src',
-    format: 'cjs',
+    format: 'esm',
     platform: 'node',
-    plugins: [esbuildPluginYaml.yamlPlugin({})],
-    // The names come from a third-party API and cannot be changed.
-    /* eslint-disable @typescript-eslint/naming-convention */
-    outExtension: { '.js': '.cjs' },
+    outExtension: { '.js': '.mjs' },
+    plugins: [wasmLoader()],
+    target: ['node20'], // electron31
     alias: {
       '@': fileURLToPath(new URL('./src', import.meta.url)),
     },
@@ -60,7 +59,7 @@ export function bundlerOptions(
       'process.env.GUI_CONFIG_PATH': JSON.stringify(path.resolve('../../gui2/vite.config.ts')),
     },
     /* eslint-enable @typescript-eslint/naming-convention */
-    sourcemap: true,
+    sourcemap: 'linked',
     external: ['electron', 'vite', 'lightningcss'],
   }
 }
diff --git a/app/ide-desktop/client/package.json b/app/ide-desktop/client/package.json
index f84372ad188e..ae63e6f86361 100644
--- a/app/ide-desktop/client/package.json
+++ b/app/ide-desktop/client/package.json
@@ -15,7 +15,7 @@
   },
   "name": "enso",
   "description": "Enso Data Processing Environment.",
-  "main": "index.cjs",
+  "main": "index.mjs",
   "dependencies": {
     "chalk": "^5.2.0",
     "create-servers": "3.2.0",
@@ -26,7 +26,8 @@
     "semver": "^7.6.2",
     "string-length": "^5.0.1",
     "tar": "^6.2.0",
-    "yargs": "17.6.2"
+    "yargs": "17.6.2",
+    "ydoc-server": "workspace:*"
   },
   "devDependencies": {
     "@babel/plugin-syntax-import-attributes": "^7.24.7",
@@ -44,23 +45,18 @@
     "enso-gui2": "workspace:*",
     "enso-runner": "workspace:*",
     "esbuild": "^0.19.3",
-    "esbuild-plugin-yaml": "^0.0.1",
+    "esbuild-plugin-wasm": "^1.1.0",
     "fast-glob": "^3.2.12",
-    "lightningcss": "^1.24.0",
     "portfinder": "^1.0.32",
-    "rollup": "^4.18.1",
-    "sharp": "^0.31.2",
-    "to-ico": "^1.1.5",
     "tsx": "^4.7.1",
     "vite": "^5.3.5"
   },
   "//": [
     "vite is required for the watch script",
-    "rollup is required for vite",
     "@babel/plugin-syntax-import-attributes is a dependency of the dashboard"
   ],
   "scripts": {
-    "typecheck": "npm run --workspace=enso-gui2 compile-server && tsc --build",
+    "typecheck": "tsc --build",
     "build": "tsx bundle.ts",
     "dist": "tsx dist.ts",
     "watch:windows": "cross-env ENSO_BUILD_IDE=%LOCALAPPDATA%/Temp/enso/dist/ide ENSO_BUILD_PROJECT_MANAGER=%CD%/../../../dist/backend ENSO_BUILD_PROJECT_MANAGER_IN_BUNDLE_PATH=bin/project-manager.exe ENSO_BUILD_IDE_BUNDLED_ENGINE_VERSION=0 tsx watch.ts",
diff --git a/app/ide-desktop/client/src/cjs-shim.ts b/app/ide-desktop/client/src/cjs-shim.ts
new file mode 100644
index 000000000000..fde2752ac9ac
--- /dev/null
+++ b/app/ide-desktop/client/src/cjs-shim.ts
@@ -0,0 +1,14 @@
+/**
+ * @file This file allows `require` to be used to resolve native node modules
+ * while executing in esm context. This is required, because some dependencies
+ * are still in commonjs format and use it. We need to run in esm context
+ * because wasm loader depends on dynamic import and top-level await.
+ */
+
+import { createRequire } from 'node:module'
+import { dirname } from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+globalThis.require = createRequire(import.meta.url)
+globalThis.__filename = fileURLToPath(import.meta.url)
+globalThis.__dirname = dirname(__filename)
diff --git a/app/ide-desktop/client/src/globals.d.ts b/app/ide-desktop/client/src/globals.d.ts
index 158f2c6b4cf8..7e9921856a7f 100644
--- a/app/ide-desktop/client/src/globals.d.ts
+++ b/app/ide-desktop/client/src/globals.d.ts
@@ -201,8 +201,6 @@ declare global {
       readonly ELECTRON_DEV_MODE?: string
       // @ts-expect-error The index signature is intentional to disallow unknown env vars.
       readonly GUI_CONFIG_PATH?: string
-      // @ts-expect-error The index signature is intentional to disallow unknown env vars.
-      readonly NODE_MODULES_PATH?: string
       /* eslint-enable @typescript-eslint/naming-convention */
     }
   }
diff --git a/app/ide-desktop/client/src/index.ts b/app/ide-desktop/client/src/index.ts
index f6792d535f05..ffc7023367c9 100644
--- a/app/ide-desktop/client/src/index.ts
+++ b/app/ide-desktop/client/src/index.ts
@@ -5,6 +5,8 @@
  * Inter-Process Communication channel, which enables seamless communication between the served web
  * application and the Electron process. */
 
+import './cjs-shim' // must be imported first
+
 import * as fsSync from 'node:fs'
 import * as fs from 'node:fs/promises'
 import * as os from 'node:os'
@@ -37,10 +39,6 @@ import * as urlAssociations from '@/urlAssociations'
 
 const logger = contentConfig.logger
 
-if (process.env.ELECTRON_DEV_MODE === 'true' && process.env.NODE_MODULES_PATH != null) {
-  module.paths.unshift(process.env.NODE_MODULES_PATH)
-}
-
 // ===========
 // === App ===
 // ===========
@@ -342,7 +340,7 @@ class App {
         this.args.groups.window.options.vibrancy.value &&= detect.supportsVibrancy()
         const useVibrancy = this.args.groups.window.options.vibrancy.value
         const webPreferences: electron.WebPreferences = {
-          preload: pathModule.join(paths.APP_PATH, 'preload.cjs'),
+          preload: pathModule.join(paths.APP_PATH, 'preload.mjs'),
           sandbox: true,
           backgroundThrottling: argGroups.performance.options.backgroundThrottling.value,
           enableBlinkFeatures: argGroups.chrome.options.enableBlinkFeatures.value,
diff --git a/app/ide-desktop/client/src/preload.ts b/app/ide-desktop/client/src/preload.ts
index eee7f4c700e7..75e6cfbd1217 100644
--- a/app/ide-desktop/client/src/preload.ts
+++ b/app/ide-desktop/client/src/preload.ts
@@ -3,14 +3,19 @@
  * APIs to the renderer via the contextBridge API. To learn more, visit:
  * https://www.electronjs.org/docs/latest/tutorial/tutorial-preload. */
 
-import * as electron from 'electron'
-
 import type * as dashboard from 'enso-dashboard'
 
 import * as debug from '@/debug'
 import * as ipc from '@/ipc'
 import type * as projectManagement from '@/projectManagement'
 
+// Even though this is already built as an mjs module, we are "faking" cjs format on preload script
+// due to missing module support. Since this is the only module that's treated as external by
+// esbuild, we have to manually use "require". Switch this to an import once new electron version
+// actually honours ".mjs" files for sandboxed preloading (this will likely become an error at that time).
+// https://www.electronjs.org/fr/docs/latest/tutorial/esm#sandboxed-preload-scripts-cant-use-esm-imports
+const electron = require('electron')
+
 // =================
 // === Constants ===
 // =================
diff --git a/app/ide-desktop/client/src/server.ts b/app/ide-desktop/client/src/server.ts
index 2c9aa26568c9..bfc3441179c7 100644
--- a/app/ide-desktop/client/src/server.ts
+++ b/app/ide-desktop/client/src/server.ts
@@ -1,7 +1,6 @@
 /** @file A simple HTTP server which serves application data to the Electron web-view. */
 
 import * as mkcert from 'mkcert'
-import * as fsSync from 'node:fs'
 import * as fs from 'node:fs/promises'
 import * as http from 'node:http'
 import * as path from 'node:path'
@@ -15,13 +14,16 @@ import type * as vite from 'vite'
 import * as projectManagement from '@/projectManagement'
 import * as common from 'enso-common'
 import GLOBAL_CONFIG from 'enso-common/src/config.json' assert { type: 'json' }
-import * as ydocServer from 'enso-gui2/ydoc-server'
+import * as ydocServer from 'ydoc-server'
 
 import * as contentConfig from '@/contentConfig'
 import * as paths from '@/paths'
+import { pathToFileURL } from 'node:url'
 
 const logger = contentConfig.logger
 
+ydocServer.configureAllDebugLogs(process.env.ENSO_YDOC_LS_DEBUG === 'true', logger.log)
+
 // =================
 // === Constants ===
 // =================
@@ -137,43 +139,26 @@ export class Server {
               reject(err)
             }
             const server = httpsServer ?? httpServer
-            // Prepare the YDoc server access point for the new Vue-based GUI.
-            // TODO[ao]: This is very ugly quickfix to make our rust-ffi WASM
-            // working both in browser and in ydocs server. Doing it properly
-            // is tracked in https://github.com/enso-org/enso/issues/8931
-            const assets = path.join(paths.ASSETS_PATH, 'assets')
-            const bundledFiles = fsSync.existsSync(assets) ? await fs.readdir(assets) : []
-            const rustFFIWasmName = bundledFiles.find(name => /rust_ffi_bg-.*\.wasm/.test(name))
-            const rustFFIWasmPath =
-              process.env.ELECTRON_DEV_MODE === 'true' ?
-                path.resolve('../../gui2/rust-ffi/pkg/rust_ffi_bg.wasm')
-              : rustFFIWasmName == null ? null
-              : path.join(assets, rustFFIWasmName)
-            if (server && rustFFIWasmPath != null) {
-              await ydocServer.createGatewayServer(
-                server,
-                rustFFIWasmPath,
-                process.env.ENSO_YDOC_LS_DEBUG === 'true',
-              )
+            if (server) {
+              await ydocServer.createGatewayServer(server)
             } else {
               logger.warn('YDocs server is not run, new GUI may not work properly!')
             }
             logger.log(`Server started on port ${this.config.port}.`)
             logger.log(`Serving files from '${path.join(process.cwd(), this.config.dir)}'.`)
-            resolve()
             if (process.env.ELECTRON_DEV_MODE === 'true') {
-              // eslint-disable-next-line no-restricted-syntax, @typescript-eslint/consistent-type-imports, @typescript-eslint/no-var-requires
-              const vite = require('vite') as typeof import('vite')
-              void vite
-                .createServer({
-                  server: {
-                    middlewareMode: true,
-                    hmr: server ? { server } : {},
-                  },
-                  configFile: process.env.GUI_CONFIG_PATH ?? false,
-                })
-                .then(devServer => (this.devServer = devServer))
+              const vite = (await import(
+                pathToFileURL(process.env.NODE_MODULES_PATH + '/vite/dist/node/index.js').href
+              )) as typeof import('vite')
+              this.devServer = await vite.createServer({
+                server: {
+                  middlewareMode: true,
+                  hmr: server ? { server } : {},
+                },
+                configFile: process.env.GUI_CONFIG_PATH ?? false,
+              })
             }
+            resolve()
           })()
         },
       )
@@ -320,11 +305,11 @@ export class Server {
 
       const resource = hasExtension ? requestUrl : '/index.html'
 
-      // `preload.cjs` must be specialcased here as it is loaded by electron from the root,
+      // `preload.mjs` must be specialcased here as it is loaded by electron from the root,
       // in contrast to all assets loaded by the window, which are loaded from `assets/` via
       // this server.
       const resourceFile =
-        resource === '/preload.cjs.map' ? paths.APP_PATH + resource : this.config.dir + resource
+        resource === '/preload.mjs.map' ? paths.APP_PATH + resource : this.config.dir + resource
       for (const [header, value] of common.COOP_COEP_CORP_HEADERS) {
         response.setHeader(header, value)
       }
diff --git a/app/ide-desktop/client/tsconfig.json b/app/ide-desktop/client/tsconfig.json
index 336b72dfa627..215d7a24f156 100644
--- a/app/ide-desktop/client/tsconfig.json
+++ b/app/ide-desktop/client/tsconfig.json
@@ -11,8 +11,5 @@
     "../../build.json",
     "src/config.json"
   ],
-  "references": [
-    { "path": "../../gui2/tsconfig.server.json" },
-    { "path": "../../dashboard" }
-  ]
+  "references": [{ "path": "../../dashboard" }]
 }
diff --git a/app/ide-desktop/client/watch.ts b/app/ide-desktop/client/watch.ts
index 661ede490d76..49ec8aab7f2a 100644
--- a/app/ide-desktop/client/watch.ts
+++ b/app/ide-desktop/client/watch.ts
@@ -49,8 +49,6 @@ const ALL_BUNDLES_READY = new Promise<Watches>((resolve, reject) => {
     const devMode = true
     const clientBundlerOpts = clientBundler.bundlerOptionsFromEnv(devMode)
     clientBundlerOpts.outdir = path.resolve(IDE_DIR_PATH)
-    // Eslint is wrong here; `clientBundlerOpts.plugins` is actually `undefined`.
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     ;(clientBundlerOpts.plugins ??= []).push({
       name: 'enso-on-rebuild',
       setup: build => {
@@ -93,7 +91,7 @@ const ELECTRON_FLAGS =
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
   process.env.ELECTRON_FLAGS == null ? [] : String(process.env.ELECTRON_FLAGS).split(' ')
 const ELECTRON_ARGS = [
-  path.join(IDE_DIR_PATH, 'index.cjs'),
+  path.join(IDE_DIR_PATH, 'index.mjs'),
   ...ELECTRON_FLAGS,
   '--',
   ...process.argv.slice(2),
diff --git a/app/ide-desktop/common/src/appConfig.js b/app/ide-desktop/common/src/appConfig.js
index 591fb0784b5e..343f93305ce3 100644
--- a/app/ide-desktop/common/src/appConfig.js
+++ b/app/ide-desktop/common/src/appConfig.js
@@ -19,7 +19,7 @@ export async function readEnvironmentFromFile() {
   const filePath = path.join(url.fileURLToPath(new URL('../..', import.meta.url)), fileName)
   const buildInfo = await (async () => {
     try {
-      return await import('../../../../build.json', { assert: { type: 'json' } })
+      return await import('../../../../build.json', { with: { type: 'json' } })
     } catch {
       return { commit: '', version: '', engineVersion: '', name: '' }
     }
diff --git a/app/ide-desktop/common/src/services/Backend.ts b/app/ide-desktop/common/src/services/Backend.ts
index 70aad310dea9..8a8d73277ae7 100644
--- a/app/ide-desktop/common/src/services/Backend.ts
+++ b/app/ide-desktop/common/src/services/Backend.ts
@@ -630,7 +630,7 @@ export interface LChColor {
 }
 
 /** A pre-selected list of colors to be used in color pickers. */
-export const COLORS: readonly [LChColor, ...LChColor[]] = [
+export const COLORS = [
   /* eslint-disable @typescript-eslint/no-magic-numbers */
   // Red
   { lightness: 50, chroma: 66, hue: 7 },
@@ -653,7 +653,7 @@ export const COLORS: readonly [LChColor, ...LChColor[]] = [
   // Dark blue
   { lightness: 22, chroma: 13, hue: 252 },
   /* eslint-enable @typescript-eslint/no-magic-numbers */
-]
+] as const satisfies LChColor[]
 
 /** Converts a {@link LChColor} to a CSS color string. */
 export function lChColorToCssColor(color: LChColor): string {
diff --git a/app/ide-desktop/common/src/utilities/style/tabBar.ts b/app/ide-desktop/common/src/utilities/style/tabBar.ts
index 3888a8ff896d..8888c21632fc 100644
--- a/app/ide-desktop/common/src/utilities/style/tabBar.ts
+++ b/app/ide-desktop/common/src/utilities/style/tabBar.ts
@@ -10,9 +10,6 @@ export function tabClipPath(
   radiusPx: number,
   side: 'top' | 'right' = 'top',
 ) {
-  console.log('bounds', JSON.stringify(bounds))
-  console.log('radiusPx', JSON.stringify(radiusPx))
-  console.log('side', JSON.stringify(side))
   const sweep0 = 0
   const sweep1 = 1
   const xIndex = side === 'top' ? 0 : 1
@@ -32,7 +29,6 @@ export function tabClipPath(
     `A ${radiusPx} ${radiusPx} 0 0 ${sweep0} ${pt(x1, y1)}`,
     `M ${pt(0, 0)}`,
   ])
-  console.log('result', JSON.stringify(result))
   return result
 }
 
diff --git a/app/gui2/rust-ffi/Cargo.toml b/app/rust-ffi/Cargo.toml
similarity index 71%
rename from app/gui2/rust-ffi/Cargo.toml
rename to app/rust-ffi/Cargo.toml
index e305e0c792e2..d53055941731 100644
--- a/app/gui2/rust-ffi/Cargo.toml
+++ b/app/rust-ffi/Cargo.toml
@@ -8,8 +8,8 @@ authors = ["Enso Team <contact@enso.org>"]
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-enso-parser = { path = "../../../lib/rust/parser" }
-enso-doc-parser = { path = "../../../lib/rust/parser/doc-parser" }
+enso-parser = { path = "../../lib/rust/parser" }
+enso-doc-parser = { path = "../../lib/rust/parser/doc-parser" }
 wasm-bindgen = { workspace = true }
 serde_json = { workspace = true }
 console_error_panic_hook = { workspace = true }
diff --git a/app/rust-ffi/package.json b/app/rust-ffi/package.json
new file mode 100644
index 000000000000..9dc794c2206b
--- /dev/null
+++ b/app/rust-ffi/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "rust-ffi",
+  "collaborators": [
+    "Enso Team <contact@enso.org>"
+  ],
+  "version": "0.1.0",
+  "scripts": {
+    "compile": "wasm-pack build . --release --out-dir pkg --target bundler",
+    "postinstall": "corepack pnpm compile"
+  },
+  "exports": {
+    ".": "./pkg/rust_ffi.js"
+  }
+}
diff --git a/app/gui2/rust-ffi/src/lib.rs b/app/rust-ffi/src/lib.rs
similarity index 100%
rename from app/gui2/rust-ffi/src/lib.rs
rename to app/rust-ffi/src/lib.rs
diff --git a/app/tsconfig.json b/app/tsconfig.json
index 2e7c7f02945a..e7cedc6bed9c 100644
--- a/app/tsconfig.json
+++ b/app/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "lib": ["DOM"],
+    "lib": ["ES2021", "DOM", "DOM.Iterable"],
     "composite": true,
     "rootDir": "../..",
     "allowSyntheticDefaultImports": true,
@@ -10,7 +10,6 @@
     "moduleResolution": "Bundler",
     "noEmit": true,
     "allowJs": true,
-    "checkJs": true,
     "strict": true,
     "noImplicitAny": true,
     "exactOptionalPropertyTypes": true,
@@ -21,7 +20,7 @@
     "resolveJsonModule": true,
     "sourceMap": true,
     "skipLibCheck": true,
-    "target": "ES2019",
+    "target": "ES2021",
     "jsx": "react-jsx"
   }
 }
diff --git a/app/ydoc-server-nodejs/build.mjs b/app/ydoc-server-nodejs/build.mjs
new file mode 100644
index 000000000000..db88e216a8d2
--- /dev/null
+++ b/app/ydoc-server-nodejs/build.mjs
@@ -0,0 +1,21 @@
+import esbuild from 'esbuild'
+import { wasmLoader } from 'esbuild-plugin-wasm'
+
+const watchMode = process.argv[2] === 'watch'
+
+const ctx = await esbuild.context({
+  outfile: 'dist/main.mjs',
+  sourcemap: 'linked',
+  entryPoints: ['src/main.ts'],
+  bundle: true,
+  platform: 'node',
+  target: ['node20'],
+  conditions: watchMode ? ['source'] : [],
+  format: 'esm',
+  plugins: [wasmLoader()],
+})
+if (watchMode) await ctx.watch()
+else {
+  await ctx.rebuild()
+  await ctx.dispose()
+}
diff --git a/app/ydoc-server-nodejs/package.json b/app/ydoc-server-nodejs/package.json
new file mode 100644
index 000000000000..2291ba359503
--- /dev/null
+++ b/app/ydoc-server-nodejs/package.json
@@ -0,0 +1,30 @@
+{
+  "version": "0.1.0",
+  "name": "ydoc-server-nodejs",
+  "private": true,
+  "type": "module",
+  "author": {
+    "name": "Enso Team",
+    "email": "contact@enso.org"
+  },
+  "module": "./dist/main.mjs",
+  "scripts": {
+    "compile": "node ./build.mjs build",
+    "start": "node ./dist/main.mjs",
+    "dev": "corepack pnpm run /^^^^dev:/",
+    "dev:esbuild": "node ./build.mjs watch",
+    "dev:start": "nodemon --watch dist ./dist/main.mjs",
+    "lint": "eslint .",
+    "format": "prettier --version && prettier --write src/ && eslint . --fix"
+  },
+  "dependencies": {
+    "ydoc-server": "workspace:*"
+  },
+  "devDependencies": {
+    "@types/node": "^20.11.21",
+    "esbuild": "^0.23.0",
+    "esbuild-plugin-wasm": "^1.1.0",
+    "nodemon": "^3.1.4",
+    "typescript": "^5.5.3"
+  }
+}
diff --git a/app/ydoc-server-nodejs/src/cjs-shim.ts b/app/ydoc-server-nodejs/src/cjs-shim.ts
new file mode 100644
index 000000000000..fde2752ac9ac
--- /dev/null
+++ b/app/ydoc-server-nodejs/src/cjs-shim.ts
@@ -0,0 +1,14 @@
+/**
+ * @file This file allows `require` to be used to resolve native node modules
+ * while executing in esm context. This is required, because some dependencies
+ * are still in commonjs format and use it. We need to run in esm context
+ * because wasm loader depends on dynamic import and top-level await.
+ */
+
+import { createRequire } from 'node:module'
+import { dirname } from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+globalThis.require = createRequire(import.meta.url)
+globalThis.__filename = fileURLToPath(import.meta.url)
+globalThis.__dirname = dirname(__filename)
diff --git a/app/ydoc-server-nodejs/src/main.ts b/app/ydoc-server-nodejs/src/main.ts
new file mode 100644
index 000000000000..e549839787e5
--- /dev/null
+++ b/app/ydoc-server-nodejs/src/main.ts
@@ -0,0 +1,30 @@
+/** @file entrypoint for standalone ydoc-server running in nodejs environment. */
+
+import './cjs-shim' // must be imported first
+
+import * as http from 'node:http'
+import { createGatewayServer } from 'ydoc-server'
+
+const DEFAULT_PORT = 5976
+const PORT = (process.env.PORT != null && parseInt(process.env.PORT, 10)) || DEFAULT_PORT
+const HOSTNAME = process.env.HOSTNAME ?? 'localhost'
+const LANGUAGE_SERVER_URL = process.env.LANGUAGE_SERVER_URL
+
+await runServer()
+
+/** Start http server that handles ydoc websocket connections. */
+async function runServer() {
+  const server = http.createServer()
+  server.on('request', (request, response) => {
+    if (request.method === 'GET' && request.url === '/_health') {
+      // eslint-disable-next-line @typescript-eslint/no-magic-numbers, @typescript-eslint/naming-convention
+      response.writeHead(200, { 'Content-Type': 'text/plain; charset=UTF-8' }).end('OK')
+    }
+  })
+
+  await createGatewayServer(server, LANGUAGE_SERVER_URL)
+
+  server.listen(PORT, HOSTNAME, () => {
+    console.log(`Ydoc server listening on ${HOSTNAME}:${PORT}`)
+  })
+}
diff --git a/app/ydoc-server-nodejs/tsconfig.json b/app/ydoc-server-nodejs/tsconfig.json
new file mode 100644
index 000000000000..eea0005cbe5b
--- /dev/null
+++ b/app/ydoc-server-nodejs/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig.json",
+  "include": ["src/**/*.ts"],
+  "references": [{ "path": "../ydoc-server" }],
+  "compilerOptions": {
+    "composite": true,
+    "noEmit": false,
+    "rootDir": "src",
+    "outDir": "dist",
+    "types": ["node"],
+    "paths": { "#/*": ["./src/*"] }
+  }
+}
diff --git a/app/ydoc-server-polyglot/build.mjs b/app/ydoc-server-polyglot/build.mjs
new file mode 100644
index 000000000000..72bf6cf3bd57
--- /dev/null
+++ b/app/ydoc-server-polyglot/build.mjs
@@ -0,0 +1,48 @@
+import esbuild from 'esbuild'
+import fs from 'fs/promises'
+import path from 'path'
+import url from 'url'
+
+const watchMode = process.argv[2] === 'watch'
+
+const ctx = await esbuild.context({
+  outfile: 'dist/main.cjs',
+  sourcemap: 'linked',
+  entryPoints: ['src/main.ts'],
+  bundle: true,
+  platform: 'browser',
+  define: {
+    self: 'globalThis',
+  },
+  plugins: [usePolyglotFfi()],
+  conditions: watchMode ? ['source'] : [],
+  external: ['node:url'], // Not actually used, tree-shaken out
+  format: 'cjs',
+})
+if (watchMode) await ctx.watch()
+else {
+  const result = await ctx.rebuild()
+  await ctx.dispose()
+}
+
+/** @type () => esbuild.Plugin */
+function usePolyglotFfi() {
+  return {
+    name: 'use-polyglot-ffi',
+    setup(build) {
+      const newPath = url.fileURLToPath(new URL('./src/ffiPolyglot.ts', import.meta.url))
+      build.onLoad(
+        {
+          filter: /ydoc-shared.*ast(\\|\/)ffi.(js|ts)$/,
+        },
+        async () => {
+          return {
+            contents: await fs.readFile(newPath),
+            resolveDir: path.dirname(newPath),
+            loader: 'ts',
+          }
+        },
+      )
+    },
+  }
+}
diff --git a/app/ydoc-server-polyglot/package.json b/app/ydoc-server-polyglot/package.json
new file mode 100644
index 000000000000..3226aa2b2ccb
--- /dev/null
+++ b/app/ydoc-server-polyglot/package.json
@@ -0,0 +1,29 @@
+{
+  "version": "0.1.0",
+  "name": "ydoc-server-polyglot",
+  "private": true,
+  "type": "commonjs",
+  "author": {
+    "name": "Enso Team",
+    "email": "contact@enso.org"
+  },
+  "main": "./dist/main.js",
+  "scripts": {
+    "compile": "node ./build.mjs build",
+    "start": "node ./dist/main.cjs",
+    "dev": "corepack pnpm run /^^^^dev:/",
+    "dev:esbuild": "node ./build.mjs watch",
+    "dev:start": "nodemon --watch dist ./dist/main.mjs"
+  },
+  "dependencies": {
+    "ydoc-shared": "workspace:*",
+    "ydoc-server": "workspace:*"
+  },
+  "devDependencies": {
+    "esbuild-plugin-wasm": "^1.1.0",
+    "@types/node": "^20.11.21",
+    "esbuild": "^0.23.0",
+    "nodemon": "^3.1.4",
+    "typescript": "^5.5.3"
+  }
+}
diff --git a/app/ydoc-server-polyglot/src/ffiPolyglot.ts b/app/ydoc-server-polyglot/src/ffiPolyglot.ts
new file mode 100644
index 000000000000..19bbc890dc5f
--- /dev/null
+++ b/app/ydoc-server-polyglot/src/ffiPolyglot.ts
@@ -0,0 +1,16 @@
+/**
+ * @file This file is used as rust ffi interface for building the polyglot ydoc server.
+ * All the exported methods are provided by the ydoc server implementation.
+ * The interface should be kept in sync with Rust ffi interface {@link ydoc-shared/src/ast/ffi}.
+ *
+ * @module ffiPolyglot
+ */
+
+/* eslint-disable camelcase */
+export const {
+  is_ident_or_operator,
+  is_numeric_literal,
+  parse_doc_to_json,
+  parse_tree,
+  xxHash128,
+} = globalThis
diff --git a/app/ydoc-server-polyglot/src/main.ts b/app/ydoc-server-polyglot/src/main.ts
new file mode 100644
index 000000000000..b5d91ccd9bb1
--- /dev/null
+++ b/app/ydoc-server-polyglot/src/main.ts
@@ -0,0 +1,22 @@
+import { configureAllDebugLogs, docName, setupGatewayClient } from 'ydoc-server'
+
+const host = YDOC_HOST ?? 'localhost'
+const port = YDOC_PORT ?? 1234
+const debug = YDOC_LS_DEBUG ?? false
+
+configureAllDebugLogs(debug)
+
+const wss = new WebSocketServer({ host, port })
+
+wss.onconnect = (socket, url) => {
+  const doc = docName(url.pathname)
+  const ls = url.searchParams.get('ls')
+  if (doc != null && ls != null) {
+    console.log('setupGatewayClient', ls, doc)
+    setupGatewayClient(socket, ls, doc)
+  } else {
+    console.log('Failed to authenticate user', ls, doc)
+  }
+}
+
+wss.start()
diff --git a/app/ydoc-server-polyglot/src/polyglot.d.ts b/app/ydoc-server-polyglot/src/polyglot.d.ts
new file mode 100644
index 000000000000..f42e691d18fc
--- /dev/null
+++ b/app/ydoc-server-polyglot/src/polyglot.d.ts
@@ -0,0 +1,20 @@
+/**
+ * @file Type declarations for environment provided in polyglot JVM runtime.
+ */
+
+declare class WebSocketServer {
+  constructor(config: any)
+  onconnect: ((socket: any, url: any) => any) | null
+  start(): void
+}
+
+declare const YDOC_HOST: string | undefined
+declare const YDOC_PORT: number | undefined
+declare const YDOC_LS_DEBUG: boolean | undefined
+
+// rust ffi shims
+declare function parse_tree(code: string): Uint8Array
+declare function parse_doc_to_json(docs: string): string
+declare function is_ident_or_operator(code: string): number
+declare function is_numeric_literal(code: string): boolean
+declare function xxHash128(input: IDataType): string
diff --git a/app/ydoc-server-polyglot/tsconfig.json b/app/ydoc-server-polyglot/tsconfig.json
new file mode 100644
index 000000000000..45430500217b
--- /dev/null
+++ b/app/ydoc-server-polyglot/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "extends": "../tsconfig.json",
+  "include": ["src/**/*.ts"],
+  "references": [{ "path": "../ydoc-server" }],
+  "compilerOptions": {
+    "composite": true,
+    "noEmit": false,
+    "rootDir": "src",
+    "outDir": "dist",
+    "paths": { "#/*": ["./src/*"] }
+  }
+}
diff --git a/app/ydoc-server/package.json b/app/ydoc-server/package.json
new file mode 100644
index 000000000000..d51066ee7ab3
--- /dev/null
+++ b/app/ydoc-server/package.json
@@ -0,0 +1,41 @@
+{
+  "version": "0.1.0",
+  "name": "ydoc-server",
+  "private": true,
+  "type": "module",
+  "author": {
+    "name": "Enso Team",
+    "email": "contact@enso.org"
+  },
+  "scripts": {
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "typecheck": "tsc",
+    "compile": "tsc"
+  },
+  "exports": {
+    ".": {
+      "source": "./src/index.ts",
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    }
+  },
+  "dependencies": {
+    "debug": "^4.3.6",
+    "fast-diff": "^1.3.0",
+    "isomorphic-ws": "^5.0.0",
+    "lib0": "^0.2.85",
+    "y-protocols": "^1.0.5",
+    "ydoc-shared": "workspace:*",
+    "yjs": "^13.6.7",
+    "zod": "^3.23.8"
+  },
+  "devDependencies": {
+    "@fast-check/vitest": "^0.0.8",
+    "@types/debug": "^4.1.12",
+    "@types/node": "^20.11.21",
+    "typescript": "^5.5.3",
+    "vite-plugin-wasm": "^3.3.0",
+    "vitest": "^1.3.1"
+  }
+}
diff --git a/app/gui2/ydoc-server/__tests__/edits.bench.ts b/app/ydoc-server/src/__tests__/edits.bench.ts
similarity index 100%
rename from app/gui2/ydoc-server/__tests__/edits.bench.ts
rename to app/ydoc-server/src/__tests__/edits.bench.ts
diff --git a/app/gui2/ydoc-server/__tests__/edits.test.ts b/app/ydoc-server/src/__tests__/edits.test.ts
similarity index 96%
rename from app/gui2/ydoc-server/__tests__/edits.test.ts
rename to app/ydoc-server/src/__tests__/edits.test.ts
index 2610c315bea4..8ec5eb93fffe 100644
--- a/app/gui2/ydoc-server/__tests__/edits.test.ts
+++ b/app/ydoc-server/src/__tests__/edits.test.ts
@@ -1,6 +1,6 @@
 import { fc, test } from '@fast-check/vitest'
-import { Position, TextEdit } from 'shared/languageServerTypes'
 import { describe, expect } from 'vitest'
+import { Position, TextEdit } from 'ydoc-shared/languageServerTypes'
 import { applyDiffAsTextEdits, stupidFastDiff } from '../edits'
 
 // ======================
@@ -40,8 +40,8 @@ function getNthLineLengthAndOffset(content: string, line: number) {
   const match = nthLineRegex.exec(content)
   if (!match) throw new Error(`Line ${line} not found in content:\n${content}`)
   return {
-    offset: match[1].length,
-    length: match[2].length,
+    offset: match[1]!.length,
+    length: match[2]!.length,
   }
 }
 
diff --git a/app/gui2/ydoc-server/auth.ts b/app/ydoc-server/src/auth.ts
similarity index 100%
rename from app/gui2/ydoc-server/auth.ts
rename to app/ydoc-server/src/auth.ts
diff --git a/app/gui2/shared/ast/generated/.gitkeep b/app/ydoc-server/src/debug.ts
similarity index 100%
rename from app/gui2/shared/ast/generated/.gitkeep
rename to app/ydoc-server/src/debug.ts
diff --git a/app/gui2/ydoc-server/edits.ts b/app/ydoc-server/src/edits.ts
similarity index 89%
rename from app/gui2/ydoc-server/edits.ts
rename to app/ydoc-server/src/edits.ts
index 1bd88a1ceb6b..88d075c67665 100644
--- a/app/gui2/ydoc-server/edits.ts
+++ b/app/ydoc-server/src/edits.ts
@@ -4,12 +4,12 @@
  */
 
 import diff from 'fast-diff'
-import type { ModuleUpdate } from '../shared/ast'
-import { MutableModule, print, spanMapToIdMap } from '../shared/ast'
-import { EnsoFileParts } from '../shared/ensoFile'
-import { TextEdit } from '../shared/languageServerTypes'
-import { assert } from '../shared/util/assert'
-import { IdMap, ModuleDoc, type VisualizationMetadata } from '../shared/yjsModel'
+import type { ModuleUpdate } from 'ydoc-shared/ast'
+import { MutableModule, print, spanMapToIdMap } from 'ydoc-shared/ast'
+import { EnsoFileParts } from 'ydoc-shared/ensoFile'
+import { TextEdit } from 'ydoc-shared/languageServerTypes'
+import { assert } from 'ydoc-shared/util/assert'
+import { IdMap, ModuleDoc, type VisualizationMetadata } from 'ydoc-shared/yjsModel'
 import * as fileFormat from './fileFormat'
 
 /**
@@ -76,7 +76,7 @@ export function applyDocumentUpdates(
     // Update the metadata object.
     // Depth-first key order keeps diffs small.
     newMetadata = {} satisfies fileFormat.IdeMetadata['node']
-    root.visitRecursiveAst((ast) => {
+    root.visitRecursiveAst(ast => {
       let pos = ast.nodeMetadata.get('position')
       const vis = ast.nodeMetadata.get('visualization')
       const colorOverride = ast.nodeMetadata.get('colorOverride')
@@ -268,22 +268,3 @@ export function prettyPrintDiff(from: string, to: string): string {
   content += colReset
   return content
 }
-
-if (import.meta.vitest) {
-  const { test, expect } = import.meta.vitest
-
-  test.each`
-    oldStr     | newStr      | expected
-    ${''}      | ${'foo'}    | ${[[1, 'foo']]}
-    ${'foo'}   | ${''}       | ${[[-1, 'foo']]}
-    ${'foo'}   | ${'foo'}    | ${[[0, 'foo']]}
-    ${'foo'}   | ${'bar'}    | ${[[-1, 'foo'], [1, 'bar']]}
-    ${'ababx'} | ${'acacx'}  | ${[[0, 'a'], [-1, 'bab'], [1, 'cac'], [0, 'x']]}
-    ${'ax'}    | ${'acacx'}  | ${[[0, 'a'], [1, 'cac'], [0, 'x']]}
-    ${'ababx'} | ${'ax'}     | ${[[0, 'a'], [-1, 'bab'], [0, 'x']]}
-    ${'ababx'} | ${'abacax'} | ${[[0, 'aba'], [-1, 'b'], [1, 'ca'], [0, 'x']]}
-    ${'axxxa'} | ${'a'}      | ${[[0, 'a'], [-1, 'xxxa']]}
-  `('Stupid diff of $oldStr and $newStr', ({ oldStr, newStr, expected }) => {
-    expect(stupidFastDiff(oldStr, newStr)).toEqual(expected)
-  })
-}
diff --git a/app/gui2/ydoc-server/fileFormat.ts b/app/ydoc-server/src/fileFormat.ts
similarity index 95%
rename from app/gui2/ydoc-server/fileFormat.ts
rename to app/ydoc-server/src/fileFormat.ts
index 3a97544edee0..5a5118aaba4f 100644
--- a/app/gui2/ydoc-server/fileFormat.ts
+++ b/app/ydoc-server/src/fileFormat.ts
@@ -1,5 +1,5 @@
 import * as json from 'lib0/json'
-import z from 'zod'
+import { z } from 'zod'
 
 export type Vector = z.infer<typeof vector>
 export const vector = z.tuple([z.number(), z.number()])
@@ -25,7 +25,7 @@ const visualizationMetadata = z
 export type NodeMetadata = z.infer<typeof nodeMetadata>
 export const nodeMetadata = z
   .object({
-    position: z.object({ vector }).catch((ctx) => {
+    position: z.object({ vector }).catch(ctx => {
       printError(ctx)
       return { vector: [0, 0] satisfies Vector }
     }),
@@ -45,7 +45,7 @@ export const ideMetadata = z
   })
   .passthrough()
   .default(() => defaultMetadata().ide)
-  .catch((ctx) => {
+  .catch(ctx => {
     printError(ctx)
     return defaultMetadata().ide
   })
@@ -56,7 +56,7 @@ export const metadata = z
     ide: ideMetadata,
   })
   .passthrough()
-  .catch((ctx) => {
+  .catch(ctx => {
     printError(ctx)
     return defaultMetadata()
   })
@@ -76,7 +76,7 @@ export type IdMapEntry = z.infer<typeof idMapEntry>
 export const idMapEntry = z.tuple([idMapRange, z.string().uuid()])
 
 export type IdMap = z.infer<typeof idMap>
-export const idMap = z.array(idMapEntry).catch((ctx) => {
+export const idMap = z.array(idMapEntry).catch(ctx => {
   printError(ctx)
   return []
 })
diff --git a/app/ydoc-server/src/index.ts b/app/ydoc-server/src/index.ts
new file mode 100644
index 000000000000..1d9900a6f7fa
--- /dev/null
+++ b/app/ydoc-server/src/index.ts
@@ -0,0 +1,90 @@
+/**
+ * @file An entry point for the Yjs gateway server. The gateway server is a WebSocket server that
+ * synchronizes document requests and updates between language server and clients connected to the
+ * Yjs document mesh. It also serves as a central point for synchronizing document data and
+ * awareness updates between clients.
+ *
+ * Currently, this server is being run automatically in background as part of the vite development
+ * server. It is not yet deployed to any other environment.
+ */
+
+import debug from 'debug'
+import type { Server } from 'http'
+import type { Http2SecureServer } from 'http2'
+import type { WebSocket } from 'isomorphic-ws'
+import type { IncomingMessage } from 'node:http'
+import { ConnectionData, docName } from './auth'
+import { deserializeIdMap } from './serialization'
+import { setupGatewayClient } from './ydoc'
+
+export { deserializeIdMap, docName, setupGatewayClient }
+
+/**
+ * @param customLogger Optional external logger to use for all debug logs.
+ */
+export function configureAllDebugLogs(
+  forceEnable: boolean,
+  customLogger?: (...args: any[]) => any,
+) {
+  for (const debugModule of ['ydoc-server:session', 'ydoc-shared:languageServer']) {
+    const instance = debug(debugModule)
+    if (forceEnable) instance.enabled = true
+    if (customLogger) instance.log = customLogger
+  }
+}
+
+export async function createGatewayServer(
+  httpServer: Server | Http2SecureServer,
+  overrideLanguageServerUrl?: string,
+) {
+  const { WebSocketServer } = await import('isomorphic-ws')
+  const { parse } = await import('node:url')
+
+  const wss = new WebSocketServer({ noServer: true })
+  wss.on('connection', (ws: WebSocket, _request: IncomingMessage, data: ConnectionData) => {
+    ws.on('error', onWebSocketError)
+    setupGatewayClient(ws, overrideLanguageServerUrl ?? data.lsUrl, data.doc)
+  })
+
+  httpServer.on('upgrade', (request, socket, head) => {
+    socket.on('error', onHttpSocketError)
+    authenticate(request, function next(err, data) {
+      if (err != null) {
+        socket.write('HTTP/1.1 401 Unauthorized\r\n\r\n')
+        socket.destroy()
+        return
+      }
+      socket.removeListener('error', onHttpSocketError)
+      if (data != null) {
+        wss.handleUpgrade(request, socket, head, function done(ws) {
+          wss.emit('connection', ws, request, data)
+        })
+      }
+    })
+  })
+
+  function onWebSocketError(err: Error) {
+    console.log('WebSocket error:', err)
+  }
+
+  function onHttpSocketError(err: Error) {
+    console.log('HTTP socket error:', err)
+  }
+
+  function authenticate(
+    request: IncomingMessage,
+    callback: (err: Error | null, authData: ConnectionData | null) => void,
+  ) {
+    // FIXME: Stub. We don't implement authentication for now. Need to be implemented in combination
+    // with the language server.
+    const user = 'mock-user'
+
+    if (request.url == null) return callback(null, null)
+    const { pathname, query } = parse(request.url, true)
+    if (pathname == null) return callback(null, null)
+    const doc = docName(pathname)
+    const lsUrl = query.ls
+    const data = doc != null && typeof lsUrl === 'string' ? { lsUrl, doc, user } : null
+    callback(null, data)
+  }
+}
diff --git a/app/gui2/ydoc-server/languageServerSession.ts b/app/ydoc-server/src/languageServerSession.ts
similarity index 91%
rename from app/gui2/ydoc-server/languageServerSession.ts
rename to app/ydoc-server/src/languageServerSession.ts
index e229934368e8..b1efa4368ead 100644
--- a/app/gui2/ydoc-server/languageServerSession.ts
+++ b/app/ydoc-server/src/languageServerSession.ts
@@ -1,12 +1,12 @@
+import createDebug from 'debug'
 import * as json from 'lib0/json'
 import * as map from 'lib0/map'
 import { ObservableV2 } from 'lib0/observable'
 import * as random from 'lib0/random'
-import * as Y from 'yjs'
-import * as Ast from '../shared/ast'
-import { astCount } from '../shared/ast'
-import { EnsoFileParts, combineFileParts, splitFileContents } from '../shared/ensoFile'
-import { LanguageServer, computeTextChecksum } from '../shared/languageServer'
+import * as Ast from 'ydoc-shared/ast'
+import { astCount } from 'ydoc-shared/ast'
+import { EnsoFileParts, combineFileParts, splitFileContents } from 'ydoc-shared/ensoFile'
+import { LanguageServer, computeTextChecksum } from 'ydoc-shared/languageServer'
 import {
   Checksum,
   FileEdit,
@@ -14,11 +14,15 @@ import {
   Path,
   TextEdit,
   response,
-} from '../shared/languageServerTypes'
-import { assertNever } from '../shared/util/assert'
-import { Err, Ok, Result, withContext } from '../shared/util/data/result'
-import { AbortScope, exponentialBackoff, printingCallbacks } from '../shared/util/net'
-import ReconnectingWebSocketTransport from '../shared/util/net/ReconnectingWSTransport'
+} from 'ydoc-shared/languageServerTypes'
+import { assertNever } from 'ydoc-shared/util/assert'
+import { Err, Ok, Result, withContext } from 'ydoc-shared/util/data/result'
+import {
+  AbortScope,
+  ReconnectingWebSocketTransport,
+  exponentialBackoff,
+  printingCallbacks,
+} from 'ydoc-shared/util/net'
 import {
   DistributedProject,
   ExternalId,
@@ -26,7 +30,8 @@ import {
   ModuleDoc,
   visMetadataEquals,
   type Uuid,
-} from '../shared/yjsModel'
+} from 'ydoc-shared/yjsModel'
+import * as Y from 'yjs'
 import {
   applyDiffAsTextEdits,
   applyDocumentUpdates,
@@ -40,6 +45,8 @@ import { WSSharedDoc } from './ydoc'
 const SOURCE_DIR = 'src'
 const EXTENSION = '.enso'
 
+const debugLog = createDebug('ydoc-server:session')
+
 export class LanguageServerSession {
   clientId: Uuid
   indexDoc: WSSharedDoc
@@ -52,9 +59,10 @@ export class LanguageServerSession {
   projectRootId: Uuid | null
   authoritativeModules: Map<string, ModulePersistence>
   clientScope: AbortScope
-  debug: boolean
 
-  constructor(url: string, debug: boolean) {
+  static DEBUG = false
+
+  constructor(url: string) {
     this.clientScope = new AbortScope()
     this.clientId = random.uuidv4() as Uuid
     this.docs = new Map()
@@ -75,18 +83,17 @@ export class LanguageServerSession {
         if (!persistence) continue
       }
     })
-    this.ls = new LanguageServer(this.clientId, new ReconnectingWebSocketTransport(this.url), debug)
+    this.ls = new LanguageServer(this.clientId, new ReconnectingWebSocketTransport(this.url))
     this.clientScope.onAbort(() => this.ls.release())
     this.setupClient()
-    this.debug = debug
   }
 
   static sessions = new Map<string, LanguageServerSession>()
-  static get(url: string, debug: boolean): LanguageServerSession {
+  static get(url: string): LanguageServerSession {
     const session = map.setIfUndefined(
       LanguageServerSession.sessions,
       url,
-      () => new LanguageServerSession(url, debug),
+      () => new LanguageServerSession(url),
     )
     session.retain()
     return session
@@ -98,10 +105,8 @@ export class LanguageServerSession {
   }
 
   private setupClient() {
-    this.ls.on('file/event', async (event) => {
-      if (this.debug) {
-        console.log('file/event', event)
-      }
+    this.ls.on('file/event', async event => {
+      debugLog('file/event %O', event)
       const result = await this.handleFileEvent(event)
       if (!result.ok) this.restartClient()
     })
@@ -114,7 +119,7 @@ export class LanguageServerSession {
       if (!result.ok) this.restartClient()
     }
     this.ls.on('text/fileModifiedOnDisk', fileModified)
-    this.ls.on('text/didChange', (event) => {
+    this.ls.on('text/didChange', event => {
       for (const edit of event.edits) {
         fileModified(edit)
       }
@@ -122,7 +127,7 @@ export class LanguageServerSession {
     exponentialBackoff(
       () => this.readInitialState(),
       printingCallbacks('read initial state', 'read initial state'),
-    ).then((result) => {
+    ).then(result => {
       if (!result.ok) {
         result.error.log('Could not read initial state')
         exponentialBackoff(
@@ -173,7 +178,7 @@ export class LanguageServerSession {
       () => 'When reading initial state',
       async () => {
         let moduleOpenPromises: Promise<Result<void>>[] = []
-        const projectRoot = (await this.ls.contentRoots).find((root) => root.type === 'Project')
+        const projectRoot = (await this.ls.contentRoots).find(root => root.type === 'Project')
         if (!projectRoot) return Err('Missing project root')
         this.projectRootId = projectRoot.id
         const aquireResult = await this.ls.acquireReceivesTreeUpdates({
@@ -185,13 +190,13 @@ export class LanguageServerSession {
         if (!files.ok) return files
         moduleOpenPromises = this.indexDoc.doc.transact(
           () =>
-            files.value.map((file) =>
+            files.value.map(file =>
               this.getModuleModel(pushPathSegment(file.path, file.name)).open(),
             ),
           this,
         )
         const results = await Promise.all(moduleOpenPromises)
-        return results.find((res) => !res.ok) ?? Ok()
+        return results.find(res => !res.ok) ?? Ok()
       },
     )
   }
@@ -202,9 +207,7 @@ export class LanguageServerSession {
     const srcModules = await this.ls.listFiles(sourceDir)
     if (!srcModules.ok) return srcModules
     return Ok(
-      srcModules.value.paths.filter(
-        (file) => file.type === 'File' && file.name.endsWith(EXTENSION),
-      ),
+      srcModules.value.paths.filter(file => file.type === 'File' && file.name.endsWith(EXTENSION)),
     )
   }
 
@@ -238,7 +241,7 @@ export class LanguageServerSession {
     this.retainCount -= 1
     if (this.retainCount !== 0) return
     const modules = this.authoritativeModules.values()
-    const moduleDisposePromises = Array.from(modules, (mod) => mod.dispose())
+    const moduleDisposePromises = Array.from(modules, mod => mod.dispose())
     this.authoritativeModules.clear()
     this.model.doc.destroy()
     this.clientScope.dispose('LangueServerSession disposed.')
@@ -253,7 +256,9 @@ export class LanguageServerSession {
 
 function isSourceFile(path: Path): boolean {
   return (
-    path.segments[0] === SOURCE_DIR && path.segments[path.segments.length - 1].endsWith(EXTENSION)
+    (path.segments[0] === SOURCE_DIR &&
+      path.segments[path.segments.length - 1]?.endsWith(EXTENSION)) ??
+    false
   )
 }
 
@@ -328,9 +333,7 @@ class ModulePersistence extends ObservableV2<{ removed: () => void }> {
 
   private setState(state: LsSyncState) {
     if (this.state !== LsSyncState.Disposed) {
-      if (this.ls.debug) {
-        console.debug('State change:', LsSyncState[this.state], '->', LsSyncState[state])
-      }
+      debugLog('State change: %o -> %o', LsSyncState[this.state], LsSyncState[state])
       // This is SAFE. `this.state` is only `readonly` to ensure that this is the only place
       // where it is mutated.
       // @ts-expect-error
@@ -395,9 +398,7 @@ class ModulePersistence extends ObservableV2<{ removed: () => void }> {
           case LsSyncState.Closed: {
             await this.withState(LsSyncState.Opening, async () => {
               const promise = this.ls.openTextFile(this.path)
-              this.setLastAction(
-                promise.then((res) => !res.ok && this.setState(LsSyncState.Closed)),
-              )
+              this.setLastAction(promise.then(res => !res.ok && this.setState(LsSyncState.Closed)))
               const result = await promise
               if (!result.ok) return result
               if (!result.value.writeCapability) {
@@ -505,15 +506,14 @@ class ModulePersistence extends ObservableV2<{ removed: () => void }> {
 
     const newVersion = computeTextChecksum(newContent)
 
-    if (this.ls.debug) {
-      console.debug(' === changes === ')
-      console.debug('number of edits:', edits.length)
+    if (debugLog.enabled) {
+      debugLog(' === changes === ')
+      debugLog('number of edits: %d', edits.length)
       if (edits.length > 0) {
-        console.debug('version:', this.syncedVersion, '->', newVersion)
-        console.debug('Content diff:')
-        console.debug(prettyPrintDiff(this.syncedContent, newContent))
+        debugLog('version: %s -> %s', this.syncedVersion, newVersion)
+        debugLog('Content diff:\n%s', prettyPrintDiff(this.syncedContent, newContent))
       }
-      console.debug(' =============== ')
+      debugLog(' =============== ')
     }
 
     this.setState(LsSyncState.WritingFile)
@@ -533,7 +533,7 @@ class ModulePersistence extends ObservableV2<{ removed: () => void }> {
       this.syncedMetaJson = null
       return this.reload()
     }
-    const promise = apply.then((result) => {
+    const promise = apply.then(result => {
       if (!result.ok) return handleError(result.error)
       this.syncedContent = newContent
       this.syncedVersion = newVersion
@@ -602,7 +602,7 @@ class ModulePersistence extends ObservableV2<{ removed: () => void }> {
         nodeMeta.length !== 0
       ) {
         const externalIdToAst = new Map<ExternalId, Ast.Ast>()
-        astRoot.visitRecursiveAst((ast) => {
+        astRoot.visitRecursiveAst(ast => {
           if (!externalIdToAst.has(ast.externalId)) externalIdToAst.set(ast.externalId, ast)
         })
         const missing = new Set<string>()
@@ -707,7 +707,7 @@ class ModulePersistence extends ObservableV2<{ removed: () => void }> {
           case LsSyncState.WriteError: {
             return this.withState(LsSyncState.Reloading, async () => {
               const path = this.path.segments.join('/')
-              const reloading = this.ls.closeTextFile(this.path).then(async (closing) => {
+              const reloading = this.ls.closeTextFile(this.path).then(async closing => {
                 if (!closing.ok) closing.error.log('Could not close file after write error:')
                 return exponentialBackoff(
                   async () => {
diff --git a/app/gui2/ydoc-server/serialization.ts b/app/ydoc-server/src/serialization.ts
similarity index 95%
rename from app/gui2/ydoc-server/serialization.ts
rename to app/ydoc-server/src/serialization.ts
index f00bb47351ed..f385dfc65166 100644
--- a/app/gui2/ydoc-server/serialization.ts
+++ b/app/ydoc-server/src/serialization.ts
@@ -1,7 +1,7 @@
 /** Translation of `yjsModel` types to and from the `fileFormat` representation. */
 
 import * as json from 'lib0/json'
-import { ExternalId, IdMap, sourceRangeFromKey } from '../shared/yjsModel'
+import { ExternalId, IdMap, sourceRangeFromKey } from 'ydoc-shared/yjsModel'
 import * as fileFormat from './fileFormat'
 
 export function deserializeIdMap(idMapJson: string) {
diff --git a/app/gui2/ydoc-server/ydoc.ts b/app/ydoc-server/src/ydoc.ts
similarity index 97%
rename from app/gui2/ydoc-server/ydoc.ts
rename to app/ydoc-server/src/ydoc.ts
index 276837de98e4..87e9fb144197 100644
--- a/app/gui2/ydoc-server/ydoc.ts
+++ b/app/ydoc-server/src/ydoc.ts
@@ -89,10 +89,9 @@ export class WSSharedDoc {
  * will be assigned its own `DistributedProject` instance with a unique namespace of Yjs documents.
  * @param docName The name of the document to synchronize. When the document name is `index`, the
  * document is considered to be the root document of the `DistributedProject` data model.
- * @param debug Print debug logs if true.
  */
-export function setupGatewayClient(ws: WebSocket, lsUrl: string, docName: string, debug: boolean) {
-  const lsSession = LanguageServerSession.get(lsUrl, debug)
+export function setupGatewayClient(ws: WebSocket, lsUrl: string, docName: string) {
+  const lsSession = LanguageServerSession.get(lsUrl)
   const wsDoc = lsSession.getYDoc(docName)
   if (wsDoc == null) {
     console.error(`Document '${docName}' not found in language server session '${lsUrl}'.`)
@@ -170,7 +169,7 @@ class YjsConnection extends ObservableV2<{ close(): void }> {
       this.close()
     }
     try {
-      this.ws.send(message, (error) => error && this.close())
+      this.ws.send(message, error => error && this.close())
     } catch (e) {
       this.close()
     }
diff --git a/app/ydoc-server/tsconfig.json b/app/ydoc-server/tsconfig.json
new file mode 100644
index 000000000000..b09e19487668
--- /dev/null
+++ b/app/ydoc-server/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig.json",
+  "include": ["src/**/*.ts"],
+  "references": [{ "path": "../ydoc-shared" }],
+  "compilerOptions": {
+    "composite": true,
+    "noEmit": false,
+    "rootDir": "src",
+    "outDir": "dist",
+    "types": ["node", "vitest/importMeta"],
+    "paths": { "#/*": ["./src/*"] }
+  }
+}
diff --git a/app/ydoc-server/vitest.config.ts b/app/ydoc-server/vitest.config.ts
new file mode 100644
index 000000000000..6019cc586b8e
--- /dev/null
+++ b/app/ydoc-server/vitest.config.ts
@@ -0,0 +1,15 @@
+import wasm from 'vite-plugin-wasm'
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  plugins: [wasm()],
+  build: {
+    lib: {
+      entry: 'src/index.ts',
+      formats: ['es'],
+    },
+  },
+  resolve: {
+    conditions: ['source'],
+  },
+})
diff --git a/app/ydoc-shared/package.json b/app/ydoc-shared/package.json
new file mode 100644
index 000000000000..e96d8b533801
--- /dev/null
+++ b/app/ydoc-shared/package.json
@@ -0,0 +1,60 @@
+{
+  "version": "0.1.0",
+  "name": "ydoc-shared",
+  "private": true,
+  "type": "module",
+  "author": {
+    "name": "Enso Team",
+    "email": "contact@enso.org"
+  },
+  "scripts": {
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "compile": "tsc",
+    "typecheck": "tsc",
+    "clean": "rimraf --glob src/ast/generated/*.{json,ts}",
+    "generate": "corepack pnpm run generate:ast-schema && corepack pnpm run generate:ast-types",
+    "generate:ast-schema": "cargo run -p enso-parser-schema > src/ast/generated/ast-schema.json",
+    "generate:ast-types": "vite-node ./parser-codegen/index.ts src/ast/generated/ast-schema.json src/ast/generated/ast.ts",
+    "generate:ast-types-lazy": "vite-node ./parser-codegen/index.ts src/ast/generated/ast-schema.json src/ast/generated/ast.ts --if-changed",
+    "format": "prettier --version && prettier --write src/ && eslint . --fix",
+    "postinstall": "corepack pnpm run generate:ast-schema && corepack pnpm run generate:ast-types-lazy"
+  },
+  "exports": {
+    "./ast": {
+      "source": "./src/ast/index.ts",
+      "types": "./dist/ast/index.d.ts",
+      "import": "./dist/ast/index.js"
+    },
+    "./*": {
+      "source": "./src/*.ts",
+      "types": "./dist/*.d.ts",
+      "import": "./dist/*.js"
+    }
+  },
+  "dependencies": {
+    "@noble/hashes": "^1.4.0",
+    "@open-rpc/client-js": "^1.8.1",
+    "@types/debug": "^4.1.12",
+    "change-case": "^4.1.2",
+    "debug": "^4.3.6",
+    "fast-diff": "^1.3.0",
+    "hash-wasm": "^4.11.0",
+    "isomorphic-ws": "^5.0.0",
+    "lib0": "^0.2.85",
+    "partysocket": "^1.0.1",
+    "rimraf": "^6.0.1",
+    "rust-ffi": "workspace:*",
+    "yjs": "^13.6.7",
+    "zod": "^3.23.8"
+  },
+  "devDependencies": {
+    "@fast-check/vitest": "^0.0.8",
+    "@tsconfig/node20": "^20.1.4",
+    "@types/node": "^20.11.21",
+    "typescript": "^5.5.3",
+    "vite-node": "^2.0.4",
+    "vite-plugin-wasm": "^3.3.0",
+    "vitest": "^1.3.1"
+  }
+}
diff --git a/app/gui2/parser-codegen/codegen.ts b/app/ydoc-shared/parser-codegen/codegen.ts
similarity index 97%
rename from app/gui2/parser-codegen/codegen.ts
rename to app/ydoc-shared/parser-codegen/codegen.ts
index f6d39ece9d7d..77f00ee3ea53 100644
--- a/app/gui2/parser-codegen/codegen.ts
+++ b/app/ydoc-shared/parser-codegen/codegen.ts
@@ -8,7 +8,7 @@
  */
 
 import ts from 'typescript'
-import * as Schema from './schema.js'
+import type * as Schema from './schema.js'
 import {
   Type,
   abstractTypeDeserializer,
@@ -288,7 +288,7 @@ function makeVisitFunction(fields: Field[]): ts.MethodDeclaration {
     visitSuperChildren,
   )
   return tsf.createMethodDeclaration(
-    undefined,
+    [tsf.createModifier(ts.SyntaxKind.OverrideKeyword)],
     undefined,
     ident,
     undefined,
@@ -448,22 +448,22 @@ function makeAbstractType(
       tsf.createEnumDeclaration(
         [modifiers.export, modifiers.const],
         'Type',
-        childTypes.map((child) => child.enumMember),
+        childTypes.map(child => child.enumMember),
       ),
       makeExportConstVariable(
         'typeNames',
         tsf.createArrayLiteralExpression(
-          childTypes.map((child) => tsf.createStringLiteralFromNode(child.name)),
+          childTypes.map(child => tsf.createStringLiteralFromNode(child.name)),
         ),
       ),
-      ...childTypes.map((child) => child.definition),
+      ...childTypes.map(child => child.definition),
       tsf.createTypeAliasDeclaration(
         [modifiers.export],
         ident,
         undefined,
-        tsf.createUnionTypeNode(childTypes.map((child) => tsf.createTypeReferenceNode(child.name))),
+        tsf.createUnionTypeNode(childTypes.map(child => tsf.createTypeReferenceNode(child.name))),
       ),
-      abstractTypeVariants(childTypes.map((child) => child.name)),
+      abstractTypeVariants(childTypes.map(child => child.name)),
       makeReadFunction(
         ident,
         addressIdent,
diff --git a/app/ydoc-shared/parser-codegen/index.ts b/app/ydoc-shared/parser-codegen/index.ts
new file mode 100644
index 000000000000..f9f2daee51f8
--- /dev/null
+++ b/app/ydoc-shared/parser-codegen/index.ts
@@ -0,0 +1,57 @@
+import * as crypto from 'node:crypto'
+import * as fs from 'node:fs/promises'
+import * as process from 'node:process'
+import type * as Schema from './schema.js'
+
+const positionalArgs = []
+let doChangeDetection = false
+
+for (let i = 2; i < process.argv.length; i++) {
+  const nextArg = process.argv[i]!
+  if (nextArg === '--if-changed') doChangeDetection = true
+  else if (nextArg.startsWith('--')) usage()
+  else if (positionalArgs.length > 2) usage()
+  else positionalArgs.push(nextArg)
+}
+
+const schemaPath = positionalArgs[0]
+const outputPath = positionalArgs[1]
+
+if (!schemaPath || !outputPath) usage()
+
+function usage(): never {
+  console.error(
+    'Usage: parser-codegen [flags] <schemaPath> <outputPath>\n  flags:\n  --if-changed: only generate if schema is outdated',
+  )
+  process.exit(1)
+}
+
+const schemaContents = await fs.readFile(schemaPath, 'utf8')
+var hash = crypto.createHash('sha1')
+hash.update(schemaContents)
+const schemaHash = hash.digest()
+
+const runCodegen = async () => {
+  console.log(`Generating ${outputPath} from ${schemaPath}.`)
+  // load codegen lazily only when necessary, since it has a large loading time cost
+  const codegen = await import('./codegen.js')
+  const schema: Schema.Schema = JSON.parse(schemaContents)
+  const code = codegen.implement(schema)
+  await fs.writeFile(outputPath, code)
+  await fs.writeFile(`${outputPath}.schema-digest`, schemaHash)
+}
+
+const checkSchemaChanged = async () => {
+  try {
+    const lastDigest = await fs.readFile(`${outputPath}.schema-digest`)
+    return !lastDigest.equals(schemaHash)
+  } catch (e) {
+    return true
+  }
+}
+
+if (!doChangeDetection || (await checkSchemaChanged())) {
+  await runCodegen()
+} else {
+  console.log('No schema changes detected since last code generation.')
+}
diff --git a/app/gui2/parser-codegen/schema.ts b/app/ydoc-shared/parser-codegen/schema.ts
similarity index 100%
rename from app/gui2/parser-codegen/schema.ts
rename to app/ydoc-shared/parser-codegen/schema.ts
diff --git a/app/gui2/parser-codegen/serialization.ts b/app/ydoc-shared/parser-codegen/serialization.ts
similarity index 99%
rename from app/gui2/parser-codegen/serialization.ts
rename to app/ydoc-shared/parser-codegen/serialization.ts
index 16878de32599..78aaff9b617b 100644
--- a/app/gui2/parser-codegen/serialization.ts
+++ b/app/ydoc-shared/parser-codegen/serialization.ts
@@ -192,7 +192,7 @@ export function seekViewDyn(view: ts.Expression, address: ts.Expression): ts.Exp
 }
 
 export function abstractTypeVariants(cases: ts.Identifier[]): ts.Statement {
-  const reads = cases.map((c) => tsf.createPropertyAccessChain(c, undefined, 'read'))
+  const reads = cases.map(c => tsf.createPropertyAccessChain(c, undefined, 'read'))
   return tsf.createVariableStatement(
     [],
     tsf.createVariableDeclarationList(
@@ -290,7 +290,7 @@ function primitiveReader(func: ts.Identifier): ReadApplicator {
  * create a `readerTransformer('readOption')`, we can apply it to the number reader to yield an optional-number reader.
  */
 function readerTransformer(func: ts.Identifier): (readElement: ReadApplicator) => ReadApplicator {
-  return (readElement) => (view, offset) => {
+  return readElement => (view, offset) => {
     return tsf.createCallExpression(
       func,
       [],
diff --git a/app/ydoc-shared/parser-codegen/tsconfig.json b/app/ydoc-shared/parser-codegen/tsconfig.json
new file mode 100644
index 000000000000..55c88dfc2048
--- /dev/null
+++ b/app/ydoc-shared/parser-codegen/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "extends": "@tsconfig/node20/tsconfig.json",
+  "include": ["*.ts"],
+  "compilerOptions": {
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "noEmit": true,
+    "strict": true,
+    "verbatimModuleSyntax": true,
+    "noUncheckedIndexedAccess": true,
+    "exactOptionalPropertyTypes": true,
+    "strictNullChecks": true,
+    "types": ["node"]
+  }
+}
diff --git a/app/gui2/parser-codegen/util.ts b/app/ydoc-shared/parser-codegen/util.ts
similarity index 97%
rename from app/gui2/parser-codegen/util.ts
rename to app/ydoc-shared/parser-codegen/util.ts
index 4580987ec49c..f5753295f9d4 100644
--- a/app/gui2/parser-codegen/util.ts
+++ b/app/ydoc-shared/parser-codegen/util.ts
@@ -89,7 +89,7 @@ export function makeArrow(params: ts.BindingName[], expr: ts.Expression) {
   return tsf.createArrowFunction(
     [],
     [],
-    params.map((ident) => tsf.createParameterDeclaration([], undefined, ident)),
+    params.map(ident => tsf.createParameterDeclaration([], undefined, ident)),
     undefined,
     undefined,
     expr,
diff --git a/app/gui2/shared/__tests__/ensoFile.test.ts b/app/ydoc-shared/src/__tests__/ensoFile.test.ts
similarity index 68%
rename from app/gui2/shared/__tests__/ensoFile.test.ts
rename to app/ydoc-shared/src/__tests__/ensoFile.test.ts
index 2d641b845150..bd3353d61f32 100644
--- a/app/gui2/shared/__tests__/ensoFile.test.ts
+++ b/app/ydoc-shared/src/__tests__/ensoFile.test.ts
@@ -1,5 +1,5 @@
-import { combineFileParts, splitFileContents } from 'shared/ensoFile'
 import { expect, test } from 'vitest'
+import { combineFileParts, splitFileContents } from '../ensoFile'
 
 const cases = [
   `foo`,
@@ -21,7 +21,7 @@ const cases = [
 {}`,
 ]
 
-test.each(cases)('File split and combine roundtrip $#', (contents) => {
+test.each(cases)('File split and combine roundtrip $#', contents => {
   const parts = splitFileContents(contents)
   const combined = combineFileParts(parts)
   expect(combined).toEqual(contents)
diff --git a/app/gui2/shared/__tests__/mutableModule.test.ts b/app/ydoc-shared/src/__tests__/mutableModule.test.ts
similarity index 86%
rename from app/gui2/shared/__tests__/mutableModule.test.ts
rename to app/ydoc-shared/src/__tests__/mutableModule.test.ts
index be3f315d5981..4e88edcf5115 100644
--- a/app/gui2/shared/__tests__/mutableModule.test.ts
+++ b/app/ydoc-shared/src/__tests__/mutableModule.test.ts
@@ -1,6 +1,6 @@
 import { fc, test } from '@fast-check/vitest'
-import { __TEST, isAstId } from 'shared/ast/mutableModule'
 import { expect } from 'vitest'
+import { __TEST, isAstId } from '../ast/mutableModule'
 
 const { newAstId } = __TEST
 
diff --git a/app/gui2/shared/__tests__/yjsModel.test.ts b/app/ydoc-shared/src/__tests__/yjsModel.test.ts
similarity index 98%
rename from app/gui2/shared/__tests__/yjsModel.test.ts
rename to app/ydoc-shared/src/__tests__/yjsModel.test.ts
index 1cb99598347f..7f1170439f20 100644
--- a/app/gui2/shared/__tests__/yjsModel.test.ts
+++ b/app/ydoc-shared/src/__tests__/yjsModel.test.ts
@@ -1,5 +1,5 @@
-import { rangeEncloses, rangeIntersects, type SourceRange } from 'shared/yjsModel'
 import { expect, test } from 'vitest'
+import { rangeEncloses, rangeIntersects, type SourceRange } from '../yjsModel'
 
 type RangeTest = { a: SourceRange; b: SourceRange }
 
diff --git a/app/gui2/shared/ast/debug.ts b/app/ydoc-shared/src/ast/debug.ts
similarity index 96%
rename from app/gui2/shared/ast/debug.ts
rename to app/ydoc-shared/src/ast/debug.ts
index a63d26207e22..15d0c6388fcc 100644
--- a/app/gui2/shared/ast/debug.ts
+++ b/app/ydoc-shared/src/ast/debug.ts
@@ -5,7 +5,7 @@ export function graphParentPointers(ast: Ast) {
   const sanitize = (id: string) => id.replace('ast:', '').replace(/[^A-Za-z0-9]/g, '')
   const parentToChild = new Array<{ parent: string; child: string }>()
   const childToParent = new Array<{ child: string; parent: string }>()
-  ast.visitRecursiveAst((ast) => {
+  ast.visitRecursiveAst(ast => {
     for (const child of ast.children()) {
       if (child instanceof Ast)
         parentToChild.push({ child: sanitize(child.id), parent: sanitize(ast.id) })
diff --git a/app/ydoc-shared/src/ast/ffi.ts b/app/ydoc-shared/src/ast/ffi.ts
new file mode 100644
index 000000000000..32d4a638860e
--- /dev/null
+++ b/app/ydoc-shared/src/ast/ffi.ts
@@ -0,0 +1,19 @@
+/**
+ * @file Provides the Rust ffi interface. The interface should be kept in sync with polyglot ffi inteface {@link module:ffiPolyglot}.
+ *
+ * @module ffi
+ */
+
+import { createXXHash128 } from 'hash-wasm'
+import type { IDataType } from 'hash-wasm/dist/lib/util'
+import { is_ident_or_operator, is_numeric_literal, parse, parse_doc_to_json } from 'rust-ffi'
+
+const xxHasher128 = await createXXHash128()
+export function xxHash128(input: IDataType) {
+  xxHasher128.init()
+  xxHasher128.update(input)
+  return xxHasher128.digest()
+}
+
+/* eslint-disable-next-line camelcase */
+export { is_ident_or_operator, is_numeric_literal, parse_doc_to_json, parse as parse_tree }
diff --git a/app/ydoc-shared/src/ast/generated/.gitkeep b/app/ydoc-shared/src/ast/generated/.gitkeep
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/app/gui2/shared/ast/index.ts b/app/ydoc-shared/src/ast/index.ts
similarity index 98%
rename from app/gui2/shared/ast/index.ts
rename to app/ydoc-shared/src/ast/index.ts
index f3b9be6bebdd..956f78239398 100644
--- a/app/gui2/shared/ast/index.ts
+++ b/app/ydoc-shared/src/ast/index.ts
@@ -41,7 +41,7 @@ export function parentId(ast: Ast): AstId | undefined {
 
 /** Returns the given IDs, and the IDs of all their ancestors. */
 export function subtrees(module: Module, ids: Iterable<AstId>) {
-  return reachable(ids, (id) => {
+  return reachable(ids, id => {
     const parent = module.tryGet(id)?.parent()
     return parent ? [id, parent.id] : [id]
   })
diff --git a/app/gui2/shared/ast/mutableModule.ts b/app/ydoc-shared/src/ast/mutableModule.ts
similarity index 98%
rename from app/gui2/shared/ast/mutableModule.ts
rename to app/ydoc-shared/src/ast/mutableModule.ts
index 6cf4bd31d5d0..a315e7044117 100644
--- a/app/gui2/shared/ast/mutableModule.ts
+++ b/app/ydoc-shared/src/ast/mutableModule.ts
@@ -155,7 +155,7 @@ export class MutableModule implements Module {
   /** @internal */
   importCopy<T extends Ast>(ast: T): Owned<Mutable<T>> {
     assert(ast.module !== this)
-    ast.visitRecursiveAst((ast) => this.nodes.set(ast.id, ast.fields.clone() as any))
+    ast.visitRecursiveAst(ast => this.nodes.set(ast.id, ast.fields.clone() as any))
     const fields = this.nodes.get(ast.id)
     assertDefined(fields)
     fields.set('parent', undefined)
@@ -430,7 +430,7 @@ class UpdateBuilder {
 
   finish(): ModuleUpdate {
     const dirtyNodes = new Set(this.nodesUpdated)
-    this.nodesAdded.forEach((node) => dirtyNodes.add(node))
+    this.nodesAdded.forEach(node => dirtyNodes.add(node))
     const updateRoots = subtreeRoots(this.module, dirtyNodes)
     return { ...this, updateRoots }
   }
diff --git a/app/gui2/shared/ast/parse.ts b/app/ydoc-shared/src/ast/parse.ts
similarity index 98%
rename from app/gui2/shared/ast/parse.ts
rename to app/ydoc-shared/src/ast/parse.ts
index 9e87c3e72f3f..84917e887ae1 100644
--- a/app/gui2/shared/ast/parse.ts
+++ b/app/ydoc-shared/src/ast/parse.ts
@@ -148,7 +148,7 @@ class Abstractor {
     let node: Owned
     switch (tree.type) {
       case RawAst.Tree.Type.BodyBlock: {
-        const lines = Array.from(tree.statements, (line) => {
+        const lines = Array.from(tree.statements, line => {
           const newline = this.abstractToken(line.newline)
           const expression = line.expression ? this.abstractTree(line.expression) : undefined
           return { newline, expression }
@@ -158,7 +158,7 @@ class Abstractor {
       }
       case RawAst.Tree.Type.Function: {
         const name = this.abstractTree(tree.name)
-        const argumentDefinitions = Array.from(tree.args, (arg) => this.abstractChildren(arg))
+        const argumentDefinitions = Array.from(tree.args, arg => this.abstractChildren(arg))
         const equals = this.abstractToken(tree.equals)
         const body = tree.body !== undefined ? this.abstractTree(tree.body) : undefined
         node = Function.concrete(this.module, name, argumentDefinitions, equals, body)
@@ -264,7 +264,7 @@ class Abstractor {
       case RawAst.Tree.Type.TextLiteral: {
         const open = tree.open ? this.abstractToken(tree.open) : undefined
         const newline = tree.newline ? this.abstractToken(tree.newline) : undefined
-        const elements = Array.from(tree.elements, (raw) => this.abstractTextElement(raw))
+        const elements = Array.from(tree.elements, raw => this.abstractTextElement(raw))
         const close = tree.close ? this.abstractToken(tree.close) : undefined
         node = TextLiteral.concrete(this.module, open, newline, elements, close)
         break
@@ -440,7 +440,7 @@ export function spanMapToSpanGetter(spans: SpanMap): (id: AstId) => SourceRange
       reverseMap.set(ast.id, sourceRangeFromKey(key))
     }
   }
-  return (id) => reverseMap.get(id)
+  return id => reverseMap.get(id)
 }
 
 /** Return stringification with associated ID map. This is only exported for testing. */
@@ -627,7 +627,7 @@ export function parseExtended(code: string, idMap?: IdMap | undefined, inModule?
 /** Return the number of `Ast`s in the tree, including the provided root. */
 export function astCount(ast: Ast): number {
   let count = 0
-  ast.visitRecursiveAst((_subtree) => {
+  ast.visitRecursiveAst(_subtree => {
     count += 1
   })
   return count
@@ -704,7 +704,7 @@ export function repair(
   const fixes = module ?? root.module.edit()
   for (const ast of lostInline) {
     if (ast instanceof Group) continue
-    fixes.getVersion(ast).update((ast) => Group.new(fixes, ast))
+    fixes.getVersion(ast).update(ast => Group.new(fixes, ast))
   }
 
   // Verify that it's fixed.
@@ -736,7 +736,7 @@ function resync(
   edit: MutableModule,
 ) {
   const parentsOfBadSubtrees = new Set<AstId>()
-  const badAstIds = new Set(Array.from(badAsts, (ast) => ast.id))
+  const badAstIds = new Set(Array.from(badAsts, ast => ast.id))
   for (const id of subtreeRoots(edit, badAstIds)) {
     const parent = edit.get(id)?.parentId
     if (parent) parentsOfBadSubtrees.add(parent)
@@ -846,7 +846,7 @@ function calculateCorrespondence(
     partAfterToAstBefore.set(sourceRangeKey(partAfter), astBefore)
   }
   const matchingPartsAfter = spansBeforeAndAfter.map(([_before, after]) => after)
-  const parsedSpanTree = new AstWithSpans(parsedRoot, (id) => newSpans.get(id)!)
+  const parsedSpanTree = new AstWithSpans(parsedRoot, id => newSpans.get(id)!)
   const astsMatchingPartsAfter = enclosingSpans(parsedSpanTree, matchingPartsAfter)
   for (const [astAfter, partsAfter] of astsMatchingPartsAfter) {
     for (const partAfter of partsAfter) {
@@ -873,8 +873,8 @@ function calculateCorrespondence(
   const newHashes = syntaxHash(parsedRoot).hashes
   const oldHashes = syntaxHash(ast).hashes
   for (const [hash, newAsts] of newHashes) {
-    const unmatchedNewAsts = newAsts.filter((ast) => !newIdsMatched.has(ast.id))
-    const unmatchedOldAsts = oldHashes.get(hash)?.filter((ast) => !oldIdsMatched.has(ast.id)) ?? []
+    const unmatchedNewAsts = newAsts.filter(ast => !newIdsMatched.has(ast.id))
+    const unmatchedOldAsts = oldHashes.get(hash)?.filter(ast => !oldIdsMatched.has(ast.id)) ?? []
     for (const [unmatchedNew, unmatchedOld] of zip(unmatchedNewAsts, unmatchedOldAsts)) {
       toSync.set(unmatchedOld.id, unmatchedNew)
       // Update the matched-IDs indices.
@@ -948,7 +948,7 @@ function syncTree(
     target.fields.get('metadata').set('externalId', newExternalId())
   }
   const newRoot = syncRoot ? target : newContent
-  newRoot.visitRecursiveAst((ast) => {
+  newRoot.visitRecursiveAst(ast => {
     const syncFieldsFrom = toSync.get(ast.id)
     const editAst = edit.getVersion(ast)
     if (syncFieldsFrom) {
diff --git a/app/gui2/shared/ast/parserSupport.ts b/app/ydoc-shared/src/ast/parserSupport.ts
similarity index 99%
rename from app/gui2/shared/ast/parserSupport.ts
rename to app/ydoc-shared/src/ast/parserSupport.ts
index d0334720a896..caad26845a52 100644
--- a/app/gui2/shared/ast/parserSupport.ts
+++ b/app/ydoc-shared/src/ast/parserSupport.ts
@@ -22,7 +22,7 @@ export abstract class LazyObject {
 
   children(): LazyObject[] {
     const children: LazyObject[] = []
-    this.visitChildren((child) => {
+    this.visitChildren(child => {
       children.push(child)
     })
     return children
diff --git a/app/gui2/shared/ast/sourceDocument.ts b/app/ydoc-shared/src/ast/sourceDocument.ts
similarity index 99%
rename from app/gui2/shared/ast/sourceDocument.ts
rename to app/ydoc-shared/src/ast/sourceDocument.ts
index 0bc725616741..ea1b172b8cfc 100644
--- a/app/gui2/shared/ast/sourceDocument.ts
+++ b/app/ydoc-shared/src/ast/sourceDocument.ts
@@ -48,7 +48,7 @@ export class SourceDocument {
           assertDefined(oldSpan)
           const oldCode = this.text_.slice(oldSpan[0], oldSpan[1])
           const newCode = printed.code.slice(range[0], range[1])
-          const subedits = textChangeToEdits(oldCode, newCode).map((textEdit) =>
+          const subedits = textChangeToEdits(oldCode, newCode).map(textEdit =>
             offsetEdit(textEdit, oldSpan[0]),
           )
           subtreeTextEdits.push(...subedits)
diff --git a/app/gui2/shared/ast/text.ts b/app/ydoc-shared/src/ast/text.ts
similarity index 100%
rename from app/gui2/shared/ast/text.ts
rename to app/ydoc-shared/src/ast/text.ts
diff --git a/app/gui2/shared/ast/token.ts b/app/ydoc-shared/src/ast/token.ts
similarity index 98%
rename from app/gui2/shared/ast/token.ts
rename to app/ydoc-shared/src/ast/token.ts
index ccc111717531..ecfbd2183a11 100644
--- a/app/gui2/shared/ast/token.ts
+++ b/app/ydoc-shared/src/ast/token.ts
@@ -1,5 +1,4 @@
-import type { DeepReadonly } from 'vue'
-import type { AstId, NodeChild, Owned } from '.'
+import type { AstId, DeepReadonly, NodeChild, Owned } from '.'
 import { Ast, newExternalId } from '.'
 import { assert } from '../util/assert'
 import type { ExternalId } from '../yjsModel'
diff --git a/app/gui2/shared/ast/tree.ts b/app/ydoc-shared/src/ast/tree.ts
similarity index 97%
rename from app/gui2/shared/ast/tree.ts
rename to app/ydoc-shared/src/ast/tree.ts
index 62a9b1302a03..4cbd679513ce 100644
--- a/app/gui2/shared/ast/tree.ts
+++ b/app/ydoc-shared/src/ast/tree.ts
@@ -1,4 +1,3 @@
-import type { DeepReadonly } from 'vue'
 import type {
   Identifier,
   IdentifierOrOperatorIdentifier,
@@ -45,6 +44,8 @@ import {
   syncToCode,
 } from './parse'
 
+export type DeepReadonly<T> = T
+
 declare const brandAstId: unique symbol
 export type AstId = string & { [brandAstId]: never }
 
@@ -81,6 +82,7 @@ const astFieldKeys = allKeys<RawAstFields>({
   parent: null,
   metadata: null,
 })
+
 export abstract class Ast {
   readonly module: Module
   /** @internal */
@@ -359,7 +361,7 @@ export abstract class MutableAst extends Ast {
     if (existing) return this.module.getVersion(existing)
     return this.module
       .getVersion(this.wrappingExpressionRoot())
-      .updateValue((ast) => Documented.new('', ast))
+      .updateValue(ast => Documented.new('', ast))
   }
 
   ///////////////////
@@ -381,7 +383,7 @@ export abstract class MutableAst extends Ast {
   /** @internal */
   replaceChild<T extends MutableAst>(target: AstId, replacement: Owned<T>) {
     const replacementId = this.claimChild(replacement)
-    const changes = rewriteRefs(this, (id) => (id === target ? replacementId : undefined))
+    const changes = rewriteRefs(this, id => (id === target ? replacementId : undefined))
     assertEqual(changes, 1)
   }
 
@@ -566,8 +568,8 @@ function fieldEqual(field1: FieldData, field2: FieldData): boolean {
 }
 
 function applyMixins(derivedCtor: any, constructors: any[]) {
-  constructors.forEach((baseCtor) => {
-    Object.getOwnPropertyNames(baseCtor.prototype).forEach((name) => {
+  constructors.forEach(baseCtor => {
+    Object.getOwnPropertyNames(baseCtor.prototype).forEach(name => {
       Object.defineProperty(
         derivedCtor.prototype,
         name,
@@ -953,7 +955,7 @@ export class OprApp extends Ast {
   }
   get operator(): Result<Token, NodeChild<Token>[]> {
     const operators = this.fields.get('operators')
-    const operators_ = operators.map((child) => ({
+    const operators_ = operators.map(child => ({
       ...child,
       node: this.module.getToken(child.node),
     }))
@@ -1125,7 +1127,7 @@ export class Generic extends Ast {
     const base = module.baseObject('Generic')
     const id_ = base.get('id')
     const fields = composeFieldData(base, {
-      children: children.map((child) => concreteChild(module, child, id_)),
+      children: children.map(child => concreteChild(module, child, id_)),
     })
     return asOwned(new MutableGeneric(module, fields))
   }
@@ -1458,7 +1460,7 @@ export class TextLiteral extends Ast {
     const fields = composeFieldData(base, {
       open,
       newline,
-      elements: elements.map((e) => mapRefs(e, ownedToRaw(module, id_))),
+      elements: elements.map(e => mapRefs(e, ownedToRaw(module, id_))),
       close,
     })
     return asOwned(new MutableTextLiteral(module, fields))
@@ -1509,7 +1511,7 @@ export class TextLiteral extends Ast {
   }
 
   get elements(): TextElement<ConcreteRefs>[] {
-    return this.fields.get('elements').map((e) => mapRefs(e, rawToConcrete(this.module)))
+    return this.fields.get('elements').map(e => mapRefs(e, rawToConcrete(this.module)))
   }
 }
 export class MutableTextLiteral extends TextLiteral implements MutableAst {
@@ -1524,7 +1526,7 @@ export class MutableTextLiteral extends TextLiteral implements MutableAst {
   setElements(elements: TextElement<OwnedRefs>[]) {
     this.fields.set(
       'elements',
-      elements.map((e) => mapRefs(e, ownedToRaw(this.module, this.id))),
+      elements.map(e => mapRefs(e, ownedToRaw(this.module, this.id))),
     )
   }
 
@@ -1544,7 +1546,7 @@ export class MutableTextLiteral extends TextLiteral implements MutableAst {
       isInterpolated || mustBecomeInterpolated ? escapeTextLiteral(rawText) : rawText
     const parsed = parse(`${boundary}${literalContents}${boundary}`)
     assert(parsed instanceof TextLiteral)
-    const elements = parsed.elements.map((e) => mapRefs(e, concreteToOwned(this.module)))
+    const elements = parsed.elements.map(e => mapRefs(e, concreteToOwned(this.module)))
     this.setElements(elements)
   }
 }
@@ -1589,7 +1591,7 @@ export class Documented extends Ast {
     const id_ = base.get('id')
     const fields = composeFieldData(base, {
       open: open ?? unspaced(Token.new('##', RawAst.Token.Type.Operator)),
-      elements: elements.map((e) => mapRefs(e, ownedToRaw(module, id_))),
+      elements: elements.map(e => mapRefs(e, ownedToRaw(module, id_))),
       newlines: newlines ?? [unspaced(Token.new('\n', RawAst.Token.Type.Newline))],
       expression: concreteChild(module, expression, id_),
     })
@@ -1606,11 +1608,11 @@ export class Documented extends Ast {
     return raw.startsWith(' ') ? raw.slice(1) : raw
   }
 
-  wrappedExpression(): Ast | undefined {
+  override wrappedExpression(): Ast | undefined {
     return this.expression
   }
 
-  documentingAncestor(): Documented | undefined {
+  override documentingAncestor(): Documented | undefined {
     return this
   }
 
@@ -1622,7 +1624,7 @@ export class Documented extends Ast {
     if (expression) yield expression
   }
 
-  printSubtree(
+  override printSubtree(
     info: SpanMap,
     offset: number,
     parentIndent: string | undefined,
@@ -1638,7 +1640,7 @@ export class MutableDocumented extends Documented implements MutableAst {
   setDocumentationText(text: string) {
     this.fields.set(
       'elements',
-      textToUninterpolatedElements(text).map((owned) =>
+      textToUninterpolatedElements(text).map(owned =>
         mapRefs(owned, ownedToRaw(this.module, this.id)),
       ),
     )
@@ -1691,7 +1693,7 @@ export class Invalid extends Ast {
     yield this.fields.get('expression')
   }
 
-  printSubtree(
+  override printSubtree(
     info: SpanMap,
     offset: number,
     parentIndent: string | undefined,
@@ -1760,7 +1762,7 @@ export class Group extends Ast {
     return this.module.get(this.fields.get('expression')?.node)
   }
 
-  wrappedExpression(): Ast | undefined {
+  override wrappedExpression(): Ast | undefined {
     return this.expression
   }
 
@@ -1852,7 +1854,7 @@ export class Function extends Ast {
   get argumentDefinitions(): ArgumentDefinition<ConcreteRefs>[] {
     return this.fields
       .get('argumentDefinitions')
-      .map((raw) => raw.map((part) => this.module.getConcrete(part)))
+      .map(raw => raw.map(part => this.module.getConcrete(part)))
   }
 
   static concrete(
@@ -1866,7 +1868,7 @@ export class Function extends Ast {
     const id_ = base.get('id')
     const fields = composeFieldData(base, {
       name: concreteChild(module, name, id_),
-      argumentDefinitions: argumentDefinitions.map((def) => mapRefs(def, ownedToRaw(module, id_))),
+      argumentDefinitions: argumentDefinitions.map(def => mapRefs(def, ownedToRaw(module, id_))),
       equals,
       body: concreteChild(module, body, id_),
     })
@@ -1898,10 +1900,10 @@ export class Function extends Ast {
     argumentNames: StrictIdentLike[],
     statements: Owned[],
   ): Owned<MutableFunction> {
-    const statements_: OwnedBlockLine[] = statements.map((statement) => ({
+    const statements_: OwnedBlockLine[] = statements.map(statement => ({
       expression: unspaced(statement),
     }))
-    const argumentDefinitions = argumentNames.map((name) => [spaced(Ident.new(module, name))])
+    const argumentDefinitions = argumentNames.map(name => [spaced(Ident.new(module, name))])
     const body = BodyBlock.new(statements_, module)
     return MutableFunction.new(module, name, argumentDefinitions, body)
   }
@@ -1915,7 +1917,7 @@ export class Function extends Ast {
     }
   }
 
-  get isBindingStatement(): boolean {
+  override get isBindingStatement(): boolean {
     return true
   }
 
@@ -1940,7 +1942,7 @@ export class MutableFunction extends Function implements MutableAst {
   setArgumentDefinitions(defs: ArgumentDefinition<OwnedRefs>[]) {
     this.fields.set(
       'argumentDefinitions',
-      defs.map((def) => mapRefs(def, ownedToRaw(this.module, this.id))),
+      defs.map(def => mapRefs(def, ownedToRaw(this.module, this.id))),
     )
   }
 
@@ -2007,7 +2009,7 @@ export class Assignment extends Ast {
     return this.module.get(this.fields.get('expression').node)
   }
 
-  get isBindingStatement(): boolean {
+  override get isBindingStatement(): boolean {
     return true
   }
 
@@ -2053,7 +2055,7 @@ export class BodyBlock extends Ast {
     const base = module.baseObject('BodyBlock')
     const id_ = base.get('id')
     const fields = composeFieldData(base, {
-      lines: lines.map((line) => lineToRaw(line, module, id_)),
+      lines: lines.map(line => lineToRaw(line, module, id_)),
     })
     return asOwned(new MutableBodyBlock(module, fields))
   }
@@ -2063,7 +2065,7 @@ export class BodyBlock extends Ast {
   }
 
   get lines(): BlockLine[] {
-    return this.fields.get('lines').map((line) => lineFromRaw(line, this.module))
+    return this.fields.get('lines').map(line => lineFromRaw(line, this.module))
   }
 
   *statements(): IterableIterator<Ast> {
@@ -2079,7 +2081,7 @@ export class BodyBlock extends Ast {
     }
   }
 
-  printSubtree(
+  override printSubtree(
     info: SpanMap,
     offset: number,
     parentIndent: string | undefined,
@@ -2096,19 +2098,19 @@ export class MutableBodyBlock extends BodyBlock implements MutableAst {
     return this.setLines(map(this.takeLines()))
   }
   takeLines(): OwnedBlockLine[] {
-    return this.fields.get('lines').map((line) => ownedLineFromRaw(line, this.module))
+    return this.fields.get('lines').map(line => ownedLineFromRaw(line, this.module))
   }
   setLines(lines: OwnedBlockLine[]) {
     this.fields.set(
       'lines',
-      lines.map((line) => lineToRaw(line, this.module, this.id)),
+      lines.map(line => lineToRaw(line, this.module, this.id)),
     )
   }
 
   /** Insert the given statement(s) starting at the specified line index. */
   insert(index: number, ...statements: (Owned | undefined)[]) {
     const before = this.fields.get('lines').slice(0, index)
-    const insertions = statements.map((statement) => ({
+    const insertions = statements.map(statement => ({
       newline: unspaced(Token.new('\n', RawAst.Token.Type.Newline)),
       expression: statement && unspaced(this.claimChild(statement)),
     }))
@@ -2127,7 +2129,7 @@ export class MutableBodyBlock extends BodyBlock implements MutableAst {
 
   filter(keep: (ast: MutableAst) => boolean) {
     const oldLines = this.fields.get('lines')
-    const filteredLines = oldLines.filter((line) => {
+    const filteredLines = oldLines.filter(line => {
       if (!line.expression) return true
       return keep(this.module.get(line.expression.node))
     })
@@ -2231,7 +2233,7 @@ export class Ident extends Ast {
     yield this.fields.get('token')
   }
 
-  code(): Identifier {
+  override code(): Identifier {
     return this.token.code() as Identifier
   }
 }
@@ -2243,7 +2245,7 @@ export class MutableIdent extends Ident implements MutableAst {
     this.fields.set('token', unspaced(toIdent(ident)))
   }
 
-  code(): Identifier {
+  override code(): Identifier {
     return this.token.code()
   }
 }
@@ -2328,7 +2330,7 @@ export class Vector extends Ast {
     const id_ = base.get('id')
     const fields = composeFieldData(base, {
       open: open ?? unspaced(Token.new('[', RawAst.Token.Type.OpenSymbol)),
-      elements: elements.map(delimitVectorElement).map((e) => mapRefs(e, ownedToRaw(module, id_))),
+      elements: elements.map(delimitVectorElement).map(e => mapRefs(e, ownedToRaw(module, id_))),
       close: close ?? unspaced(Token.new(']', RawAst.Token.Type.CloseSymbol)),
     })
     return asOwned(new MutableVector(module, fields))
@@ -2338,7 +2340,7 @@ export class Vector extends Ast {
     return this.concrete(
       module,
       undefined,
-      elements.map((value) => ({ value: autospaced(value) })),
+      elements.map(value => ({ value: autospaced(value) })),
       undefined,
     )
   }
@@ -2413,7 +2415,7 @@ export class MutableVector extends Vector implements MutableAst {
   keep(predicate: (ast: Ast) => boolean) {
     const elements = this.fields.get('elements')
     const filtered = elements.filter(
-      (element) => element.value && predicate(this.module.get(element.value.node)),
+      element => element.value && predicate(this.module.get(element.value.node)),
     )
     this.fields.set('elements', filtered)
   }
diff --git a/app/gui2/shared/binaryProtocol.ts b/app/ydoc-shared/src/binaryProtocol.ts
similarity index 100%
rename from app/gui2/shared/binaryProtocol.ts
rename to app/ydoc-shared/src/binaryProtocol.ts
diff --git a/app/gui2/shared/ensoFile.ts b/app/ydoc-shared/src/ensoFile.ts
similarity index 100%
rename from app/gui2/shared/ensoFile.ts
rename to app/ydoc-shared/src/ensoFile.ts
diff --git a/app/gui2/shared/languageServer.ts b/app/ydoc-shared/src/languageServer.ts
similarity index 96%
rename from app/gui2/shared/languageServer.ts
rename to app/ydoc-shared/src/languageServer.ts
index 62ffe5cee3a6..e1403f504202 100644
--- a/app/gui2/shared/languageServer.ts
+++ b/app/ydoc-shared/src/languageServer.ts
@@ -1,6 +1,7 @@
 import { sha3_224 as SHA3 } from '@noble/hashes/sha3'
 import { bytesToHex } from '@noble/hashes/utils'
 import { Client, RequestManager } from '@open-rpc/client-js'
+import debug from 'debug'
 import { ObservableV2 } from 'lib0/observable'
 import { uuidv4 } from 'lib0/random'
 import { z } from 'zod'
@@ -19,19 +20,17 @@ import type {
   Notifications,
   Path,
   RegisterOptions,
+  response,
   StackItem,
   TextFileContents,
   VisualizationConfiguration,
-  response,
 } from './languageServerTypes'
 import { Err, Ok, type Result } from './util/data/result'
-import {
-  AbortScope,
-  exponentialBackoff,
-  type ReconnectingTransportWithWebsocketEvents,
-} from './util/net'
+import { AbortScope, exponentialBackoff, ReconnectingWebSocketTransport } from './util/net'
 import type { Uuid } from './yjsModel'
 
+const debugLog = debug('ydoc-shared:languageServer')
+
 const RPC_TIMEOUT_MS = 15000
 
 export enum ErrorCode {
@@ -143,20 +142,19 @@ export class LanguageServer extends ObservableV2<Notifications & TransportEvents
 
   constructor(
     private clientID: Uuid,
-    private transport: ReconnectingTransportWithWebsocketEvents,
-    debug = false,
+    private transport: ReconnectingWebSocketTransport,
   ) {
     super()
     this.initialized = this.scheduleInitializationAfterConnect()
     const requestManager = new RequestManager([transport])
     this.client = new Client(requestManager)
-    this.client.onNotification((notification) => {
+    this.client.onNotification(notification => {
       this.emit(notification.method as keyof Notifications, [notification.params])
     })
-    this.client.onError((error) => {
+    this.client.onError(error => {
       console.error('Unexpected Language Server connection error:', error)
     })
-    transport.on('error', (error) => {
+    transport.on('error', error => {
       if (this.shouldReconnect) {
         console.error('Language Server transport error:', error)
       }
@@ -169,7 +167,7 @@ export class LanguageServer extends ObservableV2<Notifications & TransportEvents
         return
       }
       this.emit('transport/closed', [])
-      console.log('Language Server: WebSocket closed')
+      debugLog('Language Server: WebSocket closed')
       this.scheduleInitializationAfterConnect()
     }
     transport.on('close', onTransportClosed)
@@ -177,13 +175,12 @@ export class LanguageServer extends ObservableV2<Notifications & TransportEvents
       this.transport.off('close', onTransportClosed)
       this.transport.close()
     })
-    this.debug = debug
   }
 
   private scheduleInitializationAfterConnect() {
     if (this.initializationScheduled) return this.initialized
     this.initializationScheduled = true
-    this.initialized = new Promise((resolve) => {
+    this.initialized = new Promise(resolve => {
       this.transport.on(
         'open',
         () => {
@@ -196,7 +193,7 @@ export class LanguageServer extends ObservableV2<Notifications & TransportEvents
                 error,
               )
             },
-          }).then((result) => {
+          }).then(result => {
             if (!result.ok) {
               result.error.log('Error initializing Language Server RPC')
             }
@@ -214,7 +211,7 @@ export class LanguageServer extends ObservableV2<Notifications & TransportEvents
   }
 
   get contentRoots(): Promise<ContentRoot[]> {
-    return this.initialized.then((result) => (result.ok ? result.value.contentRoots : []))
+    return this.initialized.then(result => (result.ok ? result.value.contentRoots : []))
   }
 
   reconnect() {
@@ -234,10 +231,7 @@ export class LanguageServer extends ObservableV2<Notifications & TransportEvents
     const uuid = uuidv4()
     const now = performance.now()
     try {
-      if (this.debug) {
-        console.log(`LS [${uuid}] ${method}:`)
-        console.dir(params)
-      }
+      debugLog('LS [%s] %s:\n%j', uuid, method, params)
       if (waitForInit) {
         const initResult = await this.initialized
         if (!initResult.ok) return initResult
@@ -251,9 +245,7 @@ export class LanguageServer extends ObservableV2<Notifications & TransportEvents
         return Err(new LsRpcError(error, method, params))
       } else throw error
     } finally {
-      if (this.debug) {
-        console.log(`LS [${uuid}] ${method} took ${performance.now() - now}ms`)
-      }
+      debugLog('LS [%s] %s took %dms', uuid, method, performance.now() - now)
     }
   }
 
diff --git a/app/gui2/shared/languageServer/files.ts b/app/ydoc-shared/src/languageServer/files.ts
similarity index 94%
rename from app/gui2/shared/languageServer/files.ts
rename to app/ydoc-shared/src/languageServer/files.ts
index 567573570081..661ccb1e6fea 100644
--- a/app/gui2/shared/languageServer/files.ts
+++ b/app/ydoc-shared/src/languageServer/files.ts
@@ -1,4 +1,4 @@
-import { type LanguageServer } from '../languageServer'
+import type { LanguageServer } from '../languageServer'
 import type { FileSystemObject, Path } from '../languageServerTypes'
 import { Err, Ok, type Result } from '../util/data/result'
 
diff --git a/app/gui2/shared/languageServerTypes.ts b/app/ydoc-shared/src/languageServerTypes.ts
similarity index 100%
rename from app/gui2/shared/languageServerTypes.ts
rename to app/ydoc-shared/src/languageServerTypes.ts
diff --git a/app/gui2/shared/languageServerTypes/suggestions.ts b/app/ydoc-shared/src/languageServerTypes/suggestions.ts
similarity index 99%
rename from app/gui2/shared/languageServerTypes/suggestions.ts
rename to app/ydoc-shared/src/languageServerTypes/suggestions.ts
index 8e3835a62ce7..217cb60c550a 100644
--- a/app/gui2/shared/languageServerTypes/suggestions.ts
+++ b/app/ydoc-shared/src/languageServerTypes/suggestions.ts
@@ -1,4 +1,4 @@
-import type { Uuid } from '../languageServerTypes'
+import { Uuid } from '../yjsModel'
 
 export type SuggestionId = number
 
diff --git a/app/gui2/shared/util/__tests__/net.test.ts b/app/ydoc-shared/src/util/__tests__/net.test.ts
similarity index 95%
rename from app/gui2/shared/util/__tests__/net.test.ts
rename to app/ydoc-shared/src/util/__tests__/net.test.ts
index fbbb813e8770..fdddd6bc3a97 100644
--- a/app/gui2/shared/util/__tests__/net.test.ts
+++ b/app/ydoc-shared/src/util/__tests__/net.test.ts
@@ -1,6 +1,6 @@
-import { Err, Ok, ResultError } from 'shared/util/data/result'
-import { exponentialBackoff } from 'shared/util/net'
 import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
+import { Err, Ok, ResultError } from '../data/result'
+import { exponentialBackoff } from '../net'
 
 beforeEach(() => {
   vi.useFakeTimers()
diff --git a/app/gui2/shared/util/assert.ts b/app/ydoc-shared/src/util/assert.ts
similarity index 99%
rename from app/gui2/shared/util/assert.ts
rename to app/ydoc-shared/src/util/assert.ts
index 1525c891a348..81882739fb2f 100644
--- a/app/gui2/shared/util/assert.ts
+++ b/app/ydoc-shared/src/util/assert.ts
@@ -9,7 +9,7 @@ export function assert(condition: boolean, message?: string): asserts condition
 /**
  * Checks if the given iterable has the specified length and throws an assertion error
  * if the lengths do not match.
- *
+ *export function assert
  * @param iterable The iterable to check.
  * @param length The expected length of the iterable.
  * @param message Optional message for the assertion error.
diff --git a/app/gui2/shared/util/data/__tests__/iterable.test.ts b/app/ydoc-shared/src/util/data/__tests__/iterable.test.ts
similarity index 77%
rename from app/gui2/shared/util/data/__tests__/iterable.test.ts
rename to app/ydoc-shared/src/util/data/__tests__/iterable.test.ts
index 3ee69da0453e..eecaac5830f5 100644
--- a/app/gui2/shared/util/data/__tests__/iterable.test.ts
+++ b/app/ydoc-shared/src/util/data/__tests__/iterable.test.ts
@@ -1,5 +1,5 @@
-import { tryGetSoleValue } from 'shared/util/data/iterable'
 import { expect, test } from 'vitest'
+import { tryGetSoleValue } from '../iterable'
 
 test('tryGetSoleValue', () => {
   expect(tryGetSoleValue([])).toBeUndefined()
diff --git a/app/gui2/shared/util/data/__tests__/text.test.ts b/app/ydoc-shared/src/util/data/__tests__/text.test.ts
similarity index 97%
rename from app/gui2/shared/util/data/__tests__/text.test.ts
rename to app/ydoc-shared/src/util/data/__tests__/text.test.ts
index ff82efe66072..a8dfbdd3e87f 100644
--- a/app/gui2/shared/util/data/__tests__/text.test.ts
+++ b/app/ydoc-shared/src/util/data/__tests__/text.test.ts
@@ -8,8 +8,7 @@ test.prop({
 })('textChangeToEdits / applyTextEdits round-trip', ({ before, after }) => {
   // Generate strings composed of a mix of only two characters so that `textChangeToEdits` will find a variety of
   // similarities between the inputs.
-  const stringFromBools = (bools: Array<boolean>) =>
-    bools.map((bool) => (bool ? 't' : 'f')).join('')
+  const stringFromBools = (bools: Array<boolean>) => bools.map(bool => (bool ? 't' : 'f')).join('')
   const beforeString = stringFromBools(before)
   const afterString = stringFromBools(after)
   const edits = textChangeToEdits(beforeString, afterString)
diff --git a/app/gui2/shared/util/data/graph.ts b/app/ydoc-shared/src/util/data/graph.ts
similarity index 100%
rename from app/gui2/shared/util/data/graph.ts
rename to app/ydoc-shared/src/util/data/graph.ts
diff --git a/app/gui2/shared/util/data/iterable.ts b/app/ydoc-shared/src/util/data/iterable.ts
similarity index 100%
rename from app/gui2/shared/util/data/iterable.ts
rename to app/ydoc-shared/src/util/data/iterable.ts
diff --git a/app/gui2/shared/util/data/opt.ts b/app/ydoc-shared/src/util/data/opt.ts
similarity index 100%
rename from app/gui2/shared/util/data/opt.ts
rename to app/ydoc-shared/src/util/data/opt.ts
diff --git a/app/gui2/shared/util/data/result.ts b/app/ydoc-shared/src/util/data/result.ts
similarity index 95%
rename from app/gui2/shared/util/data/result.ts
rename to app/ydoc-shared/src/util/data/result.ts
index ab3c6fa5dcbf..83ce2b2407a7 100644
--- a/app/gui2/shared/util/data/result.ts
+++ b/app/ydoc-shared/src/util/data/result.ts
@@ -62,7 +62,7 @@ export class ResultError<E = unknown> {
 
   message(preamble: string = 'error') {
     const ctx =
-      this.context.length > 0 ? `\n${Array.from(this.context, (ctx) => ctx()).join('\n')}` : ''
+      this.context.length > 0 ? `\n${Array.from(this.context, ctx => ctx()).join('\n')}` : ''
     return `${preamble}: ${this.payload}${ctx}`
   }
 }
@@ -98,7 +98,7 @@ export function rejectionToResult<ErrorKind extends new (...args: any[]) => any>
   errorKinds: ErrorKind | ErrorKind[],
 ): <T>(promise: Promise<T>) => Promise<Result<T, InstanceType<ErrorKind>>> {
   const errorKindArray = Array.isArray(errorKinds) ? errorKinds : [errorKinds]
-  return async (promise) => {
+  return async promise => {
     try {
       return Ok(await promise)
     } catch (error) {
diff --git a/app/gui2/shared/util/data/text.ts b/app/ydoc-shared/src/util/data/text.ts
similarity index 95%
rename from app/gui2/shared/util/data/text.ts
rename to app/ydoc-shared/src/util/data/text.ts
index 9f4027df94b4..fdd680791c7d 100644
--- a/app/gui2/shared/util/data/text.ts
+++ b/app/ydoc-shared/src/util/data/text.ts
@@ -76,7 +76,7 @@ export function applyTextEditsToSpans(textEdits: SourceRangeEdit[], spansBefore:
   const endMap = new Map<number, number>()
   let offset = 0
   for (const { range, insert } of textEdits) {
-    starts.advanceWhile((start) => {
+    starts.advanceWhile(start => {
       if (start < range[0]) {
         startMap.set(start, start + offset)
         return true
@@ -86,7 +86,7 @@ export function applyTextEditsToSpans(textEdits: SourceRangeEdit[], spansBefore:
       }
       return false
     })
-    ends.advanceWhile((end) => {
+    ends.advanceWhile(end => {
       if (end <= range[0]) {
         endMap.set(end, end + offset)
         return true
@@ -98,8 +98,8 @@ export function applyTextEditsToSpans(textEdits: SourceRangeEdit[], spansBefore:
     })
     offset += insert.length - rangeLength(range)
   }
-  starts.forEach((start) => startMap.set(start, start + offset))
-  ends.forEach((end) => endMap.set(end, end + offset))
+  starts.forEach(start => startMap.set(start, start + offset))
+  ends.forEach(end => endMap.set(end, end + offset))
 
   // Apply the translations to the map.
   const spansBeforeAndAfter = new Array<readonly [SourceRange, SourceRange]>()
@@ -129,7 +129,7 @@ export function enclosingSpans<NodeId>(
   for (const child of tree.children()) {
     const childSpan = child.span()
     const childRanges: SourceRange[] = []
-    ranges = ranges.filter((range) => {
+    ranges = ranges.filter(range => {
       if (rangeEncloses(childSpan, range)) {
         childRanges.push(range)
         return false
diff --git a/app/gui2/shared/util/detect.ts b/app/ydoc-shared/src/util/detect.ts
similarity index 100%
rename from app/gui2/shared/util/detect.ts
rename to app/ydoc-shared/src/util/detect.ts
diff --git a/app/gui2/shared/util/net.ts b/app/ydoc-shared/src/util/net.ts
similarity index 86%
rename from app/gui2/shared/util/net.ts
rename to app/ydoc-shared/src/util/net.ts
index a51842619a47..63292309d21b 100644
--- a/app/gui2/shared/util/net.ts
+++ b/app/ydoc-shared/src/util/net.ts
@@ -1,10 +1,18 @@
-import { Transport } from '@open-rpc/client-js/build/transports/Transport'
-import { type ObservableV2 } from 'lib0/observable'
+import type { ObservableV2 } from 'lib0/observable'
 import { wait } from 'lib0/promise'
-import { type WebSocketEventMap } from 'partysocket/ws'
-import { type Result, type ResultError } from './data/result'
-import { type AddEventListenerOptions } from './net/ReconnectingWSTransport'
+import type { Result, ResultError } from './data/result'
+import { type MockTransportData, MockWebSocketTransport } from './net/MockWSTransport'
+import {
+  ReconnectingWebSocket,
+  ReconnectingWebSocketTransport,
+} from './net/ReconnectingWSTransport'
 
+export {
+  MockWebSocketTransport,
+  ReconnectingWebSocket,
+  ReconnectingWebSocketTransport,
+  type MockTransportData,
+}
 interface Disposable {
   dispose(): void
 }
@@ -151,7 +159,7 @@ export function defaultOnFailure(
 export function defaultOnSuccess(
   description: string,
 ): NonNullable<BackoffOptions<any>['onSuccess']> {
-  return (retryCount) => {
+  return retryCount => {
     if (retryCount === 0) return
     console.info(
       'Successfully ' +
@@ -170,17 +178,3 @@ export function printingCallbacks(successDescription: string, errorDescription:
     onFailure: defaultOnFailure(errorDescription),
   } satisfies BackoffOptions<unknown>
 }
-
-export type ReconnectingTransportWithWebsocketEvents = Transport & {
-  on<K extends keyof WebSocketEventMap>(
-    type: K,
-    cb: (event: WebSocketEventMap[K]) => void,
-    options?: AddEventListenerOptions,
-  ): void
-  off<K extends keyof WebSocketEventMap>(
-    type: K,
-    cb: (event: WebSocketEventMap[K]) => void,
-    options?: AddEventListenerOptions,
-  ): void
-  reconnect(): void
-}
diff --git a/app/ydoc-shared/src/util/net/MockWSTransport.ts b/app/ydoc-shared/src/util/net/MockWSTransport.ts
new file mode 100644
index 000000000000..3b94057c3bc3
--- /dev/null
+++ b/app/ydoc-shared/src/util/net/MockWSTransport.ts
@@ -0,0 +1,75 @@
+import type {
+  IJSONRPCNotificationResponse,
+  JSONRPCRequestData,
+} from '@open-rpc/client-js/build/Request'
+import type { WebSocketEventMap } from 'partysocket/ws'
+import { Notifications } from '../../languageServerTypes'
+import { ReconnectingWebSocketTransport } from './ReconnectingWSTransport'
+
+type ArgumentsType<T> = T extends (...args: infer U) => any ? U : never
+
+export interface MockTransportData<Methods extends string = string> {
+  (method: Methods, params: any, transport: MockWebSocketTransport): Promise<any>
+}
+
+export class MockWebSocketTransport extends ReconnectingWebSocketTransport {
+  static mocks: Map<string, MockTransportData> = new Map()
+  private openEventListeners = new Set<(event: WebSocketEventMap['open']) => void>()
+  constructor(public name: string) {
+    super('')
+  }
+
+  static addMock<Methods extends string>(name: string, data: MockTransportData<Methods>) {
+    MockWebSocketTransport.mocks.set(name, data as any)
+  }
+  override connect(): Promise<any> {
+    for (const listener of this.openEventListeners) listener(new Event('open'))
+    return Promise.resolve()
+  }
+  override reconnect() {}
+  override close(): void {}
+  override sendData(data: JSONRPCRequestData, timeout?: number | null): Promise<any> {
+    if (Array.isArray(data)) return Promise.all(data.map(d => this.sendData(d.request, timeout)))
+    return (
+      MockWebSocketTransport.mocks.get(this.name)?.(
+        data.request.method,
+        data.request.params,
+        this,
+      ) ?? Promise.reject()
+    )
+  }
+  emit<N extends keyof Notifications>(method: N, params: ArgumentsType<Notifications[N]>[0]): void {
+    this.transportRequestManager.transportEventChannel.emit('notification', {
+      jsonrpc: '2.0',
+      method,
+      params,
+    } as IJSONRPCNotificationResponse)
+  }
+
+  override on<K extends keyof WebSocketEventMap>(
+    type: K,
+    cb: (
+      event: WebSocketEventMap[K] extends Event ? WebSocketEventMap[K] : never,
+    ) => WebSocketEventMap[K] extends Event ? void : never,
+    options?: AddEventListenerOptions,
+  ): void {
+    if (type === 'open') this.openEventListeners.add(cb as any)
+  }
+
+  override off<K extends keyof WebSocketEventMap>(
+    type: K,
+    cb: (
+      event: WebSocketEventMap[K] extends Event ? WebSocketEventMap[K] : never,
+    ) => WebSocketEventMap[K] extends Event ? void : never,
+    options?: AddEventListenerOptions,
+  ): void {
+    if (type === 'open') this.openEventListeners.delete(cb as any)
+  }
+}
+
+export interface WebSocketHandler {
+  (
+    data: string | ArrayBufferLike | Blob | ArrayBufferView,
+    send: (data: string | ArrayBufferLike | Blob | ArrayBufferView) => void,
+  ): void
+}
diff --git a/app/ydoc-shared/src/util/net/ReconnectingWSTransport.ts b/app/ydoc-shared/src/util/net/ReconnectingWSTransport.ts
new file mode 100644
index 000000000000..2ae14f848e50
--- /dev/null
+++ b/app/ydoc-shared/src/util/net/ReconnectingWSTransport.ts
@@ -0,0 +1,54 @@
+/**
+ * This file is modified version of open-rpc/client-js WebSocketTransport implementation
+ * (https://github.com/open-rpc/client-js/blob/master/src/transports/WebSocketTransport.ts)
+ * which uses the automatically reconnecting websocket.
+ */
+
+import { WebSocketTransport } from '@open-rpc/client-js'
+import WS from 'isomorphic-ws'
+import { WebSocket } from 'partysocket'
+import ReconnectingWebSocket, { type WebSocketEventMap } from 'partysocket/ws'
+
+export { ReconnectingWebSocket }
+
+export interface AddEventListenerOptions {
+  capture?: boolean
+  once?: boolean
+  passive?: boolean
+  signal?: AbortSignal
+}
+
+export class ReconnectingWebSocketTransport extends WebSocketTransport {
+  private _reconnectingConnection: ReconnectingWebSocket
+  constructor(uri: string) {
+    super(uri)
+    this.uri = uri
+    this._reconnectingConnection = new WebSocket(uri, undefined, { WebSocket: WS })
+    // Make sure that the WebSocketTransport implementation uses this version of socket.
+    this.connection = this._reconnectingConnection as any
+  }
+
+  public reconnect() {
+    this._reconnectingConnection.reconnect()
+  }
+
+  on<K extends keyof WebSocketEventMap>(
+    type: K,
+    cb: (
+      event: WebSocketEventMap[K] extends Event ? WebSocketEventMap[K] : never,
+    ) => WebSocketEventMap[K] extends Event ? void : never,
+    options?: AddEventListenerOptions,
+  ): void {
+    this._reconnectingConnection.addEventListener(type, cb, options)
+  }
+
+  off<K extends keyof WebSocketEventMap>(
+    type: K,
+    cb: (
+      event: WebSocketEventMap[K] extends Event ? WebSocketEventMap[K] : never,
+    ) => WebSocketEventMap[K] extends Event ? void : never,
+    options?: AddEventListenerOptions,
+  ): void {
+    this._reconnectingConnection.removeEventListener(type, cb, options)
+  }
+}
diff --git a/app/gui2/shared/util/types.ts b/app/ydoc-shared/src/util/types.ts
similarity index 100%
rename from app/gui2/shared/util/types.ts
rename to app/ydoc-shared/src/util/types.ts
diff --git a/app/gui2/shared/uuid.ts b/app/ydoc-shared/src/uuid.ts
similarity index 100%
rename from app/gui2/shared/uuid.ts
rename to app/ydoc-shared/src/uuid.ts
diff --git a/app/gui2/shared/yjsModel.ts b/app/ydoc-shared/src/yjsModel.ts
similarity index 99%
rename from app/gui2/shared/yjsModel.ts
rename to app/ydoc-shared/src/yjsModel.ts
index 49116232dc21..45f554e9821d 100644
--- a/app/gui2/shared/yjsModel.ts
+++ b/app/ydoc-shared/src/yjsModel.ts
@@ -157,7 +157,7 @@ export function sourceRangeKey(range: SourceRange): SourceRangeKey {
   return `${range[0].toString(16)}:${range[1].toString(16)}` as SourceRangeKey
 }
 export function sourceRangeFromKey(key: SourceRangeKey): SourceRange {
-  return key.split(':').map((x) => parseInt(x, 16)) as [number, number]
+  return key.split(':').map(x => parseInt(x, 16)) as [number, number]
 }
 
 export class IdMap {
diff --git a/app/ydoc-shared/tsconfig.json b/app/ydoc-shared/tsconfig.json
new file mode 100644
index 000000000000..a46d328adb14
--- /dev/null
+++ b/app/ydoc-shared/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "extends": "../tsconfig.json",
+  "include": ["src/**/*.ts"],
+  "compilerOptions": {
+    "composite": true,
+    "noEmit": false,
+    "rootDir": "src",
+    "outDir": "dist",
+    "types": ["node", "vitest/importMeta"]
+  }
+}
diff --git a/app/ydoc-shared/vitest.config.ts b/app/ydoc-shared/vitest.config.ts
new file mode 100644
index 000000000000..6019cc586b8e
--- /dev/null
+++ b/app/ydoc-shared/vitest.config.ts
@@ -0,0 +1,15 @@
+import wasm from 'vite-plugin-wasm'
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  plugins: [wasm()],
+  build: {
+    lib: {
+      entry: 'src/index.ts',
+      formats: ['es'],
+    },
+  },
+  resolve: {
+    conditions: ['source'],
+  },
+})
diff --git a/build/build/src/ci_gen.rs b/build/build/src/ci_gen.rs
index e7424ceca960..9a5e63ea3749 100644
--- a/build/build/src/ci_gen.rs
+++ b/build/build/src/ci_gen.rs
@@ -644,19 +644,19 @@ pub fn gui() -> Result<Workflow> {
         workflow.add_customized(target, job::PackageIde, |job| {
             job.needs.insert(project_manager_job.clone());
         });
-        workflow.add(target, job::NewGuiBuild);
+        workflow.add(target, job::GuiBuild);
     }
     Ok(workflow)
 }
 
 pub fn gui_tests() -> Result<Workflow> {
     let on = typical_check_triggers();
-    let mut workflow = Workflow { name: "GUI Tests".into(), on, ..default() };
+    let mut workflow = Workflow { name: "GUI Check".into(), on, ..default() };
     workflow.add(PRIMARY_TARGET, job::CancelWorkflow);
     workflow.add(PRIMARY_TARGET, job::Lint);
     workflow.add(PRIMARY_TARGET, job::WasmTest);
     workflow.add(PRIMARY_TARGET, job::NativeTest);
-    workflow.add(PRIMARY_TARGET, job::GuiTest);
+    workflow.add(PRIMARY_TARGET, job::GuiCheck);
     Ok(workflow)
 }
 
diff --git a/build/build/src/ci_gen/job.rs b/build/build/src/ci_gen/job.rs
index 3987498abd7f..f269745e3417 100644
--- a/build/build/src/ci_gen/job.rs
+++ b/build/build/src/ci_gen/job.rs
@@ -326,21 +326,21 @@ impl JobArchetype for NativeTest {
 }
 
 #[derive(Clone, Copy, Debug)]
-pub struct GuiTest;
+pub struct GuiCheck;
 
-impl JobArchetype for GuiTest {
+impl JobArchetype for GuiCheck {
     fn job(&self, target: Target) -> Job {
-        plain_job(target, "GUI tests", "gui test")
+        plain_job(target, "GUI tests", "gui check")
     }
 }
 
 
 #[derive(Clone, Copy, Debug)]
-pub struct NewGuiBuild;
+pub struct GuiBuild;
 
-impl JobArchetype for NewGuiBuild {
+impl JobArchetype for GuiBuild {
     fn job(&self, target: Target) -> Job {
-        let command = "gui build";
+        let command: &str = "gui build";
         RunStepsBuilder::new(command)
             .customize(|step| vec![expose_gui_vars(step)])
             .build_job("GUI build", target)
diff --git a/build/build/src/ide/web.rs b/build/build/src/ide/web.rs
index f1fd041e4ad7..e2d674514090 100644
--- a/build/build/src/ide/web.rs
+++ b/build/build/src/ide/web.rs
@@ -11,8 +11,8 @@ use anyhow::Context;
 use ide_ci::env::known::electron_builder::WindowsSigningCredentials;
 use ide_ci::program::command::FallibleManipulator;
 use ide_ci::program::command::Manipulator;
-use ide_ci::programs::node::NpmCommand;
-use ide_ci::programs::Npm;
+use ide_ci::programs::node::PnpmCommand;
+use ide_ci::programs::Pnpm;
 use sha2::Digest;
 use std::process::Stdio;
 use tempfile::TempDir;
@@ -171,26 +171,6 @@ impl Manipulator for RemoveEmptyCscEnvVars {
     }
 }
 
-#[derive(Clone, Copy, Debug)]
-pub enum Workspaces {
-    Icons,
-    IdeDesktop,
-    Content,
-    /// The Electron client.
-    Enso,
-}
-
-impl AsRef<OsStr> for Workspaces {
-    fn as_ref(&self) -> &OsStr {
-        match self {
-            Workspaces::Icons => OsStr::new("enso-icons"),
-            Workspaces::IdeDesktop => OsStr::new("enso-ide-desktop"),
-            Workspaces::Content => OsStr::new("enso-content"),
-            Workspaces::Enso => OsStr::new("enso"),
-        }
-    }
-}
-
 pub fn target_os_flag(os: OS) -> Result<&'static str> {
     match os {
         OS::Windows => Ok("--win"),
@@ -254,10 +234,8 @@ impl IdeDesktop {
         }
     }
 
-    pub fn npm(&self) -> Result<NpmCommand> {
-        let mut command = Npm.cmd()?;
-        command.arg("--color").arg("always");
-        command.arg("--yes");
+    pub fn pnpm(&self) -> Result<PnpmCommand> {
+        let mut command = Pnpm.cmd()?;
         command.current_dir(&self.repo_root);
         command.stdin(Stdio::null()); // nothing in that process subtree should require input
         Ok(command)
@@ -269,10 +247,9 @@ impl IdeDesktop {
     }
 
     pub async fn build_icons(&self, output_path: impl AsRef<Path>) -> Result<IconsArtifacts> {
-        self.npm()?
-            .workspace(Workspaces::Icons)
+        self.pnpm()?
             .set_env(env::ENSO_BUILD_ICONS, output_path.as_ref())?
-            .run("build")
+            .run("build:icons")
             .run_ok()
             .await?;
         Ok(IconsArtifacts(output_path.as_ref().into()))
@@ -307,12 +284,11 @@ impl IdeDesktop {
 
         crate::web::install(&self.repo_root).await?;
         let pm_bundle = ProjectManagerInfo::new(project_manager)?;
-        self.npm()?
+        self.pnpm()?
             .set_env(env::ENSO_BUILD_GUI, gui.as_ref())?
             .set_env(env::ENSO_BUILD_IDE, output_path)?
             .try_applying(&pm_bundle)?
-            .workspace(Workspaces::Enso)
-            .run("build")
+            .run("build:ide")
             .run_ok()
             .await?;
 
@@ -326,7 +302,7 @@ impl IdeDesktop {
             None => vec![],
         };
 
-        self.npm()?
+        self.pnpm()?
             .try_applying(&icons)?
             .apply(&RemoveEmptyCscEnvVars)
             // .env("DEBUG", "electron-builder")
@@ -334,9 +310,7 @@ impl IdeDesktop {
             .set_env(env::ENSO_BUILD_IDE, output_path)?
             .set_env(env::ENSO_BUILD_PROJECT_MANAGER, project_manager.as_ref())?
             .set_env(enso_install_config::ENSO_BUILD_ELECTRON_BUILDER_CONFIG, &electron_config)?
-            .workspace(Workspaces::Enso)
-            // .args(["--loglevel", "verbose"])
-            .run("dist")
+            .run("dist:ide")
             .arg("--")
             .arg(target_os_flag(target_os)?)
             .args(target_args)
diff --git a/build/build/src/project/gui.rs b/build/build/src/project/gui.rs
index 02436e477fdd..95ef70b1aade 100644
--- a/build/build/src/project/gui.rs
+++ b/build/build/src/project/gui.rs
@@ -13,112 +13,6 @@ use crate::project::IsTarget;
 use crate::source::WithDestination;
 
 use ide_ci::ok_ready_boxed;
-use ide_ci::programs::node::NpmCommand;
-use ide_ci::programs::Npm;
-
-
-
-// ===============
-// === Scripts ===
-// ===============
-
-/// The scripts defined in `package.json`.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, strum::AsRefStr)]
-#[strum(serialize_all = "kebab-case")]
-pub enum Scripts {
-    Dev,
-    Build,
-    Preview,
-    Test,
-    #[strum(serialize = "test:unit")]
-    TestUnit,
-    #[strum(serialize = "test:e2e")]
-    TestE2e,
-    BuildOnly,
-    TypeCheck,
-    Lint,
-    Format,
-    BuildRustFfi,
-}
-
-pub fn script(repo_root: impl AsRef<Path>, script: Scripts) -> Result<NpmCommand> {
-    let mut ret = Npm.cmd()?;
-    ret.current_dir(repo_root).workspace(crate::web::Workspace::EnsoGui2).run(script.as_ref());
-    Ok(ret)
-}
-
-pub fn dashboard_script(repo_root: impl AsRef<Path>, script: Scripts) -> Result<NpmCommand> {
-    let mut ret = Npm.cmd()?;
-    ret.current_dir(repo_root).workspace(crate::web::Workspace::EnsoDashboard).run(script.as_ref());
-    Ok(ret)
-}
-
-
-
-// ================
-// === Commands ===
-// ================
-
-/// Run steps that should be done along with the "lint"
-pub fn lint(repo_root: impl AsRef<Path>) -> BoxFuture<'static, Result> {
-    install_and_run_script(Scripts::Lint, repo_root)
-}
-
-pub fn tests(repo_root: impl AsRef<Path>) -> BoxFuture<'static, Result> {
-    install_and_run_script(Scripts::Test, repo_root)
-}
-
-pub fn dashboard_tests(repo_root: impl AsRef<Path>) -> BoxFuture<'static, Result> {
-    install_and_run_dashboard_script(Scripts::Test, repo_root)
-}
-
-/// Run unit tests.
-pub fn unit_tests(repo_root: impl AsRef<Path>) -> BoxFuture<'static, Result> {
-    install_and_run_script(Scripts::TestUnit, repo_root)
-}
-
-/// Run dashboard unit tests.
-pub fn dashboard_unit_tests(repo_root: impl AsRef<Path>) -> BoxFuture<'static, Result> {
-    install_and_run_dashboard_script(Scripts::TestUnit, repo_root)
-}
-
-/// Run E2E tests.
-pub fn e2e_tests(repo_root: impl AsRef<Path>) -> BoxFuture<'static, Result> {
-    install_and_run_script(Scripts::TestE2e, repo_root)
-}
-
-/// Run dashboard E2E tests.
-pub fn dashboard_e2e_tests(repo_root: impl AsRef<Path>) -> BoxFuture<'static, Result> {
-    install_and_run_dashboard_script(Scripts::TestE2e, repo_root)
-}
-
-pub fn watch(repo_root: impl AsRef<Path>) -> BoxFuture<'static, Result> {
-    install_and_run_script(Scripts::Dev, repo_root)
-}
-
-fn install_and_run_script(
-    script: Scripts,
-    repo_root: impl AsRef<Path>,
-) -> BoxFuture<'static, Result> {
-    let repo_root = repo_root.as_ref().to_owned();
-    async move {
-        crate::web::install(&repo_root).await?;
-        self::script(&repo_root, script)?.run_ok().await
-    }
-    .boxed()
-}
-
-fn install_and_run_dashboard_script(
-    script: Scripts,
-    repo_root: impl AsRef<Path>,
-) -> BoxFuture<'static, Result> {
-    let repo_root = repo_root.as_ref().to_owned();
-    async move {
-        crate::web::install(&repo_root).await?;
-        dashboard_script(&repo_root, script)?.run_ok().await
-    }
-    .boxed()
-}
 
 // ================
 // === Artifact ===
@@ -142,8 +36,6 @@ impl Artifact {
     }
 }
 
-
-
 // ==============
 // === Target ===
 // ==============
@@ -199,7 +91,7 @@ impl IsTarget for Gui {
             )
             .await?;
             crate::web::install(repo_root).await?;
-            script(repo_root, Scripts::Build)?.run_ok().await?;
+            crate::web::run_script(repo_root, crate::web::Script::Build).await?;
             ide_ci::fs::mirror_directory(
                 &repo_root.app.gui_2.dist,
                 &destination.join(RepoRootDistGui2Assets::segment_name()),
diff --git a/build/build/src/web.rs b/build/build/src/web.rs
index aa8deb30d28e..4f165d9c7d84 100644
--- a/build/build/src/web.rs
+++ b/build/build/src/web.rs
@@ -5,7 +5,6 @@
 use crate::prelude::*;
 
 use ide_ci::io::retry;
-use ide_ci::programs::Npm;
 use ide_ci::programs::Pnpm;
 
 
@@ -66,37 +65,17 @@ pub fn assume_installed() {
 #[derive(Clone, Copy, Debug, PartialEq, Eq, strum::AsRefStr)]
 #[strum(serialize_all = "kebab-case")]
 pub enum Script {
-    Format,
-    Prettier,
-    Lint,
-    Test,
-    Typecheck,
     CiCheck,
+    #[strum(serialize = "build:gui")]
+    Build,
+    Format,
+    #[strum(serialize = "format:workflows")]
+    FormatWorkflows,
 }
 
 /// Invoke the given script in the context of the root repository's NPM.
 pub fn run_script(repo_root: impl AsRef<Path>, script: Script) -> BoxFuture<'static, Result> {
     let root_path = repo_root.as_ref().to_owned();
-    async move { Npm.cmd()?.with_current_dir(&root_path).run(script.as_ref()).run_ok().await }
+    async move { Pnpm.cmd()?.with_current_dir(&root_path).run(script.as_ref()).run_ok().await }
         .boxed()
 }
-
-/// The list of NPM workspaces that are part of the root repository.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, strum::AsRefStr)]
-#[strum(serialize_all = "kebab-case")]
-pub enum Workspace {
-    EnsoIdeDesktop,
-    Enso,
-    EnsoContent,
-    EnsoDashboard,
-    EnsoIcons,
-    EnsoAuthentication,
-    EnsoGui2,
-    EnsoglRunner,
-}
-
-impl AsRef<OsStr> for Workspace {
-    fn as_ref(&self) -> &OsStr {
-        AsRef::<str>::as_ref(self).as_ref()
-    }
-}
diff --git a/build/ci-gen/src/main.rs b/build/ci-gen/src/main.rs
index dec30bb92041..ccee320d2cd0 100644
--- a/build/ci-gen/src/main.rs
+++ b/build/ci-gen/src/main.rs
@@ -37,7 +37,7 @@ async fn main() -> Result {
 
     // Ensure that generated files are properly formatted.
     enso_build::web::install(&repo_root).await?;
-    enso_build::web::run_script(&repo_root, enso_build::web::Script::Format).await?;
+    enso_build::web::run_script(&repo_root, enso_build::web::Script::FormatWorkflows).await?;
 
     Ok(())
 }
diff --git a/build/ci_utils/src/programs/node.rs b/build/ci_utils/src/programs/node.rs
index 56028bbf6854..e4ba8f0f5511 100644
--- a/build/ci_utils/src/programs/node.rs
+++ b/build/ci_utils/src/programs/node.rs
@@ -54,6 +54,11 @@ impl PnpmCommand {
         self.arg("pnpm").arg("i");
         self
     }
+
+    pub fn run(&mut self, script_name: impl AsRef<OsStr>) -> &mut Self {
+        self.arg("pnpm").arg("run").arg(script_name);
+        self
+    }
 }
 
 #[derive(Clone, Copy, Debug, Default)]
diff --git a/build/cli/src/arg.rs b/build/cli/src/arg.rs
index 67e160b34182..72b0afa47098 100644
--- a/build/cli/src/arg.rs
+++ b/build/cli/src/arg.rs
@@ -130,7 +130,7 @@ pub enum Target {
     /// Clean the repository. Keeps the IntelliJ's .idea directory intact. WARNING: This removes
     /// files that are not under version control in the repository subtree.
     GitClean(git_clean::Options),
-    /// Lint the codebase.
+    /// Lint non-TypeScript codebase. TypeScript Linting is part of the GUI Check target.
     Lint,
     /// Apply automatic formatters on the repository.
     #[clap(alias = "format")]
diff --git a/build/cli/src/arg/gui.rs b/build/cli/src/arg/gui.rs
index b96acdeb0352..fa8fc0387ee9 100644
--- a/build/cli/src/arg/gui.rs
+++ b/build/cli/src/arg/gui.rs
@@ -22,12 +22,8 @@ pub enum Command {
     Build(BuildJob<Gui>),
     /// Gets the GUI, either by compiling it from scratch or downloading from an external source.
     Get(Source<Gui>),
-    /// Runs the GUI's unit tests.
-    Test,
-    /// Run linter on the GUI's sources.
-    Lint,
-    /// Continuously rebuilds GUI when its sources are changed and serves it using dev-server.
-    Watch,
+    /// Runs the GUI's linting and unit tests.
+    Check,
 }
 
 #[derive(Args, Clone, Debug)]
diff --git a/build/cli/src/lib.rs b/build/cli/src/lib.rs
index 634c8c3515fd..154f099aa6a9 100644
--- a/build/cli/src/lib.rs
+++ b/build/cli/src/lib.rs
@@ -18,7 +18,6 @@ pub mod prelude {
 }
 
 use crate::prelude::*;
-use std::future::join;
 
 use crate::arg::java_gen;
 use crate::arg::libraries;
@@ -341,31 +340,35 @@ impl Processor {
         match gui.command {
             arg::gui::Command::Build(job) => self.build(job),
             arg::gui::Command::Get(source) => self.get(source).void_ok().boxed(),
-            arg::gui::Command::Test => {
+            arg::gui::Command::Check => {
                 let repo_root = self.repo_root.clone();
-                let gui_tests = run_and_upload_dir(
-                    gui::tests(&repo_root),
-                    &repo_root.app.gui_2.playwright_report,
-                    "gui-playwright-report",
-                );
-                let dashboard_tests = run_and_upload_dir(
-                    gui::dashboard_tests(&repo_root),
-                    &repo_root.app.dashboard.playwright_report,
-                    "dashboard-playwright-report",
-                );
-                try_join(gui_tests, dashboard_tests).void_ok().boxed()
+                async {
+                    enso_build::web::install(&repo_root).await?;
+                    let check_result =
+                        enso_build::web::run_script(&repo_root, enso_build::web::Script::CiCheck)
+                            .await;
+                    if is_in_env() {
+                        let gui_report = ide_ci::actions::artifacts::upload_directory(
+                            &repo_root.app.gui_2.playwright_report,
+                            "gui-playwright-report",
+                        );
+                        let dashboard_report = ide_ci::actions::artifacts::upload_directory(
+                            repo_root.app.dashboard.playwright_report,
+                            "dashboard-playwright-report",
+                        );
+                        try_join!(gui_report, dashboard_report)?;
+                    }
+                    check_result
+                }
+                .void_ok()
+                .boxed()
             }
-            arg::gui::Command::Watch => gui::watch(&self.repo_root),
-            arg::gui::Command::Lint => gui::lint(&self.repo_root),
         }
     }
 
     pub fn handle_runtime(&self, gui: arg::runtime::Target) -> BoxFuture<'static, Result> {
-        // todo!()
         match gui.command {
             arg::runtime::Command::Build(job) => self.build(job),
-            //     arg::gui::Command::Get(source) => self.get(source).void_ok().boxed(),
-            //     arg::gui::Command::Watch(job) => self.watch_and_wait(job),
         }
     }
 
@@ -774,11 +777,6 @@ pub async fn main_internal(config: Option<Config>) -> Result {
                 .await?;
 
             enso_build::rust::enso_linter::lint_all(ctx.repo_root.clone()).await?;
-
-            enso_build::web::install(&ctx.repo_root).await?;
-            enso_build::web::run_script(&ctx.repo_root, enso_build::web::Script::Typecheck).await?;
-            enso_build::web::run_script(&ctx.repo_root, enso_build::web::Script::Lint).await?;
-            enso_build::web::run_script(&ctx.repo_root, enso_build::web::Script::Prettier).await?;
         }
         Target::Fmt => {
             enso_build::web::install(&ctx.repo_root).await?;
@@ -786,9 +784,7 @@ pub async fn main_internal(config: Option<Config>) -> Result {
                 enso_build::web::run_script(&ctx.repo_root, enso_build::web::Script::Format);
             let our_formatter =
                 enso_formatter::process_path(&ctx.repo_root, enso_formatter::Action::Format);
-            let (r1, r2) = join!(prettier, our_formatter).await;
-            r1?;
-            r2?;
+            try_join!(prettier, our_formatter)?;
         }
         Target::Release(release) => match release.action {
             Action::CreateDraft => {
diff --git a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Ydoc.java b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Ydoc.java
index 50b278025bdc..088a9151e1ec 100644
--- a/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Ydoc.java
+++ b/lib/java/ydoc-server/src/main/java/org/enso/ydoc/Ydoc.java
@@ -15,7 +15,7 @@
 public final class Ydoc implements AutoCloseable {
 
   private static final String YDOC_EXECUTOR_THREAD_NAME = "Ydoc executor thread";
-  private static final String YDOC_SERVER_PATH = "ydocServer.js";
+  private static final String YDOC_PATH = "ydoc.cjs";
 
   private final ScheduledExecutorService executor;
   private final ParserPolyfill parser;
@@ -116,12 +116,12 @@ public Context.Builder getContextBuilder() {
   }
 
   public void start() throws ExecutionException, InterruptedException, IOException {
-    var ydoc = Main.class.getResource(YDOC_SERVER_PATH);
+    var ydoc = Main.class.getResource(YDOC_PATH);
     if (ydoc == null) {
       throw new AssertionError(
-          YDOC_SERVER_PATH
+          YDOC_PATH
               + " not found in resources. You probably need to first built it with: "
-              + "`npm --workspace=enso-gui2 run build-ydoc-server-polyglot`");
+              + "`corepack pnpm -r compile`");
     }
     var ydocJs = Source.newBuilder("js", ydoc).build();
 
diff --git a/lib/rust/parser/schema/src/lib.rs b/lib/rust/parser/schema/src/lib.rs
index 465d84724cac..285a4ee9249a 100644
--- a/lib/rust/parser/schema/src/lib.rs
+++ b/lib/rust/parser/schema/src/lib.rs
@@ -42,9 +42,9 @@ pub fn schema() -> impl serde::Serialize {
 #[derive(Debug, serde::Serialize, serde::Deserialize)]
 pub struct Schema {
     /// The type definitions.
-    pub types:         HashMap<TypeId, Type>,
+    pub types:         BTreeMap<TypeId, Type>,
     /// Serialization information for the types.
-    pub serialization: HashMap<TypeId, Layout>,
+    pub serialization: BTreeMap<TypeId, Layout>,
 }
 
 
@@ -57,18 +57,18 @@ pub struct Type {
     /// The type's name, in snake case.
     pub name:   Rc<str>,
     /// The type's fields.
-    pub fields: HashMap<FieldName, TypeRef>,
+    pub fields: BTreeMap<FieldName, TypeRef>,
     /// The type's parent, if any.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub parent: Option<TypeId>,
 }
 
 /// Arbitrary key uniquely identifying a type within the schema.
-#[derive(Debug, serde::Serialize, serde::Deserialize, Clone, Hash, PartialEq, Eq)]
+#[derive(Debug, serde::Serialize, serde::Deserialize, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)]
 pub struct TypeId(Rc<str>);
 
 /// The name of a field, in snake case.
-#[derive(Debug, serde::Serialize, serde::Deserialize, Clone, Hash, PartialEq, Eq)]
+#[derive(Debug, serde::Serialize, serde::Deserialize, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)]
 pub struct FieldName(Rc<str>);
 
 /// A reference to a type, which may be a [`Type`] defined in the schema, a primitive, or a
@@ -154,7 +154,7 @@ pub struct Discriminant(u32);
 // ==================
 
 struct Types {
-    types: HashMap<TypeId, Type>,
+    types: BTreeMap<TypeId, Type>,
     ids:   HashMap<meta::TypeId, TypeId>,
 }
 
@@ -211,7 +211,7 @@ fn types(graph: &meta::TypeGraph) -> Types {
             }
         });
     }
-    let types: HashMap<_, _> = graph
+    let types: BTreeMap<_, _> = graph
         .types
         .iter()
         .filter_map(|(key, ty)| {
diff --git a/package.json b/package.json
index d48622c7e076..d39135cb93ae 100644
--- a/package.json
+++ b/package.json
@@ -13,27 +13,30 @@
   },
   "name": "root",
   "scripts": {
+    "dev:gui": "corepack pnpm run --parallel -r --filter enso-gui2 --filter ydoc-server-nodejs  --aggregate-output /^^^^dev:/",
+    "build:gui": "corepack pnpm run -r --filter enso-gui2 build",
+    "build:ide": "corepack pnpm run -r compile && corepack pnpm run -r --filter enso build",
+    "build:icons": "corepack pnpm run -r --filter enso-icons build",
+    "dist:ide": "corepack pnpm run -r --filter enso dist",
     "format": "prettier --write .",
-    "prettier": "prettier --check .",
-    "lint": "npm --workspaces --if-present run lint",
-    "test": "npm --workspaces --if-present run test",
-    "typecheck": "npm --workspaces --if-present run typecheck",
-    "ci-check": "run-p test prettier lint typecheck"
+    "format:workflows": "prettier --write .github/workflows",
+    "ci-check": "corepack pnpm run --aggregate-output /^ci:/",
+    "ci:prettier": "prettier --check .",
+    "ci:lint": "corepack pnpm run -r lint",
+    "ci:test": "corepack pnpm run -r --parallel test",
+    "ci:typecheck": "corepack pnpm run -r typecheck"
   },
+  "//": "Workspaces kept only to show deprecated message when running a script. Remove once everyone is familiar with pnpm.",
   "workspaces": [
-    "app/dashboard",
-    "app/ide-desktop/*",
-    "app/gui2",
-    "lib/js/runner"
+    "app/gui2"
   ],
   "pnpm": {
+    "//": "To completely ignore deep dependencies, see .pnpmfile.cjs",
     "overrides": {
       "tslib": "$tslib",
       "jsdom": "^24.1.0",
       "@types/react": "^18.0.27",
-      "react-native": "./_IGNORED_",
-      "react-native-url-polyfill": "./_IGNORED_",
-      "react-native-get-random-values": "./_IGNORED_"
+      "ws": "^8.18.0"
     },
     "packageExtensions": {
       "@aws-amplify/auth": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cea26abd2aea..7425388facbc 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -8,12 +8,12 @@ overrides:
   tslib: ^2.6.3
   jsdom: ^24.1.0
   '@types/react': ^18.0.27
-  react-native: ./_IGNORED_
-  react-native-url-polyfill: ./_IGNORED_
-  react-native-get-random-values: ./_IGNORED_
+  ws: ^8.18.0
 
 packageExtensionsChecksum: d5d1f1febc9b02d190bb3faf586ac1bb
 
+pnpmfileChecksum: yrev2pk43cjl5fkasomnhoqkcu
+
 importers:
 
   .:
@@ -309,11 +309,8 @@ importers:
         specifier: ^1.1.6
         version: 1.2.0
       '@noble/hashes':
-        specifier: ^1.3.2
+        specifier: ^1.4.0
         version: 1.4.0
-      '@open-rpc/client-js':
-        specifier: ^1.8.1
-        version: 1.8.1
       '@tanstack/vue-query':
         specifier: '>= 5.45.0 < 5.46.0'
         version: 5.45.0(vue@3.4.31(typescript@5.5.3))
@@ -338,9 +335,6 @@ importers:
       events:
         specifier: ^3.3.0
         version: 3.3.0
-      fast-diff:
-        specifier: ^1.3.0
-        version: 1.3.0
       hash-sum:
         specifier: ^2.0.0
         version: 2.0.0
@@ -349,7 +343,7 @@ importers:
         version: 0.13.0
       isomorphic-ws:
         specifier: ^5.0.0
-        version: 5.0.0(ws@8.17.1)
+        version: 5.0.0(ws@8.18.0)
       lexical:
         specifier: ^0.16.0
         version: 0.16.0
@@ -362,9 +356,6 @@ importers:
       murmurhash:
         specifier: ^2.0.1
         version: 2.0.1
-      partysocket:
-        specifier: ^1.0.1
-        version: 1.0.1
       postcss-inline-svg:
         specifier: ^6.0.0
         version: 6.0.0(postcss@8.4.39)
@@ -374,9 +365,6 @@ importers:
       react-toastify:
         specifier: ^9.1.3
         version: 9.1.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      rimraf:
-        specifier: ^5.0.5
-        version: 5.0.7
       sucrase:
         specifier: ^3.34.0
         version: 3.35.0
@@ -386,9 +374,6 @@ importers:
       vue:
         specifier: ^3.4.19
         version: 3.4.31(typescript@5.5.3)
-      ws:
-        specifier: ^8.13.0
-        version: 8.17.1
       y-codemirror.next:
         specifier: ^0.3.2
         version: 0.3.5(@codemirror/state@6.4.1)(@codemirror/view@6.28.3)(yjs@13.6.18)
@@ -401,13 +386,19 @@ importers:
       y-websocket:
         specifier: ^1.5.0
         version: 1.5.4(yjs@13.6.18)
+      ydoc-shared:
+        specifier: workspace:*
+        version: link:../ydoc-shared
       yjs:
         specifier: ^13.6.7
         version: 13.6.18
       zod:
-        specifier: ^3.22.4
+        specifier: ^3.23.8
         version: 3.23.8
     devDependencies:
+      '@codemirror/theme-one-dark':
+        specifier: ^6.1.2
+        version: 6.1.2
       '@danmarshall/deckgl-typings':
         specifier: ^4.9.28
         version: 4.9.28
@@ -429,9 +420,9 @@ importers:
       '@rushstack/eslint-patch':
         specifier: ^1.3.2
         version: 1.10.3
-      '@tsconfig/node18':
-        specifier: ^18.2.0
-        version: 18.2.4
+      '@tsconfig/node20':
+        specifier: ^20.1.4
+        version: 20.1.4
       '@types/css.escape':
         specifier: ^1.5.2
         version: 1.5.2
@@ -489,9 +480,6 @@ importers:
       '@vue/tsconfig':
         specifier: ^0.5.1
         version: 0.5.1
-      change-case:
-        specifier: ^4.1.2
-        version: 4.1.2
       cross-env:
         specifier: ^7.0.3
         version: 7.0.3
@@ -514,7 +502,7 @@ importers:
         specifier: ^2.0.0-beta.24
         version: 2.0.0(vue@3.4.31(typescript@5.5.3))
       hash-wasm:
-        specifier: ^4.10.0
+        specifier: ^4.11.0
         version: 4.11.0
       histoire:
         specifier: ^0.17.2
@@ -564,6 +552,9 @@ importers:
       vite-plugin-vue-devtools:
         specifier: 7.3.7
         version: 7.3.7(rollup@4.18.1)(vite@5.3.5(@types/node@20.11.21)(lightningcss@1.25.1))(vue@3.4.31(typescript@5.5.3))
+      vite-plugin-wasm:
+        specifier: ^3.3.0
+        version: 3.3.0(vite@5.3.5(@types/node@20.11.21)(lightningcss@1.25.1))
       vitest:
         specifier: ^1.3.1
         version: 1.6.0(@types/node@20.11.21)(jsdom@24.1.0)(lightningcss@1.25.1)
@@ -576,6 +567,9 @@ importers:
       yaml:
         specifier: ^2.4.5
         version: 2.4.5
+      ydoc-server:
+        specifier: workspace:*
+        version: link:../ydoc-server
 
   app/ide-desktop/client:
     dependencies:
@@ -609,6 +603,9 @@ importers:
       yargs:
         specifier: 17.6.2
         version: 17.6.2
+      ydoc-server:
+        specifier: workspace:*
+        version: link:../../ydoc-server
     devDependencies:
       '@babel/plugin-syntax-import-attributes':
         specifier: ^7.24.7
@@ -655,27 +652,15 @@ importers:
       esbuild:
         specifier: ^0.19.3
         version: 0.19.12
-      esbuild-plugin-yaml:
-        specifier: ^0.0.1
-        version: 0.0.1
+      esbuild-plugin-wasm:
+        specifier: ^1.1.0
+        version: 1.1.0
       fast-glob:
         specifier: ^3.2.12
         version: 3.3.2
-      lightningcss:
-        specifier: ^1.24.0
-        version: 1.25.1
       portfinder:
         specifier: ^1.0.32
         version: 1.0.32
-      rollup:
-        specifier: ^4.18.1
-        version: 4.18.1
-      sharp:
-        specifier: ^0.31.2
-        version: 0.31.3
-      to-ico:
-        specifier: ^1.1.5
-        version: 1.1.5
       tsx:
         specifier: ^4.7.1
         version: 4.16.0
@@ -722,6 +707,168 @@ importers:
         specifier: ^1.1.5
         version: 1.1.5
 
+  app/rust-ffi: {}
+
+  app/ydoc-server:
+    dependencies:
+      debug:
+        specifier: ^4.3.6
+        version: 4.3.6(supports-color@5.5.0)
+      fast-diff:
+        specifier: ^1.3.0
+        version: 1.3.0
+      isomorphic-ws:
+        specifier: ^5.0.0
+        version: 5.0.0(ws@8.18.0)
+      lib0:
+        specifier: ^0.2.85
+        version: 0.2.94
+      y-protocols:
+        specifier: ^1.0.5
+        version: 1.0.6(yjs@13.6.18)
+      ydoc-shared:
+        specifier: workspace:*
+        version: link:../ydoc-shared
+      yjs:
+        specifier: ^13.6.7
+        version: 13.6.18
+      zod:
+        specifier: ^3.23.8
+        version: 3.23.8
+    devDependencies:
+      '@fast-check/vitest':
+        specifier: ^0.0.8
+        version: 0.0.8(vitest@1.6.0(@types/node@20.11.21)(jsdom@24.1.0)(lightningcss@1.25.1))
+      '@types/debug':
+        specifier: ^4.1.12
+        version: 4.1.12
+      '@types/node':
+        specifier: ^20.11.21
+        version: 20.11.21
+      typescript:
+        specifier: ^5.5.3
+        version: 5.5.3
+      vite-plugin-wasm:
+        specifier: ^3.3.0
+        version: 3.3.0(vite@5.3.5(@types/node@20.11.21)(lightningcss@1.25.1))
+      vitest:
+        specifier: ^1.3.1
+        version: 1.6.0(@types/node@20.11.21)(jsdom@24.1.0)(lightningcss@1.25.1)
+
+  app/ydoc-server-nodejs:
+    dependencies:
+      ydoc-server:
+        specifier: workspace:*
+        version: link:../ydoc-server
+    devDependencies:
+      '@types/node':
+        specifier: ^20.11.21
+        version: 20.11.21
+      esbuild:
+        specifier: ^0.23.0
+        version: 0.23.0
+      esbuild-plugin-wasm:
+        specifier: ^1.1.0
+        version: 1.1.0
+      nodemon:
+        specifier: ^3.1.4
+        version: 3.1.4
+      typescript:
+        specifier: ^5.5.3
+        version: 5.5.3
+
+  app/ydoc-server-polyglot:
+    dependencies:
+      ydoc-server:
+        specifier: workspace:*
+        version: link:../ydoc-server
+      ydoc-shared:
+        specifier: workspace:*
+        version: link:../ydoc-shared
+    devDependencies:
+      '@types/node':
+        specifier: ^20.11.21
+        version: 20.11.21
+      esbuild:
+        specifier: ^0.23.0
+        version: 0.23.0
+      esbuild-plugin-wasm:
+        specifier: ^1.1.0
+        version: 1.1.0
+      nodemon:
+        specifier: ^3.1.4
+        version: 3.1.4
+      typescript:
+        specifier: ^5.5.3
+        version: 5.5.3
+
+  app/ydoc-shared:
+    dependencies:
+      '@noble/hashes':
+        specifier: ^1.4.0
+        version: 1.4.0
+      '@open-rpc/client-js':
+        specifier: ^1.8.1
+        version: 1.8.1
+      '@types/debug':
+        specifier: ^4.1.12
+        version: 4.1.12
+      change-case:
+        specifier: ^4.1.2
+        version: 4.1.2
+      debug:
+        specifier: ^4.3.6
+        version: 4.3.6(supports-color@5.5.0)
+      fast-diff:
+        specifier: ^1.3.0
+        version: 1.3.0
+      hash-wasm:
+        specifier: ^4.11.0
+        version: 4.11.0
+      isomorphic-ws:
+        specifier: ^5.0.0
+        version: 5.0.0(ws@8.18.0)
+      lib0:
+        specifier: ^0.2.85
+        version: 0.2.94
+      partysocket:
+        specifier: ^1.0.1
+        version: 1.0.1
+      rimraf:
+        specifier: ^6.0.1
+        version: 6.0.1
+      rust-ffi:
+        specifier: workspace:*
+        version: link:../rust-ffi
+      yjs:
+        specifier: ^13.6.7
+        version: 13.6.18
+      zod:
+        specifier: ^3.23.8
+        version: 3.23.8
+    devDependencies:
+      '@fast-check/vitest':
+        specifier: ^0.0.8
+        version: 0.0.8(vitest@1.6.0(@types/node@20.11.21)(jsdom@24.1.0)(lightningcss@1.25.1))
+      '@tsconfig/node20':
+        specifier: ^20.1.4
+        version: 20.1.4
+      '@types/node':
+        specifier: ^20.11.21
+        version: 20.11.21
+      typescript:
+        specifier: ^5.5.3
+        version: 5.5.3
+      vite-node:
+        specifier: ^2.0.4
+        version: 2.0.4(@types/node@20.11.21)(lightningcss@1.25.1)
+      vite-plugin-wasm:
+        specifier: ^3.3.0
+        version: 3.3.0(vite@5.3.5(@types/node@20.11.21)(lightningcss@1.25.1))
+      vitest:
+        specifier: ^1.3.1
+        version: 1.6.0(@types/node@20.11.21)(jsdom@24.1.0)(lightningcss@1.25.1)
+
   lib/js/runner:
     dependencies:
       spectorjs:
@@ -1298,6 +1445,12 @@ packages:
     cpu: [ppc64]
     os: [aix]
 
+  '@esbuild/aix-ppc64@0.23.0':
+    resolution: {integrity: sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [aix]
+
   '@esbuild/android-arm64@0.19.12':
     resolution: {integrity: sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==}
     engines: {node: '>=12'}
@@ -1310,6 +1463,12 @@ packages:
     cpu: [arm64]
     os: [android]
 
+  '@esbuild/android-arm64@0.23.0':
+    resolution: {integrity: sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [android]
+
   '@esbuild/android-arm@0.19.12':
     resolution: {integrity: sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==}
     engines: {node: '>=12'}
@@ -1322,6 +1481,12 @@ packages:
     cpu: [arm]
     os: [android]
 
+  '@esbuild/android-arm@0.23.0':
+    resolution: {integrity: sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [android]
+
   '@esbuild/android-x64@0.19.12':
     resolution: {integrity: sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==}
     engines: {node: '>=12'}
@@ -1334,6 +1499,12 @@ packages:
     cpu: [x64]
     os: [android]
 
+  '@esbuild/android-x64@0.23.0':
+    resolution: {integrity: sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [android]
+
   '@esbuild/darwin-arm64@0.19.12':
     resolution: {integrity: sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==}
     engines: {node: '>=12'}
@@ -1346,6 +1517,12 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
+  '@esbuild/darwin-arm64@0.23.0':
+    resolution: {integrity: sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [darwin]
+
   '@esbuild/darwin-x64@0.19.12':
     resolution: {integrity: sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==}
     engines: {node: '>=12'}
@@ -1358,6 +1535,12 @@ packages:
     cpu: [x64]
     os: [darwin]
 
+  '@esbuild/darwin-x64@0.23.0':
+    resolution: {integrity: sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [darwin]
+
   '@esbuild/freebsd-arm64@0.19.12':
     resolution: {integrity: sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==}
     engines: {node: '>=12'}
@@ -1370,6 +1553,12 @@ packages:
     cpu: [arm64]
     os: [freebsd]
 
+  '@esbuild/freebsd-arm64@0.23.0':
+    resolution: {integrity: sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [freebsd]
+
   '@esbuild/freebsd-x64@0.19.12':
     resolution: {integrity: sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==}
     engines: {node: '>=12'}
@@ -1382,6 +1571,12 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
+  '@esbuild/freebsd-x64@0.23.0':
+    resolution: {integrity: sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [freebsd]
+
   '@esbuild/linux-arm64@0.19.12':
     resolution: {integrity: sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==}
     engines: {node: '>=12'}
@@ -1394,6 +1589,12 @@ packages:
     cpu: [arm64]
     os: [linux]
 
+  '@esbuild/linux-arm64@0.23.0':
+    resolution: {integrity: sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [linux]
+
   '@esbuild/linux-arm@0.19.12':
     resolution: {integrity: sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==}
     engines: {node: '>=12'}
@@ -1406,6 +1607,12 @@ packages:
     cpu: [arm]
     os: [linux]
 
+  '@esbuild/linux-arm@0.23.0':
+    resolution: {integrity: sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [linux]
+
   '@esbuild/linux-ia32@0.19.12':
     resolution: {integrity: sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==}
     engines: {node: '>=12'}
@@ -1418,6 +1625,12 @@ packages:
     cpu: [ia32]
     os: [linux]
 
+  '@esbuild/linux-ia32@0.23.0':
+    resolution: {integrity: sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [linux]
+
   '@esbuild/linux-loong64@0.19.12':
     resolution: {integrity: sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==}
     engines: {node: '>=12'}
@@ -1430,6 +1643,12 @@ packages:
     cpu: [loong64]
     os: [linux]
 
+  '@esbuild/linux-loong64@0.23.0':
+    resolution: {integrity: sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A==}
+    engines: {node: '>=18'}
+    cpu: [loong64]
+    os: [linux]
+
   '@esbuild/linux-mips64el@0.19.12':
     resolution: {integrity: sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==}
     engines: {node: '>=12'}
@@ -1442,6 +1661,12 @@ packages:
     cpu: [mips64el]
     os: [linux]
 
+  '@esbuild/linux-mips64el@0.23.0':
+    resolution: {integrity: sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==}
+    engines: {node: '>=18'}
+    cpu: [mips64el]
+    os: [linux]
+
   '@esbuild/linux-ppc64@0.19.12':
     resolution: {integrity: sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==}
     engines: {node: '>=12'}
@@ -1454,6 +1679,12 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
+  '@esbuild/linux-ppc64@0.23.0':
+    resolution: {integrity: sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [linux]
+
   '@esbuild/linux-riscv64@0.19.12':
     resolution: {integrity: sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==}
     engines: {node: '>=12'}
@@ -1466,6 +1697,12 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
+  '@esbuild/linux-riscv64@0.23.0':
+    resolution: {integrity: sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==}
+    engines: {node: '>=18'}
+    cpu: [riscv64]
+    os: [linux]
+
   '@esbuild/linux-s390x@0.19.12':
     resolution: {integrity: sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==}
     engines: {node: '>=12'}
@@ -1478,6 +1715,12 @@ packages:
     cpu: [s390x]
     os: [linux]
 
+  '@esbuild/linux-s390x@0.23.0':
+    resolution: {integrity: sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg==}
+    engines: {node: '>=18'}
+    cpu: [s390x]
+    os: [linux]
+
   '@esbuild/linux-x64@0.19.12':
     resolution: {integrity: sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==}
     engines: {node: '>=12'}
@@ -1490,6 +1733,12 @@ packages:
     cpu: [x64]
     os: [linux]
 
+  '@esbuild/linux-x64@0.23.0':
+    resolution: {integrity: sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [linux]
+
   '@esbuild/netbsd-x64@0.19.12':
     resolution: {integrity: sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==}
     engines: {node: '>=12'}
@@ -1502,6 +1751,18 @@ packages:
     cpu: [x64]
     os: [netbsd]
 
+  '@esbuild/netbsd-x64@0.23.0':
+    resolution: {integrity: sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [netbsd]
+
+  '@esbuild/openbsd-arm64@0.23.0':
+    resolution: {integrity: sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
   '@esbuild/openbsd-x64@0.19.12':
     resolution: {integrity: sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==}
     engines: {node: '>=12'}
@@ -1514,6 +1775,12 @@ packages:
     cpu: [x64]
     os: [openbsd]
 
+  '@esbuild/openbsd-x64@0.23.0':
+    resolution: {integrity: sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [openbsd]
+
   '@esbuild/sunos-x64@0.19.12':
     resolution: {integrity: sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==}
     engines: {node: '>=12'}
@@ -1526,6 +1793,12 @@ packages:
     cpu: [x64]
     os: [sunos]
 
+  '@esbuild/sunos-x64@0.23.0':
+    resolution: {integrity: sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [sunos]
+
   '@esbuild/win32-arm64@0.19.12':
     resolution: {integrity: sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==}
     engines: {node: '>=12'}
@@ -1538,6 +1811,12 @@ packages:
     cpu: [arm64]
     os: [win32]
 
+  '@esbuild/win32-arm64@0.23.0':
+    resolution: {integrity: sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [win32]
+
   '@esbuild/win32-ia32@0.19.12':
     resolution: {integrity: sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==}
     engines: {node: '>=12'}
@@ -1550,6 +1829,12 @@ packages:
     cpu: [ia32]
     os: [win32]
 
+  '@esbuild/win32-ia32@0.23.0':
+    resolution: {integrity: sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [win32]
+
   '@esbuild/win32-x64@0.19.12':
     resolution: {integrity: sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==}
     engines: {node: '>=12'}
@@ -1562,6 +1847,12 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@esbuild/win32-x64@0.23.0':
+    resolution: {integrity: sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [win32]
+
   '@eslint-community/eslint-utils@4.4.0':
     resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -2576,8 +2867,8 @@ packages:
     resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
     engines: {node: '>= 10'}
 
-  '@tsconfig/node18@18.2.4':
-    resolution: {integrity: sha512-5xxU8vVs9/FNcvm3gE07fPbn9tl6tqGGWA9tSlwsUEkBxtRnTsNmwrV8gasZ9F/EobaSv9+nu8AxUKccw77JpQ==}
+  '@tsconfig/node20@20.1.4':
+    resolution: {integrity: sha512-sqgsT69YFeLWf5NtJ4Xq/xAF8p4ZQHlmGW74Nu2tD4+g5fAsposc4ZfaaPixVu4y01BEiDCWLRDCvDM5JOsRxg==}
 
   '@types/babel__core@7.20.5':
     resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==}
@@ -3218,9 +3509,6 @@ packages:
     resolution: {integrity: sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==}
     engines: {node: '>=0.12.0'}
 
-  async-limiter@1.0.1:
-    resolution: {integrity: sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==}
-
   async@2.6.4:
     resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==}
 
@@ -3807,8 +4095,8 @@ packages:
       supports-color:
         optional: true
 
-  debug@4.3.5:
-    resolution: {integrity: sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==}
+  debug@4.3.6:
+    resolution: {integrity: sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==}
     engines: {node: '>=6.0'}
     peerDependencies:
       supports-color: '*'
@@ -4099,8 +4387,9 @@ packages:
   es6-promise@3.3.1:
     resolution: {integrity: sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==}
 
-  esbuild-plugin-yaml@0.0.1:
-    resolution: {integrity: sha512-s3jqOeeCd+dUuUsuBqLRgN2SeQjPF2ppIglvV3B//txgQpTDThGvxu6sqiOUOJ0NOzegitmpWCXoCONdRbUS7w==}
+  esbuild-plugin-wasm@1.1.0:
+    resolution: {integrity: sha512-0bQ6+1tUbySSnxzn5jnXHMDvYnT0cN/Wd4Syk8g/sqAIJUg7buTIi22svS3Qz6ssx895NT+TgLPb33xi1OkZig==}
+    engines: {node: '>=0.10.0'}
 
   esbuild@0.19.12:
     resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==}
@@ -4112,6 +4401,11 @@ packages:
     engines: {node: '>=12'}
     hasBin: true
 
+  esbuild@0.23.0:
+    resolution: {integrity: sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA==}
+    engines: {node: '>=18'}
+    hasBin: true
+
   escalade@3.1.2:
     resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==}
     engines: {node: '>=6'}
@@ -4207,10 +4501,6 @@ packages:
     engines: {node: '>=4'}
     hasBin: true
 
-  esquery@1.5.0:
-    resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==}
-    engines: {node: '>=0.10'}
-
   esquery@1.6.0:
     resolution: {integrity: sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==}
     engines: {node: '>=0.10'}
@@ -4499,6 +4789,11 @@ packages:
     engines: {node: '>=16 || 14 >=14.18'}
     hasBin: true
 
+  glob@11.0.0:
+    resolution: {integrity: sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==}
+    engines: {node: 20 || >=22}
+    hasBin: true
+
   glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
     deprecated: Glob versions prior to v9 are no longer supported
@@ -4694,6 +4989,9 @@ packages:
   ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
+  ignore-by-default@1.0.1:
+    resolution: {integrity: sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==}
+
   ignore@5.3.1:
     resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==}
     engines: {node: '>= 4'}
@@ -4940,7 +5238,7 @@ packages:
   isomorphic-ws@5.0.0:
     resolution: {integrity: sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==}
     peerDependencies:
-      ws: '*'
+      ws: ^8.18.0
 
   isomorphic.js@0.2.5:
     resolution: {integrity: sha512-PIeMbHqMt4DnUP3MA/Flc0HElYjMXArsw1qwJZcm9sqR8mq3l8NYizFMty0pWwE/tzIGH3EKK5+jes5mAr85yw==}
@@ -4971,6 +5269,10 @@ packages:
     resolution: {integrity: sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==}
     engines: {node: '>=14'}
 
+  jackspeak@4.0.1:
+    resolution: {integrity: sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==}
+    engines: {node: 20 || >=22}
+
   jake@10.9.1:
     resolution: {integrity: sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==}
     engines: {node: '>=10'}
@@ -5305,6 +5607,10 @@ packages:
     resolution: {integrity: sha512-CQl19J/g+Hbjbv4Y3mFNNXFEL/5t/KCg8POCuUqd4rMKjGG+j1ybER83hxV58zL+dFI1PTkt3GNFSHRt+d8qEQ==}
     engines: {node: 14 || >=16.14}
 
+  lru-cache@11.0.0:
+    resolution: {integrity: sha512-Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA==}
+    engines: {node: 20 || >=22}
+
   lru-cache@5.1.1:
     resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
 
@@ -5406,6 +5712,10 @@ packages:
   min-document@2.19.0:
     resolution: {integrity: sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==}
 
+  minimatch@10.0.1:
+    resolution: {integrity: sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==}
+    engines: {node: 20 || >=22}
+
   minimatch@3.1.2:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
 
@@ -5566,6 +5876,11 @@ packages:
   node-releases@2.0.14:
     resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==}
 
+  nodemon@3.1.4:
+    resolution: {integrity: sha512-wjPBbFhtpJwmIeY2yP7QF+UKzPfltVGtfce1g/bB15/8vCGZj8uxD62b/b9M9/WVgme0NZudpownKN+c0plXlQ==}
+    engines: {node: '>=10'}
+    hasBin: true
+
   nopt@7.2.1:
     resolution: {integrity: sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
@@ -5761,6 +6076,10 @@ packages:
     resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==}
     engines: {node: '>=16 || 14 >=14.18'}
 
+  path-scurry@2.0.0:
+    resolution: {integrity: sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==}
+    engines: {node: 20 || >=22}
+
   path-type@3.0.0:
     resolution: {integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==}
     engines: {node: '>=4'}
@@ -6023,6 +6342,9 @@ packages:
   psl@1.9.0:
     resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==}
 
+  pstree.remy@1.1.8:
+    resolution: {integrity: sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==}
+
   pump@3.0.0:
     resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==}
 
@@ -6251,9 +6573,9 @@ packages:
     deprecated: Rimraf versions prior to v4 are no longer supported
     hasBin: true
 
-  rimraf@5.0.7:
-    resolution: {integrity: sha512-nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg==}
-    engines: {node: '>=14.18'}
+  rimraf@6.0.1:
+    resolution: {integrity: sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==}
+    engines: {node: 20 || >=22}
     hasBin: true
 
   roarr@2.15.4:
@@ -6697,6 +7019,10 @@ packages:
     resolution: {integrity: sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==}
     engines: {node: '>=14.0.0'}
 
+  tinyrainbow@1.2.0:
+    resolution: {integrity: sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==}
+    engines: {node: '>=14.0.0'}
+
   tinyspy@2.2.1:
     resolution: {integrity: sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==}
     engines: {node: '>=14.0.0'}
@@ -6732,6 +7058,10 @@ packages:
     resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
     engines: {node: '>=6'}
 
+  touch@3.1.1:
+    resolution: {integrity: sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==}
+    hasBin: true
+
   tough-cookie@2.5.0:
     resolution: {integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==}
     engines: {node: '>=0.8'}
@@ -6832,6 +7162,9 @@ packages:
   unbzip2-stream@1.4.3:
     resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==}
 
+  undefsafe@2.0.5:
+    resolution: {integrity: sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==}
+
   undici-types@5.26.5:
     resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
 
@@ -6954,6 +7287,11 @@ packages:
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
 
+  vite-node@2.0.4:
+    resolution: {integrity: sha512-ZpJVkxcakYtig5iakNeL7N3trufe3M6vGuzYAr4GsbCTwobDeyPJpE4cjDhhPluv8OvQCFzu2LWp6GkoKRITXA==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+    hasBin: true
+
   vite-plugin-inspect@0.8.4:
     resolution: {integrity: sha512-G0N3rjfw+AiiwnGw50KlObIHYWfulVwaCBUBLh2xTW9G1eM9ocE5olXkEYUbwyTmX+azM8duubi+9w5awdCz+g==}
     engines: {node: '>=14'}
@@ -6975,6 +7313,11 @@ packages:
     peerDependencies:
       vite: ^3.0.0-0 || ^4.0.0-0 || ^5.0.0-0
 
+  vite-plugin-wasm@3.3.0:
+    resolution: {integrity: sha512-tVhz6w+W9MVsOCHzxo6SSMSswCeIw4HTrXEi6qL3IRzATl83jl09JVO1djBqPSwfjgnpVHNLYcaMbaDX5WB/pg==}
+    peerDependencies:
+      vite: ^2 || ^3 || ^4 || ^5
+
   vite@5.3.5:
     resolution: {integrity: sha512-MdjglKR6AQXQb9JGiS7Rc2wC6uMjcm7Go/NHNO63EwiJXfuk9PgqiP/n5IDJCziMkfw9n4Ubp7lttNwz+8ZVKA==}
     engines: {node: ^18.0.0 || >=20.0.0}
@@ -7155,31 +7498,8 @@ packages:
   wrappy@1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
-  ws@6.2.3:
-    resolution: {integrity: sha512-jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==}
-    peerDependencies:
-      bufferutil: ^4.0.1
-      utf-8-validate: ^5.0.2
-    peerDependenciesMeta:
-      bufferutil:
-        optional: true
-      utf-8-validate:
-        optional: true
-
-  ws@7.5.10:
-    resolution: {integrity: sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==}
-    engines: {node: '>=8.3.0'}
-    peerDependencies:
-      bufferutil: ^4.0.1
-      utf-8-validate: ^5.0.2
-    peerDependenciesMeta:
-      bufferutil:
-        optional: true
-      utf-8-validate:
-        optional: true
-
-  ws@8.17.1:
-    resolution: {integrity: sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==}
+  ws@8.18.0:
+    resolution: {integrity: sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
       bufferutil: ^4.0.1
@@ -7370,7 +7690,6 @@ snapshots:
       '@aws-sdk/util-hex-encoding': 3.6.1
       '@types/node-fetch': 2.6.4
       isomorphic-unfetch: 3.1.0
-      react-native-url-polyfill: link:_IGNORED_
       tslib: 2.6.3
       universal-cookie: 4.0.4
       zen-observable-ts: 0.8.19
@@ -7547,7 +7866,6 @@ snapshots:
       '@aws-sdk/protocol-http': 3.6.1
       '@aws-sdk/service-error-classification': 3.6.1
       '@aws-sdk/types': 3.6.1
-      react-native-get-random-values: link:_IGNORED_
       tslib: 2.6.3
       uuid: 3.4.0
 
@@ -7728,7 +8046,7 @@ snapshots:
       '@babel/traverse': 7.24.7
       '@babel/types': 7.24.7
       convert-source-map: 2.0.0
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -7940,7 +8258,7 @@ snapshots:
       '@babel/helper-split-export-declaration': 7.24.7
       '@babel/parser': 7.24.7
       '@babel/types': 7.24.7
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -8069,7 +8387,7 @@ snapshots:
       '@vladfrangu/async_event_emitter': 2.4.0
       discord-api-types: 0.37.83
       tslib: 2.6.3
-      ws: 8.17.1
+      ws: 8.18.0
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
@@ -8082,7 +8400,7 @@ snapshots:
 
   '@electron/get@2.0.3':
     dependencies:
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       env-paths: 2.2.1
       fs-extra: 8.1.0
       got: 11.8.6
@@ -8096,7 +8414,7 @@ snapshots:
 
   '@electron/notarize@2.1.0':
     dependencies:
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       fs-extra: 9.1.0
       promise-retry: 2.0.1
     transitivePeerDependencies:
@@ -8104,7 +8422,7 @@ snapshots:
 
   '@electron/notarize@2.2.1':
     dependencies:
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       fs-extra: 9.1.0
       promise-retry: 2.0.1
     transitivePeerDependencies:
@@ -8113,7 +8431,7 @@ snapshots:
   '@electron/osx-sign@1.0.5':
     dependencies:
       compare-version: 0.1.2
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       fs-extra: 10.1.0
       isbinaryfile: 4.0.10
       minimist: 1.2.8
@@ -8125,7 +8443,7 @@ snapshots:
     dependencies:
       '@electron/asar': 3.2.10
       '@malept/cross-spawn-promise': 1.1.1
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       dir-compare: 3.3.0
       fs-extra: 9.1.0
       minimatch: 3.1.2
@@ -8136,7 +8454,7 @@ snapshots:
   '@es-joy/jsdoccomment@0.41.0':
     dependencies:
       comment-parser: 1.4.1
-      esquery: 1.5.0
+      esquery: 1.6.0
       jsdoc-type-pratt-parser: 4.0.0
 
   '@es-joy/jsdoccomment@0.46.0':
@@ -8151,138 +8469,210 @@ snapshots:
   '@esbuild/aix-ppc64@0.21.5':
     optional: true
 
+  '@esbuild/aix-ppc64@0.23.0':
+    optional: true
+
   '@esbuild/android-arm64@0.19.12':
     optional: true
 
   '@esbuild/android-arm64@0.21.5':
     optional: true
 
+  '@esbuild/android-arm64@0.23.0':
+    optional: true
+
   '@esbuild/android-arm@0.19.12':
     optional: true
 
   '@esbuild/android-arm@0.21.5':
     optional: true
 
+  '@esbuild/android-arm@0.23.0':
+    optional: true
+
   '@esbuild/android-x64@0.19.12':
     optional: true
 
   '@esbuild/android-x64@0.21.5':
     optional: true
 
+  '@esbuild/android-x64@0.23.0':
+    optional: true
+
   '@esbuild/darwin-arm64@0.19.12':
     optional: true
 
   '@esbuild/darwin-arm64@0.21.5':
     optional: true
 
+  '@esbuild/darwin-arm64@0.23.0':
+    optional: true
+
   '@esbuild/darwin-x64@0.19.12':
     optional: true
 
   '@esbuild/darwin-x64@0.21.5':
     optional: true
 
+  '@esbuild/darwin-x64@0.23.0':
+    optional: true
+
   '@esbuild/freebsd-arm64@0.19.12':
     optional: true
 
   '@esbuild/freebsd-arm64@0.21.5':
     optional: true
 
+  '@esbuild/freebsd-arm64@0.23.0':
+    optional: true
+
   '@esbuild/freebsd-x64@0.19.12':
     optional: true
 
   '@esbuild/freebsd-x64@0.21.5':
     optional: true
 
+  '@esbuild/freebsd-x64@0.23.0':
+    optional: true
+
   '@esbuild/linux-arm64@0.19.12':
     optional: true
 
   '@esbuild/linux-arm64@0.21.5':
     optional: true
 
+  '@esbuild/linux-arm64@0.23.0':
+    optional: true
+
   '@esbuild/linux-arm@0.19.12':
     optional: true
 
   '@esbuild/linux-arm@0.21.5':
     optional: true
 
+  '@esbuild/linux-arm@0.23.0':
+    optional: true
+
   '@esbuild/linux-ia32@0.19.12':
     optional: true
 
   '@esbuild/linux-ia32@0.21.5':
     optional: true
 
+  '@esbuild/linux-ia32@0.23.0':
+    optional: true
+
   '@esbuild/linux-loong64@0.19.12':
     optional: true
 
   '@esbuild/linux-loong64@0.21.5':
     optional: true
 
+  '@esbuild/linux-loong64@0.23.0':
+    optional: true
+
   '@esbuild/linux-mips64el@0.19.12':
     optional: true
 
   '@esbuild/linux-mips64el@0.21.5':
     optional: true
 
+  '@esbuild/linux-mips64el@0.23.0':
+    optional: true
+
   '@esbuild/linux-ppc64@0.19.12':
     optional: true
 
   '@esbuild/linux-ppc64@0.21.5':
     optional: true
 
+  '@esbuild/linux-ppc64@0.23.0':
+    optional: true
+
   '@esbuild/linux-riscv64@0.19.12':
     optional: true
 
   '@esbuild/linux-riscv64@0.21.5':
     optional: true
 
+  '@esbuild/linux-riscv64@0.23.0':
+    optional: true
+
   '@esbuild/linux-s390x@0.19.12':
     optional: true
 
   '@esbuild/linux-s390x@0.21.5':
     optional: true
 
+  '@esbuild/linux-s390x@0.23.0':
+    optional: true
+
   '@esbuild/linux-x64@0.19.12':
     optional: true
 
   '@esbuild/linux-x64@0.21.5':
     optional: true
 
+  '@esbuild/linux-x64@0.23.0':
+    optional: true
+
   '@esbuild/netbsd-x64@0.19.12':
     optional: true
 
   '@esbuild/netbsd-x64@0.21.5':
     optional: true
 
+  '@esbuild/netbsd-x64@0.23.0':
+    optional: true
+
+  '@esbuild/openbsd-arm64@0.23.0':
+    optional: true
+
   '@esbuild/openbsd-x64@0.19.12':
     optional: true
 
   '@esbuild/openbsd-x64@0.21.5':
     optional: true
 
+  '@esbuild/openbsd-x64@0.23.0':
+    optional: true
+
   '@esbuild/sunos-x64@0.19.12':
     optional: true
 
   '@esbuild/sunos-x64@0.21.5':
     optional: true
 
+  '@esbuild/sunos-x64@0.23.0':
+    optional: true
+
   '@esbuild/win32-arm64@0.19.12':
     optional: true
 
   '@esbuild/win32-arm64@0.21.5':
     optional: true
 
+  '@esbuild/win32-arm64@0.23.0':
+    optional: true
+
   '@esbuild/win32-ia32@0.19.12':
     optional: true
 
   '@esbuild/win32-ia32@0.21.5':
     optional: true
 
+  '@esbuild/win32-ia32@0.23.0':
+    optional: true
+
   '@esbuild/win32-x64@0.19.12':
     optional: true
 
   '@esbuild/win32-x64@0.21.5':
     optional: true
 
+  '@esbuild/win32-x64@0.23.0':
+    optional: true
+
   '@eslint-community/eslint-utils@4.4.0(eslint@8.57.0)':
     dependencies:
       eslint: 8.57.0
@@ -8293,7 +8683,7 @@ snapshots:
   '@eslint/eslintrc@2.1.4':
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       espree: 9.6.1
       globals: 13.24.0
       ignore: 5.3.1
@@ -8307,7 +8697,7 @@ snapshots:
   '@eslint/eslintrc@3.1.0':
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       espree: 10.1.0
       globals: 14.0.0
       ignore: 5.3.1
@@ -8431,7 +8821,7 @@ snapshots:
   '@humanwhocodes/config-array@0.11.14':
     dependencies:
       '@humanwhocodes/object-schema': 2.0.3
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -8619,7 +9009,7 @@ snapshots:
 
   '@malept/flatpak-bundler@0.4.0':
     dependencies:
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       fs-extra: 9.1.0
       lodash: 4.17.21
       tmp-promise: 3.0.3
@@ -8667,9 +9057,9 @@ snapshots:
     dependencies:
       events: 3.3.0
       isomorphic-fetch: 3.0.0
-      isomorphic-ws: 5.0.0(ws@7.5.10)
+      isomorphic-ws: 5.0.0(ws@8.18.0)
       strict-event-emitter-types: 2.0.0
-      ws: 7.5.10
+      ws: 8.18.0
     transitivePeerDependencies:
       - bufferutil
       - encoding
@@ -8701,7 +9091,7 @@ snapshots:
       json-schema-faker: 0.5.6
       lodash: 4.17.21
       node-ipc: 9.1.1
-      ws: 8.17.1
+      ws: 8.18.0
     transitivePeerDependencies:
       - bufferutil
       - encoding
@@ -9834,7 +10224,7 @@ snapshots:
 
   '@tootallnate/once@2.0.0': {}
 
-  '@tsconfig/node18@18.2.4': {}
+  '@tsconfig/node20@20.1.4': {}
 
   '@types/babel__core@7.20.5':
     dependencies:
@@ -10160,7 +10550,7 @@ snapshots:
       '@typescript-eslint/types': 7.15.0
       '@typescript-eslint/typescript-estree': 7.15.0(typescript@5.5.3)
       '@typescript-eslint/visitor-keys': 7.15.0
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       eslint: 8.57.0
     optionalDependencies:
       typescript: 5.5.3
@@ -10176,7 +10566,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/typescript-estree': 7.15.0(typescript@5.5.3)
       '@typescript-eslint/utils': 7.15.0(eslint@8.57.0)(typescript@5.5.3)
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       eslint: 8.57.0
       ts-api-utils: 1.3.0(typescript@5.5.3)
     optionalDependencies:
@@ -10190,7 +10580,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 7.15.0
       '@typescript-eslint/visitor-keys': 7.15.0
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.5
@@ -10239,7 +10629,7 @@ snapshots:
     dependencies:
       '@ampproject/remapping': 2.3.0
       '@bcoe/v8-coverage': 0.2.3
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       istanbul-lib-coverage: 3.2.2
       istanbul-lib-report: 3.0.1
       istanbul-lib-source-maps: 5.0.5
@@ -10508,13 +10898,13 @@ snapshots:
 
   agent-base@6.0.2:
     dependencies:
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
   agent-base@7.1.1:
     dependencies:
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -10584,7 +10974,7 @@ snapshots:
       builder-util: 24.13.1
       builder-util-runtime: 9.2.4
       chromium-pickle-js: 0.2.0
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       dmg-builder: 24.13.3(electron-builder-squirrel-windows@24.13.3)
       ejs: 3.1.10
       electron-builder-squirrel-windows: 24.13.3(dmg-builder@24.13.3)
@@ -10731,9 +11121,6 @@ snapshots:
 
   async-exit-hook@2.0.1: {}
 
-  async-limiter@1.0.1:
-    optional: true
-
   async@2.6.4:
     dependencies:
       lodash: 4.17.21
@@ -10867,7 +11254,7 @@ snapshots:
 
   builder-util-runtime@9.2.4:
     dependencies:
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       sax: 1.4.1
     transitivePeerDependencies:
       - supports-color
@@ -10881,7 +11268,7 @@ snapshots:
       builder-util-runtime: 9.2.4
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       fs-extra: 10.1.0
       http-proxy-agent: 5.0.0
       https-proxy-agent: 5.0.1
@@ -11394,9 +11781,11 @@ snapshots:
     dependencies:
       ms: 2.1.2
 
-  debug@4.3.5:
+  debug@4.3.6(supports-color@5.5.0):
     dependencies:
       ms: 2.1.2
+    optionalDependencies:
+      supports-color: 5.5.0
 
   decimal.js@10.4.3: {}
 
@@ -11453,7 +11842,8 @@ snapshots:
 
   destroy@1.2.0: {}
 
-  detect-libc@1.0.3: {}
+  detect-libc@1.0.3:
+    optional: true
 
   detect-libc@2.0.3: {}
 
@@ -11657,7 +12047,7 @@ snapshots:
       better-sqlite3: 8.7.0
       discord.js: 14.15.3
       validator: 13.12.0
-      ws: 8.17.1
+      ws: 8.18.0
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
@@ -11782,10 +12172,7 @@ snapshots:
 
   es6-promise@3.3.1: {}
 
-  esbuild-plugin-yaml@0.0.1:
-    dependencies:
-      fs-extra: 9.1.0
-      js-yaml: 4.1.0
+  esbuild-plugin-wasm@1.1.0: {}
 
   esbuild@0.19.12:
     optionalDependencies:
@@ -11839,6 +12226,33 @@ snapshots:
       '@esbuild/win32-ia32': 0.21.5
       '@esbuild/win32-x64': 0.21.5
 
+  esbuild@0.23.0:
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.23.0
+      '@esbuild/android-arm': 0.23.0
+      '@esbuild/android-arm64': 0.23.0
+      '@esbuild/android-x64': 0.23.0
+      '@esbuild/darwin-arm64': 0.23.0
+      '@esbuild/darwin-x64': 0.23.0
+      '@esbuild/freebsd-arm64': 0.23.0
+      '@esbuild/freebsd-x64': 0.23.0
+      '@esbuild/linux-arm': 0.23.0
+      '@esbuild/linux-arm64': 0.23.0
+      '@esbuild/linux-ia32': 0.23.0
+      '@esbuild/linux-loong64': 0.23.0
+      '@esbuild/linux-mips64el': 0.23.0
+      '@esbuild/linux-ppc64': 0.23.0
+      '@esbuild/linux-riscv64': 0.23.0
+      '@esbuild/linux-s390x': 0.23.0
+      '@esbuild/linux-x64': 0.23.0
+      '@esbuild/netbsd-x64': 0.23.0
+      '@esbuild/openbsd-arm64': 0.23.0
+      '@esbuild/openbsd-x64': 0.23.0
+      '@esbuild/sunos-x64': 0.23.0
+      '@esbuild/win32-arm64': 0.23.0
+      '@esbuild/win32-ia32': 0.23.0
+      '@esbuild/win32-x64': 0.23.0
+
   escalade@3.1.2: {}
 
   escape-html@1.0.3: {}
@@ -11856,10 +12270,10 @@ snapshots:
       '@es-joy/jsdoccomment': 0.41.0
       are-docs-informative: 0.0.2
       comment-parser: 1.4.1
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       escape-string-regexp: 4.0.0
       eslint: 8.57.0
-      esquery: 1.5.0
+      esquery: 1.6.0
       is-builtin-module: 3.2.1
       semver: 7.6.2
       spdx-expression-parse: 4.0.0
@@ -11871,7 +12285,7 @@ snapshots:
       '@es-joy/jsdoccomment': 0.46.0
       are-docs-informative: 0.0.2
       comment-parser: 1.4.1
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       escape-string-regexp: 4.0.0
       eslint: 8.57.0
       esquery: 1.6.0
@@ -11954,13 +12368,13 @@ snapshots:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.2.2
       eslint-visitor-keys: 3.4.3
       espree: 9.6.1
-      esquery: 1.5.0
+      esquery: 1.6.0
       esutils: 2.0.3
       fast-deep-equal: 3.1.3
       file-entry-cache: 6.0.1
@@ -11998,10 +12412,6 @@ snapshots:
 
   esprima@4.0.1: {}
 
-  esquery@1.5.0:
-    dependencies:
-      estraverse: 5.3.0
-
   esquery@1.6.0:
     dependencies:
       estraverse: 5.3.0
@@ -12050,7 +12460,7 @@ snapshots:
 
   extract-zip@2.0.1:
     dependencies:
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       get-stream: 5.2.0
       yauzl: 2.10.0
     optionalDependencies:
@@ -12297,6 +12707,15 @@ snapshots:
       package-json-from-dist: 1.0.0
       path-scurry: 1.11.1
 
+  glob@11.0.0:
+    dependencies:
+      foreground-child: 3.2.1
+      jackspeak: 4.0.1
+      minimatch: 10.0.1
+      minipass: 7.1.2
+      package-json-from-dist: 1.0.0
+      path-scurry: 2.0.0
+
   glob@7.2.3:
     dependencies:
       fs.realpath: 1.0.0
@@ -12509,14 +12928,14 @@ snapshots:
     dependencies:
       '@tootallnate/once': 2.0.0
       agent-base: 6.0.2
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
   http-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.1
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -12534,14 +12953,14 @@ snapshots:
   https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
   https-proxy-agent@7.0.5:
     dependencies:
       agent-base: 7.1.1
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -12565,6 +12984,8 @@ snapshots:
 
   ieee754@1.2.1: {}
 
+  ignore-by-default@1.0.1: {}
+
   ignore@5.3.1: {}
 
   image-size@0.5.5: {}
@@ -12774,13 +13195,9 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
-  isomorphic-ws@5.0.0(ws@7.5.10):
+  isomorphic-ws@5.0.0(ws@8.18.0):
     dependencies:
-      ws: 7.5.10
-
-  isomorphic-ws@5.0.0(ws@8.17.1):
-    dependencies:
-      ws: 8.17.1
+      ws: 8.18.0
 
   isomorphic.js@0.2.5: {}
 
@@ -12797,7 +13214,7 @@ snapshots:
   istanbul-lib-source-maps@5.0.5:
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       istanbul-lib-coverage: 3.2.2
     transitivePeerDependencies:
       - supports-color
@@ -12821,6 +13238,12 @@ snapshots:
     optionalDependencies:
       '@pkgjs/parseargs': 0.11.0
 
+  jackspeak@4.0.1:
+    dependencies:
+      '@isaacs/cliui': 8.0.2
+    optionalDependencies:
+      '@pkgjs/parseargs': 0.11.0
+
   jake@10.9.1:
     dependencies:
       async: 3.2.5
@@ -12909,7 +13332,7 @@ snapshots:
       whatwg-encoding: 3.1.1
       whatwg-mimetype: 4.0.0
       whatwg-url: 14.0.0
-      ws: 8.17.1
+      ws: 8.18.0
       xml-name-validator: 5.0.0
     transitivePeerDependencies:
       - bufferutil
@@ -13107,6 +13530,7 @@ snapshots:
       lightningcss-linux-x64-gnu: 1.25.1
       lightningcss-linux-x64-musl: 1.25.1
       lightningcss-win32-x64-msvc: 1.25.1
+    optional: true
 
   lilconfig@2.1.0: {}
 
@@ -13183,6 +13607,8 @@ snapshots:
 
   lru-cache@10.3.0: {}
 
+  lru-cache@11.0.0: {}
+
   lru-cache@5.1.1:
     dependencies:
       yallist: 3.1.1
@@ -13269,6 +13695,10 @@ snapshots:
     dependencies:
       dom-walk: 0.1.2
 
+  minimatch@10.0.1:
+    dependencies:
+      brace-expansion: 2.0.1
+
   minimatch@3.1.2:
     dependencies:
       brace-expansion: 1.1.11
@@ -13403,6 +13833,19 @@ snapshots:
 
   node-releases@2.0.14: {}
 
+  nodemon@3.1.4:
+    dependencies:
+      chokidar: 3.6.0
+      debug: 4.3.6(supports-color@5.5.0)
+      ignore-by-default: 1.0.1
+      minimatch: 3.1.2
+      pstree.remy: 1.1.8
+      semver: 7.6.2
+      simple-update-notifier: 2.0.0
+      supports-color: 5.5.0
+      touch: 3.1.1
+      undefsafe: 2.0.5
+
   nopt@7.2.1:
     dependencies:
       abbrev: 2.0.0
@@ -13609,6 +14052,11 @@ snapshots:
       lru-cache: 10.3.0
       minipass: 7.1.2
 
+  path-scurry@2.0.0:
+    dependencies:
+      lru-cache: 11.0.0
+      minipass: 7.1.2
+
   path-type@3.0.0:
     dependencies:
       pify: 3.0.0
@@ -13802,6 +14250,8 @@ snapshots:
 
   psl@1.9.0: {}
 
+  pstree.remy@1.1.8: {}
+
   pump@3.0.0:
     dependencies:
       end-of-stream: 1.4.4
@@ -14132,9 +14582,10 @@ snapshots:
     dependencies:
       glob: 7.2.3
 
-  rimraf@5.0.7:
+  rimraf@6.0.1:
     dependencies:
-      glob: 10.4.2
+      glob: 11.0.0
+      package-json-from-dist: 1.0.0
 
   roarr@2.15.4:
     dependencies:
@@ -14528,7 +14979,7 @@ snapshots:
 
   sumchecker@3.0.1:
     dependencies:
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -14659,6 +15110,8 @@ snapshots:
 
   tinypool@0.8.4: {}
 
+  tinyrainbow@1.2.0: {}
+
   tinyspy@2.2.1: {}
 
   tmp-promise@3.0.3:
@@ -14687,6 +15140,8 @@ snapshots:
 
   totalist@3.0.1: {}
 
+  touch@3.1.1: {}
+
   tough-cookie@2.5.0:
     dependencies:
       psl: 1.9.0
@@ -14800,6 +15255,8 @@ snapshots:
       buffer: 5.7.1
       through: 2.3.8
 
+  undefsafe@2.0.5: {}
+
   undici-types@5.26.5: {}
 
   undici@6.13.0: {}
@@ -14906,7 +15363,7 @@ snapshots:
   vite-node@0.34.7(@types/node@20.11.21)(lightningcss@1.25.1):
     dependencies:
       cac: 6.7.14
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       mlly: 1.7.1
       pathe: 1.1.2
       picocolors: 1.0.1
@@ -14924,7 +15381,7 @@ snapshots:
   vite-node@1.6.0(@types/node@20.11.21)(lightningcss@1.25.1):
     dependencies:
       cac: 6.7.14
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       pathe: 1.1.2
       picocolors: 1.0.1
       vite: 5.3.5(@types/node@20.11.21)(lightningcss@1.25.1)
@@ -14938,11 +15395,28 @@ snapshots:
       - supports-color
       - terser
 
+  vite-node@2.0.4(@types/node@20.11.21)(lightningcss@1.25.1):
+    dependencies:
+      cac: 6.7.14
+      debug: 4.3.6(supports-color@5.5.0)
+      pathe: 1.1.2
+      tinyrainbow: 1.2.0
+      vite: 5.3.5(@types/node@20.11.21)(lightningcss@1.25.1)
+    transitivePeerDependencies:
+      - '@types/node'
+      - less
+      - lightningcss
+      - sass
+      - stylus
+      - sugarss
+      - supports-color
+      - terser
+
   vite-plugin-inspect@0.8.4(rollup@4.18.1)(vite@5.3.5(@types/node@20.11.21)(lightningcss@1.25.1)):
     dependencies:
       '@antfu/utils': 0.7.10
       '@rollup/pluginutils': 5.1.0(rollup@4.18.1)
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       error-stack-parser-es: 0.1.4
       fs-extra: 11.2.0
       open: 10.1.0
@@ -14985,6 +15459,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  vite-plugin-wasm@3.3.0(vite@5.3.5(@types/node@20.11.21)(lightningcss@1.25.1)):
+    dependencies:
+      vite: 5.3.5(@types/node@20.11.21)(lightningcss@1.25.1)
+
   vite@5.3.5(@types/node@20.11.21)(lightningcss@1.25.1):
     dependencies:
       esbuild: 0.21.5
@@ -15004,7 +15482,7 @@ snapshots:
       '@vitest/utils': 1.6.0
       acorn-walk: 8.3.3
       chai: 4.4.1
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       execa: 8.0.1
       local-pkg: 0.5.0
       magic-string: 0.30.10
@@ -15039,12 +15517,12 @@ snapshots:
 
   vue-eslint-parser@9.4.3(eslint@8.57.0):
     dependencies:
-      debug: 4.3.5
+      debug: 4.3.6(supports-color@5.5.0)
       eslint: 8.57.0
       eslint-scope: 7.2.2
       eslint-visitor-keys: 3.4.3
       espree: 9.6.1
-      esquery: 1.5.0
+      esquery: 1.6.0
       lodash: 4.17.21
       semver: 7.6.2
     transitivePeerDependencies:
@@ -15182,14 +15660,7 @@ snapshots:
 
   wrappy@1.0.2: {}
 
-  ws@6.2.3:
-    dependencies:
-      async-limiter: 1.0.1
-    optional: true
-
-  ws@7.5.10: {}
-
-  ws@8.17.1: {}
+  ws@8.18.0: {}
 
   xhr@2.6.0:
     dependencies:
@@ -15247,7 +15718,7 @@ snapshots:
       y-protocols: 1.0.6(yjs@13.6.18)
       yjs: 13.6.18
     optionalDependencies:
-      ws: 6.2.3
+      ws: 8.18.0
       y-leveldb: 0.1.2(yjs@13.6.18)
     transitivePeerDependencies:
       - bufferutil
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 52388c5e3f47..b4ac81e8f7e4 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -2,4 +2,9 @@ packages:
   - app/dashboard
   - app/ide-desktop/*
   - app/gui2
+  - app/rust-ffi
+  - app/ydoc-server
+  - app/ydoc-shared
+  - app/ydoc-server-nodejs
+  - app/ydoc-server-polyglot
   - lib/js/runner
diff --git a/project/Ydoc.scala b/project/Ydoc.scala
index bce22e13c79c..daa526db362e 100644
--- a/project/Ydoc.scala
+++ b/project/Ydoc.scala
@@ -5,7 +5,6 @@ import scala.sys.process.*
 
 object Ydoc {
 
-  private val npmCommand = if (Platform.isWindows) "npm.cmd" else "npm"
   private val pnpmCommand =
     if (Platform.isWindows) "corepack.cmd pnpm" else "corepack pnpm"
 
@@ -51,25 +50,30 @@ object Ydoc {
     val generator = Tracked.inputChanged[Seq[File], Seq[File]](store) {
       case (changed, _) =>
         val resourceYdocServerJs =
-          ydocServerResourceManaged / "org" / "enso" / "ydoc" / "ydocServer.js"
+          ydocServerResourceManaged / "org" / "enso" / "ydoc" / "ydoc.cjs"
 
         if (changed) {
-          val command =
-            s"$npmCommand --workspace=enso-gui2 run build-ydoc-server-polyglot"
+          val command = s"$pnpmCommand -r compile"
           streams.log.info(command)
           command ! streams.log
           val generatedYdocServerJs =
-            ydocServerBase / "target" / "ydoc-server-bundle" / "assets" / "ydocServer.js"
+            base / "app" / "ydoc-server-polyglot" / "dist" / "main.cjs"
           IO.copyFile(generatedYdocServerJs, resourceYdocServerJs)
         }
 
         Seq(resourceYdocServerJs)
     }
 
-    val ydocServerSrc = (base / "app" / "gui2" / "ydoc-server") ** "*.ts"
-    val sharedSrc     = (base / "app" / "gui2" / "shared") ** "*.ts"
-    val buildCfg      = (base / "app" / "gui2") * ("*.ts" || "*.json")
-    val inputFiles    = ydocServerSrc +++ sharedSrc +++ buildCfg
+    val ydocServerPolyglot = base / "app" / "ydoc-server-polyglot"
+    val ydocServerPolyglotSrc =
+      ydocServerPolyglot * ("*.mjs" | "*.json") +++ (ydocServerPolyglot / "src") ** "*.ts"
+    val ydocShared = base / "app" / "ydoc-shared"
+    val ydocSharedSrc =
+      ydocShared * ("*.ts" || "*.json") +++
+      (ydocShared / "src") ** "*.ts" +++
+      (ydocShared / "parser-codegen") ** "*.ts"
+    val sharedSrc  = (base / "app" / "gui2" / "shared") ** "*.ts"
+    val inputFiles = ydocServerPolyglotSrc +++ sharedSrc
 
     generator(inputFiles.get)
   }

From 5079b212076be5c8e6994eaf75aa76d8ec6888e1 Mon Sep 17 00:00:00 2001
From: somebody1234 <ehern.lee@gmail.com>
Date: Fri, 9 Aug 2024 18:05:45 +1000
Subject: [PATCH 05/23] Switch from applying optimistic updates to invalidating
 queries (#10601)

- The update handling is no longer reactive, so it will no longer cause unnecessary re-renders

Other changes:
- Rename `Root` component to `UIProviders` to be more descriptive

# Important Notes
None
---
 app/.vscode/react.code-snippets               |  26 +-
 app/dashboard/e2e/api.ts                      |   7 +-
 app/dashboard/src/App.tsx                     | 175 +++-------
 app/dashboard/src/authentication/service.ts   |  44 +--
 .../src/components/ErrorBoundary.tsx          |   4 +-
 app/dashboard/src/components/Root.tsx         |  32 --
 app/dashboard/src/components/UIProviders.tsx  |  28 ++
 .../src/components/dashboard/AssetRow.tsx     |  63 ++--
 .../dashboard/DatalinkNameColumn.tsx          |   6 +-
 .../dashboard/DirectoryNameColumn.tsx         |   8 +-
 .../components/dashboard/FileNameColumn.tsx   |  20 +-
 .../src/components/dashboard/Permission.tsx   |  10 +-
 .../dashboard/ProjectNameColumn.tsx           |  30 +-
 .../components/dashboard/SecretNameColumn.tsx |   8 +-
 .../dashboard/column/LabelsColumn.tsx         |   2 +-
 app/dashboard/src/hooks/backendHooks.ts       | 317 ++++++++----------
 app/dashboard/src/index.tsx                   |  57 ++--
 app/dashboard/src/layouts/AssetPanel.tsx      |   6 +-
 app/dashboard/src/layouts/AssetProperties.tsx |  18 +-
 app/dashboard/src/layouts/AssetSearchBar.tsx  |   2 +-
 app/dashboard/src/layouts/AssetsTable.tsx     |  20 +-
 app/dashboard/src/layouts/Labels.tsx          |  21 +-
 app/dashboard/src/layouts/Settings.tsx        |  29 +-
 .../Settings/ActivityLogSettingsSection.tsx   |   2 +-
 .../Settings/MembersSettingsSection.tsx       |  34 +-
 .../src/layouts/Settings/MembersTable.tsx     |   2 +-
 .../OrganizationProfilePictureInput.tsx       |  21 +-
 .../layouts/Settings/ProfilePictureInput.tsx  |  22 +-
 .../Settings/UserGroupsSettingsSection.tsx    |  30 +-
 .../InviteUsersModal/InviteUsersForm.tsx      |  14 +-
 .../src/modals/ManageLabelsModal.tsx          |  16 +-
 .../src/modals/ManagePermissionsModal.tsx     |  15 +-
 app/dashboard/src/modals/NewLabelModal.tsx    |  20 +-
 .../src/modals/NewUserGroupModal.tsx          |  12 +-
 .../src/modals/SetOrganizationNameModal.tsx   |  16 +-
 .../src/modals/TermsOfServiceModal.tsx        |   2 +-
 .../src/pages/authentication/Registration.tsx |   3 +-
 app/dashboard/src/utilities/LocalStorage.ts   |  75 +++--
 38 files changed, 580 insertions(+), 637 deletions(-)
 delete mode 100644 app/dashboard/src/components/Root.tsx
 create mode 100644 app/dashboard/src/components/UIProviders.tsx

diff --git a/app/.vscode/react.code-snippets b/app/.vscode/react.code-snippets
index a6a27e058e65..32127c8d48eb 100644
--- a/app/.vscode/react.code-snippets
+++ b/app/.vscode/react.code-snippets
@@ -2,9 +2,6 @@
   "React Component": {
     "prefix": ["$c", "component"],
     "body": [
-      "/** @file $2 */",
-      "import * as React from 'react'",
-      "",
       "// ====${1/./=/g}====",
       "// === $1 ===",
       "// ====${1/./=/g}====",
@@ -18,15 +15,28 @@
       "export default function $1(props: $1Props) {",
       "  const { ${3/(.+?):.+/$1, /g} } = props",
       "  return <>$4</>",
-      "}"
-    ]
+      "}",
+    ],
+  },
+  "React Hook": {
+    "prefix": ["$h", "hook"],
+    "body": [
+      "// =======${1/./=/g}====",
+      "// === use$1 ===",
+      "// =======${1/./=/g}====",
+      "",
+      "/** $2 */",
+      "export function use$1($3) {",
+      "  $4",
+      "}",
+    ],
   },
   "useState": {
     "prefix": ["$s", "usestate"],
-    "body": ["const [$1, set${1/(.*)/${1:/pascalcase}/}] = React.useState($2)"]
+    "body": ["const [$1, set${1/(.*)/${1:/pascalcase}/}] = React.useState($2)"],
   },
   "section": {
     "prefix": ["$S", "section"],
-    "body": ["// ====${1/./=/g}====", "// === $1 ===", "// ====${1/./=/g}===="]
-  }
+    "body": ["// ====${1/./=/g}====", "// === $1 ===", "// ====${1/./=/g}===="],
+  },
 }
diff --git a/app/dashboard/e2e/api.ts b/app/dashboard/e2e/api.ts
index 757f872b9996..a949ecc4ef6e 100644
--- a/app/dashboard/e2e/api.ts
+++ b/app/dashboard/e2e/api.ts
@@ -776,12 +776,7 @@ async function mockApiInternal({ page, setupAPI }: MockParams) {
     await post(remoteBackendPaths.CREATE_TAG_PATH + '*', (route) => {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       const body: backend.CreateTagRequestBody = route.request().postDataJSON()
-      const json: backend.Label = {
-        id: backend.TagId(`tag-${uniqueString.uniqueString()}`),
-        value: backend.LabelName(body.value),
-        color: body.color,
-      }
-      return json
+      return addLabel(body.value, body.color)
     })
     await post(remoteBackendPaths.CREATE_PROJECT_PATH + '*', (_route, request) => {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
diff --git a/app/dashboard/src/App.tsx b/app/dashboard/src/App.tsx
index eee830bfa0b8..c31a214f325b 100644
--- a/app/dashboard/src/App.tsx
+++ b/app/dashboard/src/App.tsx
@@ -38,6 +38,7 @@ import * as React from 'react'
 import * as reactQuery from '@tanstack/react-query'
 import * as router from 'react-router-dom'
 import * as toastify from 'react-toastify'
+import * as z from 'zod'
 
 import * as detect from 'enso-common/src/detect'
 
@@ -45,17 +46,14 @@ import * as appUtils from '#/appUtils'
 
 import * as inputBindingsModule from '#/configurations/inputBindings'
 
-import * as backendHooks from '#/hooks/backendHooks'
-
 import AuthProvider, * as authProvider from '#/providers/AuthProvider'
-import BackendProvider, { useLocalBackend, useRemoteBackend } from '#/providers/BackendProvider'
+import BackendProvider from '#/providers/BackendProvider'
 import DriveProvider from '#/providers/DriveProvider'
 import DevtoolsProvider from '#/providers/EnsoDevtoolsProvider'
-import * as httpClientProvider from '#/providers/HttpClientProvider'
+import { useHttpClient } from '#/providers/HttpClientProvider'
 import InputBindingsProvider from '#/providers/InputBindingsProvider'
 import LocalStorageProvider, * as localStorageProvider from '#/providers/LocalStorageProvider'
-import type * as loggerProvider from '#/providers/LoggerProvider'
-import LoggerProvider from '#/providers/LoggerProvider'
+import { useLogger } from '#/providers/LoggerProvider'
 import ModalProvider, * as modalProvider from '#/providers/ModalProvider'
 import * as navigator2DProvider from '#/providers/Navigator2DProvider'
 import SessionProvider from '#/providers/SessionProvider'
@@ -76,10 +74,9 @@ import type * as editor from '#/layouts/Editor'
 import * as openAppWatcher from '#/layouts/OpenAppWatcher'
 import VersionChecker from '#/layouts/VersionChecker'
 
+import { RouterProvider } from '#/components/aria'
 import * as devtools from '#/components/Devtools'
 import * as errorBoundary from '#/components/ErrorBoundary'
-import * as offlineNotificationManager from '#/components/OfflineNotificationManager'
-import * as rootComponent from '#/components/Root'
 import * as suspense from '#/components/Suspense'
 
 import AboutModal from '#/modals/AboutModal'
@@ -92,11 +89,10 @@ import RemoteBackend from '#/services/RemoteBackend'
 
 import * as appBaseUrl from '#/utilities/appBaseUrl'
 import * as eventModule from '#/utilities/event'
-import type HttpClient from '#/utilities/HttpClient'
 import LocalStorage from '#/utilities/LocalStorage'
 import * as object from '#/utilities/object'
 
-import * as authServiceModule from '#/authentication/service'
+import { useInitAuthService } from '#/authentication/service'
 
 // ============================
 // === Global configuration ===
@@ -110,17 +106,16 @@ declare module '#/utilities/LocalStorage' {
 }
 
 LocalStorage.registerKey('inputBindings', {
-  tryParse: (value) =>
-    typeof value !== 'object' || value == null ?
-      null
-    : Object.fromEntries(
-        Object.entries<unknown>({ ...value }).flatMap((kv) => {
-          const [k, v] = kv
-          return Array.isArray(v) && v.every((item): item is string => typeof item === 'string') ?
-              [[k, v]]
-            : []
-        }),
-      ),
+  schema: z.record(z.string().array().readonly()).transform((value) =>
+    Object.fromEntries(
+      Object.entries<unknown>({ ...value }).flatMap((kv) => {
+        const [k, v] = kv
+        return Array.isArray(v) && v.every((item): item is string => typeof item === 'string') ?
+            [[k, v]]
+          : []
+      }),
+    ),
+  ),
 })
 
 // ======================
@@ -141,7 +136,6 @@ function getMainPageUrl() {
 /** Global configuration for the `App` component. */
 export interface AppProps {
   readonly vibrancy: boolean
-  readonly logger: loggerProvider.Logger
   /** Whether the application may have the local backend running. */
   readonly supportsLocalBackend: boolean
   /** If true, the app can only be used in offline mode. */
@@ -157,8 +151,6 @@ export interface AppProps {
   readonly projectManagerUrl: string | null
   readonly ydocUrl: string | null
   readonly appRunner: editor.GraphEditorRunner | null
-  readonly portalRoot: Element
-  readonly httpClient: HttpClient
   readonly queryClient: reactQuery.QueryClient
 }
 
@@ -262,12 +254,10 @@ export interface AppRouterProps extends AppProps {
  * because the {@link AppRouter} relies on React hooks, which can't be used in the same React
  * component as the component that defines the provider. */
 function AppRouter(props: AppRouterProps) {
-  const { logger, isAuthenticationDisabled, shouldShowDashboard, httpClient } = props
+  const { isAuthenticationDisabled, shouldShowDashboard } = props
   const { onAuthenticated, projectManagerInstance } = props
-  const { portalRoot } = props
-  // `navigateHooks.useNavigate` cannot be used here as it relies on `AuthProvider`, which has not
-  // yet been initialized at this point.
-  // eslint-disable-next-line no-restricted-properties
+  const httpClient = useHttpClient()
+  const logger = useLogger()
   const navigate = router.useNavigate()
   const { getText } = textProvider.useText()
   const { localStorage } = localStorageProvider.useLocalStorage()
@@ -356,14 +346,8 @@ function AppRouter(props: AppRouterProps) {
       },
     }
   }, [localStorage, inputBindingsRaw])
-
   const mainPageUrl = getMainPageUrl()
-
-  const authService = React.useMemo(() => {
-    const authConfig = { navigate, ...props }
-    return authServiceModule.initAuthService(authConfig)
-  }, [props, navigate])
-
+  const authService = useInitAuthService(props)
   const userSession = authService?.cognito.userSession.bind(authService.cognito) ?? null
   const refreshUserSession =
     authService?.cognito.refreshUserSession.bind(authService.cognito) ?? null
@@ -494,90 +478,39 @@ function AppRouter(props: AppRouterProps) {
     </router.Routes>
   )
 
-  let result = (
-    <>
-      <MutationListener />
-      <VersionChecker />
-      {routes}
-    </>
-  )
-
-  result = (
-    <>
-      {result}
-
-      <errorBoundary.ErrorBoundary>
-        <suspense.Suspense>
-          <devtools.EnsoDevtools />
-        </suspense.Suspense>
-      </errorBoundary.ErrorBoundary>
-    </>
-  )
-  result = <errorBoundary.ErrorBoundary>{result}</errorBoundary.ErrorBoundary>
-  result = <InputBindingsProvider inputBindings={inputBindings}>{result}</InputBindingsProvider>
-  result = (
-    <AuthProvider
-      shouldStartInOfflineMode={isAuthenticationDisabled}
-      authService={authService}
-      onAuthenticated={onAuthenticated}
-    >
-      {result}
-    </AuthProvider>
-  )
-
-  result = (
-    <BackendProvider remoteBackend={remoteBackend} localBackend={localBackend}>
-      {result}
-    </BackendProvider>
-  )
-
-  result = (
-    <SessionProvider
-      saveAccessToken={authService?.cognito.saveAccessToken.bind(authService.cognito) ?? null}
-      mainPageUrl={mainPageUrl}
-      userSession={userSession}
-      registerAuthEventListener={registerAuthEventListener}
-      refreshUserSession={refreshUserSession}
-    >
-      {result}
-    </SessionProvider>
-  )
-  result = <LoggerProvider logger={logger}>{result}</LoggerProvider>
-  result = (
-    <rootComponent.Root navigate={navigate} portalRoot={portalRoot}>
-      {result}
-    </rootComponent.Root>
-  )
-  // Ideally this would be in `Drive.tsx`, but it currently must be all the way out here
-  // due to modals being in `TheModal`.
-  result = <DriveProvider>{result}</DriveProvider>
-  result = (
-    <offlineNotificationManager.OfflineNotificationManager>
-      {result}
-    </offlineNotificationManager.OfflineNotificationManager>
-  )
-  result = (
-    <httpClientProvider.HttpClientProvider httpClient={httpClient}>
-      {result}
-    </httpClientProvider.HttpClientProvider>
+  return (
+    <DevtoolsProvider>
+      <RouterProvider navigate={navigate}>
+        <SessionProvider
+          saveAccessToken={authService?.cognito.saveAccessToken.bind(authService.cognito) ?? null}
+          mainPageUrl={mainPageUrl}
+          userSession={userSession}
+          registerAuthEventListener={registerAuthEventListener}
+          refreshUserSession={refreshUserSession}
+        >
+          <BackendProvider remoteBackend={remoteBackend} localBackend={localBackend}>
+            <AuthProvider
+              shouldStartInOfflineMode={isAuthenticationDisabled}
+              authService={authService}
+              onAuthenticated={onAuthenticated}
+            >
+              <InputBindingsProvider inputBindings={inputBindings}>
+                {/* Ideally this would be in `Drive.tsx`, but it currently must be all the way out here
+                 * due to modals being in `TheModal`. */}
+                <DriveProvider>
+                  <errorBoundary.ErrorBoundary>
+                    <VersionChecker />
+                    {routes}
+                    <suspense.Suspense>
+                      <devtools.EnsoDevtools />
+                    </suspense.Suspense>
+                  </errorBoundary.ErrorBoundary>
+                </DriveProvider>
+              </InputBindingsProvider>
+            </AuthProvider>
+          </BackendProvider>
+        </SessionProvider>
+      </RouterProvider>
+    </DevtoolsProvider>
   )
-  result = <LoggerProvider logger={logger}>{result}</LoggerProvider>
-  result = <DevtoolsProvider>{result}</DevtoolsProvider>
-
-  return result
-}
-
-// ========================
-// === MutationListener ===
-// ========================
-
-/** A component that applies state updates for successful mutations. */
-function MutationListener() {
-  const remoteBackend = useRemoteBackend()
-  const localBackend = useLocalBackend()
-
-  backendHooks.useObserveBackend(remoteBackend)
-  backendHooks.useObserveBackend(localBackend)
-
-  return null
 }
diff --git a/app/dashboard/src/authentication/service.ts b/app/dashboard/src/authentication/service.ts
index 20404e5a957a..a72f2b3d83d5 100644
--- a/app/dashboard/src/authentication/service.ts
+++ b/app/dashboard/src/authentication/service.ts
@@ -1,14 +1,17 @@
 /** @file Provides an {@link AuthService} which consists of an underyling `Cognito` API
  * wrapper, along with some convenience callbacks to make URL redirects for the authentication flows
  * work with Electron. */
+import * as React from 'react'
+
 import * as amplify from '@aws-amplify/auth'
+import { useNavigate } from 'react-router'
 
 import * as common from 'enso-common'
 import * as detect from 'enso-common/src/detect'
 
 import * as appUtils from '#/appUtils'
 
-import type * as loggerProvider from '#/providers/LoggerProvider'
+import { useLogger, type Logger } from '#/providers/LoggerProvider'
 
 import type * as saveAccessTokenModule from '#/utilities/accessToken'
 
@@ -90,16 +93,9 @@ export function toNestedAmplifyConfig(config: AmplifyConfig): NestedAmplifyConfi
 
 /** Configuration for the authentication service. */
 export interface AuthConfig {
-  /** Logger for the authentication service. */
-  readonly logger: loggerProvider.Logger
   /** Whether the application supports deep links. This is only true when using
    * the installed app on macOS and Windows. */
   readonly supportsDeepLinks: boolean
-  /** Function to navigate to a given (relative) URL.
-   *
-   * Used to redirect to pages like the password reset page with the query parameters set in the
-   * URL (e.g., `?verification_code=...`). */
-  readonly navigate: (url: string) => void
 }
 
 // ===================
@@ -118,24 +114,28 @@ export interface AuthService {
  *
  * # Warning
  *
- * This function should only be called once, and the returned service should be used throughout the
- * application. This is because it performs global configuration of the Amplify library. */
-export function initAuthService(authConfig: AuthConfig): AuthService | null {
-  const { logger, supportsDeepLinks, navigate } = authConfig
-  const amplifyConfig = loadAmplifyConfig(logger, supportsDeepLinks, navigate)
-  const cognito =
-    amplifyConfig == null ? null : (
-      new cognitoModule.Cognito(logger, supportsDeepLinks, amplifyConfig)
-    )
+ * This hook should only be called in a single place, as it performs global configuration of the
+ * Amplify library. */
+export function useInitAuthService(authConfig: AuthConfig): AuthService | null {
+  const { supportsDeepLinks } = authConfig
+  const logger = useLogger()
+  const navigate = useNavigate()
+  return React.useMemo(() => {
+    const amplifyConfig = loadAmplifyConfig(logger, supportsDeepLinks, navigate)
+    const cognito =
+      amplifyConfig == null ? null : (
+        new cognitoModule.Cognito(logger, supportsDeepLinks, amplifyConfig)
+      )
 
-  return cognito == null ? null : (
-      { cognito, registerAuthEventListener: listen.registerAuthEventListener }
-    )
+    return cognito == null ? null : (
+        { cognito, registerAuthEventListener: listen.registerAuthEventListener }
+      )
+  }, [logger, navigate, supportsDeepLinks])
 }
 
 /** Return the appropriate Amplify configuration for the current platform. */
 function loadAmplifyConfig(
-  logger: loggerProvider.Logger,
+  logger: Logger,
   supportsDeepLinks: boolean,
   navigate: (url: string) => void,
 ): AmplifyConfig | null {
@@ -213,7 +213,7 @@ function loadAmplifyConfig(
  *
  * All URLs that don't have a pathname that starts with `AUTHENTICATION_PATHNAME_BASE` will be
  * ignored by this handler. */
-function setDeepLinkHandler(logger: loggerProvider.Logger, navigate: (url: string) => void) {
+function setDeepLinkHandler(logger: Logger, navigate: (url: string) => void) {
   window.authenticationApi.setDeepLinkHandler((urlString: string) => {
     const url = new URL(urlString)
     logger.log(`Parsed pathname: ${url.pathname}`)
diff --git a/app/dashboard/src/components/ErrorBoundary.tsx b/app/dashboard/src/components/ErrorBoundary.tsx
index 05a0b3310fa9..3a7c3ab2b26d 100644
--- a/app/dashboard/src/components/ErrorBoundary.tsx
+++ b/app/dashboard/src/components/ErrorBoundary.tsx
@@ -25,9 +25,9 @@ export interface ErrorBoundaryProps
   extends Readonly<React.PropsWithChildren>,
     Readonly<Pick<errorBoundary.ErrorBoundaryProps, 'FallbackComponent' | 'onError' | 'onReset'>> {}
 
-/** Catches errors in the child components
+/** Catches errors in child components
  * Shows a fallback UI when there is an error.
- * The error can also be logged. to an error reporting service. */
+ * The error can also be logged to an error reporting service. */
 export function ErrorBoundary(props: ErrorBoundaryProps) {
   const {
     FallbackComponent = ErrorDisplay,
diff --git a/app/dashboard/src/components/Root.tsx b/app/dashboard/src/components/Root.tsx
deleted file mode 100644
index 1f0df2551140..000000000000
--- a/app/dashboard/src/components/Root.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-/** @file The root component with required providers */
-import * as React from 'react'
-
-import * as aria from '#/components/aria'
-import * as ariaComponents from '#/components/AriaComponents'
-import * as portal from '#/components/Portal'
-
-// ============
-// === Root ===
-// ============
-
-/** Props for {@link Root}. */
-export interface RootProps extends React.PropsWithChildren {
-  readonly portalRoot: Element
-  readonly navigate: (path: string) => void
-  readonly locale?: string
-}
-
-/** The root component with required providers. */
-export function Root(props: RootProps) {
-  const { children, navigate, locale = 'en-US', portalRoot } = props
-
-  return (
-    <portal.PortalProvider value={portalRoot}>
-      <aria.RouterProvider navigate={navigate}>
-        <aria.I18nProvider locale={locale}>
-          <ariaComponents.DialogStackProvider>{children}</ariaComponents.DialogStackProvider>
-        </aria.I18nProvider>
-      </aria.RouterProvider>
-    </portal.PortalProvider>
-  )
-}
diff --git a/app/dashboard/src/components/UIProviders.tsx b/app/dashboard/src/components/UIProviders.tsx
new file mode 100644
index 000000000000..486d067f4b37
--- /dev/null
+++ b/app/dashboard/src/components/UIProviders.tsx
@@ -0,0 +1,28 @@
+/** @file A wrapper containing all UI-related React Provdiers. */
+import * as React from 'react'
+
+import { I18nProvider } from '#/components/aria'
+import { DialogStackProvider } from '#/components/AriaComponents'
+import { PortalProvider } from '#/components/Portal'
+
+// ===================
+// === UIProviders ===
+// ===================
+
+/** Props for a {@link UIProviders}. */
+export interface UIProvidersProps extends Readonly<React.PropsWithChildren> {
+  readonly portalRoot: Element
+  readonly locale: string
+}
+
+/** A wrapper containing all UI-related React Provdiers. */
+export default function UIProviders(props: UIProvidersProps) {
+  const { portalRoot, locale, children } = props
+  return (
+    <PortalProvider value={portalRoot}>
+      <DialogStackProvider>
+        <I18nProvider locale={locale}>{children}</I18nProvider>
+      </DialogStackProvider>
+    </PortalProvider>
+  )
+}
diff --git a/app/dashboard/src/components/dashboard/AssetRow.tsx b/app/dashboard/src/components/dashboard/AssetRow.tsx
index 9395494b88f6..7e70ef335dfc 100644
--- a/app/dashboard/src/components/dashboard/AssetRow.tsx
+++ b/app/dashboard/src/components/dashboard/AssetRow.tsx
@@ -1,11 +1,12 @@
 /** @file A table row for an arbitrary asset. */
 import * as React from 'react'
 
+import { useMutation } from '@tanstack/react-query'
 import { useStore } from 'zustand'
 
 import BlankIcon from '#/assets/blank.svg'
 
-import * as backendHooks from '#/hooks/backendHooks'
+import { backendMutationOptions } from '#/hooks/backendHooks'
 import * as dragAndDropHooks from '#/hooks/dragAndDropHooks'
 import { useEventCallback } from '#/hooks/eventCallbackHooks'
 import * as setAssetHooks from '#/hooks/setAssetHooks'
@@ -138,23 +139,25 @@ export default function AssetRow(props: AssetRowProps) {
     : outerVisibility
   const hidden = hiddenRaw || visibility === Visibility.hidden
 
-  const copyAssetMutation = backendHooks.useBackendMutation(backend, 'copyAsset')
-  const updateAssetMutation = backendHooks.useBackendMutation(backend, 'updateAsset')
-  const deleteAssetMutation = backendHooks.useBackendMutation(backend, 'deleteAsset')
-  const undoDeleteAssetMutation = backendHooks.useBackendMutation(backend, 'undoDeleteAsset')
-  const openProjectMutation = backendHooks.useBackendMutation(backend, 'openProject')
-  const closeProjectMutation = backendHooks.useBackendMutation(backend, 'closeProject')
-  const getProjectDetailsMutation = backendHooks.useBackendMutation(backend, 'getProjectDetails')
-  const getFileDetailsMutation = backendHooks.useBackendMutation(backend, 'getFileDetails')
-  const getDatalinkMutation = backendHooks.useBackendMutation(backend, 'getDatalink')
-  const createPermissionMutation = backendHooks.useBackendMutation(backend, 'createPermission')
-  const associateTagMutation = backendHooks.useBackendMutation(backend, 'associateTag')
-  const copyAssetMutate = copyAssetMutation.mutateAsync
-  const updateAssetMutate = updateAssetMutation.mutateAsync
-  const deleteAssetMutate = deleteAssetMutation.mutateAsync
-  const undoDeleteAssetMutate = undoDeleteAssetMutation.mutateAsync
-  const openProjectMutate = openProjectMutation.mutateAsync
-  const closeProjectMutate = closeProjectMutation.mutateAsync
+  const copyAssetMutation = useMutation(backendMutationOptions(backend, 'copyAsset'))
+  const updateAssetMutation = useMutation(backendMutationOptions(backend, 'updateAsset'))
+  const deleteAssetMutation = useMutation(backendMutationOptions(backend, 'deleteAsset'))
+  const undoDeleteAssetMutation = useMutation(backendMutationOptions(backend, 'undoDeleteAsset'))
+  const openProjectMutation = useMutation(backendMutationOptions(backend, 'openProject'))
+  const closeProjectMutation = useMutation(backendMutationOptions(backend, 'closeProject'))
+  const getProjectDetailsMutation = useMutation(
+    backendMutationOptions(backend, 'getProjectDetails'),
+  )
+  const getFileDetailsMutation = useMutation(backendMutationOptions(backend, 'getFileDetails'))
+  const getDatalinkMutation = useMutation(backendMutationOptions(backend, 'getDatalink'))
+  const createPermissionMutation = useMutation(backendMutationOptions(backend, 'createPermission'))
+  const associateTagMutation = useMutation(backendMutationOptions(backend, 'associateTag'))
+  const copyAsset = copyAssetMutation.mutateAsync
+  const updateAsset = updateAssetMutation.mutateAsync
+  const deleteAsset = deleteAssetMutation.mutateAsync
+  const undoDeleteAsset = undoDeleteAssetMutation.mutateAsync
+  const openProject = openProjectMutation.mutateAsync
+  const closeProject = closeProjectMutation.mutateAsync
 
   const { data: projectState } = useQuery({
     // This is SAFE, as `isOpened` is only true for projects.
@@ -207,7 +210,7 @@ export default function AssetRow(props: AssetRowProps) {
           }),
         )
         newParentId ??= rootDirectoryId
-        const copiedAsset = await copyAssetMutate([
+        const copiedAsset = await copyAsset([
           asset.id,
           newParentId,
           asset.title,
@@ -234,7 +237,7 @@ export default function AssetRow(props: AssetRowProps) {
       asset,
       item.key,
       toastAndLog,
-      copyAssetMutate,
+      copyAsset,
       nodeMap,
       setAsset,
       dispatchAssetListEvent,
@@ -290,7 +293,7 @@ export default function AssetRow(props: AssetRowProps) {
           item: newAsset,
         })
         setAsset(newAsset)
-        await updateAssetMutate([
+        await updateAsset([
           asset.id,
           { parentDirectoryId: newParentId ?? rootDirectoryId, description: null },
           asset.title,
@@ -327,7 +330,7 @@ export default function AssetRow(props: AssetRowProps) {
       item.directoryKey,
       item.key,
       toastAndLog,
-      updateAssetMutate,
+      updateAsset,
       setAsset,
       dispatchAssetListEvent,
     ],
@@ -362,15 +365,15 @@ export default function AssetRow(props: AssetRowProps) {
             asset.projectState.type !== backendModule.ProjectState.placeholder &&
             asset.projectState.type !== backendModule.ProjectState.closed
           ) {
-            await openProjectMutate([asset.id, null, asset.title])
+            await openProject([asset.id, null, asset.title])
           }
           try {
-            await closeProjectMutate([asset.id, asset.title])
+            await closeProject([asset.id, asset.title])
           } catch {
             // Ignored. The project was already closed.
           }
         }
-        await deleteAssetMutate([asset.id, { force: forever }, asset.title])
+        await deleteAsset([asset.id, { force: forever }, asset.title])
         dispatchAssetListEvent({ type: AssetListEventType.delete, key: item.key })
       } catch (error) {
         setInsertionVisibility(Visibility.visible)
@@ -381,9 +384,9 @@ export default function AssetRow(props: AssetRowProps) {
       backend,
       dispatchAssetListEvent,
       asset,
-      openProjectMutate,
-      closeProjectMutate,
-      deleteAssetMutate,
+      openProject,
+      closeProject,
+      deleteAsset,
       item.key,
       toastAndLog,
     ],
@@ -393,13 +396,13 @@ export default function AssetRow(props: AssetRowProps) {
     // Visually, the asset is deleted from the Trash view.
     setInsertionVisibility(Visibility.hidden)
     try {
-      await undoDeleteAssetMutate([asset.id, asset.title])
+      await undoDeleteAsset([asset.id, asset.title])
       dispatchAssetListEvent({ type: AssetListEventType.delete, key: item.key })
     } catch (error) {
       setInsertionVisibility(Visibility.visible)
       toastAndLog('restoreAssetError', error, asset.title)
     }
-  }, [dispatchAssetListEvent, asset, toastAndLog, undoDeleteAssetMutate, item.key])
+  }, [dispatchAssetListEvent, asset, toastAndLog, undoDeleteAsset, item.key])
 
   const doTriggerDescriptionEdit = React.useCallback(() => {
     setModal(
diff --git a/app/dashboard/src/components/dashboard/DatalinkNameColumn.tsx b/app/dashboard/src/components/dashboard/DatalinkNameColumn.tsx
index f342e185753a..f9376efd54ab 100644
--- a/app/dashboard/src/components/dashboard/DatalinkNameColumn.tsx
+++ b/app/dashboard/src/components/dashboard/DatalinkNameColumn.tsx
@@ -1,9 +1,11 @@
 /** @file The icon and name of a {@link backendModule.SecretAsset}. */
 import * as React from 'react'
 
+import { useMutation } from '@tanstack/react-query'
+
 import DatalinkIcon from '#/assets/datalink.svg'
 
-import * as backendHooks from '#/hooks/backendHooks'
+import { backendMutationOptions } from '#/hooks/backendHooks'
 import * as setAssetHooks from '#/hooks/setAssetHooks'
 import * as toastAndLogHooks from '#/hooks/toastAndLogHooks'
 
@@ -48,7 +50,7 @@ export default function DatalinkNameColumn(props: DatalinkNameColumnProps) {
   const asset = item.item
   const setAsset = setAssetHooks.useSetAsset(asset, setItem)
 
-  const createDatalinkMutation = backendHooks.useBackendMutation(backend, 'createDatalink')
+  const createDatalinkMutation = useMutation(backendMutationOptions(backend, 'createDatalink'))
 
   const setIsEditing = (isEditingName: boolean) => {
     if (isEditable) {
diff --git a/app/dashboard/src/components/dashboard/DirectoryNameColumn.tsx b/app/dashboard/src/components/dashboard/DirectoryNameColumn.tsx
index e5e060988f92..75def3d91baa 100644
--- a/app/dashboard/src/components/dashboard/DirectoryNameColumn.tsx
+++ b/app/dashboard/src/components/dashboard/DirectoryNameColumn.tsx
@@ -1,10 +1,12 @@
 /** @file The icon and name of a {@link backendModule.DirectoryAsset}. */
 import * as React from 'react'
 
+import { useMutation } from '@tanstack/react-query'
+
 import FolderIcon from '#/assets/folder.svg'
 import FolderArrowIcon from '#/assets/folder_arrow.svg'
 
-import * as backendHooks from '#/hooks/backendHooks'
+import { backendMutationOptions } from '#/hooks/backendHooks'
 import * as setAssetHooks from '#/hooks/setAssetHooks'
 import * as toastAndLogHooks from '#/hooks/toastAndLogHooks'
 
@@ -59,8 +61,8 @@ export default function DirectoryNameColumn(props: DirectoryNameColumnProps) {
   const setAsset = setAssetHooks.useSetAsset(asset, setItem)
   const isExpanded = item.children != null && item.isExpanded
 
-  const createDirectoryMutation = backendHooks.useBackendMutation(backend, 'createDirectory')
-  const updateDirectoryMutation = backendHooks.useBackendMutation(backend, 'updateDirectory')
+  const createDirectoryMutation = useMutation(backendMutationOptions(backend, 'createDirectory'))
+  const updateDirectoryMutation = useMutation(backendMutationOptions(backend, 'updateDirectory'))
 
   const setIsEditing = (isEditingName: boolean) => {
     if (isEditable) {
diff --git a/app/dashboard/src/components/dashboard/FileNameColumn.tsx b/app/dashboard/src/components/dashboard/FileNameColumn.tsx
index 170a15ef464a..f40aeb038a48 100644
--- a/app/dashboard/src/components/dashboard/FileNameColumn.tsx
+++ b/app/dashboard/src/components/dashboard/FileNameColumn.tsx
@@ -1,7 +1,9 @@
 /** @file The icon and name of a {@link backendModule.FileAsset}. */
 import * as React from 'react'
 
-import * as backendHooks from '#/hooks/backendHooks'
+import { useMutation } from '@tanstack/react-query'
+
+import { backendMutationOptions } from '#/hooks/backendHooks'
 import * as setAssetHooks from '#/hooks/setAssetHooks'
 import * as toastAndLogHooks from '#/hooks/toastAndLogHooks'
 
@@ -50,13 +52,15 @@ export default function FileNameColumn(props: FileNameColumnProps) {
   const setAsset = setAssetHooks.useSetAsset(asset, setItem)
   const isCloud = backend.type === backendModule.BackendType.remote
 
-  const updateFileMutation = backendHooks.useBackendMutation(backend, 'updateFile')
-  const uploadFileMutation = backendHooks.useBackendMutation(backend, 'uploadFile', {
-    meta: {
-      invalidates: [['assetVersions', item.item.id, item.item.title]],
-      awaitInvalidates: true,
-    },
-  })
+  const updateFileMutation = useMutation(backendMutationOptions(backend, 'updateFile'))
+  const uploadFileMutation = useMutation(
+    backendMutationOptions(backend, 'uploadFile', {
+      meta: {
+        invalidates: [['assetVersions', item.item.id, item.item.title]],
+        awaitInvalidates: true,
+      },
+    }),
+  )
 
   const setIsEditing = (isEditingName: boolean) => {
     if (isEditable) {
diff --git a/app/dashboard/src/components/dashboard/Permission.tsx b/app/dashboard/src/components/dashboard/Permission.tsx
index b25455ee06e8..c75d54ccff05 100644
--- a/app/dashboard/src/components/dashboard/Permission.tsx
+++ b/app/dashboard/src/components/dashboard/Permission.tsx
@@ -1,9 +1,11 @@
 /** @file Permissions for a specific user or user group on a specific asset. */
 import * as React from 'react'
 
+import { useMutation } from '@tanstack/react-query'
+
 import type * as text from 'enso-common/src/text'
 
-import * as backendHooks from '#/hooks/backendHooks'
+import { backendMutationOptions } from '#/hooks/backendHooks'
 import * as toastAndLogHooks from '#/hooks/toastAndLogHooks'
 
 import * as textProvider from '#/providers/TextProvider'
@@ -58,7 +60,9 @@ export default function Permission(props: PermissionProps) {
   const isDisabled = isOnlyOwner && permissionId === self.user.userId
   const assetTypeName = getText(ASSET_TYPE_TO_TEXT_ID[asset.type])
 
-  const createPermissionMutation = backendHooks.useBackendMutation(backend, 'createPermission')
+  const createPermission = useMutation(
+    backendMutationOptions(backend, 'createPermission'),
+  ).mutateAsync
 
   React.useEffect(() => {
     setPermission(initialPermission)
@@ -68,7 +72,7 @@ export default function Permission(props: PermissionProps) {
     try {
       setPermission(newPermission)
       outerSetPermission(newPermission)
-      await createPermissionMutation.mutateAsync([
+      await createPermission([
         {
           actorsIds: [backendModule.getAssetPermissionId(newPermission)],
           resourceId: asset.id,
diff --git a/app/dashboard/src/components/dashboard/ProjectNameColumn.tsx b/app/dashboard/src/components/dashboard/ProjectNameColumn.tsx
index e66dc2bb78de..0286c8b8ed84 100644
--- a/app/dashboard/src/components/dashboard/ProjectNameColumn.tsx
+++ b/app/dashboard/src/components/dashboard/ProjectNameColumn.tsx
@@ -1,11 +1,11 @@
 /** @file The icon and name of a {@link backendModule.ProjectAsset}. */
 import * as React from 'react'
 
-import * as reactQuery from '@tanstack/react-query'
+import { useMutation, useQueryClient } from '@tanstack/react-query'
 
 import NetworkIcon from '#/assets/network.svg'
 
-import * as backendHooks from '#/hooks/backendHooks'
+import { backendMutationOptions } from '#/hooks/backendHooks'
 import * as projectHooks from '#/hooks/projectHooks'
 import * as setAssetHooks from '#/hooks/setAssetHooks'
 import * as toastAndLogHooks from '#/hooks/toastAndLogHooks'
@@ -61,7 +61,7 @@ export default function ProjectNameColumn(props: ProjectNameColumnProps) {
     isOpened,
   } = props
   const { backend, nodeMap } = state
-  const client = reactQuery.useQueryClient()
+  const client = useQueryClient()
   const toastAndLog = toastAndLogHooks.useToastAndLog()
   const { user } = authProvider.useNonPartialUserSession()
   const { getText } = textProvider.useText()
@@ -96,16 +96,20 @@ export default function ProjectNameColumn(props: ProjectNameColumnProps) {
   const isOtherUserUsingProject =
     isCloud && projectState.openedBy != null && projectState.openedBy !== user.email
 
-  const createProjectMutation = backendHooks.useBackendMutation(backend, 'createProject')
-  const updateProjectMutation = backendHooks.useBackendMutation(backend, 'updateProject')
-  const duplicateProjectMutation = backendHooks.useBackendMutation(backend, 'duplicateProject')
-  const getProjectDetailsMutation = backendHooks.useBackendMutation(backend, 'getProjectDetails')
-  const uploadFileMutation = backendHooks.useBackendMutation(backend, 'uploadFile', {
-    meta: {
-      invalidates: [['assetVersions', item.item.id, item.item.title]],
-      awaitInvalidates: true,
-    },
-  })
+  const createProjectMutation = useMutation(backendMutationOptions(backend, 'createProject'))
+  const updateProjectMutation = useMutation(backendMutationOptions(backend, 'updateProject'))
+  const duplicateProjectMutation = useMutation(backendMutationOptions(backend, 'duplicateProject'))
+  const getProjectDetailsMutation = useMutation(
+    backendMutationOptions(backend, 'getProjectDetails'),
+  )
+  const uploadFileMutation = useMutation(
+    backendMutationOptions(backend, 'uploadFile', {
+      meta: {
+        invalidates: [['assetVersions', item.item.id, item.item.title]],
+        awaitInvalidates: true,
+      },
+    }),
+  )
 
   const setIsEditing = (isEditingName: boolean) => {
     if (isEditable) {
diff --git a/app/dashboard/src/components/dashboard/SecretNameColumn.tsx b/app/dashboard/src/components/dashboard/SecretNameColumn.tsx
index 790c301af265..3170bed6b7f2 100644
--- a/app/dashboard/src/components/dashboard/SecretNameColumn.tsx
+++ b/app/dashboard/src/components/dashboard/SecretNameColumn.tsx
@@ -1,9 +1,11 @@
 /** @file The icon and name of a {@link backendModule.SecretAsset}. */
 import * as React from 'react'
 
+import { useMutation } from '@tanstack/react-query'
+
 import KeyIcon from '#/assets/key.svg'
 
-import * as backendHooks from '#/hooks/backendHooks'
+import { backendMutationOptions } from '#/hooks/backendHooks'
 import * as setAssetHooks from '#/hooks/setAssetHooks'
 import * as toastAndLogHooks from '#/hooks/toastAndLogHooks'
 
@@ -52,8 +54,8 @@ export default function SecretNameColumn(props: SecretNameColumnProps) {
   }
   const asset = item.item
 
-  const createSecretMutation = backendHooks.useBackendMutation(backend, 'createSecret')
-  const updateSecretMutation = backendHooks.useBackendMutation(backend, 'updateSecret')
+  const createSecretMutation = useMutation(backendMutationOptions(backend, 'createSecret'))
+  const updateSecretMutation = useMutation(backendMutationOptions(backend, 'updateSecret'))
 
   const setIsEditing = (isEditingName: boolean) => {
     if (isEditable) {
diff --git a/app/dashboard/src/components/dashboard/column/LabelsColumn.tsx b/app/dashboard/src/components/dashboard/column/LabelsColumn.tsx
index 609c1445a8d3..bdd14a30d593 100644
--- a/app/dashboard/src/components/dashboard/column/LabelsColumn.tsx
+++ b/app/dashboard/src/components/dashboard/column/LabelsColumn.tsx
@@ -41,7 +41,7 @@ export default function LabelsColumn(props: column.AssetColumnProps) {
   const { setModal, unsetModal } = modalProvider.useSetModal()
   const { getText } = textProvider.useText()
   const toastAndLog = toastAndLogHooks.useToastAndLog()
-  const labels = backendHooks.useBackendListTags(backend)
+  const labels = backendHooks.useListTags(backend)
   const labelsByName = React.useMemo(() => {
     return new Map(labels?.map((label) => [label.value, label]))
   }, [labels])
diff --git a/app/dashboard/src/hooks/backendHooks.ts b/app/dashboard/src/hooks/backendHooks.ts
index 7f381cf83a06..abe98645f485 100644
--- a/app/dashboard/src/hooks/backendHooks.ts
+++ b/app/dashboard/src/hooks/backendHooks.ts
@@ -16,16 +16,17 @@ import * as uniqueString from '#/utilities/uniqueString'
 // === revokeUserPictureUrl ===
 // ============================
 
-const USER_PICTURE_URL_REVOKERS = new WeakMap<Backend, () => void>()
+const USER_PICTURE_URLS = new Map<backendModule.BackendType, string>()
 
 /** Create the corresponding "user picture" URL for the given backend. */
-function createUserPictureUrl(backend: Backend | null, picture: Blob) {
-  if (backend != null) {
-    USER_PICTURE_URL_REVOKERS.get(backend)?.()
+function createUserPictureUrl(
+  backendType: backendModule.BackendType | null | undefined,
+  picture: Blob,
+) {
+  if (backendType != null) {
+    revokeUserPictureUrl(backendType)
     const url = URL.createObjectURL(picture)
-    USER_PICTURE_URL_REVOKERS.set(backend, () => {
-      URL.revokeObjectURL(url)
-    })
+    USER_PICTURE_URLS.set(backendType, url)
     return url
   } else {
     // This should never happen, so use an arbitrary URL.
@@ -34,9 +35,12 @@ function createUserPictureUrl(backend: Backend | null, picture: Blob) {
 }
 
 /** Revoke the corresponding "user picture" URL for the given backend. */
-function revokeUserPictureUrl(backend: Backend | null) {
-  if (backend != null) {
-    USER_PICTURE_URL_REVOKERS.get(backend)?.()
+function revokeUserPictureUrl(backendType: backendModule.BackendType | null | undefined) {
+  if (backendType != null) {
+    const url = USER_PICTURE_URLS.get(backendType)
+    if (url != null) {
+      URL.revokeObjectURL(url)
+    }
   }
 }
 
@@ -44,16 +48,17 @@ function revokeUserPictureUrl(backend: Backend | null) {
 // === revokeOrganizationPictureUrl ===
 // ====================================
 
-const ORGANIZATION_PICTURE_URL_REVOKERS = new WeakMap<Backend, () => void>()
+const ORGANIZATION_PICTURE_URLS = new Map<backendModule.BackendType, string>()
 
 /** Create the corresponding "organization picture" URL for the given backend. */
-function createOrganizationPictureUrl(backend: Backend | null, picture: Blob) {
-  if (backend != null) {
-    ORGANIZATION_PICTURE_URL_REVOKERS.get(backend)?.()
+function createOrganizationPictureUrl(
+  backendType: backendModule.BackendType | null | undefined,
+  picture: Blob,
+) {
+  if (backendType != null) {
+    revokeOrganizationPictureUrl(backendType)
     const url = URL.createObjectURL(picture)
-    ORGANIZATION_PICTURE_URL_REVOKERS.set(backend, () => {
-      URL.revokeObjectURL(url)
-    })
+    ORGANIZATION_PICTURE_URLS.set(backendType, url)
     return url
   } else {
     // This should never happen, so use an arbitrary URL.
@@ -62,102 +67,70 @@ function createOrganizationPictureUrl(backend: Backend | null, picture: Blob) {
 }
 
 /** Revoke the corresponding "organization picture" URL for the given backend. */
-function revokeOrganizationPictureUrl(backend: Backend | null) {
-  if (backend != null) {
-    ORGANIZATION_PICTURE_URL_REVOKERS.get(backend)?.()
+function revokeOrganizationPictureUrl(backendType: backendModule.BackendType | null | undefined) {
+  if (backendType != null) {
+    const url = ORGANIZATION_PICTURE_URLS.get(backendType)
+    if (url != null) {
+      URL.revokeObjectURL(url)
+    }
   }
 }
 
-// =========================
-// === useObserveBackend ===
-// =========================
+// ============================
+// === DefineBackendMethods ===
+// ============================
 
-/** Listen to all mutations and update state as appropriate when they succeed.
- * MUST be unconditionally called exactly once for each backend type. */
-export function useObserveBackend(backend: Backend | null) {
-  const queryClient = reactQuery.useQueryClient()
-  const [seen] = React.useState(new WeakSet())
-  const useObserveMutations = <Method extends backendQuery.BackendMethods>(
-    method: Method,
-    onSuccess: (
-      state: reactQuery.MutationState<
-        Awaited<ReturnType<Backend[Method]>>,
-        Error,
-        Parameters<Backend[Method]>
-      >,
-    ) => void,
-  ) => {
-    const states = reactQuery.useMutationState<Parameters<Backend[Method]>>({
-      // Errored mutations can be safely ignored as they should not change the state.
-      filters: { mutationKey: [backend?.type, method], status: 'success' },
-      // eslint-disable-next-line no-restricted-syntax
-      select: (mutation) => mutation.state as never,
-    })
-    for (const state of states) {
-      if (!seen.has(state)) {
-        seen.add(state)
-        // This is SAFE - it is just too highly dynamic for TypeScript to typecheck.
-        // eslint-disable-next-line no-restricted-syntax
-        onSuccess(state as never)
-      }
-    }
-  }
-  const setQueryData = <Method extends backendQuery.BackendMethods>(
-    method: Method,
-    updater: (
-      variable: Awaited<ReturnType<Backend[Method]>>,
-    ) => Awaited<ReturnType<Backend[Method]>>,
-  ) => {
-    queryClient.setQueryData<Awaited<ReturnType<Backend[Method]>>>(
-      [backend?.type, method],
-      (data) => (data == null ? data : updater(data)),
-    )
-  }
-  useObserveMutations('uploadUserPicture', (state) => {
-    revokeUserPictureUrl(backend)
-    setQueryData('usersMe', (user) => state.data ?? user)
-  })
-  useObserveMutations('updateOrganization', (state) => {
-    setQueryData('getOrganization', (organization) => state.data ?? organization)
-  })
-  useObserveMutations('uploadOrganizationPicture', (state) => {
-    revokeOrganizationPictureUrl(backend)
-    setQueryData('getOrganization', (organization) => state.data ?? organization)
-  })
-  useObserveMutations('createUserGroup', (state) => {
-    if (state.data != null) {
-      const data = state.data
-      setQueryData('listUserGroups', (userGroups) => [data, ...userGroups])
-    }
-  })
-  useObserveMutations('deleteUserGroup', (state) => {
-    setQueryData('listUserGroups', (userGroups) =>
-      userGroups.filter((userGroup) => userGroup.id !== state.variables?.[0]),
-    )
-  })
-  useObserveMutations('changeUserGroup', (state) => {
-    if (state.variables != null) {
-      const [userId, body] = state.variables
-      setQueryData('listUsers', (users) =>
-        users.map((user) =>
-          user.userId !== userId ? user : { ...user, userGroups: body.userGroups },
-        ),
-      )
-    }
-  })
-  useObserveMutations('createTag', (state) => {
-    if (state.data != null) {
-      const data = state.data
-      setQueryData('listTags', (tags) => [...tags, data])
-    }
-  })
-  useObserveMutations('deleteTag', (state) => {
-    if (state.variables != null) {
-      const [tagId] = state.variables
-      setQueryData('listTags', (tags) => tags.filter((tag) => tag.id !== tagId))
-    }
-  })
-}
+/** Ensure that the given type contains only names of backend methods. */
+// eslint-disable-next-line no-restricted-syntax
+type DefineBackendMethods<T extends keyof Backend> = T
+
+// ======================
+// === MutationMethod ===
+// ======================
+
+/** Names of methods corresponding to mutations. */
+export type MutationMethod = DefineBackendMethods<
+  | 'associateTag'
+  | 'changeUserGroup'
+  | 'closeProject'
+  | 'copyAsset'
+  | 'createCheckoutSession'
+  | 'createDatalink'
+  | 'createDirectory'
+  | 'createPermission'
+  | 'createProject'
+  | 'createSecret'
+  | 'createTag'
+  | 'createUser'
+  | 'createUserGroup'
+  | 'deleteAsset'
+  | 'deleteDatalink'
+  | 'deleteInvitation'
+  | 'deleteTag'
+  | 'deleteUser'
+  | 'deleteUserGroup'
+  | 'duplicateProject'
+  // TODO: `get*` are not mutations, but are currently used in some places.
+  | 'getDatalink'
+  | 'getFileDetails'
+  | 'getProjectDetails'
+  | 'inviteUser'
+  | 'logEvent'
+  | 'openProject'
+  | 'removeUser'
+  | 'resendInvitation'
+  | 'undoDeleteAsset'
+  | 'updateAsset'
+  | 'updateDirectory'
+  | 'updateFile'
+  | 'updateOrganization'
+  | 'updateProject'
+  | 'updateSecret'
+  | 'updateUser'
+  | 'uploadFile'
+  | 'uploadOrganizationPicture'
+  | 'uploadUserPicture'
+>
 
 // =======================
 // === useBackendQuery ===
@@ -209,7 +182,19 @@ export function useBackendQuery<Method extends backendQuery.BackendMethods>(
 // === useBackendMutation ===
 // ==========================
 
-export function useBackendMutation<Method extends backendQuery.BackendMethods>(
+const INVALIDATION_MAP: Partial<Record<MutationMethod, readonly backendQuery.BackendMethods[]>> = {
+  updateUser: ['usersMe'],
+  uploadUserPicture: ['usersMe'],
+  updateOrganization: ['getOrganization'],
+  uploadOrganizationPicture: ['getOrganization'],
+  createUserGroup: ['listUserGroups'],
+  deleteUserGroup: ['listUserGroups'],
+  changeUserGroup: ['listUsers'],
+  createTag: ['listTags'],
+  deleteTag: ['listTags'],
+}
+
+export function backendMutationOptions<Method extends MutationMethod>(
   backend: Backend,
   method: Method,
   options?: Omit<
@@ -220,12 +205,12 @@ export function useBackendMutation<Method extends backendQuery.BackendMethods>(
     >,
     'mutationFn'
   >,
-): reactQuery.UseMutationResult<
+): reactQuery.UseMutationOptions<
   Awaited<ReturnType<Backend[Method]>>,
   Error,
   Parameters<Backend[Method]>
 >
-export function useBackendMutation<Method extends backendQuery.BackendMethods>(
+export function backendMutationOptions<Method extends MutationMethod>(
   backend: Backend | null,
   method: Method,
   options?: Omit<
@@ -236,14 +221,13 @@ export function useBackendMutation<Method extends backendQuery.BackendMethods>(
     >,
     'mutationFn'
   >,
-): reactQuery.UseMutationResult<
-  // eslint-disable-next-line no-restricted-syntax
+): reactQuery.UseMutationOptions<
   Awaited<ReturnType<Backend[Method]>> | undefined,
   Error,
   Parameters<Backend[Method]>
 >
 /** Wrap a backend method call in a React Query Mutation. */
-export function useBackendMutation<Method extends backendQuery.BackendMethods>(
+export function backendMutationOptions<Method extends MutationMethod>(
   backend: Backend | null,
   method: Method,
   options?: Omit<
@@ -254,18 +238,25 @@ export function useBackendMutation<Method extends backendQuery.BackendMethods>(
     >,
     'mutationFn'
   >,
-) {
-  return reactQuery.useMutation<
-    Awaited<ReturnType<Backend[Method]>>,
-    Error,
-    Parameters<Backend[Method]>
-  >({
+): reactQuery.UseMutationOptions<
+  Awaited<ReturnType<Backend[Method]>>,
+  Error,
+  Parameters<Backend[Method]>
+> {
+  return {
     ...options,
     mutationKey: [backend?.type, method, ...(options?.mutationKey ?? [])],
     // eslint-disable-next-line no-restricted-syntax, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-return
     mutationFn: (args) => (backend?.[method] as any)?.(...args),
     networkMode: backend?.type === backendModule.BackendType.local ? 'always' : 'online',
-  })
+    meta: {
+      invalidates: [
+        ...(options?.meta?.invalidates ?? []),
+        ...(INVALIDATION_MAP[method]?.map((queryMethod) => [backend?.type, queryMethod]) ?? []),
+      ],
+      awaitInvalidates: options?.meta?.awaitInvalidates ?? true,
+    },
+  }
 }
 
 // ===================================
@@ -288,32 +279,6 @@ export function useBackendMutationVariables<Method extends backendQuery.BackendM
   })
 }
 
-// =======================================
-// === useBackendMutationWithVariables ===
-// =======================================
-
-/** Wrap a backend method call in a React Query Mutation, and access its variables. */
-export function useBackendMutationWithVariables<Method extends backendQuery.BackendMethods>(
-  backend: Backend,
-  method: Method,
-  options?: Omit<
-    reactQuery.UseMutationOptions<
-      Awaited<ReturnType<Backend[Method]>>,
-      Error,
-      Parameters<Backend[Method]>
-    >,
-    'mutationFn'
-  >,
-) {
-  const mutation = useBackendMutation(backend, method, options)
-  return {
-    mutation,
-    mutate: mutation.mutate,
-    mutateAsync: mutation.mutateAsync,
-    variables: useBackendMutationVariables(backend, method, options?.mutationKey),
-  }
-}
-
 // ===================
 // === Placeholder ===
 // ===================
@@ -339,12 +304,12 @@ function toNonPlaceholder<T extends object>(object: T) {
   return { ...object, isPlaceholder: false }
 }
 
-// ===========================
-// === useBackendListUsers ===
-// ===========================
+// ====================
+// === useListUsers ===
+// ====================
 
 /** A list of users, taking into account optimistic state. */
-export function useBackendListUsers(
+export function useListUsers(
   backend: Backend,
 ): readonly WithPlaceholder<backendModule.User>[] | null {
   const listUsersQuery = useBackendQuery(backend, 'listUsers', [])
@@ -367,12 +332,12 @@ export function useBackendListUsers(
   }, [changeUserGroupVariables, listUsersQuery.data])
 }
 
-// ================================
-// === useBackendListUserGroups ===
-// ================================
+// =========================
+// === useListUserGroups ===
+// =========================
 
 /** A list of user groups, taking into account optimistic state. */
-export function useBackendListUserGroups(
+export function useListUserGroups(
   backend: Backend,
 ): readonly WithPlaceholder<backendModule.UserGroupInfo>[] | null {
   const { user } = authProvider.useNonPartialUserSession()
@@ -405,9 +370,9 @@ export function useBackendListUserGroups(
   ])
 }
 
-// =========================================
-// === useBackendListUserGroupsWithUsers ===
-// =========================================
+// ==================================
+// === useListUserGroupsWithUsers ===
+// ==================================
 
 /** A user group, as well as the users that are a part of the user group. */
 export interface UserGroupInfoWithUsers extends backendModule.UserGroupInfo {
@@ -415,14 +380,14 @@ export interface UserGroupInfoWithUsers extends backendModule.UserGroupInfo {
 }
 
 /** A list of user groups, taking into account optimistic state. */
-export function useBackendListUserGroupsWithUsers(
+export function useListUserGroupsWithUsers(
   backend: Backend,
 ): readonly WithPlaceholder<UserGroupInfoWithUsers>[] | null {
-  const userGroupsRaw = useBackendListUserGroups(backend)
+  const userGroupsRaw = useListUserGroups(backend)
   // Old user list
   const listUsersQuery = useBackendQuery(backend, 'listUsers', [])
   // Current user list, including optimistic updates
-  const users = useBackendListUsers(backend)
+  const users = useListUsers(backend)
   return React.useMemo(() => {
     if (userGroupsRaw == null || listUsersQuery.data == null || users == null) {
       return null
@@ -447,12 +412,12 @@ export function useBackendListUserGroupsWithUsers(
   }, [listUsersQuery.data, userGroupsRaw, users])
 }
 
-// ==========================
-// === useBackendListTags ===
-// ==========================
+// ===================
+// === useListTags ===
+// ===================
 
 /** A list of asset tags, taking into account optimistic state. */
-export function useBackendListTags(
+export function useListTags(
   backend: Backend | null,
 ): readonly WithPlaceholder<backendModule.Label>[] | null {
   const listTagsQuery = useBackendQuery(backend, 'listTags', [])
@@ -479,12 +444,12 @@ export function useBackendListTags(
   }, [createTagVariables, deleteTagVariables, listTagsQuery.data])
 }
 
-// =========================
-// === useBackendUsersMe ===
-// =========================
+// ==================
+// === useUsersMe ===
+// ==================
 
 /** The current user, taking into account optimistic state. */
-export function useBackendUsersMe(backend: Backend | null) {
+export function useUsersMe(backend: Backend | null) {
   const usersMeQuery = useBackendQuery(backend, 'usersMe', [])
   const updateUserVariables = useBackendMutationVariables(backend, 'updateUser')
   const uploadUserPictureVariables = useBackendMutationVariables(backend, 'uploadUserPicture')
@@ -501,7 +466,7 @@ export function useBackendUsersMe(backend: Backend | null) {
       for (const [, file] of uploadUserPictureVariables) {
         result = {
           ...result,
-          profilePicture: backendModule.HttpsUrl(createUserPictureUrl(backend, file)),
+          profilePicture: backendModule.HttpsUrl(createUserPictureUrl(backend?.type, file)),
         }
       }
       return result
@@ -509,12 +474,12 @@ export function useBackendUsersMe(backend: Backend | null) {
   }, [backend, usersMeQuery.data, updateUserVariables, uploadUserPictureVariables])
 }
 
-// =================================
-// === useBackendGetOrganization ===
-// =================================
+// ==========================
+// === useGetOrganization ===
+// ==========================
 
 /** The current user's organization, taking into account optimistic state. */
-export function useBackendGetOrganization(backend: Backend | null) {
+export function useGetOrganization(backend: Backend | null) {
   const getOrganizationQuery = useBackendQuery(backend, 'getOrganization', [])
   const updateOrganizationVariables = useBackendMutationVariables(backend, 'updateOrganization')
   const uploadOrganizationPictureVariables = useBackendMutationVariables(
@@ -532,7 +497,7 @@ export function useBackendGetOrganization(backend: Backend | null) {
       for (const [, file] of uploadOrganizationPictureVariables) {
         result = {
           ...result,
-          picture: backendModule.HttpsUrl(createOrganizationPictureUrl(backend, file)),
+          picture: backendModule.HttpsUrl(createOrganizationPictureUrl(backend?.type, file)),
         }
       }
       return result
diff --git a/app/dashboard/src/index.tsx b/app/dashboard/src/index.tsx
index b0cc96fb871f..10050dbe807c 100644
--- a/app/dashboard/src/index.tsx
+++ b/app/dashboard/src/index.tsx
@@ -4,7 +4,7 @@
 import * as React from 'react'
 
 import * as sentry from '@sentry/react'
-import * as reactQuery from '@tanstack/react-query'
+import { QueryClientProvider } from '@tanstack/react-query'
 import * as reactDOM from 'react-dom/client'
 import * as reactRouter from 'react-router-dom'
 import invariant from 'tiny-invariant'
@@ -14,11 +14,16 @@ import * as detect from 'enso-common/src/detect'
 import type * as app from '#/App'
 import App from '#/App'
 
+import { HttpClientProvider } from '#/providers/HttpClientProvider'
+import LoggerProvider, { type Logger } from '#/providers/LoggerProvider'
+
 import LoadingScreen from '#/pages/authentication/LoadingScreen'
 
-import * as devtools from '#/components/Devtools'
-import * as errorBoundary from '#/components/ErrorBoundary'
-import * as suspense from '#/components/Suspense'
+import { ReactQueryDevtools } from '#/components/Devtools'
+import { ErrorBoundary } from '#/components/ErrorBoundary'
+import { OfflineNotificationManager } from '#/components/OfflineNotificationManager'
+import { Suspense } from '#/components/Suspense'
+import UIProviders from '#/components/UIProviders'
 
 import HttpClient from '#/utilities/HttpClient'
 
@@ -35,6 +40,15 @@ const ROOT_ELEMENT_ID = 'enso-dashboard'
 /** The fraction of non-erroring interactions that should be sampled by Sentry. */
 const SENTRY_SAMPLE_RATE = 0.005
 
+// ======================
+// === DashboardProps ===
+// ======================
+
+/** Props for the dashboard. */
+export interface DashboardProps extends app.AppProps {
+  readonly logger: Logger
+}
+
 // ===========
 // === run ===
 // ===========
@@ -47,8 +61,8 @@ const SENTRY_SAMPLE_RATE = 0.005
 export // This export declaration must be broken up to satisfy the `require-jsdoc` rule.
 // This is not a React component even though it contains JSX.
 // eslint-disable-next-line no-restricted-syntax
-function run(props: Omit<app.AppProps, 'httpClient' | 'portalRoot'>) {
-  const { vibrancy, supportsDeepLinks, queryClient } = props
+function run(props: DashboardProps) {
+  const { vibrancy, supportsDeepLinks, queryClient, logger } = props
   if (
     !detect.IS_DEV_MODE &&
     process.env.ENSO_CLOUD_SENTRY_DSN != null &&
@@ -99,20 +113,23 @@ function run(props: Omit<app.AppProps, 'httpClient' | 'portalRoot'>) {
   React.startTransition(() => {
     reactDOM.createRoot(root).render(
       <React.StrictMode>
-        <reactQuery.QueryClientProvider client={queryClient}>
-          <errorBoundary.ErrorBoundary>
-            <suspense.Suspense fallback={<LoadingScreen />}>
-              <App
-                {...props}
-                supportsDeepLinks={actuallySupportsDeepLinks}
-                portalRoot={portalRoot}
-                httpClient={httpClient}
-              />
-            </suspense.Suspense>
-          </errorBoundary.ErrorBoundary>
-
-          <devtools.ReactQueryDevtools />
-        </reactQuery.QueryClientProvider>
+        <QueryClientProvider client={queryClient}>
+          <ErrorBoundary>
+            <Suspense fallback={<LoadingScreen />}>
+              <OfflineNotificationManager>
+                <LoggerProvider logger={logger}>
+                  <HttpClientProvider httpClient={httpClient}>
+                    <UIProviders locale="en-US" portalRoot={portalRoot}>
+                      <App {...props} supportsDeepLinks={actuallySupportsDeepLinks} />
+                    </UIProviders>
+                  </HttpClientProvider>
+                </LoggerProvider>
+              </OfflineNotificationManager>
+            </Suspense>
+          </ErrorBoundary>
+
+          <ReactQueryDevtools />
+        </QueryClientProvider>
       </React.StrictMode>,
     )
   })
diff --git a/app/dashboard/src/layouts/AssetPanel.tsx b/app/dashboard/src/layouts/AssetPanel.tsx
index 5220bdd538ee..9cdf331b9197 100644
--- a/app/dashboard/src/layouts/AssetPanel.tsx
+++ b/app/dashboard/src/layouts/AssetPanel.tsx
@@ -1,6 +1,8 @@
 /** @file A panel containing the description and settings for an asset. */
 import * as React from 'react'
 
+import * as z from 'zod'
+
 import * as localStorageProvider from '#/providers/LocalStorageProvider'
 import * as textProvider from '#/providers/TextProvider'
 
@@ -14,7 +16,6 @@ import * as ariaComponents from '#/components/AriaComponents'
 import type Backend from '#/services/Backend'
 import * as backendModule from '#/services/Backend'
 
-import * as array from '#/utilities/array'
 import type * as assetTreeNode from '#/utilities/AssetTreeNode'
 import LocalStorage from '#/utilities/LocalStorage'
 import * as tailwindMerge from '#/utilities/tailwindMerge'
@@ -41,9 +42,8 @@ declare module '#/utilities/LocalStorage' {
   }
 }
 
-const TABS = Object.values(AssetPanelTab)
 LocalStorage.registerKey('assetPanelTab', {
-  tryParse: (value) => (array.includes(TABS, value) ? value : null),
+  schema: z.nativeEnum(AssetPanelTab),
 })
 
 // ==================
diff --git a/app/dashboard/src/layouts/AssetProperties.tsx b/app/dashboard/src/layouts/AssetProperties.tsx
index 4455c1c583c4..e261cc42666c 100644
--- a/app/dashboard/src/layouts/AssetProperties.tsx
+++ b/app/dashboard/src/layouts/AssetProperties.tsx
@@ -1,11 +1,13 @@
 /** @file Display and modify the properties of an asset. */
 import * as React from 'react'
 
+import { useMutation } from '@tanstack/react-query'
+
 import PenIcon from '#/assets/pen.svg'
 
 import * as datalinkValidator from '#/data/datalinkValidator'
 
-import * as backendHooks from '#/hooks/backendHooks'
+import { backendMutationOptions, useListTags } from '#/hooks/backendHooks'
 import * as toastAndLogHooks from '#/hooks/toastAndLogHooks'
 
 import * as authProvider from '#/providers/AuthProvider'
@@ -71,7 +73,7 @@ export default function AssetProperties(props: AssetPropertiesProps) {
     },
     [setItemRaw],
   )
-  const labels = backendHooks.useBackendListTags(backend) ?? []
+  const labels = useListTags(backend) ?? []
   const self = item.item.permissions?.find(
     backendModule.isUserPermissionAnd((permission) => permission.user.userId === user.userId),
   )
@@ -89,10 +91,10 @@ export default function AssetProperties(props: AssetPropertiesProps) {
       localBackend?.getProjectPath(item.item.id) ?? null
     : localBackendModule.extractTypeAndId(item.item.id).id
 
-  const createDatalinkMutation = backendHooks.useBackendMutation(backend, 'createDatalink')
-  const getDatalinkMutation = backendHooks.useBackendMutation(backend, 'getDatalink')
-  const updateAssetMutation = backendHooks.useBackendMutation(backend, 'updateAsset')
-  const getDatalinkMutate = getDatalinkMutation.mutateAsync
+  const createDatalinkMutation = useMutation(backendMutationOptions(backend, 'createDatalink'))
+  const getDatalinkMutation = useMutation(backendMutationOptions(backend, 'getDatalink'))
+  const updateAssetMutation = useMutation(backendMutationOptions(backend, 'updateAsset'))
+  const getDatalink = getDatalinkMutation.mutateAsync
 
   React.useEffect(() => {
     setDescription(item.item.description ?? '')
@@ -101,13 +103,13 @@ export default function AssetProperties(props: AssetPropertiesProps) {
   React.useEffect(() => {
     void (async () => {
       if (item.item.type === backendModule.AssetType.datalink) {
-        const value = await getDatalinkMutate([item.item.id, item.item.title])
+        const value = await getDatalink([item.item.id, item.item.title])
         setDatalinkValue(value)
         setEditedDatalinkValue(value)
         setIsDatalinkFetched(true)
       }
     })()
-  }, [backend, item.item, getDatalinkMutate])
+  }, [backend, item.item, getDatalink])
 
   const doEditDescription = async () => {
     setIsEditingDescription(false)
diff --git a/app/dashboard/src/layouts/AssetSearchBar.tsx b/app/dashboard/src/layouts/AssetSearchBar.tsx
index 0a7e86667b10..296f8b9a5834 100644
--- a/app/dashboard/src/layouts/AssetSearchBar.tsx
+++ b/app/dashboard/src/layouts/AssetSearchBar.tsx
@@ -141,7 +141,7 @@ export default function AssetSearchBar(props: AssetSearchBarProps) {
   const querySource = React.useRef(QuerySource.external)
   const rootRef = React.useRef<HTMLLabelElement | null>(null)
   const searchRef = React.useRef<HTMLInputElement | null>(null)
-  const labels = backendHooks.useBackendListTags(backend) ?? []
+  const labels = backendHooks.useListTags(backend) ?? []
   areSuggestionsVisibleRef.current = areSuggestionsVisible
 
   React.useEffect(() => {
diff --git a/app/dashboard/src/layouts/AssetsTable.tsx b/app/dashboard/src/layouts/AssetsTable.tsx
index 84071e6485aa..e96c2bbb890f 100644
--- a/app/dashboard/src/layouts/AssetsTable.tsx
+++ b/app/dashboard/src/layouts/AssetsTable.tsx
@@ -1,14 +1,16 @@
 /** @file Table displaying a list of projects. */
 import * as React from 'react'
 
+import { useMutation } from '@tanstack/react-query'
 import * as toast from 'react-toastify'
+import * as z from 'zod'
 
 import DropFilesImage from '#/assets/drop_files.svg'
 
 import * as mimeTypes from '#/data/mimeTypes'
 
 import * as autoScrollHooks from '#/hooks/autoScrollHooks'
-import * as backendHooks from '#/hooks/backendHooks'
+import { backendMutationOptions, useBackendQuery, useListTags } from '#/hooks/backendHooks'
 import * as intersectionHooks from '#/hooks/intersectionHooks'
 import * as projectHooks from '#/hooks/projectHooks'
 import * as toastAndLogHooks from '#/hooks/toastAndLogHooks'
@@ -92,16 +94,12 @@ import Visibility from '#/utilities/Visibility'
 declare module '#/utilities/LocalStorage' {
   /** */
   interface LocalStorageData {
-    readonly enabledColumns: columnUtils.Column[]
+    readonly enabledColumns: readonly columnUtils.Column[]
   }
 }
 
 LocalStorage.registerKey('enabledColumns', {
-  tryParse: (value) => {
-    const possibleColumns = Array.isArray(value) ? value : []
-    const values = possibleColumns.filter(array.includesPredicate(columnUtils.CLOUD_COLUMNS))
-    return values.length === 0 ? null : values
-  },
+  schema: z.enum(columnUtils.CLOUD_COLUMNS).array().readonly(),
 })
 
 // =================
@@ -389,7 +387,7 @@ export default function AssetsTable(props: AssetsTableProps) {
 
   const { user } = authProvider.useNonPartialUserSession()
   const backend = backendProvider.useBackend(category)
-  const labels = backendHooks.useBackendListTags(backend)
+  const labels = useListTags(backend)
   const { setModal, unsetModal } = modalProvider.useSetModal()
   const { localStorage } = localStorageProvider.useLocalStorage()
   const { getText } = textProvider.useText()
@@ -635,7 +633,7 @@ export default function AssetsTable(props: AssetsTableProps) {
     true,
   )
 
-  const updateSecretMutation = backendHooks.useBackendMutation(backend, 'updateSecret')
+  const updateSecret = useMutation(backendMutationOptions(backend, 'updateSecret')).mutateAsync
   React.useEffect(() => {
     previousCategoryRef.current = category
   })
@@ -988,7 +986,7 @@ export default function AssetsTable(props: AssetsTableProps) {
     }
   }, [backend, category])
 
-  const rootDirectoryQuery = backendHooks.useBackendQuery(
+  const rootDirectoryQuery = useBackendQuery(
     backend,
     'listDirectory',
     [
@@ -1263,7 +1261,7 @@ export default function AssetsTable(props: AssetsTableProps) {
                     name={item.item.title}
                     doCreate={async (_name, value) => {
                       try {
-                        await updateSecretMutation.mutateAsync([id, { value }, item.item.title])
+                        await updateSecret([id, { value }, item.item.title])
                       } catch (error) {
                         toastAndLog(null, error)
                       }
diff --git a/app/dashboard/src/layouts/Labels.tsx b/app/dashboard/src/layouts/Labels.tsx
index 07ec2b529410..31d69eea170b 100644
--- a/app/dashboard/src/layouts/Labels.tsx
+++ b/app/dashboard/src/layouts/Labels.tsx
@@ -1,10 +1,12 @@
 /** @file A list of selectable labels. */
 import * as React from 'react'
 
+import { useMutation } from '@tanstack/react-query'
+
 import PlusIcon from '#/assets/plus.svg'
 import Trash2Icon from '#/assets/trash2.svg'
 
-import * as backendHooks from '#/hooks/backendHooks'
+import { backendMutationOptions, useListTags } from '#/hooks/backendHooks'
 
 import * as modalProvider from '#/providers/ModalProvider'
 import * as textProvider from '#/providers/TextProvider'
@@ -47,13 +49,14 @@ export default function Labels(props: LabelsProps) {
   const { setModal } = modalProvider.useSetModal()
   const { getText } = textProvider.useText()
   const dispatchAssetEvent = useDispatchAssetEvent()
-  const labels = backendHooks.useBackendListTags(backend) ?? []
-
-  const deleteTagMutation = backendHooks.useBackendMutation(backend, 'deleteTag', {
-    onSuccess: (_data, [, labelName]) => {
-      dispatchAssetEvent({ type: AssetEventType.deleteLabel, labelName })
-    },
-  })
+  const labels = useListTags(backend) ?? []
+  const deleteTag = useMutation(
+    backendMutationOptions(backend, 'deleteTag', {
+      onSuccess: (_data, [, labelName]) => {
+        dispatchAssetEvent({ type: AssetEventType.deleteLabel, labelName })
+      },
+    }),
+  ).mutate
 
   return (
     <FocusArea direction="vertical">
@@ -127,7 +130,7 @@ export default function Labels(props: LabelsProps) {
                             <ConfirmDeleteModal
                               actionText={getText('deleteLabelActionText', label.value)}
                               doDelete={() => {
-                                deleteTagMutation.mutate([label.id, label.value])
+                                deleteTag([label.id, label.value])
                               }}
                             />,
                           )
diff --git a/app/dashboard/src/layouts/Settings.tsx b/app/dashboard/src/layouts/Settings.tsx
index e52a2a042e64..77ba29361c08 100644
--- a/app/dashboard/src/layouts/Settings.tsx
+++ b/app/dashboard/src/layouts/Settings.tsx
@@ -1,11 +1,11 @@
 /** @file Settings screen. */
 import * as React from 'react'
 
-import * as reactQuery from '@tanstack/react-query'
+import { useMutation, useQueryClient } from '@tanstack/react-query'
 
 import BurgerMenuIcon from '#/assets/burger_menu.svg'
 
-import * as backendHooks from '#/hooks/backendHooks'
+import { backendMutationOptions, useGetOrganization } from '#/hooks/backendHooks'
 import * as searchParamsState from '#/hooks/searchParamsStateHooks'
 import * as toastAndLogHooks from '#/hooks/toastAndLogHooks'
 
@@ -41,6 +41,7 @@ export interface SettingsProps {
 
 /** Settings screen. */
 export default function Settings() {
+  const queryClient = useQueryClient()
   const backend = backendProvider.useRemoteBackendStrict()
   const localBackend = backendProvider.useLocalBackend()
   const [tab, setTab] = searchParamsState.useSearchParamsState(
@@ -49,24 +50,20 @@ export default function Settings() {
     array.includesPredicate(Object.values(SettingsTabType)),
   )
   const { user, accessToken } = authProvider.useNonPartialUserSession()
-  const { authQueryKey } = authProvider.useAuth()
   const { getText } = textProvider.useText()
   const toastAndLog = toastAndLogHooks.useToastAndLog()
   const [query, setQuery] = React.useState('')
   const root = portal.useStrictPortalContext()
   const [isSidebarPopoverOpen, setIsSidebarPopoverOpen] = React.useState(false)
-  const organization = backendHooks.useBackendGetOrganization(backend)
+  const organization = useGetOrganization(backend)
   const isQueryBlank = !/\S/.test(query)
 
-  const client = reactQuery.useQueryClient()
-  const updateUserMutation = backendHooks.useBackendMutation(backend, 'updateUser', {
-    meta: { invalidates: [authQueryKey], awaitInvalidates: true },
-  })
-  const updateOrganizationMutation = backendHooks.useBackendMutation(backend, 'updateOrganization')
-  const updateUser = updateUserMutation.mutateAsync
-  const updateOrganization = updateOrganizationMutation.mutateAsync
+  const updateUser = useMutation(backendMutationOptions(backend, 'updateUser')).mutateAsync
+  const updateOrganization = useMutation(
+    backendMutationOptions(backend, 'updateOrganization'),
+  ).mutateAsync
 
-  const updateLocalRootPathMutation = reactQuery.useMutation({
+  const updateLocalRootPath = useMutation({
     mutationKey: [localBackend?.type, 'updateRootPath'],
     mutationFn: (value: string) => {
       if (localBackend) {
@@ -75,9 +72,7 @@ export default function Settings() {
       return Promise.resolve()
     },
     meta: { invalidates: [[localBackend?.type, 'listDirectory']], awaitInvalidates: true },
-  })
-
-  const updateLocalRootPath = updateLocalRootPathMutation.mutateAsync
+  }).mutateAsync
 
   const context = React.useMemo<settingsData.SettingsContext>(
     () => ({
@@ -91,7 +86,7 @@ export default function Settings() {
       updateLocalRootPath,
       toastAndLog,
       getText,
-      queryClient: client,
+      queryClient,
     }),
     [
       accessToken,
@@ -104,7 +99,7 @@ export default function Settings() {
       updateOrganization,
       updateUser,
       user,
-      client,
+      queryClient,
     ],
   )
 
diff --git a/app/dashboard/src/layouts/Settings/ActivityLogSettingsSection.tsx b/app/dashboard/src/layouts/Settings/ActivityLogSettingsSection.tsx
index c83a986c582b..67167f2e33eb 100644
--- a/app/dashboard/src/layouts/Settings/ActivityLogSettingsSection.tsx
+++ b/app/dashboard/src/layouts/Settings/ActivityLogSettingsSection.tsx
@@ -78,7 +78,7 @@ export default function ActivityLogSettingsSection(props: ActivityLogSettingsSec
   const [emailIndices, setEmailIndices] = React.useState<readonly number[]>(() => [])
   const [sortInfo, setSortInfo] =
     React.useState<sorting.SortInfo<ActivityLogSortableColumn> | null>(null)
-  const users = backendHooks.useBackendListUsers(backend)
+  const users = backendHooks.useListUsers(backend)
   const allEmails = React.useMemo(() => (users ?? []).map((user) => user.email), [users])
   const logsQuery = backendHooks.useBackendQuery(backend, 'getLogEvents', [])
   const logs = logsQuery.data
diff --git a/app/dashboard/src/layouts/Settings/MembersSettingsSection.tsx b/app/dashboard/src/layouts/Settings/MembersSettingsSection.tsx
index 3bc7d9ad2bb2..7be05d1f6d48 100644
--- a/app/dashboard/src/layouts/Settings/MembersSettingsSection.tsx
+++ b/app/dashboard/src/layouts/Settings/MembersSettingsSection.tsx
@@ -1,9 +1,9 @@
 /** @file Settings tab for viewing and editing organization members. */
 import * as React from 'react'
 
-import * as reactQuery from '@tanstack/react-query'
+import { useMutation, useSuspenseQueries } from '@tanstack/react-query'
 
-import * as backendHooks from '#/hooks/backendHooks'
+import { backendMutationOptions } from '#/hooks/backendHooks'
 import * as billingHooks from '#/hooks/billing'
 
 import * as authProvider from '#/providers/AuthProvider'
@@ -36,7 +36,7 @@ export default function MembersSettingsSection() {
 
   const { isFeatureUnderPaywall, getFeature } = billingHooks.usePaywall({ plan: user.plan })
 
-  const [{ data: members }, { data: invitations }] = reactQuery.useSuspenseQueries({
+  const [{ data: members }, { data: invitations }] = useSuspenseQueries({
     queries: [
       {
         queryKey: ['listUsers'],
@@ -169,9 +169,11 @@ function ResendInvitationButton(props: ResendInvitationButtonProps) {
   const { invitation, backend } = props
 
   const { getText } = textProvider.useText()
-  const resendMutation = backendHooks.useBackendMutation(backend, 'resendInvitation', {
-    mutationKey: [invitation.userEmail],
-  })
+  const resendMutation = useMutation(
+    backendMutationOptions(backend, 'resendInvitation', {
+      mutationKey: [invitation.userEmail],
+    }),
+  )
 
   return (
     <ariaComponents.Button
@@ -202,10 +204,12 @@ function RemoveMemberButton(props: RemoveMemberButtonProps) {
   const { backend, userId } = props
   const { getText } = textProvider.useText()
 
-  const removeMutation = backendHooks.useBackendMutation(backend, 'removeUser', {
-    mutationKey: [userId],
-    meta: { invalidates: [['listUsers']], awaitInvalidates: true },
-  })
+  const removeMutation = useMutation(
+    backendMutationOptions(backend, 'removeUser', {
+      mutationKey: [userId],
+      meta: { invalidates: [['listUsers']], awaitInvalidates: true },
+    }),
+  )
 
   return (
     <ariaComponents.Button
@@ -234,10 +238,12 @@ function RemoveInvitationButton(props: RemoveInvitationButtonProps) {
 
   const { getText } = textProvider.useText()
 
-  const removeMutation = backendHooks.useBackendMutation(backend, 'deleteInvitation', {
-    mutationKey: [email],
-    meta: { invalidates: [['listInvitations']], awaitInvalidates: true },
-  })
+  const removeMutation = useMutation(
+    backendMutationOptions(backend, 'deleteInvitation', {
+      mutationKey: [email],
+      meta: { invalidates: [['listInvitations']], awaitInvalidates: true },
+    }),
+  )
 
   return (
     <ariaComponents.Button
diff --git a/app/dashboard/src/layouts/Settings/MembersTable.tsx b/app/dashboard/src/layouts/Settings/MembersTable.tsx
index 3ed4cba46d64..ed4ac0f4cb56 100644
--- a/app/dashboard/src/layouts/Settings/MembersTable.tsx
+++ b/app/dashboard/src/layouts/Settings/MembersTable.tsx
@@ -44,7 +44,7 @@ export default function MembersTable(props: MembersTableProps) {
   const bodyRef = React.useRef<HTMLTableSectionElement>(null)
   const userWithPlaceholder = React.useMemo(() => ({ isPlaceholder: false, ...user }), [user])
 
-  const backendListUsers = backendHooks.useBackendListUsers(backend)
+  const backendListUsers = backendHooks.useListUsers(backend)
 
   const users = React.useMemo(
     () => backendListUsers ?? (populateWithSelf ? [userWithPlaceholder] : null),
diff --git a/app/dashboard/src/layouts/Settings/OrganizationProfilePictureInput.tsx b/app/dashboard/src/layouts/Settings/OrganizationProfilePictureInput.tsx
index 6f3d90983695..9deb1d9e97fc 100644
--- a/app/dashboard/src/layouts/Settings/OrganizationProfilePictureInput.tsx
+++ b/app/dashboard/src/layouts/Settings/OrganizationProfilePictureInput.tsx
@@ -1,9 +1,11 @@
 /** @file The input for viewing and changing the organization's profile picture. */
 import * as React from 'react'
 
+import { useMutation } from '@tanstack/react-query'
+
 import DefaultUserIcon from '#/assets/default_user.svg'
 
-import * as backendHooks from '#/hooks/backendHooks'
+import { backendMutationOptions, useGetOrganization } from '#/hooks/backendHooks'
 import * as toastAndLogHooks from '#/hooks/toastAndLogHooks'
 
 import * as textProvider from '#/providers/TextProvider'
@@ -29,23 +31,18 @@ export default function OrganizationProfilePictureInput(
   const { backend } = props
   const toastAndLog = toastAndLogHooks.useToastAndLog()
   const { getText } = textProvider.useText()
-  const organization = backendHooks.useBackendGetOrganization(backend)
+  const organization = useGetOrganization(backend)
 
-  const uploadOrganizationPictureMutation = backendHooks.useBackendMutation(
-    backend,
-    'uploadOrganizationPicture',
-  )
+  const uploadOrganizationPicture = useMutation(
+    backendMutationOptions(backend, 'uploadOrganizationPicture'),
+  ).mutate
 
-  const doUploadOrganizationPicture = async (event: React.ChangeEvent<HTMLInputElement>) => {
+  const doUploadOrganizationPicture = (event: React.ChangeEvent<HTMLInputElement>) => {
     const image = event.target.files?.[0]
     if (image == null) {
       toastAndLog('noNewProfilePictureError')
     } else {
-      try {
-        await uploadOrganizationPictureMutation.mutateAsync([{ fileName: image.name }, image])
-      } catch (error) {
-        toastAndLog(null, error)
-      }
+      uploadOrganizationPicture([{ fileName: image.name }, image])
     }
     // Reset selected files, otherwise the file input will do nothing if the same file is
     // selected again. While technically not undesired behavior, it is unintuitive for the user.
diff --git a/app/dashboard/src/layouts/Settings/ProfilePictureInput.tsx b/app/dashboard/src/layouts/Settings/ProfilePictureInput.tsx
index c7e65848ff53..bb51731c5259 100644
--- a/app/dashboard/src/layouts/Settings/ProfilePictureInput.tsx
+++ b/app/dashboard/src/layouts/Settings/ProfilePictureInput.tsx
@@ -1,12 +1,13 @@
 /** @file The input for viewing and changing the user's profile picture. */
 import * as React from 'react'
 
+import { useMutation } from '@tanstack/react-query'
+
 import DefaultUserIcon from '#/assets/default_user.svg'
 
-import * as backendHooks from '#/hooks/backendHooks'
+import { backendMutationOptions, useUsersMe } from '#/hooks/backendHooks'
 import * as toastAndLogHooks from '#/hooks/toastAndLogHooks'
 
-import * as authProvider from '#/providers/AuthProvider'
 import * as textProvider from '#/providers/TextProvider'
 
 import * as aria from '#/components/aria'
@@ -27,26 +28,17 @@ export interface ProfilePictureInputProps {
 export default function ProfilePictureInput(props: ProfilePictureInputProps) {
   const { backend } = props
   const toastAndLog = toastAndLogHooks.useToastAndLog()
-  const { setUser } = authProvider.useAuth()
-  const user = backendHooks.useBackendUsersMe(backend)
+  const user = useUsersMe(backend)
   const { getText } = textProvider.useText()
 
-  const uploadUserPictureMutation = backendHooks.useBackendMutation(backend, 'uploadUserPicture')
+  const uploadUserPicture = useMutation(backendMutationOptions(backend, 'uploadUserPicture')).mutate
 
-  const doUploadUserPicture = async (event: React.ChangeEvent<HTMLInputElement>) => {
+  const doUploadUserPicture = (event: React.ChangeEvent<HTMLInputElement>) => {
     const image = event.target.files?.[0]
     if (image == null) {
       toastAndLog('noNewProfilePictureError')
     } else {
-      try {
-        const newUser = await uploadUserPictureMutation.mutateAsync([
-          { fileName: image.name },
-          image,
-        ])
-        setUser(newUser)
-      } catch (error) {
-        toastAndLog(null, error)
-      }
+      uploadUserPicture([{ fileName: image.name }, image])
     }
     // Reset selected files, otherwise the file input will do nothing if the same file is
     // selected again. While technically not undesired behavior, it is unintuitive for the user.
diff --git a/app/dashboard/src/layouts/Settings/UserGroupsSettingsSection.tsx b/app/dashboard/src/layouts/Settings/UserGroupsSettingsSection.tsx
index e4318f1d6dea..984ff19878a0 100644
--- a/app/dashboard/src/layouts/Settings/UserGroupsSettingsSection.tsx
+++ b/app/dashboard/src/layouts/Settings/UserGroupsSettingsSection.tsx
@@ -1,9 +1,15 @@
 /** @file Settings tab for viewing and editing roles for all users in the organization. */
 import * as React from 'react'
 
+import { useMutation } from '@tanstack/react-query'
+
 import * as mimeTypes from '#/data/mimeTypes'
 
-import * as backendHooks from '#/hooks/backendHooks'
+import {
+  backendMutationOptions,
+  useListUserGroupsWithUsers,
+  useListUsers,
+} from '#/hooks/backendHooks'
 import * as billingHooks from '#/hooks/billing'
 import * as scrollHooks from '#/hooks/scrollHooks'
 import * as toastAndLogHooks from '#/hooks/toastAndLogHooks'
@@ -43,12 +49,16 @@ export default function UserGroupsSettingsSection(props: UserGroupsSettingsSecti
   const { getText } = textProvider.useText()
   const { user } = authProvider.useFullUserSession()
   const toastAndLog = toastAndLogHooks.useToastAndLog()
-  const users = backendHooks.useBackendListUsers(backend)
-  const userGroups = backendHooks.useBackendListUserGroupsWithUsers(backend)
+  const users = useListUsers(backend)
+  const userGroups = useListUserGroupsWithUsers(backend)
   const rootRef = React.useRef<HTMLDivElement>(null)
   const bodyRef = React.useRef<HTMLTableSectionElement>(null)
-  const changeUserGroup = backendHooks.useBackendMutation(backend, 'changeUserGroup')
-  const deleteUserGroup = backendHooks.useBackendMutation(backend, 'deleteUserGroup')
+  const changeUserGroup = useMutation(
+    backendMutationOptions(backend, 'changeUserGroup'),
+  ).mutateAsync
+  const deleteUserGroup = useMutation(
+    backendMutationOptions(backend, 'deleteUserGroup'),
+  ).mutateAsync
   const usersMap = React.useMemo(
     () => new Map((users ?? []).map((otherUser) => [otherUser.userId, otherUser])),
     [users],
@@ -90,7 +100,7 @@ export default function UserGroupsSettingsSection(props: UserGroupsSettingsSecti
               if (!groups.includes(userGroupId)) {
                 try {
                   const newUserGroups = [...groups, userGroupId]
-                  await changeUserGroup.mutateAsync([
+                  await changeUserGroup([
                     newUser.userId,
                     { userGroups: newUserGroups },
                     newUser.name,
@@ -108,7 +118,7 @@ export default function UserGroupsSettingsSection(props: UserGroupsSettingsSecti
 
   const doDeleteUserGroup = async (userGroup: backendModule.UserGroupInfo) => {
     try {
-      await deleteUserGroup.mutateAsync([userGroup.id, userGroup.groupName])
+      await deleteUserGroup([userGroup.id, userGroup.groupName])
     } catch (error) {
       toastAndLog('deleteUserGroupError', error, userGroup.groupName)
     }
@@ -122,11 +132,7 @@ export default function UserGroupsSettingsSection(props: UserGroupsSettingsSecti
       const intermediateUserGroups =
         otherUser.userGroups?.filter((userGroupId) => userGroupId !== userGroup.id) ?? null
       const newUserGroups = intermediateUserGroups?.length === 0 ? null : intermediateUserGroups
-      await changeUserGroup.mutateAsync([
-        otherUser.userId,
-        { userGroups: newUserGroups ?? [] },
-        otherUser.name,
-      ])
+      await changeUserGroup([otherUser.userId, { userGroups: newUserGroups ?? [] }, otherUser.name])
     } catch (error) {
       toastAndLog('removeUserFromUserGroupError', error, otherUser.name, userGroup.groupName)
     }
diff --git a/app/dashboard/src/modals/InviteUsersModal/InviteUsersForm.tsx b/app/dashboard/src/modals/InviteUsersModal/InviteUsersForm.tsx
index ce80fa3d5ebb..86bdc47a075b 100644
--- a/app/dashboard/src/modals/InviteUsersModal/InviteUsersForm.tsx
+++ b/app/dashboard/src/modals/InviteUsersModal/InviteUsersForm.tsx
@@ -1,10 +1,10 @@
 /** @file A modal with inputs for user email and permission level. */
 import * as React from 'react'
 
-import * as reactQuery from '@tanstack/react-query'
+import { useMutation, useSuspenseQueries } from '@tanstack/react-query'
 import isEmail from 'validator/es/lib/isEmail'
 
-import * as backendHooks from '#/hooks/backendHooks'
+import { backendMutationOptions } from '#/hooks/backendHooks'
 import * as billingHooks from '#/hooks/billing'
 import * as eventCallbackHooks from '#/hooks/eventCallbackHooks'
 
@@ -38,11 +38,13 @@ export function InviteUsersForm(props: InviteUsersFormProps) {
   const { user } = authProvider.useFullUserSession()
   const { isFeatureUnderPaywall, getFeature } = billingHooks.usePaywall({ plan: user.plan })
 
-  const inviteUserMutation = backendHooks.useBackendMutation(backend, 'inviteUser', {
-    meta: { invalidates: [['listInvitations']], awaitInvalidates: true },
-  })
+  const inviteUserMutation = useMutation(
+    backendMutationOptions(backend, 'inviteUser', {
+      meta: { invalidates: [['listInvitations']], awaitInvalidates: true },
+    }),
+  )
 
-  const [{ data: usersCount }, { data: invitationsCount }] = reactQuery.useSuspenseQueries({
+  const [{ data: usersCount }, { data: invitationsCount }] = useSuspenseQueries({
     queries: [
       {
         queryKey: ['listInvitations'],
diff --git a/app/dashboard/src/modals/ManageLabelsModal.tsx b/app/dashboard/src/modals/ManageLabelsModal.tsx
index 0799724b151d..577b8bf50b92 100644
--- a/app/dashboard/src/modals/ManageLabelsModal.tsx
+++ b/app/dashboard/src/modals/ManageLabelsModal.tsx
@@ -1,7 +1,9 @@
 /** @file A modal to select labels for an asset. */
 import * as React from 'react'
 
-import * as backendHooks from '#/hooks/backendHooks'
+import { useMutation } from '@tanstack/react-query'
+
+import { backendMutationOptions, useListTags } from '#/hooks/backendHooks'
 import * as toastAndLogHooks from '#/hooks/toastAndLogHooks'
 
 import * as modalProvider from '#/providers/ModalProvider'
@@ -56,7 +58,7 @@ export default function ManageLabelsModal<
   const { unsetModal } = modalProvider.useSetModal()
   const { getText } = textProvider.useText()
   const toastAndLog = toastAndLogHooks.useToastAndLog()
-  const allLabels = backendHooks.useBackendListTags(backend)
+  const allLabels = useListTags(backend)
   const [labels, setLabelsRaw] = React.useState(item.labels ?? [])
   const [query, setQuery] = React.useState('')
   const [color, setColor] = React.useState<backendModule.LChColor | null>(null)
@@ -73,8 +75,8 @@ export default function ManageLabelsModal<
   )
   const canCreateNewLabel = canSelectColor
 
-  const createTagMutation = backendHooks.useBackendMutation(backend, 'createTag')
-  const associateTagMutation = backendHooks.useBackendMutation(backend, 'associateTag')
+  const createTag = useMutation(backendMutationOptions(backend, 'createTag')).mutateAsync
+  const associateTag = useMutation(backendMutationOptions(backend, 'associateTag')).mutateAsync
 
   const setLabels = React.useCallback(
     (valueOrUpdater: React.SetStateAction<backendModule.LabelName[]>) => {
@@ -98,7 +100,7 @@ export default function ManageLabelsModal<
       labelNames.has(name) ? labels.filter((label) => label !== name) : [...labels, name]
     setLabels(newLabels)
     try {
-      await associateTagMutation.mutateAsync([item.id, newLabels, item.title])
+      await associateTag([item.id, newLabels, item.title])
     } catch (error) {
       toastAndLog(null, error)
       setLabels(labels)
@@ -110,9 +112,9 @@ export default function ManageLabelsModal<
     const labelName = backendModule.LabelName(query)
     setLabels((oldLabels) => [...oldLabels, labelName])
     try {
-      await createTagMutation.mutateAsync([{ value: labelName, color: color ?? leastUsedColor }])
+      await createTag([{ value: labelName, color: color ?? leastUsedColor }])
       setLabels((newLabels) => {
-        associateTagMutation.mutate([item.id, newLabels, item.title])
+        void associateTag([item.id, newLabels, item.title])
         return newLabels
       })
     } catch (error) {
diff --git a/app/dashboard/src/modals/ManagePermissionsModal.tsx b/app/dashboard/src/modals/ManagePermissionsModal.tsx
index 05b983fa0ce5..9b44001dc8a0 100644
--- a/app/dashboard/src/modals/ManagePermissionsModal.tsx
+++ b/app/dashboard/src/modals/ManagePermissionsModal.tsx
@@ -1,11 +1,11 @@
 /** @file A modal with inputs for user email and permission level. */
 import * as React from 'react'
 
-import * as reactQuery from '@tanstack/react-query'
+import { useMutation, useQuery } from '@tanstack/react-query'
 import * as toast from 'react-toastify'
 import isEmail from 'validator/es/lib/isEmail'
 
-import * as backendHooks from '#/hooks/backendHooks'
+import { backendMutationOptions } from '#/hooks/backendHooks'
 import * as billingHooks from '#/hooks/billing'
 import * as toastAndLogHooks from '#/hooks/toastAndLogHooks'
 
@@ -70,14 +70,14 @@ export default function ManagePermissionsModal<
   const { isFeatureUnderPaywall } = billingHooks.usePaywall({ plan: user.plan })
   const isUnderPaywall = isFeatureUnderPaywall('shareFull')
 
-  const listedUsers = reactQuery.useQuery({
+  const listedUsers = useQuery({
     queryKey: ['listUsers'],
     queryFn: () => remoteBackend.listUsers(),
     enabled: !isUnderPaywall,
     select: (data) => (isUnderPaywall ? [] : data),
   })
 
-  const listedUserGroups = reactQuery.useQuery({
+  const listedUserGroups = useQuery({
     queryKey: ['listUserGroups'],
     queryFn: () => remoteBackend.listUserGroups(),
   })
@@ -122,10 +122,9 @@ export default function ManagePermissionsModal<
     [user.userId, permissions, self.permission],
   )
 
-  const inviteUserMutation = backendHooks.useBackendMutation(remoteBackend, 'inviteUser')
-  const createPermissionMutation = backendHooks.useBackendMutation(
-    remoteBackend,
-    'createPermission',
+  const inviteUserMutation = useMutation(backendMutationOptions(remoteBackend, 'inviteUser'))
+  const createPermissionMutation = useMutation(
+    backendMutationOptions(remoteBackend, 'createPermission'),
   )
 
   React.useEffect(() => {
diff --git a/app/dashboard/src/modals/NewLabelModal.tsx b/app/dashboard/src/modals/NewLabelModal.tsx
index ca553aa30cda..65f0c77fa71d 100644
--- a/app/dashboard/src/modals/NewLabelModal.tsx
+++ b/app/dashboard/src/modals/NewLabelModal.tsx
@@ -1,8 +1,9 @@
 /** @file A modal for creating a new label. */
 import * as React from 'react'
 
-import * as backendHooks from '#/hooks/backendHooks'
-import * as toastAndLogHooks from '#/hooks/toastAndLogHooks'
+import { useMutation } from '@tanstack/react-query'
+
+import { backendMutationOptions, useListTags } from '#/hooks/backendHooks'
 
 import * as modalProvider from '#/providers/ModalProvider'
 import * as textProvider from '#/providers/TextProvider'
@@ -39,13 +40,12 @@ export interface NewLabelModalProps {
 /** A modal for creating a new label. */
 export default function NewLabelModal(props: NewLabelModalProps) {
   const { backend, eventTarget } = props
-  const toastAndLog = toastAndLogHooks.useToastAndLog()
   const { unsetModal } = modalProvider.useSetModal()
   const { getText } = textProvider.useText()
   const [value, setValue] = React.useState('')
   const [color, setColor] = React.useState<backendModule.LChColor | null>(null)
   const position = React.useMemo(() => eventTarget.getBoundingClientRect(), [eventTarget])
-  const labelsRaw = backendHooks.useBackendListTags(backend)
+  const labelsRaw = useListTags(backend)
   const labels = React.useMemo(() => labelsRaw ?? [], [labelsRaw])
   const labelNames = React.useMemo(
     () => new Set<string>(labels.map((label) => label.value)),
@@ -54,16 +54,12 @@ export default function NewLabelModal(props: NewLabelModalProps) {
   const leastUsedColor = React.useMemo(() => backendModule.leastUsedColor(labels), [labels])
   const canSubmit = Boolean(value && !labelNames.has(value))
 
-  const createTagMutation = backendHooks.useBackendMutation(backend, 'createTag')
+  const createTag = useMutation(backendMutationOptions(backend, 'createTag')).mutate
 
-  const doSubmit = async () => {
+  const doSubmit = () => {
     if (value !== '') {
       unsetModal()
-      try {
-        await createTagMutation.mutateAsync([{ value, color: color ?? leastUsedColor }])
-      } catch (error) {
-        toastAndLog(null, error)
-      }
+      createTag([{ value, color: color ?? leastUsedColor }])
     }
   }
 
@@ -84,7 +80,7 @@ export default function NewLabelModal(props: NewLabelModalProps) {
           event.preventDefault()
           // Consider not calling `onSubmit()` here to make it harder to accidentally
           // delete an important asset.
-          void doSubmit()
+          doSubmit()
         }}
       >
         <aria.Heading level={2} className="relative text-sm font-semibold">
diff --git a/app/dashboard/src/modals/NewUserGroupModal.tsx b/app/dashboard/src/modals/NewUserGroupModal.tsx
index de8c429a66d3..a63798f76d09 100644
--- a/app/dashboard/src/modals/NewUserGroupModal.tsx
+++ b/app/dashboard/src/modals/NewUserGroupModal.tsx
@@ -1,7 +1,9 @@
 /** @file A modal to create a user group. */
 import * as React from 'react'
 
-import * as backendHooks from '#/hooks/backendHooks'
+import { useMutation } from '@tanstack/react-query'
+
+import { backendMutationOptions, useBackendQuery } from '#/hooks/backendHooks'
 import * as toastAndLogHooks from '#/hooks/toastAndLogHooks'
 
 import * as modalProvider from '#/providers/ModalProvider'
@@ -34,7 +36,7 @@ export default function NewUserGroupModal(props: NewUserGroupModalProps) {
   const { getText } = textProvider.useText()
   const toastAndLog = toastAndLogHooks.useToastAndLog()
   const [name, setName] = React.useState('')
-  const listUserGroupsQuery = backendHooks.useBackendQuery(backend, 'listUserGroups', [])
+  const listUserGroupsQuery = useBackendQuery(backend, 'listUserGroups', [])
   const userGroups = listUserGroupsQuery.data ?? null
   const userGroupNames = React.useMemo(
     () =>
@@ -47,14 +49,16 @@ export default function NewUserGroupModal(props: NewUserGroupModalProps) {
     userGroupNames != null && userGroupNames.has(string.normalizeName(name)) ?
       getText('duplicateUserGroupError')
     : null
-  const createUserGroupMutation = backendHooks.useBackendMutation(backend, 'createUserGroup')
+  const createUserGroup = useMutation(
+    backendMutationOptions(backend, 'createUserGroup'),
+  ).mutateAsync
   const canSubmit = nameError == null && name !== '' && userGroupNames != null
 
   const onSubmit = async () => {
     if (canSubmit) {
       unsetModal()
       try {
-        await createUserGroupMutation.mutateAsync([{ name }])
+        await createUserGroup([{ name }])
       } catch (error) {
         toastAndLog(null, error)
       }
diff --git a/app/dashboard/src/modals/SetOrganizationNameModal.tsx b/app/dashboard/src/modals/SetOrganizationNameModal.tsx
index cccd1fff68d5..0a11c19350bf 100644
--- a/app/dashboard/src/modals/SetOrganizationNameModal.tsx
+++ b/app/dashboard/src/modals/SetOrganizationNameModal.tsx
@@ -1,9 +1,11 @@
 /** @file Modal for setting the organization name. */
 import * as React from 'react'
 
-import * as reactQuery from '@tanstack/react-query'
+import { useMutation, useSuspenseQuery } from '@tanstack/react-query'
 import * as router from 'react-router'
 
+import { backendMutationOptions } from '#/hooks/backendHooks'
+
 import * as authProvider from '#/providers/AuthProvider'
 import * as backendProvider from '#/providers/BackendProvider'
 import type { GetText } from '#/providers/TextProvider'
@@ -35,18 +37,16 @@ export function SetOrganizationNameModal() {
   const userId = user?.userId ?? null
   const userPlan = user?.plan ?? null
 
-  const { data: organizationName } = reactQuery.useSuspenseQuery({
+  const { data: organizationName } = useSuspenseQuery({
     queryKey: ['organization', userId],
     queryFn: () => backend.getOrganization().catch(() => null),
     staleTime: Infinity,
     select: (data) => data?.name ?? '',
   })
 
-  const submit = reactQuery.useMutation({
-    mutationKey: ['organization', userId],
-    mutationFn: (name: string) => backend.updateOrganization({ name }),
-    meta: { invalidates: [['organization', userId]], awaitInvalidates: true },
-  })
+  const updateOrganization = useMutation(
+    backendMutationOptions(backend, 'updateOrganization'),
+  ).mutateAsync
 
   const shouldShowModal =
     userPlan != null && PLANS_TO_SPECIFY_ORG_NAME.includes(userPlan) && organizationName === ''
@@ -62,7 +62,7 @@ export function SetOrganizationNameModal() {
       >
         <SetOrganizationNameForm
           onSubmit={async (name) => {
-            await submit.mutateAsync(name)
+            await updateOrganization([{ name }])
           }}
         />
       </ariaComponents.Dialog>
diff --git a/app/dashboard/src/modals/TermsOfServiceModal.tsx b/app/dashboard/src/modals/TermsOfServiceModal.tsx
index 19df3a85be12..4dc5cc6f7a5d 100644
--- a/app/dashboard/src/modals/TermsOfServiceModal.tsx
+++ b/app/dashboard/src/modals/TermsOfServiceModal.tsx
@@ -116,7 +116,7 @@ export function TermsOfServiceModal() {
             testId="terms-of-service-form"
             method="dialog"
             onSubmit={({ hash }) => {
-              localStorage.set('termsOfService', { versionHash: hash })
+              localStorage.set('termsOfService', { versionHash: hash }, { triggerRerender: true })
             }}
           >
             {({ register }) => (
diff --git a/app/dashboard/src/pages/authentication/Registration.tsx b/app/dashboard/src/pages/authentication/Registration.tsx
index cc9a0207f969..8af24bef342c 100644
--- a/app/dashboard/src/pages/authentication/Registration.tsx
+++ b/app/dashboard/src/pages/authentication/Registration.tsx
@@ -2,6 +2,7 @@
 import * as React from 'react'
 
 import * as router from 'react-router-dom'
+import * as z from 'zod'
 
 import AtIcon from '#/assets/at.svg'
 import CreateAccountIcon from '#/assets/create_account.svg'
@@ -38,7 +39,7 @@ declare module '#/utilities/LocalStorage' {
 
 LocalStorage.registerKey('loginRedirect', {
   isUserSpecific: true,
-  tryParse: (value) => (typeof value === 'string' ? value : null),
+  schema: z.string(),
 })
 
 // ====================
diff --git a/app/dashboard/src/utilities/LocalStorage.ts b/app/dashboard/src/utilities/LocalStorage.ts
index a3a87c337607..d41ba16a4ee0 100644
--- a/app/dashboard/src/utilities/LocalStorage.ts
+++ b/app/dashboard/src/utilities/LocalStorage.ts
@@ -5,33 +5,12 @@ import * as common from 'enso-common'
 
 import * as object from '#/utilities/object'
 
-// ====================
-// === LocalStorage ===
-// ====================
+// ===============================
+// === LocalStorageKeyMetadata ===
+// ===============================
 
 /** Metadata describing runtime behavior associated with a {@link LocalStorageKey}. */
-export type LocalStorageKeyMetadata<K extends LocalStorageKey> =
-  | LocalStorageKeyMetadataWithParseFunction<K>
-  | LocalStorageKeyMetadataWithSchema<K>
-
-/**
- * A {@link LocalStorageKeyMetadata} with a `tryParse` function.
- */
-interface LocalStorageKeyMetadataWithParseFunction<K extends LocalStorageKey> {
-  readonly isUserSpecific?: boolean
-  /**
-   * A function to parse a value from the stored data.
-   * If this is provided, the value will be parsed using this function.
-   * If this is not provided, the value will be parsed using the `schema`.
-   */
-  readonly tryParse: (value: unknown) => LocalStorageData[K] | null
-  readonly schema?: never
-}
-
-/**
- * A {@link LocalStorageKeyMetadata} with a `schema`.
- */
-interface LocalStorageKeyMetadataWithSchema<K extends LocalStorageKey> {
+export interface LocalStorageKeyMetadata<K extends LocalStorageKey> {
   readonly isUserSpecific?: boolean
   /**
    * The Zod schema to validate the value.
@@ -39,16 +18,36 @@ interface LocalStorageKeyMetadataWithSchema<K extends LocalStorageKey> {
    * If this is not provided, the value will be parsed using the `tryParse` function.
    */
   readonly schema: z.ZodType<LocalStorageData[K]>
-  readonly tryParse?: never
 }
 
+// ========================
+// === LocalStorageData ===
+// ========================
+
 /** The data that can be stored in a {@link LocalStorage}.
  * Declaration merge into this interface to add a new key. */
 export interface LocalStorageData {}
 
+// =======================
+// === LocalStorageKey ===
+// =======================
+
 /** All possible keys of a {@link LocalStorage}. */
 type LocalStorageKey = keyof LocalStorageData
 
+// =================================
+// === LocalStorageMutateOptions ===
+// =================================
+
+/** Options for methods that mutate `localStorage` state (set, delete, and save). */
+export interface LocalStorageMutateOptions {
+  readonly triggerRerender?: boolean
+}
+
+// ====================
+// === LocalStorage ===
+// ====================
+
 /** A LocalStorage data manager. */
 export default class LocalStorage {
   // This is UNSAFE. It is assumed that `LocalStorage.register` is always called
@@ -68,10 +67,7 @@ export default class LocalStorage {
           // This is SAFE, as it is guarded by the `key in savedValues` check.
           // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, no-restricted-syntax, @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment
           const savedValue = (savedValues as any)[key]
-          const value =
-            metadata.schema ?
-              metadata.schema.safeParse(savedValue).data
-            : metadata.tryParse(savedValue)
+          const value = metadata.schema.safeParse(savedValue).data
           if (value != null) {
             newValues[key] = value
           }
@@ -95,18 +91,22 @@ export default class LocalStorage {
   }
 
   /** Write an entry to the stored data, and save. */
-  set<K extends LocalStorageKey>(key: K, value: LocalStorageData[K]) {
+  set<K extends LocalStorageKey>(
+    key: K,
+    value: LocalStorageData[K],
+    options?: LocalStorageMutateOptions,
+  ) {
     this.values[key] = value
-    this.save()
+    this.save(options)
   }
 
   /** Delete an entry from the stored data, and save. */
-  delete<K extends LocalStorageKey>(key: K) {
+  delete<K extends LocalStorageKey>(key: K, options?: LocalStorageMutateOptions) {
     const oldValue = this.values[key]
     // The key being deleted is one of a statically known set of keys.
     // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
     delete this.values[key]
-    this.save()
+    this.save(options)
     return oldValue
   }
 
@@ -120,8 +120,11 @@ export default class LocalStorage {
   }
 
   /** Save the current value of the stored data.. */
-  protected save() {
+  protected save(options: LocalStorageMutateOptions = {}) {
+    const { triggerRerender = false } = options
     localStorage.setItem(this.localStorageKey, JSON.stringify(this.values))
-    this.triggerRerender()
+    if (triggerRerender) {
+      this.triggerRerender()
+    }
   }
 }

From 8de4b8c9a580cf2e5887538163e4bedd17e014ea Mon Sep 17 00:00:00 2001
From: Jaroslav Tulach <jaroslav.tulach@enso.org>
Date: Fri, 9 Aug 2024 08:39:31 +0000
Subject: [PATCH 06/23] Appending warning to DataflowError is noop (#10765)

---
 .../enso/interpreter/test/WarningsTest.java   | 32 +++++++++++++++++--
 .../runtime/warning/AppendWarningNode.java    | 26 +++++++++++----
 .../interpreter/runtime/warning/Warning.java  |  2 +-
 3 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/WarningsTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/WarningsTest.java
index fd0138607c64..1e2e1c29d1d0 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/WarningsTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/WarningsTest.java
@@ -3,9 +3,11 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import org.enso.common.LanguageInfo;
 import org.enso.common.MethodNames;
 import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.interpreter.runtime.warning.AppendWarningNode;
@@ -59,8 +61,10 @@ public void doubleWithWarningsWrap() {
           var warn2 = Warning.create(ensoContext, "w2", this);
           var value = 42L;
 
-          var with1 = AppendWarningNode.getUncached().executeAppend(null, value, warn1);
-          var with2 = AppendWarningNode.getUncached().executeAppend(null, with1, warn2);
+          var with1 =
+              (WithWarnings) AppendWarningNode.getUncached().executeAppend(null, value, warn1);
+          var with2 =
+              (WithWarnings) AppendWarningNode.getUncached().executeAppend(null, with1, warn2);
 
           assertEquals(value, with1.getValue());
           assertEquals(value, with2.getValue());
@@ -73,7 +77,7 @@ public void doubleWithWarningsWrap() {
   @Test
   public void wrapAndUnwrap() {
     var value = 42;
-    WithWarnings without;
+    Object without;
     try {
       without = AppendWarningNode.getUncached().executeAppend(null, 42, new Warning[0]);
     } catch (AssertionError e) {
@@ -154,4 +158,26 @@ private void assertWarningsForAType(Value v) {
       }
     }
   }
+
+  @Test
+  public void warningOnAnError() throws Exception {
+    var code =
+        """
+    from Standard.Base import Integer, Warning, Error
+    import Standard.Base.Errors.Illegal_Argument.Illegal_Argument
+    from Standard.Base.Errors.Common import Out_Of_Range
+
+    err_warn -> Integer ! Illegal_Argument =
+        v = Warning.attach (Out_Of_Range.Error "qewr") 12
+        case v of
+            _ : Integer -> Error.throw (Illegal_Argument.Error "asdf")
+    """;
+
+    var module = ctx.eval(LanguageInfo.ID, code);
+    var errorWithWarning = module.invokeMember(MethodNames.Module.EVAL_EXPRESSION, "err_warn");
+    assertFalse("Something is returned", errorWithWarning.isNull());
+    assertTrue("But it represents an exception object", errorWithWarning.isException());
+    assertEquals(
+        "Standard.Base.Error.Error", errorWithWarning.getMetaObject().getMetaQualifiedName());
+  }
 }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/AppendWarningNode.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/AppendWarningNode.java
index dc4df5749bc7..f9c61e858fb9 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/AppendWarningNode.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/AppendWarningNode.java
@@ -12,12 +12,14 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 import org.enso.interpreter.runtime.EnsoContext;
+import org.enso.interpreter.runtime.data.EnsoObject;
 import org.enso.interpreter.runtime.data.hash.EnsoHashMap;
 import org.enso.interpreter.runtime.data.hash.HashMapInsertAllNode;
 import org.enso.interpreter.runtime.data.hash.HashMapInsertNode;
 import org.enso.interpreter.runtime.data.hash.HashMapSizeNode;
 import org.enso.interpreter.runtime.data.vector.ArrayLikeAtNode;
 import org.enso.interpreter.runtime.data.vector.ArrayLikeLengthNode;
+import org.enso.interpreter.runtime.error.DataflowError;
 
 @GenerateUncached
 public abstract class AppendWarningNode extends Node {
@@ -38,9 +40,9 @@ public static AppendWarningNode getUncached() {
    *     It is expected that all the elements in the container are of {@link Warning} class.
    * @return A wrapped object with warnings
    */
-  public abstract WithWarnings executeAppend(VirtualFrame frame, Object object, Object warnings);
+  public abstract EnsoObject executeAppend(VirtualFrame frame, Object object, Object warnings);
 
-  @Specialization
+  @Specialization(guards = "!isError(object)")
   WithWarnings doSingleWarning(
       VirtualFrame frame,
       Object object,
@@ -70,7 +72,7 @@ WithWarnings doSingleWarning(
     return new WithWarnings(value, warnsLimit, isLimitReached, warnsMap);
   }
 
-  @Specialization
+  @Specialization(guards = "!isError(object)")
   WithWarnings doMultipleWarningsArray(
       VirtualFrame frame,
       Object object,
@@ -106,7 +108,7 @@ WithWarnings doMultipleWarningsArray(
    * This specialization should be the most frequent - just wrapping the given {@code object} with
    * warnings hash map
    */
-  @Specialization(guards = {"!isWithWarns(object)"})
+  @Specialization(guards = {"!isError(object)", "!isWithWarns(object)"})
   WithWarnings doObjectMultipleWarningsHashMap(
       VirtualFrame frame,
       Object object,
@@ -138,7 +140,8 @@ WithWarnings doWithWarnMultipleWarningsHashMap(
     return new WithWarnings(withWarnings.value, withWarnings.maxWarnings, isLimitReached, warnsMap);
   }
 
-  @Specialization(guards = {"interop.hasArrayElements(warnings)", "!isWarnArray(warnings)"})
+  @Specialization(
+      guards = {"interop.hasArrayElements(warnings)", "!isError(object)", "!isWarnArray(warnings)"})
   WithWarnings doMultipleWarningsInterop(
       VirtualFrame frame,
       Object object,
@@ -171,6 +174,11 @@ WithWarnings doMultipleWarningsInterop(
     return new WithWarnings(value, warnsLimit, isLimitReached, resWarningMap);
   }
 
+  @Specialization(guards = "isError(object)")
+  EnsoObject dontAnnotateError(Object object, Object ignoreWarnings) {
+    return (EnsoObject) object;
+  }
+
   /** Inserts all {@code warnings} to the {@code initialWarningMap}. */
   private EnsoHashMap insertToWarningMap(
       VirtualFrame frame,
@@ -199,11 +207,15 @@ private EnsoHashMap insertToWarningMap(
     return resWarningMap;
   }
 
-  protected static boolean isWarnArray(Object obj) {
+  static boolean isWarnArray(Object obj) {
     return obj instanceof Warning[];
   }
 
-  protected static boolean isWithWarns(Object obj) {
+  static boolean isWithWarns(Object obj) {
     return obj instanceof WithWarnings;
   }
+
+  static boolean isError(Object obj) {
+    return obj instanceof DataflowError;
+  }
 }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/Warning.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/Warning.java
index 2c94a82dac70..84c2aa729ad3 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/Warning.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/warning/Warning.java
@@ -57,7 +57,7 @@ public static Warning create(EnsoContext ctx, Object payload, Object origin) {
       description = "Attaches the given warning to the value.",
       autoRegister = false)
   @Builtin.Specialize
-  public static WithWarnings attach(
+  public static EnsoObject attach(
       EnsoContext ctx,
       Object value,
       Object warning,

From 3581fd8e21cba7927de83c71b1ae79aafd2a01b5 Mon Sep 17 00:00:00 2001
From: AdRiley <riley.ad@gmail.com>
Date: Fri, 9 Aug 2024 11:06:16 +0100
Subject: [PATCH 07/23] Make sqlserver temp tables work (#10781)

* Temp table support

* Fix

* Add query

* Clean up

* Clean up

* Fix

* Code review changes

* Added comment

* Code review changes

* Add execute
---
 .../Redshift/Internal/Redshift_Dialect.enso   |  7 +++---
 .../0.0.0-dev/src/Connection/Connection.enso  | 18 +++++++++++++++
 .../Database/0.0.0-dev/src/Dialect.enso       | 16 ++++++++++---
 .../src/Internal/Base_Generator.enso          |  3 ++-
 .../src/Internal/JDBC_Connection.enso         | 23 +++++++++++++++++++
 .../Postgres/Postgres_Connection.enso         | 16 +++++++++++++
 .../Internal/Postgres/Postgres_Dialect.enso   |  7 +++---
 .../Internal/SQLite/SQLite_Connection.enso    | 16 +++++++++++++
 .../src/Internal/SQLite/SQLite_Dialect.enso   |  7 +++---
 .../Upload/Operations/Internal_Core.enso      | 20 +++++++++++++---
 .../src/Internal/SQLServer_Connection.enso    | 16 +++++++++++++
 .../src/Internal/SQLServer_Dialect.enso       |  7 +++---
 .../src/Internal/Snowflake_Connection.enso    | 16 +++++++++++++
 .../src/Internal/Snowflake_Dialect.enso       |  7 +++---
 test/Microsoft_Tests/README.md                | 10 +++++---
 test/Microsoft_Tests/src/SQLServer_Spec.enso  | 12 +++++-----
 16 files changed, 170 insertions(+), 31 deletions(-)

diff --git a/distribution/lib/Standard/AWS/0.0.0-dev/src/Database/Redshift/Internal/Redshift_Dialect.enso b/distribution/lib/Standard/AWS/0.0.0-dev/src/Database/Redshift/Internal/Redshift_Dialect.enso
index 30239ef32536..da342cdb6819 100644
--- a/distribution/lib/Standard/AWS/0.0.0-dev/src/Database/Redshift/Internal/Redshift_Dialect.enso
+++ b/distribution/lib/Standard/AWS/0.0.0-dev/src/Database/Redshift/Internal/Redshift_Dialect.enso
@@ -26,6 +26,7 @@ import Standard.Database.SQL.SQL_Builder
 import Standard.Database.SQL_Statement.SQL_Statement
 import Standard.Database.SQL_Type.SQL_Type
 from Standard.Database.Errors import SQL_Error, Unsupported_Database_Operation
+from Standard.Database.Dialect import Temp_Table_Style
 
 import project.Database.Redshift.Internal.Redshift_Error_Mapper.Redshift_Error_Mapper
 
@@ -146,9 +147,9 @@ type Redshift_Dialect
     supports_float_round_decimal_places self = False
 
     ## PRIVATE
-       Specifies whether the Database supports CREATE TEMPORARY TABLE syntax.
-    suppports_temporary_table_syntax : Boolean
-    suppports_temporary_table_syntax self = True
+       Specifies how the database creates temp tables.
+    temp_table_style : Temp_Table_Style
+    temp_table_style self = Temp_Table_Style.Temporary_Table
 
     ## PRIVATE
     adapt_unified_column : Internal_Column -> Value_Type -> (SQL_Expression -> SQL_Type_Reference) -> Internal_Column
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Connection/Connection.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Connection/Connection.enso
index 2a3ce67e0f07..5f3c952cae2e 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Connection/Connection.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Connection/Connection.enso
@@ -385,6 +385,24 @@ type Connection
                 SQL_Warning_Helper.process_warnings stmt <|
                     result
 
+    ## PRIVATE
+       ADVANCED
+
+       Executes a raw query. If the query was inserting, updating or
+       deleting rows, the number of affected rows is returned; otherwise it
+       returns 0 for other types of queries (like creating or altering tables).
+
+       Arguments:
+       - query: either raw SQL code as Text or an instance of SQL_Statement
+         representing the query to execute.
+    execute : Text | SQL_Statement -> Integer
+    execute self query =
+        Execution_Context.Output.if_enabled disabled_message="Executing update queries is forbidden as the Output context is disabled." panic=False <|
+            result = self.jdbc_connection.execute query
+            stmt = result.second
+            check_statement_is_allowed self stmt
+            stmt.getUpdateCount
+
     ## PRIVATE
        Drops a table.
 
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Dialect.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Dialect.enso
index 6681606fe216..89ccd032e54d 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Dialect.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Dialect.enso
@@ -164,9 +164,9 @@ type Dialect
         Unimplemented.throw "This is an interface only."
 
     ## PRIVATE
-       Specifies whether the Database supports CREATE TEMPORARY TABLE syntax.
-    suppports_temporary_table_syntax : Boolean
-    suppports_temporary_table_syntax self =
+       Specifies how the database creates temp tables.
+    temp_table_style : Temp_Table_Style
+    temp_table_style self =
          Unimplemented.throw "This is an interface only."
 
     ## PRIVATE
@@ -293,3 +293,13 @@ default_fetch_primary_key connection table_name =
         selected = keys_table.select_columns ["COLUMN_NAME", "KEY_SEQ"] case_sensitivity=Case_Sensitivity.Insensitive reorder=True
         key_column_names = selected.sort 1 . at 0 . to_vector
         if key_column_names.is_empty then Nothing else key_column_names
+
+## PRIVATE
+type Temp_Table_Style
+      ## PRIVATE
+         The temporary table is created using a create table statement.
+      Temporary_Table
+      
+      ## PRIVATE
+         The temporary table is created using a # table name.
+      Hash_Prefix
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Base_Generator.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Base_Generator.enso
index b9c07aeeaea6..8744bdfd8b5a 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Base_Generator.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Base_Generator.enso
@@ -12,6 +12,7 @@ import project.Internal.IR.SQL_Expression.SQL_Expression
 import project.Internal.IR.SQL_Join_Kind.SQL_Join_Kind
 import project.SQL.SQL_Builder
 from project.Errors import Unsupported_Database_Operation
+from project.Dialect import Temp_Table_Style
 from project.Internal.IR.Operation_Metadata import Row_Number_Metadata
 
 type Dialect_Operations
@@ -587,7 +588,7 @@ generate_create_table dialect name columns primary_key temporary =
     column_definitions = columns.map (generate_column_description dialect)
     modifiers = if primary_key.is_nothing then [] else
         [SQL_Builder.code ", PRIMARY KEY (" ++ SQL_Builder.join ", " (primary_key.map dialect.wrap_identifier) ++ ")"]
-    table_type = if temporary && dialect.suppports_temporary_table_syntax then "TEMPORARY TABLE" else "TABLE"
+    table_type = if temporary && dialect.temp_table_style == Temp_Table_Style.Temporary_Table then "TEMPORARY TABLE" else "TABLE"
     create_prefix = SQL_Builder.code ("CREATE "+table_type+" ") ++ dialect.wrap_identifier name
     create_body = (SQL_Builder.join ", " column_definitions) ++ (SQL_Builder.join "" modifiers)
     create_prefix ++ " (" ++ create_body ++ ")"
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/JDBC_Connection.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/JDBC_Connection.enso
index 953ac0ff5c5c..f97548ba4527 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/JDBC_Connection.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/JDBC_Connection.enso
@@ -117,6 +117,29 @@ type JDBC_Connection
                 compiled = query.prepare
                 go compiled.first compiled.second
 
+    ## PRIVATE
+       Executes the provided SQL.
+       Typically this shouldn't be used and with_prepared_statement should be preferred.
+       It is needed for SQLServer temp table creation where we need to execute a raw SQL statement
+       outside of a stored procedure.
+    execute : Text | SQL_Statement -> Any
+    execute self query:(Text | SQL_Statement) = self.synchronized <| profile_sql_if_enabled self query.to_text <|
+        compiled_query = case query of
+            _ : Text -> query
+            SQL_Statement.Value _ -> query.prepare.first
+        self.with_connection java_connection->
+            stmt = java_connection.createStatement
+            handle_illegal_state caught_panic =
+                Error.throw (Illegal_Argument.Error caught_panic.payload.message)
+            handle_any caught_panic =
+                stmt.close
+                Panic.throw caught_panic
+            result = Panic.catch Illegal_State handler=handle_illegal_state <|
+                Panic.catch Any handler=handle_any <|
+                    stmt.execute compiled_query
+            result.if_not_error <|
+                [result, stmt]
+
     ## PRIVATE
        Given a prepared statement, gets the column names and types for the
        result set.
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Connection.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Connection.enso
index 95cf90f9e588..080d4170d883 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Connection.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Connection.enso
@@ -245,6 +245,22 @@ type Postgres_Connection
     execute_update self query =
         self.connection.execute_update query
 
+    ## PRIVATE
+       ADVANCED
+       GROUP Standard.Base.Output
+       ICON data_output
+
+       Executes a raw query. If the query was inserting, updating or
+       deleting rows, the number of affected rows is returned; otherwise it
+       returns 0 for other types of queries (like creating or altering tables).
+
+       Arguments:
+       - query: either raw SQL code as Text or an instance of SQL_Statement
+         representing the query to execute.
+    execute : Text | SQL_Statement -> Integer
+    execute self query =
+        self.connection.execute query
+
     ## PRIVATE
        Access the dialect.
     dialect self = self.connection.dialect
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Dialect.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Dialect.enso
index c20a9a639d71..2e55a876b5aa 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Dialect.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Dialect.enso
@@ -38,6 +38,7 @@ import project.SQL.SQL_Fragment
 import project.SQL_Statement.SQL_Statement
 import project.SQL_Type.SQL_Type
 from project.Errors import SQL_Error, Unsupported_Database_Operation
+from project.Dialect import Temp_Table_Style
 from project.Internal.IR.Operation_Metadata import Date_Period_Metadata
 
 polyglot java import java.sql.Types
@@ -183,9 +184,9 @@ type Postgres_Dialect
     supports_float_round_decimal_places self = False
 
     ## PRIVATE
-       Specifies whether the Database supports CREATE TEMPORARY TABLE syntax.
-    suppports_temporary_table_syntax : Boolean
-    suppports_temporary_table_syntax self = True
+       Specifies how the database creates temp tables.
+    temp_table_style : Temp_Table_Style
+    temp_table_style self = Temp_Table_Style.Temporary_Table
 
     ## PRIVATE
        There is a bug in Postgres type inference, where if we unify two
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Connection.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Connection.enso
index b02147dd7fd8..a6d7fececc74 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Connection.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Connection.enso
@@ -231,6 +231,22 @@ type SQLite_Connection
     execute_update self query =
         self.connection.execute_update query
 
+    ## PRIVATE
+       ADVANCED
+       GROUP Standard.Base.Output
+       ICON data_output
+
+       Executes a raw query. If the query was inserting, updating or
+       deleting rows, the number of affected rows is returned; otherwise it
+       returns 0 for other types of queries (like creating or altering tables).
+
+       Arguments:
+       - query: either raw SQL code as Text or an instance of SQL_Statement
+         representing the query to execute.
+    execute : Text | SQL_Statement -> Integer
+    execute self query =
+        self.connection.execute query
+
     ## PRIVATE
        Access the dialect.
     dialect self = self.connection.dialect
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Dialect.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Dialect.enso
index c08f58490727..c2bcd7e332f4 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Dialect.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Dialect.enso
@@ -32,6 +32,7 @@ import project.SQL.SQL_Builder
 import project.SQL_Statement.SQL_Statement
 import project.SQL_Type.SQL_Type
 from project.Errors import SQL_Error, Unsupported_Database_Operation
+from project.Dialect import Temp_Table_Style
 
 ## PRIVATE
 
@@ -193,9 +194,9 @@ type SQLite_Dialect
     supports_float_round_decimal_places self = True
 
     ## PRIVATE
-       Specifies whether the Database supports CREATE TEMPORARY TABLE syntax.
-    suppports_temporary_table_syntax : Boolean
-    suppports_temporary_table_syntax self = True
+       Specifies how the database creates temp tables.
+    temp_table_style : Temp_Table_Style
+    temp_table_style self = Temp_Table_Style.Temporary_Table
 
     ## PRIVATE
        SQLite allows mixed type columns, but we want our columns to be uniform.
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Upload/Operations/Internal_Core.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Upload/Operations/Internal_Core.enso
index e115767c9759..1a04b916ff45 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Upload/Operations/Internal_Core.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Upload/Operations/Internal_Core.enso
@@ -14,6 +14,7 @@ import project.Internal.In_Transaction.In_Transaction
 import project.Internal.IR.Query.Query
 import project.SQL_Query.SQL_Query
 from project.Errors import SQL_Error, Table_Already_Exists, Unsupported_Database_Operation
+from project.Dialect import Temp_Table_Style
 from project.Internal.Upload.Helpers.Argument_Checks import resolve_primary_key
 from project.Internal.Upload.Helpers.Constants import default_batch_size
 from project.Internal.Upload.Helpers.Error_Helpers import handle_upload_errors, internal_translate_known_upload_errors
@@ -29,7 +30,7 @@ internal_create_table_structure connection table_name structure primary_key temp
     validate_structure connection.base_connection.column_naming_helper aligned_structure <|
         create_table_statement = prepare_create_table_statement connection table_name aligned_structure resolved_primary_key temporary on_problems
         update_result = create_table_statement.if_not_error <|
-            connection.execute_update create_table_statement
+            connection.execute create_table_statement
         final_result = update_result.if_not_error table_name
         final_result.catch SQL_Error sql_error->
             if connection.dialect.get_error_mapper.is_table_already_exists_error sql_error then Error.throw (Table_Already_Exists.Error table_name) else final_result
@@ -62,11 +63,12 @@ type Table_Upload_Operation
    - row_limit: if set, only the first `row_limit` rows will be uploaded.
 internal_upload_table : DB_Table | Table -> Connection -> Text -> Nothing | Vector Text -> Boolean -> Boolean -> Nothing | Vector Column_Description ->  Problem_Behavior -> Integer | Nothing -> Table_Upload_Operation
 internal_upload_table source_table connection (table_name : Text) (primary_key : Nothing | Vector Text) (temporary : Boolean) (remove_after_transaction : Boolean = False) structure_hint=Nothing (on_problems:Problem_Behavior=..Report_Error) (row_limit : Integer | Nothing = Nothing) -> Table_Upload_Operation =
+    resolved_table_name = resolve_temp_table_name connection temporary table_name
     case source_table of
         _ : Table ->
-            internal_upload_in_memory_table source_table connection table_name primary_key temporary remove_after_transaction structure_hint on_problems row_limit
+            internal_upload_in_memory_table source_table connection resolved_table_name primary_key temporary remove_after_transaction structure_hint on_problems row_limit
         _ : DB_Table ->
-            internal_upload_database_table source_table connection table_name primary_key temporary remove_after_transaction structure_hint on_problems row_limit
+            internal_upload_database_table source_table connection resolved_table_name primary_key temporary remove_after_transaction structure_hint on_problems row_limit
         _ ->
             Panic.throw <| Illegal_Argument.Error ("Unsupported table type: " + Meta.get_qualified_type_name source_table)
 
@@ -128,3 +130,15 @@ internal_upload_database_table (source_table : DB_Table) connection table_name p
 check_outside_transaction =
     if In_Transaction.is_in_transaction then
         Panic.throw (Illegal_State.Error "Preparing Table_Upload_Operation should itself be called outside of transaction. This is a bug in the Database library.")
+
+## PRIVATE
+resolve_temp_table_name connection temporary:Boolean table_name:Text -> Text =
+    case temporary of
+        False -> case table_name.starts_with "#" of
+            True -> Error.throw <| Illegal_Argument.Error ("Table name cannot start with '#': " + table_name)
+            False -> table_name
+        True -> case connection.dialect.temp_table_style of
+            Temp_Table_Style.Temporary_Table -> table_name
+            Temp_Table_Style.Hash_Prefix -> case table_name.starts_with "#" of
+                True -> table_name
+                False -> "#" + table_name
diff --git a/distribution/lib/Standard/Microsoft/0.0.0-dev/src/Internal/SQLServer_Connection.enso b/distribution/lib/Standard/Microsoft/0.0.0-dev/src/Internal/SQLServer_Connection.enso
index 454567760ad0..5a438fc03140 100644
--- a/distribution/lib/Standard/Microsoft/0.0.0-dev/src/Internal/SQLServer_Connection.enso
+++ b/distribution/lib/Standard/Microsoft/0.0.0-dev/src/Internal/SQLServer_Connection.enso
@@ -238,6 +238,22 @@ type SQLServer_Connection
     execute_update self query =
         self.connection.execute_update query
 
+    ## PRIVATE
+       ADVANCED
+       GROUP Standard.Base.Output
+       ICON data_output
+
+       Executes a raw query. If the query was inserting, updating or
+       deleting rows, the number of affected rows is returned; otherwise it
+       returns 0 for other types of queries (like creating or altering tables).
+
+       Arguments:
+       - query: either raw SQL code as Text or an instance of SQL_Statement
+         representing the query to execute.
+    execute : Text | SQL_Statement -> Integer
+    execute self query =
+        self.connection.execute query
+
     ## PRIVATE
        Access the dialect.
     dialect self = self.connection.dialect
diff --git a/distribution/lib/Standard/Microsoft/0.0.0-dev/src/Internal/SQLServer_Dialect.enso b/distribution/lib/Standard/Microsoft/0.0.0-dev/src/Internal/SQLServer_Dialect.enso
index 77ecaaa55cb4..001bc818d683 100644
--- a/distribution/lib/Standard/Microsoft/0.0.0-dev/src/Internal/SQLServer_Dialect.enso
+++ b/distribution/lib/Standard/Microsoft/0.0.0-dev/src/Internal/SQLServer_Dialect.enso
@@ -39,6 +39,7 @@ import Standard.Database.SQL.SQL_Fragment
 import Standard.Database.SQL_Statement.SQL_Statement
 import Standard.Database.SQL_Type.SQL_Type
 from Standard.Database.Errors import SQL_Error, Unsupported_Database_Operation
+from Standard.Database.Dialect import Temp_Table_Style
 from Standard.Database.Internal.IR.Operation_Metadata import Date_Period_Metadata
 from Standard.Database.Internal.Statement_Setter import fill_hole_default
 
@@ -195,9 +196,9 @@ type SQLSever_Dialect
     supports_float_round_decimal_places self = True
 
     ## PRIVATE
-       Specifies whether the Database supports CREATE TEMPORARY TABLE syntax.
-    suppports_temporary_table_syntax : Boolean
-    suppports_temporary_table_syntax self = False
+       Specifies how the database creates temp tables.
+    temp_table_style : Temp_Table_Style
+    temp_table_style self = Temp_Table_Style.Hash_Prefix
     
     ## PRIVATE
     adapt_unified_column : Internal_Column -> Value_Type -> (SQL_Expression -> SQL_Type_Reference) -> Internal_Column
diff --git a/distribution/lib/Standard/Snowflake/0.0.0-dev/src/Internal/Snowflake_Connection.enso b/distribution/lib/Standard/Snowflake/0.0.0-dev/src/Internal/Snowflake_Connection.enso
index 38e067a7e606..083a77148d89 100644
--- a/distribution/lib/Standard/Snowflake/0.0.0-dev/src/Internal/Snowflake_Connection.enso
+++ b/distribution/lib/Standard/Snowflake/0.0.0-dev/src/Internal/Snowflake_Connection.enso
@@ -265,6 +265,22 @@ type Snowflake_Connection
     execute_update self query =
         self.connection.execute_update query
 
+    ## PRIVATE
+       ADVANCED
+       GROUP Standard.Base.Output
+       ICON data_output
+
+       Executes a raw query. If the query was inserting, updating or
+       deleting rows, the number of affected rows is returned; otherwise it
+       returns 0 for other types of queries (like creating or altering tables).
+
+       Arguments:
+       - query: either raw SQL code as Text or an instance of SQL_Statement
+         representing the query to execute.
+    execute : Text | SQL_Statement -> Integer
+    execute self query =
+        self.connection.execute query
+
     ## PRIVATE
        Access the dialect.
     dialect self = self.connection.dialect
diff --git a/distribution/lib/Standard/Snowflake/0.0.0-dev/src/Internal/Snowflake_Dialect.enso b/distribution/lib/Standard/Snowflake/0.0.0-dev/src/Internal/Snowflake_Dialect.enso
index a19f7d9acfde..c03fbb884dff 100644
--- a/distribution/lib/Standard/Snowflake/0.0.0-dev/src/Internal/Snowflake_Dialect.enso
+++ b/distribution/lib/Standard/Snowflake/0.0.0-dev/src/Internal/Snowflake_Dialect.enso
@@ -40,6 +40,7 @@ import Standard.Database.SQL.SQL_Fragment
 import Standard.Database.SQL_Statement.SQL_Statement
 import Standard.Database.SQL_Type.SQL_Type
 from Standard.Database.Errors import SQL_Error, Unsupported_Database_Operation
+from Standard.Database.Dialect import Temp_Table_Style
 from Standard.Database.Internal.IR.Operation_Metadata import Date_Period_Metadata
 from Standard.Database.Internal.Statement_Setter import fill_hole_default
 
@@ -206,9 +207,9 @@ type Snowflake_Dialect
     supports_float_round_decimal_places self = True
 
     ## PRIVATE
-       Specifies whether the Database supports CREATE TEMPORARY TABLE syntax.
-    suppports_temporary_table_syntax : Boolean
-    suppports_temporary_table_syntax self = True
+       Specifies how the database creates temp tables.
+    temp_table_style : Temp_Table_Style
+    temp_table_style self = Temp_Table_Style.Temporary_Table
 
     ## PRIVATE
     adapt_unified_column : Internal_Column -> Value_Type -> (SQL_Expression -> SQL_Type_Reference) -> Internal_Column
diff --git a/test/Microsoft_Tests/README.md b/test/Microsoft_Tests/README.md
index 58b22f5ed12f..6fd823f01fd9 100644
--- a/test/Microsoft_Tests/README.md
+++ b/test/Microsoft_Tests/README.md
@@ -17,9 +17,13 @@ Please set the following environment variables:
 
 The easiest way to test locally is to use a docker image
 
-```docker run -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=<YourStrong@Passw0rd>" -p 1433:1433 --name sql1 --hostname sql1 -d mcr.microsoft.com/mssql/server:2022-latest
-
-Set ENSO_SQLSERVER_DATABASE to tempdb and the defaults will work for everything else. (The user is sa with the above password)
+```shell
+docker run -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=<YourStrong@Passw0rd>" -p 1433:1433 --name sql1 --hostname sql1 -d mcr.microsoft.com/mssql/server:2022-latest
+```
 
+Set ENSO_SQLSERVER_DATABASE to tempdb and the defaults will work for everything
+else. (The user is sa with the above password)
 
+```powershell
+$env:ENSO_SQLSERVER_DATABASE='tempdb'
 ```
diff --git a/test/Microsoft_Tests/src/SQLServer_Spec.enso b/test/Microsoft_Tests/src/SQLServer_Spec.enso
index 9224b6bd82b0..7582aff186cc 100644
--- a/test/Microsoft_Tests/src/SQLServer_Spec.enso
+++ b/test/Microsoft_Tests/src/SQLServer_Spec.enso
@@ -40,8 +40,8 @@ type SQLServer_Info_Data
 
     setup default_connection = SQLServer_Info_Data.Value <|
         connection = default_connection
-        tinfo = Name_Generator.random_name "Tinfo"
-        connection.execute_update 'Create Table "'+tinfo+'" ("strs" VARCHAR(255), "ints" INTEGER, "bools" BIT, "reals" REAL, "floats" FLOAT, "tinyints" TINYINT, "smallints" SMALLINT, "bigints" BIGINT, "times" TIME, "dates" DATE, "datetimes" DATETIME, "smalldatetimes" SMALLDATETIME, "datetime2s" DATETIME2, "datetimeoffsets" DATETIMEOFFSET)'
+        tinfo = "#" + (Name_Generator.random_name "Tinfo")
+        connection.execute 'Create Table "'+tinfo+'" ("strs" VARCHAR(255), "ints" INTEGER, "bools" BIT, "reals" REAL, "floats" FLOAT, "tinyints" TINYINT, "smallints" SMALLINT, "bigints" BIGINT, "times" TIME, "dates" DATE, "datetimes" DATETIME, "smalldatetimes" SMALLDATETIME, "datetime2s" DATETIME2, "datetimeoffsets" DATETIMEOFFSET)'
         t = connection.query (SQL_Query.Table_Name tinfo)
         row1 = ["a", Nothing, False, 1.2, 1.2, 0, 0, 0, Time_Of_Day.new 12 12 12 1 1 1, Date.new 2021 1 1, Date_Time.new 2021 1 1 12 12 12 500 1 1, Date_Time.new 2021 1 1 12 12 12 1 1 1, Date_Time.new 2021 1 1 12 12 12 1 1 1, Date_Time.new 2021 1 1 12 12 12 1 1 1]
         row2 = ["abc", Nothing, Nothing, 1.3, 1.3, 255, 32767, 9223372036854775807, Time_Of_Day.new 7 12 12 1 1 1, Date.new 1999 1 1, Date_Time.new 1999 1 1 12 12 12 1 1 1, Date_Time.new 1999 1 1 12 12 12 1 1 1, Date_Time.new 1999 1 1 12 12 12 1 1 1, Date_Time.new 1999 1 1 12 12 12 1 1 1]
@@ -56,7 +56,7 @@ type SQLServer_Info_Data
         [connection, tinfo, t]
 
     teardown self =
-        self.connection.execute_update 'DROP TABLE "'+self.tinfo+'"'
+        self.connection.execute 'DROP TABLE "'+self.tinfo+'"'
         self.connection.close
 
 get_configured_connection_details =
@@ -127,9 +127,9 @@ add_specs suite_builder =
                     in_memory.at "txt-fixed" . value_type . should_equal (Value_Type.Char size=3 variable_length=False)
 
                 group_builder.specify "test datetime2 precision round trip" <|
-                    name = Name_Generator.random_name "datetime2-test"
+                    name = "#" + (Name_Generator.random_name "datetime2-test")
                     Problems.assume_no_problems <|
-                        data.connection.execute_update 'CREATE TABLE "'+name+'" ("dt2" DATETIME2)'
+                        data.connection.execute 'CREATE TABLE "'+name+'" ("dt2" DATETIME2)'
                     t = data.connection.query (SQL_Query.Table_Name name)
                     row1 = [Date_Time.new 2021 1 1 12 13 14 500 1 1]
                     row2 = [Date_Time.new 2021 1 1 9 12 12 987 654 321]
@@ -143,7 +143,7 @@ add_specs suite_builder =
                     expected_table = Table.from_rows ["dt2"] [expected_row1, expected_row2, expected_row3]
                     returned_table = t.read
                     returned_table.should_equal expected_table
-                    data.connection.execute_update 'DROP TABLE "'+name+'"'
+                    data.connection.execute 'DROP TABLE "'+name+'"'
 
 main filter=Nothing =
     suite = Test.build suite_builder->

From 0f5a3a78b19a2a7396c5602d0438490afb862cd1 Mon Sep 17 00:00:00 2001
From: Hubert Plociniczak <hubert.plociniczak@gmail.com>
Date: Fri, 9 Aug 2024 14:38:05 +0200
Subject: [PATCH 08/23] Revert "Import all available libraries in --repl mode
 (#10746)" (#10778)

* Revert "Import all available libraries in --repl mode (#10746)"

This reverts commit 71285e6ff8bd57d94fc5c1ec8feb69e2c6bf1a56.

* trigger build
---
 CHANGELOG.md                                  |  2 -
 .../java/org/enso/common/MethodNames.java     |  1 -
 .../org/enso/polyglot/PolyglotContext.java    | 57 -------------------
 .../org/enso/polyglot/PolyglotContext.scala   | 40 +++++++++++++
 .../scala/org/enso/polyglot/TopScope.scala    |  3 -
 .../src/main/java/org/enso/runner/Main.java   | 15 +++--
 .../org/enso/compiler/PackageRepository.scala |  4 --
 .../runtime/ListLibrariesTest.java            | 52 -----------------
 .../test/instrument/ReplTest.scala            | 20 +++----
 .../runtime/scope/TopLevelScope.java          | 43 ++++++--------
 .../runtime/DefaultPackageRepository.scala    |  4 --
 .../org/enso/test/utils/ProjectUtils.java     |  5 +-
 .../DefaultLibraryProvider.scala              |  5 --
 .../ResolvingLibraryProvider.scala            |  3 -
 14 files changed, 78 insertions(+), 176 deletions(-)
 delete mode 100644 engine/polyglot-api/src/main/java/org/enso/polyglot/PolyglotContext.java
 create mode 100644 engine/polyglot-api/src/main/scala/org/enso/polyglot/PolyglotContext.scala
 delete mode 100644 engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ListLibrariesTest.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32a965890370..6c6c74f663d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,14 +23,12 @@
 - [Space-precedence does not apply to value-level operators][10597]
 - [Must specify `--repl` to enable debug server][10709]
 - [Improved parser error reporting and performance][10734]
-- [Import all available libraries in `--repl` mode][10746]
 
 [10468]: https://github.com/enso-org/enso/pull/10468
 [10535]: https://github.com/enso-org/enso/pull/10535
 [10597]: https://github.com/enso-org/enso/pull/10597
 [10709]: https://github.com/enso-org/enso/pull/10709
 [10734]: https://github.com/enso-org/enso/pull/10734
-[10746]: https://github.com/enso-org/enso/pull/10746
 
 #### Enso IDE
 
diff --git a/engine/common/src/main/java/org/enso/common/MethodNames.java b/engine/common/src/main/java/org/enso/common/MethodNames.java
index a76ef6ccf578..8f3187fc38d4 100644
--- a/engine/common/src/main/java/org/enso/common/MethodNames.java
+++ b/engine/common/src/main/java/org/enso/common/MethodNames.java
@@ -9,7 +9,6 @@ public static class TopScope {
     public static final String REGISTER_MODULE = "register_module";
     public static final String UNREGISTER_MODULE = "unregister_module";
     public static final String COMPILE = "compile";
-    public static final String LOCAL_LIBRARIES = "local_libraries";
   }
 
   public static class Module {
diff --git a/engine/polyglot-api/src/main/java/org/enso/polyglot/PolyglotContext.java b/engine/polyglot-api/src/main/java/org/enso/polyglot/PolyglotContext.java
deleted file mode 100644
index 1ae05343e107..000000000000
--- a/engine/polyglot-api/src/main/java/org/enso/polyglot/PolyglotContext.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.enso.polyglot;
-
-import java.io.File;
-import java.io.IOException;
-import org.enso.common.LanguageInfo;
-import org.graalvm.polyglot.Context;
-import org.graalvm.polyglot.Source;
-
-public record PolyglotContext(Context context) {
-  /**
-   * Evaluates provided code string as a new module.
-   *
-   * @param code the code to evaluate.
-   * @param moduleName the name for the newly parsed module.
-   * @return the module representing evaluated code.
-   */
-  public Module evalModule(String code, String moduleName) {
-    var source = Source.newBuilder(LanguageInfo.ID, code, moduleName).buildLiteral();
-    return new Module(context.eval(source));
-  }
-
-  /**
-   * Evaluates provided code file as a new module.
-   *
-   * @param codeFile the code to evaluate.
-   * @return the module representing evaluated code.
-   */
-  public Module evalModule(File codeFile) throws IOException {
-    var source = Source.newBuilder(LanguageInfo.ID, codeFile).build();
-    return new Module(context.eval(source));
-  }
-
-  /**
-   * Generates and evaluates default repl script for this context.
-   *
-   * @param mainMethodName name of the main method
-   * @return module representing evaluated code
-   */
-  public Module evalReplModule(String mainMethodName) {
-    var replModuleName = "Internal_Repl_Module___";
-    var sb = new StringBuilder();
-    sb.append("import Standard.Base.Runtime.Debug\n");
-    for (var libName : getTopScope().getLibraries()) {
-      sb.append("from ").append(libName).append(" import all\n");
-    }
-    sb.append("\n");
-    sb.append(mainMethodName).append(" = Debug.breakpoint");
-    return evalModule(sb.toString(), replModuleName);
-  }
-
-  /**
-   * @return the top scope of Enso execution context
-   */
-  public TopScope getTopScope() {
-    return new TopScope(context.getBindings(LanguageInfo.ID));
-  }
-}
diff --git a/engine/polyglot-api/src/main/scala/org/enso/polyglot/PolyglotContext.scala b/engine/polyglot-api/src/main/scala/org/enso/polyglot/PolyglotContext.scala
new file mode 100644
index 000000000000..5ea0992e9798
--- /dev/null
+++ b/engine/polyglot-api/src/main/scala/org/enso/polyglot/PolyglotContext.scala
@@ -0,0 +1,40 @@
+package org.enso.polyglot
+import java.io.File
+import org.enso.common.LanguageInfo
+
+import org.graalvm.polyglot.{Context, Source}
+
+/** Exposes language specific aliases for generic polyglot context operations.
+  * @param context the Graal polyglot context to use.
+  */
+class PolyglotContext(val context: Context) {
+
+  /** Evaluates provided code string as a new module.
+    *
+    * @param code the code to evaluate.
+    * @param moduleName the name for the newly parsed module.
+    * @return the module representing evaluated code.
+    */
+  def evalModule(code: String, moduleName: String): Module = {
+    val source = Source
+      .newBuilder(LanguageInfo.ID, code, moduleName)
+      .build()
+    new Module(context.eval(source))
+  }
+
+  /** Evaluates provided code file as a new module.
+    *
+    * @param codeFile the code to evaluate.
+    * @return the module representing evaluated code.
+    */
+  def evalModule(codeFile: File): Module = {
+    val source = Source.newBuilder(LanguageInfo.ID, codeFile).build
+    new Module(context.eval(source))
+  }
+
+  /** @return the top scope of Enso execution context
+    */
+  def getTopScope: TopScope = {
+    new TopScope(context.getBindings(LanguageInfo.ID))
+  }
+}
diff --git a/engine/polyglot-api/src/main/scala/org/enso/polyglot/TopScope.scala b/engine/polyglot-api/src/main/scala/org/enso/polyglot/TopScope.scala
index cee11f5a40e8..3b3150f7376d 100644
--- a/engine/polyglot-api/src/main/scala/org/enso/polyglot/TopScope.scala
+++ b/engine/polyglot-api/src/main/scala/org/enso/polyglot/TopScope.scala
@@ -37,7 +37,4 @@ class TopScope(private val value: Value) {
   def compile(shouldCompileDependencies: Boolean): Unit = {
     value.invokeMember(COMPILE, shouldCompileDependencies)
   }
-
-  def getLibraries(): Array[String] =
-    value.invokeMember(LOCAL_LIBRARIES).as(classOf[Array[String]])
 }
diff --git a/engine/runner/src/main/java/org/enso/runner/Main.java b/engine/runner/src/main/java/org/enso/runner/Main.java
index cb9b51fcc3d4..98864a28c527 100644
--- a/engine/runner/src/main/java/org/enso/runner/Main.java
+++ b/engine/runner/src/main/java/org/enso/runner/Main.java
@@ -818,8 +818,7 @@ private void runPackage(
   }
 
   private void runSingleFile(
-      PolyglotContext context, File file, java.util.List<String> additionalArgs)
-      throws IOException {
+      PolyglotContext context, File file, java.util.List<String> additionalArgs) {
     var mainModule = context.evalModule(file);
     runMain(mainModule, file, additionalArgs, "main");
   }
@@ -894,6 +893,15 @@ private void runRepl(
       boolean enableIrCaches,
       boolean enableStaticAnalysis) {
     var mainMethodName = "internal_repl_entry_point___";
+    var dummySourceToTriggerRepl =
+        """
+         from Standard.Base import all
+         import Standard.Base.Runtime.Debug
+
+         $mainMethodName = Debug.breakpoint
+         """
+            .replace("$mainMethodName", mainMethodName);
+    var replModuleName = "Internal_Repl_Module___";
     var projectRoot = projectPath != null ? projectPath : "";
     var options = Collections.singletonMap(DebugServerInfo.ENABLE_OPTION, "true");
 
@@ -909,8 +917,7 @@ private void runRepl(
                 .disableLinting(true)
                 .enableStaticAnalysis(enableStaticAnalysis)
                 .build());
-
-    var mainModule = context.evalReplModule(mainMethodName);
+    var mainModule = context.evalModule(dummySourceToTriggerRepl, replModuleName);
     runMain(mainModule, null, Collections.emptyList(), mainMethodName);
     throw exitSuccess();
   }
diff --git a/engine/runtime-compiler/src/main/scala/org/enso/compiler/PackageRepository.scala b/engine/runtime-compiler/src/main/scala/org/enso/compiler/PackageRepository.scala
index 4bf271c6c5c8..eff0d52a835d 100644
--- a/engine/runtime-compiler/src/main/scala/org/enso/compiler/PackageRepository.scala
+++ b/engine/runtime-compiler/src/main/scala/org/enso/compiler/PackageRepository.scala
@@ -29,10 +29,6 @@ trait PackageRepository {
     libraryName: LibraryName
   ): Either[PackageRepository.Error, Unit]
 
-  /** Iterates over all installed libraries.
-    */
-  def findAvailableLocalLibraries(): Seq[LibraryName]
-
   /** Checks if the library has already been loaded */
   def isPackageLoaded(libraryName: LibraryName): Boolean
 
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ListLibrariesTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ListLibrariesTest.java
deleted file mode 100644
index c01dfe2b0e7f..000000000000
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ListLibrariesTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.enso.interpreter.runtime;
-
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
-import org.enso.common.LanguageInfo;
-import org.enso.common.MethodNames;
-import org.enso.polyglot.PolyglotContext;
-import org.enso.test.utils.ContextUtils;
-import org.graalvm.polyglot.Context;
-import org.graalvm.polyglot.TypeLiteral;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class ListLibrariesTest {
-  private static Context ctx;
-
-  @BeforeClass
-  public static void initCtx() {
-    ctx = ContextUtils.createDefaultContext();
-  }
-
-  @AfterClass
-  public static void closeCtx() {
-    ctx.close();
-  }
-
-  @Test
-  public void listLibraries() {
-    var b = ctx.getBindings(LanguageInfo.ID);
-    var libs = b.invokeMember(MethodNames.TopScope.LOCAL_LIBRARIES);
-    assertTrue("Array of lib names: " + libs, libs.hasArrayElements());
-    var list = libs.as(new TypeLiteral<List<String>>() {});
-    assertTrue("At least five libs: " + list, list.size() >= 5);
-
-    assertTrue("Base found " + list, list.contains("Standard.Base"));
-    assertTrue("Table found " + list, list.contains("Standard.Table"));
-    assertTrue("DB found " + list, list.contains("Standard.Database"));
-    assertTrue("AWS found " + list, list.contains("Standard.AWS"));
-    assertTrue("Geo found " + list, list.contains("Standard.Geo"));
-  }
-
-  @Test
-  public void evaluateDefaultReplScript() {
-    var pc = new PolyglotContext(ctx);
-    final var fnName = "main_fn_name__";
-    var module = pc.evalReplModule(fnName);
-    var result = module.evalExpression(fnName);
-    assertTrue("Returns Nothing", result.isNull());
-  }
-}
diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/ReplTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/ReplTest.scala
index 7bcc1cda01ee..66227c76a15d 100644
--- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/ReplTest.scala
+++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/ReplTest.scala
@@ -21,16 +21,14 @@ class ReplTest
   ): Unit = {
 
     "initialize properly" in {
-      var counter = 0;
-      setSessionManager(executor => {
-        counter = counter + 1
-        executor.exit()
-      })
-      val mainFn = "my_main_fn__"
-      val replModule =
-        interpreterContext.executionContext.evalReplModule(mainFn)
-      replModule.evalExpression(mainFn)
-      counter shouldEqual 1
+      val code =
+        """
+          |import Standard.Base.Runtime.Debug
+          |
+          |main = Debug.breakpoint
+          |""".stripMargin
+      setSessionManager(executor => executor.exit())
+      eval(code)
     }
 
     "be able to execute arbitrary code in the caller scope" in {
@@ -295,7 +293,7 @@ class ReplTest
       }
       eval(code)
       val errorMsg =
-        "Compile error: The name `undefined` could not be found."
+        "Compile_Error.Error"
       evalResult.left.value.getMessage shouldEqual errorMsg
     }
 
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/scope/TopLevelScope.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/scope/TopLevelScope.java
index 1f5fb816e635..0dd5629983f2 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/scope/TopLevelScope.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/scope/TopLevelScope.java
@@ -117,7 +117,6 @@ EnsoObject getMembers(boolean includeInternal) {
         MethodNames.TopScope.CREATE_MODULE,
         MethodNames.TopScope.REGISTER_MODULE,
         MethodNames.TopScope.UNREGISTER_MODULE,
-        MethodNames.TopScope.LOCAL_LIBRARIES,
         MethodNames.TopScope.COMPILE);
   }
 
@@ -166,18 +165,6 @@ private static Object unregisterModule(
       return context.getNothing();
     }
 
-    @CompilerDirectives.TruffleBoundary
-    private static EnsoObject localLibraries(EnsoContext context) {
-      var seq = context.getTopScope().packageRepository.findAvailableLocalLibraries();
-      String[] names = new String[seq.size()];
-      var it = seq.iterator();
-      var i = 0;
-      while (it.hasNext()) {
-        names[i++] = it.next().toString();
-      }
-      return ArrayLikeHelpers.wrapStrings(names);
-    }
-
     private static Object leakContext(EnsoContext context) {
       return context.asGuestValue(context);
     }
@@ -199,19 +186,22 @@ private static Object compile(Object[] arguments, EnsoContext context)
     @Specialization
     static Object doInvoke(TopLevelScope scope, String member, Object[] arguments)
         throws UnknownIdentifierException, ArityException, UnsupportedTypeException {
-      return switch (member) {
-        case MethodNames.TopScope.GET_MODULE -> getModule(scope, arguments);
-        case MethodNames.TopScope.CREATE_MODULE -> createModule(
-            scope, arguments, EnsoContext.get(null));
-        case MethodNames.TopScope.REGISTER_MODULE -> registerModule(
-            scope, arguments, EnsoContext.get(null));
-        case MethodNames.TopScope.UNREGISTER_MODULE -> unregisterModule(
-            scope, arguments, EnsoContext.get(null));
-        case MethodNames.TopScope.LEAK_CONTEXT -> leakContext(EnsoContext.get(null));
-        case MethodNames.TopScope.LOCAL_LIBRARIES -> localLibraries(EnsoContext.get(null));
-        case MethodNames.TopScope.COMPILE -> compile(arguments, EnsoContext.get(null));
-        default -> throw UnknownIdentifierException.create(member);
-      };
+      switch (member) {
+        case MethodNames.TopScope.GET_MODULE:
+          return getModule(scope, arguments);
+        case MethodNames.TopScope.CREATE_MODULE:
+          return createModule(scope, arguments, EnsoContext.get(null));
+        case MethodNames.TopScope.REGISTER_MODULE:
+          return registerModule(scope, arguments, EnsoContext.get(null));
+        case MethodNames.TopScope.UNREGISTER_MODULE:
+          return unregisterModule(scope, arguments, EnsoContext.get(null));
+        case MethodNames.TopScope.LEAK_CONTEXT:
+          return leakContext(EnsoContext.get(null));
+        case MethodNames.TopScope.COMPILE:
+          return compile(arguments, EnsoContext.get(null));
+        default:
+          throw UnknownIdentifierException.create(member);
+      }
     }
   }
 
@@ -228,7 +218,6 @@ boolean isMemberInvocable(String member) {
         || member.equals(MethodNames.TopScope.REGISTER_MODULE)
         || member.equals(MethodNames.TopScope.UNREGISTER_MODULE)
         || member.equals(MethodNames.TopScope.LEAK_CONTEXT)
-        || member.equals(MethodNames.TopScope.LOCAL_LIBRARIES)
         || member.equals(MethodNames.TopScope.COMPILE);
   }
 
diff --git a/engine/runtime/src/main/scala/org/enso/interpreter/runtime/DefaultPackageRepository.scala b/engine/runtime/src/main/scala/org/enso/interpreter/runtime/DefaultPackageRepository.scala
index 0a401b70ddc7..5c7773944f54 100644
--- a/engine/runtime/src/main/scala/org/enso/interpreter/runtime/DefaultPackageRepository.scala
+++ b/engine/runtime/src/main/scala/org/enso/interpreter/runtime/DefaultPackageRepository.scala
@@ -138,10 +138,6 @@ private class DefaultPackageRepository(
     go(component.name.split(LibraryName.separator))
   }
 
-  override def findAvailableLocalLibraries(): Seq[LibraryName] = {
-    libraryProvider.findAvailableLocalLibraries()
-  }
-
   /** @inheritdoc */
   override def getModuleMap: PackageRepository.ModuleMap = loadedModules
 
diff --git a/lib/java/test-utils/src/main/java/org/enso/test/utils/ProjectUtils.java b/lib/java/test-utils/src/main/java/org/enso/test/utils/ProjectUtils.java
index abc9576cddc7..5eb9a183f974 100644
--- a/lib/java/test-utils/src/main/java/org/enso/test/utils/ProjectUtils.java
+++ b/lib/java/test-utils/src/main/java/org/enso/test/utils/ProjectUtils.java
@@ -84,7 +84,7 @@ public static void createProject(String projName, Set<SourceModule> modules, Pat
    *     main} method
    */
   public static void testProjectRun(
-      Context.Builder ctxBuilder, Path projDir, Consumer<Value> resultConsumer) throws IOException {
+      Context.Builder ctxBuilder, Path projDir, Consumer<Value> resultConsumer) {
     if (!(projDir.toFile().exists() && projDir.toFile().isDirectory())) {
       throw new IllegalArgumentException(
           "Project directory " + projDir + " must already be created");
@@ -115,8 +115,7 @@ public static void testProjectRun(
    * @param resultConsumer Any action that is to be evaluated on the result of running the {@code
    *     main} method
    */
-  public static void testProjectRun(Path projDir, Consumer<Value> resultConsumer)
-      throws IOException {
+  public static void testProjectRun(Path projDir, Consumer<Value> resultConsumer) {
     testProjectRun(ContextUtils.defaultContextBuilder(), projDir, resultConsumer);
   }
 
diff --git a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/DefaultLibraryProvider.scala b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/DefaultLibraryProvider.scala
index 94c67433aca4..264fd5a31f37 100644
--- a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/DefaultLibraryProvider.scala
+++ b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/DefaultLibraryProvider.scala
@@ -40,11 +40,6 @@ class DefaultLibraryProvider(
   private val logger   = Logger[DefaultLibraryProvider]
   private val resolver = LibraryResolver(localLibraryProvider)
 
-  override def findAvailableLocalLibraries(): Seq[LibraryName] = {
-    val libs = edition.getAllDefinedLibraries
-    libs.keys.toSeq
-  }
-
   /** Resolves the library version that should be used based on the
     * configuration and returns its location on the filesystem.
     *
diff --git a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/ResolvingLibraryProvider.scala b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/ResolvingLibraryProvider.scala
index 86e6759f0206..b596de605b29 100644
--- a/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/ResolvingLibraryProvider.scala
+++ b/lib/scala/library-manager/src/main/scala/org/enso/librarymanager/ResolvingLibraryProvider.scala
@@ -5,9 +5,6 @@ import org.enso.editions.{LibraryName, LibraryVersion}
 /** A helper class for resolving libraries. */
 trait ResolvingLibraryProvider {
 
-  /** Finds available library names */
-  def findAvailableLocalLibraries(): Seq[LibraryName]
-
   /** Resolves which library version should be used and finds its path within
     * local libraries or the cache.
     *

From 09c4b7a9937ce2ca66a9615d7c284a2bf6e8742a Mon Sep 17 00:00:00 2001
From: Adam Obuchowicz <adam.obuchowicz@enso.org>
Date: Mon, 12 Aug 2024 11:57:29 +0200
Subject: [PATCH 09/23] Fix file open retry in ydocs server (#10787)

There is a code for exponential back off, but the result with error was lost at one place.

Tested by mocking timeouts in our `lanugageServer.ts`

Fixes #10606
---
 app/ydoc-server/src/languageServerSession.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/ydoc-server/src/languageServerSession.ts b/app/ydoc-server/src/languageServerSession.ts
index b1efa4368ead..0455cd892cd6 100644
--- a/app/ydoc-server/src/languageServerSession.ts
+++ b/app/ydoc-server/src/languageServerSession.ts
@@ -396,7 +396,7 @@ class ModulePersistence extends ObservableV2<{ removed: () => void }> {
             return Ok()
           }
           case LsSyncState.Closed: {
-            await this.withState(LsSyncState.Opening, async () => {
+            return await this.withState(LsSyncState.Opening, async () => {
               const promise = this.ls.openTextFile(this.path)
               this.setLastAction(promise.then(res => !res.ok && this.setState(LsSyncState.Closed)))
               const result = await promise
@@ -409,7 +409,6 @@ class ModulePersistence extends ObservableV2<{ removed: () => void }> {
               this.syncFileContents(result.value.content, result.value.currentVersion)
               return Ok()
             })
-            return Ok()
           }
           default: {
             assertNever(this.state)

From b277132950dec72b6472452906f0665f7a491980 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Grabarz?= <frizi09@gmail.com>
Date: Mon, 12 Aug 2024 12:25:18 +0200
Subject: [PATCH 10/23] Fix test report artifact upload error handling 
 (#10789)

Fixed error handling for test report file discovery, skipping not-found errors. Applied flaky dashboard e2e test fix to missed test suite.
---
 app/dashboard/e2e/actions.ts                  |  5 ++
 app/dashboard/e2e/actions/DrivePageActions.ts | 47 ++++++++++---------
 app/dashboard/e2e/assetsTableFeatures.spec.ts |  8 ++--
 app/gui2/README.md                            | 28 +++++------
 app/gui2/src/components/DockPanel.vue         |  4 +-
 build/ci_utils/src/actions/artifacts.rs       | 25 +++++-----
 build/cli/src/lib.rs                          | 32 +++----------
 7 files changed, 68 insertions(+), 81 deletions(-)

diff --git a/app/dashboard/e2e/actions.ts b/app/dashboard/e2e/actions.ts
index 6a21950e2e00..fc5c5245bee8 100644
--- a/app/dashboard/e2e/actions.ts
+++ b/app/dashboard/e2e/actions.ts
@@ -328,6 +328,11 @@ export function locateAssetRows(page: test.Page) {
   return locateAssetsTable(page).getByTestId('asset-row')
 }
 
+/** Find assets table placeholder rows (if any) on the current page. */
+export function locateNonAssetRows(page: test.Page) {
+  return locateAssetsTable(page).locator('tbody tr:not([data-testid="asset-row"])')
+}
+
 /** Find the name column of the given asset row. */
 export function locateAssetName(locator: test.Locator) {
   return locator.locator('> :nth-child(1)')
diff --git a/app/dashboard/e2e/actions/DrivePageActions.ts b/app/dashboard/e2e/actions/DrivePageActions.ts
index b2877749d932..5780d53482bc 100644
--- a/app/dashboard/e2e/actions/DrivePageActions.ts
+++ b/app/dashboard/e2e/actions/DrivePageActions.ts
@@ -17,15 +17,6 @@ import StartModalActions from './StartModalActions'
 // eslint-disable-next-line @typescript-eslint/no-magic-numbers
 const ASSET_ROW_SAFE_POSITION = { x: 300, y: 16 }
 
-// =======================
-// === locateAssetRows ===
-// =======================
-
-/** Find all assets table rows (if any). */
-function locateAssetRows(page: test.Page) {
-  return actions.locateAssetsTable(page).locator('tbody').getByRole('row')
-}
-
 // ========================
 // === DrivePageActions ===
 // ========================
@@ -97,14 +88,18 @@ export default class DrivePageActions extends PageActions {
       /** Click to select a specific row. */
       clickRow(index: number) {
         return self.step(`Click drive table row #${index}`, (page) =>
-          locateAssetRows(page).nth(index).click({ position: actions.ASSET_ROW_SAFE_POSITION }),
+          actions
+            .locateAssetRows(page)
+            .nth(index)
+            .click({ position: actions.ASSET_ROW_SAFE_POSITION }),
         )
       },
       /** Right click a specific row to bring up its context menu, or the context menu for multiple
        * assets when right clicking on a selected asset when multiple assets are selected. */
       rightClickRow(index: number) {
         return self.step(`Right click drive table row #${index}`, (page) =>
-          locateAssetRows(page)
+          actions
+            .locateAssetRows(page)
             .nth(index)
             .click({ button: 'right', position: actions.ASSET_ROW_SAFE_POSITION }),
         )
@@ -112,19 +107,24 @@ export default class DrivePageActions extends PageActions {
       /** Double click a row. */
       doubleClickRow(index: number) {
         return self.step(`Double dlick drive table row #${index}`, (page) =>
-          locateAssetRows(page).nth(index).dblclick({ position: actions.ASSET_ROW_SAFE_POSITION }),
+          actions
+            .locateAssetRows(page)
+            .nth(index)
+            .dblclick({ position: actions.ASSET_ROW_SAFE_POSITION }),
         )
       },
       /** Interact with the set of all rows in the Drive table. */
-      withRows(callback: baseActions.LocatorCallback) {
+      withRows(
+        callback: (assetRows: test.Locator, nonAssetRows: test.Locator) => Promise<void> | void,
+      ) {
         return self.step('Interact with drive table rows', async (page) => {
-          await callback(locateAssetRows(page))
+          await callback(actions.locateAssetRows(page), actions.locateNonAssetRows(page))
         })
       },
       /** Drag a row onto another row. */
       dragRowToRow(from: number, to: number) {
         return self.step(`Drag drive table row #${from} to row #${to}`, async (page) => {
-          const rows = locateAssetRows(page)
+          const rows = actions.locateAssetRows(page)
           await rows.nth(from).dragTo(rows.nth(to), {
             sourcePosition: ASSET_ROW_SAFE_POSITION,
             targetPosition: ASSET_ROW_SAFE_POSITION,
@@ -134,7 +134,8 @@ export default class DrivePageActions extends PageActions {
       /** Drag a row onto another row. */
       dragRow(from: number, to: test.Locator, force?: boolean) {
         return self.step(`Drag drive table row #${from} to custom locator`, (page) =>
-          locateAssetRows(page)
+          actions
+            .locateAssetRows(page)
             .nth(from)
             .dragTo(to, {
               sourcePosition: ASSET_ROW_SAFE_POSITION,
@@ -146,18 +147,20 @@ export default class DrivePageActions extends PageActions {
        * placeholder row displayed when there are no assets to show. */
       expectPlaceholderRow() {
         return self.step('Expect placeholder row', async (page) => {
-          const rows = locateAssetRows(page)
-          await test.expect(rows).toHaveCount(1)
-          await test.expect(rows).toHaveText(/You have no files/)
+          await test.expect(actions.locateAssetRows(page)).toHaveCount(0)
+          const nonAssetRows = actions.locateNonAssetRows(page)
+          await test.expect(nonAssetRows).toHaveCount(1)
+          await test.expect(nonAssetRows).toHaveText(/You have no files/)
         })
       },
       /** A test assertion to confirm that there is only one row visible, and that row is the
        * placeholder row displayed when there are no assets in Trash. */
       expectTrashPlaceholderRow() {
         return self.step('Expect trash placeholder row', async (page) => {
-          const rows = locateAssetRows(page)
-          await test.expect(rows).toHaveCount(1)
-          await test.expect(rows).toHaveText(/Your trash is empty/)
+          await test.expect(actions.locateAssetRows(page)).toHaveCount(0)
+          const nonAssetRows = actions.locateNonAssetRows(page)
+          await test.expect(nonAssetRows).toHaveCount(1)
+          await test.expect(nonAssetRows).toHaveText(/Your trash is empty/)
         })
       },
       /** Toggle a column's visibility. */
diff --git a/app/dashboard/e2e/assetsTableFeatures.spec.ts b/app/dashboard/e2e/assetsTableFeatures.spec.ts
index ab01b960b22d..bd80bd889b08 100644
--- a/app/dashboard/e2e/assetsTableFeatures.spec.ts
+++ b/app/dashboard/e2e/assetsTableFeatures.spec.ts
@@ -92,17 +92,15 @@ test.test('can drop onto root directory dropzone', ({ page }) =>
     .createFolder()
     .uploadFile('b', 'testing')
     .driveTable.doubleClickRow(0)
-    .driveTable.withRows(async (rows) => {
+    .driveTable.withRows(async (rows, nonAssetRows) => {
       const parentLeft = await actions.getAssetRowLeftPx(rows.nth(0))
-      const childLeft = await actions.getAssetRowLeftPx(rows.nth(1))
+      const childLeft = await actions.getAssetRowLeftPx(nonAssetRows.nth(0))
       test.expect(childLeft, 'Child is indented further than parent').toBeGreaterThan(parentLeft)
     })
     .driveTable.dragRow(1, actions.locateRootDirectoryDropzone(page))
     .driveTable.withRows(async (rows) => {
       const firstLeft = await actions.getAssetRowLeftPx(rows.nth(0))
-      // The second row is the indented child of the directory
-      // (the "this folder is empty" row).
-      const secondLeft = await actions.getAssetRowLeftPx(rows.nth(2))
+      const secondLeft = await actions.getAssetRowLeftPx(rows.nth(1))
       test.expect(firstLeft, 'Siblings have same indentation').toEqual(secondLeft)
     }),
 )
diff --git a/app/gui2/README.md b/app/gui2/README.md
index 1593e4185f8c..93d293f9e660 100644
--- a/app/gui2/README.md
+++ b/app/gui2/README.md
@@ -30,44 +30,44 @@ pnpm install
 ### Compile and Hot-Reload for Development
 
 ```sh
-npm run dev
+pnpm -w dev:gui
 ```
 
 ### Type-Check, Compile and Minify for Production
 
 ```sh
-npm run build
+pnpm build
 ```
 
 ### Run Unit Tests with [Vitest](https://vitest.dev/)
 
 ```sh
-npm run test:unit
+# Run once
+pnpm test:unit
+# Run in watch mode
+pnpm test-dev:unit
 ```
 
 ### Run End-to-End Tests with [Playwright](https://playwright.dev)
 
 ```sh
 # Install browsers for the first run
-npx playwright install
-
-# When testing on CI, must build the project first
-npm run build
+pnpm exec playwright install
 
 # Runs the end-to-end tests
-npm run test:e2e
+pnpm test:e2e
 # Runs the tests only on Chromium
-npm run test:e2e -- --project=chromium
+pnpm test:e2e -- --project=chromium
 # Runs the tests of a specific file
-npm run test:e2e -- tests/example.spec.ts
-# Runs the tests in debug mode
-npm run test:e2e -- --debug
+pnpm test:e2e -- tests/example.spec.ts
+# Runs the tests in watch mode, open the testing UI
+pnpm test-dev:e2e
 ```
 
-### Lint with [ESLint](https://eslint.org/)
+### Format code with [ESLint](https://eslint.org/) and Prettier
 
 ```sh
-npm run lint
+pnpm format
 ```
 
 ## Icons license
diff --git a/app/gui2/src/components/DockPanel.vue b/app/gui2/src/components/DockPanel.vue
index 2ef0d06c1632..f3e95a1b9b91 100644
--- a/app/gui2/src/components/DockPanel.vue
+++ b/app/gui2/src/components/DockPanel.vue
@@ -59,17 +59,17 @@ const tabStyle = {
         <div class="tab" :style="tabStyle">
           <ToggleIcon
             :modelValue="tab == 'docs'"
-            @update:modelValue="tab = 'docs'"
             title="Documentation Editor"
             icon="text"
+            @update:modelValue="tab = 'docs'"
           />
         </div>
         <div class="tab" :style="tabStyle">
           <ToggleIcon
             :modelValue="tab == 'help'"
-            @update:modelValue="tab = 'help'"
             title="Component Help"
             icon="help"
+            @update:modelValue="tab = 'help'"
           />
         </div>
       </div>
diff --git a/build/ci_utils/src/actions/artifacts.rs b/build/ci_utils/src/actions/artifacts.rs
index 4b34432286c8..178d3aca611c 100644
--- a/build/ci_utils/src/actions/artifacts.rs
+++ b/build/ci_utils/src/actions/artifacts.rs
@@ -96,16 +96,14 @@ pub fn upload_single_file(
         .boxed()
 }
 
-pub fn upload_directory(
+pub async fn upload_directory_if_exists(
     dir: impl Into<PathBuf>,
     artifact_name: impl Into<String>,
-) -> BoxFuture<'static, Result> {
+) -> Result {
     let dir = dir.into();
     let artifact_name = artifact_name.into();
     info!("Uploading directory {} as artifact {artifact_name}.", dir.display());
-    single_dir_provider(&dir)
-        .and_then_async(move |stream| upload(stream, artifact_name, default()))
-        .boxed()
+    upload(single_dir_provider(&dir)?, artifact_name, default()).await
 }
 
 #[tracing::instrument(skip_all , fields(artifact_name = %artifact_name.as_ref(), target = %target.as_ref().display()), err)]
@@ -185,14 +183,17 @@ pub fn single_file_provider(
 pub fn single_dir_provider(path: &Path) -> Result<impl Stream<Item = FileToUpload> + 'static> {
     // TODO not optimal, could discover files at the same time as handling them.
     let parent_path = path.try_parent()?;
-    let files = walkdir::WalkDir::new(path)
-        .into_iter()
-        .try_collect_vec()?
+    let files: Vec<FileToUpload> = walkdir::WalkDir::new(path)
         .into_iter()
-        .filter(|entry| !entry.file_type().is_dir())
-        .map(|entry| FileToUpload::new_relative(parent_path, entry.path()))
-        .try_collect_vec()?;
-
+        .filter(|res| match res {
+            Ok(entry) => !entry.file_type().is_dir(),
+            // ignore "not found" errors, just don't include the file in the final stream.
+            Err(e) =>
+                e.depth() != 0
+                    || e.io_error().map_or(true, |e| e.kind() != std::io::ErrorKind::NotFound),
+        })
+        .map(|entry| FileToUpload::new_relative(parent_path, entry?.path()))
+        .try_collect()?;
     info!("Discovered {} files under the {}.", files.len(), path.display());
     Ok(futures::stream::iter(files))
 }
diff --git a/build/cli/src/lib.rs b/build/cli/src/lib.rs
index 154f099aa6a9..d0043305cbfe 100644
--- a/build/cli/src/lib.rs
+++ b/build/cli/src/lib.rs
@@ -86,27 +86,6 @@ fn resolve_artifact_name(input: Option<String>, project: &impl IsTarget) -> Stri
     input.unwrap_or_else(|| project.artifact_name())
 }
 
-/// Run the given future. After it is complete (regardless of success or failure), upload the
-/// directory as a CI artifact.
-///
-/// Does not attempt any uploads if not running in a CI environment.
-pub fn run_and_upload_dir(
-    fut: BoxFuture<'static, Result>,
-    dir_path: impl Into<PathBuf>,
-    artifact_name: impl Into<String>,
-) -> BoxFuture<'static, Result> {
-    let dir_path = dir_path.into();
-    let artifact_name = artifact_name.into();
-    async move {
-        let result = fut.await;
-        if is_in_env() {
-            ide_ci::actions::artifacts::upload_directory(dir_path, artifact_name).await?;
-        }
-        result
-    }
-    .boxed()
-}
-
 define_env_var! {
     ENSO_BUILD_KIND, version::Kind;
 }
@@ -348,14 +327,15 @@ impl Processor {
                         enso_build::web::run_script(&repo_root, enso_build::web::Script::CiCheck)
                             .await;
                     if is_in_env() {
-                        let gui_report = ide_ci::actions::artifacts::upload_directory(
+                        let gui_report = ide_ci::actions::artifacts::upload_directory_if_exists(
                             &repo_root.app.gui_2.playwright_report,
                             "gui-playwright-report",
                         );
-                        let dashboard_report = ide_ci::actions::artifacts::upload_directory(
-                            repo_root.app.dashboard.playwright_report,
-                            "dashboard-playwright-report",
-                        );
+                        let dashboard_report =
+                            ide_ci::actions::artifacts::upload_directory_if_exists(
+                                repo_root.app.dashboard.playwright_report,
+                                "dashboard-playwright-report",
+                            );
                         try_join!(gui_report, dashboard_report)?;
                     }
                     check_result

From 0d5d01a294b92db50adf9c2d8ce42534c6797122 Mon Sep 17 00:00:00 2001
From: marthasharkey <martha_king@hotmail.co.uk>
Date: Mon, 12 Aug 2024 13:51:51 +0100
Subject: [PATCH 11/23] Wip/mk/drive drilldown from enso (#10724)

This moves some of the drilldown logic to the enso code and utilises the new 'get_rows' method for Table
---
 .../visualizations/TableVisualization.vue     | 97 +++++++------------
 .../Postgres/Postgres_Connection.enso         |  2 +-
 .../Internal/SQLite/SQLite_Connection.enso    |  2 +-
 .../0.0.0-dev/src/Table/Visualization.enso    | 23 +++--
 test/Visualization_Tests/src/Table_Spec.enso  | 24 ++---
 5 files changed, 62 insertions(+), 86 deletions(-)

diff --git a/app/gui2/src/components/visualizations/TableVisualization.vue b/app/gui2/src/components/visualizations/TableVisualization.vue
index d081daf52660..9d148da2f797 100644
--- a/app/gui2/src/components/visualizations/TableVisualization.vue
+++ b/app/gui2/src/components/visualizations/TableVisualization.vue
@@ -60,6 +60,7 @@ interface Matrix {
   all_rows_count: number
   json: unknown[][]
   value_type: ValueType[]
+  get_child_node: string
 }
 
 interface Excel_Workbook {
@@ -68,6 +69,7 @@ interface Excel_Workbook {
   all_rows_count: number
   sheet_names: string[]
   json: unknown[][]
+  get_child_node: string
 }
 
 interface ObjectMatrix {
@@ -76,6 +78,7 @@ interface ObjectMatrix {
   all_rows_count: number
   json: object[]
   value_type: ValueType[]
+  get_child_node: string
 }
 
 interface UnknownTable {
@@ -90,6 +93,7 @@ interface UnknownTable {
   value_type: ValueType[]
   has_index_col: boolean | undefined
   links: string[] | undefined
+  get_child_node: string
 }
 
 export enum TextFormatOptions {
@@ -187,32 +191,20 @@ const selectableRowLimits = computed(() => {
 })
 
 const newNodeSelectorValues = computed(() => {
-  let selector
-  let identifierAction
   let tooltipValue
   let headerName
   switch (config.nodeType) {
     case COLUMN_NODE_TYPE:
     case VECTOR_NODE_TYPE:
-      selector = INDEX_FIELD_NAME
-      identifierAction = 'at'
-      tooltipValue = 'value'
-      break
     case ROW_NODE_TYPE:
-      selector = 'column'
-      identifierAction = 'at'
       tooltipValue = 'value'
       break
     case EXCEL_WORKBOOK_NODE_TYPE:
-      selector = 'Value'
-      identifierAction = 'read'
       tooltipValue = 'sheet'
       headerName = 'Sheets'
       break
     case SQLITE_CONNECTIONS_NODE_TYPE:
     case POSTGRES_CONNECTIONS_NODE_TYPE:
-      selector = 'Value'
-      identifierAction = 'query'
       tooltipValue = 'table'
       headerName = 'Tables'
       break
@@ -221,8 +213,6 @@ const newNodeSelectorValues = computed(() => {
       tooltipValue = 'row'
   }
   return {
-    selector,
-    identifierAction,
     tooltipValue,
     headerName,
   }
@@ -432,61 +422,37 @@ function toRowField(name: string, valueType?: ValueType | null | undefined) {
   }
 }
 
-function getAstPattern(selector: string | number, action: string) {
-  return Pattern.new((ast) =>
-    Ast.App.positional(
-      Ast.PropertyAccess.new(ast.module, ast, Ast.identifier(action)!),
-      typeof selector === 'number' ?
-        Ast.tryNumberToEnso(selector, ast.module)!
-      : Ast.TextLiteral.new(selector, ast.module),
-    ),
-  )
-}
-
-const getTablePattern = (index: number) =>
-  Pattern.new((ast) =>
-    Ast.OprApp.new(
-      ast.module,
+function getAstPattern(selector: string | number, action?: string) {
+  const identifierAction =
+    config.nodeType === (COLUMN_NODE_TYPE || VECTOR_NODE_TYPE) ? 'at' : action
+  if (identifierAction) {
+    return Pattern.new((ast) =>
       Ast.App.positional(
-        Ast.PropertyAccess.new(ast.module, ast, Ast.identifier('rows')!),
-        Ast.parse('(..All_Rows)'),
+        Ast.PropertyAccess.new(ast.module, ast, Ast.identifier(identifierAction)!),
+        typeof selector === 'number' ?
+          Ast.tryNumberToEnso(selector, ast.module)!
+        : Ast.TextLiteral.new(selector, ast.module),
       ),
-      '.',
-      Ast.App.positional(
-        Ast.Ident.new(ast.module, Ast.identifier('get')!),
-        Ast.tryNumberToEnso(index, ast.module)!,
-      ),
-    ),
-  )
-
-function createNode(params: CellClickedEvent) {
-  if (config.nodeType === TABLE_NODE_TYPE || config.nodeType === DB_TABLE_NODE_TYPE) {
-    config.createNodes({
-      content: getTablePattern(params.data[INDEX_FIELD_NAME]),
-      commit: true,
-    })
+    )
   }
-  if (
-    newNodeSelectorValues.value.selector !== undefined &&
-    newNodeSelectorValues.value.selector !== null &&
-    newNodeSelectorValues.value.identifierAction
-  ) {
+}
+
+function createNode(params: CellClickedEvent, selector: string, action?: string) {
+  const pattern = getAstPattern(params.data[selector], action)
+  if (pattern) {
     config.createNodes({
-      content: getAstPattern(
-        params.data[newNodeSelectorValues.value.selector],
-        newNodeSelectorValues.value.identifierAction,
-      ),
+      content: pattern,
       commit: true,
     })
   }
 }
 
-function toLinkField(fieldName: string): ColDef {
+function toLinkField(fieldName: string, getChildAction?: string): ColDef {
   return {
     headerName:
       newNodeSelectorValues.value.headerName ? newNodeSelectorValues.value.headerName : fieldName,
     field: fieldName,
-    onCellDoubleClicked: (params) => createNode(params),
+    onCellDoubleClicked: (params) => createNode(params, fieldName, getChildAction),
     tooltipValueGetter: () => {
       return `Double click to view this ${newNodeSelectorValues.value.tooltipValue} in a separate component`
     },
@@ -515,6 +481,8 @@ watchEffect(() => {
         // eslint-disable-next-line camelcase
         has_index_col: false,
         links: undefined,
+        // eslint-disable-next-line camelcase
+        get_child_node: undefined,
       }
   const options = agGridOptions.value
   if (options.api == null) {
@@ -533,14 +501,14 @@ watchEffect(() => {
     ]
     rowData = [{ Error: data_.error }]
   } else if (data_.type === 'Matrix') {
-    columnDefs.push(toLinkField(INDEX_FIELD_NAME))
+    columnDefs.push(toLinkField(INDEX_FIELD_NAME, data_.get_child_node))
     for (let i = 0; i < data_.column_count; i++) {
       columnDefs.push(toField(i.toString()))
     }
     rowData = addRowIndex(data_.json)
     isTruncated.value = data_.all_rows_count !== data_.json.length
   } else if (data_.type === 'Object_Matrix') {
-    columnDefs.push(toLinkField(INDEX_FIELD_NAME))
+    columnDefs.push(toLinkField(INDEX_FIELD_NAME, data_.get_child_node))
     let keys = new Set<string>()
     for (const val of data_.json) {
       if (val != null) {
@@ -555,14 +523,14 @@ watchEffect(() => {
     rowData = addRowIndex(data_.json)
     isTruncated.value = data_.all_rows_count !== data_.json.length
   } else if (data_.type === 'Excel_Workbook') {
-    columnDefs = [toLinkField('Value')]
+    columnDefs = [toLinkField('Value', data_.get_child_node)]
     rowData = data_.sheet_names.map((name) => ({ Value: name }))
   } else if (Array.isArray(data_.json)) {
-    columnDefs = [toLinkField(INDEX_FIELD_NAME), toField('Value')]
+    columnDefs = [toLinkField(INDEX_FIELD_NAME, data_.get_child_node), toField('Value')]
     rowData = data_.json.map((row, i) => ({ [INDEX_FIELD_NAME]: i, Value: toRender(row) }))
     isTruncated.value = data_.all_rows_count ? data_.all_rows_count !== data_.json.length : false
   } else if (data_.json !== undefined) {
-    columnDefs = data_.links ? [toLinkField('Value')] : [toField('Value')]
+    columnDefs = data_.links ? [toLinkField('Value', data_.get_child_node)] : [toField('Value')]
     rowData =
       data_.links ?
         data_.links.map((link) => ({
@@ -574,12 +542,15 @@ watchEffect(() => {
       ('header' in data_ ? data_.header : [])?.map((v, i) => {
         const valueType = data_.value_type ? data_.value_type[i] : null
         if (config.nodeType === ROW_NODE_TYPE) {
-          return v === 'column' ? toLinkField(v) : toRowField(v, valueType)
+          return v === 'column' ? toLinkField(v, data_.get_child_node) : toRowField(v, valueType)
         }
         return toField(v, valueType)
       }) ?? []
 
-    columnDefs = data_.has_index_col ? [toLinkField(INDEX_FIELD_NAME), ...dataHeader] : dataHeader
+    columnDefs =
+      data_.has_index_col ?
+        [toLinkField(INDEX_FIELD_NAME, data_.get_child_node), ...dataHeader]
+      : dataHeader
     const rows = data_.data && data_.data.length > 0 ? data_.data[0]?.length ?? 0 : 0
     rowData = Array.from({ length: rows }, (_, i) => {
       const shift = data_.has_index_col ? 1 : 0
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Connection.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Connection.enso
index 080d4170d883..f12298eef3c9 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Connection.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Connection.enso
@@ -306,7 +306,7 @@ type Postgres_Connection
        Converts this value to a JSON serializable object.
     to_js_object : JS_Object
     to_js_object self =
-        JS_Object.from_pairs [["type", "Postgres_Connection"], ["links", self.connection.tables.at "Name" . to_vector]]    
+        JS_Object.from_pairs [["type", "Postgres_Connection"], ["links", self.connection.tables.at "Name" . to_vector], ["get_child_node", "query"]]    
 
 ## PRIVATE
 get_encoding_name : JDBC_Connection.JDBC_Connection -> Text
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Connection.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Connection.enso
index a6d7fececc74..b96b4bf8bb1d 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Connection.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Connection.enso
@@ -287,4 +287,4 @@ type SQLite_Connection
        Converts this value to a JSON serializable object.
     to_js_object : JS_Object
     to_js_object self =
-        JS_Object.from_pairs [["type", "SQLite_Connection"], ["links", self.connection.tables.at "Name" . to_vector]]
+        JS_Object.from_pairs [["type", "SQLite_Connection"], ["links", self.connection.tables.at "Name" . to_vector], ["get_child_node", "query"]]
diff --git a/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table/Visualization.enso b/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table/Visualization.enso
index 0b152ced39ea..faa6126e2f90 100644
--- a/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table/Visualization.enso
+++ b/distribution/lib/Standard/Visualization/0.0.0-dev/src/Table/Visualization.enso
@@ -48,7 +48,7 @@ prepare_visualization y max_rows=1000 =
             JS_Object.from_pairs [["json", make_json_for_value x]]
         _ : Excel_Workbook ->
             js_value = x.to_js_object
-            JS_Object.from_pairs [["json", js_value], ["sheet_names", x . sheet_names], ["type", "Excel_Workbook"]]
+            JS_Object.from_pairs [["json", js_value], ["sheet_names", x . sheet_names], ["get_child_node", "read"], ["type", "Excel_Workbook"]]
         _ : XML_Document -> make_json_for_xml_element x.root_element max_rows "XML_Document"
         _ : XML_Element -> make_json_for_xml_element x max_rows
         _ -> make_json_for_other x
@@ -64,14 +64,15 @@ max_columns = 250
 make_json_for_vector : Vector -> Integer -> JS_Object
 make_json_for_vector vector max_rows =
     all_rows = ["all_rows_count", vector.length]
+    get_child_node = ["get_child_node", "at"]
     truncated = vector.take max_rows
     some_values = truncated.any (v->v.is_nothing.not)
-    if some_values.not then JS_Object.from_pairs [["type", "Vector"], all_rows, ["json", truncated.map make_json_for_value]] else
+    if some_values.not then JS_Object.from_pairs [["type", "Vector"], all_rows, ["json", truncated.map make_json_for_value], get_child_node] else
         matrix = make_json_for_matrix (Builder.new truncated.length) truncated
-        if matrix.is_nothing.not then JS_Object.from_pairs [["type", "Matrix"], all_rows, ["json", matrix], ["column_count", matrix.fold 0 c->v-> if v.is_nothing then c else c.max v.length]] else
+        if matrix.is_nothing.not then JS_Object.from_pairs [["type", "Matrix"], all_rows, ["json", matrix], ["column_count", matrix.fold 0 c->v-> if v.is_nothing then c else c.max v.length], get_child_node] else
             object_matrix = make_json_for_object_matrix (Builder.new truncated.length) truncated
-            if object_matrix.is_nothing.not then JS_Object.from_pairs [["type", "Object_Matrix"], all_rows, ["json", object_matrix]] else
-                JS_Object.from_pairs [["type", "Vector"], all_rows, ["json", truncated.map make_json_for_value]]
+            if object_matrix.is_nothing.not then JS_Object.from_pairs [["type", "Object_Matrix"], all_rows, ["json", object_matrix], get_child_node] else
+                JS_Object.from_pairs [["type", "Vector"], all_rows, ["json", truncated.map make_json_for_value], get_child_node]
 
 ## PRIVATE
    Render Vector of Vector / Array to JSON
@@ -124,7 +125,8 @@ make_json_for_dictionary dict max_items key_name="key" =
     as_vector = Warning.clear (dict.to_vector.take max_items)
     mapped = as_vector . map p-> [p.first.to_text, make_json_for_value p.second]
     data = ["data", [mapped.map .first, mapped.map .second]]
-    JS_Object.from_pairs [header, data, all_rows, ["type", "Map"]]
+    links = ["get_child_node", "at"]
+    JS_Object.from_pairs [header, data, all_rows, links, ["type", "Map"]]
 
 ## PRIVATE
    Render JS_Object to JSON
@@ -177,7 +179,8 @@ make_json_for_table dataframe all_rows_count include_index_col =
     data        = ["data",   columns.map get_vector]
     all_rows    = ["all_rows_count", all_rows_count]
     has_index_col = ["has_index_col", include_index_col]
-    pairs       = [header, value_type, data, all_rows, has_index_col, ["type", "Table"]]
+    links       = ["get_child_node", "get_row"]
+    pairs       = [header, value_type, data, all_rows, has_index_col, links, ["type", "Table"]]
     JS_Object.from_pairs pairs
 
 ## PRIVATE
@@ -188,9 +191,11 @@ make_json_for_other x =
     value = if js_value.is_a JS_Object . not then js_value else
         pairs = [['_display_text_', x.to_display_text]] + js_value.field_names.map f-> [f, make_json_for_value (js_value.get f)]
         JS_Object.from_pairs pairs
-    additional_fields = if js_value.is_a JS_Object . not then [] else
+    link_fields = if js_value.is_a JS_Object . not then [] else
         if js_value.contains_key 'links' then [["links", js_value.get 'links']] else []
-    JS_Object.from_pairs <| [["json", value]] + additional_fields
+    additional_fields = if js_value.is_a JS_Object . not then [] else
+        if js_value.contains_key 'get_child_node' then [["get_child_node", js_value.get 'get_child_node']] else []
+    JS_Object.from_pairs <| [["json", value]] + additional_fields + link_fields
 
 ## PRIVATE
    Create JSON serialization of values for the table.
diff --git a/test/Visualization_Tests/src/Table_Spec.enso b/test/Visualization_Tests/src/Table_Spec.enso
index eade4ab973bb..fd8b10481672 100644
--- a/test/Visualization_Tests/src/Table_Spec.enso
+++ b/test/Visualization_Tests/src/Table_Spec.enso
@@ -40,17 +40,17 @@ type Foo_Link
     Value x
 
     to_js_object : JS_Object
-    to_js_object self = JS_Object.from_pairs [["x", self.x], ["links", ["a", "b", "c"]]]    
-
+    to_js_object self = JS_Object.from_pairs [["x", self.x], ["links", ["a", "b", "c"]]]
 
 add_specs suite_builder =
-    make_json header data all_rows value_type has_index_col =
+    make_json header data all_rows value_type has_index_col get_child_node =
         p_header      = ["header", header]
         p_data        = ["data",   data]
         p_all_rows    = ["all_rows_count", all_rows]
         p_value_type  = ["value_type", value_type]
         p_has_index_col = ["has_index_col", has_index_col]
-        pairs    = [p_header, p_value_type, p_data, p_all_rows, p_has_index_col, ["type", "Table"]]
+        p_get_child_node = ["get_child_node", get_child_node]
+        pairs    = [p_header, p_value_type, p_data, p_all_rows, p_has_index_col, p_get_child_node, ["type", "Table"]]
         JS_Object.from_pairs pairs . to_text
 
     suite_builder.group "Table Visualization" group_builder->
@@ -60,45 +60,45 @@ add_specs suite_builder =
             vis = Visualization.prepare_visualization data.t 1
             value_type_int = JS_Object.from_pairs [["type", "Value_Type"], ["constructor", "Integer"], ["display_text", "Integer (64 bits)"], ["bits", 64]]
             value_type_char = JS_Object.from_pairs [["type", "Value_Type"], ["constructor", "Char"], ["display_text", "Char (variable length, max_size=unlimited)"], ["size", Nothing], ["variable_length", True]]
-            json = make_json header=["A", "B", "C"] data=[['a'], [2], [3]] all_rows=3 value_type=[value_type_char, value_type_int, value_type_int] has_index_col=True
+            json = make_json header=["A", "B", "C"] data=[['a'], [2], [3]] all_rows=3 value_type=[value_type_char, value_type_int, value_type_int] has_index_col=True get_child_node="get_row"
             vis . should_equal json
 
         group_builder.specify "should visualize database columns" <|
             vis = Visualization.prepare_visualization (data.t.at "A") 2
             value_type_char = JS_Object.from_pairs [["type", "Value_Type"], ["constructor", "Char"], ["display_text", "Char (variable length, max_size=unlimited)"], ["size", Nothing], ["variable_length", True]]
             value_type_float = JS_Object.from_pairs [["type", "Value_Type"], ["constructor", "Float"], ["display_text", "Float (64 bits)"], ["bits", 64]]
-            json = make_json header=["A"] data=[['a', 'a']] all_rows=3 value_type=[value_type_char] has_index_col=True
+            json = make_json header=["A"] data=[['a', 'a']] all_rows=3 value_type=[value_type_char] has_index_col=True get_child_node="get_row"
             vis . should_equal json
 
             g = data.t.aggregate ["A", "B"] [Aggregate_Column.Average "C"] . at "Average C"
             vis2 = Visualization.prepare_visualization g 1
-            json2 = make_json header=["Average C"] data=[[4.0]] all_rows=2 value_type=[value_type_float] has_index_col=True
+            json2 = make_json header=["Average C"] data=[[4.0]] all_rows=2 value_type=[value_type_float] has_index_col=True get_child_node="get_row"
             vis2 . should_equal json2
 
         group_builder.specify "should visualize dataframe tables" <|
             vis = Visualization.prepare_visualization data.t2 1
             value_type_int = JS_Object.from_pairs [["type", "Value_Type"], ["constructor", "Integer"], ["display_text", "Integer (64 bits)"], ["bits", 64]]
-            json = make_json header=["A", "B", "C"] data=[[1], [4], [7]] all_rows=3 value_type=[value_type_int, value_type_int, value_type_int] has_index_col=True
+            json = make_json header=["A", "B", "C"] data=[[1], [4], [7]] all_rows=3 value_type=[value_type_int, value_type_int, value_type_int] has_index_col=True get_child_node="get_row"
             vis . should_equal json
 
         group_builder.specify "should visualize dataframe columns" <|
             vis = Visualization.prepare_visualization (data.t2.at "A") 2
             value_type_int = JS_Object.from_pairs [["type", "Value_Type"], ["constructor", "Integer"], ["display_text", "Integer (64 bits)"], ["bits", 64]]
-            json = make_json header=["A"] data=[[1, 2]] all_rows=3 value_type=[value_type_int] has_index_col=True
+            json = make_json header=["A"] data=[[1, 2]] all_rows=3 value_type=[value_type_int] has_index_col=True get_child_node="get_row"
             vis . should_equal json
 
         group_builder.specify "should handle Vectors" <|
             vis = Visualization.prepare_visualization [1, 2, 3] 2
-            json = JS_Object.from_pairs [["type", "Vector"], ["all_rows_count", 3], ["json", [1, 2]]]
+            json = JS_Object.from_pairs [["type", "Vector"], ["all_rows_count", 3], ["json", [1, 2]], ["get_child_node", "at"]]
             vis . should_equal json.to_text
 
             vis2 = Visualization.prepare_visualization [[1, 2], [3, 4]] 2
-            json2 = JS_Object.from_pairs [["type", "Matrix"], ["all_rows_count", 2], ["json", [[1, 2], [3, 4]]], ["column_count", 2]]
+            json2 = JS_Object.from_pairs [["type", "Matrix"], ["all_rows_count", 2], ["json", [[1, 2], [3, 4]]], ["column_count", 2], ["get_child_node", "at"]]
             vis2 . should_equal json2.to_text
 
         group_builder.specify "should handle Arrays" <|
             vis = Visualization.prepare_visualization ([1, 2, 3] . to_array) 2
-            json = JS_Object.from_pairs [["type", "Vector"], ["all_rows_count", 3], ["json", [1, 2]]]
+            json = JS_Object.from_pairs [["type", "Vector"], ["all_rows_count", 3], ["json", [1, 2]], ["get_child_node", "at"]]
             vis . should_equal json.to_text
 
         group_builder.specify "should handle other datatypes" <|

From 1d0dfe17f880c3540316630d2ba4976639459826 Mon Sep 17 00:00:00 2001
From: somebody1234 <ehern.lee@gmail.com>
Date: Mon, 12 Aug 2024 22:55:49 +1000
Subject: [PATCH 12/23] Fix flaky dashboard E2E tests (#10773)

- Potentially fixes https://github.com/enso-org/enso/issues/10667
- Potentially fixes a similar issue with labels test failiing

# Important Notes
None
---
 app/dashboard/e2e/api.ts                    |   63 ++
 app/dashboard/e2e/labels.spec.ts            |    1 +
 app/dashboard/e2e/latestGithubReleases.json | 1106 +++++++++++++++++++
 app/dashboard/e2e/pageSwitcher.spec.ts      |    4 +
 app/dashboard/tsconfig.json                 |    1 +
 5 files changed, 1175 insertions(+)
 create mode 100644 app/dashboard/e2e/latestGithubReleases.json

diff --git a/app/dashboard/e2e/api.ts b/app/dashboard/e2e/api.ts
index a949ecc4ef6e..c8261eed4bb2 100644
--- a/app/dashboard/e2e/api.ts
+++ b/app/dashboard/e2e/api.ts
@@ -12,6 +12,8 @@ import * as uniqueString from '#/utilities/uniqueString'
 
 import * as actions from './actions'
 
+import LATEST_GITHUB_RELEASES from './latestGithubReleases.json' with { type: 'json' }
+
 // =================
 // === Constants ===
 // =================
@@ -357,6 +359,67 @@ async function mockApiInternal({ page, setupAPI }: MockParams) {
     await page.route('https://www.googletagmanager.com/gtag/js*', (route) =>
       route.fulfill({ contentType: 'text/javascript', body: 'export {};' }),
     )
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    if (process.env.MOCK_ALL_URLS === 'true') {
+      await page.route('https://fonts.googleapis.com/css2*', async (route) => {
+        await route.fulfill({ contentType: 'text/css', body: '' })
+      })
+      await page.route('https://ensoanalytics.com/eula.json', async (route) => {
+        await route.fulfill({
+          json: {
+            path: '/eula.md',
+            // eslint-disable-next-line @typescript-eslint/no-magic-numbers
+            size: 9472,
+            modified: '2024-06-26T10:44:04.939Z',
+            hash: '1c8a655202e59f0efebf5a83a703662527aa97247052964f959a8488382604b8',
+          },
+        })
+      })
+      await page.route(
+        'https://api.github.com/repos/enso-org/enso/releases/latest',
+        async (route) => {
+          await route.fulfill({ json: LATEST_GITHUB_RELEASES })
+        },
+      )
+      await page.route('https://github.com/enso-org/enso/releases/download/**', async (route) => {
+        await route.fulfill({
+          // eslint-disable-next-line @typescript-eslint/no-magic-numbers
+          status: 302,
+          headers: { location: 'https://objects.githubusercontent.com/foo/bar' },
+        })
+      })
+      await page.route('https://objects.githubusercontent.com/**', async (route) => {
+        await route.fulfill({
+          // eslint-disable-next-line @typescript-eslint/no-magic-numbers
+          status: 200,
+          headers: {
+            /* eslint-disable @typescript-eslint/naming-convention */
+            'content-type': 'application/octet-stream',
+            'last-modified': 'Wed, 24 Jul 2024 17:22:47 GMT',
+            etag: '"0x8DCAC053D058EA5"',
+            server: 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0',
+            'x-ms-request-id': '20ab2b4e-c01e-0068-7dfa-dd87c5000000',
+            'x-ms-version': '2020-10-02',
+            'x-ms-creation-time': 'Wed, 24 Jul 2024 17:22:47 GMT',
+            'x-ms-lease-status': 'unlocked',
+            'x-ms-lease-state': 'available',
+            'x-ms-blob-type': 'BlockBlob',
+            'content-disposition': 'attachment; filename=enso-linux-x86_64-2024.3.1-rc3.AppImage',
+            'x-ms-server-encrypted': 'true',
+            via: '1.1 varnish, 1.1 varnish',
+            'accept-ranges': 'bytes',
+            age: '1217',
+            date: 'Mon, 29 Jul 2024 09:40:09 GMT',
+            'x-served-by': 'cache-iad-kcgs7200163-IAD, cache-bne12520-BNE',
+            'x-cache': 'HIT, HIT',
+            'x-cache-hits': '48, 0',
+            'x-timer': 'S1722246008.269342,VS0,VE895',
+            'content-length': '1030383958',
+            /* eslint-enable @typescript-eslint/naming-convention */
+          },
+        })
+      })
+    }
     const isActuallyOnline = await page.evaluate(() => navigator.onLine)
     if (!isActuallyOnline) {
       await page.route('https://fonts.googleapis.com/*', (route) => route.abort())
diff --git a/app/dashboard/e2e/labels.spec.ts b/app/dashboard/e2e/labels.spec.ts
index 0683b296e261..65d813f9350a 100644
--- a/app/dashboard/e2e/labels.spec.ts
+++ b/app/dashboard/e2e/labels.spec.ts
@@ -51,6 +51,7 @@ test.test('drag labels onto multiple rows', async ({ page }) => {
   const labelEl = actions.locateLabelsPanelLabels(page, label)
 
   await page.keyboard.down(await actions.modModifier(page))
+  await test.expect(assetRows).toHaveCount(4)
   await actions.clickAssetRow(assetRows.nth(0))
   await actions.clickAssetRow(assetRows.nth(2))
   await test.expect(labelEl).toBeVisible()
diff --git a/app/dashboard/e2e/latestGithubReleases.json b/app/dashboard/e2e/latestGithubReleases.json
new file mode 100644
index 000000000000..171185284e3e
--- /dev/null
+++ b/app/dashboard/e2e/latestGithubReleases.json
@@ -0,0 +1,1106 @@
+{
+  "url": "https://api.github.com/repos/enso-org/enso/releases/166959527",
+  "assets_url": "https://api.github.com/repos/enso-org/enso/releases/166959527/assets",
+  "upload_url": "https://uploads.github.com/repos/enso-org/enso/releases/166959527/assets{?name,label}",
+  "html_url": "https://github.com/enso-org/enso/releases/tag/2024.3.1-rc3",
+  "id": 166959527,
+  "author": {
+    "login": "github-actions[bot]",
+    "id": 41898282,
+    "node_id": "MDM6Qm90NDE4OTgyODI=",
+    "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+    "html_url": "https://github.com/apps/github-actions",
+    "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+    "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+    "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+    "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+    "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+    "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+    "type": "Bot",
+    "site_admin": false
+  },
+  "node_id": "RE_kwDOBJHs384J85mn",
+  "tag_name": "2024.3.1-rc3",
+  "target_commitish": "df55f6506071ed89f08e8df1b21d4bca670b8dbe",
+  "name": "Enso 2024.3.1-rc3",
+  "draft": false,
+  "prerelease": false,
+  "created_at": "2024-07-24T16:40:45Z",
+  "published_at": "2024-07-24T18:48:34Z",
+  "assets": [
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181611371",
+      "id": 181611371,
+      "node_id": "RA_kwDOBJHs384K0ytr",
+      "name": "assets.json",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/json",
+      "state": "uploaded",
+      "size": 1428,
+      "download_count": 1,
+      "created_at": "2024-07-24T18:48:37Z",
+      "updated_at": "2024-07-24T18:48:37Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/assets.json"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181596166",
+      "id": 181596166,
+      "node_id": "RA_kwDOBJHs384K0vAG",
+      "name": "enso-bundle-2024.3.1-rc3-linux-amd64.tar.gz",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/gzip",
+      "state": "uploaded",
+      "size": 858298795,
+      "download_count": 3,
+      "created_at": "2024-07-24T17:08:31Z",
+      "updated_at": "2024-07-24T17:09:01Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-bundle-2024.3.1-rc3-linux-amd64.tar.gz"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181596666",
+      "id": 181596666,
+      "node_id": "RA_kwDOBJHs384K0vH6",
+      "name": "enso-bundle-2024.3.1-rc3-macos-aarch64.tar.gz",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/gzip",
+      "state": "uploaded",
+      "size": 862159215,
+      "download_count": 2,
+      "created_at": "2024-07-24T17:12:24Z",
+      "updated_at": "2024-07-24T17:12:52Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-bundle-2024.3.1-rc3-macos-aarch64.tar.gz"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181599597",
+      "id": 181599597,
+      "node_id": "RA_kwDOBJHs384K0v1t",
+      "name": "enso-bundle-2024.3.1-rc3-macos-amd64.tar.gz",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/gzip",
+      "state": "uploaded",
+      "size": 849560594,
+      "download_count": 3,
+      "created_at": "2024-07-24T17:33:42Z",
+      "updated_at": "2024-07-24T17:36:05Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-bundle-2024.3.1-rc3-macos-amd64.tar.gz"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181597182",
+      "id": 181597182,
+      "node_id": "RA_kwDOBJHs384K0vP-",
+      "name": "enso-bundle-2024.3.1-rc3-windows-amd64.zip",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/zip",
+      "state": "uploaded",
+      "size": 856323128,
+      "download_count": 3,
+      "created_at": "2024-07-24T17:15:16Z",
+      "updated_at": "2024-07-24T17:15:44Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-bundle-2024.3.1-rc3-windows-amd64.zip"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181596021",
+      "id": 181596021,
+      "node_id": "RA_kwDOBJHs384K0u91",
+      "name": "enso-engine-2024.3.1-rc3-linux-amd64.tar.gz",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/gzip",
+      "state": "uploaded",
+      "size": 549393006,
+      "download_count": 1,
+      "created_at": "2024-07-24T17:07:11Z",
+      "updated_at": "2024-07-24T17:07:31Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-engine-2024.3.1-rc3-linux-amd64.tar.gz"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181596484",
+      "id": 181596484,
+      "node_id": "RA_kwDOBJHs384K0vFE",
+      "name": "enso-engine-2024.3.1-rc3-macos-aarch64.tar.gz",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/gzip",
+      "state": "uploaded",
+      "size": 547995238,
+      "download_count": 0,
+      "created_at": "2024-07-24T17:10:38Z",
+      "updated_at": "2024-07-24T17:10:56Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-engine-2024.3.1-rc3-macos-aarch64.tar.gz"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181599192",
+      "id": 181599192,
+      "node_id": "RA_kwDOBJHs384K0vvY",
+      "name": "enso-engine-2024.3.1-rc3-macos-amd64.tar.gz",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/gzip",
+      "state": "uploaded",
+      "size": 548006738,
+      "download_count": 0,
+      "created_at": "2024-07-24T17:30:56Z",
+      "updated_at": "2024-07-24T17:32:38Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-engine-2024.3.1-rc3-macos-amd64.tar.gz"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181596857",
+      "id": 181596857,
+      "node_id": "RA_kwDOBJHs384K0vK5",
+      "name": "enso-engine-2024.3.1-rc3-windows-amd64.zip",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/zip",
+      "state": "uploaded",
+      "size": 546077818,
+      "download_count": 0,
+      "created_at": "2024-07-24T17:13:33Z",
+      "updated_at": "2024-07-24T17:14:03Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-engine-2024.3.1-rc3-windows-amd64.zip"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181596071",
+      "id": 181596071,
+      "node_id": "RA_kwDOBJHs384K0u-n",
+      "name": "enso-launcher-2024.3.1-rc3-linux-amd64.tar.gz",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/gzip",
+      "state": "uploaded",
+      "size": 20113787,
+      "download_count": 0,
+      "created_at": "2024-07-24T17:07:34Z",
+      "updated_at": "2024-07-24T17:07:36Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-launcher-2024.3.1-rc3-linux-amd64.tar.gz"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181596512",
+      "id": 181596512,
+      "node_id": "RA_kwDOBJHs384K0vFg",
+      "name": "enso-launcher-2024.3.1-rc3-macos-aarch64.tar.gz",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/gzip",
+      "state": "uploaded",
+      "size": 19643459,
+      "download_count": 0,
+      "created_at": "2024-07-24T17:10:59Z",
+      "updated_at": "2024-07-24T17:11:01Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-launcher-2024.3.1-rc3-macos-aarch64.tar.gz"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181599494",
+      "id": 181599494,
+      "node_id": "RA_kwDOBJHs384K0v0G",
+      "name": "enso-launcher-2024.3.1-rc3-macos-amd64.tar.gz",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/gzip",
+      "state": "uploaded",
+      "size": 19800200,
+      "download_count": 0,
+      "created_at": "2024-07-24T17:32:41Z",
+      "updated_at": "2024-07-24T17:32:43Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-launcher-2024.3.1-rc3-macos-amd64.tar.gz"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181597031",
+      "id": 181597031,
+      "node_id": "RA_kwDOBJHs384K0vNn",
+      "name": "enso-launcher-2024.3.1-rc3-windows-amd64.zip",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/zip",
+      "state": "uploaded",
+      "size": 19484737,
+      "download_count": 0,
+      "created_at": "2024-07-24T17:14:08Z",
+      "updated_at": "2024-07-24T17:14:09Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-launcher-2024.3.1-rc3-windows-amd64.zip"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181598141",
+      "id": 181598141,
+      "node_id": "RA_kwDOBJHs384K0ve9",
+      "name": "enso-linux-x86_64-2024.3.1-rc3.AppImage",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/octet-stream",
+      "state": "uploaded",
+      "size": 1030383958,
+      "download_count": 370,
+      "created_at": "2024-07-24T17:22:11Z",
+      "updated_at": "2024-07-24T17:22:48Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-linux-x86_64-2024.3.1-rc3.AppImage"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181598234",
+      "id": 181598234,
+      "node_id": "RA_kwDOBJHs384K0vga",
+      "name": "enso-linux-x86_64-2024.3.1-rc3.sha256",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/octet-stream",
+      "state": "uploaded",
+      "size": 64,
+      "download_count": 0,
+      "created_at": "2024-07-24T17:22:48Z",
+      "updated_at": "2024-07-24T17:22:48Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-linux-x86_64-2024.3.1-rc3.sha256"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181606533",
+      "id": 181606533,
+      "node_id": "RA_kwDOBJHs384K0xiF",
+      "name": "enso-mac-arm64-2024.3.1-rc3.dmg",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/octet-stream",
+      "state": "uploaded",
+      "size": 1022616014,
+      "download_count": 22,
+      "created_at": "2024-07-24T18:16:04Z",
+      "updated_at": "2024-07-24T18:16:41Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-mac-arm64-2024.3.1-rc3.dmg"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181606723",
+      "id": 181606723,
+      "node_id": "RA_kwDOBJHs384K0xlD",
+      "name": "enso-mac-arm64-2024.3.1-rc3.sha256",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/octet-stream",
+      "state": "uploaded",
+      "size": 64,
+      "download_count": 0,
+      "created_at": "2024-07-24T18:16:41Z",
+      "updated_at": "2024-07-24T18:16:42Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-mac-arm64-2024.3.1-rc3.sha256"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181611019",
+      "id": 181611019,
+      "node_id": "RA_kwDOBJHs384K0yoL",
+      "name": "enso-mac-x64-2024.3.1-rc3.dmg",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/octet-stream",
+      "state": "uploaded",
+      "size": 1018774891,
+      "download_count": 2,
+      "created_at": "2024-07-24T18:46:07Z",
+      "updated_at": "2024-07-24T18:47:37Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-mac-x64-2024.3.1-rc3.dmg"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181611229",
+      "id": 181611229,
+      "node_id": "RA_kwDOBJHs384K0yrd",
+      "name": "enso-mac-x64-2024.3.1-rc3.sha256",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/octet-stream",
+      "state": "uploaded",
+      "size": 64,
+      "download_count": 0,
+      "created_at": "2024-07-24T18:47:37Z",
+      "updated_at": "2024-07-24T18:47:37Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-mac-x64-2024.3.1-rc3.sha256"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181596080",
+      "id": 181596080,
+      "node_id": "RA_kwDOBJHs384K0u-w",
+      "name": "enso-project-manager-2024.3.1-rc3-linux-amd64.tar.gz",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/gzip",
+      "state": "uploaded",
+      "size": 72941303,
+      "download_count": 0,
+      "created_at": "2024-07-24T17:07:43Z",
+      "updated_at": "2024-07-24T17:07:46Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-project-manager-2024.3.1-rc3-linux-amd64.tar.gz"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181596537",
+      "id": 181596537,
+      "node_id": "RA_kwDOBJHs384K0vF5",
+      "name": "enso-project-manager-2024.3.1-rc3-macos-aarch64.tar.gz",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/gzip",
+      "state": "uploaded",
+      "size": 71748842,
+      "download_count": 0,
+      "created_at": "2024-07-24T17:11:07Z",
+      "updated_at": "2024-07-24T17:11:11Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-project-manager-2024.3.1-rc3-macos-aarch64.tar.gz"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181599514",
+      "id": 181599514,
+      "node_id": "RA_kwDOBJHs384K0v0a",
+      "name": "enso-project-manager-2024.3.1-rc3-macos-amd64.tar.gz",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/gzip",
+      "state": "uploaded",
+      "size": 72474560,
+      "download_count": 0,
+      "created_at": "2024-07-24T17:32:52Z",
+      "updated_at": "2024-07-24T17:32:59Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-project-manager-2024.3.1-rc3-macos-amd64.tar.gz"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181597064",
+      "id": 181597064,
+      "node_id": "RA_kwDOBJHs384K0vOI",
+      "name": "enso-project-manager-2024.3.1-rc3-windows-amd64.zip",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/zip",
+      "state": "uploaded",
+      "size": 70706423,
+      "download_count": 0,
+      "created_at": "2024-07-24T17:14:28Z",
+      "updated_at": "2024-07-24T17:14:31Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-project-manager-2024.3.1-rc3-windows-amd64.zip"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181599175",
+      "id": 181599175,
+      "node_id": "RA_kwDOBJHs384K0vvH",
+      "name": "enso-win-x64-2024.3.1-rc3.exe",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/vnd.microsoft.portable-executable",
+      "state": "uploaded",
+      "size": 1037289696,
+      "download_count": 35,
+      "created_at": "2024-07-24T17:30:39Z",
+      "updated_at": "2024-07-24T17:31:51Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-win-x64-2024.3.1-rc3.exe"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181599394",
+      "id": 181599394,
+      "node_id": "RA_kwDOBJHs384K0vyi",
+      "name": "enso-win-x64-2024.3.1-rc3.sha256",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/octet-stream",
+      "state": "uploaded",
+      "size": 64,
+      "download_count": 0,
+      "created_at": "2024-07-24T17:31:51Z",
+      "updated_at": "2024-07-24T17:31:51Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-win-x64-2024.3.1-rc3.sha256"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181596446",
+      "id": 181596446,
+      "node_id": "RA_kwDOBJHs384K0vEe",
+      "name": "launcher-manifest.yaml",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "text/yaml",
+      "state": "uploaded",
+      "size": 101,
+      "download_count": 0,
+      "created_at": "2024-07-24T17:10:30Z",
+      "updated_at": "2024-07-24T17:10:30Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/launcher-manifest.yaml"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181596443",
+      "id": 181596443,
+      "node_id": "RA_kwDOBJHs384K0vEb",
+      "name": "manifest.yaml",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "text/yaml",
+      "state": "uploaded",
+      "size": 274,
+      "download_count": 0,
+      "created_at": "2024-07-24T17:10:29Z",
+      "updated_at": "2024-07-24T17:10:29Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/manifest.yaml"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181596336",
+      "id": 181596336,
+      "node_id": "RA_kwDOBJHs384K0vCw",
+      "name": "project-manager-bundle-2024.3.1-rc3-linux-amd64.tar.gz",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/gzip",
+      "state": "uploaded",
+      "size": 911128717,
+      "download_count": 1,
+      "created_at": "2024-07-24T17:09:55Z",
+      "updated_at": "2024-07-24T17:10:29Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/project-manager-bundle-2024.3.1-rc3-linux-amd64.tar.gz"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181597048",
+      "id": 181597048,
+      "node_id": "RA_kwDOBJHs384K0vN4",
+      "name": "project-manager-bundle-2024.3.1-rc3-macos-aarch64.tar.gz",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/gzip",
+      "state": "uploaded",
+      "size": 914278251,
+      "download_count": 1,
+      "created_at": "2024-07-24T17:14:18Z",
+      "updated_at": "2024-07-24T17:14:51Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/project-manager-bundle-2024.3.1-rc3-macos-aarch64.tar.gz"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181600014",
+      "id": 181600014,
+      "node_id": "RA_kwDOBJHs384K0v8O",
+      "name": "project-manager-bundle-2024.3.1-rc3-macos-amd64.tar.gz",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/gzip",
+      "state": "uploaded",
+      "size": 902231006,
+      "download_count": 1,
+      "created_at": "2024-07-24T17:36:54Z",
+      "updated_at": "2024-07-24T17:40:15Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/project-manager-bundle-2024.3.1-rc3-macos-amd64.tar.gz"
+    },
+    {
+      "url": "https://api.github.com/repos/enso-org/enso/releases/assets/181597329",
+      "id": 181597329,
+      "node_id": "RA_kwDOBJHs384K0vSR",
+      "name": "project-manager-bundle-2024.3.1-rc3-windows-amd64.zip",
+      "label": "",
+      "uploader": {
+        "login": "github-actions[bot]",
+        "id": 41898282,
+        "node_id": "MDM6Qm90NDE4OTgyODI=",
+        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+        "html_url": "https://github.com/apps/github-actions",
+        "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+        "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+        "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+        "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+        "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+        "type": "Bot",
+        "site_admin": false
+      },
+      "content_type": "application/zip",
+      "state": "uploaded",
+      "size": 907545448,
+      "download_count": 1,
+      "created_at": "2024-07-24T17:16:36Z",
+      "updated_at": "2024-07-24T17:17:09Z",
+      "browser_download_url": "https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/project-manager-bundle-2024.3.1-rc3-windows-amd64.zip"
+    }
+  ],
+  "tarball_url": "https://api.github.com/repos/enso-org/enso/tarball/2024.3.1-rc3",
+  "zipball_url": "https://api.github.com/repos/enso-org/enso/zipball/2024.3.1-rc3",
+  "body": "# Download\r\n\r\n## Enso IDE\r\n\r\nEnso IDE is the main product of the Enso project. The packages are stand-alone, they contain both GUI and the backend.\r\n\r\nDownload links:\r\n- [Windows](https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-win-x64-2024.3.1-rc3.exe)\r\n- [Linux](https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-linux-x86_64-2024.3.1-rc3.AppImage)\r\n- [macOS (Intel)](https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-mac-x64-2024.3.1-rc3.dmg)\r\n- [macOS (Apple silicon)](https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-mac-arm64-2024.3.1-rc3.dmg)\r\n\r\nThis is the recommended download for most users.\r\n\r\n## Enso Engine\r\n\r\nIf you are interested in using Enso Engine command line tools only, download the Enso Engine bundle.\r\n\r\nDownload links:\r\n- [Windows](https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-bundle-2024.3.1-rc3-windows-amd64.zip)\r\n- [Linux](https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-bundle-2024.3.1-rc3-linux-amd64.tar.gz)\r\n- [macOS (Intel)](https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-bundle-2024.3.1-rc3-macos-amd64.tar.gz)\r\n- [macOS (Apple silicon)](https://github.com/enso-org/enso/releases/download/2024.3.1-rc3/enso-bundle-2024.3.1-rc3-macos-aarch64.tar.gz)\r\n\r\nThese are archives containing the [Enso portable distribution](https://enso.org/docs/developer/enso/distribution/distribution.html#portable-enso-distribution-layout). User is responsible for setting up the environment variables and adding the `bin` directory to the `PATH`.\r\n\r\nNote that these distributions do not allow you to use the Enso IDE.\r\n\r\nIt is recommended only for advanced users, who want to just try the compiler CLI.\r\n\r\n# Anonymous Data Collection\r\n\r\nPlease note that this release collects anonymous usage data which will be used to improve Enso and prepare it for a stable release. We will switch to opt-in data collection in stable version releases. The usage data will not contain your code (expressions above nodes), however, reported errors may contain brief snippets of out of context code that specifically leads to the error, like \"the method 'foo' does not exist on Number\". The following data will be collected:\r\n\r\n- Session length.\r\n- Graph editing events (node creation, deletion, position change, connect, disconnect, collapse, edit start, edit end). This will not include any information about node expressions used.\r\n- Navigation events (camera movement, scope change).\r\n- Visualization events (visualization open, close, switch). This will not include any information about the displayed data nor the rendered visualization itself.\r\n- Project management events (project open, close, rename).\r\n- Errors (IDE crashes, WASM panics, Project Manager errors, Language Server errors, Compiler errors).\r\n- Performance statistics (minimum, maximum, average GUI refresh rate).\r\n\r\n# Changelog\r\n\r\n#### Enso Language &amp; Runtime\r\n\r\n- [Enforce conversion method return type][10468]\r\n- [Renaming launcher executable to ensoup][10535]\r\n- [Space-precedence does not apply to value-level operators][10597]\r\n\r\n[10468]: https://github.com/enso-org/enso/pull/10468\r\n[10535]: https://github.com/enso-org/enso/pull/10535\r\n[10597]: https://github.com/enso-org/enso/pull/10597\r\n\r\n#### Enso IDE\r\n\r\n- [&quot;Add node&quot; button is not obscured by output port][10433]\r\n- [Numeric Widget does not accept non-numeric input][10457]. This is to prevent\r\n  node being completely altered by accidental code put to the widget.\r\n- [Redesigned &quot;record control&quot; panel][10509]. Now it contains more intuitive\r\n  &quot;refresh&quot; and &quot;write all&quot; buttons.\r\n- [Warning messages do not obscure visualization buttons][10546].\r\n- [Output component in collapsed function changed][10577]. It cannot be deleted\r\n  anymore, except by directily editing the code.\r\n- [Multiselect drop-down widget visuals are improved][10607].\r\n- [Text displayed in monospace and whitespace rendered as symbols][10563].\r\n\r\n[10433]: https://github.com/enso-org/enso/pull/10443\r\n[10457]: https://github.com/enso-org/enso/pull/10457\r\n[10509]: https://github.com/enso-org/enso/pull/10509\r\n[10546]: https://github.com/enso-org/enso/pull/10546\r\n[10577]: https://github.com/enso-org/enso/pull/10577\r\n[10607]: https://github.com/enso-org/enso/pull/10607\r\n[10563]: https://github.com/enso-org/enso/pull/10563\r\n\r\n#### Enso Enso Standard Library\r\n\r\n- [Renamed &#x60;Data.list_directory&#x60; to &#x60;Data.list&#x60;. Removed list support from read\r\n  methods.][10434]\r\n- [Renamed &#x60;Location.Start&#x60; to &#x60;Location.Left&#x60; and &#x60;Location.End&#x60; to\r\n  &#x60;Location.Right&#x60;.][10445]\r\n- [Renamed &#x60;Postgres_Details.Postgres&#x60; to &#x60;Postgres.Server&#x60;.][10466]\r\n- [Remove &#x60;First&#x60; and &#x60;Last&#x60; from namespace, use auto-scoped.][10467]\r\n- [Rename &#x60;Map&#x60; to &#x60;Dictionary&#x60; and &#x60;Set&#x60; to &#x60;Hashset&#x60;.][10474]\r\n- [Compare two objects with &#x60;Ordering.compare&#x60; and define comparator with\r\n  &#x60;Comparable.new&#x60;][10468]\r\n- [Added &#x60;dec&#x60; construction function for creating &#x60;Decimal&#x60;s.][10517]\r\n\r\n[10434]: https://github.com/enso-org/enso/pull/10434\r\n[10445]: https://github.com/enso-org/enso/pull/10445\r\n[10466]: https://github.com/enso-org/enso/pull/10466\r\n[10467]: https://github.com/enso-org/enso/pull/10467\r\n[10474]: https://github.com/enso-org/enso/pull/10474\r\n[10517]: https://github.com/enso-org/enso/pull/10517\r\n",
+  "reactions": {
+    "url": "https://api.github.com/repos/enso-org/enso/releases/166959527/reactions",
+    "total_count": 1,
+    "+1": 0,
+    "-1": 0,
+    "laugh": 0,
+    "hooray": 0,
+    "confused": 0,
+    "heart": 0,
+    "rocket": 1,
+    "eyes": 0
+  }
+}
diff --git a/app/dashboard/e2e/pageSwitcher.spec.ts b/app/dashboard/e2e/pageSwitcher.spec.ts
index 115478fc3387..4800b78ab532 100644
--- a/app/dashboard/e2e/pageSwitcher.spec.ts
+++ b/app/dashboard/e2e/pageSwitcher.spec.ts
@@ -8,6 +8,10 @@ test.test('page switcher', ({ page }) =>
     .mockAllAndLogin({ page })
     // Create a new project so that the editor page can be switched to.
     .newEmptyProject()
+    .do(async (thePage) => {
+      await test.expect(actions.locateDriveView(thePage)).not.toBeVisible()
+      await test.expect(actions.locateEditor(thePage)).toBeVisible()
+    })
     .goToPage.drive()
     .do(async (thePage) => {
       await test.expect(actions.locateDriveView(thePage)).toBeVisible()
diff --git a/app/dashboard/tsconfig.json b/app/dashboard/tsconfig.json
index a50e793d18f3..3ed52dcedc51 100644
--- a/app/dashboard/tsconfig.json
+++ b/app/dashboard/tsconfig.json
@@ -5,6 +5,7 @@
     "e2e",
     "../types",
     "./src/**/*.json",
+    "./e2e/**/*.json",
     "../../utils.ts",
     ".prettierrc.cjs",
     "*.js",

From 6eece5f8d6e990ac43082a21dc8e20c5fcd14b88 Mon Sep 17 00:00:00 2001
From: Adam Obuchowicz <adam.obuchowicz@enso.org>
Date: Mon, 12 Aug 2024 16:45:58 +0200
Subject: [PATCH 13/23] Table Editor Widget (#10774)

Fixes #10293

The Table Editor Widget allows adding rows and columns, editing cells and renaming columns.

[Screencast from 2024-08-07 13-17-37.webm](https://github.com/user-attachments/assets/d2e708b5-6516-4107-bc17-f018e455c111)

# Important Notes
* The parts of Table Visualization which were useful for the widget were put in vue component. On this occasion, we use aggrid vue.
---
 CHANGELOG.md                                  |   6 +
 app/gui2/e2e/widgets.spec.ts                  |  62 ++++
 app/gui2/package.json                         |   2 +
 .../GraphEditor/widgets/WidgetTableEditor.vue | 168 +++++++++-
 .../widgets/WidgetTableEditor/TableHeader.vue |  87 +++++
 .../__tests__/tableNewArgument.test.ts        | 241 ++++++++++++++
 .../WidgetTableEditor/tableNewArgument.ts     | 301 ++++++++++++++++++
 .../visualizations/TableVisualization.vue     | 250 +++------------
 .../components/widgets/AgGridTableView.vue    | 202 ++++++++++++
 .../src/util/ast/__tests__/abstract.test.ts   | 106 +++++-
 app/gui2/src/util/ast/abstract.ts             |  17 +-
 app/gui2/src/util/autoBlur.ts                 |   7 +-
 app/ydoc-shared/src/ast/parse.ts              |   1 +
 app/ydoc-shared/src/ast/tree.ts               |  53 ++-
 app/ydoc-shared/src/util/data/result.ts       | 121 +++++++
 pnpm-lock.yaml                                |  25 +-
 16 files changed, 1404 insertions(+), 245 deletions(-)
 create mode 100644 app/gui2/src/components/GraphEditor/widgets/WidgetTableEditor/TableHeader.vue
 create mode 100644 app/gui2/src/components/GraphEditor/widgets/WidgetTableEditor/__tests__/tableNewArgument.test.ts
 create mode 100644 app/gui2/src/components/GraphEditor/widgets/WidgetTableEditor/tableNewArgument.ts
 create mode 100644 app/gui2/src/components/widgets/AgGridTableView.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c6c74f663d8..f9c6ca98693d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Next Release
 
+#### Enso IDE
+
+- [Table Editor Widget][10774] displayed in `Table.new` component.
+
+[10774]: https://github.com/enso-org/enso/pull/10774
+
 #### Enso Standard Library
 
 - [Implemented in-memory and database mixed `Decimal` column
diff --git a/app/gui2/e2e/widgets.spec.ts b/app/gui2/e2e/widgets.spec.ts
index 7f823d4b0e95..b42381857fdf 100644
--- a/app/gui2/e2e/widgets.spec.ts
+++ b/app/gui2/e2e/widgets.spec.ts
@@ -533,3 +533,65 @@ test('Autoscoped constructors', async ({ page }) => {
   await expect(groupBy).toBeVisible()
   await expect(groupBy.locator('.WidgetArgumentName')).toContainText(['column', 'new_name'])
 })
+
+test('Table widget', async ({ page }) => {
+  await actions.goToGraph(page)
+
+  // Adding `Table.new` component will display the widget
+  await locate.addNewNodeButton(page).click()
+  await expect(locate.componentBrowser(page)).toBeVisible()
+  await page.keyboard.type('Table.new')
+  // Wait for CB entry to appear; this way we're sure about node name (binding).
+  await expect(locate.componentBrowserSelectedEntry(page)).toHaveCount(1)
+  await expect(locate.componentBrowserSelectedEntry(page)).toHaveText('Table.new')
+  await page.keyboard.press('Enter')
+  const node = locate.selectedNodes(page)
+  await expect(node).toHaveCount(1)
+  await expect(node).toBeVisible()
+  await mockMethodCallInfo(
+    page,
+    { binding: 'table1', expr: 'Table.new' },
+    {
+      methodPointer: {
+        module: 'Standard.Table.Table',
+        definedOnType: 'Standard.Table.Table.Table',
+        name: 'new',
+      },
+      notAppliedArguments: [0],
+    },
+  )
+  const widget = node.locator('.WidgetTableEditor')
+  await expect(widget).toBeVisible()
+  await expect(widget.locator('.ag-header-cell-text')).toHaveText('New Column')
+  await expect(widget.locator('.ag-header-cell-text')).toHaveClass(/(?<=^| )virtualColumn(?=$| )/)
+  // There's one empty cell, allowing creating first row and column
+  await expect(widget.locator('.ag-cell')).toHaveCount(1)
+
+  // Putting first value
+  await widget.locator('.ag-cell').dblclick()
+  await page.keyboard.type('Value')
+  await page.keyboard.press('Enter')
+  // There will be new blank column and new blank row allowing adding new columns and rows
+  // (so 4 cells in total)
+  await expect(widget.locator('.ag-header-cell-text')).toHaveText(['New Column', 'New Column'])
+  await expect(widget.locator('.ag-cell')).toHaveText(['Value', '', '', ''])
+
+  // Renaming column
+  await widget.locator('.ag-header-cell-text').first().dblclick()
+  await page.keyboard.type('Header')
+  await page.keyboard.press('Enter')
+  await expect(widget.locator('.ag-header-cell-text')).toHaveText(['Header', 'New Column'])
+
+  // Switching edit between cells and headers - check we will never edit two things at once.
+  await expect(widget.locator('.ag-text-field-input')).toHaveCount(0)
+  await widget.locator('.ag-header-cell-text').first().dblclick()
+  await expect(widget.locator('.ag-text-field-input')).toHaveCount(1)
+  await widget.locator('.ag-cell').first().dblclick()
+  await expect(widget.locator('.ag-text-field-input')).toHaveCount(1)
+  await widget.locator('.ag-header-cell-text').first().dblclick()
+  await expect(widget.locator('.ag-text-field-input')).toHaveCount(1)
+  await widget.locator('.ag-header-cell-text').last().dblclick()
+  await expect(widget.locator('.ag-text-field-input')).toHaveCount(1)
+  await page.keyboard.press('Escape')
+  await expect(widget.locator('.ag-text-field-input')).toHaveCount(0)
+})
diff --git a/app/gui2/package.json b/app/gui2/package.json
index c39edf0ff127..8da94f8ad2a1 100644
--- a/app/gui2/package.json
+++ b/app/gui2/package.json
@@ -65,6 +65,7 @@
     "@vueuse/core": "^10.4.1",
     "ag-grid-community": "^30.2.1",
     "ag-grid-enterprise": "^30.2.1",
+    "ag-grid-vue3": "^30.2.1",
     "codemirror": "^6.0.1",
     "culori": "^3.2.0",
     "enso-dashboard": "workspace:*",
@@ -82,6 +83,7 @@
     "sucrase": "^3.34.0",
     "veaury": "^2.3.18",
     "vue": "^3.4.19",
+    "vue-component-type-helpers": "^2.0.29",
     "y-codemirror.next": "^0.3.2",
     "y-protocols": "^1.0.5",
     "y-textarea": "^1.0.0",
diff --git a/app/gui2/src/components/GraphEditor/widgets/WidgetTableEditor.vue b/app/gui2/src/components/GraphEditor/widgets/WidgetTableEditor.vue
index 4f43876ad73b..f7ed722dc241 100644
--- a/app/gui2/src/components/GraphEditor/widgets/WidgetTableEditor.vue
+++ b/app/gui2/src/components/GraphEditor/widgets/WidgetTableEditor.vue
@@ -1,13 +1,131 @@
 <script setup lang="ts">
+import { WidgetInputIsSpecificMethodCall } from '@/components/GraphEditor/widgets/WidgetFunction.vue'
+import TableHeader from '@/components/GraphEditor/widgets/WidgetTableEditor/TableHeader.vue'
+import {
+  tableNewCallMayBeHandled,
+  useTableNewArgument,
+  type RowData,
+} from '@/components/GraphEditor/widgets/WidgetTableEditor/tableNewArgument'
 import ResizeHandles from '@/components/ResizeHandles.vue'
+import AgGridTableView from '@/components/widgets/AgGridTableView.vue'
 import { injectGraphNavigator } from '@/providers/graphNavigator'
 import { Score, defineWidget, widgetProps } from '@/providers/widgetRegistry'
+import { WidgetEditHandler } from '@/providers/widgetRegistry/editHandler'
+import { useGraphStore } from '@/stores/graph'
+import { useSuggestionDbStore } from '@/stores/suggestionDatabase'
 import { Rect } from '@/util/data/rect'
 import { Vec2 } from '@/util/data/vec2'
+import '@ag-grid-community/styles/ag-grid.css'
+import '@ag-grid-community/styles/ag-theme-alpine.css'
+import type { CellEditingStartedEvent, CellEditingStoppedEvent } from 'ag-grid-community'
+import type { Column } from 'ag-grid-enterprise'
 import { computed, ref } from 'vue'
-import { WidgetInputIsSpecificMethodCall } from './WidgetFunction.vue'
+import type { ComponentExposed } from 'vue-component-type-helpers'
 
-const size = ref(new Vec2(200, 50))
+const props = defineProps(widgetProps(widgetDefinition))
+const graph = useGraphStore()
+const suggestionDb = useSuggestionDbStore()
+const grid = ref<ComponentExposed<typeof AgGridTableView<RowData, any>>>()
+
+const { rowData, columnDefs } = useTableNewArgument(
+  () => props.input,
+  graph,
+  suggestionDb.entries,
+  props.onUpdate,
+)
+
+// === Edit Handlers ===
+
+class CellEditing {
+  handler: WidgetEditHandler
+  editedCell: { rowIndex: number; colKey: Column<RowData> } | undefined
+  supressNextStopEditEvent: boolean = false
+
+  constructor() {
+    this.handler = WidgetEditHandler.New('WidgetTableEditor.cellEditHandler', props.input, {
+      cancel() {
+        grid.value?.gridApi?.stopEditing(true)
+      },
+      end() {
+        grid.value?.gridApi?.stopEditing(false)
+      },
+      suspend: () => {
+        return {
+          resume: () => {
+            this.editedCell && grid.value?.gridApi?.startEditingCell(this.editedCell)
+          },
+        }
+      },
+    })
+  }
+
+  cellEditedInGrid(event: CellEditingStartedEvent) {
+    this.editedCell =
+      event.rowIndex != null ? { rowIndex: event.rowIndex, colKey: event.column } : undefined
+    if (!this.handler.isActive()) {
+      this.handler.start()
+    }
+  }
+
+  cellEditingStoppedInGrid(event: CellEditingStoppedEvent) {
+    if (!this.handler.isActive()) return
+    if (this.supressNextStopEditEvent && this.editedCell) {
+      this.supressNextStopEditEvent = false
+      // If row data changed, the editing will be stopped, but we want to continue it.
+      grid.value?.gridApi?.startEditingCell(this.editedCell)
+    } else {
+      this.handler.end()
+    }
+  }
+
+  rowDataChanged() {
+    if (this.handler.isActive()) {
+      this.supressNextStopEditEvent = true
+    }
+  }
+}
+
+const cellEditHandler = new CellEditing()
+
+class HeaderEditing {
+  handler: WidgetEditHandler
+  stopEditingCallback: ((cancel: boolean) => void) | undefined
+
+  constructor() {
+    this.handler = WidgetEditHandler.New('WidgetTableEditor.headerEditHandler', props.input, {
+      cancel: () => {
+        this.stopEditingCallback?.(true)
+      },
+      end: () => {
+        this.stopEditingCallback?.(false)
+      },
+    })
+  }
+
+  headerEditedInGrid(stopCb: (cancel: boolean) => void) {
+    // If another header is edited, stop it (with the old callback).
+    if (this.handler.isActive()) {
+      this.stopEditingCallback?.(false)
+    }
+    this.stopEditingCallback = stopCb
+    if (!this.handler.isActive()) {
+      this.handler.start()
+    }
+  }
+
+  headerEditingStoppedInGrid() {
+    this.stopEditingCallback = undefined
+    if (this.handler.isActive()) {
+      this.handler.end()
+    }
+  }
+}
+
+const headerEditHandler = new HeaderEditing()
+
+// === Resizing ===
+
+const size = ref(new Vec2(200, 150))
 const graphNav = injectGraphNavigator()
 
 const clientBounds = computed({
@@ -26,7 +144,16 @@ const widgetStyle = computed(() => {
   }
 })
 
-const _props = defineProps(widgetProps(widgetDefinition))
+// === Column Default Definition ===
+
+const defaultColDef = {
+  editable: true,
+  resizable: true,
+  headerComponentParams: {
+    onHeaderEditingStarted: headerEditHandler.headerEditedInGrid.bind(headerEditHandler),
+    onHeaderEditingStopped: headerEditHandler.headerEditingStoppedInGrid.bind(headerEditHandler),
+  },
+}
 </script>
 
 <script lang="ts">
@@ -38,9 +165,10 @@ export const widgetDefinition = defineWidget(
   }),
   {
     priority: 999,
-    // TODO[#10293]: This widget is not yet fully implemented, so it is temporarily disabled.
-    // Change this to `Score.Perfect` or implement appropriate score method as part of next task.
-    score: Score.Mismatch,
+    score: (props) => {
+      if (!tableNewCallMayBeHandled(props.input.value)) return Score.Mismatch
+      return Score.Perfect
+    },
   },
   import.meta.hot,
 )
@@ -48,18 +176,40 @@ export const widgetDefinition = defineWidget(
 
 <template>
   <div class="WidgetTableEditor" :style="widgetStyle">
-    <div>WidgetTableEditor</div>
+    <Suspense>
+      <AgGridTableView
+        ref="grid"
+        class="grid"
+        :defaultColDef="defaultColDef"
+        :columnDefs="columnDefs"
+        :rowData="rowData"
+        :getRowId="(row) => `${row.data.index}`"
+        :components="{ agColumnHeader: TableHeader }"
+        :singleClickEdit="true"
+        :stopEditingWhenCellsLoseFocus="true"
+        @keydown.enter.stop
+        @cellEditingStarted="cellEditHandler.cellEditedInGrid($event)"
+        @cellEditingStopped="cellEditHandler.cellEditingStoppedInGrid($event)"
+        @rowDataUpdated="cellEditHandler.rowDataChanged()"
+        @pointerdown.stop
+        @click.stop
+      />
+    </Suspense>
     <ResizeHandles v-model="clientBounds" bottom right />
   </div>
 </template>
 
 <style scoped>
 .WidgetTableEditor {
-  color: yellow;
   display: flex;
   align-items: center;
   justify-content: center;
-  background: #00ff0055;
   border-radius: var(--node-port-border-radius);
+  position: relative;
+}
+
+.grid {
+  width: 100%;
+  height: 100%;
 }
 </style>
diff --git a/app/gui2/src/components/GraphEditor/widgets/WidgetTableEditor/TableHeader.vue b/app/gui2/src/components/GraphEditor/widgets/WidgetTableEditor/TableHeader.vue
new file mode 100644
index 000000000000..e0c465b96a08
--- /dev/null
+++ b/app/gui2/src/components/GraphEditor/widgets/WidgetTableEditor/TableHeader.vue
@@ -0,0 +1,87 @@
+<script lang="ts">
+import type { IHeaderParams } from 'ag-grid-community'
+import { ref, watch } from 'vue'
+
+/** Parameters recognized by this header component.
+ *
+ * They are set through `headerComponentParams` option in AGGrid column definition.
+ */
+export interface HeaderParams {
+  /** Setter called when column name is changed by the user. */
+  nameSetter?: (newName: string) => void
+  /** Column is virtual if it is not represented in the AST. Such column might be used
+   * to create new one.
+   */
+  virtualColumn?: boolean
+  onHeaderEditingStarted?: (stop: (cancel: boolean) => void) => void
+  onHeaderEditingStopped?: () => void
+}
+</script>
+
+<script setup lang="ts">
+const props = defineProps<{
+  params: IHeaderParams & HeaderParams
+}>()
+
+const editing = ref(false)
+const inputElement = ref<HTMLInputElement>()
+
+watch(editing, (newVal, oldVal) => {
+  if (newVal) {
+    props.params.onHeaderEditingStarted?.((cancel: boolean) => {
+      if (cancel) editing.value = false
+      else acceptNewName()
+    })
+  } else {
+    props.params.onHeaderEditingStopped?.()
+  }
+})
+
+watch(inputElement, (newVal, oldVal) => {
+  if (newVal != null && oldVal == null) {
+    // Whenever input field appears, focus and select text
+    newVal.focus()
+    newVal.select()
+  }
+})
+
+function acceptNewName() {
+  if (inputElement.value == null) {
+    console.error('Tried to accept header new name without input element!')
+    return
+  }
+  props.params.nameSetter?.(inputElement.value.value)
+  editing.value = false
+}
+</script>
+
+<template>
+  <div class="ag-cell-label-container" role="presentation" @pointerdown.stop @click.stop>
+    <div class="ag-header-cell-label" role="presentation">
+      <input
+        v-if="editing"
+        ref="inputElement"
+        class="ag-input-field-input ag-text-field-input"
+        :value="params.displayName"
+        @change="acceptNewName()"
+        @keydown.arrow-left.stop
+        @keydown.arrow-right.stop
+        @keydown.arrow-up.stop
+        @keydown.arrow-down.stop
+      />
+      <span
+        v-else
+        class="ag-header-cell-text"
+        :class="{ virtualColumn: params.virtualColumn === true }"
+        @click="editing = params.nameSetter != null"
+        >{{ params.displayName }}</span
+      >
+    </div>
+  </div>
+</template>
+
+<style>
+.virtualColumn {
+  color: rgba(0, 0, 0, 0.5);
+}
+</style>
diff --git a/app/gui2/src/components/GraphEditor/widgets/WidgetTableEditor/__tests__/tableNewArgument.test.ts b/app/gui2/src/components/GraphEditor/widgets/WidgetTableEditor/__tests__/tableNewArgument.test.ts
new file mode 100644
index 000000000000..29934d4e1f17
--- /dev/null
+++ b/app/gui2/src/components/GraphEditor/widgets/WidgetTableEditor/__tests__/tableNewArgument.test.ts
@@ -0,0 +1,241 @@
+import {
+  tableNewCallMayBeHandled,
+  useTableNewArgument,
+} from '@/components/GraphEditor/widgets/WidgetTableEditor/tableNewArgument'
+import { WidgetInput } from '@/providers/widgetRegistry'
+import { SuggestionDb } from '@/stores/suggestionDatabase'
+import { makeType } from '@/stores/suggestionDatabase/entry'
+import { assert } from '@/util/assert'
+import { Ast } from '@/util/ast'
+import { expect, test, vi } from 'vitest'
+
+function suggestionDbWithNothing() {
+  const db = new SuggestionDb()
+  db.set(1, makeType('Standard.Base.Nothing.Nothing'))
+  return db
+}
+
+test.each([
+  {
+    code: 'Table.new [["a", [1, 2, 3]], ["b", [4, 5, "six"]], ["empty", [Nothing, Standard.Base.Nothing, Nothing]]]',
+    expectedColumnDefs: [
+      { headerName: 'a' },
+      { headerName: 'b' },
+      { headerName: 'empty' },
+      { headerName: 'New Column' },
+    ],
+    expectedRows: [
+      { a: 1, b: 4, empty: null, 'New Column': null },
+      { a: 2, b: 5, empty: null, 'New Column': null },
+      { a: 3, b: 'six', empty: null, 'New Column': null },
+      { a: null, b: null, empty: null, 'New Column': null },
+    ],
+  },
+  {
+    code: 'Table.new []',
+    expectedColumnDefs: [{ headerName: 'New Column' }],
+    expectedRows: [{ 'New Column': null }],
+  },
+  {
+    code: 'Table.new',
+    expectedColumnDefs: [{ headerName: 'New Column' }],
+    expectedRows: [{ 'New Column': null }],
+  },
+  {
+    code: 'Table.new _',
+    expectedColumnDefs: [{ headerName: 'New Column' }],
+    expectedRows: [{ 'New Column': null }],
+  },
+  {
+    code: 'Table.new [["a", []]]',
+    expectedColumnDefs: [{ headerName: 'a' }, { headerName: 'New Column' }],
+    expectedRows: [{ a: null, 'New Column': null }],
+  },
+  {
+    code: 'Table.new [["a", [1,,2]], ["b", [3, 4,]], ["c", [, 5, 6]], ["d", [,,]]]',
+    expectedColumnDefs: [
+      { headerName: 'a' },
+      { headerName: 'b' },
+      { headerName: 'c' },
+      { headerName: 'd' },
+      { headerName: 'New Column' },
+    ],
+    expectedRows: [
+      { a: 1, b: 3, c: null, d: null, 'New Column': null },
+      { a: null, b: 4, c: 5, d: null, 'New Column': null },
+      { a: 2, b: null, c: 6, d: null, 'New Column': null },
+      { a: null, b: null, c: null, d: null, 'New Column': null },
+    ],
+  },
+])('Reading table from $code', ({ code, expectedColumnDefs, expectedRows }) => {
+  const ast = Ast.parse(code)
+  expect(tableNewCallMayBeHandled(ast)).toBeTruthy()
+  const input = WidgetInput.FromAst(ast)
+  const startEdit = vi.fn()
+  const addMissingImports = vi.fn()
+  const onUpdate = vi.fn()
+  const tableNewArgs = useTableNewArgument(
+    input,
+    { startEdit, addMissingImports },
+    suggestionDbWithNothing(),
+    onUpdate,
+  )
+  expect(tableNewArgs.columnDefs.value).toEqual(
+    Array.from(expectedColumnDefs, (colDef) => expect.objectContaining(colDef)),
+  )
+  const resolvedRow = Array.from(tableNewArgs.rowData.value, (row) =>
+    Object.fromEntries(
+      tableNewArgs.columnDefs.value.map((col) => [col.headerName, col.valueGetter({ data: row })]),
+    ),
+  )
+  expect(resolvedRow).toEqual(expectedRows)
+
+  function* expectedIndices() {
+    for (let i = 0; i < expectedRows.length; ++i) {
+      yield expect.objectContaining({ index: i })
+    }
+  }
+  expect(tableNewArgs.rowData.value).toEqual([...expectedIndices()])
+  expect(startEdit).not.toHaveBeenCalled()
+  expect(onUpdate).not.toHaveBeenCalled()
+  expect(addMissingImports).not.toHaveBeenCalled()
+})
+
+test.each([
+  'Table.new 14',
+  'Table.new array1',
+  "Table.new ['a', [123]]",
+  "Table.new [['a', [123]], ['b', [124], []]]",
+  "Table.new [['a', [123]], ['a'.repeat 170, [123]]]",
+  "Table.new [['a', [1, 2, 3, 3 + 1]]]",
+])('"%s" is not valid input for Table Editor Widget', (code) => {
+  const ast = Ast.parse(code)
+  expect(tableNewCallMayBeHandled(ast)).toBeFalsy()
+})
+
+test.each([
+  {
+    code: "Table.new [['a', [1, 2, 3]], ['b', [4, 5, 6]]]",
+    description: 'Editing number',
+    edit: { column: 0, row: 1, value: -22 },
+    expected: "Table.new [['a', [1, -22, 3]], ['b', [4, 5, 6]]]",
+  },
+  {
+    code: "Table.new [['a', [1, 2, 3]], ['b', [4, 5, 6]]]",
+    description: 'Editing string',
+    edit: { column: 0, row: 1, value: 'two' },
+    expected: "Table.new [['a', [1, 'two', 3]], ['b', [4, 5, 6]]]",
+  },
+  {
+    code: "Table.new [['a', [1, 2, 3]], ['b', [4, 5, 6]]]",
+    description: 'Putting blank value',
+    edit: { column: 1, row: 1, value: '' },
+    expected: "Table.new [['a', [1, 2, 3]], ['b', [4, Nothing, 6]]]",
+    importExpected: true,
+  },
+  {
+    code: "Table.new [['a', [1, 2, 3]], ['b', [4, 5, 6]]]",
+    description: 'Adding new column',
+    edit: { column: 2, row: 1, value: 8 },
+    expected:
+      "Table.new [['a', [1, 2, 3]], ['b', [4, 5, 6]], ['New Column', [Nothing, 8, Nothing]]]",
+    importExpected: true,
+  },
+  {
+    code: 'Table.new []',
+    description: 'Adding first column',
+    edit: { column: 0, row: 0, value: 8 },
+    expected: "Table.new [['New Column', [8]]]",
+  },
+  {
+    code: 'Table.new',
+    description: 'Adding parameter',
+    edit: { column: 0, row: 0, value: 8 },
+    expected: "Table.new [['New Column', [8]]]",
+  },
+  {
+    code: 'Table.new _',
+    description: 'Update parameter',
+    edit: { column: 0, row: 0, value: 8 },
+    expected: "Table.new [['New Column', [8]]]",
+  },
+  {
+    code: "Table.new [['a', [1, 2, 3]], ['b', [4, 5, 6]]]",
+    description: 'Adding new row',
+    edit: { column: 0, row: 3, value: 4.5 },
+    expected: "Table.new [['a', [1, 2, 3, 4.5]], ['b', [4, 5, 6, Nothing]]]",
+    importExpected: true,
+  },
+  {
+    code: "Table.new [['a', []], ['b', []]]",
+    description: 'Adding first row',
+    edit: { column: 1, row: 0, value: 'val' },
+    expected: "Table.new [['a', [Nothing]], ['b', ['val']]]",
+    importExpected: true,
+  },
+  {
+    code: "Table.new [['a', [1, 2, 3]], ['b', [4, 5, 6]]]",
+    description: 'Adding new row and column (the cell in the corner)',
+    edit: { column: 2, row: 3, value: 7 },
+    expected:
+      "Table.new [['a', [1, 2, 3, Nothing]], ['b', [4, 5, 6, Nothing]], ['New Column', [Nothing, Nothing, Nothing, 7]]]",
+    importExpected: true,
+  },
+  {
+    code: "Table.new [['a', [1, ,3]]]",
+    description: 'Setting missing value',
+    edit: { column: 0, row: 1, value: 2 },
+    expected: "Table.new [['a', [1, 2 ,3]]]",
+  },
+  {
+    code: "Table.new [['a', [, 2, 3]]]",
+    description: 'Setting missing value at first row',
+    edit: { column: 0, row: 0, value: 1 },
+    expected: "Table.new [['a', [1, 2, 3]]]",
+  },
+  {
+    code: "Table.new [['a', [1, 2,]]]",
+    description: 'Setting missing value at last row',
+    edit: { column: 0, row: 2, value: 3 },
+    expected: "Table.new [['a', [1, 2, 3]]]",
+  },
+  {
+    code: "Table.new [['a', [1, 2]], ['a', [3, 4]]]",
+    description: 'Editing with duplicated column name',
+    edit: { column: 0, row: 1, value: 5 },
+    expected: "Table.new [['a', [1, 5]], ['a', [3, 4]]]",
+  },
+])('Editing table $code: $description', ({ code, edit, expected, importExpected }) => {
+  const ast = Ast.parseBlock(code)
+  const inputAst = [...ast.statements()][0]
+  assert(inputAst != null)
+  const input = WidgetInput.FromAst(inputAst)
+  const onUpdate = vi.fn((update) => {
+    const inputAst = [...update.edit.getVersion(ast).statements()][0]
+    expect(inputAst?.code()).toBe(expected)
+  })
+  const addMissingImports = vi.fn((_, imports) => {
+    expect(imports).toEqual([
+      {
+        kind: 'Unqualified',
+        from: 'Standard.Base.Nothing',
+        import: 'Nothing',
+      },
+    ])
+  })
+  const tableNewArgs = useTableNewArgument(
+    input,
+    { startEdit: () => ast.module.edit(), addMissingImports },
+    suggestionDbWithNothing(),
+    onUpdate,
+  )
+  const editedRow = tableNewArgs.rowData.value[edit.row]
+  assert(editedRow != null)
+  tableNewArgs.columnDefs.value[edit.column]?.valueSetter?.({
+    data: editedRow,
+    newValue: edit.value,
+  })
+  expect(onUpdate).toHaveBeenCalledOnce()
+  if (importExpected) expect(addMissingImports).toHaveBeenCalled()
+  else expect(addMissingImports).not.toHaveBeenCalled()
+})
diff --git a/app/gui2/src/components/GraphEditor/widgets/WidgetTableEditor/tableNewArgument.ts b/app/gui2/src/components/GraphEditor/widgets/WidgetTableEditor/tableNewArgument.ts
new file mode 100644
index 000000000000..3906d334bdf6
--- /dev/null
+++ b/app/gui2/src/components/GraphEditor/widgets/WidgetTableEditor/tableNewArgument.ts
@@ -0,0 +1,301 @@
+import type { HeaderParams } from '@/components/GraphEditor/widgets/WidgetTableEditor/TableHeader.vue'
+import type { WidgetInput, WidgetUpdate } from '@/providers/widgetRegistry'
+import { requiredImportsByFQN, type RequiredImport } from '@/stores/graph/imports'
+import type { SuggestionDb } from '@/stores/suggestionDatabase'
+import { assert } from '@/util/assert'
+import { Ast } from '@/util/ast'
+import { tryEnsoToNumber, tryNumberToEnso } from '@/util/ast/abstract'
+import { Err, Ok, transposeResult, unwrapOrWithLog, type Result } from '@/util/data/result'
+import { qnLastSegment, type QualifiedName } from '@/util/qualifiedName'
+import type { ToValue } from '@/util/reactivity'
+import type { ColDef } from 'ag-grid-community'
+import { computed, toValue } from 'vue'
+
+const NEW_COLUMN_ID = 'NewColumn'
+const NEW_COLUMN_HEADER = 'New Column'
+const NOTHING_PATH = 'Standard.Base.Nothing.Nothing' as QualifiedName
+const NOTHING_NAME = qnLastSegment(NOTHING_PATH)
+
+export type RowData = {
+  index: number
+  /* Column id to given row's cell id. */
+  cells: Record<Ast.AstId, Ast.AstId>
+}
+
+/** A more specialized version of AGGrid's `ColDef` to simplify testing (the tests need to provide
+ * only values actually used by the composable) */
+interface ColumnDef {
+  colId?: string
+  headerName: string
+  valueGetter: ({ data }: { data: RowData | undefined }) => any
+  valueSetter: ({ data, newValue }: { data: RowData; newValue: any }) => boolean
+  headerComponentParams?: HeaderParams
+}
+
+namespace cellValueConversion {
+  export function astToAgGrid(ast: Ast.Ast) {
+    if (ast instanceof Ast.TextLiteral) return Ok(ast.rawTextContent)
+    else if (ast instanceof Ast.Ident && ast.code() === NOTHING_NAME) return Ok(null)
+    else if (ast instanceof Ast.PropertyAccess && ast.rhs.code() === NOTHING_NAME) return Ok(null)
+    else {
+      const asNumber = tryEnsoToNumber(ast)
+      if (asNumber != null) return Ok(asNumber)
+      else return Err('Ast is not convertible to AGGrid value')
+    }
+  }
+
+  export function agGridToAst(
+    value: unknown,
+    module: Ast.MutableModule,
+  ): { ast: Ast.Owned; requireNothingImport: boolean } {
+    if (value == null || value === '') {
+      return { ast: Ast.Ident.new(module, 'Nothing' as Ast.Identifier), requireNothingImport: true }
+    } else if (typeof value === 'number') {
+      return {
+        ast: tryNumberToEnso(value, module) ?? Ast.TextLiteral.new(`${value}`, module),
+        requireNothingImport: false,
+      }
+    } else {
+      return {
+        ast:
+          Ast.NumericLiteral.tryParseWithSign(`${value}`, module) ??
+          Ast.TextLiteral.new(`${value}`, module),
+        requireNothingImport: false,
+      }
+    }
+  }
+}
+
+function retrieveColumnsAst(call: Ast.Ast) {
+  if (!(call instanceof Ast.App)) return Ok(undefined)
+  if (call.argument instanceof Ast.Vector) return Ok(call.argument)
+  if (call.argument instanceof Ast.Wildcard) return Ok(undefined)
+  return Err('Expected Table.new argument to be a vector of columns or placeholder')
+}
+
+function readColumn(ast: Ast.Ast): Result<{ name: Ast.TextLiteral; data: Ast.Vector }> {
+  const errormsg = () => `${ast.code} is not a vector of two elements`
+  if (!(ast instanceof Ast.Vector)) return Err(errormsg())
+  const elements = ast.values()
+  const first = elements.next()
+  if (first.done) return Err(errormsg())
+  const second = elements.next()
+  if (second.done) return Err(errormsg())
+  if (!elements.next().done) return Err(errormsg())
+
+  if (!(first.value instanceof Ast.TextLiteral))
+    return Err(
+      `First element in column definition is ${first.value.code()} instead of a text literal`,
+    )
+  if (!(second.value instanceof Ast.Vector))
+    return Err(`Second element in column definition is ${second.value.code()} instead of a vector`)
+  return Ok({ name: first.value, data: second.value })
+}
+
+function retrieveColumnsDefinitions(columnsAst: Ast.Vector) {
+  return transposeResult(Array.from(columnsAst.values(), readColumn))
+}
+
+export function tableNewCallMayBeHandled(call: Ast.Ast) {
+  const columnsAst = retrieveColumnsAst(call)
+  if (!columnsAst.ok) return false
+  if (!columnsAst.value) return true // We can handle lack of the argument
+  const columns = retrieveColumnsDefinitions(columnsAst.value)
+  if (!columns.ok) return false
+  for (const col of columns.value) {
+    for (const val of col.data.values()) {
+      if (!cellValueConversion.astToAgGrid(val).ok) return false
+    }
+  }
+  return true
+}
+
+/**
+ * A composable responsible for interpreting `Table.new` expressions, creating AGGrid column
+ * definitions allowing also editing AST through AGGrid editing.
+ *
+ * @param input the widget's input
+ * @param graph the graph store
+ * @param onUpdate callback called when AGGrid was edited by user, resulting in AST change.
+ */
+export function useTableNewArgument(
+  input: ToValue<WidgetInput & { value: Ast.Ast }>,
+  graph: {
+    startEdit(): Ast.MutableModule
+    addMissingImports(edit: Ast.MutableModule, newImports: RequiredImport[]): void
+  },
+  suggestions: SuggestionDb,
+  onUpdate: (update: WidgetUpdate) => void,
+) {
+  const errorMessagePreamble = 'Table Editor Widget should not have been matched'
+  const columnsAst = computed(() => retrieveColumnsAst(toValue(input).value))
+
+  const columns = computed(() => {
+    if (!columnsAst.value.ok) return []
+    if (columnsAst.value.value == null) return []
+    const cols = retrieveColumnsDefinitions(columnsAst.value.value)
+    return unwrapOrWithLog(cols, [], errorMessagePreamble)
+  })
+
+  const rowCount = computed(() =>
+    columns.value.reduce((soFar, col) => Math.max(soFar, col.data.length), 0),
+  )
+
+  const undersizedColumns = computed(() =>
+    columns.value.filter((col) => col.data.length < rowCount.value),
+  )
+
+  function fixColumns(edit: Ast.MutableModule) {
+    for (const column of undersizedColumns.value) {
+      const data = edit.getVersion(column.data)
+      while (data.length < rowCount.value) {
+        data.push(convertWithImport(null, edit))
+      }
+      while (data.length > rowCount.value) {
+        data.pop()
+      }
+    }
+  }
+
+  function addRow(edit: Ast.MutableModule, columnWithValue?: Ast.AstId, value?: unknown) {
+    for (const column of columns.value) {
+      const editedCol = edit.getVersion(column.data)
+      if (column.data.id === columnWithValue) {
+        editedCol.push(convertWithImport(value, edit))
+      } else {
+        editedCol.push(convertWithImport(null, edit))
+      }
+    }
+  }
+
+  function addColumn(
+    edit: Ast.MutableModule,
+    name: string,
+    rowWithValue?: number,
+    value?: unknown,
+  ) {
+    const newColumnSize = Math.max(rowCount.value, rowWithValue != null ? rowWithValue + 1 : 0)
+    function* cellsGenerator() {
+      for (let i = 0; i < newColumnSize; ++i) {
+        if (i === rowWithValue) yield convertWithImport(value, edit)
+        else yield convertWithImport(null, edit)
+      }
+    }
+    const cells = Ast.Vector.new(edit, Array.from(cellsGenerator()))
+    const newCol = Ast.Vector.new(edit, [Ast.TextLiteral.new(name), cells])
+    const ast = unwrapOrWithLog(columnsAst.value, undefined, errorMessagePreamble)
+    if (ast) {
+      edit.getVersion(ast).push(newCol)
+    } else {
+      const inputAst = edit.getVersion(toValue(input).value)
+      const newArg = Ast.Vector.new(edit, [newCol])
+      if (inputAst instanceof Ast.MutableApp) {
+        inputAst.setArgument(newArg)
+      } else {
+        inputAst.updateValue((func) => Ast.App.new(edit, func, undefined, newArg))
+      }
+    }
+  }
+
+  const newColumnDef = computed<ColumnDef>(() => ({
+    colId: NEW_COLUMN_ID,
+    headerName: NEW_COLUMN_HEADER,
+    valueGetter: () => null,
+    valueSetter: ({ data, newValue }: { data: RowData; newValue: any }) => {
+      const edit = graph.startEdit()
+      if (data.index === rowCount.value) {
+        addRow(edit)
+      }
+      addColumn(edit, NEW_COLUMN_HEADER, data.index, newValue)
+      onUpdate({ edit })
+      return true
+    },
+    headerComponentParams: {
+      nameSetter: (newName: string) => {
+        const edit = graph.startEdit()
+        fixColumns(edit)
+        addColumn(edit, newName)
+        onUpdate({ edit })
+      },
+      virtualColumn: true,
+    },
+  }))
+
+  const columnDefs = computed(() => {
+    const cols: ColumnDef[] = Array.from(
+      columns.value,
+      (col) =>
+        ({
+          colId: col.data.id,
+          headerName: col.name.rawTextContent,
+          valueGetter: ({ data }: { data: RowData | undefined }) => {
+            if (data == null) return undefined
+            const ast = toValue(input).value.module.tryGet(data.cells[col.data.id])
+            if (ast == null) return null
+            const value = cellValueConversion.astToAgGrid(ast)
+            if (!value.ok) {
+              console.error(
+                `Cannot read \`${ast.code}\` as value in Table Widget; the Table widget should not be matched here!`,
+              )
+              return null
+            }
+            return value.value
+          },
+          valueSetter: ({ data, newValue }: { data: RowData; newValue: any }): boolean => {
+            const astId = data?.cells[col.data.id]
+            const edit = graph.startEdit()
+            fixColumns(edit)
+            if (data.index === rowCount.value) {
+              addRow(edit, col.data.id, newValue)
+            } else {
+              const newValueAst = convertWithImport(newValue, edit)
+              if (astId != null) edit.replaceValue(astId, newValueAst)
+              else edit.getVersion(col.data).set(data.index, newValueAst)
+            }
+            onUpdate({ edit })
+            return true
+          },
+          headerComponentParams: {
+            nameSetter: (newName: string) => {
+              const edit = graph.startEdit()
+              fixColumns(edit)
+              edit.getVersion(col.name).setRawTextContent(newName)
+              onUpdate({ edit })
+            },
+          },
+        }) satisfies ColDef<RowData>,
+    )
+    cols.push(newColumnDef.value)
+    return cols
+  })
+
+  const rowData = computed(() => {
+    const rows: RowData[] = []
+    for (const col of columns.value) {
+      for (const [rowIndex, value] of col.data.enumerate()) {
+        const row: RowData = rows.at(rowIndex) ?? { index: rowIndex, cells: {} }
+        assert(rowIndex <= rows.length)
+        if (rowIndex === rows.length) {
+          rows.push(row)
+        }
+        if (value?.id) {
+          row.cells[col.data.id] = value?.id
+        }
+      }
+    }
+    rows.push({ index: rows.length, cells: {} })
+    return rows
+  })
+
+  const nothingImport = computed(() => requiredImportsByFQN(suggestions, NOTHING_PATH, true))
+
+  function convertWithImport(value: unknown, edit: Ast.MutableModule) {
+    const { ast, requireNothingImport } = cellValueConversion.agGridToAst(value, edit)
+    if (requireNothingImport) {
+      graph.addMissingImports(edit, nothingImport.value)
+    }
+    return ast
+  }
+
+  return { columnDefs, rowData }
+}
diff --git a/app/gui2/src/components/visualizations/TableVisualization.vue b/app/gui2/src/components/visualizations/TableVisualization.vue
index 9d148da2f797..de142e240765 100644
--- a/app/gui2/src/components/visualizations/TableVisualization.vue
+++ b/app/gui2/src/components/visualizations/TableVisualization.vue
@@ -1,35 +1,15 @@
 <script lang="ts">
 import icons from '@/assets/icons.svg'
-import {
-  clipboardNodeData,
-  tsvTableToEnsoExpression,
-  writeClipboard,
-} from '@/components/GraphEditor/clipboard'
 import TextFormattingSelector from '@/components/TextFormattingSelector.vue'
+import AgGridTableView from '@/components/widgets/AgGridTableView.vue'
 import { Ast } from '@/util/ast'
 import { Pattern } from '@/util/ast/match'
-import { useAutoBlur } from '@/util/autoBlur'
 import { VisualizationContainer, useVisualizationConfig } from '@/util/visualizationBuiltins'
 import '@ag-grid-community/styles/ag-grid.css'
 import '@ag-grid-community/styles/ag-theme-alpine.css'
-import type {
-  CellClassParams,
-  CellClickedEvent,
-  ColumnResizedEvent,
-  ICellRendererParams,
-  RowHeightParams,
-} from 'ag-grid-community'
-import type { ColDef, GridOptions } from 'ag-grid-enterprise'
-import {
-  computed,
-  onMounted,
-  onUnmounted,
-  reactive,
-  ref,
-  shallowRef,
-  watchEffect,
-  type Ref,
-} from 'vue'
+import type { CellClassParams, CellClickedEvent, ICellRendererParams } from 'ag-grid-community'
+import type { ColDef } from 'ag-grid-enterprise'
+import { computed, onMounted, ref, shallowRef, watchEffect, type Ref } from 'vue'
 
 export const name = 'Table'
 export const icon = 'table'
@@ -101,23 +81,9 @@ export enum TextFormatOptions {
   On,
   Off,
 }
-
-declare module 'ag-grid-enterprise' {
-  // These type parameters are defined on the original interface.
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  interface AbstractColDef<TData, TValue> {
-    field: string
-  }
-}
-
-if (typeof import.meta.env.VITE_ENSO_AG_GRID_LICENSE_KEY !== 'string') {
-  console.warn('The AG_GRID_LICENSE_KEY is not defined.')
-}
 </script>
 
 <script setup lang="ts">
-const { LicenseManager, Grid } = await import('ag-grid-enterprise')
-
 const props = defineProps<{ data: Data }>()
 const emit = defineEmits<{
   'update:preprocessor': [module: string, method: string, ...args: string[]]
@@ -135,7 +101,6 @@ const SQLITE_CONNECTIONS_NODE_TYPE =
   'Standard.Database.Internal.SQLite.SQLite_Connection.SQLite_Connection'
 const POSTGRES_CONNECTIONS_NODE_TYPE =
   'Standard.Database.Internal.Postgres.Postgres_Connection.Postgres_Connection'
-const DEFAULT_ROW_HEIGHT = 22
 
 const rowLimit = ref(0)
 const page = ref(0)
@@ -143,11 +108,8 @@ const pageLimit = ref(0)
 const rowCount = ref(0)
 const showRowCount = ref(true)
 const isTruncated = ref(false)
-const tableNode = ref<HTMLElement>()
 const dataGroupingMap = shallowRef<Map<string, boolean>>()
-useAutoBlur(tableNode)
-const widths = reactive(new Map<string, number>())
-const defaultColDef = {
+const defaultColDef: Ref<ColDef> = ref({
   editable: false,
   sortable: true,
   filter: true,
@@ -155,21 +117,10 @@ const defaultColDef = {
   minWidth: 25,
   cellRenderer: cellRenderer,
   cellClass: cellClass,
-}
-const agGridOptions: Ref<GridOptions & Required<Pick<GridOptions, 'defaultColDef'>>> = ref({
-  headerHeight: 26,
-  getRowHeight: getRowHeight,
-  rowData: [],
-  columnDefs: [],
-  defaultColDef: defaultColDef as typeof defaultColDef & { manuallySized: boolean },
-  onFirstDataRendered: updateColumnWidths,
-  onRowDataUpdated: updateColumnWidths,
-  onColumnResized: lockColumnSize,
-  sendToClipboard: ({ data }: { data: string }) => sendToClipboard(data),
-  suppressFieldDotNotation: true,
-  enableRangeSelection: true,
-  popupParent: document.body,
-})
+} satisfies ColDef)
+const rowData = ref<Record<string, any>[]>([])
+const columnDefs: Ref<ColDef[]> = ref([])
+
 const textFormatterSelected = ref<TextFormatOptions>(TextFormatOptions.Partial)
 const updateTextFormat = (option: TextFormatOptions) => {
   textFormatterSelected.value = option
@@ -307,29 +258,6 @@ function escapeHTML(str: string) {
   return str.replace(/[&<>"']/g, (m) => mapping[m]!)
 }
 
-function getRowHeight(params: RowHeightParams): number {
-  if (textFormatterSelected.value === TextFormatOptions.Off) {
-    return DEFAULT_ROW_HEIGHT
-  }
-
-  const rowData = Object.values(params.data)
-  const textValues = rowData.filter((r): r is string => typeof r === 'string')
-
-  if (!textValues.length) {
-    return DEFAULT_ROW_HEIGHT
-  }
-
-  const returnCharsCount = textValues.map((text: string) => {
-    const crlfCount = (text.match(/\r\n/g) || []).length
-    const crCount = (text.match(/\r/g) || []).length
-    const lfCount = (text.match(/\n/g) || []).length
-    return crCount + lfCount - crlfCount
-  })
-
-  const maxReturnCharsCount = Math.max(...returnCharsCount)
-  return (maxReturnCharsCount + 1) * DEFAULT_ROW_HEIGHT
-}
-
 function cellClass(params: CellClassParams) {
   if (params.colDef.field === '#') return null
   if (typeof params.value === 'number' || params.value === null) return 'ag-right-aligned-cell'
@@ -484,54 +412,48 @@ watchEffect(() => {
         // eslint-disable-next-line camelcase
         get_child_node: undefined,
       }
-  const options = agGridOptions.value
-  if (options.api == null) {
-    return
-  }
-
-  let columnDefs: ColDef[] = []
-  let rowData: object[] = []
 
   if ('error' in data_) {
-    columnDefs = [
+    columnDefs.value = [
       {
         field: 'Error',
         cellStyle: { 'white-space': 'normal' },
       },
     ]
-    rowData = [{ Error: data_.error }]
+    rowData.value = [{ Error: data_.error }]
   } else if (data_.type === 'Matrix') {
-    columnDefs.push(toLinkField(INDEX_FIELD_NAME, data_.get_child_node))
+    columnDefs.value = [toLinkField(INDEX_FIELD_NAME, data_.get_child_node)]
     for (let i = 0; i < data_.column_count; i++) {
-      columnDefs.push(toField(i.toString()))
+      columnDefs.value.push(toField(i.toString()))
     }
-    rowData = addRowIndex(data_.json)
+    rowData.value = addRowIndex(data_.json)
     isTruncated.value = data_.all_rows_count !== data_.json.length
   } else if (data_.type === 'Object_Matrix') {
-    columnDefs.push(toLinkField(INDEX_FIELD_NAME, data_.get_child_node))
+    columnDefs.value = [toLinkField(INDEX_FIELD_NAME, data_.get_child_node)]
     let keys = new Set<string>()
     for (const val of data_.json) {
       if (val != null) {
         Object.keys(val).forEach((k) => {
           if (!keys.has(k)) {
             keys.add(k)
-            columnDefs.push(toField(k))
+            columnDefs.value.push(toField(k))
           }
         })
       }
     }
-    rowData = addRowIndex(data_.json)
+    rowData.value = addRowIndex(data_.json)
     isTruncated.value = data_.all_rows_count !== data_.json.length
   } else if (data_.type === 'Excel_Workbook') {
-    columnDefs = [toLinkField('Value', data_.get_child_node)]
-    rowData = data_.sheet_names.map((name) => ({ Value: name }))
+    columnDefs.value = [toLinkField('Value', data_.get_child_node)]
+    rowData.value = data_.sheet_names.map((name) => ({ Value: name }))
   } else if (Array.isArray(data_.json)) {
-    columnDefs = [toLinkField(INDEX_FIELD_NAME, data_.get_child_node), toField('Value')]
-    rowData = data_.json.map((row, i) => ({ [INDEX_FIELD_NAME]: i, Value: toRender(row) }))
+    columnDefs.value = [toLinkField(INDEX_FIELD_NAME, data_.get_child_node), toField('Value')]
+    rowData.value = data_.json.map((row, i) => ({ [INDEX_FIELD_NAME]: i, Value: toRender(row) }))
     isTruncated.value = data_.all_rows_count ? data_.all_rows_count !== data_.json.length : false
   } else if (data_.json !== undefined) {
-    columnDefs = data_.links ? [toLinkField('Value', data_.get_child_node)] : [toField('Value')]
-    rowData =
+    columnDefs.value =
+      data_.links ? [toLinkField('Value', data_.get_child_node)] : [toField('Value')]
+    rowData.value =
       data_.links ?
         data_.links.map((link) => ({
           Value: link,
@@ -547,15 +469,15 @@ watchEffect(() => {
         return toField(v, valueType)
       }) ?? []
 
-    columnDefs =
+    columnDefs.value =
       data_.has_index_col ?
         [toLinkField(INDEX_FIELD_NAME, data_.get_child_node), ...dataHeader]
       : dataHeader
     const rows = data_.data && data_.data.length > 0 ? data_.data[0]?.length ?? 0 : 0
-    rowData = Array.from({ length: rows }, (_, i) => {
+    rowData.value = Array.from({ length: rows }, (_, i) => {
       const shift = data_.has_index_col ? 1 : 0
       return Object.fromEntries(
-        columnDefs.map((h, j) => {
+        columnDefs.value.map((h, j) => {
           return [
             h.field,
             toRender(h.field === INDEX_FIELD_NAME ? i : data_.data?.[j - shift]?.[i]),
@@ -563,7 +485,7 @@ watchEffect(() => {
         }),
       )
     })
-    isTruncated.value = data_.all_rows_count !== rowData.length
+    isTruncated.value = data_.all_rows_count !== rowData.value.length
   }
 
   // Update paging
@@ -576,11 +498,11 @@ watchEffect(() => {
     page.value = newPageLimit
   }
 
-  if (rowData.length) {
-    const headers = Object.keys(rowData[0] as object)
+  if (rowData.value[0]) {
+    const headers = Object.keys(rowData.value[0])
     const headerGroupingMap = new Map()
     headers.forEach((header) => {
-      const needsGrouping = rowData.some((row: any) => {
+      const needsGrouping = rowData.value.some((row) => {
         if (header in row && row[header] != null) {
           const value = typeof row[header] === 'object' ? row[header].value : row[header]
           return value > 9999
@@ -591,107 +513,17 @@ watchEffect(() => {
     dataGroupingMap.value = headerGroupingMap
   }
 
-  // If an existing grid, merge width from manually sized columns.
-  const newWidths = new Map<string, number>()
-  const mergedColumnDefs = columnDefs.map((columnDef) => {
-    if (!columnDef.field) return columnDef
-    const width = widths.get(columnDef.field)
-    if (width != null) newWidths.set(columnDef.field, (columnDef.width = width))
-    return columnDef
-  })
-  widths.clear()
-  for (const [key, value] of newWidths) widths.set(key, value)
-
   // If data is truncated, we cannot rely on sorting/filtering so will disable.
-  options.defaultColDef.filter = !isTruncated.value
-  options.defaultColDef.sortable = !isTruncated.value
-  options.api.setColumnDefs(mergedColumnDefs)
-  options.api.setRowData(rowData)
+  defaultColDef.value.filter = !isTruncated.value
+  defaultColDef.value.sortable = !isTruncated.value
 })
 
-function updateColumnWidths() {
-  const columnApi = agGridOptions.value.columnApi
-  if (columnApi == null) {
-    console.warn('AG Grid column API does not exist.')
-    return
-  }
-  const cols = columnApi.getAllGridColumns().filter((c) => {
-    const field = c.getColDef().field
-    return field && !widths.has(field)
-  })
-  columnApi.autoSizeColumns(cols)
-}
-
-function lockColumnSize(e: ColumnResizedEvent) {
-  // Check if the resize is finished, and it's not from the API (which is triggered by us).
-  if (!e.finished || e.source === 'api') return
-  // If the user manually resized (or manually autosized) a column, we don't want to auto-size it
-  // on a resize.
-  const manuallySized = e.source !== 'autosizeColumns'
-  for (const column of e.columns ?? []) {
-    const field = column.getColDef().field
-    if (field && manuallySized) widths.set(field, column.getActualWidth())
-  }
-}
-
-/** Copy the provided TSV-formatted table data to the clipboard.
- *
- * The data will be copied as `text/plain` TSV data for spreadsheet applications, and an Enso-specific MIME section for
- * pasting as a new table node.
- *
- * By default, AG Grid writes only `text/plain` TSV data to the clipboard. This is sufficient to paste into spreadsheet
- * applications, which are liberal in what they try to interpret as tabular data; however, when pasting into Enso, the
- * application needs to be able to distinguish tabular clipboard contents to choose the correct paste action.
- *
- * Our heuristic to identify clipboard data from applications like Excel and Google Sheets is to check for a <table> tag
- * in the clipboard `text/html` data. If we were to add a `text/html` section to the data so that it could be recognized
- * like other spreadsheets, when pasting into other applications some applications might use the `text/html` data in
- * preference to the `text/plain` content--so we would need to construct an HTML table that fully represents the
- * content.
- *
- * To avoid that complexity, we bypass our table-data detection by including application-specific data in the clipboard
- * content. This data contains a ready-to-paste node that constructs an Enso table from the provided TSV.
- */
-function sendToClipboard(tsvData: string) {
-  return writeClipboard({
-    ...clipboardNodeData([{ expression: tsvTableToEnsoExpression(tsvData) }]),
-    'text/plain': tsvData,
-  })
-}
-
 // ===============
 // === Updates ===
 // ===============
 
 onMounted(() => {
   setRowLimit(1000)
-  const agGridLicenseKey = import.meta.env.VITE_ENSO_AG_GRID_LICENSE_KEY
-  if (typeof agGridLicenseKey === 'string') {
-    LicenseManager.setLicenseKey(agGridLicenseKey)
-  } else if (import.meta.env.DEV) {
-    // Hide annoying license validation errors in dev mode when the license is not defined. The
-    // missing define warning is still displayed to not forget about it, but it isn't as obnoxious.
-    const origValidateLicense = LicenseManager.prototype.validateLicense
-    LicenseManager.prototype.validateLicense = function (this) {
-      if (!('licenseManager' in this))
-        Object.defineProperty(this, 'licenseManager', {
-          configurable: true,
-          set(value: any) {
-            Object.getPrototypeOf(value).validateLicense = () => {}
-            delete this.licenseManager
-            this.licenseManager = value
-          },
-        })
-      origValidateLicense.call(this)
-    }
-  }
-  // TODO: consider using Vue component instead: https://ag-grid.com/vue-data-grid/getting-started/
-  new Grid(tableNode.value!, agGridOptions.value)
-  updateColumnWidths()
-})
-
-onUnmounted(() => {
-  agGridOptions.value.api?.destroy()
 })
 </script>
 
@@ -723,7 +555,16 @@ onUnmounted(() => {
           <span v-else v-text="`${rowCount} rows.`"></span>
         </template>
       </div>
-      <div ref="tableNode" class="scrollable ag-theme-alpine"></div>
+      <!-- TODO[ao]: Suspence in theory is not needed here (the entire visualization is inside
+       suspense), but for some reason it causes reactivity loop - see https://github.com/enso-org/enso/issues/10782 -->
+      <Suspense>
+        <AgGridTableView
+          class="scrollable grid"
+          :columnDefs="columnDefs"
+          :rowData="rowData"
+          :defaultColDef="defaultColDef"
+        />
+      </Suspense>
     </div>
   </VisualizationContainer>
 </template>
@@ -736,11 +577,8 @@ onUnmounted(() => {
   height: 100%;
 }
 
-.ag-theme-alpine {
-  --ag-grid-size: 3px;
-  --ag-list-item-height: 20px;
+.grid {
   flex-grow: 1;
-  font-family: var(--font-mono);
 }
 
 .table-visualization-status-bar {
diff --git a/app/gui2/src/components/widgets/AgGridTableView.vue b/app/gui2/src/components/widgets/AgGridTableView.vue
new file mode 100644
index 000000000000..8a25b95bd8e5
--- /dev/null
+++ b/app/gui2/src/components/widgets/AgGridTableView.vue
@@ -0,0 +1,202 @@
+<script setup lang="ts" generic="TData, TValue">
+/**
+ * Component adding some useful logic to AGGrid table component (like keeping track of colum sizes),
+ * and using common style for tables in our application.
+ */
+import {
+  clipboardNodeData,
+  tsvTableToEnsoExpression,
+  writeClipboard,
+} from '@/components/GraphEditor/clipboard'
+import { useAutoBlur } from '@/util/autoBlur'
+import '@ag-grid-community/styles/ag-grid.css'
+import '@ag-grid-community/styles/ag-theme-alpine.css'
+import type {
+  CellEditingStartedEvent,
+  CellEditingStoppedEvent,
+  ColumnResizedEvent,
+  FirstDataRenderedEvent,
+  GridReadyEvent,
+  RowDataUpdatedEvent,
+  RowEditingStartedEvent,
+  RowEditingStoppedEvent,
+} from 'ag-grid-community'
+import type {
+  ColDef,
+  ColGroupDef,
+  GetRowIdFunc,
+  GridApi,
+  RowHeightParams,
+} from 'ag-grid-enterprise'
+import { type ComponentInstance, reactive, ref, shallowRef } from 'vue'
+
+const DEFAULT_ROW_HEIGHT = 22
+
+const _props = defineProps<{
+  rowData: TData[]
+  columnDefs: (ColDef<TData, TValue> | ColGroupDef<TData>)[] | null
+  defaultColDef: ColDef<TData>
+  getRowId?: GetRowIdFunc<TData>
+  components?: Record<string, unknown>
+  singleClickEdit?: boolean
+  stopEditingWhenCellsLoseFocus?: boolean
+}>()
+const emit = defineEmits<{
+  cellEditingStarted: [event: CellEditingStartedEvent]
+  cellEditingStopped: [event: CellEditingStoppedEvent]
+  rowEditingStarted: [event: RowEditingStartedEvent]
+  rowEditingStopped: [event: RowEditingStoppedEvent]
+  rowDataUpdated: [event: RowDataUpdatedEvent]
+}>()
+
+const widths = reactive(new Map<string, number>())
+const grid = ref<ComponentInstance<typeof AgGridVue>>()
+const gridApi = shallowRef<GridApi<TData>>()
+const popupParent = document.body
+useAutoBlur(() => grid.value?.$el)
+
+function onGridReady(event: GridReadyEvent) {
+  gridApi.value = event.api
+}
+
+function getRowHeight(params: RowHeightParams): number {
+  const rowData = Object.values(params.data)
+  const textValues = rowData.filter((r): r is string => typeof r === 'string')
+
+  if (!textValues.length) {
+    return DEFAULT_ROW_HEIGHT
+  }
+
+  const returnCharsCount = textValues.map((text: string) => {
+    const crlfCount = (text.match(/\r\n/g) || []).length
+    const crCount = (text.match(/\r/g) || []).length
+    const lfCount = (text.match(/\n/g) || []).length
+    return crCount + lfCount - crlfCount
+  })
+
+  const maxReturnCharsCount = Math.max(...returnCharsCount)
+  return (maxReturnCharsCount + 1) * DEFAULT_ROW_HEIGHT
+}
+
+function updateColumnWidths(event: FirstDataRenderedEvent | RowDataUpdatedEvent) {
+  if (event.columnApi == null) {
+    console.warn('AG Grid column API does not exist.')
+    return
+  }
+  const cols = event.columnApi.getAllGridColumns().filter((c) => {
+    const id = c.getColId()
+    return id && !widths.has(id)
+  })
+  event.columnApi.autoSizeColumns(cols)
+}
+
+function lockColumnSize(e: ColumnResizedEvent) {
+  // Check if the resize is finished, and it's not from the API (which is triggered by us).
+  if (!e.finished || e.source === 'api') return
+  // If the user manually resized (or manually autosized) a column, we don't want to auto-size it
+  // on a resize.
+  if (e.source !== 'autosizeColumns') {
+    for (const column of e.columns ?? []) {
+      const id = column.getColDef().colId
+      if (id) widths.set(id, column.getActualWidth())
+    }
+  }
+}
+
+/** Copy the provided TSV-formatted table data to the clipboard.
+ *
+ * The data will be copied as `text/plain` TSV data for spreadsheet applications, and an Enso-specific MIME section for
+ * pasting as a new table node.
+ *
+ * By default, AG Grid writes only `text/plain` TSV data to the clipboard. This is sufficient to paste into spreadsheet
+ * applications, which are liberal in what they try to interpret as tabular data; however, when pasting into Enso, the
+ * application needs to be able to distinguish tabular clipboard contents to choose the correct paste action.
+ *
+ * Our heuristic to identify clipboard data from applications like Excel and Google Sheets is to check for a <table> tag
+ * in the clipboard `text/html` data. If we were to add a `text/html` section to the data so that it could be recognized
+ * like other spreadsheets, when pasting into other applications some applications might use the `text/html` data in
+ * preference to the `text/plain` content--so we would need to construct an HTML table that fully represents the
+ * content.
+ *
+ * To avoid that complexity, we bypass our table-data detection by including application-specific data in the clipboard
+ * content. This data contains a ready-to-paste node that constructs an Enso table from the provided TSV.
+ */
+function sendToClipboard({ data }: { data: string }) {
+  return writeClipboard({
+    ...clipboardNodeData([{ expression: tsvTableToEnsoExpression(data) }]),
+    'text/plain': data,
+  })
+}
+
+defineExpose({ gridApi })
+
+// === Loading AGGrid and its license ===
+
+const { LicenseManager } = await import('ag-grid-enterprise')
+
+if (typeof import.meta.env.VITE_ENSO_AG_GRID_LICENSE_KEY !== 'string') {
+  console.warn('The AG_GRID_LICENSE_KEY is not defined.')
+  if (import.meta.env.DEV) {
+    // Hide annoying license validation errors in dev mode when the license is not defined. The
+    // missing define warning is still displayed to not forget about it, but it isn't as obnoxious.
+    const origValidateLicense = LicenseManager.prototype.validateLicense
+    LicenseManager.prototype.validateLicense = function (this) {
+      if (!('licenseManager' in this))
+        Object.defineProperty(this, 'licenseManager', {
+          configurable: true,
+          set(value: any) {
+            Object.getPrototypeOf(value).validateLicense = () => {}
+            delete this.licenseManager
+            this.licenseManager = value
+          },
+        })
+      origValidateLicense.call(this)
+    }
+  }
+} else {
+  const agGridLicenseKey = import.meta.env.VITE_ENSO_AG_GRID_LICENSE_KEY
+  LicenseManager.setLicenseKey(agGridLicenseKey)
+}
+
+const { AgGridVue } = await import('ag-grid-vue3')
+</script>
+
+<template>
+  <AgGridVue
+    v-bind="$attrs"
+    ref="grid"
+    class="grid ag-theme-alpine"
+    :headerHeight="26"
+    :getRowHeight="getRowHeight"
+    :rowData="rowData"
+    :columnDefs="columnDefs"
+    :defaultColDef="defaultColDef"
+    :sendToClipboard="sendToClipboard"
+    :suppressFieldDotNotation="true"
+    :enableRangeSelection="true"
+    :popupParent="popupParent"
+    :components="components"
+    :singleClickEdit="singleClickEdit"
+    :stopEditingWhenCellsLoseFocus="stopEditingWhenCellsLoseFocus"
+    @gridReady="onGridReady"
+    @firstDataRendered="updateColumnWidths"
+    @rowDataUpdated="updateColumnWidths($event), emit('rowDataUpdated', $event)"
+    @columnResized="lockColumnSize"
+    @cellEditingStarted="emit('cellEditingStarted', $event)"
+    @cellEditingStopped="emit('cellEditingStopped', $event)"
+    @rowEditingStarted="emit('rowEditingStarted', $event)"
+    @rowEditingStopped="emit('rowEditingStopped', $event)"
+  />
+</template>
+
+<style scoped>
+.ag-theme-alpine {
+  --ag-grid-size: 3px;
+  --ag-list-item-height: 20px;
+  font-family: var(--font-mono);
+}
+
+.TableVisualization > .ag-theme-alpine > :deep(.ag-root-wrapper.ag-layout-normal) {
+  border-radius: 0 0 var(--radius-default) var(--radius-default);
+}
+</style>
diff --git a/app/gui2/src/util/ast/__tests__/abstract.test.ts b/app/gui2/src/util/ast/__tests__/abstract.test.ts
index 3da4dedb2f60..7a662660478d 100644
--- a/app/gui2/src/util/ast/__tests__/abstract.test.ts
+++ b/app/gui2/src/util/ast/__tests__/abstract.test.ts
@@ -8,6 +8,8 @@ import {
   substituteIdentifier,
   substituteQualifiedName,
   subtrees,
+  tryEnsoToNumber,
+  tryNumberToEnso,
   unescapeTextLiteral,
   type Identifier,
 } from '@/util/ast/abstract'
@@ -1105,22 +1107,92 @@ test.each([
   }).toEqual(expected)
 })
 
-test('Vector modifications', () => {
-  const vector = Ast.Vector.tryParse('[1, 2]')
-  expect(vector).toBeDefined()
+test.each`
+  initial     | pushed     | expected
+  ${'[1, 2]'} | ${'"Foo"'} | ${'[1, 2, "Foo"]'}
+  ${'[]'}     | ${'3'}     | ${'[3]'}
+  ${'[,]'}    | ${'1'}     | ${'[,, 1]'}
+`('Pushing $pushed to vector $initial', ({ initial, pushed, expected }) => {
+  const vector = Ast.Vector.tryParse(initial)
   assertDefined(vector)
-  vector.push(Ast.parse('"Foo"', vector.module))
-  expect(vector.code()).toBe('[1, 2, "Foo"]')
-  vector.keep((ast) => ast instanceof Ast.NumericLiteral)
-  expect(vector.code()).toBe('[1, 2]')
-  vector.push(Ast.parse('3', vector.module))
-  expect(vector.code()).toBe('[1, 2, 3]')
-  vector.keep((ast) => ast.code() !== '4')
-  expect(vector.code()).toBe('[1, 2, 3]')
-  vector.keep((ast) => ast.code() !== '2')
-  expect(vector.code()).toBe('[1, 3]')
-  vector.keep((ast) => ast.code() !== '1')
-  expect(vector.code()).toBe('[3]')
-  vector.keep(() => false)
-  expect(vector.code()).toBe('[]')
+  vector.push(Ast.parse(pushed, vector.module))
+  expect(vector.code()).toBe(expected)
 })
+
+// TODO[ao]: Fix cases where expected spacing feels odd.
+test.each`
+  initial            | predicate                                                 | expected
+  ${'[1, 2, "Foo"]'} | ${(ast: Ast.Ast) => ast instanceof Ast.NumericLiteral}    | ${'[1, 2]'}
+  ${'[1, "Foo", 3]'} | ${(ast: Ast.Ast) => ast instanceof Ast.NumericLiteral}    | ${'[1, 3]'}
+  ${'["Foo", 2, 3]'} | ${(ast: Ast.Ast) => ast instanceof Ast.NumericLiteral}    | ${'[ 2, 3]'}
+  ${'[1, 2, "Foo"]'} | ${(ast: Ast.Ast) => !(ast instanceof Ast.NumericLiteral)} | ${'[ "Foo"]'}
+  ${'[1, "Foo", 3]'} | ${(ast: Ast.Ast) => !(ast instanceof Ast.NumericLiteral)} | ${'[ "Foo"]'}
+  ${'["Foo", 2, 3]'} | ${(ast: Ast.Ast) => !(ast instanceof Ast.NumericLiteral)} | ${'["Foo"]'}
+  ${'[]'}            | ${(ast: Ast.Ast) => ast instanceof Ast.NumericLiteral}    | ${'[]'}
+  ${'[1, 2, 3]'}     | ${(ast: Ast.Ast) => ast.code() != '4'}                    | ${'[1, 2, 3]'}
+  ${'[1, 2, 3]'}     | ${() => false}                                            | ${'[]'}
+`('Keeping elements in vector ($initial -> $expected)', ({ initial, predicate, expected }) => {
+  const vector = Ast.Vector.tryParse(initial)
+  assertDefined(vector)
+  vector.keep(predicate)
+  expect(vector.code()).toBe(expected)
+})
+
+// TODO[ao]: Fix cases where expected spacing feels odd.
+test.each`
+  initial        | expectedVector | expectedValue
+  ${'[1, 2, 3]'} | ${'[1, 2]'}    | ${'3'}
+  ${'[1, 2, ]'}  | ${'[1, 2 ]'}   | ${undefined}
+  ${'[]'}        | ${'[]'}        | ${undefined}
+`('Popping elements from vector $initial', ({ initial, expectedVector, expectedValue }) => {
+  const vector = Ast.Vector.tryParse(initial)
+  assertDefined(vector)
+  const value = vector.pop()
+  expect(value?.code()).toBe(expectedValue)
+  expect(vector.code()).toBe(expectedVector)
+})
+
+test.each`
+  initial        | index | value  | expected
+  ${'[1, 2, 3]'} | ${0}  | ${'4'} | ${'[4, 2, 3]'}
+  ${'[1, 2, 3]'} | ${1}  | ${'4'} | ${'[1, 4, 3]'}
+  ${'[1, 2, 3]'} | ${2}  | ${'4'} | ${'[1, 2, 4]'}
+  ${'[,,]'}      | ${0}  | ${'4'} | ${'[4,,]'}
+  ${'[,,]'}      | ${1}  | ${'4'} | ${'[, 4,]'}
+  ${'[,,]'}      | ${2}  | ${'4'} | ${'[,, 4]'}
+`(
+  'Setting vector elements: in $initial on index $index to $value',
+  ({ initial, index, value, expected }) => {
+    const vector = Ast.Vector.tryParse(initial)
+    assertDefined(vector)
+    vector.set(index, Ast.parse(value, vector.module))
+    expect(vector.code()).toBe(expected)
+  },
+)
+
+test.each`
+  ensoNumber               | jsNumber                                                  | expectedEnsoNumber
+  ${'0'}                   | ${0}                                                      | ${'0'}
+  ${'12345'}               | ${12345}                                                  | ${'12345'}
+  ${'123_456'}             | ${123456}                                                 | ${'123456'}
+  ${'-12345'}              | ${-12345}                                                 | ${'-12345'}
+  ${'-123_456'}            | ${-123456}                                                | ${'-123456'}
+  ${'0b101'}               | ${0b101}                                                  | ${'5'}
+  ${'0o444'}               | ${0o444}                                                  | ${'292'}
+  ${'0xabcdef'}            | ${0xabcdef}                                               | ${'11259375'}
+  ${`1${'0'.repeat(300)}`} | ${1e300}                                                  | ${undefined /*Not yet implemented*/}
+  ${`1${'0'.repeat(309)}`} | ${Infinity /*Limitation of IEEE 754-1985 double format*/} | ${undefined}
+  ${undefined}             | ${NaN}                                                    | ${undefined}
+`(
+  'Conversions between enso literals and js numbers: $ensoNumber',
+  ({ ensoNumber, jsNumber, expectedEnsoNumber }) => {
+    if (ensoNumber != null) {
+      const literal = Ast.parse(ensoNumber)
+      expect(tryEnsoToNumber(literal)).toBe(jsNumber)
+    }
+    if (jsNumber != null) {
+      const convertedToAst = tryNumberToEnso(jsNumber, MutableModule.Transient())
+      expect(convertedToAst?.code()).toBe(expectedEnsoNumber)
+    }
+  },
+)
diff --git a/app/gui2/src/util/ast/abstract.ts b/app/gui2/src/util/ast/abstract.ts
index 28b559110d58..82891d1c802e 100644
--- a/app/gui2/src/util/ast/abstract.ts
+++ b/app/gui2/src/util/ast/abstract.ts
@@ -19,6 +19,7 @@ import {
   MutableIdent,
   MutableModule,
   MutablePropertyAccess,
+  NegationApp,
   NumericLiteral,
   OprApp,
   PropertyAccess,
@@ -224,10 +225,22 @@ export function substituteQualifiedName(
  */
 export function tryNumberToEnso(value: number, module: MutableModule) {
   if (!Number.isFinite(value)) return
-  const literal = NumericLiteral.tryParse(value.toString(), module)
+  const literal = NumericLiteral.tryParse(Math.abs(value).toString(), module)
   if (!literal)
     console.warn(`Not implemented: Converting scientific-notation number to Enso value`, value)
-  return literal
+  if (literal && value < 0) {
+    return NegationApp.new(module, literal)
+  } else {
+    return literal
+  }
+}
+
+export function tryEnsoToNumber(ast: Ast) {
+  const [sign, literal] = ast instanceof NegationApp ? [-1, ast.argument] : [1, ast]
+  if (!(literal instanceof NumericLiteral)) return
+  // JS parsing is accidentally the same as our rules for literals: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number#number_coercion
+  // except `_` separators: https://stackoverflow.com/questions/72548282/why-does-number-constructor-fail-to-parse-numbers-with-separators
+  return sign * Number(literal.code().replace(/_/g, ''))
 }
 
 export function copyIntoNewModule<T extends Ast>(ast: T): Owned<Mutable<T>> {
diff --git a/app/gui2/src/util/autoBlur.ts b/app/gui2/src/util/autoBlur.ts
index 85ac22d0d983..ae61f5004d23 100644
--- a/app/gui2/src/util/autoBlur.ts
+++ b/app/gui2/src/util/autoBlur.ts
@@ -1,14 +1,15 @@
 import { unrefElement, useEvent } from '@/composables/events'
 import { injectInteractionHandler, type Interaction } from '@/providers/interactionHandler'
+import type { ToValue } from '@/util/reactivity'
 import type { VueInstance } from '@vueuse/core'
-import { watchEffect, type Ref } from 'vue'
+import { toValue, watchEffect, type Ref } from 'vue'
 import type { Opt } from 'ydoc-shared/util/data/opt'
 
 /** Automatically `blur` the currently active element on any mouse click outside of `root`.
  * It is useful when other elements may capture pointer events, preventing default browser behavior for focus change. */
-export function useAutoBlur(root: Ref<HTMLElement | SVGElement | undefined>) {
+export function useAutoBlur(root: ToValue<HTMLElement | SVGElement | undefined>) {
   watchEffect((onCleanup) => {
-    const element = root.value
+    const element = toValue(root)
     if (element) {
       autoBlurRoots.add(element)
       onCleanup(() => autoBlurRoots.delete(element))
diff --git a/app/ydoc-shared/src/ast/parse.ts b/app/ydoc-shared/src/ast/parse.ts
index 84917e887ae1..adfdabb254b5 100644
--- a/app/ydoc-shared/src/ast/parse.ts
+++ b/app/ydoc-shared/src/ast/parse.ts
@@ -300,6 +300,7 @@ class Abstractor {
         const left = this.abstractToken(tree.left)
         const elements = []
         if (tree.first) elements.push({ value: this.abstractTree(tree.first) })
+        else if (!tree.rest.next().done) elements.push({ value: undefined })
         for (const rawElement of tree.rest) {
           elements.push({
             delimiter: this.abstractToken(rawElement.operator),
diff --git a/app/ydoc-shared/src/ast/tree.ts b/app/ydoc-shared/src/ast/tree.ts
index 4cbd679513ce..7e3c12a13b87 100644
--- a/app/ydoc-shared/src/ast/tree.ts
+++ b/app/ydoc-shared/src/ast/tree.ts
@@ -877,8 +877,9 @@ export class NegationApp extends Ast {
     return asOwned(new MutableNegationApp(module, fields))
   }
 
-  static new(module: MutableModule, operator: Token, argument: Owned) {
-    return this.concrete(module, unspaced(operator), autospaced(argument))
+  static new(module: MutableModule, argument: Owned) {
+    const minus = Token.new('-', RawAst.Token.Type.Operator)
+    return this.concrete(module, unspaced(minus), unspaced(argument))
   }
 
   get operator(): Token {
@@ -1803,6 +1804,18 @@ export class NumericLiteral extends Ast {
     if (parsed instanceof MutableNumericLiteral) return parsed
   }
 
+  static tryParseWithSign(
+    source: string,
+    module?: MutableModule,
+  ): Owned<MutableNumericLiteral | MutableNegationApp> | undefined {
+    const parsed = parse(source, module)
+    if (
+      parsed instanceof MutableNumericLiteral ||
+      (parsed instanceof MutableNegationApp && parsed.argument instanceof MutableNumericLiteral)
+    )
+      return parsed
+  }
+
   static concrete(module: MutableModule, tokens: NodeChild<Token>[]) {
     const base = module.baseObject('NumericLiteral')
     const fields = composeFieldData(base, { tokens })
@@ -2383,8 +2396,8 @@ export class Vector extends Ast {
     yield ensureUnspaced(open, verbatim)
     let isFirst = true
     for (const { delimiter, value } of elements) {
-      if (isFirst && value) {
-        yield preferUnspaced(value)
+      if (isFirst) {
+        if (value) yield preferUnspaced(value)
       } else {
         yield preferUnspaced(delimiter)
         if (value) yield preferSpaced(value)
@@ -2398,6 +2411,16 @@ export class Vector extends Ast {
     for (const element of this.fields.get('elements'))
       if (element.value) yield this.module.get(element.value.node)
   }
+
+  *enumerate(): IterableIterator<[number, Ast | undefined]> {
+    for (const [index, element] of this.fields.get('elements').entries()) {
+      yield [index, this.module.get(element.value?.node)]
+    }
+  }
+
+  get length() {
+    return this.fields.get('elements').length
+  }
 }
 export class MutableVector extends Vector implements MutableAst {
   declare readonly module: MutableModule
@@ -2412,6 +2435,28 @@ export class MutableVector extends Vector implements MutableAst {
     this.fields.set('elements', [...elements, element])
   }
 
+  pop(): Owned | undefined {
+    const elements = this.fields.get('elements')
+    const last = elements[elements.length - 1]?.value?.node
+    this.fields.set('elements', elements.slice(0, -1))
+    const lastNode = this.module.get(last)
+    if (lastNode != null) {
+      lastNode.fields.set('parent', undefined)
+      return lastNode as Owned
+    } else {
+      return undefined
+    }
+  }
+
+  set<T extends MutableAst>(index: number, value: Owned<T>) {
+    const elements = [...this.fields.get('elements')]
+    elements[index] = {
+      delimiter: elements[index]!.delimiter,
+      value: autospaced(this.claimChild(value)),
+    }
+    this.fields.set('elements', elements)
+  }
+
   keep(predicate: (ast: Ast) => boolean) {
     const elements = this.fields.get('elements')
     const filtered = elements.filter(
diff --git a/app/ydoc-shared/src/util/data/result.ts b/app/ydoc-shared/src/util/data/result.ts
index 83ce2b2407a7..384bddb65f06 100644
--- a/app/ydoc-shared/src/util/data/result.ts
+++ b/app/ydoc-shared/src/util/data/result.ts
@@ -3,40 +3,113 @@
 
 import { isSome, type Opt } from './opt'
 
+/**
+ * A type representing result of a function where errors are expected and recoverable.
+ *
+ * Usage:
+ * ```ts
+ * function mayFail() {
+ *    // ....
+ *    if (allIsGood) return Ok()
+ *    else return Err("Something bad happened")
+ * }
+ *
+ * const result = mayFail()
+ * if (result.ok) console.log('Operation succesfull:', result.value)
+ * else result.error.log('Operation failed')
+ * ```
+ *
+ * In more complex cases, adding contextual information to errors may be useful - see
+ * {@link withContext}.
+ */
 export type Result<T = undefined, E = unknown> =
   | { ok: true; value: T }
   | { ok: false; error: ResultError<E> }
 
+/**
+ * Constructor of success {@link Result}.
+ */
 export function Ok(): Result<undefined, never>
 export function Ok<T>(data: T): Result<T, never>
 export function Ok<T>(data?: T): Result<T | undefined, never> {
   return { ok: true, value: data }
 }
 
+/**
+ * Constructor of error {@link Result}.
+ */
 export function Err<E>(error: E): Result<never, E> {
   return { ok: false, error: new ResultError(error) }
 }
 
+/**
+ * Helper function for converting optional value to {@link Result}.
+ */
 export function okOr<T, E>(data: Opt<T>, error: E): Result<T, E> {
   if (isSome(data)) return Ok(data)
   else return Err(error)
 }
 
+/**
+ * Unwraps the {@link Result} value. If the result is error, it is thrown.
+ */
 export function unwrap<T, E>(result: Result<T, E>): T {
   if (result.ok) return result.value
   else throw result.error
 }
 
+/**
+ * Unwraps the {@link Result} value. If the result is error, an alternative is returned.
+ */
 export function unwrapOr<T, A>(result: Result<T, unknown>, alternative: A): T | A {
   if (result.ok) return result.value
   else return alternative
 }
 
+/**
+ * Unwraps the {@link Result} value. If the result is error, it is logged and alternative is returned.
+ */
+export function unwrapOrWithLog<T, A>(
+  result: Result<T, unknown>,
+  alternative: A,
+  preamble?: string,
+): T | A {
+  if (result.ok) return result.value
+  else {
+    result.error.log(preamble)
+    return alternative
+  }
+}
+
+/**
+ * Maps the {@link Result} value.
+ */
 export function mapOk<T, U, E>(result: Result<T, E>, f: (value: T) => U): Result<U, E> {
   if (result.ok) return Ok(f(result.value))
   else return result
 }
 
+/**
+ * If the value is nullish, returns {@link Ok} with it.
+ */
+export function transposeResult<T, E>(value: Opt<Result<T, E>>): Result<Opt<T>, E>
+/**
+ * If any of the values is an error, the first error is returned.
+ */
+export function transposeResult<T, E>(value: Result<T, E>[]): Result<T[], E>
+export function transposeResult<T, E>(value: Opt<Result<T, E>> | Result<T, E>[]) {
+  if (value == null) return Ok(value)
+  if (value instanceof Array) {
+    const error = value.find(x => !x.ok)
+    if (error) return error
+    else return Ok(Array.from(value, x => (x as { ok: true; value: T }).value))
+  }
+  return value
+}
+
+/**
+ * Check if given value is {@link Result}.
+ */
 export function isResult(v: unknown): v is Result {
   return (
     v != null &&
@@ -47,8 +120,12 @@ export function isResult(v: unknown): v is Result {
   )
 }
 
+/**
+ * A class containing information about {@link Result} error.
+ */
 export class ResultError<E = unknown> {
   payload: E
+  /** All contexts attached by {@link withContext} function */
   context: (() => string)[]
 
   constructor(payload: E) {
@@ -56,10 +133,17 @@ export class ResultError<E = unknown> {
     this.context = []
   }
 
+  /**
+   * Log the error with context information and given preable.
+   */
   log(preamble: string = 'Error') {
     console.error(this.message(preamble))
   }
 
+  /**
+   * Returns the error message: the given preamble, the payload coerced to string and all context
+   * information.
+   */
   message(preamble: string = 'error') {
     const ctx =
       this.context.length > 0 ? `\n${Array.from(this.context, ctx => ctx()).join('\n')}` : ''
@@ -67,6 +151,43 @@ export class ResultError<E = unknown> {
   }
 }
 
+/**
+ * Adds a context information to any error returned by `f`
+ *
+ * It it useful for making helpful error messages in complex operations, where result errors may be
+ * propagated through several calls.
+ *
+ * A simplified example:
+ * ```ts
+ *
+ * function parse(x: unknown): Result<number> {
+ *   const parsed = parseFloat(x)
+ *   if (isNan(parsed)) return Err(`Cannot parse ${x} as number`)
+ *   return parsed
+ * }
+ *
+ * function parseAndAdd(a: unknown, b: unknown): Result<number> {
+ *   const parsedA = withContext(
+ *     () => 'When parsing left operand',
+ *     () => parse(a)
+ *   )
+ *   if (!parsedA.ok) return parsedA
+ *   const parsedB = withContext(
+ *     () => 'When parsing right operand',
+ *     () => parse(b)
+ *   )
+ *   if (!parsedB.ok) return parsedB
+ *   return parsedA + parsedB
+ * }
+ *
+ * parseAndAdd('2', '3') // returns Ok(5)
+ *
+ * // Will print:
+ * // Error: Cannot parse x as number
+ * // When parsing right operand
+ * const result = parseAndAdd('2', 'x')
+ * result.ok || result.error.log()
+ */
 export function withContext<T, E>(context: () => string, f: () => Result<T, E>): Result<T, E>
 export function withContext<T, E>(
   context: () => string,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7425388facbc..8eb3a0e501e5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -323,6 +323,9 @@ importers:
       ag-grid-enterprise:
         specifier: ^30.2.1
         version: 30.2.1
+      ag-grid-vue3:
+        specifier: ^30.2.1
+        version: 30.2.1(ag-grid-community@30.2.1)(vue@3.4.31(typescript@5.5.3))
       codemirror:
         specifier: ^6.0.1
         version: 6.0.1(@lezer/common@1.2.1)
@@ -374,6 +377,9 @@ importers:
       vue:
         specifier: ^3.4.19
         version: 3.4.31(typescript@5.5.3)
+      vue-component-type-helpers:
+        specifier: ^2.0.29
+        version: 2.0.29      
       y-codemirror.next:
         specifier: ^0.3.2
         version: 0.3.5(@codemirror/state@6.4.1)(@codemirror/view@6.28.3)(yjs@13.6.18)
@@ -3364,6 +3370,12 @@ packages:
   ag-grid-enterprise@30.2.1:
     resolution: {integrity: sha512-sGeyAfZ416dBlJaxIHB6hGTJG6QzuajXnDAtVuQlOLUuV4/TXVQoh5SJkiKBpWXukZQJPE4VD/5IkQ1tXh96/w==}
 
+  ag-grid-vue3@30.2.1:
+    resolution: {integrity: sha512-uIsBv5H7Nu6ao1V7cuReVj27gFdlK4kfvo/4M6AWmYswghMpc1GwzczZNV8HUypGcwxONW9YSfr8zabYQNGcAg==}
+    peerDependencies:
+      ag-grid-community: ~30.2.1
+      vue: ^3.0.0
+
   agent-base@6.0.2:
     resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
     engines: {node: '>= 6.0.0'}
@@ -7374,8 +7386,8 @@ packages:
   vscode-uri@3.0.8:
     resolution: {integrity: sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==}
 
-  vue-component-type-helpers@2.0.24:
-    resolution: {integrity: sha512-Jr5N8QVYEcbQuMN1LRgvg61758G8HTnzUlQsAFOxx6Y6X8kmhJ7C+jOvWsQruYxi3uHhhS6BghyRlyiwO99DBg==}
+  vue-component-type-helpers@2.0.29:
+    resolution: {integrity: sha512-58i+ZhUAUpwQ+9h5Hck0D+jr1qbYl4voRt5KffBx8qzELViQ4XdT/Tuo+mzq8u63teAG8K0lLaOiL5ofqW38rg==}
 
   vue-demi@0.14.8:
     resolution: {integrity: sha512-Uuqnk9YE9SsWeReYqK2alDI5YzciATE0r2SkA6iMAtuXvNTMNACJLJEXNXaEy94ECuBe4Sk6RzRU80kjdbIo1Q==}
@@ -10835,7 +10847,7 @@ snapshots:
   '@vue/test-utils@2.4.6':
     dependencies:
       js-beautify: 1.15.1
-      vue-component-type-helpers: 2.0.24
+      vue-component-type-helpers: 2.0.29
 
   '@vue/tsconfig@0.5.1': {}
 
@@ -10896,6 +10908,11 @@ snapshots:
     dependencies:
       ag-grid-community: 30.2.1
 
+  ag-grid-vue3@30.2.1(ag-grid-community@30.2.1)(vue@3.4.31(typescript@5.5.3)):
+    dependencies:
+      ag-grid-community: 30.2.1
+      vue: 3.4.31(typescript@5.5.3)
+
   agent-base@6.0.2:
     dependencies:
       debug: 4.3.6(supports-color@5.5.0)
@@ -15509,7 +15526,7 @@ snapshots:
 
   vscode-uri@3.0.8: {}
 
-  vue-component-type-helpers@2.0.24: {}
+  vue-component-type-helpers@2.0.29: {}
 
   vue-demi@0.14.8(vue@3.4.31(typescript@5.5.3)):
     dependencies:

From a79a393ed771685784e198d9d647fa2b44b8673a Mon Sep 17 00:00:00 2001
From: Pavel Marek <pavel.marek@enso.org>
Date: Mon, 12 Aug 2024 17:03:41 +0200
Subject: [PATCH 14/23] Flatten object hierarchy of AliasAnalysis metadata so
 it is accessible from Java (#10780)

Flatten hierarchy of alias analysis metadata (`or.genso.compiler.pass.alias.Info`) so that it is easily accessible from Java and rename it.

# Important Notes
- Rename `org.enso.compiler.alias.Graph.Occurence` to `org.enso.compiler.alias.graph.GraphOccurence` and flatten the hierarchy.
- Rename `org.enso.compiler.pass.alias.Info` to `org.enso.compiler.pass.alias.AliasMetadata` and flatten the hierarchy.
---
 .../context/NameResolutionAlgorithm.java      |  10 +-
 .../pass/analyse/PassPersistance.java         |  29 +-
 .../analyse/types/LocalBindingsTyping.java    |   2 +-
 .../pass/analyse/types/TypePropagation.java   |  11 +-
 .../enso/compiler/context/LocalScope.scala    |   7 +-
 .../compiler/pass/analyse/AliasAnalysis.scala | 115 ++++---
 .../pass/analyse/AutomaticParallelism.scala   |   7 +-
 .../pass/analyse/DataflowAnalysis.scala       |   5 +-
 .../pass/analyse/DemandAnalysis.scala         |   2 +-
 .../pass/analyse/alias/AliasMetadata.scala    |  89 ++++++
 .../compiler/pass/analyse/alias/Info.scala    |  89 ------
 .../analyse/alias/{ => graph}/Graph.scala     | 134 +++------
 .../analyse/alias/graph/GraphOccurrence.scala |  65 ++++
 .../compiler/pass/lint/UnusedBindings.scala   |   2 +-
 .../pass/optimise/LambdaConsolidate.scala     |  13 +-
 .../pass/resolve/FullyQualifiedNames.scala    |   2 +-
 .../compiler/pass/resolve/GlobalNames.scala   |   2 +-
 .../test/pass/analyse/AliasAnalysisTest.scala | 282 ++++++++++--------
 .../interpreter/runtime/IrToTruffle.scala     |  34 +--
 19 files changed, 487 insertions(+), 413 deletions(-)
 create mode 100644 engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/alias/AliasMetadata.scala
 delete mode 100644 engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/alias/Info.scala
 rename engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/alias/{ => graph}/Graph.scala (83%)
 create mode 100644 engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/alias/graph/GraphOccurrence.scala

diff --git a/engine/runtime-compiler/src/main/java/org/enso/compiler/context/NameResolutionAlgorithm.java b/engine/runtime-compiler/src/main/java/org/enso/compiler/context/NameResolutionAlgorithm.java
index 3e4b19acc7c4..0d938af7dc71 100644
--- a/engine/runtime-compiler/src/main/java/org/enso/compiler/context/NameResolutionAlgorithm.java
+++ b/engine/runtime-compiler/src/main/java/org/enso/compiler/context/NameResolutionAlgorithm.java
@@ -5,7 +5,7 @@
 import org.enso.compiler.core.ir.Name;
 import org.enso.compiler.data.BindingsMap;
 import org.enso.compiler.pass.analyse.AliasAnalysis$;
-import org.enso.compiler.pass.analyse.alias.Info;
+import org.enso.compiler.pass.analyse.alias.AliasMetadata;
 import org.enso.compiler.pass.resolve.GlobalNames$;
 import scala.Option;
 
@@ -30,8 +30,9 @@
  */
 public abstract class NameResolutionAlgorithm<ResultType, LocalNameLinkType> {
   public final ResultType resolveName(Name.Literal name) {
-    Info.Occurrence occurrenceMetadata =
-        MetadataInteropHelpers.getMetadata(name, AliasAnalysis$.MODULE$, Info.Occurrence.class);
+    AliasMetadata.Occurrence occurrenceMetadata =
+        MetadataInteropHelpers.getMetadata(
+            name, AliasAnalysis$.MODULE$, AliasMetadata.Occurrence.class);
     var maybeLocalLink = findLocalLink(occurrenceMetadata);
     if (maybeLocalLink.isDefined()) {
       return resolveLocalName(maybeLocalLink.get());
@@ -52,7 +53,8 @@ public final ResultType resolveName(Name.Literal name) {
     return resolveUnresolvedSymbol(name.name());
   }
 
-  protected abstract Option<LocalNameLinkType> findLocalLink(Info.Occurrence occurrenceMetadata);
+  protected abstract Option<LocalNameLinkType> findLocalLink(
+      AliasMetadata.Occurrence occurrenceMetadata);
 
   protected abstract ResultType resolveLocalName(LocalNameLinkType localLink);
 
diff --git a/engine/runtime-compiler/src/main/java/org/enso/compiler/pass/analyse/PassPersistance.java b/engine/runtime-compiler/src/main/java/org/enso/compiler/pass/analyse/PassPersistance.java
index 838a148e7a0b..93d0150e031e 100644
--- a/engine/runtime-compiler/src/main/java/org/enso/compiler/pass/analyse/PassPersistance.java
+++ b/engine/runtime-compiler/src/main/java/org/enso/compiler/pass/analyse/PassPersistance.java
@@ -1,8 +1,9 @@
 package org.enso.compiler.pass.analyse;
 
 import java.io.IOException;
-import org.enso.compiler.pass.analyse.alias.Graph;
-import org.enso.compiler.pass.analyse.alias.Info;
+import org.enso.compiler.pass.analyse.alias.AliasMetadata;
+import org.enso.compiler.pass.analyse.alias.graph.Graph;
+import org.enso.compiler.pass.analyse.alias.graph.GraphOccurrence;
 import org.enso.compiler.pass.analyse.types.TypeInference;
 import org.enso.compiler.pass.resolve.DocumentationComments;
 import org.enso.compiler.pass.resolve.DocumentationComments$;
@@ -57,23 +58,11 @@
 @Persistable(clazz = GenericAnnotations$.class, id = 1216)
 @Persistable(clazz = ExpressionAnnotations$.class, id = 1217)
 @Persistable(clazz = FullyQualifiedNames$.class, id = 1218)
-@Persistable(clazz = Info.Occurrence.class, id = 1261, allowInlining = false)
-@Persistable(
-    clazz = org.enso.compiler.pass.analyse.alias.Info$Scope$Root.class,
-    id = 1262,
-    allowInlining = false)
-@Persistable(
-    clazz = org.enso.compiler.pass.analyse.alias.Info$Scope$Child.class,
-    id = 1263,
-    allowInlining = false)
-@Persistable(
-    clazz = org.enso.compiler.pass.analyse.alias.Graph$Occurrence$Use.class,
-    id = 1264,
-    allowInlining = false)
-@Persistable(
-    clazz = org.enso.compiler.pass.analyse.alias.Graph$Occurrence$Def.class,
-    id = 1265,
-    allowInlining = false)
+@Persistable(clazz = AliasMetadata.Occurrence.class, id = 1261, allowInlining = false)
+@Persistable(clazz = AliasMetadata.RootScope.class, id = 1262, allowInlining = false)
+@Persistable(clazz = AliasMetadata.ChildScope.class, id = 1263, allowInlining = false)
+@Persistable(clazz = GraphOccurrence.Use.class, id = 1264, allowInlining = false)
+@Persistable(clazz = GraphOccurrence.Def.class, id = 1265, allowInlining = false)
 @Persistable(clazz = Graph.Link.class, id = 1266, allowInlining = false)
 @Persistable(clazz = TypeInference.class, id = 1280)
 public final class PassPersistance {
@@ -131,7 +120,7 @@ public PersistAliasAnalysisGraphScope() {
     @SuppressWarnings("unchecked")
     protected Graph.Scope readObject(Input in) throws IOException {
       var childScopes = in.readInline(scala.collection.immutable.List.class);
-      var occurrencesValues = (scala.collection.immutable.Set<Graph.Occurrence>) in.readObject();
+      var occurrencesValues = (scala.collection.immutable.Set<GraphOccurrence>) in.readObject();
       var occurrences = occurrencesValues.map(v -> Tuple2$.MODULE$.apply(v.id(), v)).toMap(null);
       var allDefinitions = in.readInline(scala.collection.immutable.List.class);
       var parent = new Graph.Scope(childScopes, occurrences, allDefinitions);
diff --git a/engine/runtime-compiler/src/main/java/org/enso/compiler/pass/analyse/types/LocalBindingsTyping.java b/engine/runtime-compiler/src/main/java/org/enso/compiler/pass/analyse/types/LocalBindingsTyping.java
index 4c3876cd02f4..6dcac3b86c09 100644
--- a/engine/runtime-compiler/src/main/java/org/enso/compiler/pass/analyse/types/LocalBindingsTyping.java
+++ b/engine/runtime-compiler/src/main/java/org/enso/compiler/pass/analyse/types/LocalBindingsTyping.java
@@ -2,7 +2,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import org.enso.compiler.pass.analyse.alias.Graph;
+import org.enso.compiler.pass.analyse.alias.graph.Graph;
 
 /**
  * A mapping that maps binding definitions from an alias analysis graph to their inferred types.
diff --git a/engine/runtime-compiler/src/main/java/org/enso/compiler/pass/analyse/types/TypePropagation.java b/engine/runtime-compiler/src/main/java/org/enso/compiler/pass/analyse/types/TypePropagation.java
index a7bad8b0ccf2..d9c3493216ee 100644
--- a/engine/runtime-compiler/src/main/java/org/enso/compiler/pass/analyse/types/TypePropagation.java
+++ b/engine/runtime-compiler/src/main/java/org/enso/compiler/pass/analyse/types/TypePropagation.java
@@ -17,8 +17,9 @@
 import org.enso.compiler.core.ir.expression.Case;
 import org.enso.compiler.data.BindingsMap;
 import org.enso.compiler.pass.analyse.AliasAnalysis$;
-import org.enso.compiler.pass.analyse.alias.Graph;
-import org.enso.compiler.pass.analyse.alias.Info;
+import org.enso.compiler.pass.analyse.alias.AliasMetadata;
+import org.enso.compiler.pass.analyse.alias.graph.Graph;
+import org.enso.compiler.pass.analyse.alias.graph.GraphOccurrence;
 import org.enso.compiler.pass.resolve.TypeSignatures;
 import org.enso.compiler.pass.resolve.TypeSignatures$;
 import org.slf4j.Logger;
@@ -340,7 +341,7 @@ private CompilerNameResolution(LocalBindingsTyping localBindingsTyping) {
     }
 
     @Override
-    protected Option<LinkInfo> findLocalLink(Info.Occurrence occurrenceMetadata) {
+    protected Option<LinkInfo> findLocalLink(AliasMetadata.Occurrence occurrenceMetadata) {
       return occurrenceMetadata
           .graph()
           .defLinkFor(occurrenceMetadata.id())
@@ -396,7 +397,7 @@ private record LinkInfo(Graph graph, Graph.Link link) {}
    */
   private void registerBinding(
       IR binding, TypeRepresentation type, LocalBindingsTyping localBindingsTyping) {
-    var metadata = getMetadata(binding, AliasAnalysis$.MODULE$, Info.Occurrence.class);
+    var metadata = getMetadata(binding, AliasAnalysis$.MODULE$, AliasMetadata.Occurrence.class);
     var occurrence = metadata.graph().getOccurrence(metadata.id());
     if (occurrence.isEmpty()) {
       logger.warn(
@@ -404,7 +405,7 @@ private void registerBinding(
       return;
     }
 
-    if (occurrence.get() instanceof org.enso.compiler.pass.analyse.alias.Graph$Occurrence$Def def) {
+    if (occurrence.get() instanceof GraphOccurrence.Def def) {
       localBindingsTyping.registerBindingType(metadata.graph(), def.id(), type);
     } else {
       throw new CompilerError(
diff --git a/engine/runtime-compiler/src/main/scala/org/enso/compiler/context/LocalScope.scala b/engine/runtime-compiler/src/main/scala/org/enso/compiler/context/LocalScope.scala
index dc70212d5c1e..f215d6bcd8c5 100644
--- a/engine/runtime-compiler/src/main/scala/org/enso/compiler/context/LocalScope.scala
+++ b/engine/runtime-compiler/src/main/scala/org/enso/compiler/context/LocalScope.scala
@@ -1,7 +1,10 @@
 package org.enso.compiler.context
 
 import org.enso.compiler.pass.analyse.DataflowAnalysis
-import org.enso.compiler.pass.analyse.alias.{Graph => AliasGraph}
+import org.enso.compiler.pass.analyse.alias.graph.{
+  GraphOccurrence,
+  Graph => AliasGraph
+}
 
 import scala.jdk.CollectionConverters._
 
@@ -140,7 +143,7 @@ class LocalScope(
       .getOrElse(Map())
 
     scope.occurrences.foreach {
-      case (id, x: AliasGraph.Occurrence.Def) =>
+      case (id, x: GraphOccurrence.Def) =>
         parentResult += x.symbol -> new FramePointer(
           level,
           allFrameSlotIdxs(id)
diff --git a/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/AliasAnalysis.scala b/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/AliasAnalysis.scala
index d64e56fef86b..0f10a8bf6f2e 100644
--- a/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/AliasAnalysis.scala
+++ b/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/AliasAnalysis.scala
@@ -28,7 +28,9 @@ import org.enso.compiler.core.ir.{
 }
 import org.enso.compiler.core.{CompilerError, IR}
 import org.enso.compiler.pass.IRPass
-import org.enso.compiler.pass.analyse.alias.Graph.{Occurrence, Scope}
+import org.enso.compiler.pass.analyse.alias.graph.Graph
+import org.enso.compiler.pass.analyse.alias.graph.GraphOccurrence
+import org.enso.compiler.pass.analyse.alias.graph.Graph.Scope
 import org.enso.compiler.pass.desugar._
 import org.enso.compiler.pass.lint.UnusedBindings
 
@@ -69,7 +71,7 @@ import scala.collection.mutable
 case object AliasAnalysis extends IRPass {
 
   /** Alias information for the IR. */
-  override type Metadata = alias.Info
+  override type Metadata = alias.AliasMetadata
   override type Config   = Configuration
 
   override lazy val precursorPasses: Seq[IRPass] = List(
@@ -159,7 +161,7 @@ case object AliasAnalysis extends IRPass {
       sourceRootScopeGraphOpt.foreach { sourceRootScopeGraphScope =>
         val sourceRootScopeGraph =
           sourceRootScopeGraphScope
-            .asInstanceOf[alias.Info.Scope.Root]
+            .asInstanceOf[alias.AliasMetadata.RootScope]
             .graph
 
         val scopeMapping = mutable.Map[Scope, Scope]()
@@ -175,14 +177,14 @@ case object AliasAnalysis extends IRPass {
           sourceNode.getMetadata(this) match {
             case Some(meta) =>
               val newMeta = meta match {
-                case root: alias.Info.Scope.Root =>
+                case root: alias.AliasMetadata.RootScope =>
                   root.copy(graph = copyRootScopeGraph)
-                case child: alias.Info.Scope.Child =>
+                case child: alias.AliasMetadata.ChildScope =>
                   child.copy(
                     graph = copyRootScopeGraph,
                     scope = child.scope.deepCopy(scopeMapping)
                   )
-                case occ: alias.Info.Occurrence =>
+                case occ: alias.AliasMetadata.Occurrence =>
                   occ.copy(graph = copyRootScopeGraph)
               }
               copyNode.updateMetadata(new MetadataPair(this, newMeta))
@@ -228,7 +230,7 @@ case object AliasAnalysis extends IRPass {
   def analyseModuleDefinition(
     ir: Definition
   ): Definition = {
-    val topLevelGraph = new alias.Graph
+    val topLevelGraph = new Graph
 
     ir match {
       case m: definition.Method.Conversion =>
@@ -244,7 +246,7 @@ case object AliasAnalysis extends IRPass {
             ).updateMetadata(
               new MetadataPair(
                 this,
-                alias.Info.Scope.Root(topLevelGraph)
+                alias.AliasMetadata.RootScope(topLevelGraph)
               )
             )
           case _ =>
@@ -265,7 +267,7 @@ case object AliasAnalysis extends IRPass {
             ).updateMetadata(
               new MetadataPair(
                 this,
-                alias.Info.Scope.Root(topLevelGraph)
+                alias.AliasMetadata.RootScope(topLevelGraph)
               )
             )
           case _ =>
@@ -285,7 +287,7 @@ case object AliasAnalysis extends IRPass {
             topLevelGraph.rootScope
           ),
           members = t.members.map(d => {
-            val graph = new alias.Graph
+            val graph = new Graph
             d.copy(
               arguments = analyseArgumentDefs(
                 d.arguments,
@@ -304,16 +306,16 @@ case object AliasAnalysis extends IRPass {
                   .updateMetadata(
                     new MetadataPair(
                       this,
-                      alias.Info.Scope.Root(topLevelGraph)
+                      alias.AliasMetadata.RootScope(topLevelGraph)
                     )
                   )
               }
             ).updateMetadata(
-              new MetadataPair(this, alias.Info.Scope.Root(graph))
+              new MetadataPair(this, alias.AliasMetadata.RootScope(graph))
             )
           })
         ).updateMetadata(
-          new MetadataPair(this, alias.Info.Scope.Root(topLevelGraph))
+          new MetadataPair(this, alias.AliasMetadata.RootScope(topLevelGraph))
         )
       case _: Definition.SugaredType =>
         throw new CompilerError(
@@ -344,7 +346,7 @@ case object AliasAnalysis extends IRPass {
             )
           )
           .updateMetadata(
-            new MetadataPair(this, alias.Info.Scope.Root(topLevelGraph))
+            new MetadataPair(this, alias.AliasMetadata.RootScope(topLevelGraph))
           )
       case err: Error => err
     }
@@ -367,7 +369,7 @@ case object AliasAnalysis extends IRPass {
     */
   private def analyseExpression(
     expression: Expression,
-    graph: alias.Graph,
+    graph: Graph,
     parentScope: Scope,
     lambdaReuseScope: Boolean = false
   ): Expression = {
@@ -412,18 +414,20 @@ case object AliasAnalysis extends IRPass {
           .updateMetadata(
             new MetadataPair(
               this,
-              alias.Info.Scope.Child(graph, currentScope)
+              alias.AliasMetadata.ChildScope(graph, currentScope)
             )
           )
       case binding @ Expression.Binding(name, expression, _, _, _) =>
-        if (!parentScope.hasSymbolOccurrenceAs[Occurrence.Def](name.name)) {
+        if (
+          !parentScope.hasSymbolOccurrenceAs[GraphOccurrence.Def](name.name)
+        ) {
           val isSuspended = expression match {
             case Expression.Block(_, _, _, isSuspended, _, _) => isSuspended
             case _                                            => false
           }
           val occurrenceId = graph.nextId()
           val occurrence =
-            Occurrence.Def(
+            GraphOccurrence.Def(
               occurrenceId,
               name.name,
               binding.getId(),
@@ -445,7 +449,7 @@ case object AliasAnalysis extends IRPass {
             .updateMetadata(
               new MetadataPair(
                 this,
-                alias.Info.Occurrence(graph, occurrenceId)
+                alias.AliasMetadata.Occurrence(graph, occurrenceId)
               )
             )
         } else {
@@ -474,7 +478,7 @@ case object AliasAnalysis extends IRPass {
     */
   def analyseType(
     value: Type,
-    graph: alias.Graph,
+    graph: Graph,
     parentScope: Scope
   ): Type = {
     value match {
@@ -491,7 +495,12 @@ case object AliasAnalysis extends IRPass {
 
         val labelId = graph.nextId()
         val definition =
-          Occurrence.Def(labelId, label.name, label.getId, label.getExternalId)
+          GraphOccurrence.Def(
+            labelId,
+            label.name,
+            label.getId,
+            label.getExternalId
+          )
         parentScope.add(definition)
         parentScope.addDefinition(definition)
 
@@ -501,7 +510,10 @@ case object AliasAnalysis extends IRPass {
             value      = analyseExpression(value, graph, valueScope)
           )
           .updateMetadata(
-            new MetadataPair(this, alias.Info.Occurrence(graph, labelId))
+            new MetadataPair(
+              this,
+              alias.AliasMetadata.Occurrence(graph, labelId)
+            )
           )
       case x =>
         x.mapExpressions(analyseExpression(_, graph, parentScope))
@@ -526,7 +538,7 @@ case object AliasAnalysis extends IRPass {
     */
   private def analyseArgumentDefs(
     args: List[DefinitionArgument],
-    graph: alias.Graph,
+    graph: Graph,
     scope: Scope
   ): List[DefinitionArgument] = {
     args.map {
@@ -542,7 +554,7 @@ case object AliasAnalysis extends IRPass {
         // Synthetic `self` must not be added to the scope, but it has to be added as a
         // definition for frame index metadata
         val occurrenceId = graph.nextId()
-        val definition = alias.Graph.Occurrence.Def(
+        val definition = GraphOccurrence.Def(
           occurrenceId,
           selfName.name,
           arg.getId(),
@@ -553,7 +565,7 @@ case object AliasAnalysis extends IRPass {
           .updateMetadata(
             new MetadataPair(
               this,
-              alias.Info.Occurrence(graph, occurrenceId)
+              alias.AliasMetadata.Occurrence(graph, occurrenceId)
             )
           )
           .copy(
@@ -571,7 +583,7 @@ case object AliasAnalysis extends IRPass {
             _
           ) =>
         val nameOccursInScope =
-          scope.hasSymbolOccurrenceAs[alias.Graph.Occurrence.Def](
+          scope.hasSymbolOccurrenceAs[GraphOccurrence.Def](
             name.name
           )
         if (!nameOccursInScope) {
@@ -582,7 +594,7 @@ case object AliasAnalysis extends IRPass {
             )
 
           val occurrenceId = graph.nextId()
-          val definition = alias.Graph.Occurrence.Def(
+          val definition = GraphOccurrence.Def(
             occurrenceId,
             name.name,
             arg.getId(),
@@ -601,7 +613,7 @@ case object AliasAnalysis extends IRPass {
             .updateMetadata(
               new MetadataPair(
                 this,
-                alias.Info.Occurrence(graph, occurrenceId)
+                alias.AliasMetadata.Occurrence(graph, occurrenceId)
               )
             )
         } else {
@@ -615,7 +627,7 @@ case object AliasAnalysis extends IRPass {
             .updateMetadata(
               new MetadataPair(
                 this,
-                alias.Info.Occurrence(graph, f.get.id)
+                alias.AliasMetadata.Occurrence(graph, f.get.id)
               )
             )
         }
@@ -631,8 +643,8 @@ case object AliasAnalysis extends IRPass {
     */
   def analyseApplication(
     application: Application,
-    graph: alias.Graph,
-    scope: alias.Graph.Scope
+    graph: Graph,
+    scope: Graph.Scope
   ): Application = {
     application match {
       case app @ Application.Prefix(fun, arguments, _, _, _, _) =>
@@ -651,7 +663,7 @@ case object AliasAnalysis extends IRPass {
           .updateMetadata(
             new MetadataPair(
               this,
-              alias.Info.Scope.Child(graph, newScope)
+              alias.AliasMetadata.ChildScope(graph, newScope)
             )
           )
       case _: Operator.Binary =>
@@ -674,8 +686,8 @@ case object AliasAnalysis extends IRPass {
     */
   private def analyseCallArguments(
     args: List[CallArgument],
-    graph: alias.Graph,
-    parentScope: alias.Graph.Scope
+    graph: Graph,
+    parentScope: Graph.Scope
   ): List[CallArgument] = {
     args.map { case arg @ CallArgument.Specified(_, expr, _, _, _) =>
       val currentScope = expr match {
@@ -687,7 +699,7 @@ case object AliasAnalysis extends IRPass {
         .updateMetadata(
           new MetadataPair(
             this,
-            alias.Info.Scope.Child(graph, currentScope)
+            alias.AliasMetadata.ChildScope(graph, currentScope)
           )
         )
     }
@@ -704,7 +716,7 @@ case object AliasAnalysis extends IRPass {
     */
   def analyseFunction(
     function: Function,
-    graph: alias.Graph,
+    graph: Graph,
     parentScope: Scope,
     lambdaReuseScope: Boolean = false
   ): Function = {
@@ -725,7 +737,7 @@ case object AliasAnalysis extends IRPass {
           .updateMetadata(
             new MetadataPair(
               this,
-              alias.Info.Scope.Child(graph, currentScope)
+              alias.AliasMetadata.ChildScope(graph, currentScope)
             )
           )
       case _: Function.Binding =>
@@ -750,19 +762,29 @@ case object AliasAnalysis extends IRPass {
     name: Name,
     isInPatternContext: Boolean,
     isConstructorNameInPatternContext: Boolean,
-    graph: alias.Graph,
+    graph: Graph,
     parentScope: Scope
   ): Name = {
     val occurrenceId = graph.nextId()
 
     if (isInPatternContext && !isConstructorNameInPatternContext) {
       val definition =
-        Occurrence.Def(occurrenceId, name.name, name.getId, name.getExternalId)
+        GraphOccurrence.Def(
+          occurrenceId,
+          name.name,
+          name.getId,
+          name.getExternalId
+        )
       parentScope.add(definition)
       parentScope.addDefinition(definition)
     } else {
       val occurrence =
-        Occurrence.Use(occurrenceId, name.name, name.getId, name.getExternalId)
+        GraphOccurrence.Use(
+          occurrenceId,
+          name.name,
+          name.getId,
+          name.getExternalId
+        )
       parentScope.add(occurrence)
       if (!isConstructorNameInPatternContext && !name.isMethod) {
         graph.resolveLocalUsage(occurrence)
@@ -771,7 +793,10 @@ case object AliasAnalysis extends IRPass {
       }
     }
     name.updateMetadata(
-      new MetadataPair(this, alias.Info.Occurrence(graph, occurrenceId))
+      new MetadataPair(
+        this,
+        alias.AliasMetadata.Occurrence(graph, occurrenceId)
+      )
     )
   }
 
@@ -784,7 +809,7 @@ case object AliasAnalysis extends IRPass {
     */
   def analyseCase(
     ir: Case,
-    graph: alias.Graph,
+    graph: Graph,
     parentScope: Scope
   ): Case = {
     ir match {
@@ -808,7 +833,7 @@ case object AliasAnalysis extends IRPass {
     */
   def analyseCaseBranch(
     branch: Case.Branch,
-    graph: alias.Graph,
+    graph: Graph,
     parentScope: Scope
   ): Case.Branch = {
     val currentScope = parentScope.addChild()
@@ -825,7 +850,7 @@ case object AliasAnalysis extends IRPass {
       .updateMetadata(
         new MetadataPair(
           this,
-          alias.Info.Scope.Child(graph, currentScope)
+          alias.AliasMetadata.ChildScope(graph, currentScope)
         )
       )
   }
@@ -839,7 +864,7 @@ case object AliasAnalysis extends IRPass {
     */
   def analysePattern(
     pattern: Pattern,
-    graph: alias.Graph,
+    graph: Graph,
     parentScope: Scope
   ): Pattern = {
     pattern match {
diff --git a/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/AutomaticParallelism.scala b/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/AutomaticParallelism.scala
index a2c2d9e09f47..5d714e0d1e00 100644
--- a/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/AutomaticParallelism.scala
+++ b/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/AutomaticParallelism.scala
@@ -16,6 +16,7 @@ import org.enso.compiler.data.BindingsMap.{Resolution, ResolvedModuleMethod}
 import org.enso.compiler.core.CompilerError
 import org.enso.compiler.core.ir.expression.{Application, Operator}
 import org.enso.compiler.pass.IRPass
+import org.enso.compiler.pass.analyse.alias.graph.Graph
 import org.enso.compiler.pass.desugar.ComplexType
 import org.enso.compiler.pass.resolve.{
   IgnoredBindings,
@@ -78,7 +79,7 @@ object AutomaticParallelism extends IRPass {
     ir: Expression,
     parallelismStatus: ParallelismStatus,
     id: Int,
-    assignment: Option[alias.Graph.Id],
+    assignment: Option[Graph.Id],
     dependencies: Set[Int],
     blockAssignment: Option[BlockAssignment]
   )
@@ -215,7 +216,7 @@ object AutomaticParallelism extends IRPass {
               AliasAnalysis,
               "Alias analysis left a binding behind"
             )
-            .asInstanceOf[alias.Info.Occurrence]
+            .asInstanceOf[alias.AliasMetadata.Occurrence]
           line.copy(assignment = Some(aaInfo.id))
         case _ => line
       }
@@ -233,7 +234,7 @@ object AutomaticParallelism extends IRPass {
           n
         }
         .flatMap(_.getMetadata(AliasAnalysis))
-        .collect { case occ: alias.Info.Occurrence =>
+        .collect { case occ: alias.AliasMetadata.Occurrence =>
           occ
         }
         .flatMap(occ => occ.graph.defLinkFor(occ.id))
diff --git a/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/DataflowAnalysis.scala b/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/DataflowAnalysis.scala
index ceb99906adf9..e6a62412f09b 100644
--- a/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/DataflowAnalysis.scala
+++ b/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/DataflowAnalysis.scala
@@ -30,6 +30,7 @@ import org.enso.compiler.core.ir.{
 import org.enso.compiler.core.ir.MetadataStorage._
 import org.enso.compiler.pass.IRPass
 import org.enso.compiler.pass.analyse.DataflowAnalysis.DependencyInfo.Type.asStatic
+import org.enso.compiler.pass.analyse.alias.graph.GraphOccurrence
 
 import java.util.UUID
 import scala.collection.immutable.ListSet
@@ -548,7 +549,7 @@ case object DataflowAnalysis extends IRPass {
           "Name occurrence with missing aliasing information."
         )
       )
-      .asInstanceOf[alias.Info.Occurrence]
+      .asInstanceOf[alias.AliasMetadata.Occurrence]
 
     name match {
       case _: Name.Blank =>
@@ -560,7 +561,7 @@ case object DataflowAnalysis extends IRPass {
         val key: DependencyInfo.Type = defIdForName match {
           case Some(defLink) =>
             aliasInfo.graph.getOccurrence(defLink.target) match {
-              case Some(alias.Graph.Occurrence.Def(_, _, id, ext, _)) =>
+              case Some(GraphOccurrence.Def(_, _, id, ext, _)) =>
                 DependencyInfo.Type.Static(id, ext)
               case _ =>
                 DependencyInfo.Type.Dynamic(name.name, None)
diff --git a/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/DemandAnalysis.scala b/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/DemandAnalysis.scala
index e032b7ba1505..34362b627fdf 100644
--- a/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/DemandAnalysis.scala
+++ b/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/DemandAnalysis.scala
@@ -202,7 +202,7 @@ case object DemandAnalysis extends IRPass {
         AliasAnalysis,
         "Missing alias occurrence information for a name usage"
       )
-      .unsafeAs[alias.Info.Occurrence]
+      .unsafeAs[alias.AliasMetadata.Occurrence]
 
     aliasInfo.graph.defLinkFor(aliasInfo.id).isDefined
   }
diff --git a/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/alias/AliasMetadata.scala b/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/alias/AliasMetadata.scala
new file mode 100644
index 000000000000..6ec2c96e9b00
--- /dev/null
+++ b/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/alias/AliasMetadata.scala
@@ -0,0 +1,89 @@
+package org.enso.compiler.pass.analyse.alias
+
+import org.enso.compiler.pass.IRPass
+import org.enso.compiler.pass.analyse.alias.graph.Graph
+
+/** Information about the aliasing state for a given IR node. */
+sealed trait AliasMetadata extends IRPass.IRMetadata {
+
+  /** The aliasing graph. */
+  val graph: Graph
+}
+
+object AliasMetadata {
+  sealed trait Scope extends AliasMetadata
+
+  /** Aliasing information for a root scope.
+    *
+    * A root scope has a 1:1 correspondence with a top-level binding.
+    *
+    * @param graph the graph containing the alias information for that node
+    */
+  sealed case class RootScope(override val graph: Graph) extends Scope {
+    override val metadataName: String = "AliasMetadata.RootScope"
+
+    /** @inheritdoc */
+    override def prepareForSerialization(
+      compiler: Compiler
+    ): RootScope = this
+
+    /** @inheritdoc */
+    override def restoreFromSerialization(
+      compiler: Compiler
+    ): Option[RootScope] = Some(this)
+
+    /** @inheritdoc */
+    override def duplicate(): Option[IRPass.IRMetadata] = None
+  }
+
+  /** Aliasing information about a child scope.
+    *
+    * @param graph the graph
+    * @param scope the child scope in `graph`
+    */
+  sealed case class ChildScope(
+    override val graph: Graph,
+    scope: Graph.Scope
+  ) extends Scope {
+    override val metadataName: String = "AliasMetadata.ChildScope"
+
+    /** @inheritdoc */
+    override def prepareForSerialization(
+      compiler: Compiler
+    ): ChildScope = this
+
+    /** @inheritdoc */
+    override def restoreFromSerialization(
+      compiler: Compiler
+    ): Option[ChildScope] = Some(this)
+
+    /** @inheritdoc */
+    override def duplicate(): Option[IRPass.IRMetadata] = None
+  }
+
+  /** Aliasing information for a piece of [[IR]] that is contained within a
+    * [[Scope]].
+    *
+    * @param graph the graph in which this IR node can be found
+    * @param id the identifier of this IR node in `graph`
+    */
+  sealed case class Occurrence(
+    override val graph: Graph,
+    id: Graph.Id
+  ) extends AliasMetadata {
+    override val metadataName: String = "AliasMetadata.Occurrence"
+
+    /** @inheritdoc */
+    override def prepareForSerialization(
+      compiler: Compiler
+    ): Occurrence = this
+
+    /** @inheritdoc */
+    override def restoreFromSerialization(
+      compiler: Compiler
+    ): Option[Occurrence] = Some(this)
+
+    /** @inheritdoc */
+    override def duplicate(): Option[IRPass.IRMetadata] = None
+  }
+}
diff --git a/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/alias/Info.scala b/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/alias/Info.scala
deleted file mode 100644
index f035d923f49f..000000000000
--- a/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/alias/Info.scala
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.enso.compiler.pass.analyse.alias
-
-import org.enso.compiler.pass.IRPass
-
-/** Information about the aliasing state for a given IR node. */
-sealed trait Info extends IRPass.IRMetadata {
-
-  /** The aliasing graph. */
-  val graph: Graph
-}
-object Info {
-  sealed trait Scope extends Info
-  object Scope {
-
-    /** Aliasing information for a root scope.
-      *
-      * A root scope has a 1:1 correspondence with a top-level binding.
-      *
-      * @param graph the graph containing the alias information for that node
-      */
-    sealed case class Root(override val graph: Graph) extends Scope {
-      override val metadataName: String = "Info.Scope.Root"
-
-      /** @inheritdoc */
-      override def prepareForSerialization(
-        compiler: Compiler
-      ): Root = this
-
-      /** @inheritdoc */
-      override def restoreFromSerialization(
-        compiler: Compiler
-      ): Option[Root] = Some(this)
-
-      /** @inheritdoc */
-      override def duplicate(): Option[IRPass.IRMetadata] = None
-    }
-
-    /** Aliasing information about a child scope.
-      *
-      * @param graph the graph
-      * @param scope the child scope in `graph`
-      */
-    sealed case class Child(
-      override val graph: Graph,
-      scope: Graph.Scope
-    ) extends Scope {
-      override val metadataName: String = "Info.Scope.Child"
-
-      /** @inheritdoc */
-      override def prepareForSerialization(
-        compiler: Compiler
-      ): Child = this
-
-      /** @inheritdoc */
-      override def restoreFromSerialization(
-        compiler: Compiler
-      ): Option[Child] = Some(this)
-
-      /** @inheritdoc */
-      override def duplicate(): Option[IRPass.IRMetadata] = None
-    }
-  }
-
-  /** Aliasing information for a piece of [[IR]] that is contained within a
-    * [[Scope]].
-    *
-    * @param graph the graph in which this IR node can be found
-    * @param id the identifier of this IR node in `graph`
-    */
-  sealed case class Occurrence(
-    override val graph: Graph,
-    id: Graph.Id
-  ) extends Info {
-    override val metadataName: String = "Info.Occurrence"
-
-    /** @inheritdoc */
-    override def prepareForSerialization(
-      compiler: Compiler
-    ): Occurrence = this
-
-    /** @inheritdoc */
-    override def restoreFromSerialization(
-      compiler: Compiler
-    ): Option[Occurrence] = Some(this)
-
-    /** @inheritdoc */
-    override def duplicate(): Option[IRPass.IRMetadata] = None
-  }
-}
diff --git a/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/alias/Graph.scala b/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/alias/graph/Graph.scala
similarity index 83%
rename from engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/alias/Graph.scala
rename to engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/alias/graph/Graph.scala
index 0ed0f41f930c..066cdba3e708 100644
--- a/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/alias/Graph.scala
+++ b/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/alias/graph/Graph.scala
@@ -1,10 +1,9 @@
-package org.enso.compiler.pass.analyse.alias
+package org.enso.compiler.pass.analyse.alias.graph
 
-import org.enso.compiler.core.{CompilerError, ExternalID, Identifier}
+import org.enso.compiler.core.CompilerError
 import org.enso.compiler.debug.Debug
-import org.enso.compiler.pass.analyse.alias.Graph.{Occurrence, Scope}
+import org.enso.compiler.pass.analyse.alias.graph.Graph.Scope
 
-import java.util.UUID
 import scala.collection.immutable.HashMap
 import scala.collection.mutable
 import scala.reflect.ClassTag
@@ -17,7 +16,7 @@ sealed class Graph extends Serializable {
   private var targetLinks: Map[Graph.Id, Set[Graph.Link]] = new HashMap()
   var nextIdCounter                                       = 0
 
-  private var globalSymbols: Map[Graph.Symbol, Occurrence.Global] =
+  private var globalSymbols: Map[Graph.Symbol, GraphOccurrence.Global] =
     Map()
 
   /** @return a deep structural copy of `this` */
@@ -47,7 +46,7 @@ sealed class Graph extends Serializable {
     *
     * @param sym the symbol occurrence
     */
-  def addGlobalSymbol(sym: Occurrence.Global): Unit = {
+  def addGlobalSymbol(sym: GraphOccurrence.Global): Unit = {
     if (!globalSymbols.contains(sym.symbol)) {
       globalSymbols = globalSymbols + (sym.symbol -> sym)
     }
@@ -97,7 +96,7 @@ sealed class Graph extends Serializable {
     * @return the link, if it exists
     */
   def resolveLocalUsage(
-    occurrence: Graph.Occurrence.Use
+    occurrence: GraphOccurrence.Use
   ): Option[Graph.Link] = {
     scopeFor(occurrence.id).flatMap(_.resolveUsage(occurrence).map { link =>
       links += link
@@ -122,7 +121,7 @@ sealed class Graph extends Serializable {
     * @return the link, if it exists
     */
   def resolveGlobalUsage(
-    occurrence: Graph.Occurrence.Use
+    occurrence: GraphOccurrence.Use
   ): Option[Graph.Link] = {
     scopeFor(occurrence.id) match {
       case Some(scope) =>
@@ -168,7 +167,7 @@ sealed class Graph extends Serializable {
     * @tparam T the role in which `symbol` should occur
     * @return a set of all links in which `symbol` occurs with role `T`
     */
-  def linksFor[T <: Occurrence: ClassTag](
+  def linksFor[T <: GraphOccurrence: ClassTag](
     symbol: Graph.Symbol
   ): Set[Graph.Link] = {
     val idsForSym = rootScope.symbolToIds[T](symbol)
@@ -184,7 +183,7 @@ sealed class Graph extends Serializable {
     * @param id the occurrence identifier
     * @return the occurrence for `id`, if it exists
     */
-  def getOccurrence(id: Graph.Id): Option[Occurrence] =
+  def getOccurrence(id: Graph.Id): Option[GraphOccurrence] =
     scopeFor(id).flatMap(_.getOccurrence(id))
 
   /** Gets the link from an id to the definition of the symbol it represents.
@@ -196,8 +195,8 @@ sealed class Graph extends Serializable {
     linksFor(id).find { edge =>
       val occ = getOccurrence(edge.target)
       occ match {
-        case Some(Occurrence.Def(_, _, _, _, _)) => true
-        case _                                   => false
+        case Some(GraphOccurrence.Def(_, _, _, _, _)) => true
+        case _                                        => false
       }
     }
   }
@@ -217,7 +216,7 @@ sealed class Graph extends Serializable {
     * @tparam T the role in which `symbol` occurs
     * @return all the scopes where `symbol` occurs with role `T`
     */
-  def scopesFor[T <: Graph.Occurrence: ClassTag](
+  def scopesFor[T <: GraphOccurrence: ClassTag](
     symbol: Graph.Symbol
   ): List[Graph.Scope] = {
     rootScope.scopesForSymbol[T](symbol)
@@ -249,8 +248,8 @@ sealed class Graph extends Serializable {
     scopeFor(id)
       .flatMap(
         _.getOccurrence(id).flatMap {
-          case d: Occurrence.Def => Some(d)
-          case _                 => None
+          case d: GraphOccurrence.Def => Some(d)
+          case _                      => None
         }
       )
       .isDefined
@@ -267,25 +266,25 @@ sealed class Graph extends Serializable {
     * @return the bindings shadowed by `definition`
     */
   def knownShadowedDefinitions(
-    definition: Occurrence
-  ): Set[Graph.Occurrence] = {
+    definition: GraphOccurrence
+  ): Set[GraphOccurrence] = {
     def getShadowedIds(
       scope: Graph.Scope
-    ): Set[Graph.Occurrence] = {
+    ): Set[GraphOccurrence] = {
       scope.occurrences.values.collect {
-        case d: Occurrence.Def if d.symbol == definition.symbol    => d
-        case g: Occurrence.Global if g.symbol == definition.symbol => g
+        case d: GraphOccurrence.Def if d.symbol == definition.symbol    => d
+        case g: GraphOccurrence.Global if g.symbol == definition.symbol => g
       } ++ scope.parent.map(getShadowedIds).getOrElse(Set())
     }.toSet
 
     definition match {
-      case d: Occurrence.Def =>
+      case d: GraphOccurrence.Def =>
         scopeFor(d.id).flatMap(_.parent) match {
           case Some(scope) => getShadowedIds(scope) // + globals
           case None        => Set()
         }
-      case _: Occurrence.Global => Set()
-      case _: Occurrence.Use    => Set()
+      case _: GraphOccurrence.Global => Set()
+      case _: GraphOccurrence.Use    => Set()
     }
   }
 
@@ -315,7 +314,7 @@ sealed class Graph extends Serializable {
     * @tparam T the role in which `symbol` should occur
     * @return a list of identifiers for that symbol
     */
-  def symbolToIds[T <: Occurrence: ClassTag](
+  def symbolToIds[T <: GraphOccurrence: ClassTag](
     symbol: Graph.Symbol
   ): List[Graph.Id] = {
     rootScope.symbolToIds[T](symbol)
@@ -348,9 +347,9 @@ object Graph {
     *                       Note that there may not be a link for all these definitions.
     */
   sealed class Scope(
-    var childScopes: List[Scope]             = List(),
-    var occurrences: Map[Id, Occurrence]     = HashMap(),
-    var allDefinitions: List[Occurrence.Def] = List()
+    var childScopes: List[Scope]                  = List(),
+    var occurrences: Map[Id, GraphOccurrence]     = HashMap(),
+    var allDefinitions: List[GraphOccurrence.Def] = List()
   ) extends Serializable {
 
     var parent: Option[Scope] = None
@@ -436,7 +435,7 @@ object Graph {
       *
       * @param occurrence the occurrence to add
       */
-    def add(occurrence: Occurrence): Unit = {
+    def add(occurrence: GraphOccurrence): Unit = {
       if (occurrences.contains(occurrence.id)) {
         throw new CompilerError(
           s"Multiple occurrences found for ID ${occurrence.id}."
@@ -451,7 +450,7 @@ object Graph {
       *
       * @param definition The definition to add.
       */
-    def addDefinition(definition: Occurrence.Def): Unit = {
+    def addDefinition(definition: GraphOccurrence.Def): Unit = {
       allDefinitions = allDefinitions ++ List(definition)
     }
 
@@ -461,7 +460,7 @@ object Graph {
       * @param id the occurrence identifier
       * @return the occurrence for `id`, if it exists
       */
-    def getOccurrence(id: Graph.Id): Option[Occurrence] = {
+    def getOccurrence(id: Graph.Id): Option[GraphOccurrence] = {
       occurrences.get(id)
     }
 
@@ -472,9 +471,9 @@ object Graph {
       * @tparam T the role for the symbol
       * @return the occurrences for `name`, if they exist
       */
-    def getOccurrences[T <: Occurrence: ClassTag](
+    def getOccurrences[T <: GraphOccurrence: ClassTag](
       symbol: Graph.Symbol
-    ): Set[Occurrence] = {
+    ): Set[GraphOccurrence] = {
       occurrences.values.collect {
         case o: T if o.symbol == symbol => o
       }.toSet
@@ -488,7 +487,7 @@ object Graph {
       * @param id the occurrence identifier
       * @return the occurrence for `id`
       */
-    def unsafeGetOccurrence(id: Graph.Id): Occurrence = {
+    def unsafeGetOccurrence(id: Graph.Id): GraphOccurrence = {
       getOccurrence(id).get
     }
 
@@ -499,7 +498,7 @@ object Graph {
       * @return `true` if `symbol` occurs in role `T` in this scope, `false`
       *         otherwise
       */
-    def hasSymbolOccurrenceAs[T <: Occurrence: ClassTag](
+    def hasSymbolOccurrenceAs[T <: GraphOccurrence: ClassTag](
       symbol: Graph.Symbol
     ): Boolean = {
       occurrences.values.collectFirst {
@@ -516,11 +515,11 @@ object Graph {
       *         exists
       */
     def resolveUsage(
-      occurrence: Graph.Occurrence.Use,
+      occurrence: GraphOccurrence.Use,
       parentCounter: Int = 0
     ): Option[Graph.Link] = {
       val definition = occurrences.values.find {
-        case Graph.Occurrence.Def(_, name, _, _, _) =>
+        case GraphOccurrence.Def(_, name, _, _, _) =>
           name == occurrence.symbol
         case _ => false
       }
@@ -613,7 +612,7 @@ object Graph {
       * @tparam T the role in which `name` occurs
       * @return all the scopes where `name` occurs with role `T`
       */
-    def scopesForSymbol[T <: Occurrence: ClassTag](
+    def scopesForSymbol[T <: GraphOccurrence: ClassTag](
       symbol: Graph.Symbol
     ): List[Scope] = {
       val occursInThisScope = hasSymbolOccurrenceAs[T](symbol)
@@ -646,7 +645,7 @@ object Graph {
       * @tparam T the role in which `symbol` should occur
       * @return a list of identifiers for that symbol
       */
-    def symbolToIds[T <: Occurrence: ClassTag](
+    def symbolToIds[T <: GraphOccurrence: ClassTag](
       symbol: Graph.Symbol
     ): List[Graph.Id] = {
       val scopes =
@@ -694,8 +693,8 @@ object Graph {
 
   /** A link in the [[Graph]].
     *
-    * The source of the link should always be an [[Occurrence.Use]] while the
-    * target of the link should always be an [[Occurrence.Def]].
+    * The source of the link should always be an [[GraphOccurrence.Use]] while the
+    * target of the link should always be an [[GraphOccurrence.Def]].
     *
     * @param source the source ID of the link in the graph
     * @param scopeCount the number of scopes that the link traverses
@@ -703,59 +702,4 @@ object Graph {
     */
   sealed case class Link(source: Id, scopeCount: Int, target: Id)
       extends Serializable
-
-  /** An occurrence of a given symbol in the aliasing graph. */
-  sealed trait Occurrence extends Serializable {
-    val id: Id
-    val symbol: Graph.Symbol
-  }
-  object Occurrence {
-
-    /** The definition of a symbol in the aliasing graph.
-      *
-      * @param id the identifier of the name in the graph
-      * @param symbol the text of the name
-      * @param identifier the identifier of the symbol
-      * @param externalId the external identifier for the IR node defining
-      *                   the symbol
-      * @param isLazy whether or not the symbol is defined as lazy
-      */
-    sealed case class Def(
-      override val id: Id,
-      override val symbol: Graph.Symbol,
-      identifier: UUID @Identifier,
-      externalId: Option[UUID @ExternalID],
-      isLazy: Boolean = false
-    ) extends Occurrence
-
-    /** A usage of a symbol in the aliasing graph
-      *
-      * Name usages _need not_ correspond to name definitions, as dynamic
-      * symbol resolution means that a name used at runtime _may not_ be
-      * statically visible in the scope.
-      *
-      * @param id the identifier of the name in the graph
-      * @param symbol the text of the name
-      * @param identifier the identifier of the symbol
-      * @param externalId the external identifier for the IR node defining
-      *                   the symbol
-      */
-    sealed case class Use(
-      override val id: Id,
-      override val symbol: Graph.Symbol,
-      identifier: UUID @Identifier,
-      externalId: Option[UUID @ExternalID]
-    ) extends Occurrence
-
-    // TODO [AA] At some point the analysis should make use of these.
-    /** Represents a global symbol that has been _asked for_ in the program.
-      *
-      * @param id the identifier of the name in the graph
-      * @param symbol the text of the name
-      */
-    sealed case class Global(
-      override val id: Id,
-      override val symbol: Graph.Symbol
-    ) extends Occurrence
-  }
 }
diff --git a/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/alias/graph/GraphOccurrence.scala b/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/alias/graph/GraphOccurrence.scala
new file mode 100644
index 000000000000..545da729e1b3
--- /dev/null
+++ b/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/analyse/alias/graph/GraphOccurrence.scala
@@ -0,0 +1,65 @@
+package org.enso.compiler.pass.analyse.alias.graph
+
+import org.enso.compiler.core.{ExternalID, Identifier}
+import org.enso.compiler.pass.analyse.alias.graph.Graph.Id
+
+import java.util.UUID
+
+/** An occurrence of a given symbol in the aliasing graph.
+  * Note that this is not present in the metadata attached to the [[org.enso.compiler.core.IR]] elements,
+  * but only in the alias [[Graph]].
+  */
+sealed trait GraphOccurrence extends Serializable {
+  val id: Id
+  val symbol: Graph.Symbol
+}
+
+object GraphOccurrence {
+
+  /** The definition of a symbol in the aliasing graph.
+    *
+    * @param id the identifier of the name in the graph
+    * @param symbol the text of the name
+    * @param identifier the identifier of the symbol
+    * @param externalId the external identifier for the IR node defining
+    *                   the symbol
+    * @param isLazy whether or not the symbol is defined as lazy
+    */
+  sealed case class Def(
+    override val id: Id,
+    override val symbol: Graph.Symbol,
+    identifier: UUID @Identifier,
+    externalId: Option[UUID @ExternalID],
+    isLazy: Boolean = false
+  ) extends GraphOccurrence
+
+  /** A usage of a symbol in the aliasing graph
+    *
+    * Name usages _need not_ correspond to name definitions, as dynamic
+    * symbol resolution means that a name used at runtime _may not_ be
+    * statically visible in the scope.
+    *
+    * @param id the identifier of the name in the graph
+    * @param symbol the text of the name
+    * @param identifier the identifier of the symbol
+    * @param externalId the external identifier for the IR node defining
+    *                   the symbol
+    */
+  sealed case class Use(
+    override val id: Id,
+    override val symbol: Graph.Symbol,
+    identifier: UUID @Identifier,
+    externalId: Option[UUID @ExternalID]
+  ) extends GraphOccurrence
+
+  // TODO [AA] At some point the analysis should make use of these.
+  /** Represents a global symbol that has been _asked for_ in the program.
+    *
+    * @param id the identifier of the name in the graph
+    * @param symbol the text of the name
+    */
+  sealed case class Global(
+    override val id: Id,
+    override val symbol: Graph.Symbol
+  ) extends GraphOccurrence
+}
diff --git a/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/lint/UnusedBindings.scala b/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/lint/UnusedBindings.scala
index 071581ec63ff..2865a7df4a58 100644
--- a/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/lint/UnusedBindings.scala
+++ b/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/lint/UnusedBindings.scala
@@ -16,7 +16,7 @@ import org.enso.compiler.core.ir.expression.{errors, warnings, Case, Foreign}
 import org.enso.compiler.core.CompilerError
 import org.enso.compiler.pass.IRPass
 import org.enso.compiler.pass.analyse.AliasAnalysis
-import org.enso.compiler.pass.analyse.alias.{Info => AliasInfo}
+import org.enso.compiler.pass.analyse.alias.{AliasMetadata => AliasInfo}
 import org.enso.compiler.pass.desugar._
 import org.enso.compiler.pass.optimise.LambdaConsolidate
 import org.enso.compiler.pass.resolve.{ExpressionAnnotations, IgnoredBindings}
diff --git a/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/optimise/LambdaConsolidate.scala b/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/optimise/LambdaConsolidate.scala
index f80c55eea5bc..97d979df3722 100644
--- a/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/optimise/LambdaConsolidate.scala
+++ b/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/optimise/LambdaConsolidate.scala
@@ -16,16 +16,17 @@ import org.enso.compiler.core.ir.{
 import org.enso.compiler.core.ir.expression.warnings
 import org.enso.compiler.core.ir.expression.errors
 import org.enso.compiler.pass.IRPass
+import org.enso.compiler.pass.analyse.alias.graph.{
+  GraphOccurrence,
+  Graph => AliasGraph
+}
 import org.enso.compiler.pass.analyse.{
   AliasAnalysis,
   DataflowAnalysis,
   DemandAnalysis,
   TailCall
 }
-import org.enso.compiler.pass.analyse.alias.{
-  Graph => AliasGraph,
-  Info => AliasInfo
-}
+import org.enso.compiler.pass.analyse.alias.{AliasMetadata => AliasInfo}
 import org.enso.compiler.pass.desugar._
 import org.enso.compiler.pass.resolve.IgnoredBindings
 
@@ -364,7 +365,7 @@ case object LambdaConsolidate extends IRPass {
           .flatMap(occ => Some(aliasInfo.graph.knownShadowedDefinitions(occ)))
           .getOrElse(Set())
       }
-      .foldLeft(Set[AliasGraph.Occurrence]())(_ ++ _)
+      .foldLeft(Set[GraphOccurrence]())(_ ++ _)
       .map(_.id)
   }
 
@@ -397,7 +398,7 @@ case object LambdaConsolidate extends IRPass {
               .map(link => aliasInfo.graph.getOccurrence(link.source))
               .collect {
                 case Some(
-                      AliasGraph.Occurrence.Use(_, _, identifier, _)
+                      GraphOccurrence.Use(_, _, identifier, _)
                     ) =>
                   identifier
               }
diff --git a/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/resolve/FullyQualifiedNames.scala b/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/resolve/FullyQualifiedNames.scala
index e1b63df05bf4..ce0173a0bc46 100644
--- a/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/resolve/FullyQualifiedNames.scala
+++ b/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/resolve/FullyQualifiedNames.scala
@@ -25,7 +25,7 @@ import org.enso.compiler.core.Implicits.{AsDiagnostics, AsMetadata}
 import org.enso.compiler.core.ir.expression.Application
 import org.enso.compiler.pass.IRPass
 import org.enso.compiler.pass.analyse.{AliasAnalysis, BindingAnalysis}
-import org.enso.compiler.pass.analyse.alias.{Info => AliasInfo}
+import org.enso.compiler.pass.analyse.alias.{AliasMetadata => AliasInfo}
 import org.enso.compiler.pass.desugar.Imports
 import org.enso.editions.LibraryName
 
diff --git a/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/resolve/GlobalNames.scala b/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/resolve/GlobalNames.scala
index 2ef38afb3e24..05536d3b07be 100644
--- a/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/resolve/GlobalNames.scala
+++ b/engine/runtime-compiler/src/main/scala/org/enso/compiler/pass/resolve/GlobalNames.scala
@@ -27,7 +27,7 @@ import org.enso.compiler.core.ConstantsNames
 import org.enso.compiler.core.ir.expression.Application
 import org.enso.compiler.pass.IRPass
 import org.enso.compiler.pass.analyse.{AliasAnalysis, BindingAnalysis}
-import org.enso.compiler.pass.analyse.alias.{Info => AliasInfo}
+import org.enso.compiler.pass.analyse.alias.{AliasMetadata => AliasInfo}
 
 /** Resolves name occurences in non-pattern contexts.
   *
diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/pass/analyse/AliasAnalysisTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/pass/analyse/AliasAnalysisTest.scala
index a1eb100b0e74..da8d9d197f9b 100644
--- a/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/pass/analyse/AliasAnalysisTest.scala
+++ b/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/pass/analyse/AliasAnalysisTest.scala
@@ -16,8 +16,9 @@ import org.enso.compiler.core.ir.module.scope.Definition
 import org.enso.compiler.core.ir.module.scope.definition
 import org.enso.compiler.pass.PassConfiguration._
 import org.enso.compiler.pass.analyse.AliasAnalysis
-import org.enso.compiler.pass.analyse.alias.Graph.{Link, Occurrence}
-import org.enso.compiler.pass.analyse.alias.{Graph, Info}
+import org.enso.compiler.pass.analyse.alias.graph.Graph.Link
+import org.enso.compiler.pass.analyse.alias.AliasMetadata
+import org.enso.compiler.pass.analyse.alias.graph.{Graph, GraphOccurrence}
 import org.enso.compiler.pass.{PassConfiguration, PassGroup, PassManager}
 import org.enso.compiler.test.CompilerTest
 
@@ -94,19 +95,19 @@ class AliasAnalysisTest extends CompilerTest {
     val childOfChildOfChild = childOfChild.addChild()
 
     val aDefId = graph.nextId()
-    val aDef   = Occurrence.Def(aDefId, "a", genId, None)
+    val aDef   = GraphOccurrence.Def(aDefId, "a", genId, None)
 
     val bDefId = graph.nextId()
-    val bDef   = Occurrence.Def(bDefId, "b", genId, None)
+    val bDef   = GraphOccurrence.Def(bDefId, "b", genId, None)
 
     val aUseId = graph.nextId()
-    val aUse   = Occurrence.Use(aUseId, "a", genId, None)
+    val aUse   = GraphOccurrence.Use(aUseId, "a", genId, None)
 
     val bUseId = graph.nextId()
-    val bUse   = Occurrence.Use(bUseId, "b", genId, None)
+    val bUse   = GraphOccurrence.Use(bUseId, "b", genId, None)
 
     val cUseId = graph.nextId()
-    val cUse   = Occurrence.Use(cUseId, "c", genId, None)
+    val cUse   = GraphOccurrence.Use(cUseId, "c", genId, None)
 
     // Add occurrences to the scopes
     complexScope.add(aDef)
@@ -144,7 +145,9 @@ class AliasAnalysisTest extends CompilerTest {
     }
 
     "find the occurrence for an name in the current scope if it exists" in {
-      complexScope.getOccurrences[Occurrence](aDef.symbol) shouldEqual Set(aDef)
+      complexScope.getOccurrences[GraphOccurrence](aDef.symbol) shouldEqual Set(
+        aDef
+      )
     }
 
     "find no occurrences if they do not exist" in {
@@ -163,12 +166,16 @@ class AliasAnalysisTest extends CompilerTest {
     }
 
     "correctly find the scopes in which a given symbol occurs" in {
-      complexScope.scopesForSymbol[Occurrence.Def]("a").length shouldEqual 1
-      complexScope.scopesForSymbol[Occurrence.Use]("a").length shouldEqual 1
+      complexScope
+        .scopesForSymbol[GraphOccurrence.Def]("a")
+        .length shouldEqual 1
+      complexScope
+        .scopesForSymbol[GraphOccurrence.Use]("a")
+        .length shouldEqual 1
 
-      complexScope.scopesForSymbol[Occurrence]("a").length shouldEqual 2
+      complexScope.scopesForSymbol[GraphOccurrence]("a").length shouldEqual 2
 
-      complexScope.scopesForSymbol[Occurrence]("a") shouldEqual List(
+      complexScope.scopesForSymbol[GraphOccurrence]("a") shouldEqual List(
         complexScope,
         childOfChildOfChild
       )
@@ -179,12 +186,17 @@ class AliasAnalysisTest extends CompilerTest {
     }
 
     "check correctly for specified occurrences of a symbol" in {
-      complexScope.hasSymbolOccurrenceAs[Occurrence.Def]("a") shouldEqual true
-      complexScope.hasSymbolOccurrenceAs[Occurrence]("b") shouldEqual false
+      complexScope.hasSymbolOccurrenceAs[GraphOccurrence.Def](
+        "a"
+      ) shouldEqual true
+      complexScope.hasSymbolOccurrenceAs[GraphOccurrence]("b") shouldEqual false
     }
 
     "be able to convert from a symbol to identifiers that use it" in {
-      complexScope.symbolToIds[Occurrence]("a") shouldEqual List(aDefId, aUseId)
+      complexScope.symbolToIds[GraphOccurrence]("a") shouldEqual List(
+        aDefId,
+        aUseId
+      )
     }
 
     "be able to convert from an identifier to the associated symbol" in {
@@ -221,19 +233,19 @@ class AliasAnalysisTest extends CompilerTest {
     val childScope = rootScope.addChild()
 
     val aDefId = graph.nextId()
-    val aDef   = Occurrence.Def(aDefId, "a", genId, None)
+    val aDef   = GraphOccurrence.Def(aDefId, "a", genId, None)
 
     val bDefId = graph.nextId()
-    val bDef   = Occurrence.Def(bDefId, "b", genId, None)
+    val bDef   = GraphOccurrence.Def(bDefId, "b", genId, None)
 
     val aUse1Id = graph.nextId()
-    val aUse1   = Occurrence.Use(aUse1Id, "a", genId, None)
+    val aUse1   = GraphOccurrence.Use(aUse1Id, "a", genId, None)
 
     val aUse2Id = graph.nextId()
-    val aUse2   = Occurrence.Use(aUse2Id, "a", genId, None)
+    val aUse2   = GraphOccurrence.Use(aUse2Id, "a", genId, None)
 
     val cUseId = graph.nextId()
-    val cUse   = Occurrence.Use(cUseId, "c", genId, None)
+    val cUse   = GraphOccurrence.Use(cUseId, "c", genId, None)
 
     rootScope.add(aDef)
     rootScope.add(aUse1)
@@ -306,10 +318,10 @@ class AliasAnalysisTest extends CompilerTest {
     }
 
     "find all scopes where a given symbol occurs" in {
-      val aDefs = graph.scopesFor[Occurrence.Def]("a")
-      val aUses = graph.scopesFor[Occurrence.Use]("a")
-      val aOccs = graph.scopesFor[Occurrence]("a")
-      val dOccs = graph.scopesFor[Occurrence]("d")
+      val aDefs = graph.scopesFor[GraphOccurrence.Def]("a")
+      val aUses = graph.scopesFor[GraphOccurrence.Use]("a")
+      val aOccs = graph.scopesFor[GraphOccurrence]("a")
+      val dOccs = graph.scopesFor[GraphOccurrence]("d")
 
       aDefs.length shouldEqual 1
       aUses.length shouldEqual 2
@@ -343,28 +355,28 @@ class AliasAnalysisTest extends CompilerTest {
       val grandChild = child1.addChild()
 
       val aDefInRootId = graph.nextId()
-      val aDefInRoot   = Occurrence.Def(aDefInRootId, "a", genId, None)
+      val aDefInRoot   = GraphOccurrence.Def(aDefInRootId, "a", genId, None)
       rootScope.add(aDefInRoot)
 
       val aDefInChild1Id = graph.nextId()
-      val aDefInChild1   = Occurrence.Def(aDefInChild1Id, "a", genId, None)
+      val aDefInChild1   = GraphOccurrence.Def(aDefInChild1Id, "a", genId, None)
       child1.add(aDefInChild1)
 
       val aDefInChild2Id = graph.nextId()
-      val aDefInChild2   = Occurrence.Def(aDefInChild2Id, "a", genId, None)
+      val aDefInChild2   = GraphOccurrence.Def(aDefInChild2Id, "a", genId, None)
       child2.add(aDefInChild2)
 
       val aDefInGrandChildId = graph.nextId()
       val aDefInGrandChild =
-        Occurrence.Def(aDefInGrandChildId, "a", genId, None)
+        GraphOccurrence.Def(aDefInGrandChildId, "a", genId, None)
       grandChild.add(aDefInGrandChild)
 
       val bDefInRootId = graph.nextId()
-      val bDefInRoot   = Occurrence.Def(bDefInRootId, "b", genId, None)
+      val bDefInRoot   = GraphOccurrence.Def(bDefInRootId, "b", genId, None)
       rootScope.add(bDefInRoot)
 
       val bDefInChild2Id = graph.nextId()
-      val bDefInChild2   = Occurrence.Def(bDefInChild2Id, "b", genId, None)
+      val bDefInChild2   = GraphOccurrence.Def(bDefInChild2Id, "b", genId, None)
       child2.add(bDefInChild2)
 
       graph.knownShadowedDefinitions(aDefInGrandChild) shouldEqual Set(
@@ -383,7 +395,7 @@ class AliasAnalysisTest extends CompilerTest {
     }
 
     "correctly return all links for a given symbol" in {
-      graph.linksFor[Occurrence]("a") shouldEqual Set(
+      graph.linksFor[GraphOccurrence]("a") shouldEqual Set(
         use1Link.get,
         use2Link.get
       )
@@ -413,7 +425,7 @@ class AliasAnalysisTest extends CompilerTest {
         .members
         .head
     val goodMeta  = goodAtom.getMetadata(AliasAnalysis)
-    val goodGraph = goodMeta.get.unsafeAs[Info.Scope.Root].graph
+    val goodGraph = goodMeta.get.unsafeAs[AliasMetadata.RootScope].graph
 
     val badAtom =
       """
@@ -424,29 +436,29 @@ class AliasAnalysisTest extends CompilerTest {
         .members
         .head
     val badMeta  = badAtom.getMetadata(AliasAnalysis)
-    val badGraph = badMeta.get.unsafeAs[Info.Scope.Root].graph
+    val badGraph = badMeta.get.unsafeAs[AliasMetadata.RootScope].graph
 
     "assign Info.Scope.Root metadata to the atom" in {
       goodMeta shouldBe defined
-      goodMeta.get shouldBe a[Info.Scope.Root]
+      goodMeta.get shouldBe a[AliasMetadata.RootScope]
     }
 
     "create definition occurrences in the atom's scope" in {
-      goodGraph.rootScope.hasSymbolOccurrenceAs[Occurrence.Def]("a")
-      goodGraph.rootScope.hasSymbolOccurrenceAs[Occurrence.Def]("b")
-      goodGraph.rootScope.hasSymbolOccurrenceAs[Occurrence.Def]("c")
+      goodGraph.rootScope.hasSymbolOccurrenceAs[GraphOccurrence.Def]("a")
+      goodGraph.rootScope.hasSymbolOccurrenceAs[GraphOccurrence.Def]("b")
+      goodGraph.rootScope.hasSymbolOccurrenceAs[GraphOccurrence.Def]("c")
     }
 
     "create defaults in the same scope as the argument" in {
       goodGraph.nesting shouldEqual 1
-      goodGraph.rootScope.hasSymbolOccurrenceAs[Occurrence.Use]("a")
+      goodGraph.rootScope.hasSymbolOccurrenceAs[GraphOccurrence.Use]("a")
     }
 
     "create usage links where valid" in {
       val aDefId = goodAtom.arguments.head
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Occurrence]
+        .unsafeAs[AliasMetadata.Occurrence]
         .id
       val aUseId = goodAtom
         .arguments(2)
@@ -454,7 +466,7 @@ class AliasAnalysisTest extends CompilerTest {
         .get
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Occurrence]
+        .unsafeAs[AliasMetadata.Occurrence]
         .id
 
       goodGraph.getLinks() should contain(Link(aUseId, 0, aDefId))
@@ -481,7 +493,7 @@ class AliasAnalysisTest extends CompilerTest {
       methodWithLambda
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Scope.Root]
+        .unsafeAs[AliasMetadata.RootScope]
         .graph
 
     val graphLinks = methodWithLambdaGraph.getLinks()
@@ -507,21 +519,21 @@ class AliasAnalysisTest extends CompilerTest {
       val meta = methodWithLambda.getMetadata(AliasAnalysis)
 
       meta shouldBe defined
-      meta.get shouldBe a[Info.Scope.Root]
+      meta.get shouldBe a[AliasMetadata.RootScope]
     }
 
     "assign Info.Scope.Child to all child scopes" in {
       methodWithLambda.body
         .asInstanceOf[Function.Lambda]
         .getMetadata(AliasAnalysis)
-        .get shouldBe an[Info.Scope.Child]
+        .get shouldBe an[AliasMetadata.ChildScope]
 
       methodWithLambda.body
         .asInstanceOf[Function.Lambda]
         .body
         .asInstanceOf[Function.Lambda]
         .getMetadata(AliasAnalysis)
-        .get shouldBe an[Info.Scope.Child]
+        .get shouldBe an[AliasMetadata.ChildScope]
 
       methodWithLambda.body
         .asInstanceOf[Function.Lambda]
@@ -530,16 +542,16 @@ class AliasAnalysisTest extends CompilerTest {
         .body
         .asInstanceOf[Function.Lambda]
         .getMetadata(AliasAnalysis)
-        .get shouldBe an[Info.Scope.Child]
+        .get shouldBe an[AliasMetadata.ChildScope]
 
       topLambdaBody
         .getMetadata(AliasAnalysis)
-        .get shouldBe an[Info.Scope.Child]
+        .get shouldBe an[AliasMetadata.ChildScope]
 
       childLambda.body
         .asInstanceOf[Function.Lambda]
         .getMetadata(AliasAnalysis)
-        .get shouldBe an[Info.Scope.Child]
+        .get shouldBe an[AliasMetadata.ChildScope]
     }
 
     "not allocate additional scopes unnecessarily" in {
@@ -556,7 +568,7 @@ class AliasAnalysisTest extends CompilerTest {
         .asInstanceOf[Function.Lambda]
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Scope.Child]
+        .unsafeAs[AliasMetadata.ChildScope]
         .scope
 
       val cLamBlockScope =
@@ -570,7 +582,7 @@ class AliasAnalysisTest extends CompilerTest {
           .asInstanceOf[Expression.Block]
           .getMetadata(AliasAnalysis)
           .get
-          .unsafeAs[Info.Scope.Child]
+          .unsafeAs[AliasMetadata.ChildScope]
           .scope
 
       cLamScope shouldEqual cLamBlockScope
@@ -579,7 +591,7 @@ class AliasAnalysisTest extends CompilerTest {
         .asInstanceOf[Function.Lambda]
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Scope.Child]
+        .unsafeAs[AliasMetadata.ChildScope]
         .scope
 
       aLamScope shouldEqual methodWithLambdaGraph.rootScope
@@ -591,7 +603,7 @@ class AliasAnalysisTest extends CompilerTest {
           .asInstanceOf[Function.Lambda]
           .getMetadata(AliasAnalysis)
           .get
-          .unsafeAs[Info.Scope.Child]
+          .unsafeAs[AliasMetadata.ChildScope]
           .scope
 
       val bLambdaScope = methodWithLambda.body
@@ -600,7 +612,7 @@ class AliasAnalysisTest extends CompilerTest {
         .asInstanceOf[Function.Lambda]
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Scope.Child]
+        .unsafeAs[AliasMetadata.ChildScope]
         .scope
 
       val cLambdaScope = methodWithLambda.body
@@ -611,13 +623,13 @@ class AliasAnalysisTest extends CompilerTest {
         .asInstanceOf[Function.Lambda]
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Scope.Child]
+        .unsafeAs[AliasMetadata.ChildScope]
         .scope
 
       val mainBlockScope = topLambdaBody
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Scope.Child]
+        .unsafeAs[AliasMetadata.ChildScope]
         .scope
 
       val dALambdaScope = topLambdaBody.expressions.head
@@ -626,7 +638,7 @@ class AliasAnalysisTest extends CompilerTest {
         .asInstanceOf[Function.Lambda]
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Scope.Child]
+        .unsafeAs[AliasMetadata.ChildScope]
         .scope
 
       val gScope = topLambdaBody
@@ -636,7 +648,7 @@ class AliasAnalysisTest extends CompilerTest {
         .asInstanceOf[Expression.Block]
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Scope.Child]
+        .unsafeAs[AliasMetadata.ChildScope]
         .scope
 
       val cUseScope = topLambdaBody.returnValue
@@ -646,7 +658,7 @@ class AliasAnalysisTest extends CompilerTest {
         .asInstanceOf[CallArgument.Specified]
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Scope.Child]
+        .unsafeAs[AliasMetadata.ChildScope]
         .scope
 
       topScope.childScopes should contain(bLambdaScope)
@@ -656,29 +668,36 @@ class AliasAnalysisTest extends CompilerTest {
       mainBlockScope.childScopes should contain(cUseScope)
     }
 
-    "assign Info.Occurrence to definitions and usages of symbols" in {
+    "assign Info.GraphOccurrence to definitions and usages of symbols" in {
       topLambda.arguments.foreach(arg =>
-        arg.getMetadata(AliasAnalysis).get.as[Info.Occurrence] shouldBe defined
+        arg
+          .getMetadata(AliasAnalysis)
+          .get
+          .as[AliasMetadata.Occurrence] shouldBe defined
       )
 
       topLambdaBody.expressions.foreach(
         _.asInstanceOf[Expression.Binding]
           .getMetadata(AliasAnalysis)
           .get
-          .as[Info.Occurrence] shouldBe defined
+          .as[AliasMetadata.Occurrence] shouldBe defined
       )
 
       childLambda.arguments.foreach(arg =>
-        arg.getMetadata(AliasAnalysis).get.as[Info.Occurrence] shouldBe defined
+        arg
+          .getMetadata(AliasAnalysis)
+          .get
+          .as[AliasMetadata.Occurrence] shouldBe defined
       )
 
       childLambdaBody.function
         .getMetadata(AliasAnalysis)
         .get
-        .as[Info.Occurrence] shouldBe defined
+        .as[AliasMetadata.Occurrence] shouldBe defined
 
       childLambdaBody.arguments.foreach(
-        _.getMetadata(AliasAnalysis).get.as[Info.Scope.Child] shouldBe defined
+        _.getMetadata(AliasAnalysis).get
+          .as[AliasMetadata.ChildScope] shouldBe defined
       )
     }
 
@@ -692,14 +711,14 @@ class AliasAnalysisTest extends CompilerTest {
           .head
           .getMetadata(AliasAnalysis)
           .get
-          .unsafeAs[Info.Occurrence]
+          .unsafeAs[AliasMetadata.Occurrence]
           .id
 
       val nestedLambdaADefId =
         childLambda.arguments.head
           .getMetadata(AliasAnalysis)
           .get
-          .unsafeAs[Info.Occurrence]
+          .unsafeAs[AliasMetadata.Occurrence]
           .id
       val nestedLambdaBDefId =
         childLambda.body
@@ -708,7 +727,7 @@ class AliasAnalysisTest extends CompilerTest {
           .head
           .getMetadata(AliasAnalysis)
           .get
-          .unsafeAs[Info.Occurrence]
+          .unsafeAs[AliasMetadata.Occurrence]
           .id
 
       val nestedLambdaAUseId = childLambdaBody
@@ -716,7 +735,7 @@ class AliasAnalysisTest extends CompilerTest {
         .function
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Occurrence]
+        .unsafeAs[AliasMetadata.Occurrence]
         .id
 
       val nestedLambdaBUseId = childLambdaBody
@@ -727,21 +746,21 @@ class AliasAnalysisTest extends CompilerTest {
         .value
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Occurrence]
+        .unsafeAs[AliasMetadata.Occurrence]
         .id
 
       val dDefId = topLambdaBody.expressions.head
         .asInstanceOf[Expression.Binding]
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Occurrence]
+        .unsafeAs[AliasMetadata.Occurrence]
         .id
       val dUseId = topLambdaBody.returnValue
         .asInstanceOf[Application.Prefix]
         .function
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Occurrence]
+        .unsafeAs[AliasMetadata.Occurrence]
         .id
       val dDefCUseId = topLambdaBody.returnValue
         .asInstanceOf[Application.Prefix]
@@ -751,7 +770,7 @@ class AliasAnalysisTest extends CompilerTest {
         .value
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Occurrence]
+        .unsafeAs[AliasMetadata.Occurrence]
         .id
 
       graphLinks should contain(Link(nestedLambdaAUseId, 1, nestedLambdaADefId))
@@ -772,13 +791,13 @@ class AliasAnalysisTest extends CompilerTest {
         .function
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Occurrence]
+        .unsafeAs[AliasMetadata.Occurrence]
         .id
 
       methodWithLambdaGraph.linksFor(unknownPlusId) shouldBe empty
       methodWithLambdaGraph
         .getOccurrence(unknownPlusId)
-        .get shouldBe an[Occurrence.Use]
+        .get shouldBe an[GraphOccurrence.Use]
     }
   }
 
@@ -798,28 +817,28 @@ class AliasAnalysisTest extends CompilerTest {
       methodWithBlock
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Scope.Root]
+        .unsafeAs[AliasMetadata.RootScope]
         .graph
 
     "assign Info.Scope.Root metadata to the method" in {
       val meta1 = methodWithBlock.getMetadata(AliasAnalysis)
 
       meta1 shouldBe defined
-      meta1.get shouldBe a[Info.Scope.Root]
+      meta1.get shouldBe a[AliasMetadata.RootScope]
     }
 
     "assign Info.Scope.Child to all child scopes" in {
       methodWithBlock.body
         .asInstanceOf[Function.Lambda]
         .getMetadata(AliasAnalysis)
-        .get shouldBe an[Info.Scope.Child]
+        .get shouldBe an[AliasMetadata.ChildScope]
 
       methodWithBlock.body
         .asInstanceOf[Function.Lambda]
         .body
         .asInstanceOf[Expression.Block]
         .getMetadata(AliasAnalysis)
-        .get shouldBe an[Info.Scope.Child]
+        .get shouldBe an[AliasMetadata.ChildScope]
     }
 
     "not allocate additional scopes unnecessarily" in {
@@ -831,7 +850,7 @@ class AliasAnalysisTest extends CompilerTest {
           .asInstanceOf[Function.Lambda]
           .getMetadata(AliasAnalysis)
           .get
-          .unsafeAs[Info.Scope.Child]
+          .unsafeAs[AliasMetadata.ChildScope]
           .scope
       val blockChildBlockScope =
         methodWithBlock.body
@@ -840,7 +859,7 @@ class AliasAnalysisTest extends CompilerTest {
           .asInstanceOf[Expression.Block]
           .getMetadata(AliasAnalysis)
           .get
-          .unsafeAs[Info.Scope.Child]
+          .unsafeAs[AliasMetadata.ChildScope]
           .scope
 
       blockChildBlockScope shouldEqual methodWithBlockGraph.rootScope
@@ -861,7 +880,7 @@ class AliasAnalysisTest extends CompilerTest {
 
     val graph = addMethod
       .unsafeGetMetadata(AliasAnalysis, "Missing aliasing info")
-      .unsafeAs[Info.Scope.Root]
+      .unsafeAs[AliasMetadata.RootScope]
       .graph
     val graphLinks = graph.getLinks()
 
@@ -879,7 +898,7 @@ class AliasAnalysisTest extends CompilerTest {
       val lambdaScope = lambda
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Scope.Child]
+        .unsafeAs[AliasMetadata.ChildScope]
         .scope
 
       topScope shouldEqual lambdaScope
@@ -889,7 +908,7 @@ class AliasAnalysisTest extends CompilerTest {
         .arguments(1)
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Occurrence]
+        .unsafeAs[AliasMetadata.Occurrence]
         .id
       lambda.body shouldBe an[Application.Prefix]
       val app = lambda.body.asInstanceOf[Application.Prefix]
@@ -898,7 +917,7 @@ class AliasAnalysisTest extends CompilerTest {
         .value
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Occurrence]
+        .unsafeAs[AliasMetadata.Occurrence]
         .id
       // No link between self.x and self
       graphLinks shouldEqual Set(Link(valueUseId, 1, valueDefId))
@@ -910,7 +929,7 @@ class AliasAnalysisTest extends CompilerTest {
       val lambdaScope = lambda
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Scope.Child]
+        .unsafeAs[AliasMetadata.ChildScope]
         .scope
 
       lambdaScope.allDefinitions.length shouldBe 2
@@ -931,7 +950,7 @@ class AliasAnalysisTest extends CompilerTest {
 
     val graph = conversionMethod
       .unsafeGetMetadata(AliasAnalysis, "Missing aliasing info")
-      .unsafeAs[Info.Scope.Root]
+      .unsafeAs[AliasMetadata.RootScope]
       .graph
     val graphLinks = graph.getLinks()
 
@@ -943,12 +962,16 @@ class AliasAnalysisTest extends CompilerTest {
       val meta = conversionMethod.getMetadata(AliasAnalysis)
 
       meta shouldBe defined
-      meta.get shouldBe an[Info.Scope.Root]
+      meta.get shouldBe an[AliasMetadata.RootScope]
     }
 
     "assign Info.Scope.Child to all child scopes" in {
-      lambda.getMetadata(AliasAnalysis).get shouldBe an[Info.Scope.Child]
-      lambdaBody.getMetadata(AliasAnalysis).get shouldBe an[Info.Scope.Child]
+      lambda
+        .getMetadata(AliasAnalysis)
+        .get shouldBe an[AliasMetadata.ChildScope]
+      lambdaBody
+        .getMetadata(AliasAnalysis)
+        .get shouldBe an[AliasMetadata.ChildScope]
     }
 
     "not allocate additional scopes unnecessarily" in {
@@ -959,12 +982,12 @@ class AliasAnalysisTest extends CompilerTest {
       val lambdaScope = lambda
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Scope.Child]
+        .unsafeAs[AliasMetadata.ChildScope]
         .scope
       val blockScope = lambdaBody
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Scope.Child]
+        .unsafeAs[AliasMetadata.ChildScope]
         .scope
 
       topScope shouldEqual lambdaScope
@@ -976,22 +999,25 @@ class AliasAnalysisTest extends CompilerTest {
       val arg1Scope = app.arguments.head
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Scope.Child]
+        .unsafeAs[AliasMetadata.ChildScope]
         .scope
       val arg2Scope = app
         .arguments(1)
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Scope.Child]
+        .unsafeAs[AliasMetadata.ChildScope]
         .scope
 
       topScope.childScopes should contain(arg1Scope)
       topScope.childScopes should contain(arg2Scope)
     }
 
-    "assign Info.Occurrence to definitions and usages of symbols" in {
+    "assign Info.GraphOccurrence to definitions and usages of symbols" in {
       lambda.arguments.foreach(arg =>
-        arg.getMetadata(AliasAnalysis).get.as[Info.Occurrence] shouldBe defined
+        arg
+          .getMetadata(AliasAnalysis)
+          .get
+          .as[AliasMetadata.Occurrence] shouldBe defined
       )
       val firstAppArg =
         app.arguments.head.value.asInstanceOf[Application.Prefix]
@@ -999,7 +1025,7 @@ class AliasAnalysisTest extends CompilerTest {
       innerAppArg
         .getMetadata(AliasAnalysis)
         .get
-        .as[Info.Occurrence] shouldBe defined
+        .as[AliasMetadata.Occurrence] shouldBe defined
     }
 
     "create the correct usage links for resolvable entities" in {
@@ -1007,7 +1033,7 @@ class AliasAnalysisTest extends CompilerTest {
         .arguments(1)
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Occurrence]
+        .unsafeAs[AliasMetadata.Occurrence]
         .id
       val valueUseId = app.arguments.head.value
         .asInstanceOf[Application.Prefix]
@@ -1016,7 +1042,7 @@ class AliasAnalysisTest extends CompilerTest {
         .value
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Occurrence]
+        .unsafeAs[AliasMetadata.Occurrence]
         .id
 
       graphLinks should contain(Link(valueUseId, 2, valueDefId))
@@ -1028,11 +1054,11 @@ class AliasAnalysisTest extends CompilerTest {
         .value
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Occurrence]
+        .unsafeAs[AliasMetadata.Occurrence]
         .id
 
       graph.linksFor(unknownHereId) shouldBe empty
-      graph.getOccurrence(unknownHereId).get shouldBe an[Occurrence.Use]
+      graph.getOccurrence(unknownHereId).get shouldBe an[GraphOccurrence.Use]
     }
   }
 
@@ -1058,21 +1084,21 @@ class AliasAnalysisTest extends CompilerTest {
     val graph = methodWithCase
       .getMetadata(AliasAnalysis)
       .get
-      .as[Info.Scope.Root]
+      .as[AliasMetadata.RootScope]
       .get
       .graph
 
     "expose the scrutinee in the parent scope" in {
       val scrutBindingId = scrutBinding
         .unsafeGetMetadata(AliasAnalysis, "")
-        .unsafeAs[Info.Occurrence]
+        .unsafeAs[AliasMetadata.Occurrence]
         .id
       graph.rootScope.getOccurrence(scrutBindingId) shouldBe defined
 
       val scrutineeId = caseExpr.scrutinee
         .getMetadata(AliasAnalysis)
         .get
-        .as[Info.Occurrence]
+        .as[AliasMetadata.Occurrence]
         .get
         .id
       graph.rootScope.getOccurrence(scrutineeId) shouldBe defined
@@ -1081,7 +1107,7 @@ class AliasAnalysisTest extends CompilerTest {
 
       val scrutBindingExprId = scrutBindingExpr
         .unsafeGetMetadata(AliasAnalysis, "")
-        .unsafeAs[Info.Occurrence]
+        .unsafeAs[AliasMetadata.Occurrence]
         .id
       graph.rootScope.getOccurrence(scrutBindingExprId) shouldBe defined
 
@@ -1089,7 +1115,7 @@ class AliasAnalysisTest extends CompilerTest {
         .arguments(1)
         .getMetadata(AliasAnalysis)
         .get
-        .as[Info.Occurrence]
+        .as[AliasMetadata.Occurrence]
         .get
         .id
       graph.rootScope.getOccurrence(aDefId) shouldBe defined
@@ -1101,28 +1127,28 @@ class AliasAnalysisTest extends CompilerTest {
       val consBranchScope = caseExpr.branches.head
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Scope.Child]
+        .unsafeAs[AliasMetadata.ChildScope]
         .scope
       val nilBranchScope =
         caseExpr
           .branches(1)
           .getMetadata(AliasAnalysis)
           .get
-          .unsafeAs[Info.Scope.Child]
+          .unsafeAs[AliasMetadata.ChildScope]
           .scope
       val tpeBranchScope =
         caseExpr
           .branches(2)
           .getMetadata(AliasAnalysis)
           .get
-          .unsafeAs[Info.Scope.Child]
+          .unsafeAs[AliasMetadata.ChildScope]
           .scope
       val fallbackBranchScope =
         caseExpr
           .branches(3)
           .getMetadata(AliasAnalysis)
           .get
-          .unsafeAs[Info.Scope.Child]
+          .unsafeAs[AliasMetadata.ChildScope]
           .scope
 
       val rootScope = graph.rootScope
@@ -1137,7 +1163,7 @@ class AliasAnalysisTest extends CompilerTest {
       val consBranchScope = caseExpr.branches.head
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Scope.Child]
+        .unsafeAs[AliasMetadata.ChildScope]
         .scope
       consBranchScope.allDefinitions.length shouldBe 2
 
@@ -1158,14 +1184,14 @@ class AliasAnalysisTest extends CompilerTest {
         consBranchADef
           .getMetadata(AliasAnalysis)
           .get
-          .unsafeAs[Info.Occurrence]
+          .unsafeAs[AliasMetadata.Occurrence]
           .id
 
       val consBranchBDef = pattern.fields(1).asInstanceOf[Pattern.Name].name
       val consBranchBDefId = consBranchBDef
         .getMetadata(AliasAnalysis)
         .get
-        .unsafeAs[Info.Occurrence]
+        .unsafeAs[AliasMetadata.Occurrence]
         .id
 
       val aUse = body.arguments.head
@@ -1173,7 +1199,11 @@ class AliasAnalysisTest extends CompilerTest {
         .value
         .asInstanceOf[Name.Literal]
       val aUseId =
-        aUse.getMetadata(AliasAnalysis).get.unsafeAs[Info.Occurrence].id
+        aUse
+          .getMetadata(AliasAnalysis)
+          .get
+          .unsafeAs[AliasMetadata.Occurrence]
+          .id
 
       val bUse = body
         .arguments(1)
@@ -1181,7 +1211,11 @@ class AliasAnalysisTest extends CompilerTest {
         .value
         .asInstanceOf[Name.Literal]
       val bUseId =
-        bUse.getMetadata(AliasAnalysis).get.unsafeAs[Info.Occurrence].id
+        bUse
+          .getMetadata(AliasAnalysis)
+          .get
+          .unsafeAs[AliasMetadata.Occurrence]
+          .id
 
       graph.getLinks() should contain(Link(aUseId, 1, consBranchADefId))
       graph.getLinks() should contain(Link(bUseId, 1, consBranchBDefId))
@@ -1198,13 +1232,13 @@ class AliasAnalysisTest extends CompilerTest {
         tpeBranchNameDef
           .getMetadata(AliasAnalysis)
           .get
-          .unsafeAs[Info.Occurrence]
+          .unsafeAs[AliasMetadata.Occurrence]
           .id
       val tpeBranchTpeDefId =
         tpeTpeBranchTpeDef
           .getMetadata(AliasAnalysis)
           .get
-          .unsafeAs[Info.Occurrence]
+          .unsafeAs[AliasMetadata.Occurrence]
           .id
 
       val numUse = body
@@ -1213,7 +1247,11 @@ class AliasAnalysisTest extends CompilerTest {
         .value
         .asInstanceOf[Name.Literal]
       val numUseId =
-        numUse.getMetadata(AliasAnalysis).get.unsafeAs[Info.Occurrence].id
+        numUse
+          .getMetadata(AliasAnalysis)
+          .get
+          .unsafeAs[AliasMetadata.Occurrence]
+          .id
 
       val integerUse = body
         .arguments(1)
@@ -1221,7 +1259,11 @@ class AliasAnalysisTest extends CompilerTest {
         .value
         .asInstanceOf[Name.Literal]
       val integerUseId =
-        integerUse.getMetadata(AliasAnalysis).get.unsafeAs[Info.Occurrence].id
+        integerUse
+          .getMetadata(AliasAnalysis)
+          .get
+          .unsafeAs[AliasMetadata.Occurrence]
+          .id
 
       graph.getLinks() should contain(Link(numUseId, 1, tpeBranchNameDefId))
       graph.getLinks() should not contain (Link(
@@ -1248,7 +1290,9 @@ class AliasAnalysisTest extends CompilerTest {
       .asInstanceOf[Expression.Block]
 
     val blockScope =
-      block.unsafeGetMetadata(AliasAnalysis, "").unsafeAs[Info.Scope.Child]
+      block
+        .unsafeGetMetadata(AliasAnalysis, "")
+        .unsafeAs[AliasMetadata.ChildScope]
 
     "create a new scope for the literal" in {
       if (!block.returnValue.isInstanceOf[errors.Syntax]) {
@@ -1257,7 +1301,7 @@ class AliasAnalysisTest extends CompilerTest {
         val literalScope =
           literal
             .unsafeGetMetadata(AliasAnalysis, "")
-            .unsafeAs[Info.Scope.Child]
+            .unsafeAs[AliasMetadata.ChildScope]
         blockScope.scope.childScopes should contain(literalScope.scope)
       }
     }
diff --git a/engine/runtime/src/main/scala/org/enso/interpreter/runtime/IrToTruffle.scala b/engine/runtime/src/main/scala/org/enso/interpreter/runtime/IrToTruffle.scala
index 5ce3330212ea..9bd5ea3aba5a 100644
--- a/engine/runtime/src/main/scala/org/enso/interpreter/runtime/IrToTruffle.scala
+++ b/engine/runtime/src/main/scala/org/enso/interpreter/runtime/IrToTruffle.scala
@@ -45,18 +45,16 @@ import org.enso.compiler.core.ir.module.scope.definition.Method
 import org.enso.compiler.data.BindingsMap.{ResolvedConstructor, ResolvedModule}
 import org.enso.compiler.data.{BindingsMap, CompilerConfig}
 import org.enso.compiler.exception.BadPatternMatch
-import org.enso.compiler.pass.analyse.alias.Graph.{Scope => AliasScope}
-import org.enso.compiler.pass.analyse.alias.Info.Scope
+import org.enso.compiler.pass.analyse.alias.graph.Graph.{Scope => AliasScope}
 import org.enso.compiler.pass.analyse.{
+  alias,
   AliasAnalysis,
   BindingAnalysis,
   DataflowAnalysis,
   TailCall
 }
-import org.enso.compiler.pass.analyse.alias.{
-  Graph => AliasGraph,
-  Info => AliasInfo
-}
+import org.enso.compiler.pass.analyse.alias.AliasMetadata
+import org.enso.compiler.pass.analyse.alias.graph.{Graph => AliasGraph}
 import org.enso.compiler.pass.resolve.{
   ExpressionAnnotations,
   GenericAnnotations,
@@ -277,7 +275,7 @@ class IrToTruffle(
         AliasAnalysis,
         "No root scope on an atom definition."
       )
-      .unsafeAs[AliasInfo.Scope.Root]
+      .unsafeAs[AliasMetadata.RootScope]
 
     val dataflowInfo = atomDefn.unsafeGetMetadata(
       DataflowAnalysis,
@@ -309,7 +307,7 @@ class IrToTruffle(
           AliasAnalysis,
           "No occurrence on an argument definition."
         )
-        .unsafeAs[AliasInfo.Occurrence]
+        .unsafeAs[alias.AliasMetadata.Occurrence]
       val slotIdx = localScope.getVarSlotIdx(occInfo.id)
       argDefs(idx) = arg
       val readArg =
@@ -382,7 +380,7 @@ class IrToTruffle(
           s"Missing scope information for method " +
           s"`${methodDef.typeName.map(_.name + ".").getOrElse("")}${methodDef.methodName.name}`."
         )
-        .unsafeAs[AliasInfo.Scope.Root]
+        .unsafeAs[AliasMetadata.RootScope]
       val dataflowInfo = methodDef.unsafeGetMetadata(
         DataflowAnalysis,
         "Method definition missing dataflow information."
@@ -559,7 +557,7 @@ class IrToTruffle(
                 scopeElements.init
                   .mkString(Constants.SCOPE_SEPARATOR)
               )
-              .unsafeAs[Scope.Root]
+              .unsafeAs[AliasMetadata.RootScope]
             val dataflowInfo = annotation.unsafeGetMetadata(
               DataflowAnalysis,
               "Missing dataflow information for annotation " +
@@ -776,7 +774,7 @@ class IrToTruffle(
           s"Missing scope information for conversion " +
           s"`${methodDef.typeName.map(_.name + ".").getOrElse("")}${methodDef.methodName.name}`."
         )
-        .unsafeAs[AliasInfo.Scope.Root]
+        .unsafeAs[AliasMetadata.RootScope]
       val dataflowInfo = methodDef.unsafeGetMetadata(
         DataflowAnalysis,
         "Method definition missing dataflow information."
@@ -1340,7 +1338,7 @@ class IrToTruffle(
             AliasAnalysis,
             "Missing scope information on block."
           )
-          .unsafeAs[AliasInfo.Scope.Child]
+          .unsafeAs[AliasMetadata.ChildScope]
 
         val childFactory = this.createChild(
           "suspended-block",
@@ -1454,7 +1452,7 @@ class IrToTruffle(
           AliasAnalysis,
           "No scope information on a case branch."
         )
-        .unsafeAs[AliasInfo.Scope.Child]
+        .unsafeAs[AliasMetadata.ChildScope]
 
       val childProcessor =
         this.createChild(
@@ -1830,7 +1828,7 @@ class IrToTruffle(
           AliasAnalysis,
           "Binding with missing occurrence information."
         )
-        .unsafeAs[AliasInfo.Occurrence]
+        .unsafeAs[AliasMetadata.Occurrence]
 
       currentVarName = binding.name.name
 
@@ -1854,7 +1852,7 @@ class IrToTruffle(
     ): RuntimeExpression = {
       val scopeInfo = function
         .unsafeGetMetadata(AliasAnalysis, "No scope info on a function.")
-        .unsafeAs[AliasInfo.Scope.Child]
+        .unsafeAs[AliasMetadata.ChildScope]
 
       if (function.body.isInstanceOf[Function]) {
         throw new CompilerError(
@@ -1949,7 +1947,7 @@ class IrToTruffle(
     private class RuntimeNameResolution
         extends NameResolutionAlgorithm[RuntimeExpression, FramePointer] {
       override protected def findLocalLink(
-        occurrenceMetadata: org.enso.compiler.pass.analyse.alias.Info.Occurrence
+        occurrenceMetadata: org.enso.compiler.pass.analyse.alias.AliasMetadata.Occurrence
       ): Option[FramePointer] =
         scope.getFramePointer(occurrenceMetadata.id)
 
@@ -2198,7 +2196,7 @@ class IrToTruffle(
                 AliasAnalysis,
                 "No occurrence on an argument definition."
               )
-              .unsafeAs[AliasInfo.Occurrence]
+              .unsafeAs[AliasMetadata.Occurrence]
 
             val slotIdx = scope.getVarSlotIdx(occInfo.id)
             val readArg =
@@ -2432,7 +2430,7 @@ class IrToTruffle(
               AliasAnalysis,
               "No scope attached to a call argument."
             )
-            .unsafeAs[AliasInfo.Scope.Child]
+            .unsafeAs[AliasMetadata.ChildScope]
 
           def valueHasSomeTypeCheck() =
             value.getMetadata(TypeSignatures).isDefined

From be5e3d2b974a0a109791edcbd0fd90cf03ae0b98 Mon Sep 17 00:00:00 2001
From: Dmitry Bushev <bushevdv@gmail.com>
Date: Mon, 12 Aug 2024 18:33:20 +0300
Subject: [PATCH 15/23] Text editing ranges specified in UTF16 code units
 (#10764)

related #10678

Changelog:
- update: text editing expects Unicode code units when specifying text ranges
- test: text editing with emojis
---
 build.sbt                                     |  1 +
 .../protocol-language-server.md               | 19 +++++++
 .../enso/text/editing/RopeTextEditor.scala    | 13 +++--
 .../org/enso/text/editing/EditorOpsSpec.scala | 50 ++++++++++++++++---
 .../text/editing/RopeTextEditorSpec.scala     |  2 +-
 5 files changed, 70 insertions(+), 15 deletions(-)

diff --git a/build.sbt b/build.sbt
index 5158291b3eb0..1295c80cfe97 100644
--- a/build.sbt
+++ b/build.sbt
@@ -637,6 +637,7 @@ lazy val `text-buffer` = project
   .configs(Test)
   .settings(
     frgaalJavaCompilerSetting,
+    commands += WithDebugCommand.withDebug,
     libraryDependencies ++= Seq(
       "org.scalatest"  %% "scalatest"  % scalatestVersion  % Test,
       "org.scalacheck" %% "scalacheck" % scalacheckVersion % Test
diff --git a/docs/language-server/protocol-language-server.md b/docs/language-server/protocol-language-server.md
index 841a44e992ee..685b7769d5dd 100644
--- a/docs/language-server/protocol-language-server.md
+++ b/docs/language-server/protocol-language-server.md
@@ -1005,6 +1005,25 @@ The range of `1` is
 }
 ```
 
+For unicode characters, the range is measured in code units, for example given
+the function with the old key emoji `foo 🗝 = ...` argument consisting of two
+unicode code units `\uD83D` and `\uDDDD`.
+
+```rust
+0|foo \uD83D\uDDDD = ...
+  ^^^^^^^^^^^^^^^^^^
+  01234     5     67
+```
+
+The range of old key emoji `🗝` argument is
+
+```typescript
+{
+    start: { line: 0, character: 4},
+    end: { line: 0, character: 6}
+}
+```
+
 #### Format
 
 ```typescript
diff --git a/lib/scala/text-buffer/src/main/scala/org/enso/text/editing/RopeTextEditor.scala b/lib/scala/text-buffer/src/main/scala/org/enso/text/editing/RopeTextEditor.scala
index 5a7978b5c829..16f656a62a16 100644
--- a/lib/scala/text-buffer/src/main/scala/org/enso/text/editing/RopeTextEditor.scala
+++ b/lib/scala/text-buffer/src/main/scala/org/enso/text/editing/RopeTextEditor.scala
@@ -3,8 +3,7 @@ package org.enso.text.editing
 import org.enso.text.buffer.Rope
 import org.enso.text.editing.model.TextEdit
 
-/** Instance of the [[TextEditor]] type class for the [[Rope]] type.
-  */
+/** Instance of the [[TextEditor]] type class for the [[Rope]] type. */
 object RopeTextEditor extends TextEditor[Rope] {
 
   /** Edits a buffer.
@@ -27,7 +26,7 @@ object RopeTextEditor extends TextEditor[Rope] {
       if (diff.range.start.character > 0)
         buffer.lines
           .drop(diff.range.start.line)
-          .codePoints
+          .characters
           .take(diff.range.start.character)
       else
         Rope.empty
@@ -36,11 +35,11 @@ object RopeTextEditor extends TextEditor[Rope] {
   }
 
   private def cutOutTail(buffer: Rope, diff: TextEdit): Rope = {
-    val codePoints = buffer.lines
+    val characters = buffer.lines
       .drop(diff.range.end.line)
-      .codePoints
-    if (codePoints.length < diff.range.end.character) Rope.empty
-    else codePoints.drop(diff.range.end.character)
+      .characters
+    if (characters.length < diff.range.end.character) Rope.empty
+    else characters.drop(diff.range.end.character)
   }
 
   /** Returns a number of lines in a buffer.
diff --git a/lib/scala/text-buffer/src/test/scala/org/enso/text/editing/EditorOpsSpec.scala b/lib/scala/text-buffer/src/test/scala/org/enso/text/editing/EditorOpsSpec.scala
index 38cdb26b6533..42c25103b4a6 100644
--- a/lib/scala/text-buffer/src/test/scala/org/enso/text/editing/EditorOpsSpec.scala
+++ b/lib/scala/text-buffer/src/test/scala/org/enso/text/editing/EditorOpsSpec.scala
@@ -19,13 +19,37 @@ class EditorOpsSpec extends AnyFlatSpec with Matchers with EitherValues {
     //when
     val result = EditorOps.applyEdits(testSnippet, diffs)
     //then
-    result.map(_.toString) mustBe Right("""
-                                          |main =
-                                          |    apply = arg f -> f arg
-                                          |    adder = a b -> a + b
-                                          |    plusOne = apply (f = adder 1)
-                                          |    result = plusOne 10
-                                          |    result""".stripMargin)
+    result.map(_.toString) mustBe Right(
+      """
+        |main =
+        |    apply = arg f -> f arg
+        |    adder = a b -> a + b
+        |    plusOne = apply (f = adder 1)
+        |    result = plusOne 10
+        |    result""".stripMargin
+    )
+  }
+
+  it should "be able to apply diffs with unicode symbols" in {
+    //given
+    val oldKeyEmoji       = "\uD83D\uDDDD"
+    val signaturePosition = Range(Position(2, 12), Position(2, 13))
+    val signatureDiff     = TextEdit(signaturePosition, oldKeyEmoji)
+    val bodyPosition      = Range(Position(2, 22), Position(2, 23))
+    val bodyDiff          = TextEdit(bodyPosition, oldKeyEmoji)
+    val diffs             = List(signatureDiff, bodyDiff)
+    //when
+    val result = EditorOps.applyEdits(testSnippet, diffs)
+    //then
+    result.map(_.toString) mustBe Right(
+      """
+        |main =
+        |    apply = 🗝 f -> f 🗝
+        |    adder = a b -> a + b
+        |    plusOne = apply (f = adder 1)
+        |    result = plusOne 10
+        |    result""".stripMargin
+    )
   }
 
   it should "take into account applied so far edits when validate next diff" in {
@@ -86,4 +110,16 @@ class EditorOpsSpec extends AnyFlatSpec with Matchers with EitherValues {
     result.map(_.toString) mustBe Right("foo")
   }
 
+  it should "be able to edit text with unicode symbols" in {
+    //given
+    val oldKeyEmoji       = "\uD83D\uDDDD"
+    val variationSelector = "\uFE0F"
+    val codeToEdit        = Rope(s"$oldKeyEmoji$variationSelector")
+    val range             = Range(Position(0, 2), Position(0, 2))
+    val diff              = TextEdit(range, "xyz")
+    //when
+    val result = EditorOps.applyEdits(codeToEdit, Seq(diff))
+    //then
+    result.map(_.toString) mustBe Right("\uD83D\uDDDDxyz\uFE0F")
+  }
 }
diff --git a/lib/scala/text-buffer/src/test/scala/org/enso/text/editing/RopeTextEditorSpec.scala b/lib/scala/text-buffer/src/test/scala/org/enso/text/editing/RopeTextEditorSpec.scala
index 7e2717cb26d6..844375a9124c 100644
--- a/lib/scala/text-buffer/src/test/scala/org/enso/text/editing/RopeTextEditorSpec.scala
+++ b/lib/scala/text-buffer/src/test/scala/org/enso/text/editing/RopeTextEditorSpec.scala
@@ -99,7 +99,7 @@ class RopeTextEditorSpec extends AnyFlatSpec with Matchers {
     //given
     //0x0001F4AF
     val utf32Text           = Rope("unicode: \ud83d\udcaf end")
-    val positionInCodeUnits = Range(Position(0, 9), Position(0, 10))
+    val positionInCodeUnits = Range(Position(0, 9), Position(0, 11))
     //0x0001F449
     val diff = TextEdit(positionInCodeUnits, "\ud83d\udc49")
     //when

From 31e589e362ac690896b961be38f783219a3b68b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Grabarz?= <frizi09@gmail.com>
Date: Mon, 12 Aug 2024 18:52:44 +0200
Subject: [PATCH 16/23] Do not default to development ydoc server in prod
 build. (#10786)

Fixes https://github.com/enso-org/enso/issues/10784
---
 app/gui2/package.json                 | 2 +-
 app/gui2/src/composables/animation.ts | 1 -
 app/gui2/vite.config.ts               | 4 +++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/gui2/package.json b/app/gui2/package.json
index 8da94f8ad2a1..6e4786cd5a09 100644
--- a/app/gui2/package.json
+++ b/app/gui2/package.json
@@ -8,7 +8,7 @@
     "email": "contact@enso.org"
   },
   "scripts": {
-    "dev": "echo DEPRECATED! Use `pnpm dev:gui` in workspace root directory.",
+    "dev": "echo DEPRECATED! Use `pnpm -w dev:gui` instead.",
     "dev:vite": "vite",
     "build": "corepack pnpm -r --filter enso-dashboard run compile && corepack pnpm run build:vite",
     "build-cloud": "cross-env CLOUD_BUILD=true corepack pnpm run build",
diff --git a/app/gui2/src/composables/animation.ts b/app/gui2/src/composables/animation.ts
index 8d00c0b85cc7..e89c6429d15c 100644
--- a/app/gui2/src/composables/animation.ts
+++ b/app/gui2/src/composables/animation.ts
@@ -63,7 +63,6 @@ export function useRaf(
     },
     { immediate: true },
   )
-  console.log('onScopeDispose(unmountRaf)?')
   onScopeDispose(unmountRaf)
 }
 
diff --git a/app/gui2/vite.config.ts b/app/gui2/vite.config.ts
index 42bdc33a91cb..81d65dc0d523 100644
--- a/app/gui2/vite.config.ts
+++ b/app/gui2/vite.config.ts
@@ -15,7 +15,9 @@ const projectManagerUrl =
   process.env.E2E === 'true' ? 'ws://127.0.0.1:30536' : 'ws://127.0.0.1:30535'
 
 const IS_CLOUD_BUILD = process.env.CLOUD_BUILD === 'true'
-const YDOC_SERVER_URL = process.env.ENSO_POLYGLOT_YDOC_SERVER ?? 'ws://localhost:5976'
+const YDOC_SERVER_URL =
+  process.env.ENSO_POLYGLOT_YDOC_SERVER ??
+  (process.env.NODE_ENV === 'development' ? 'ws://localhost:5976' : undefined)
 
 await readEnvironmentFromFile()
 

From ff7e31c237f0b26f8a15cfaf6ffd4b0e6f22c75d Mon Sep 17 00:00:00 2001
From: Hubert Plociniczak <hubert.plociniczak@gmail.com>
Date: Tue, 13 Aug 2024 10:01:31 +0200
Subject: [PATCH 17/23] Reducing memory leaks in runtime-integration-tests
 (#10793)

Inspired by the revert done in https://github.com/enso-org/enso/pull/10778, started looking into apparent memory leaks in `runtime-integration-tests`, written in Java.

Initial state:
![Screenshot from 2024-08-09 14-36-29](https://github.com/user-attachments/assets/39abd48f-503b-49d8-af97-da051352c70d)

After:
![Screenshot from 2024-08-12 16-33-40](https://github.com/user-attachments/assets/2bf4cc2d-7e0e-4d22-8810-c2e7e5c3b065)

# Important Notes
Some remaining issues:
- [ ] [TCK tests](https://github.com/enso-org/enso/tree/develop/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/tck) appear to have some memory leaks but we are essentially enabling them via simple inheritance
- [ ] [RuntimeManagementTest](https://github.com/enso-org/enso/blob/develop/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/semantic/RuntimeManagementTest.scala) appears to be broken as it doesn't seem to shutdown properly created threads:
![Screenshot from 2024-08-12 16-29-09](https://github.com/user-attachments/assets/d90aca62-0562-4287-88b7-6d4719e5cf50)

Leaving this for now, as it will probably need to be taken care by initial authors of those tests, if possible. Plus this PR leaves tests in a much better state than before.
---
 .../org/enso/compiler/PackageRepository.scala |   1 +
 .../enso/compiler/ExecStrictCompilerTest.java |   5 +-
 .../enso/compiler/ExportedSymbolsTest.java    | 121 +++++++------
 .../ImportsAndFQNConsistencyTest.java         |   1 +
 .../org/enso/compiler/SerdeCompilerTest.java  |   4 +-
 .../compiler/SerializationManagerTest.java    |  19 +-
 .../org/enso/compiler/SerializerTest.java     |  44 ++---
 .../compiler/VectorArraySignatureTest.java    |   1 +
 .../enso/compiler/dump/test/IRDumpTest.java   |   4 +-
 .../interpreter/caches/ModuleCacheTest.java   |   7 +
 .../node/callable/PolyglotCallTypeTest.java   |   1 +
 .../builtin/meta/TypeOfNodeTest.java          |   1 +
 .../runtime/ModuleSourcesTest.java            |   1 +
 .../enso/interpreter/runtime/ModuleTest.java  |   1 +
 .../interpreter/test/AtomConstructorTest.java |   1 +
 .../interpreter/test/AtomInteropTest.java     |   1 +
 .../test/AutoscopedConstructorTest.java       |   5 +-
 .../enso/interpreter/test/BigNumberTest.java  |   1 +
 .../interpreter/test/BinaryDispatchTest.java  |   2 +
 .../interpreter/test/BinaryOpFloatTest.java   |   1 +
 .../interpreter/test/BinaryOpIntegerTest.java |   1 +
 .../enso/interpreter/test/ContextTest.java    |  27 +++
 .../test/ConversionMethodTests.java           |   5 +-
 .../interpreter/test/DebuggingEnsoTest.java   |   2 +
 .../test/DiagnosticFormatterTest.java         |   1 +
 .../test/EqualsConversionsTest.java           |   1 +
 .../org/enso/interpreter/test/EqualsTest.java |   4 +
 .../test/FindExceptionMessageTest.java        |   1 +
 .../test/ForeignMethodInvokeTest.java         |   1 +
 .../enso/interpreter/test/HashCodeTest.java   |   2 +
 .../interpreter/test/InsightForEnsoTest.java  |   2 +
 .../enso/interpreter/test/IntegerTest.java    |   1 +
 .../interpreter/test/JavaInteropTest.java     |   5 +-
 .../enso/interpreter/test/JsInteropTest.java  |   3 +-
 .../org/enso/interpreter/test/ListTest.java   |   8 +
 .../enso/interpreter/test/MetaIsATest.java    |   3 +
 .../interpreter/test/NonStrictModeTests.java  |   1 +
 .../interpreter/test/PolyglotErrorTest.java   |   2 +
 .../enso/interpreter/test/RootNamesTest.java  |   2 +
 .../enso/interpreter/test/SignatureTest.java  |  22 +--
 .../test/SymbolResolutionTest.java            |  22 +--
 .../test/TypeInferenceConsistencyTest.java    |   5 +-
 .../interpreter/test/TypeMembersTest.java     |   1 +
 .../enso/interpreter/test/VectorSortTest.java |   2 +
 .../org/enso/interpreter/test/VectorTest.java |   1 +
 .../enso/interpreter/test/WarningsTest.java   |   5 +-
 .../test/asserts/AssertionsTest.java          |   1 +
 .../test/asserts/DisabledAssertionsTest.java  |   1 +
 .../SuccessfulAssertionExpressionTest.java    |   1 +
 .../AvoidIdInstrumentationTagTest.java        |   2 +
 .../test/instrument/FunctionPointerTest.java  |   1 +
 .../instrument/IncrementalUpdatesTest.java    |   2 +
 .../WarningInstrumentationTest.java           |   2 +
 .../compiler/refactoring/IRUtilsTest.scala    |   3 +-
 .../org/enso/compiler/test/ModifiedTest.scala |   4 +-
 .../test/context/SuggestionBuilderTest.scala  |   3 +-
 .../test/semantic/TypeSignaturesTest.scala    |   3 +-
 .../interpreter/test/InterpreterTest.scala    | 171 ++++++++++++------
 .../test/instrument/RuntimeServerTest.scala   |   2 +-
 .../test/semantic/RuntimeManagementTest.scala |   3 +-
 .../enso/interpreter/runtime/EnsoContext.java |   4 +
 .../interpreter/runtime/HostClassLoader.java  |   7 +-
 .../runtime/SerializationPool.java            |   1 +
 .../runtime/DefaultPackageRepository.scala    |   7 +
 64 files changed, 364 insertions(+), 206 deletions(-)
 create mode 100644 engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/ContextTest.java

diff --git a/engine/runtime-compiler/src/main/scala/org/enso/compiler/PackageRepository.scala b/engine/runtime-compiler/src/main/scala/org/enso/compiler/PackageRepository.scala
index eff0d52a835d..3305a48c8e09 100644
--- a/engine/runtime-compiler/src/main/scala/org/enso/compiler/PackageRepository.scala
+++ b/engine/runtime-compiler/src/main/scala/org/enso/compiler/PackageRepository.scala
@@ -105,6 +105,7 @@ trait PackageRepository {
     context: CompilerContext
   ): Option[IRModule]
 
+  def shutdown(): Unit
 }
 
 object PackageRepository {
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/ExecStrictCompilerTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/ExecStrictCompilerTest.java
index 6464f30aeb7d..256da1d16a7d 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/ExecStrictCompilerTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/ExecStrictCompilerTest.java
@@ -17,8 +17,8 @@
 import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.Source;
 import org.graalvm.polyglot.io.IOAccess;
+import org.junit.After;
 import org.junit.AfterClass;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -45,7 +45,7 @@ public static void initEnsoContext() {
     assertNotNull("Enso language is supported", ctx.getEngine().getLanguages().get("enso"));
   }
 
-  @Before
+  @After
   public void cleanMessages() {
     MESSAGES.reset();
   }
@@ -53,6 +53,7 @@ public void cleanMessages() {
   @AfterClass
   public static void closeEnsoContext() {
     ctx.close();
+    ctx = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/ExportedSymbolsTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/ExportedSymbolsTest.java
index ba4e187dcfe0..a5e0e9a14a7f 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/ExportedSymbolsTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/ExportedSymbolsTest.java
@@ -47,13 +47,14 @@ public void exportedSymbolsFromSingleModule() throws IOException {
         type A_Type
         """);
     ProjectUtils.createProject("Proj", Set.of(mainSrcMod), projDir);
-    var ctx = createCtx(projDir);
-    compile(ctx);
-    var mainExportedSymbols = getExportedSymbolsFromModule(ctx, "local.Proj.Main");
-    assertThat(mainExportedSymbols.size(), is(1));
-    assertThat(mainExportedSymbols.containsKey("A_Type"), is(true));
-    assertThat(
-        mainExportedSymbols.get("A_Type").get(0), instanceOf(BindingsMap.ResolvedType.class));
+    try (var ctx = createCtx(projDir)) {
+      compile(ctx);
+      var mainExportedSymbols = getExportedSymbolsFromModule(ctx, "local.Proj.Main");
+      assertThat(mainExportedSymbols.size(), is(1));
+      assertThat(mainExportedSymbols.containsKey("A_Type"), is(true));
+      assertThat(
+          mainExportedSymbols.get("A_Type").get(0), instanceOf(BindingsMap.ResolvedType.class));
+    }
   }
 
   @Test
@@ -70,11 +71,12 @@ public void transitivelyExportedSymbols() throws IOException {
         type B_Type
         """);
     ProjectUtils.createProject("Proj", Set.of(aMod, mainSrcMod), projDir);
-    var ctx = createCtx(projDir);
-    compile(ctx);
-    var mainExportedSymbols = getExportedSymbolsFromModule(ctx, "local.Proj.Main");
-    assertThat(mainExportedSymbols.size(), is(2));
-    assertThat(mainExportedSymbols.keySet(), containsInAnyOrder("A_Type", "B_Type"));
+    try (var ctx = createCtx(projDir)) {
+      compile(ctx);
+      var mainExportedSymbols = getExportedSymbolsFromModule(ctx, "local.Proj.Main");
+      assertThat(mainExportedSymbols.size(), is(2));
+      assertThat(mainExportedSymbols.keySet(), containsInAnyOrder("A_Type", "B_Type"));
+    }
   }
 
   @Test
@@ -91,11 +93,12 @@ public void exportSymbolFromDifferentModule() throws IOException {
         type B_Type
         """);
     ProjectUtils.createProject("Proj", Set.of(mainMod, bMod), projDir);
-    var ctx = createCtx(projDir);
-    compile(ctx);
-    var mainExportedSymbols = getExportedSymbolsFromModule(ctx, "local.Proj.Main");
-    assertThat(mainExportedSymbols.size(), is(2));
-    assertThat(mainExportedSymbols.keySet(), containsInAnyOrder("A_Type", "B_Type"));
+    try (var ctx = createCtx(projDir)) {
+      compile(ctx);
+      var mainExportedSymbols = getExportedSymbolsFromModule(ctx, "local.Proj.Main");
+      assertThat(mainExportedSymbols.size(), is(2));
+      assertThat(mainExportedSymbols.keySet(), containsInAnyOrder("A_Type", "B_Type"));
+    }
   }
 
   @Test
@@ -111,11 +114,12 @@ public void exportRenamedSymbol() throws IOException {
         export project.A_Module.A_Type as Foo
         """);
     ProjectUtils.createProject("Proj", Set.of(aMod, mainSrcMod), projDir);
-    var ctx = createCtx(projDir);
-    compile(ctx);
-    var mainExportedSymbols = getExportedSymbolsFromModule(ctx, "local.Proj.Main");
-    assertThat(mainExportedSymbols.size(), is(1));
-    assertThat(mainExportedSymbols.keySet(), containsInAnyOrder("Foo"));
+    try (var ctx = createCtx(projDir)) {
+      compile(ctx);
+      var mainExportedSymbols = getExportedSymbolsFromModule(ctx, "local.Proj.Main");
+      assertThat(mainExportedSymbols.size(), is(1));
+      assertThat(mainExportedSymbols.keySet(), containsInAnyOrder("Foo"));
+    }
   }
 
   @Test
@@ -133,13 +137,16 @@ public void exportedSymbolsFromSubModule() throws IOException {
         import project.Synthetic_Module
         """);
     ProjectUtils.createProject("Proj", Set.of(aMod, mainMod), projDir);
-    var ctx = createCtx(projDir);
-    compile(ctx);
-    var syntheticModExpSymbols = getExportedSymbolsFromModule(ctx, "local.Proj.Synthetic_Module");
-    assertThat(
-        "Just a A_Module submodule should be exported", syntheticModExpSymbols.size(), is(1));
-    assertThat(
-        "Just a A_Module submodule should be exported", syntheticModExpSymbols, hasKey("A_Module"));
+    try (var ctx = createCtx(projDir)) {
+      compile(ctx);
+      var syntheticModExpSymbols = getExportedSymbolsFromModule(ctx, "local.Proj.Synthetic_Module");
+      assertThat(
+          "Just a A_Module submodule should be exported", syntheticModExpSymbols.size(), is(1));
+      assertThat(
+          "Just a A_Module submodule should be exported",
+          syntheticModExpSymbols,
+          hasKey("A_Module"));
+    }
   }
 
   @Test
@@ -156,14 +163,16 @@ public void exportTypeFromModuleWithSameName() throws IOException {
         export project.A_Module.A_Module
         """);
     ProjectUtils.createProject("Proj", Set.of(aMod, mainMod), projDir);
-    var ctx = createCtx(projDir);
-    compile(ctx);
-    var mainExportedSymbols = getExportedSymbolsFromModule(ctx, "local.Proj.Main");
-    assertThat(mainExportedSymbols.size(), is(1));
-    assertThat(mainExportedSymbols.keySet(), containsInAnyOrder("A_Module"));
-    assertThat(mainExportedSymbols.get("A_Module").size(), is(1));
-    assertThat(
-        mainExportedSymbols.get("A_Module").get(0), is(instanceOf(BindingsMap.ResolvedType.class)));
+    try (var ctx = createCtx(projDir)) {
+      compile(ctx);
+      var mainExportedSymbols = getExportedSymbolsFromModule(ctx, "local.Proj.Main");
+      assertThat(mainExportedSymbols.size(), is(1));
+      assertThat(mainExportedSymbols.keySet(), containsInAnyOrder("A_Module"));
+      assertThat(mainExportedSymbols.get("A_Module").size(), is(1));
+      assertThat(
+          mainExportedSymbols.get("A_Module").get(0),
+          is(instanceOf(BindingsMap.ResolvedType.class)));
+    }
   }
 
   @Test
@@ -179,15 +188,16 @@ public void exportModuleWithTypeWithSameName() throws IOException {
         export project.A_Module
         """);
     ProjectUtils.createProject("Proj", Set.of(aMod, mainMod), projDir);
-    var ctx = createCtx(projDir);
-    compile(ctx);
-    var mainExportedSymbols = getExportedSymbolsFromModule(ctx, "local.Proj.Main");
-    assertThat(mainExportedSymbols.size(), is(1));
-    assertThat(mainExportedSymbols.keySet(), containsInAnyOrder("A_Module"));
-    assertThat(mainExportedSymbols.get("A_Module").size(), is(1));
-    assertThat(
-        mainExportedSymbols.get("A_Module").get(0),
-        is(instanceOf(BindingsMap.ResolvedModule.class)));
+    try (var ctx = createCtx(projDir)) {
+      compile(ctx);
+      var mainExportedSymbols = getExportedSymbolsFromModule(ctx, "local.Proj.Main");
+      assertThat(mainExportedSymbols.size(), is(1));
+      assertThat(mainExportedSymbols.keySet(), containsInAnyOrder("A_Module"));
+      assertThat(mainExportedSymbols.get("A_Module").size(), is(1));
+      assertThat(
+          mainExportedSymbols.get("A_Module").get(0),
+          is(instanceOf(BindingsMap.ResolvedModule.class)));
+    }
   }
 
   @Test
@@ -205,15 +215,16 @@ public void exportSyntheticModule() throws IOException {
         export project.Synthetic_Module
         """);
     ProjectUtils.createProject("Proj", Set.of(aMod, mainMod), projDir);
-    var ctx = createCtx(projDir);
-    compile(ctx);
-    var mainExportedSymbols = getExportedSymbolsFromModule(ctx, "local.Proj.Main");
-    assertThat(mainExportedSymbols.size(), is(1));
-    assertThat(mainExportedSymbols.keySet(), containsInAnyOrder("Synthetic_Module"));
-    assertThat(mainExportedSymbols.get("Synthetic_Module").size(), is(1));
-    assertThat(
-        mainExportedSymbols.get("Synthetic_Module").get(0),
-        is(instanceOf(BindingsMap.ResolvedModule.class)));
+    try (var ctx = createCtx(projDir)) {
+      compile(ctx);
+      var mainExportedSymbols = getExportedSymbolsFromModule(ctx, "local.Proj.Main");
+      assertThat(mainExportedSymbols.size(), is(1));
+      assertThat(mainExportedSymbols.keySet(), containsInAnyOrder("Synthetic_Module"));
+      assertThat(mainExportedSymbols.get("Synthetic_Module").size(), is(1));
+      assertThat(
+          mainExportedSymbols.get("Synthetic_Module").get(0),
+          is(instanceOf(BindingsMap.ResolvedModule.class)));
+    }
   }
 
   private static Context createCtx(Path projDir) {
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/ImportsAndFQNConsistencyTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/ImportsAndFQNConsistencyTest.java
index c9a49cd53f24..d724b8181a53 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/ImportsAndFQNConsistencyTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/ImportsAndFQNConsistencyTest.java
@@ -103,6 +103,7 @@ public static void initCtx() {
   @AfterClass
   public static void disposeCtx() {
     ctx.close();
+    ctx = null;
   }
 
   private final Symbol symbol;
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerdeCompilerTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerdeCompilerTest.java
index e35ed9a6989b..18d15cae5779 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerdeCompilerTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerdeCompilerTest.java
@@ -74,7 +74,7 @@ private void parseSerializedModule(String projectName, String forbiddenMessage)
         var persisted = f.get(10, TimeUnit.SECONDS);
         assertEquals("Fib_Test library has been fully persisted", true, persisted);
       }
-      old = module.getIr();
+      old = module.getIr().duplicate(true, true, true, false);
       ctx.leave();
     }
 
@@ -103,7 +103,7 @@ private void parseSerializedModule(String projectName, String forbiddenMessage)
       var mainValue = ctx.asValue(main);
       assertEquals(42, mainValue.execute().asInt());
 
-      now = module.getIr();
+      now = module.getIr().duplicate(true, true, true, false);
 
       ctx.leave();
     }
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerializationManagerTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerializationManagerTest.java
index 9e8b96d65d5c..7a04b07d98fd 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerializationManagerTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerializationManagerTest.java
@@ -28,11 +28,12 @@ public class SerializationManagerTest {
 
   private static final long COMPILE_TIMEOUT_SECONDS = 20;
 
-  private final PackageManager<TruffleFile> packageManager;
-  private final InterpreterContext interpreterContext;
-  private final EnsoContext ensoContext;
+  private PackageManager<TruffleFile> packageManager;
+  private InterpreterContext interpreterContext;
+  private EnsoContext ensoContext;
 
-  public SerializationManagerTest() {
+  @Before
+  public void setup() {
     packageManager = new PackageManager<>(new TruffleFileSystem());
     interpreterContext = new InterpreterContext(x -> x);
     ensoContext =
@@ -41,22 +42,20 @@ public SerializationManagerTest() {
             .getBindings(LanguageInfo.ID)
             .invokeMember(MethodNames.TopScope.LEAK_CONTEXT)
             .asHostObject();
-  }
-
-  @Before
-  public void setup() {
     interpreterContext.ctx().initialize(LanguageInfo.ID);
     interpreterContext.ctx().enter();
   }
 
   @After
   public void teardown() {
-    interpreterContext.ctx().close();
+    interpreterContext.close();
+    ensoContext.shutdown();
+    ensoContext = null;
   }
 
   private Path getLibraryPath(LibraryName libraryName) {
     return Paths.get(
-            interpreterContext.languageHome(),
+            interpreterContext.languageHome().toFile().getAbsolutePath(),
             "..",
             "lib",
             libraryName.namespace(),
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerializerTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerializerTest.java
index 83571047d953..5ec0c09193d1 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerializerTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/SerializerTest.java
@@ -42,29 +42,29 @@ public void testSerializationOfFQNs() throws Exception {
     var pkgPath = new File(getClass().getClassLoader().getResource(testName).getPath());
     var pkg = PackageManager.Default().fromDirectory(pkgPath).get();
 
-    var ctx = ensoContextForPackage(testName, pkgPath);
-    var ensoContext =
-        (EnsoContext)
-            ctx.getBindings(LanguageInfo.ID)
-                .invokeMember(MethodNames.TopScope.LEAK_CONTEXT)
-                .asHostObject();
-    var mainModuleOpt = ensoContext.getModuleForFile(pkg.mainFile());
-    assertEquals(mainModuleOpt.isPresent(), true);
+    try (var ctx = ensoContextForPackage(testName, pkgPath)) {
+      var ensoContext =
+          (EnsoContext)
+              ctx.getBindings(LanguageInfo.ID)
+                  .invokeMember(MethodNames.TopScope.LEAK_CONTEXT)
+                  .asHostObject();
+      var mainModuleOpt = ensoContext.getModuleForFile(pkg.mainFile());
+      assertEquals(mainModuleOpt.isPresent(), true);
 
-    var compiler = ensoContext.getCompiler();
-    var module = mainModuleOpt.get().asCompilerModule();
+      var compiler = ensoContext.getCompiler();
+      var module = mainModuleOpt.get().asCompilerModule();
 
-    ctx.enter();
-    var result = compiler.run(module);
-    assertEquals(result.compiledModules().exists(m -> m == module), true);
-    var useThreadPool = compiler.context().isCreateThreadAllowed();
-    var future = compiler.context().serializeModule(compiler, module, true, useThreadPool);
-    var serialized = future.get(5, TimeUnit.SECONDS);
-    assertEquals(serialized, true);
-    var deserialized = compiler.context().deserializeModule(compiler, module);
-    assertTrue("Deserialized", deserialized);
-    compiler.context().shutdown(true);
-    ctx.leave();
-    ctx.close();
+      ctx.enter();
+      var result = compiler.run(module);
+      assertEquals(result.compiledModules().exists(m -> m == module), true);
+      var useThreadPool = compiler.context().isCreateThreadAllowed();
+      var future = compiler.context().serializeModule(compiler, module, true, useThreadPool);
+      var serialized = future.get(5, TimeUnit.SECONDS);
+      assertEquals(serialized, true);
+      var deserialized = compiler.context().deserializeModule(compiler, module);
+      assertTrue("Deserialized", deserialized);
+      compiler.context().shutdown(true);
+      ctx.leave();
+    }
   }
 }
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/VectorArraySignatureTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/VectorArraySignatureTest.java
index b8ce02248532..d5c2c9440a7b 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/VectorArraySignatureTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/VectorArraySignatureTest.java
@@ -35,6 +35,7 @@ public static void initEnsoParser() {
   @AfterClass
   public static void closeEnsoParser() throws Exception {
     ensoCompiler.close();
+    ensoCompiler = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/dump/test/IRDumpTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/dump/test/IRDumpTest.java
index 35fb6262660e..ffcef2cfc8f8 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/compiler/dump/test/IRDumpTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/compiler/dump/test/IRDumpTest.java
@@ -19,8 +19,7 @@ public void testIrDump() {
     System.setProperty(IRDumper.SYSTEM_PROP, "true");
     try (var ctx = ContextUtils.defaultContextBuilder().out(out).build()) {
       // Dumping is done in the compiler, so it is enough just to compile the module
-      var moduleIr =
-          ContextUtils.compileModule(ctx, """
+      ContextUtils.compileModule(ctx, """
           main = 42
           """, "MyMainModule");
       assertThat(
@@ -39,6 +38,7 @@ public void testIrDump() {
       } catch (IOException e) {
         // Ignore. The ir-dumps directory should be deleted eventually.
       }
+      out.reset();
     }
   }
 }
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/caches/ModuleCacheTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/caches/ModuleCacheTest.java
index 0544debc93bd..a55cf495fe5a 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/caches/ModuleCacheTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/caches/ModuleCacheTest.java
@@ -14,6 +14,7 @@
 import org.enso.test.utils.ContextUtils;
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Source;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -30,6 +31,12 @@ public static void initializeContext() throws Exception {
             .build();
   }
 
+  @AfterClass
+  public static void disposeContext() {
+    ctx.close();
+    ctx = null;
+  }
+
   @Test
   public void testCompareList() throws Exception {
     var ensoCtx =
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/node/callable/PolyglotCallTypeTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/node/callable/PolyglotCallTypeTest.java
index db363ddee719..fcaf4d9812b8 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/node/callable/PolyglotCallTypeTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/node/callable/PolyglotCallTypeTest.java
@@ -27,6 +27,7 @@ public static void setupCtx() {
   @AfterClass
   public static void closeCtx() {
     ctx.close();
+    ctx = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/node/expression/builtin/meta/TypeOfNodeTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/node/expression/builtin/meta/TypeOfNodeTest.java
index 1c85d1992f23..affc85f4e336 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/node/expression/builtin/meta/TypeOfNodeTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/node/expression/builtin/meta/TypeOfNodeTest.java
@@ -66,6 +66,7 @@ public static Object[][] allPossibleEnsoInterpreterValues() throws Exception {
   public static void disposeCtx() throws Exception {
     if (ctx != null) {
       ctx.close();
+      ctx = null;
     }
   }
 
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ModuleSourcesTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ModuleSourcesTest.java
index c23ba56682aa..5c0c2418d6a1 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ModuleSourcesTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ModuleSourcesTest.java
@@ -42,6 +42,7 @@ public void prepareTest() throws IOException {
   public void cleanup() {
     f.delete();
     this.ctx.close();
+    this.ctx = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ModuleTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ModuleTest.java
index fa0d73242f73..699ff6f60155 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ModuleTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/runtime/ModuleTest.java
@@ -50,6 +50,7 @@ public void prepareTest() throws IOException {
   public void cleanup() {
     f.delete();
     this.ctx.close();
+    this.ctx = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/AtomConstructorTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/AtomConstructorTest.java
index e177512bbc88..cf37f5c03cee 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/AtomConstructorTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/AtomConstructorTest.java
@@ -31,6 +31,7 @@ public static void initContext() {
   @AfterClass
   public static void closeContext() {
     ctx.close();
+    ctx = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/AtomInteropTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/AtomInteropTest.java
index 4b41495d1dcc..8da2fe340d3c 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/AtomInteropTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/AtomInteropTest.java
@@ -27,6 +27,7 @@ public void initCtx() {
   @After
   public void disposeCtx() {
     ctx.close();
+    ctx = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/AutoscopedConstructorTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/AutoscopedConstructorTest.java
index 41515e2c0e82..d9640f438315 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/AutoscopedConstructorTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/AutoscopedConstructorTest.java
@@ -12,8 +12,8 @@
 import org.enso.test.utils.ContextUtils;
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.PolyglotException;
+import org.junit.After;
 import org.junit.AfterClass;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -28,7 +28,7 @@ public static void prepareCtx() {
     ctx = ContextUtils.createDefaultContext(out);
   }
 
-  @Before
+  @After
   public void resetOut() {
     out.reset();
   }
@@ -36,6 +36,7 @@ public void resetOut() {
   @AfterClass
   public static void disposeCtx() {
     ctx.close();
+    ctx = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BigNumberTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BigNumberTest.java
index 0a497a206ca3..88419a34f7fc 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BigNumberTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BigNumberTest.java
@@ -28,6 +28,7 @@ public static void prepareCtx() {
   @AfterClass
   public static void disposeCtx() {
     ctx.close();
+    ctx = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryDispatchTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryDispatchTest.java
index c0eaac928288..d0c6d69d883e 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryDispatchTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryDispatchTest.java
@@ -63,7 +63,9 @@ public static void initCtx() throws Exception {
 
   @AfterClass
   public static void closeCtx() {
+    module = null;
     ctx.close();
+    ctx = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryOpFloatTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryOpFloatTest.java
index 5a5638bd30a4..cdfde332d925 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryOpFloatTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryOpFloatTest.java
@@ -89,6 +89,7 @@ public static void initContext() {
   @AfterClass
   public static void closeContext() {
     ctx.close();
+    ctx = null;
   }
 
   private final String operation;
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryOpIntegerTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryOpIntegerTest.java
index c93e7addb567..b016a8cd7a9e 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryOpIntegerTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/BinaryOpIntegerTest.java
@@ -108,6 +108,7 @@ public static void initContext() {
   @AfterClass
   public static void closeContext() {
     ctx.close();
+    ctx = null;
   }
 
   private final String operation;
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/ContextTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/ContextTest.java
new file mode 100644
index 000000000000..d8d0ec2ddbf9
--- /dev/null
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/ContextTest.java
@@ -0,0 +1,27 @@
+package org.enso.interpreter.test;
+
+import java.io.OutputStream;
+import org.enso.test.utils.ContextUtils;
+import org.graalvm.polyglot.Context;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+
+public class ContextTest {
+
+  protected static Context ctx;
+
+  @BeforeClass
+  public static void prepareCtx() {
+    ctx =
+        ContextUtils.defaultContextBuilder()
+            .out(OutputStream.nullOutputStream())
+            .err(OutputStream.nullOutputStream())
+            .build();
+  }
+
+  @AfterClass
+  public static void disposeCtx() {
+    ctx.close();
+    ctx = null;
+  }
+}
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/ConversionMethodTests.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/ConversionMethodTests.java
index ca317701e941..b57cd7b03172 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/ConversionMethodTests.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/ConversionMethodTests.java
@@ -10,8 +10,8 @@
 import org.graalvm.polyglot.Value;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
+import org.junit.After;
 import org.junit.AfterClass;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -28,9 +28,10 @@ public static void initCtx() {
   @AfterClass
   public static void disposeCtx() {
     ctx.close();
+    ctx = null;
   }
 
-  @Before
+  @After
   public void resetOutput() {
     out.reset();
   }
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/DebuggingEnsoTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/DebuggingEnsoTest.java
index 391b432e93ff..f3b9a757aab8 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/DebuggingEnsoTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/DebuggingEnsoTest.java
@@ -79,7 +79,9 @@ public void initContext() {
   @After
   public void disposeContext() {
     context.close();
+    context = null;
     engine.close();
+    engine = null;
   }
 
   private static void expectStackFrame(
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/DiagnosticFormatterTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/DiagnosticFormatterTest.java
index e0b1d7f176d5..a6945f54c79a 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/DiagnosticFormatterTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/DiagnosticFormatterTest.java
@@ -55,6 +55,7 @@ public void initCtx() {
   @After
   public void closeCtx() throws IOException {
     ctx.close();
+    ctx = null;
     output.close();
   }
 
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/EqualsConversionsTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/EqualsConversionsTest.java
index bb6184df2412..631ec9c59b47 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/EqualsConversionsTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/EqualsConversionsTest.java
@@ -23,6 +23,7 @@ public static void initContextAndData() {
   @AfterClass
   public static void disposeContext() {
     context.close();
+    context = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/EqualsTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/EqualsTest.java
index 6d62fb048326..b6f415f67e2e 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/EqualsTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/EqualsTest.java
@@ -61,6 +61,8 @@ public static void initContextAndData() {
   @AfterClass
   public static void disposeContext() {
     context.close();
+    context = null;
+    unwrappedValues = null;
   }
 
   @DataPoints public static Object[] unwrappedValues;
@@ -90,6 +92,8 @@ private static Object[] fetchAllUnwrappedValues() {
           .toArray(new Object[] {});
     } catch (Exception e) {
       throw new AssertionError(e);
+    } finally {
+      valGenerator.dispose();
     }
   }
 
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/FindExceptionMessageTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/FindExceptionMessageTest.java
index ea181150396f..b36843d562dc 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/FindExceptionMessageTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/FindExceptionMessageTest.java
@@ -29,6 +29,7 @@ public static void initCtx() {
   @AfterClass
   public static void disposeCtx() {
     ctx.close();
+    ctx = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/ForeignMethodInvokeTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/ForeignMethodInvokeTest.java
index fbcbed8b284b..3cb3722f504b 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/ForeignMethodInvokeTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/ForeignMethodInvokeTest.java
@@ -27,6 +27,7 @@ public static void prepareCtx() {
   @AfterClass
   public static void disposeCtx() {
     ctx.close();
+    ctx = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/HashCodeTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/HashCodeTest.java
index 41b2e809c405..2e5c6726df4c 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/HashCodeTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/HashCodeTest.java
@@ -53,6 +53,8 @@ public static void initContextAndData() {
   @AfterClass
   public static void disposeContext() {
     context.close();
+    context = null;
+    unwrappedValues = null;
   }
 
   /**
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/InsightForEnsoTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/InsightForEnsoTest.java
index 799bc1b95d96..0e7e48627ce5 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/InsightForEnsoTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/InsightForEnsoTest.java
@@ -60,7 +60,9 @@ public void initContext() throws Exception {
   @After
   public void disposeContext() throws Exception {
     this.insightHandle.close();
+    this.out.reset();
     this.ctx.close();
+    ctx = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/IntegerTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/IntegerTest.java
index 88aa5d1552a9..e4e2d48c8c4f 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/IntegerTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/IntegerTest.java
@@ -40,6 +40,7 @@ public static void setup() {
   @AfterClass
   public static void teardown() {
     ctx.close();
+    ctx = null;
   }
 
   private static final EnsoBigInteger bigInt =
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/JavaInteropTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/JavaInteropTest.java
index e4b000593d50..9cfbd2248533 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/JavaInteropTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/JavaInteropTest.java
@@ -12,8 +12,8 @@
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.Value;
+import org.junit.After;
 import org.junit.AfterClass;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -30,9 +30,10 @@ public static void prepareCtx() {
   @AfterClass
   public static void disposeCtx() {
     ctx.close();
+    ctx = null;
   }
 
-  @Before
+  @After
   public void resetOutput() {
     out.reset();
   }
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/JsInteropTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/JsInteropTest.java
index a3edd76d6c99..a45be5cf4027 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/JsInteropTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/JsInteropTest.java
@@ -18,12 +18,13 @@ public class JsInteropTest {
   @Before
   public void initContext() {
     ctx = ContextUtils.createDefaultContext(out);
-    out.reset();
   }
 
   @After
   public void disposeCtx() {
     ctx.close();
+    ctx = null;
+    out.reset();
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/ListTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/ListTest.java
index fb8268cba9eb..a72bea076815 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/ListTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/ListTest.java
@@ -64,7 +64,15 @@ public void prepareCtx() throws Exception {
 
   @After
   public void disposeCtx() {
+    generator = null;
+    plusOne = null;
+    evenOnes = null;
+    taken = null;
+    init = null;
+    asVector = null;
+    asText = null;
     this.ctx.close();
+    ctx = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/MetaIsATest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/MetaIsATest.java
index dd2814c14208..76e70b59d74f 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/MetaIsATest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/MetaIsATest.java
@@ -53,7 +53,10 @@ public static void disposeCtx() {
       generator.dispose();
       generator = null;
     }
+    isACheck = null;
+    warningCheck = null;
     ctx.close();
+    ctx = null;
   }
 
   /**
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/NonStrictModeTests.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/NonStrictModeTests.java
index 2dc5f952b341..0def03ab8984 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/NonStrictModeTests.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/NonStrictModeTests.java
@@ -38,6 +38,7 @@ protected static Context createNonStrictContext() {
   @AfterClass
   public static void disposeCtx() {
     nonStrictCtx.close();
+    nonStrictCtx = null;
   }
 
   @Before
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/PolyglotErrorTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/PolyglotErrorTest.java
index b941f334ddbd..6be980549af7 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/PolyglotErrorTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/PolyglotErrorTest.java
@@ -93,7 +93,9 @@ Panic.catch Illegal_State (PolyglotErrorTest.bar (TypeCc.Cc 'z')) caught_panic->
 
   @After
   public void disposeCtx() {
+    this.panic = null;
     this.ctx.close();
+    ctx = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/RootNamesTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/RootNamesTest.java
index d78fb67ca3dd..9960f9158669 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/RootNamesTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/RootNamesTest.java
@@ -55,6 +55,8 @@ public void initContext() throws Exception {
   public void disposeContext() throws Exception {
     this.insightHandle.close();
     this.ctx.close();
+    this.ctx = null;
+    this.out.reset();
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/SignatureTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/SignatureTest.java
index 3eb6ce5f89ad..94aa592cfbdb 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/SignatureTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/SignatureTest.java
@@ -6,36 +6,16 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.io.OutputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import org.enso.common.MethodNames;
-import org.enso.test.utils.ContextUtils;
-import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.Source;
 import org.graalvm.polyglot.Value;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class SignatureTest {
-  private static Context ctx;
-
-  @BeforeClass
-  public static void prepareCtx() {
-    ctx =
-        ContextUtils.defaultContextBuilder()
-            .out(OutputStream.nullOutputStream())
-            .err(OutputStream.nullOutputStream())
-            .build();
-  }
-
-  @AfterClass
-  public static void disposeCtx() {
-    ctx.close();
-  }
+public class SignatureTest extends ContextTest {
 
   @Test
   public void wrongFunctionSignature() throws Exception {
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/SymbolResolutionTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/SymbolResolutionTest.java
index 0ffffed1a927..ff4e0dcbc41f 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/SymbolResolutionTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/SymbolResolutionTest.java
@@ -3,32 +3,12 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import java.io.OutputStream;
 import java.net.URI;
 import org.enso.common.MethodNames;
-import org.enso.test.utils.ContextUtils;
-import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Source;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class SymbolResolutionTest {
-  private static Context ctx;
-
-  @BeforeClass
-  public static void prepareCtx() {
-    ctx =
-        ContextUtils.defaultContextBuilder()
-            .out(OutputStream.nullOutputStream())
-            .err(OutputStream.nullOutputStream())
-            .build();
-  }
-
-  @AfterClass
-  public static void disposeCtx() {
-    ctx.close();
-  }
+public class SymbolResolutionTest extends ContextTest {
 
   @Test
   public void resolvingLocalSymbol() throws Exception {
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/TypeInferenceConsistencyTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/TypeInferenceConsistencyTest.java
index 1221c4f554fa..a48e6307b5bf 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/TypeInferenceConsistencyTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/TypeInferenceConsistencyTest.java
@@ -10,8 +10,8 @@
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.Source;
+import org.junit.After;
 import org.junit.AfterClass;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -34,7 +34,7 @@ public static void prepareCtx() {
             .build();
   }
 
-  @Before
+  @After
   public void cleanMessages() {
     output.reset();
   }
@@ -46,6 +46,7 @@ private String getOutput() {
   @AfterClass
   public static void disposeCtx() {
     ctx.close();
+    ctx = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/TypeMembersTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/TypeMembersTest.java
index bca7d28d421a..8bac52d718b0 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/TypeMembersTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/TypeMembersTest.java
@@ -28,6 +28,7 @@ public void prepareCtx() {
   @After
   public void disposeCtx() {
     ctx.close();
+    ctx = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/VectorSortTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/VectorSortTest.java
index 94021804c92a..d8a6c8b7498e 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/VectorSortTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/VectorSortTest.java
@@ -47,12 +47,14 @@ public static void initCtxAndNodes() {
     values.addAll(valuesGenerator.booleans());
     values.addAll(valuesGenerator.durations());
     values.addAll(valuesGenerator.maps());
+    valuesGenerator.dispose();
   }
 
   @AfterClass
   public static void disposeCtx() {
     values.clear();
     context.close();
+    context = null;
   }
 
   @DataPoints public static List<Value> values;
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/VectorTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/VectorTest.java
index 6b28ba7ab31a..7b59f3aa0a6d 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/VectorTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/VectorTest.java
@@ -27,6 +27,7 @@ public static void prepareCtx() {
   @AfterClass
   public static void disposeCtx() {
     ctx.close();
+    ctx = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/WarningsTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/WarningsTest.java
index 1e2e1c29d1d0..3dd2def91dfd 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/WarningsTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/WarningsTest.java
@@ -48,8 +48,11 @@ public static void initEnsoContext() {
 
   @AfterClass
   public static void disposeContext() {
-    ensoContext = null;
+    generator.dispose();
     ctx.close();
+    ctx = null;
+    ensoContext.shutdown();
+    ensoContext = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/AssertionsTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/AssertionsTest.java
index 3ac6245d9eba..3ea35198860b 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/AssertionsTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/AssertionsTest.java
@@ -42,6 +42,7 @@ public static void setupCtx() {
   @AfterClass
   public static void disposeCtx() {
     ctx.close(true);
+    ctx = null;
   }
 
   @After
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/DisabledAssertionsTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/DisabledAssertionsTest.java
index b795b179bea4..ff7c4cab7391 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/DisabledAssertionsTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/DisabledAssertionsTest.java
@@ -27,6 +27,7 @@ public static void setupCtx() {
   @AfterClass
   public static void disposeCtx() {
     ctx.close(true);
+    ctx = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/SuccessfulAssertionExpressionTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/SuccessfulAssertionExpressionTest.java
index f3114222f072..356dfd447b0e 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/SuccessfulAssertionExpressionTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/asserts/SuccessfulAssertionExpressionTest.java
@@ -36,6 +36,7 @@ public static void setupCtx() {
   @AfterClass
   public static void disposeCtx() {
     ctx.close(true);
+    ctx = null;
   }
 
   @After
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/instrument/AvoidIdInstrumentationTagTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/instrument/AvoidIdInstrumentationTagTest.java
index 2d5253c4f1f5..3be47fb8121f 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/instrument/AvoidIdInstrumentationTagTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/instrument/AvoidIdInstrumentationTagTest.java
@@ -44,7 +44,9 @@ public void initContext() {
 
   @After
   public void disposeContext() {
+    nodes = null;
     context.close();
+    context = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/instrument/FunctionPointerTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/instrument/FunctionPointerTest.java
index ba55683bd238..baf19357a3b4 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/instrument/FunctionPointerTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/instrument/FunctionPointerTest.java
@@ -48,6 +48,7 @@ public void initContext() {
   @After
   public void disposeContext() {
     context.close();
+    context = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/instrument/IncrementalUpdatesTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/instrument/IncrementalUpdatesTest.java
index 7d7cb4311677..46c9fa69a210 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/instrument/IncrementalUpdatesTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/instrument/IncrementalUpdatesTest.java
@@ -68,7 +68,9 @@ public void initializeContext() {
 
   @After
   public void teardownContext() {
+    nodeCountingInstrument = null;
     context.close();
+    context = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/instrument/WarningInstrumentationTest.java b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/instrument/WarningInstrumentationTest.java
index daacaf7724b8..b26de82ed7c1 100644
--- a/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/instrument/WarningInstrumentationTest.java
+++ b/engine/runtime-integration-tests/src/test/java/org/enso/interpreter/test/instrument/WarningInstrumentationTest.java
@@ -62,7 +62,9 @@ public void initContext() {
 
   @After
   public void disposeContext() {
+    instrument = null;
     context.close();
+    context = null;
   }
 
   @Test
diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/refactoring/IRUtilsTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/refactoring/IRUtilsTest.scala
index 3820d8252511..bc9dcf70cefd 100644
--- a/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/refactoring/IRUtilsTest.scala
+++ b/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/refactoring/IRUtilsTest.scala
@@ -16,7 +16,8 @@ import java.util.UUID
 
 class IRUtilsTest extends AnyWordSpecLike with Matchers with OptionValues {
   private val ctx = new InterpreterContext()
-  private val langCtx = ctx.ctx
+  private val langCtx = ctx
+    .ctx()
     .getBindings(LanguageInfo.ID)
     .invokeMember(MethodNames.TopScope.LEAK_CONTEXT)
     .asHostObject[EnsoContext]()
diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/ModifiedTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/ModifiedTest.scala
index 17896c58865d..0972b801e3ed 100644
--- a/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/ModifiedTest.scala
+++ b/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/ModifiedTest.scala
@@ -71,13 +71,15 @@ trait ModifiedTest
       .build()
     context.initialize(LanguageInfo.ID)
     val executionContext = new PolyglotContext(context)
-    InterpreterException.rethrowPolyglot {
+    val result = InterpreterException.rethrowPolyglot {
       val topScope        = executionContext.getTopScope
       val mainModuleScope = topScope.getModule(mainModule.toString)
       val assocCons       = mainModuleScope.getAssociatedType
       val mainFun         = mainModuleScope.getMethod(assocCons, "main").get
       mainFun.execute()
     }
+    context.close()
+    result
   }
 
   private def initialCopy(from: File, to: File): Unit = {
diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/context/SuggestionBuilderTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/context/SuggestionBuilderTest.scala
index 3d045bfc3821..378ca5e162e3 100644
--- a/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/context/SuggestionBuilderTest.scala
+++ b/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/context/SuggestionBuilderTest.scala
@@ -16,7 +16,8 @@ import java.util.UUID
 
 class SuggestionBuilderTest extends AnyWordSpecLike with Matchers {
   private val ctx = new InterpreterContext()
-  private val langCtx = ctx.ctx
+  private val langCtx = ctx
+    .ctx()
     .getBindings(LanguageInfo.ID)
     .invokeMember(MethodNames.TopScope.LEAK_CONTEXT)
     .asHostObject[EnsoContext]()
diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/semantic/TypeSignaturesTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/semantic/TypeSignaturesTest.scala
index 375c89125004..fe4384a6de51 100644
--- a/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/semantic/TypeSignaturesTest.scala
+++ b/engine/runtime-integration-tests/src/test/scala/org/enso/compiler/test/semantic/TypeSignaturesTest.scala
@@ -130,7 +130,8 @@ class TypeSignaturesTest
     with TypeMatchers {
 
   private val ctx = new InterpreterContext()
-  private val langCtx = ctx.ctx
+  private val langCtx = ctx
+    .ctx()
     .getBindings(LanguageInfo.ID)
     .invokeMember(MethodNames.TopScope.LEAK_CONTEXT)
     .asHostObject[EnsoContext]()
diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/InterpreterTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/InterpreterTest.scala
index 5a0e5613df65..08a896f9aa78 100644
--- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/InterpreterTest.scala
+++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/InterpreterTest.scala
@@ -15,7 +15,6 @@ import org.enso.polyglot.debugger.{
 }
 import org.enso.common.LanguageInfo
 import org.enso.common.RuntimeOptions
-
 import org.enso.polyglot.{Function, PolyglotContext}
 import org.graalvm.polyglot.{Context, Value}
 import org.scalatest.Assertions
@@ -28,7 +27,7 @@ import java.io.{
   PipedOutputStream,
   PrintStream
 }
-import java.nio.file.Paths
+import java.nio.file.{Path, Paths}
 import java.util.UUID
 import java.util.logging.Level
 
@@ -104,43 +103,101 @@ class ReplaceableSessionManager extends SessionManager {
 class InterpreterContext(
   contextModifiers: Context#Builder => Context#Builder = bldr => bldr
 ) {
-  val output         = new ByteArrayOutputStream()
-  val err            = new ByteArrayOutputStream()
-  val inOut          = new PipedOutputStream()
-  val inOutPrinter   = new PrintStream(inOut, true)
-  val in             = new PipedInputStream(inOut)
-  val sessionManager = new ReplaceableSessionManager
-
-  val languageHome = Paths
-    .get("../../test/micro-distribution/component")
-    .toFile
-    .getAbsolutePath
-  val edition = "0.0.0-dev"
-
-  val ctx = contextModifiers(
-    Context
-      .newBuilder(LanguageInfo.ID)
-      .allowExperimentalOptions(true)
-      .allowAllAccess(true)
-      .allowCreateThread(false)
-      .out(output)
-      .err(err)
-      .option(RuntimeOptions.LOG_LEVEL, Level.WARNING.getName())
-      .option(RuntimeOptions.DISABLE_IR_CACHES, "true")
-      .option(RuntimeOptions.STRICT_ERRORS, "false")
-      .environment("NO_COLOR", "true")
-      .logHandler(System.err)
-      .in(in)
-      .option(RuntimeOptions.LANGUAGE_HOME_OVERRIDE, languageHome)
-      .option(RuntimeOptions.EDITION_OVERRIDE, edition)
-      .option("engine.WarnInterpreterOnly", "false")
-      .serverTransport { (uri, peer) =>
-        if (uri.toString == DebugServerInfo.URI) {
-          new DebuggerSessionManagerEndpoint(sessionManager, peer)
-        } else null
-      }
-  ).build()
-  lazy val executionContext = new PolyglotContext(ctx)
+  var _ctx: Context                              = _
+  var _err: ByteArrayOutputStream                = _
+  var _output: ByteArrayOutputStream             = new ByteArrayOutputStream()
+  var _in: PipedInputStream                      = _
+  var _inOut: PipedOutputStream                  = _
+  var _inOutPrinter: PrintStream                 = _
+  var _sessionManager: ReplaceableSessionManager = new ReplaceableSessionManager
+  var _languageHome: Path                        = _
+  val edition                                    = "0.0.0-dev"
+  def ctx(): Context = {
+    if (_ctx == null) {
+      _output       = new ByteArrayOutputStream()
+      _err          = new ByteArrayOutputStream()
+      _inOut        = new PipedOutputStream()
+      _inOutPrinter = new PrintStream(_inOut, true)
+      _in           = new PipedInputStream(_inOut)
+
+      _languageHome = Paths
+        .get("../../test/micro-distribution/component")
+
+      _ctx = contextModifiers(
+        Context
+          .newBuilder(LanguageInfo.ID)
+          .allowExperimentalOptions(true)
+          .allowAllAccess(true)
+          .allowCreateThread(false)
+          .out(_output)
+          .err(_err)
+          .option(RuntimeOptions.LOG_LEVEL, Level.WARNING.getName())
+          .option(RuntimeOptions.DISABLE_IR_CACHES, "true")
+          .option(RuntimeOptions.STRICT_ERRORS, "false")
+          .environment("NO_COLOR", "true")
+          .logHandler(System.err)
+          .in(_in)
+          .option(
+            RuntimeOptions.LANGUAGE_HOME_OVERRIDE,
+            _languageHome.toFile.getAbsolutePath
+          )
+          .option(RuntimeOptions.EDITION_OVERRIDE, edition)
+          .option("engine.WarnInterpreterOnly", "false")
+          .serverTransport { (uri, peer) =>
+            if (uri.toString == DebugServerInfo.URI) {
+              new DebuggerSessionManagerEndpoint(_sessionManager, peer)
+            } else null
+          }
+      ).build()
+    }
+    _ctx
+  }
+
+  def err(): ByteArrayOutputStream = {
+    assert(_ctx != null)
+    _err
+  }
+
+  def output(): ByteArrayOutputStream = {
+    _output
+  }
+
+  def in(): PipedInputStream = {
+    assert(_ctx != null)
+    _in
+  }
+
+  def inOut(): PipedOutputStream = {
+    assert(_ctx != null)
+    _inOut;
+  }
+
+  def inOutPrinter(): PrintStream = {
+    assert(_ctx != null)
+    _inOutPrinter
+  }
+
+  def sessionManager(): ReplaceableSessionManager = {
+    _sessionManager
+  }
+
+  def languageHome(): Path = {
+    assert(_ctx != null)
+    _languageHome
+  }
+
+  def close(): Unit = {
+    if (_ctx != null) {
+      _ctx.close()
+      _ctx = null
+    }
+
+    _output.reset()
+    if (_err != null) _err.close()
+    if (_in != null) _in.close()
+    if (_inOut != null) _inOut.close()
+  }
+  lazy val executionContext = new PolyglotContext(ctx())
 }
 
 trait InterpreterRunner {
@@ -154,7 +211,10 @@ trait InterpreterRunner {
   def withLocationsInstrumenter(
     test: LocationsInstrumenter => Unit
   )(implicit interpreterContext: InterpreterContext): Unit = {
-    val instrument = interpreterContext.ctx.getEngine.getInstruments
+    val instrument = interpreterContext
+      .ctx()
+      .getEngine
+      .getInstruments
       .get(CodeLocationsTestInstrument.INSTRUMENT_ID)
       .lookup(classOf[CodeLocationsTestInstrument])
     val instrumenter = LocationsInstrumenter(instrument)
@@ -166,7 +226,10 @@ trait InterpreterRunner {
   def withIdsInstrumenter(
     test: IdsInstrumenter => Unit
   )(implicit interpreterContext: InterpreterContext): Unit = {
-    val instrument = interpreterContext.ctx.getEngine.getInstruments
+    val instrument = interpreterContext
+      .ctx()
+      .getEngine
+      .getInstruments
       .get(CodeIdsTestInstrument.INSTRUMENT_ID)
       .lookup(classOf[CodeIdsTestInstrument])
     val instrumenter = IdsInstrumenter(instrument)
@@ -185,7 +248,7 @@ trait InterpreterRunner {
   def getMain(
     code: String
   )(implicit interpreterContext: InterpreterContext): MainMethod = {
-    interpreterContext.output.reset()
+    interpreterContext.output().reset()
     val module = InterpreterException.rethrowPolyglot(
       interpreterContext.executionContext.evalModule(code, "Test")
     )
@@ -206,52 +269,52 @@ trait InterpreterRunner {
   def consumeErr(implicit
     interpreterContext: InterpreterContext
   ): List[String] = {
-    val result = interpreterContext.err.toString
-    interpreterContext.err.reset()
+    val result = interpreterContext.err().toString
+    interpreterContext.err().reset()
     result.linesIterator.toList
   }
 
   def consumeErrBytes(implicit
     interpreterContext: InterpreterContext
   ): Array[Byte] = {
-    val result = interpreterContext.err.toByteArray
-    interpreterContext.err.reset()
+    val result = interpreterContext.err().toByteArray
+    interpreterContext.err().reset()
     result
   }
 
   def consumeOut(implicit
     interpreterContext: InterpreterContext
   ): List[String] = {
-    val result = interpreterContext.output.toString
-    interpreterContext.output.reset()
+    val result = interpreterContext.output().toString
+    interpreterContext.output().reset()
     result.linesIterator.toList
   }
 
   def consumeOutBytes(implicit
     interpreterContext: InterpreterContext
   ): Array[Byte] = {
-    val result = interpreterContext.output.toByteArray
-    interpreterContext.output.reset()
+    val result = interpreterContext.output().toByteArray
+    interpreterContext.output().reset()
     result
   }
 
   def feedInput(
     string: String
   )(implicit interpreterContext: InterpreterContext): Unit = {
-    interpreterContext.inOutPrinter.println(string)
+    interpreterContext.inOutPrinter().println(string)
   }
 
   def feedBytes(
     input: Array[Byte]
   )(implicit interpreterContext: InterpreterContext): Unit = {
-    interpreterContext.inOut.write(input)
-    interpreterContext.inOut.flush()
+    interpreterContext.inOut().write(input)
+    interpreterContext.inOut().flush()
   }
 
   def setSessionManager(
     manager: SessionManager
   )(implicit interpreterContext: InterpreterContext): Unit =
-    interpreterContext.sessionManager.setSessionManager(manager)
+    interpreterContext.sessionManager().setSessionManager(manager)
 
   // For Enso raw text blocks inside scala multiline strings
   val rawTQ = "\"\"\""
diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeServerTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeServerTest.scala
index 556864a8aba0..ba035d973aac 100644
--- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeServerTest.scala
+++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/instrument/RuntimeServerTest.scala
@@ -36,7 +36,7 @@ class RuntimeServerTest
 
     val out: ByteArrayOutputStream    = new ByteArrayOutputStream()
     val logOut: ByteArrayOutputStream = new ByteArrayOutputStream()
-    val context =
+    protected val context =
       Context
         .newBuilder(LanguageInfo.ID)
         .allowExperimentalOptions(true)
diff --git a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/semantic/RuntimeManagementTest.scala b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/semantic/RuntimeManagementTest.scala
index c77e736ccb52..876b42ab20ee 100644
--- a/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/semantic/RuntimeManagementTest.scala
+++ b/engine/runtime-integration-tests/src/test/scala/org/enso/interpreter/test/semantic/RuntimeManagementTest.scala
@@ -15,7 +15,8 @@ class RuntimeManagementTest extends InterpreterTest {
   ): Unit = {
 
     "Interrupt threads through Thread#interrupt()" in {
-      val langCtx = interpreterContext.ctx
+      val langCtx = interpreterContext
+        .ctx()
         .getBindings(LanguageInfo.ID)
         .invokeMember(MethodNames.TopScope.LEAK_CONTEXT)
         .asHostObject[EnsoContext]()
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/EnsoContext.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/EnsoContext.java
index 64d651f9b10e..be434fb65b59 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/EnsoContext.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/EnsoContext.java
@@ -290,6 +290,10 @@ public void shutdown() {
     threadManager.shutdown();
     resourceManager.shutdown();
     compiler.shutdown(shouldWaitForPendingSerializationJobs);
+    packageRepository.shutdown();
+    guestJava = null;
+    topScope = null;
+    hostClassLoader.close();
   }
 
   private boolean shouldAssertionsBeEnabled() {
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/HostClassLoader.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/HostClassLoader.java
index 8a8886809865..7a428b1fa2aa 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/HostClassLoader.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/HostClassLoader.java
@@ -17,7 +17,7 @@
  * the classes that are loaded via this class loader are first searched inside those archives. If
  * not found, delegates to parent class loaders.
  */
-final class HostClassLoader extends URLClassLoader {
+final class HostClassLoader extends URLClassLoader implements AutoCloseable {
 
   private final Map<String, Class<?>> loadedClasses = new ConcurrentHashMap<>();
   private static final Logger logger = LoggerFactory.getLogger(HostClassLoader.class);
@@ -84,4 +84,9 @@ public Enumeration<URL> findResources(String name) throws IOException {
       return super.findResources(name);
     }
   }
+
+  @Override
+  public void close() {
+    loadedClasses.clear();
+  }
 }
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/SerializationPool.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/SerializationPool.java
index d8f607033654..6d8a6233af30 100644
--- a/engine/runtime/src/main/java/org/enso/interpreter/runtime/SerializationPool.java
+++ b/engine/runtime/src/main/java/org/enso/interpreter/runtime/SerializationPool.java
@@ -121,6 +121,7 @@ void shutdown(boolean waitForPendingJobCompletion) throws InterruptedException {
         t.join();
       }
       context.logSerializationManager(Level.FINE, "Serialization manager has been shut down.");
+      threads.clear();
     }
   }
 
diff --git a/engine/runtime/src/main/scala/org/enso/interpreter/runtime/DefaultPackageRepository.scala b/engine/runtime/src/main/scala/org/enso/interpreter/runtime/DefaultPackageRepository.scala
index 5c7773944f54..e1d571cb3131 100644
--- a/engine/runtime/src/main/scala/org/enso/interpreter/runtime/DefaultPackageRepository.scala
+++ b/engine/runtime/src/main/scala/org/enso/interpreter/runtime/DefaultPackageRepository.scala
@@ -610,6 +610,13 @@ private class DefaultPackageRepository(
       }
     else Failure(PackageManager.PackageNotFound())
   }
+
+  override def shutdown(): Unit = {
+    loadedPackages.clear()
+    loadedModules.clear()
+    loadedComponents.clear()
+    loadedLibraryBindings.clear()
+  }
 }
 
 private object DefaultPackageRepository {

From b1958f8aa307ffac61b5a8c1c4073165ee8aba03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Wa=C5=9Bko?= <radoslaw.wasko@enso.org>
Date: Tue, 13 Aug 2024 10:53:39 +0200
Subject: [PATCH 18/23] Adding vectorized implementations to some Column
 operations (#10795)

- Part of #6256 - implements operations that could have been vectorized without changes to the overall infrastructure
---
 .../Examples/0.0.0-dev/data/.gitignore        |   1 +
 .../Standard/Table/0.0.0-dev/src/Column.enso  |   7 +-
 .../Standard/Test/0.0.0-dev/src/Bench.enso    |   7 +-
 .../bool/GenericBinaryOpReturningBoolean.java | 152 ++++
 .../TimeLikeBinaryOpReturningBoolean.java     |  26 +
 .../datetime/TimeLikeCoalescingOperation.java |  95 +++
 .../map/numeric/arithmetic/MaxOp.java         |  36 +
 .../map/numeric/arithmetic/MinOp.java         |  36 +
 .../arithmetic/NumericBinaryOpCoalescing.java | 274 +++++++
 .../NumericBinaryOpImplementation.java        |   5 +-
 .../helpers/BigDecimalArrayAdapter.java       |  14 +
 .../helpers/BigIntegerArrayAdapter.java       |  14 +
 .../numeric/helpers/DoubleArrayAdapter.java   |  15 +
 .../map/text/CoalescingStringStringOp.java    |  81 ++
 .../operation/map/text/StringBooleanOp.java   |   6 +-
 .../operation/unary/IsEmptyOperation.java     |   8 +-
 .../operation/unary/IsNaNOperation.java       |   9 +-
 .../column/operation/unary/NotOperation.java  |   6 +-
 .../data/column/storage/BoolStorage.java      | 718 +++++++++++++-----
 .../column/storage/SpecializedStorage.java    |  13 +
 .../table/data/column/storage/Storage.java    |   2 +
 .../data/column/storage/StringStorage.java    |  73 ++
 .../column/storage/datetime/DateStorage.java  |  81 ++
 .../storage/datetime/DateTimeStorage.java     |  80 ++
 .../storage/datetime/TimeOfDayStorage.java    |  80 ++
 .../storage/numeric/AbstractLongStorage.java  |   4 +
 .../storage/numeric/BigDecimalStorage.java    |   4 +
 .../storage/numeric/BigIntegerStorage.java    |   4 +
 .../column/storage/numeric/DoubleStorage.java |   9 +
 .../table/error/UnexpectedTypeException.java  |   5 +
 test/Benchmarks/src/Main.enso                 |  13 +-
 .../src/Table/Column_Comparisons.enso         | 110 +++
 test/Benchmarks/src/Table/Csv.enso            |   6 +-
 .../src/Table/Mixed_Operations.enso           |  35 +
 .../Column_Operations_Spec.enso               |  54 +-
 test/Table_Tests/src/In_Memory/Bool_Spec.enso |  97 +++
 test/Table_Tests/src/In_Memory/Main.enso      |   2 +
 37 files changed, 1966 insertions(+), 216 deletions(-)
 create mode 100644 distribution/lib/Standard/Examples/0.0.0-dev/data/.gitignore
 create mode 100644 std-bits/table/src/main/java/org/enso/table/data/column/operation/map/bool/GenericBinaryOpReturningBoolean.java
 create mode 100644 std-bits/table/src/main/java/org/enso/table/data/column/operation/map/datetime/TimeLikeBinaryOpReturningBoolean.java
 create mode 100644 std-bits/table/src/main/java/org/enso/table/data/column/operation/map/datetime/TimeLikeCoalescingOperation.java
 create mode 100644 std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/arithmetic/MaxOp.java
 create mode 100644 std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/arithmetic/MinOp.java
 create mode 100644 std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/arithmetic/NumericBinaryOpCoalescing.java
 create mode 100644 std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/CoalescingStringStringOp.java
 create mode 100644 test/Benchmarks/src/Table/Column_Comparisons.enso
 create mode 100644 test/Benchmarks/src/Table/Mixed_Operations.enso
 create mode 100644 test/Table_Tests/src/In_Memory/Bool_Spec.enso

diff --git a/distribution/lib/Standard/Examples/0.0.0-dev/data/.gitignore b/distribution/lib/Standard/Examples/0.0.0-dev/data/.gitignore
new file mode 100644
index 000000000000..ecfb2241eb0a
--- /dev/null
+++ b/distribution/lib/Standard/Examples/0.0.0-dev/data/.gitignore
@@ -0,0 +1 @@
+data_2500_rows.csv
diff --git a/distribution/lib/Standard/Table/0.0.0-dev/src/Column.enso b/distribution/lib/Standard/Table/0.0.0-dev/src/Column.enso
index e1bf71a05a08..cd090649e23f 100644
--- a/distribution/lib/Standard/Table/0.0.0-dev/src/Column.enso
+++ b/distribution/lib/Standard/Table/0.0.0-dev/src/Column.enso
@@ -992,8 +992,11 @@ type Column
              example_coalesce = Examples.decimal_column.coalesce Examples.integer_column
     coalesce : (Any | Vector Any) -> Column
     coalesce self values =
-        fallback a b = a.if_nothing b
-        run_vectorized_many_op self "coalesce" fallback values
+        vec = Vector.unify_vector_or_element values
+        new_name = self.naming_helper.function_name "coalesce" [self]+vec
+        result = if values.is_empty then self else
+            values.fold self acc-> v-> acc.fill_nothing v
+        result.rename new_name
 
     ## GROUP Standard.Base.Math
        ICON transform4
diff --git a/distribution/lib/Standard/Test/0.0.0-dev/src/Bench.enso b/distribution/lib/Standard/Test/0.0.0-dev/src/Bench.enso
index 5cf7ad83f53f..09893ac057ae 100644
--- a/distribution/lib/Standard/Test/0.0.0-dev/src/Bench.enso
+++ b/distribution/lib/Standard/Test/0.0.0-dev/src/Bench.enso
@@ -161,8 +161,11 @@ type Bench
         case get_benchmark_report_path of
             Nothing -> Nothing
             path ->
-                line = 'Label,Phase,"Invocations count","Average time (ms)","Time Stdev"'
-                line.write path on_existing_file=Existing_File_Behavior.Backup
+                f = File.new path
+                # Only write the header line if this is the first time writing to this report file.
+                if f.exists.not then
+                    line = 'Label,Phase,"Invocations count","Average time (ms)","Time Stdev"'
+                    line.write f on_existing_file=Existing_File_Behavior.Backup
 
         self.fold Nothing _-> g-> s->
             c = g.configuration
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/bool/GenericBinaryOpReturningBoolean.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/bool/GenericBinaryOpReturningBoolean.java
new file mode 100644
index 000000000000..d6a2c2529a4c
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/bool/GenericBinaryOpReturningBoolean.java
@@ -0,0 +1,152 @@
+package org.enso.table.data.column.operation.map.bool;
+
+import java.util.BitSet;
+import org.enso.table.data.column.operation.map.BinaryMapOperation;
+import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
+import org.enso.table.data.column.storage.BoolStorage;
+import org.enso.table.data.column.storage.SpecializedStorage;
+import org.enso.table.data.column.storage.Storage;
+import org.graalvm.polyglot.Context;
+
+/**
+ * A generic binary operation that takes two values of some type T and returns a boolean.
+ *
+ * <p>If any of the two values is null, the result will also be null.
+ */
+public abstract class GenericBinaryOpReturningBoolean<T, S extends SpecializedStorage<T>>
+    extends BinaryMapOperation<T, S> {
+
+  public GenericBinaryOpReturningBoolean(String name) {
+    super(name);
+  }
+
+  /**
+   * Tries to cast an object to the type T.
+   *
+   * <p>Returns {@code null} if the types are not compatible.
+   */
+  protected abstract T tryCast(Object object);
+
+  protected abstract boolean doOperation(T a, T b);
+
+  protected abstract boolean doOther(T a, Object b);
+
+  @Override
+  public Storage<?> runBinaryMap(
+      S storage, Object arg, MapOperationProblemAggregator problemAggregator) {
+    if (arg == null) {
+      return BoolStorage.makeEmpty(storage.size());
+    } else {
+      T argT = tryCast(arg);
+      if (argT != null) {
+        return runHomogenousMap(storage, argT);
+      } else {
+        return runMixedMap(storage, arg);
+      }
+    }
+  }
+
+  @Override
+  public Storage<?> runZip(
+      S storage, Storage<?> arg, MapOperationProblemAggregator problemAggregator) {
+    assert arg != null;
+    if (storage.getType().equals(arg.getType())
+        && arg instanceof SpecializedStorage<?> argStorage) {
+      SpecializedStorage<T> argTStorage = storage.castIfSameType(argStorage);
+      assert argTStorage != null : "We checked that types are equal so cast should not fail";
+      return runHomogenousZip(storage, argTStorage);
+    } else {
+      return runMixedZip(storage, arg);
+    }
+  }
+
+  private BoolStorage runHomogenousMap(S storage, T arg) {
+    BitSet newVals = new BitSet();
+    BitSet newIsNothing = new BitSet();
+    Context context = Context.getCurrent();
+    int n = storage.size();
+    for (int i = 0; i < n; i++) {
+      if (storage.isNothing(i)) {
+        newIsNothing.set(i);
+      } else {
+        T storageItem = storage.getItemBoxed(i);
+        assert storageItem != null : "isNothing returned true but element was null";
+        boolean r = doOperation(storageItem, arg);
+        newVals.set(i, r);
+      }
+
+      context.safepoint();
+    }
+    return new BoolStorage(newVals, newIsNothing, n, false);
+  }
+
+  private BoolStorage runMixedMap(S storage, Object arg) {
+    BitSet newVals = new BitSet();
+    BitSet newIsNothing = new BitSet();
+    Context context = Context.getCurrent();
+    int n = storage.size();
+    for (int i = 0; i < n; i++) {
+      if (storage.isNothing(i)) {
+        newIsNothing.set(i);
+      } else {
+        T storageItem = storage.getItemBoxed(i);
+        assert storageItem != null : "isNothing returned true but element was null";
+        boolean r = doOther(storageItem, arg);
+        newVals.set(i, r);
+      }
+
+      context.safepoint();
+    }
+    return new BoolStorage(newVals, newIsNothing, n, false);
+  }
+
+  private BoolStorage runHomogenousZip(S storage, SpecializedStorage<T> argStorage) {
+    BitSet newVals = new BitSet();
+    BitSet newIsNothing = new BitSet();
+    Context context = Context.getCurrent();
+    int n = storage.size();
+    int m = argStorage.size();
+    for (int i = 0; i < n; i++) {
+      if (storage.isNothing(i) || !(i < m) || argStorage.isNothing(i)) {
+        newIsNothing.set(i);
+      } else {
+        T storageItem = storage.getItemBoxed(i);
+        T argItem = argStorage.getItemBoxed(i);
+        assert storageItem != null : "isNothing returned true but element was null";
+        assert argItem != null : "isNothing returned true but element was null";
+        boolean r = doOperation(storageItem, argItem);
+        newVals.set(i, r);
+      }
+
+      context.safepoint();
+    }
+
+    return new BoolStorage(newVals, newIsNothing, n, false);
+  }
+
+  private BoolStorage runMixedZip(S storage, Storage<?> argStorage) {
+    BitSet newVals = new BitSet();
+    BitSet newIsNothing = new BitSet();
+    Context context = Context.getCurrent();
+    int n = storage.size();
+    int m = argStorage.size();
+    for (int i = 0; i < n; i++) {
+      if (storage.isNothing(i) || !(i < m) || argStorage.isNothing(i)) {
+        newIsNothing.set(i);
+      } else {
+        T storageItem = storage.getItemBoxed(i);
+        Object argItem = argStorage.getItemBoxed(i);
+        assert storageItem != null : "isNothing returned true but element was null";
+        assert argItem != null : "isNothing returned true but element was null";
+
+        T argT = tryCast(argItem);
+        boolean r = (argT != null) ? doOperation(storageItem, argT) : doOther(storageItem, argItem);
+        newVals.set(i, r);
+      }
+
+      context.safepoint();
+    }
+
+    return new BoolStorage(newVals, newIsNothing, n, false);
+  }
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/datetime/TimeLikeBinaryOpReturningBoolean.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/datetime/TimeLikeBinaryOpReturningBoolean.java
new file mode 100644
index 000000000000..9a74ff791f84
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/datetime/TimeLikeBinaryOpReturningBoolean.java
@@ -0,0 +1,26 @@
+package org.enso.table.data.column.operation.map.datetime;
+
+import org.enso.base.polyglot.Polyglot_Utils;
+import org.enso.table.data.column.operation.map.bool.GenericBinaryOpReturningBoolean;
+import org.enso.table.data.column.storage.SpecializedStorage;
+
+public abstract class TimeLikeBinaryOpReturningBoolean<T>
+    extends GenericBinaryOpReturningBoolean<T, SpecializedStorage<T>> {
+  Class<T> clazz;
+
+  public TimeLikeBinaryOpReturningBoolean(String name, Class<T> objectType) {
+    super(name);
+    this.clazz = objectType;
+  }
+
+  @Override
+  protected T tryCast(Object object) {
+    // We need to adapt date/time values to ensure correct handling of polyglot values.
+    Object adapted = Polyglot_Utils.convertPolyglotValue(object);
+    if (clazz.isInstance(adapted)) {
+      return clazz.cast(adapted);
+    } else {
+      return null;
+    }
+  }
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/datetime/TimeLikeCoalescingOperation.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/datetime/TimeLikeCoalescingOperation.java
new file mode 100644
index 000000000000..c3e251035e78
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/datetime/TimeLikeCoalescingOperation.java
@@ -0,0 +1,95 @@
+package org.enso.table.data.column.operation.map.datetime;
+
+import org.enso.base.polyglot.Polyglot_Utils;
+import org.enso.table.data.column.builder.Builder;
+import org.enso.table.data.column.operation.map.BinaryMapOperation;
+import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
+import org.enso.table.data.column.storage.SpecializedStorage;
+import org.enso.table.data.column.storage.Storage;
+import org.enso.table.error.UnexpectedTypeException;
+import org.graalvm.polyglot.Context;
+
+public abstract class TimeLikeCoalescingOperation<T>
+    extends BinaryMapOperation<T, SpecializedStorage<T>> {
+  private final Class<T> inputTypeClass;
+
+  public TimeLikeCoalescingOperation(String name, Class<T> inputTypeClass) {
+    super(name);
+    this.inputTypeClass = inputTypeClass;
+  }
+
+  protected abstract Builder createOutputBuilder(int size);
+
+  protected abstract T doOperation(T a, T b);
+
+  @Override
+  public Storage<?> runBinaryMap(
+      SpecializedStorage<T> storage, Object arg, MapOperationProblemAggregator problemAggregator) {
+    int size = storage.size();
+    if (arg == null) {
+      return storage;
+    } else {
+      Object adapted = Polyglot_Utils.convertPolyglotValue(arg);
+      if (inputTypeClass.isInstance(adapted)) {
+        T casted = inputTypeClass.cast(adapted);
+        int n = storage.size();
+        Builder builder = createOutputBuilder(n);
+        Context context = Context.getCurrent();
+        for (int i = 0; i < size; i++) {
+          T r = storage.isNothing(i) ? casted : doOperation(storage.getItemBoxed(i), casted);
+          builder.appendNoGrow(r);
+          context.safepoint();
+        }
+
+        return builder.seal();
+      } else {
+        throw new UnexpectedTypeException(
+            "a " + inputTypeClass.getName() + " but got " + arg.getClass().getName());
+      }
+    }
+  }
+
+  @Override
+  public Storage<?> runZip(
+      SpecializedStorage<T> storage,
+      Storage<?> arg,
+      MapOperationProblemAggregator problemAggregator) {
+    if (arg.getType().equals(storage.getType())) {
+      if (arg instanceof SpecializedStorage<?> argStorage) {
+        SpecializedStorage<T> argTStorage = storage.castIfSameType(argStorage);
+        int n = storage.size();
+        Builder builder = createOutputBuilder(n);
+        Context context = Context.getCurrent();
+        for (int i = 0; i < n; i++) {
+          T a = storage.getItemBoxed(i);
+          T b = argTStorage.getItemBoxed(i);
+          T r;
+          if (a == null && b == null) {
+            r = null;
+          } else {
+            if (a == null) {
+              r = b;
+            } else if (b == null) {
+              r = a;
+            } else {
+              r = doOperation(a, b);
+            }
+          }
+
+          builder.appendNoGrow(r);
+          context.safepoint();
+        }
+
+        return builder.seal();
+      } else {
+        throw new IllegalArgumentException(
+            "Unexpected storage implementation for type "
+                + storage.getType()
+                + ": "
+                + arg.getClass().getCanonicalName());
+      }
+    } else {
+      throw new UnexpectedTypeException("a " + storage.getType() + " column");
+    }
+  }
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/arithmetic/MaxOp.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/arithmetic/MaxOp.java
new file mode 100644
index 000000000000..da385141238e
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/arithmetic/MaxOp.java
@@ -0,0 +1,36 @@
+package org.enso.table.data.column.operation.map.numeric.arithmetic;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
+import org.enso.table.data.column.storage.Storage;
+
+public class MaxOp<T extends Number, I extends Storage<? super T>>
+    extends NumericBinaryOpCoalescing<T, I> {
+  public MaxOp() {
+    super(Storage.Maps.MAX);
+  }
+
+  @Override
+  public double doDouble(
+      double a, double b, int ix, MapOperationProblemAggregator problemAggregator) {
+    return Math.max(a, b);
+  }
+
+  @Override
+  public Long doLong(long a, long b, int ix, MapOperationProblemAggregator problemAggregator) {
+    return Math.max(a, b);
+  }
+
+  @Override
+  public BigInteger doBigInteger(
+      BigInteger a, BigInteger b, int ix, MapOperationProblemAggregator problemAggregator) {
+    return a.max(b);
+  }
+
+  @Override
+  public BigDecimal doBigDecimal(
+      BigDecimal a, BigDecimal b, int ix, MapOperationProblemAggregator problemAggregator) {
+    return a.max(b);
+  }
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/arithmetic/MinOp.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/arithmetic/MinOp.java
new file mode 100644
index 000000000000..1dd0b99f78ff
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/arithmetic/MinOp.java
@@ -0,0 +1,36 @@
+package org.enso.table.data.column.operation.map.numeric.arithmetic;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
+import org.enso.table.data.column.storage.Storage;
+
+public class MinOp<T extends Number, I extends Storage<? super T>>
+    extends NumericBinaryOpCoalescing<T, I> {
+  public MinOp() {
+    super(Storage.Maps.MIN);
+  }
+
+  @Override
+  public double doDouble(
+      double a, double b, int ix, MapOperationProblemAggregator problemAggregator) {
+    return Math.min(a, b);
+  }
+
+  @Override
+  public Long doLong(long a, long b, int ix, MapOperationProblemAggregator problemAggregator) {
+    return Math.min(a, b);
+  }
+
+  @Override
+  public BigInteger doBigInteger(
+      BigInteger a, BigInteger b, int ix, MapOperationProblemAggregator problemAggregator) {
+    return a.min(b);
+  }
+
+  @Override
+  public BigDecimal doBigDecimal(
+      BigDecimal a, BigDecimal b, int ix, MapOperationProblemAggregator problemAggregator) {
+    return a.min(b);
+  }
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/arithmetic/NumericBinaryOpCoalescing.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/arithmetic/NumericBinaryOpCoalescing.java
new file mode 100644
index 000000000000..5475a3c59461
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/arithmetic/NumericBinaryOpCoalescing.java
@@ -0,0 +1,274 @@
+package org.enso.table.data.column.operation.map.numeric.arithmetic;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.BitSet;
+import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
+import org.enso.table.data.column.operation.map.numeric.helpers.BigDecimalArrayAdapter;
+import org.enso.table.data.column.operation.map.numeric.helpers.BigIntegerArrayAdapter;
+import org.enso.table.data.column.operation.map.numeric.helpers.DoubleArrayAdapter;
+import org.enso.table.data.column.storage.SpecializedStorage;
+import org.enso.table.data.column.storage.Storage;
+import org.enso.table.data.column.storage.numeric.AbstractLongStorage;
+import org.enso.table.data.column.storage.numeric.BigDecimalStorage;
+import org.enso.table.data.column.storage.numeric.BigIntegerStorage;
+import org.enso.table.data.column.storage.numeric.DoubleStorage;
+import org.enso.table.data.column.storage.numeric.LongStorage;
+import org.graalvm.polyglot.Context;
+
+/**
+ * A variant of NumericBinaryOpImplementation that has different null behaviour: if one of the
+ * values is null, the other non-null value is returned.
+ */
+public abstract class NumericBinaryOpCoalescing<T extends Number, I extends Storage<? super T>>
+    extends NumericBinaryOpImplementation<T, I> {
+  public NumericBinaryOpCoalescing(String name) {
+    super(name);
+  }
+
+  @Override
+  protected DoubleStorage runDoubleZip(
+      DoubleArrayAdapter a, DoubleArrayAdapter b, MapOperationProblemAggregator problemAggregator) {
+    Context context = Context.getCurrent();
+    int n = a.size();
+    int m = Math.min(a.size(), b.size());
+    long[] out = new long[n];
+    BitSet isNothing = new BitSet();
+    for (int i = 0; i < m; i++) {
+      boolean aNothing = a.isNothing(i);
+      boolean bNothing = b.isNothing(i);
+      if (aNothing && bNothing) {
+        isNothing.set(i);
+      } else {
+        double r;
+        if (aNothing) {
+          r = b.getItemAsDouble(i);
+        } else if (bNothing) {
+          r = a.getItemAsDouble(i);
+        } else {
+          r = doDouble(a.getItemAsDouble(i), b.getItemAsDouble(i), i, problemAggregator);
+        }
+        out[i] = Double.doubleToRawLongBits(r);
+      }
+
+      context.safepoint();
+    }
+
+    for (int i = m; i < n; ++i) {
+      if (a.isNothing(i)) {
+        isNothing.set(i);
+      } else {
+        out[i] = Double.doubleToRawLongBits(a.getItemAsDouble(i));
+      }
+
+      context.safepoint();
+    }
+
+    return new DoubleStorage(out, n, isNothing);
+  }
+
+  @Override
+  protected DoubleStorage runDoubleMap(
+      DoubleArrayAdapter a, Double b, MapOperationProblemAggregator problemAggregator) {
+    if (b == null) {
+      return a.intoStorage();
+    }
+
+    double bNonNull = b;
+    Context context = Context.getCurrent();
+    int n = a.size();
+    long[] out = new long[n];
+    BitSet isNothing = new BitSet();
+    for (int i = 0; i < n; i++) {
+      double r =
+          a.isNothing(i)
+              ? bNonNull
+              : doDouble(a.getItemAsDouble(i), bNonNull, i, problemAggregator);
+      out[i] = Double.doubleToRawLongBits(r);
+      context.safepoint();
+    }
+
+    return new DoubleStorage(out, n, isNothing);
+  }
+
+  @Override
+  protected LongStorage runLongZip(
+      AbstractLongStorage a,
+      AbstractLongStorage b,
+      MapOperationProblemAggregator problemAggregator) {
+    Context context = Context.getCurrent();
+    int n = a.size();
+    int m = Math.min(a.size(), b.size());
+    long[] out = new long[n];
+    BitSet isNothing = new BitSet();
+    for (int i = 0; i < m; i++) {
+      boolean aNothing = a.isNothing(i);
+      boolean bNothing = b.isNothing(i);
+      if (aNothing && bNothing) {
+        isNothing.set(i);
+      } else {
+        if (aNothing) {
+          out[i] = b.getItem(i);
+        } else if (bNothing) {
+          out[i] = a.getItem(i);
+        } else {
+          Long r = doLong(a.getItem(i), b.getItem(i), i, problemAggregator);
+          if (r == null) {
+            isNothing.set(i);
+          } else {
+            out[i] = r;
+          }
+        }
+      }
+
+      context.safepoint();
+    }
+
+    for (int i = m; i < n; ++i) {
+      if (a.isNothing(i)) {
+        isNothing.set(i);
+      } else {
+        out[i] = a.getItem(i);
+      }
+
+      context.safepoint();
+    }
+
+    return new LongStorage(out, n, isNothing, INTEGER_RESULT_TYPE);
+  }
+
+  protected Storage<Long> runLongMap(
+      AbstractLongStorage a, Long b, MapOperationProblemAggregator problemAggregator) {
+    if (b == null) {
+      return a;
+    }
+
+    long bNonNull = b;
+    Context context = Context.getCurrent();
+    int n = a.size();
+    long[] out = new long[n];
+    BitSet isNothing = new BitSet();
+    for (int i = 0; i < n; i++) {
+      if (a.isNothing(i)) {
+        out[i] = bNonNull;
+      } else {
+        Long r = doLong(a.getItem(i), bNonNull, i, problemAggregator);
+        if (r == null) {
+          isNothing.set(i);
+        } else {
+          out[i] = r;
+        }
+      }
+
+      context.safepoint();
+    }
+
+    return new LongStorage(out, n, isNothing, INTEGER_RESULT_TYPE);
+  }
+
+  protected BigIntegerStorage runBigIntegerZip(
+      BigIntegerArrayAdapter a,
+      BigIntegerArrayAdapter b,
+      MapOperationProblemAggregator problemAggregator) {
+    Context context = Context.getCurrent();
+    int n = a.size();
+    int m = Math.min(a.size(), b.size());
+    BigInteger[] out = new BigInteger[n];
+    for (int i = 0; i < m; i++) {
+      BigInteger x = a.getItem(i);
+      BigInteger y = b.getItem(i);
+      if (x == null && y == null) {
+        out[i] = null;
+      } else {
+        if (x == null) {
+          out[i] = y;
+        } else if (y == null) {
+          out[i] = x;
+        } else {
+          BigInteger r = doBigInteger(x, y, i, problemAggregator);
+          out[i] = r;
+        }
+      }
+      context.safepoint();
+    }
+
+    return new BigIntegerStorage(out, n);
+  }
+
+  protected BigIntegerStorage runBigIntegerMap(
+      BigIntegerArrayAdapter a, BigInteger b, MapOperationProblemAggregator problemAggregator) {
+    if (b == null) {
+      return a.intoStorage();
+    }
+
+    Context context = Context.getCurrent();
+    int n = a.size();
+    BigInteger[] out = new BigInteger[n];
+    for (int i = 0; i < n; i++) {
+      BigInteger x = a.getItem(i);
+      if (x == null) {
+        out[i] = b;
+      } else {
+        BigInteger r = doBigInteger(x, b, i, problemAggregator);
+        out[i] = r;
+      }
+
+      context.safepoint();
+    }
+
+    return new BigIntegerStorage(out, n);
+  }
+
+  protected BigDecimalStorage runBigDecimalZip(
+      BigDecimalArrayAdapter a,
+      BigDecimalArrayAdapter b,
+      MapOperationProblemAggregator problemAggregator) {
+    Context context = Context.getCurrent();
+    int n = a.size();
+    int m = Math.min(a.size(), b.size());
+    BigDecimal[] out = new BigDecimal[n];
+    for (int i = 0; i < m; i++) {
+      BigDecimal x = a.getItem(i);
+      BigDecimal y = b.getItem(i);
+      if (x == null && y == null) {
+        out[i] = null;
+      } else {
+        if (x == null) {
+          out[i] = y;
+        } else if (y == null) {
+          out[i] = x;
+        } else {
+          BigDecimal r = doBigDecimal(x, y, i, problemAggregator);
+          out[i] = r;
+        }
+      }
+      context.safepoint();
+    }
+
+    return new BigDecimalStorage(out, n);
+  }
+
+  protected SpecializedStorage<BigDecimal> runBigDecimalMap(
+      BigDecimalArrayAdapter a, BigDecimal b, MapOperationProblemAggregator problemAggregator) {
+    if (b == null) {
+      return a.intoStorage();
+    }
+
+    Context context = Context.getCurrent();
+    int n = a.size();
+    BigDecimal[] out = new BigDecimal[n];
+    for (int i = 0; i < n; i++) {
+      BigDecimal x = a.getItem(i);
+      if (x == null) {
+        out[i] = b;
+      } else {
+        BigDecimal r = doBigDecimal(x, b, i, problemAggregator);
+        out[i] = r;
+      }
+
+      context.safepoint();
+    }
+
+    return new BigDecimalStorage(out, n);
+  }
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/arithmetic/NumericBinaryOpImplementation.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/arithmetic/NumericBinaryOpImplementation.java
index d57f5c1bfac0..c87e3b26c41f 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/arithmetic/NumericBinaryOpImplementation.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/arithmetic/NumericBinaryOpImplementation.java
@@ -11,6 +11,7 @@
 import org.enso.table.data.column.operation.map.numeric.helpers.BigDecimalArrayAdapter;
 import org.enso.table.data.column.operation.map.numeric.helpers.BigIntegerArrayAdapter;
 import org.enso.table.data.column.operation.map.numeric.helpers.DoubleArrayAdapter;
+import org.enso.table.data.column.storage.SpecializedStorage;
 import org.enso.table.data.column.storage.Storage;
 import org.enso.table.data.column.storage.numeric.AbstractLongStorage;
 import org.enso.table.data.column.storage.numeric.BigDecimalStorage;
@@ -247,7 +248,7 @@ protected LongStorage runLongZip(
     return new LongStorage(out, n, isNothing, INTEGER_RESULT_TYPE);
   }
 
-  protected LongStorage runLongMap(
+  protected Storage<Long> runLongMap(
       AbstractLongStorage a, Long b, MapOperationProblemAggregator problemAggregator) {
     if (b == null) {
       return LongStorage.makeEmpty(a.size(), INTEGER_RESULT_TYPE);
@@ -338,7 +339,7 @@ protected BigDecimalStorage runBigDecimalZip(
     return new BigDecimalStorage(out, n);
   }
 
-  protected BigDecimalStorage runBigDecimalMap(
+  protected SpecializedStorage<BigDecimal> runBigDecimalMap(
       BigDecimalArrayAdapter a, BigDecimal b, MapOperationProblemAggregator problemAggregator) {
     Context context = Context.getCurrent();
     int n = a.size();
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/BigDecimalArrayAdapter.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/BigDecimalArrayAdapter.java
index 88f8f6e1bd26..112c53582345 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/BigDecimalArrayAdapter.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/BigDecimalArrayAdapter.java
@@ -13,6 +13,15 @@ public interface BigDecimalArrayAdapter {
 
   int size();
 
+  default SpecializedStorage<BigDecimal> intoStorage() {
+    int n = size();
+    BigDecimal[] values = new BigDecimal[n];
+    for (int i = 0; i < n; i++) {
+      values[i] = getItem(i);
+    }
+    return new BigDecimalStorage(values, n);
+  }
+
   static BigDecimalArrayAdapter fromStorage(SpecializedStorage<BigDecimal> storage) {
     return new BigDecimalStorageAsBigDecimal(storage);
   }
@@ -56,6 +65,11 @@ public BigDecimal getItem(int i) {
     public int size() {
       return storage.size();
     }
+
+    @Override
+    public SpecializedStorage<BigDecimal> intoStorage() {
+      return storage;
+    }
   }
 
   class BigIntegerStorageAsBigDecimal implements BigDecimalArrayAdapter {
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/BigIntegerArrayAdapter.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/BigIntegerArrayAdapter.java
index 2d6032791dbe..76cd8611e321 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/BigIntegerArrayAdapter.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/BigIntegerArrayAdapter.java
@@ -9,6 +9,15 @@ public interface BigIntegerArrayAdapter {
 
   int size();
 
+  default BigIntegerStorage intoStorage() {
+    int n = size();
+    BigInteger[] values = new BigInteger[n];
+    for (int i = 0; i < n; i++) {
+      values[i] = getItem(i);
+    }
+    return new BigIntegerStorage(values, n);
+  }
+
   static BigIntegerArrayAdapter fromStorage(BigIntegerStorage storage) {
     return new BigIntegerStorageAsBigInteger(storage);
   }
@@ -33,6 +42,11 @@ public BigInteger getItem(int i) {
     public int size() {
       return storage.size();
     }
+
+    @Override
+    public BigIntegerStorage intoStorage() {
+      return storage;
+    }
   }
 
   class LongStorageAsBigInteger implements BigIntegerArrayAdapter {
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/DoubleArrayAdapter.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/DoubleArrayAdapter.java
index 1807659058bd..87e8533b8a17 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/DoubleArrayAdapter.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/numeric/helpers/DoubleArrayAdapter.java
@@ -2,6 +2,7 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.BitSet;
 import org.enso.table.data.column.storage.Storage;
 import org.enso.table.data.column.storage.numeric.AbstractLongStorage;
 import org.enso.table.data.column.storage.numeric.BigDecimalStorage;
@@ -15,6 +16,20 @@ public interface DoubleArrayAdapter {
 
   int size();
 
+  default DoubleStorage intoStorage() {
+    int n = size();
+    long[] values = new long[n];
+    BitSet isNothing = new BitSet();
+    for (int i = 0; i < n; i++) {
+      if (isNothing(i)) {
+        isNothing.set(i);
+      } else {
+        values[i] = Double.doubleToRawLongBits(getItemAsDouble(i));
+      }
+    }
+    return new DoubleStorage(values, n, isNothing);
+  }
+
   static DoubleArrayAdapter fromStorage(BigIntegerStorage storage) {
     return new BigIntegerStorageAsDouble(storage);
   }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/CoalescingStringStringOp.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/CoalescingStringStringOp.java
new file mode 100644
index 000000000000..e81514717c98
--- /dev/null
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/CoalescingStringStringOp.java
@@ -0,0 +1,81 @@
+package org.enso.table.data.column.operation.map.text;
+
+import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
+import org.enso.table.data.column.storage.SpecializedStorage;
+import org.enso.table.data.column.storage.Storage;
+import org.enso.table.data.column.storage.StringStorage;
+import org.enso.table.data.column.storage.type.TextType;
+import org.enso.table.error.UnexpectedTypeException;
+import org.graalvm.polyglot.Context;
+
+public abstract class CoalescingStringStringOp extends StringStringOp {
+  public CoalescingStringStringOp(String name) {
+    super(name);
+  }
+
+  @Override
+  public Storage<?> runBinaryMap(
+      SpecializedStorage<String> storage,
+      Object arg,
+      MapOperationProblemAggregator problemAggregator) {
+    int size = storage.size();
+    if (arg == null) {
+      return storage;
+    } else if (arg instanceof String argString) {
+      String[] newVals = new String[size];
+      Context context = Context.getCurrent();
+      for (int i = 0; i < size; i++) {
+        if (storage.isNothing(i)) {
+          newVals[i] = argString;
+        } else {
+          newVals[i] = doString(storage.getItem(i), argString);
+        }
+
+        context.safepoint();
+      }
+
+      TextType argumentType = TextType.preciseTypeForValue(argString);
+      TextType newType = computeResultType((TextType) storage.getType(), argumentType);
+      return new StringStorage(newVals, size, newType);
+    } else {
+      throw new UnexpectedTypeException("a Text");
+    }
+  }
+
+  @Override
+  public Storage<?> runZip(
+      SpecializedStorage<String> storage,
+      Storage<?> arg,
+      MapOperationProblemAggregator problemAggregator) {
+    if (arg instanceof StringStorage v) {
+      int size = storage.size();
+      String[] newVals = new String[size];
+      Context context = Context.getCurrent();
+      for (int i = 0; i < size; i++) {
+        String a = storage.getItem(i);
+        String b = v.getItem(i);
+        String r;
+        if (a == null && b == null) {
+          r = null;
+        } else {
+          if (a == null) {
+            r = b;
+          } else if (b == null) {
+            r = a;
+          } else {
+            r = doString(a, b);
+          }
+        }
+
+        newVals[i] = r;
+
+        context.safepoint();
+      }
+
+      TextType newType = computeResultType((TextType) storage.getType(), v.getType());
+      return new StringStorage(newVals, size, newType);
+    } else {
+      throw new UnexpectedTypeException("a Text column");
+    }
+  }
+}
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/StringBooleanOp.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/StringBooleanOp.java
index 10dcad687de5..c4cd9d982b0d 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/StringBooleanOp.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/map/text/StringBooleanOp.java
@@ -19,7 +19,7 @@ public StringBooleanOp(String name) {
   protected abstract boolean doString(String a, String b);
 
   protected boolean doObject(String a, Object o) {
-    throw new UnexpectedTypeException("a Text");
+    throw new UnexpectedTypeException("a Text", o.toString());
   }
 
   @Override
@@ -90,8 +90,8 @@ public BoolStorage runZip(
       for (int i = 0; i < storage.size(); i++) {
         if (!storage.isNothing(i) && i < arg.size() && !arg.isNothing(i)) {
           Object x = arg.getItemBoxed(i);
-          if (x instanceof String) {
-            if (doString(storage.getItem(i), (String) x)) {
+          if (x instanceof String str) {
+            if (doString(storage.getItem(i), str)) {
               newVals.set(i);
             }
           } else {
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/IsEmptyOperation.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/IsEmptyOperation.java
index cf8af70b59dd..ce9c3a3f0f18 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/IsEmptyOperation.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/IsEmptyOperation.java
@@ -4,6 +4,7 @@
 import org.enso.table.data.column.operation.UnaryOperation;
 import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
 import org.enso.table.data.column.storage.ColumnStorage;
+import org.enso.table.data.column.storage.type.AnyObjectType;
 import org.enso.table.data.column.storage.type.TextType;
 
 /* An operation that checks if a column's row values are empty.
@@ -19,7 +20,9 @@ private IsEmptyOperation() {
 
   @Override
   public boolean canApply(ColumnStorage storage) {
-    return storage.getType() instanceof TextType;
+    var type = storage.getType();
+    // We also allow this operation on Mixed type to facilitate `internal_is_empty` helper.
+    return type instanceof TextType || type instanceof AnyObjectType;
   }
 
   @Override
@@ -31,8 +34,7 @@ protected void applyObjectRow(
       if (value instanceof String s) {
         builder.appendBoolean(s.isEmpty());
       } else {
-        throw new IllegalArgumentException(
-            "Unsupported type: " + value.getClass() + " (expected text type).");
+        builder.appendBoolean(false);
       }
     }
   }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/IsNaNOperation.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/IsNaNOperation.java
index a7738f718929..7e48656dc24a 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/IsNaNOperation.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/IsNaNOperation.java
@@ -10,6 +10,7 @@
 import org.enso.table.data.column.storage.ColumnLongStorage;
 import org.enso.table.data.column.storage.ColumnStorage;
 import org.enso.table.data.column.storage.ColumnStorageWithNothingMap;
+import org.enso.table.data.column.storage.type.AnyObjectType;
 
 public class IsNaNOperation extends AbstractUnaryBooleanOperation {
   public static final String NAME = "is_nan";
@@ -21,7 +22,9 @@ private IsNaNOperation() {
 
   @Override
   public boolean canApply(ColumnStorage storage) {
-    return storage.getType().isNumeric();
+    var type = storage.getType();
+    // We also allow this operation on Mixed type to facilitate `internal_is_nan` helper.
+    return type.isNumeric() || type instanceof AnyObjectType;
   }
 
   @Override
@@ -67,9 +70,7 @@ protected void applyObjectRow(
     switch (value) {
       case Double d -> builder.appendBoolean(Double.isNaN(d));
       case Float f -> builder.appendBoolean(Float.isNaN(f));
-      case Number ignored -> builder.appendBoolean(false);
-      default -> throw new IllegalArgumentException(
-          "Unsupported type: " + value.getClass() + " (expected numeric type).");
+      default -> builder.appendBoolean(false);
     }
   }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/NotOperation.java b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/NotOperation.java
index 0d51e196903a..124ddb87893b 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/NotOperation.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/operation/unary/NotOperation.java
@@ -26,11 +26,7 @@ public boolean canApply(ColumnStorage storage) {
   public ColumnStorage apply(
       ColumnStorage storage, MapOperationProblemAggregator problemAggregator) {
     if (storage instanceof BoolStorage boolStorage) {
-      return new BoolStorage(
-          boolStorage.getValues(),
-          boolStorage.getIsNothingMap(),
-          boolStorage.size(),
-          !boolStorage.isNegated());
+      return boolStorage.makeNegated();
     }
 
     var builder = createBuilder(storage, problemAggregator);
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/BoolStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/BoolStorage.java
index ea504b0ef43d..ab5184eb0441 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/BoolStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/BoolStorage.java
@@ -3,12 +3,14 @@
 import java.util.BitSet;
 import java.util.List;
 import java.util.function.IntFunction;
+import org.enso.base.CompareException;
 import org.enso.base.polyglot.Polyglot_Utils;
 import org.enso.table.data.column.builder.Builder;
 import org.enso.table.data.column.operation.map.BinaryMapOperation;
 import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
 import org.enso.table.data.column.operation.map.MapOperationStorage;
 import org.enso.table.data.column.operation.map.bool.BooleanIsInOp;
+import org.enso.table.data.column.storage.type.AnyObjectType;
 import org.enso.table.data.column.storage.type.BooleanType;
 import org.enso.table.data.column.storage.type.StorageType;
 import org.enso.table.data.mask.OrderMask;
@@ -46,6 +48,10 @@ public static BoolStorage makeConstant(int size, boolean r) {
     return new BoolStorage(new BitSet(), new BitSet(), size, r);
   }
 
+  public BoolStorage makeNegated() {
+    return new BoolStorage(values, isNothing, size, !negated);
+  }
+
   @Override
   public int size() {
     return size;
@@ -98,7 +104,7 @@ public BitSet getValues() {
    * accordingly. If `arg` is true, new values are `values || isMissing` and if `arg` is false, new
    * values are `values && (~isMissing)`.
    */
-  private Storage<?> fillMissingBoolean(boolean arg) {
+  private BoolStorage fillMissingBoolean(boolean arg) {
     final var newValues = (BitSet) values.clone();
     if (arg != negated) {
       newValues.or(isNothing);
@@ -232,203 +238,49 @@ private static IntFunction<Object> makeRowProvider(Value value) {
 
   private static MapOperationStorage<Boolean, BoolStorage> buildOps() {
     MapOperationStorage<Boolean, BoolStorage> ops = new MapOperationStorage<>();
-    ops.add(
-            new BinaryMapOperation<>(Maps.EQ) {
-              @Override
-              public BoolStorage runBinaryMap(
-                  BoolStorage storage,
-                  Object arg,
-                  MapOperationProblemAggregator problemAggregator) {
-                if (arg == null) {
-                  return BoolStorage.makeEmpty(storage.size);
-                } else if (arg instanceof Boolean v) {
-                  if (v) {
-                    return storage;
-                  } else {
-                    return new BoolStorage(
-                        storage.values, storage.isNothing, storage.size, !storage.negated);
-                  }
-                } else {
-                  return new BoolStorage(new BitSet(), storage.isNothing, storage.size, false);
-                }
-              }
-
-              @Override
-              public BoolStorage runZip(
-                  BoolStorage storage,
-                  Storage<?> arg,
-                  MapOperationProblemAggregator problemAggregator) {
-                Context context = Context.getCurrent();
-                BitSet out = new BitSet();
-                BitSet isNothing = new BitSet();
-                for (int i = 0; i < storage.size; i++) {
-                  if (!storage.isNothing(i) && i < arg.size() && !arg.isNothing(i)) {
-                    if (((Boolean) storage.getItem(i)).equals(arg.getItemBoxed(i))) {
-                      out.set(i);
-                    }
-                  } else {
-                    isNothing.set(i);
-                  }
-
-                  context.safepoint();
-                }
-                return new BoolStorage(out, isNothing, storage.size, false);
-              }
-            })
-        .add(
-            new BinaryMapOperation<>(Maps.AND) {
-              @Override
-              public BoolStorage runBinaryMap(
-                  BoolStorage storage,
-                  Object arg,
-                  MapOperationProblemAggregator problemAggregator) {
-                if (arg == null) {
-                  if (storage.negated) {
-                    var newMissing = new BitSet(storage.size);
-                    newMissing.flip(0, storage.size);
-                    newMissing.xor(storage.values);
-                    return new BoolStorage(storage.values, newMissing, storage.size, true);
-                  } else {
-                    var newMissing = storage.isNothing.get(0, storage.size);
-                    newMissing.or(storage.values);
-                    return new BoolStorage(new BitSet(), newMissing, storage.size, false);
-                  }
-                } else if (arg instanceof Boolean v) {
-                  return v
-                      ? storage
-                      : new BoolStorage(new BitSet(), new BitSet(), storage.size, false);
-                } else {
-                  throw new UnexpectedTypeException("a Boolean");
-                }
-              }
-
-              @Override
-              public BoolStorage runZip(
-                  BoolStorage storage,
-                  Storage<?> arg,
-                  MapOperationProblemAggregator problemAggregator) {
-                if (!(arg instanceof BoolStorage v)) {
-                  throw new UnexpectedColumnTypeException("Boolean");
-                }
-
-                BitSet out = v.values.get(0, storage.size);
-                boolean negated;
-                if (storage.negated && v.negated) {
-                  out.or(storage.values);
-                  negated = true;
-                } else if (storage.negated) {
-                  out.andNot(storage.values);
-                  negated = false;
-                } else if (v.negated) {
-                  out.flip(0, storage.size);
-                  out.and(storage.values);
-                  negated = false;
-                } else {
-                  out.and(storage.values);
-                  negated = false;
-                }
-
-                BitSet isNothing = BitSets.makeDuplicate(storage.isNothing);
-                isNothing.or(v.isNothing);
-                int current = isNothing.nextSetBit(0);
-                while (current != -1) {
-                  var value = negated != out.get(current);
-                  if (!value
-                      && (storage.getItemBoxed(current) == Boolean.FALSE
-                          || v.getItemBoxed(current) == Boolean.FALSE)) {
-                    isNothing.clear(current);
-                  }
-                  current = isNothing.nextSetBit(current + 1);
-                }
-
-                return new BoolStorage(out, isNothing, storage.size, negated);
-              }
-            })
-        .add(
-            new BinaryMapOperation<>(Maps.OR) {
-              @Override
-              public BoolStorage runBinaryMap(
-                  BoolStorage storage,
-                  Object arg,
-                  MapOperationProblemAggregator problemAggregator) {
-                if (arg == null) {
-                  if (storage.negated) {
-                    var newMissing = storage.isNothing.get(0, storage.size);
-                    newMissing.or(storage.values);
-                    return new BoolStorage(new BitSet(), newMissing, storage.size, true);
-                  } else {
-                    var newMissing = new BitSet(storage.size);
-                    newMissing.flip(0, storage.size);
-                    newMissing.xor(storage.values);
-                    return new BoolStorage(storage.values, newMissing, storage.size, false);
-                  }
-                } else if (arg instanceof Boolean v) {
-                  return v
-                      ? new BoolStorage(new BitSet(), new BitSet(), storage.size, true)
-                      : storage;
-                } else {
-                  throw new UnexpectedTypeException("a Boolean");
-                }
-              }
-
-              @Override
-              public BoolStorage runZip(
-                  BoolStorage storage,
-                  Storage<?> arg,
-                  MapOperationProblemAggregator problemAggregator) {
-                if (!(arg instanceof BoolStorage v)) {
-                  throw new UnexpectedColumnTypeException("Boolean");
-                }
-
-                BitSet out = v.values.get(0, storage.size);
-                boolean negated;
-                if (storage.negated && v.negated) {
-                  out.and(storage.values);
-                  negated = true;
-                } else if (storage.negated) {
-                  out.flip(0, storage.size);
-                  out.and(storage.values);
-                  negated = true;
-                } else if (v.negated) {
-                  out.flip(0, storage.size);
-                  out.or(storage.values);
-                  negated = false;
-                } else {
-                  out.or(storage.values);
-                  negated = false;
-                }
-
-                BitSet isNothing = BitSets.makeDuplicate(storage.isNothing);
-                isNothing.or(v.isNothing);
-                int current = isNothing.nextSetBit(0);
-                while (current != -1) {
-                  var value = negated != out.get(current);
-                  if (value
-                      && (storage.getItemBoxed(current) == Boolean.TRUE
-                          || v.getItemBoxed(current) == Boolean.TRUE)) {
-                    isNothing.clear(current);
-                  }
-                  current = isNothing.nextSetBit(current + 1);
-                }
-
-                return new BoolStorage(out, isNothing, storage.size, negated);
-              }
-            })
-        .add(new BooleanIsInOp());
+    ops.add(new BoolEq())
+        .add(new BoolAnd())
+        .add(new BoolOr())
+        .add(new BooleanIsInOp())
+        .add(new BoolLess())
+        .add(new BoolLessOrEqual())
+        .add(new BoolGreaterOrEqual())
+        .add(new BoolGreater())
+        .add(new BoolMin())
+        .add(new BoolMax());
     return ops;
   }
 
   /** Creates a mask that selects elements corresponding to true entries in the passed storage. */
   public static BitSet toMask(BoolStorage storage) {
-    BitSet mask = new BitSet();
-    mask.or(storage.getValues());
-    if (storage.isNegated()) {
-      mask.flip(0, storage.size());
-    }
+    BitSet mask = storage.normalize();
     mask.andNot(storage.getIsNothingMap());
     return mask;
   }
 
+  /**
+   * Returns a BitSet representation of the storage. It is the same as the values BitSet, but with
+   * an assumption that the negated flag is false.
+   */
+  private BitSet normalize() {
+    BitSet set = new BitSet();
+    set.or(this.values);
+    if (this.negated) {
+      set.flip(0, this.size);
+    }
+    return set;
+  }
+
+  /** Acts like {@link #normalize} but also negates the bits. */
+  private BitSet negateNormalize() {
+    BitSet set = new BitSet();
+    set.or(this.values);
+    if (!this.negated) {
+      set.flip(0, this.size);
+    }
+    return set;
+  }
+
   @Override
   public BoolStorage slice(int offset, int limit) {
     int newSize = Math.min(size - offset, limit);
@@ -478,4 +330,492 @@ public boolean get(long index) throws ValueIsNothingException {
     }
     return getItem(index);
   }
+
+  private static class BoolEq extends BinaryMapOperation<Boolean, BoolStorage> {
+    public BoolEq() {
+      super(Maps.EQ);
+    }
+
+    @Override
+    public BoolStorage runBinaryMap(
+        BoolStorage storage, Object arg, MapOperationProblemAggregator problemAggregator) {
+      if (arg == null) {
+        return BoolStorage.makeEmpty(storage.size);
+      } else if (arg instanceof Boolean v) {
+        if (v) {
+          return storage;
+        } else {
+          return storage.makeNegated();
+        }
+      } else {
+        return new BoolStorage(new BitSet(), storage.isNothing, storage.size, false);
+      }
+    }
+
+    @Override
+    public BoolStorage runZip(
+        BoolStorage storage, Storage<?> arg, MapOperationProblemAggregator problemAggregator) {
+      Context context = Context.getCurrent();
+      BitSet out = new BitSet();
+      BitSet isNothing = new BitSet();
+      for (int i = 0; i < storage.size; i++) {
+        if (!storage.isNothing(i) && i < arg.size() && !arg.isNothing(i)) {
+          if (((Boolean) storage.getItem(i)).equals(arg.getItemBoxed(i))) {
+            out.set(i);
+          }
+        } else {
+          isNothing.set(i);
+        }
+
+        context.safepoint();
+      }
+      return new BoolStorage(out, isNothing, storage.size, false);
+    }
+  }
+
+  private static class BoolAnd extends BinaryMapOperation<Boolean, BoolStorage> {
+    public BoolAnd() {
+      super(Maps.AND);
+    }
+
+    @Override
+    public BoolStorage runBinaryMap(
+        BoolStorage storage, Object arg, MapOperationProblemAggregator problemAggregator) {
+      if (arg == null) {
+        if (storage.negated) {
+          var newMissing = new BitSet(storage.size);
+          newMissing.flip(0, storage.size);
+          newMissing.xor(storage.values);
+          return new BoolStorage(storage.values, newMissing, storage.size, true);
+        } else {
+          var newMissing = storage.isNothing.get(0, storage.size);
+          newMissing.or(storage.values);
+          return new BoolStorage(new BitSet(), newMissing, storage.size, false);
+        }
+      } else if (arg instanceof Boolean v) {
+        return v ? storage : new BoolStorage(new BitSet(), new BitSet(), storage.size, false);
+      } else {
+        throw new UnexpectedTypeException("a Boolean");
+      }
+    }
+
+    @Override
+    public BoolStorage runZip(
+        BoolStorage storage, Storage<?> arg, MapOperationProblemAggregator problemAggregator) {
+      if (!(arg instanceof BoolStorage v)) {
+        throw new UnexpectedColumnTypeException("Boolean");
+      }
+
+      BitSet out = v.values.get(0, storage.size);
+      boolean negated;
+      if (storage.negated && v.negated) {
+        out.or(storage.values);
+        negated = true;
+      } else if (storage.negated) {
+        out.andNot(storage.values);
+        negated = false;
+      } else if (v.negated) {
+        out.flip(0, storage.size);
+        out.and(storage.values);
+        negated = false;
+      } else {
+        out.and(storage.values);
+        negated = false;
+      }
+
+      BitSet isNothing = BitSets.makeDuplicate(storage.isNothing);
+      isNothing.or(v.isNothing);
+      if (storage.size > v.size) {
+        isNothing.set(v.size, storage.size);
+      }
+      int current = isNothing.nextSetBit(0);
+      while (current != -1) {
+        Boolean a = storage.getItemBoxed(current);
+        Boolean b = (current < v.size) ? v.getItemBoxed(current) : null;
+        if (a == Boolean.FALSE || b == Boolean.FALSE) {
+          isNothing.clear(current);
+          boolean falseValue = negated;
+          out.set(current, falseValue);
+        }
+        current = isNothing.nextSetBit(current + 1);
+      }
+
+      return new BoolStorage(out, isNothing, storage.size, negated);
+    }
+  }
+
+  private static class BoolOr extends BinaryMapOperation<Boolean, BoolStorage> {
+    public BoolOr() {
+      super(Maps.OR);
+    }
+
+    @Override
+    public BoolStorage runBinaryMap(
+        BoolStorage storage, Object arg, MapOperationProblemAggregator problemAggregator) {
+      if (arg == null) {
+        if (storage.negated) {
+          var newMissing = storage.isNothing.get(0, storage.size);
+          newMissing.or(storage.values);
+          return new BoolStorage(new BitSet(), newMissing, storage.size, true);
+        } else {
+          var newMissing = new BitSet(storage.size);
+          newMissing.flip(0, storage.size);
+          newMissing.xor(storage.values);
+          return new BoolStorage(storage.values, newMissing, storage.size, false);
+        }
+      } else if (arg instanceof Boolean v) {
+        return v ? new BoolStorage(new BitSet(), new BitSet(), storage.size, true) : storage;
+      } else {
+        throw new UnexpectedTypeException("a Boolean");
+      }
+    }
+
+    @Override
+    public BoolStorage runZip(
+        BoolStorage storage, Storage<?> arg, MapOperationProblemAggregator problemAggregator) {
+      if (!(arg instanceof BoolStorage v)) {
+        throw new UnexpectedColumnTypeException("Boolean");
+      }
+
+      BitSet out = v.values.get(0, storage.size);
+      boolean negated;
+      if (storage.negated && v.negated) {
+        out.and(storage.values);
+        negated = true;
+      } else if (storage.negated) {
+        out.flip(0, storage.size);
+        out.and(storage.values);
+        negated = true;
+      } else if (v.negated) {
+        out.flip(0, storage.size);
+        out.or(storage.values);
+        negated = false;
+      } else {
+        out.or(storage.values);
+        negated = false;
+      }
+
+      BitSet isNothing = BitSets.makeDuplicate(storage.isNothing);
+      isNothing.or(v.isNothing);
+      if (storage.size > v.size) {
+        isNothing.set(v.size, storage.size);
+      }
+      int current = isNothing.nextSetBit(0);
+      while (current != -1) {
+        Boolean a = storage.getItemBoxed(current);
+        Boolean b = (current < v.size) ? v.getItemBoxed(current) : null;
+        if (a == Boolean.TRUE || b == Boolean.TRUE) {
+          isNothing.clear(current);
+          boolean trueValue = !negated;
+          out.set(current, trueValue);
+        }
+        current = isNothing.nextSetBit(current + 1);
+      }
+
+      return new BoolStorage(out, isNothing, storage.size, negated);
+    }
+  }
+
+  private abstract static class BoolCompareOp extends BinaryMapOperation<Boolean, BoolStorage> {
+    public BoolCompareOp(String name) {
+      super(name);
+    }
+
+    protected abstract boolean doCompare(boolean a, boolean b);
+
+    @Override
+    public Storage<?> runZip(
+        BoolStorage storage, Storage<?> arg, MapOperationProblemAggregator problemAggregator) {
+      if (arg instanceof BoolStorage argBoolStorage) {
+        BitSet out = new BitSet();
+        BitSet isNothing = new BitSet();
+        int n = storage.size;
+        int m = Math.min(n, argBoolStorage.size);
+        Context context = Context.getCurrent();
+        for (int i = 0; i < m; i++) {
+          if (storage.isNothing(i) || argBoolStorage.isNothing(i)) {
+            isNothing.set(i);
+          } else {
+            boolean a = storage.getItem(i);
+            boolean b = argBoolStorage.getItem(i);
+            boolean r = doCompare(a, b);
+            out.set(i, r);
+          }
+
+          context.safepoint();
+        }
+
+        isNothing.set(m, n);
+
+        return new BoolStorage(out, isNothing, storage.size, false);
+      } else if (arg.getType() instanceof AnyObjectType) {
+        BitSet out = new BitSet();
+        BitSet isNothing = new BitSet();
+        int n = storage.size;
+        int m = Math.min(n, arg.size());
+        Context context = Context.getCurrent();
+        for (int i = 0; i < m; i++) {
+          if (storage.isNothing(i) || arg.isNothing(i)) {
+            isNothing.set(i);
+          } else {
+            boolean a = storage.getItem(i);
+            Object b = arg.getItemBoxed(i);
+            if (b instanceof Boolean bBool) {
+              boolean r = doCompare(a, bBool);
+              out.set(i, r);
+            } else {
+              assert b != null;
+              throw new CompareException(a, b);
+            }
+          }
+
+          context.safepoint();
+        }
+
+        isNothing.set(m, n);
+
+        return new BoolStorage(out, isNothing, storage.size, false);
+      } else {
+        throw new UnexpectedColumnTypeException("Boolean");
+      }
+    }
+  }
+
+  private static class BoolLess extends BoolCompareOp {
+    public BoolLess() {
+      super(Maps.LT);
+    }
+
+    @Override
+    public Storage<?> runBinaryMap(
+        BoolStorage storage, Object arg, MapOperationProblemAggregator problemAggregator) {
+      if (arg == null) {
+        return BoolStorage.makeEmpty(storage.size);
+      }
+
+      if (arg instanceof Boolean b) {
+        if (b) {
+          // false is smaller than true, so we want to negate
+          return new BoolStorage(storage.negateNormalize(), storage.isNothing, storage.size, false);
+        } else {
+          // nothing is strictly smaller than false
+          return new BoolStorage(new BitSet(), storage.isNothing, storage.size, false);
+        }
+      } else {
+        throw new UnexpectedTypeException("a Boolean", arg.toString());
+      }
+    }
+
+    @Override
+    protected boolean doCompare(boolean a, boolean b) {
+      return !a && b;
+    }
+  }
+
+  private static class BoolLessOrEqual extends BoolCompareOp {
+    public BoolLessOrEqual() {
+      super(Maps.LTE);
+    }
+
+    @Override
+    public Storage<?> runBinaryMap(
+        BoolStorage storage, Object arg, MapOperationProblemAggregator problemAggregator) {
+      if (arg == null) {
+        return BoolStorage.makeEmpty(storage.size);
+      }
+
+      if (arg instanceof Boolean b) {
+        if (b) {
+          // everything is <= true
+          return new BoolStorage(new BitSet(), storage.isNothing, storage.size, true);
+        } else {
+          // false is <= false
+          return new BoolStorage(storage.negateNormalize(), storage.isNothing, storage.size, false);
+        }
+      } else {
+        throw new UnexpectedTypeException("a Boolean", arg.toString());
+      }
+    }
+
+    @Override
+    protected boolean doCompare(boolean a, boolean b) {
+      return !a || b;
+    }
+  }
+
+  private static class BoolGreater extends BoolCompareOp {
+    public BoolGreater() {
+      super(Maps.GT);
+    }
+
+    @Override
+    public Storage<?> runBinaryMap(
+        BoolStorage storage, Object arg, MapOperationProblemAggregator problemAggregator) {
+      if (arg == null) {
+        return BoolStorage.makeEmpty(storage.size);
+      }
+
+      if (arg instanceof Boolean b) {
+        if (b) {
+          // nothing is strictly greater than true
+          return new BoolStorage(new BitSet(), storage.isNothing, storage.size, false);
+        } else {
+          // true is > false, so we just return as-is
+          return storage;
+        }
+      } else {
+        throw new UnexpectedTypeException("a Boolean", arg.toString());
+      }
+    }
+
+    @Override
+    protected boolean doCompare(boolean a, boolean b) {
+      return a && !b;
+    }
+  }
+
+  private static class BoolGreaterOrEqual extends BoolCompareOp {
+    public BoolGreaterOrEqual() {
+      super(Maps.GTE);
+    }
+
+    @Override
+    public Storage<?> runBinaryMap(
+        BoolStorage storage, Object arg, MapOperationProblemAggregator problemAggregator) {
+      if (arg == null) {
+        return BoolStorage.makeEmpty(storage.size);
+      }
+
+      if (arg instanceof Boolean b) {
+        if (b) {
+          // true is >= true
+          return storage;
+        } else {
+          // everything is >= false
+          return new BoolStorage(new BitSet(), storage.isNothing, storage.size, true);
+        }
+      } else {
+        throw new UnexpectedTypeException("a Boolean", arg.toString());
+      }
+    }
+
+    @Override
+    protected boolean doCompare(boolean a, boolean b) {
+      return a || !b;
+    }
+  }
+
+  private abstract static class BoolCoalescingOp extends BinaryMapOperation<Boolean, BoolStorage> {
+    public BoolCoalescingOp(String name) {
+      super(name);
+    }
+
+    protected abstract boolean doOperation(boolean a, boolean b);
+
+    @Override
+    public Storage<?> runZip(
+        BoolStorage storage, Storage<?> arg, MapOperationProblemAggregator problemAggregator) {
+      if (arg instanceof BoolStorage argBoolStorage) {
+        int n = storage.size;
+        int m = Math.min(n, argBoolStorage.size());
+        BitSet out = new BitSet();
+        BitSet isNothing = new BitSet();
+        Context context = Context.getCurrent();
+        for (int i = 0; i < m; i++) {
+          boolean isNothingA = storage.isNothing(i);
+          boolean isNothingB = argBoolStorage.isNothing(i);
+          if (isNothingA && isNothingB) {
+            isNothing.set(i);
+          } else {
+            if (isNothingA) {
+              out.set(i, argBoolStorage.getItem(i));
+            } else if (isNothingB) {
+              out.set(i, storage.getItem(i));
+            } else {
+              out.set(i, doOperation(storage.getItem(i), argBoolStorage.getItem(i)));
+            }
+          }
+
+          context.safepoint();
+        }
+
+        for (int i = m; i < n; i++) {
+          if (storage.isNothing(i)) {
+            isNothing.set(i);
+          } else {
+            out.set(i, storage.getItem(i));
+          }
+
+          context.safepoint();
+        }
+
+        return new BoolStorage(out, isNothing, storage.size, false);
+      } else {
+        throw new UnexpectedColumnTypeException("Boolean");
+      }
+    }
+  }
+
+  private static class BoolMin extends BoolCoalescingOp {
+    public BoolMin() {
+      super(Maps.MIN);
+    }
+
+    @Override
+    public BoolStorage runBinaryMap(
+        BoolStorage storage, Object arg, MapOperationProblemAggregator problemAggregator) {
+      if (arg == null) {
+        return storage;
+      }
+
+      if (arg instanceof Boolean b) {
+        if (b) {
+          // true is larger than false, so we want to keep values as is, and fill missing ones with
+          // true
+          return storage.fillMissingBoolean(true);
+        } else {
+          // false is smaller than everything:
+          return BoolStorage.makeConstant(storage.size, false);
+        }
+      } else {
+        throw new UnexpectedTypeException("a Boolean", arg.toString());
+      }
+    }
+
+    @Override
+    protected boolean doOperation(boolean a, boolean b) {
+      return a && b;
+    }
+  }
+
+  private static class BoolMax extends BoolCoalescingOp {
+    public BoolMax() {
+      super(Maps.MAX);
+    }
+
+    @Override
+    public BoolStorage runBinaryMap(
+        BoolStorage storage, Object arg, MapOperationProblemAggregator problemAggregator) {
+      if (arg == null) {
+        return storage;
+      }
+
+      if (arg instanceof Boolean b) {
+        if (b) {
+          // true is larger than everything:
+          return BoolStorage.makeConstant(storage.size, true);
+        } else {
+          // false is smaller than true, so we only fill null gaps with it
+          return storage.fillMissingBoolean(false);
+        }
+      } else {
+        throw new UnexpectedTypeException("a Boolean", arg.toString());
+      }
+    }
+
+    @Override
+    protected boolean doOperation(boolean a, boolean b) {
+      return a || b;
+    }
+  }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/SpecializedStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/SpecializedStorage.java
index 53e057963939..756e2e1bcfbd 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/SpecializedStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/SpecializedStorage.java
@@ -189,4 +189,17 @@ public int size() {
       return storage.size();
     }
   }
+
+  /**
+   * Returns the specialized storage casted to my own type, if it is of the same type; or null
+   * otherwise.
+   */
+  @SuppressWarnings("unchecked")
+  public SpecializedStorage<T> castIfSameType(SpecializedStorage<?> storage) {
+    if (storage.getType().equals(getType())) {
+      return (SpecializedStorage<T>) storage;
+    } else {
+      return null;
+    }
+  }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/Storage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/Storage.java
index cde141dcd583..c9c8c258fdad 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/Storage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/Storage.java
@@ -101,6 +101,8 @@ public static final class Maps {
     public static final String CONTAINS = "contains";
     public static final String LIKE = "like";
     public static final String IS_IN = "is_in";
+    public static final String MIN = "min";
+    public static final String MAX = "max";
   }
 
   /* Specifies if the given binary operation has a vectorized implementation available for this storage.*/
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/StringStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/StringStorage.java
index 4a77e2104d0a..5994a921f3c5 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/StringStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/StringStorage.java
@@ -1,10 +1,12 @@
 package org.enso.table.data.column.storage;
 
 import java.util.BitSet;
+import org.enso.base.CompareException;
 import org.enso.base.Text_Utils;
 import org.enso.table.data.column.operation.map.BinaryMapOperation;
 import org.enso.table.data.column.operation.map.MapOperationProblemAggregator;
 import org.enso.table.data.column.operation.map.MapOperationStorage;
+import org.enso.table.data.column.operation.map.text.CoalescingStringStringOp;
 import org.enso.table.data.column.operation.map.text.LikeOp;
 import org.enso.table.data.column.operation.map.text.StringBooleanOp;
 import org.enso.table.data.column.operation.map.text.StringIsInOp;
@@ -124,6 +126,34 @@ protected boolean doString(String a, String b) {
             return Text_Utils.contains(a, b);
           }
         });
+    t.add(
+        new StringComparisonOp(Maps.LT) {
+          @Override
+          protected boolean doString(String a, String b) {
+            return Text_Utils.compare_normalized(a, b) < 0;
+          }
+        });
+    t.add(
+        new StringComparisonOp(Maps.LTE) {
+          @Override
+          protected boolean doString(String a, String b) {
+            return Text_Utils.compare_normalized(a, b) <= 0;
+          }
+        });
+    t.add(
+        new StringComparisonOp(Maps.GT) {
+          @Override
+          protected boolean doString(String a, String b) {
+            return Text_Utils.compare_normalized(a, b) > 0;
+          }
+        });
+    t.add(
+        new StringComparisonOp(Maps.GTE) {
+          @Override
+          protected boolean doString(String a, String b) {
+            return Text_Utils.compare_normalized(a, b) >= 0;
+          }
+        });
     t.add(new LikeOp());
     t.add(new StringIsInOp<>());
     t.add(
@@ -138,6 +168,38 @@ protected TextType computeResultType(TextType a, TextType b) {
             return TextType.concatTypes(a, b);
           }
         });
+    t.add(
+        new CoalescingStringStringOp(Maps.MIN) {
+          @Override
+          protected String doString(String a, String b) {
+            if (Text_Utils.compare_normalized(a, b) < 0) {
+              return a;
+            } else {
+              return b;
+            }
+          }
+
+          @Override
+          protected TextType computeResultType(TextType a, TextType b) {
+            return TextType.maxType(a, b);
+          }
+        });
+    t.add(
+        new CoalescingStringStringOp(Maps.MAX) {
+          @Override
+          protected String doString(String a, String b) {
+            if (Text_Utils.compare_normalized(a, b) > 0) {
+              return a;
+            } else {
+              return b;
+            }
+          }
+
+          @Override
+          protected TextType computeResultType(TextType a, TextType b) {
+            return TextType.maxType(a, b);
+          }
+        });
     return t;
   }
 
@@ -179,4 +241,15 @@ public StorageType inferPreciseTypeShrunk() {
       return getType();
     }
   }
+
+  private abstract static class StringComparisonOp extends StringBooleanOp {
+    public StringComparisonOp(String name) {
+      super(name);
+    }
+
+    @Override
+    protected boolean doObject(String a, Object o) {
+      throw new CompareException(a, o);
+    }
+  }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/DateStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/DateStorage.java
index e2aa509c5fb0..500b3ee0376b 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/DateStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/DateStorage.java
@@ -1,8 +1,13 @@
 package org.enso.table.data.column.storage.datetime;
 
 import java.time.LocalDate;
+import org.enso.base.CompareException;
+import org.enso.table.data.column.builder.Builder;
+import org.enso.table.data.column.builder.DateBuilder;
 import org.enso.table.data.column.operation.map.MapOperationStorage;
 import org.enso.table.data.column.operation.map.datetime.DateTimeIsInOp;
+import org.enso.table.data.column.operation.map.datetime.TimeLikeBinaryOpReturningBoolean;
+import org.enso.table.data.column.operation.map.datetime.TimeLikeCoalescingOperation;
 import org.enso.table.data.column.storage.ObjectStorage;
 import org.enso.table.data.column.storage.SpecializedStorage;
 import org.enso.table.data.column.storage.type.DateType;
@@ -21,6 +26,70 @@ private static MapOperationStorage<LocalDate, SpecializedStorage<LocalDate>> bui
     MapOperationStorage<LocalDate, SpecializedStorage<LocalDate>> t =
         ObjectStorage.buildObjectOps();
     t.add(new DateTimeIsInOp<>(LocalDate.class));
+    t.add(
+        new TimeLikeBinaryOpReturningBoolean<>(Maps.EQ, LocalDate.class) {
+          @Override
+          protected boolean doOperation(LocalDate a, LocalDate b) {
+            return a.isEqual(b);
+          }
+
+          @Override
+          protected boolean doOther(LocalDate a, Object b) {
+            return false;
+          }
+        });
+    t.add(
+        new DateComparisonOp(Maps.LT) {
+          @Override
+          protected boolean doOperation(LocalDate a, LocalDate b) {
+            return a.compareTo(b) < 0;
+          }
+        });
+    t.add(
+        new DateComparisonOp(Maps.LTE) {
+          @Override
+          protected boolean doOperation(LocalDate a, LocalDate b) {
+            return a.compareTo(b) <= 0;
+          }
+        });
+    t.add(
+        new DateComparisonOp(Maps.GT) {
+          @Override
+          protected boolean doOperation(LocalDate a, LocalDate b) {
+            return a.compareTo(b) > 0;
+          }
+        });
+    t.add(
+        new DateComparisonOp(Maps.GTE) {
+          @Override
+          protected boolean doOperation(LocalDate a, LocalDate b) {
+            return a.compareTo(b) >= 0;
+          }
+        });
+    t.add(
+        new TimeLikeCoalescingOperation<>(Maps.MIN, LocalDate.class) {
+          @Override
+          protected Builder createOutputBuilder(int size) {
+            return new DateBuilder(size);
+          }
+
+          @Override
+          protected LocalDate doOperation(LocalDate a, LocalDate b) {
+            return a.compareTo(b) < 0 ? a : b;
+          }
+        });
+    t.add(
+        new TimeLikeCoalescingOperation<>(Maps.MAX, LocalDate.class) {
+          @Override
+          protected Builder createOutputBuilder(int size) {
+            return new DateBuilder(size);
+          }
+
+          @Override
+          protected LocalDate doOperation(LocalDate a, LocalDate b) {
+            return a.compareTo(b) > 0 ? a : b;
+          }
+        });
     return t;
   }
 
@@ -38,4 +107,16 @@ protected LocalDate[] newUnderlyingArray(int size) {
   public StorageType getType() {
     return DateType.INSTANCE;
   }
+
+  private abstract static class DateComparisonOp
+      extends TimeLikeBinaryOpReturningBoolean<LocalDate> {
+    public DateComparisonOp(String name) {
+      super(name, LocalDate.class);
+    }
+
+    @Override
+    protected boolean doOther(LocalDate a, Object b) {
+      throw new CompareException(a, b);
+    }
+  }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/DateTimeStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/DateTimeStorage.java
index 4023104c4cc6..87de00094447 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/DateTimeStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/DateTimeStorage.java
@@ -2,11 +2,15 @@
 
 import java.time.Duration;
 import java.time.ZonedDateTime;
+import org.enso.base.CompareException;
 import org.enso.table.data.column.builder.Builder;
+import org.enso.table.data.column.builder.DateTimeBuilder;
 import org.enso.table.data.column.builder.ObjectBuilder;
 import org.enso.table.data.column.operation.map.GenericBinaryObjectMapOperation;
 import org.enso.table.data.column.operation.map.MapOperationStorage;
 import org.enso.table.data.column.operation.map.datetime.DateTimeIsInOp;
+import org.enso.table.data.column.operation.map.datetime.TimeLikeBinaryOpReturningBoolean;
+import org.enso.table.data.column.operation.map.datetime.TimeLikeCoalescingOperation;
 import org.enso.table.data.column.storage.ObjectStorage;
 import org.enso.table.data.column.storage.SpecializedStorage;
 import org.enso.table.data.column.storage.type.DateTimeType;
@@ -25,6 +29,46 @@ private static MapOperationStorage<ZonedDateTime, SpecializedStorage<ZonedDateTi
     MapOperationStorage<ZonedDateTime, SpecializedStorage<ZonedDateTime>> t =
         ObjectStorage.buildObjectOps();
     t.add(new DateTimeIsInOp<>(ZonedDateTime.class));
+    t.add(
+        new TimeLikeBinaryOpReturningBoolean<>(Maps.EQ, ZonedDateTime.class) {
+          @Override
+          protected boolean doOperation(ZonedDateTime a, ZonedDateTime b) {
+            return a.isEqual(b);
+          }
+
+          @Override
+          protected boolean doOther(ZonedDateTime a, Object b) {
+            return false;
+          }
+        });
+    t.add(
+        new DateTimeComparisonOp(Maps.LT) {
+          @Override
+          protected boolean doOperation(ZonedDateTime a, ZonedDateTime b) {
+            return a.compareTo(b) < 0;
+          }
+        });
+    t.add(
+        new DateTimeComparisonOp(Maps.LTE) {
+          @Override
+          protected boolean doOperation(ZonedDateTime a, ZonedDateTime b) {
+            return a.compareTo(b) <= 0;
+          }
+        });
+    t.add(
+        new DateTimeComparisonOp(Maps.GT) {
+          @Override
+          protected boolean doOperation(ZonedDateTime a, ZonedDateTime b) {
+            return a.compareTo(b) > 0;
+          }
+        });
+    t.add(
+        new DateTimeComparisonOp(Maps.GTE) {
+          @Override
+          protected boolean doOperation(ZonedDateTime a, ZonedDateTime b) {
+            return a.compareTo(b) >= 0;
+          }
+        });
     t.add(
         new GenericBinaryObjectMapOperation<
             ZonedDateTime, SpecializedStorage<ZonedDateTime>, Duration>(
@@ -39,6 +83,30 @@ protected Duration run(ZonedDateTime value, ZonedDateTime other) {
             return Duration.between(other, value);
           }
         });
+    t.add(
+        new TimeLikeCoalescingOperation<>(Maps.MIN, ZonedDateTime.class) {
+          @Override
+          protected Builder createOutputBuilder(int size) {
+            return new DateTimeBuilder(size);
+          }
+
+          @Override
+          protected ZonedDateTime doOperation(ZonedDateTime a, ZonedDateTime b) {
+            return a.compareTo(b) < 0 ? a : b;
+          }
+        });
+    t.add(
+        new TimeLikeCoalescingOperation<>(Maps.MAX, ZonedDateTime.class) {
+          @Override
+          protected Builder createOutputBuilder(int size) {
+            return new DateTimeBuilder(size);
+          }
+
+          @Override
+          protected ZonedDateTime doOperation(ZonedDateTime a, ZonedDateTime b) {
+            return a.compareTo(b) > 0 ? a : b;
+          }
+        });
     return t;
   }
 
@@ -56,4 +124,16 @@ protected ZonedDateTime[] newUnderlyingArray(int size) {
   public StorageType getType() {
     return DateTimeType.INSTANCE;
   }
+
+  private abstract static class DateTimeComparisonOp
+      extends TimeLikeBinaryOpReturningBoolean<ZonedDateTime> {
+    public DateTimeComparisonOp(String name) {
+      super(name, ZonedDateTime.class);
+    }
+
+    @Override
+    protected boolean doOther(ZonedDateTime a, Object b) {
+      throw new CompareException(a, b);
+    }
+  }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/TimeOfDayStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/TimeOfDayStorage.java
index 90ac18225037..c6388f4441bb 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/TimeOfDayStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/datetime/TimeOfDayStorage.java
@@ -2,11 +2,15 @@
 
 import java.time.Duration;
 import java.time.LocalTime;
+import org.enso.base.CompareException;
 import org.enso.table.data.column.builder.Builder;
 import org.enso.table.data.column.builder.ObjectBuilder;
+import org.enso.table.data.column.builder.TimeOfDayBuilder;
 import org.enso.table.data.column.operation.map.GenericBinaryObjectMapOperation;
 import org.enso.table.data.column.operation.map.MapOperationStorage;
 import org.enso.table.data.column.operation.map.datetime.DateTimeIsInOp;
+import org.enso.table.data.column.operation.map.datetime.TimeLikeBinaryOpReturningBoolean;
+import org.enso.table.data.column.operation.map.datetime.TimeLikeCoalescingOperation;
 import org.enso.table.data.column.storage.ObjectStorage;
 import org.enso.table.data.column.storage.SpecializedStorage;
 import org.enso.table.data.column.storage.type.StorageType;
@@ -25,6 +29,46 @@ private static MapOperationStorage<LocalTime, SpecializedStorage<LocalTime>> bui
     MapOperationStorage<LocalTime, SpecializedStorage<LocalTime>> t =
         ObjectStorage.buildObjectOps();
     t.add(new DateTimeIsInOp<>(LocalTime.class));
+    t.add(
+        new TimeLikeBinaryOpReturningBoolean<>(Maps.EQ, LocalTime.class) {
+          @Override
+          protected boolean doOperation(LocalTime a, LocalTime b) {
+            return a.equals(b);
+          }
+
+          @Override
+          protected boolean doOther(LocalTime a, Object b) {
+            return false;
+          }
+        });
+    t.add(
+        new TimeOfDayComparisonOp(Maps.LT) {
+          @Override
+          protected boolean doOperation(LocalTime a, LocalTime b) {
+            return a.compareTo(b) < 0;
+          }
+        });
+    t.add(
+        new TimeOfDayComparisonOp(Maps.LTE) {
+          @Override
+          protected boolean doOperation(LocalTime a, LocalTime b) {
+            return a.compareTo(b) <= 0;
+          }
+        });
+    t.add(
+        new TimeOfDayComparisonOp(Maps.GT) {
+          @Override
+          protected boolean doOperation(LocalTime a, LocalTime b) {
+            return a.compareTo(b) > 0;
+          }
+        });
+    t.add(
+        new TimeOfDayComparisonOp(Maps.GTE) {
+          @Override
+          protected boolean doOperation(LocalTime a, LocalTime b) {
+            return a.compareTo(b) >= 0;
+          }
+        });
     t.add(
         new GenericBinaryObjectMapOperation<LocalTime, SpecializedStorage<LocalTime>, Duration>(
             Maps.SUB, LocalTime.class, TimeOfDayStorage.class) {
@@ -38,6 +82,30 @@ protected Duration run(LocalTime value, LocalTime other) {
             return Duration.between(other, value);
           }
         });
+    t.add(
+        new TimeLikeCoalescingOperation<>(Maps.MIN, LocalTime.class) {
+          @Override
+          protected Builder createOutputBuilder(int size) {
+            return new TimeOfDayBuilder(size);
+          }
+
+          @Override
+          protected LocalTime doOperation(LocalTime a, LocalTime b) {
+            return a.compareTo(b) < 0 ? a : b;
+          }
+        });
+    t.add(
+        new TimeLikeCoalescingOperation<>(Maps.MAX, LocalTime.class) {
+          @Override
+          protected Builder createOutputBuilder(int size) {
+            return new TimeOfDayBuilder(size);
+          }
+
+          @Override
+          protected LocalTime doOperation(LocalTime a, LocalTime b) {
+            return a.compareTo(b) > 0 ? a : b;
+          }
+        });
     return t;
   }
 
@@ -55,4 +123,16 @@ protected LocalTime[] newUnderlyingArray(int size) {
   public StorageType getType() {
     return TimeOfDayType.INSTANCE;
   }
+
+  private abstract static class TimeOfDayComparisonOp
+      extends TimeLikeBinaryOpReturningBoolean<LocalTime> {
+    public TimeOfDayComparisonOp(String name) {
+      super(name, LocalTime.class);
+    }
+
+    @Override
+    protected boolean doOther(LocalTime a, Object b) {
+      throw new CompareException(a, b);
+    }
+  }
 }
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/AbstractLongStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/AbstractLongStorage.java
index bd4717dc334e..4d89175a03d9 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/AbstractLongStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/AbstractLongStorage.java
@@ -6,6 +6,8 @@
 import org.enso.table.data.column.operation.map.numeric.LongRoundOp;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.AddOp;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.DivideOp;
+import org.enso.table.data.column.operation.map.numeric.arithmetic.MaxOp;
+import org.enso.table.data.column.operation.map.numeric.arithmetic.MinOp;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.ModOp;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.MulOp;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.PowerOp;
@@ -110,6 +112,8 @@ private static MapOperationStorage<Long, AbstractLongStorage> buildOps() {
         .add(new ModOp<>())
         .add(new PowerOp<>())
         .add(new LongRoundOp(Maps.ROUND))
+        .add(new MinOp<>())
+        .add(new MaxOp<>())
         .add(new LessComparison<>())
         .add(new LessOrEqualComparison<>())
         .add(new EqualsComparison<>())
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/BigDecimalStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/BigDecimalStorage.java
index 3f56d0b42420..65fd41f18416 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/BigDecimalStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/BigDecimalStorage.java
@@ -4,6 +4,8 @@
 import org.enso.table.data.column.operation.map.MapOperationStorage;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.AddOp;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.BigDecimalDivideOp;
+import org.enso.table.data.column.operation.map.numeric.arithmetic.MaxOp;
+import org.enso.table.data.column.operation.map.numeric.arithmetic.MinOp;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.ModOp;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.MulOp;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.PowerOp;
@@ -40,6 +42,8 @@ private static MapOperationStorage<BigDecimal, SpecializedStorage<BigDecimal>> b
         .add(new BigDecimalDivideOp<>())
         .add(new PowerOp<>())
         .add(new ModOp<>())
+        .add(new MinOp<>())
+        .add(new MaxOp<>())
         .add(new LessComparison<>())
         .add(new LessOrEqualComparison<>())
         .add(new EqualsComparison<>())
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/BigIntegerStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/BigIntegerStorage.java
index 852772cec68b..9f94828729c8 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/BigIntegerStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/BigIntegerStorage.java
@@ -5,6 +5,8 @@
 import org.enso.table.data.column.operation.map.MapOperationStorage;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.AddOp;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.DivideOp;
+import org.enso.table.data.column.operation.map.numeric.arithmetic.MaxOp;
+import org.enso.table.data.column.operation.map.numeric.arithmetic.MinOp;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.ModOp;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.MulOp;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.PowerOp;
@@ -39,6 +41,8 @@ protected static MapOperationStorage<BigInteger, SpecializedStorage<BigInteger>>
         .add(new DivideOp<>())
         .add(new ModOp<>())
         .add(new PowerOp<>())
+        .add(new MinOp<>())
+        .add(new MaxOp<>())
         .add(new LessComparison<>())
         .add(new LessOrEqualComparison<>())
         .add(new EqualsComparison<>())
diff --git a/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/DoubleStorage.java b/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/DoubleStorage.java
index 01f92b3b18df..2d89360443b2 100644
--- a/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/DoubleStorage.java
+++ b/std-bits/table/src/main/java/org/enso/table/data/column/storage/numeric/DoubleStorage.java
@@ -9,6 +9,8 @@
 import org.enso.table.data.column.operation.map.numeric.DoubleRoundOp;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.AddOp;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.DivideOp;
+import org.enso.table.data.column.operation.map.numeric.arithmetic.MaxOp;
+import org.enso.table.data.column.operation.map.numeric.arithmetic.MinOp;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.ModOp;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.MulOp;
 import org.enso.table.data.column.operation.map.numeric.arithmetic.PowerOp;
@@ -101,6 +103,11 @@ public double getItemAsDouble(int i) {
     return Double.longBitsToDouble(data[i]);
   }
 
+  @Override
+  public DoubleStorage intoStorage() {
+    return this;
+  }
+
   @Override
   public boolean isBinaryOpVectorized(String op) {
     return ops.isSupportedBinary(op);
@@ -282,6 +289,8 @@ private static MapOperationStorage<Double, DoubleStorage> buildOps() {
         .add(new ModOp<>())
         .add(new PowerOp<>())
         .add(new DoubleRoundOp(Maps.ROUND))
+        .add(new MinOp<>())
+        .add(new MaxOp<>())
         .add(new LessComparison<>())
         .add(new LessOrEqualComparison<>())
         .add(new EqualsComparison<>())
diff --git a/std-bits/table/src/main/java/org/enso/table/error/UnexpectedTypeException.java b/std-bits/table/src/main/java/org/enso/table/error/UnexpectedTypeException.java
index 2162cdafdb30..50cfd71939eb 100644
--- a/std-bits/table/src/main/java/org/enso/table/error/UnexpectedTypeException.java
+++ b/std-bits/table/src/main/java/org/enso/table/error/UnexpectedTypeException.java
@@ -19,6 +19,11 @@ public UnexpectedTypeException(String expected) {
     this.expected = expected;
   }
 
+  public UnexpectedTypeException(String expected, String got) {
+    super("Unexpected value type. Expected " + expected + ", but got " + got + ".");
+    this.expected = expected;
+  }
+
   /**
    * @return the expected type descriptor
    */
diff --git a/test/Benchmarks/src/Main.enso b/test/Benchmarks/src/Main.enso
index a2c0b3437b7c..1ff17eb623e8 100644
--- a/test/Benchmarks/src/Main.enso
+++ b/test/Benchmarks/src/Main.enso
@@ -18,10 +18,12 @@ import project.Sum
 import project.Table.Add_Row_Number
 import project.Table.Aggregate
 import project.Table.Arithmetic
+import project.Table.Column_Comparisons
 import project.Table.Column_From_Vector
 import project.Table.Cross_Tab
 import project.Table.Csv
 import project.Table.Join
+import project.Table.Mixed_Operations
 import project.Table.Sorting
 import project.Table.Internal.Multi_Value_Key
 import project.Text.Build
@@ -62,12 +64,14 @@ all_benchmarks =
         builder.append Aggregate.collect_benches
         builder.append Arithmetic.collect_benches
         builder.append Add_Row_Number.collect_benches
+        builder.append Column_Comparisons.collect_benches
         builder.append Column_From_Vector.collect_benches
         builder.append Cross_Tab.collect_benches
         builder.append Csv.collect_benches
         builder.append Join.collect_benches
         builder.append Sorting.collect_benches
         builder.append Multi_Value_Key.collect_benches
+        builder.append Mixed_Operations.collect_benches
 
         # Text
         builder.append Build.collect_benches
@@ -101,17 +105,22 @@ all_benchmarks =
 main filter=Nothing =
     benchmarks = if filter.is_nothing then all_benchmarks else
         no_nothing x = x.is_nothing.not
+        filter_regex = Regex.compile filter
+        is_matching name =
+            # We always check simple plain text filter, but also if the filter was a valid regex we check a regex match.
+            (name.contains filter) || (filter_regex.is_error.not && (filter_regex.match name . is_nothing . not))
 
         filter_benchmarks (b:Bench) = case b of
             Bench.All groups ->
                 vec = groups.map filter_benchmarks . filter no_nothing
                 if vec.is_empty then Nothing else
                     Bench.All vec
-            Bench.Group n opts specs -> if n.contains filter then b else
+            Bench.Group n opts specs -> if is_matching n then b else
                 vec = specs.map filter_benchmarks . filter no_nothing
                 if vec.is_empty then Nothing else
                     Bench.Group n opts vec
-            Bench.Spec n _ -> if n.contains filter then b else Nothing
+            Bench.Spec n _ ->
+                if is_matching n then b else Nothing
 
         all_benchmarks.map filter_benchmarks . filter no_nothing
 
diff --git a/test/Benchmarks/src/Table/Column_Comparisons.enso b/test/Benchmarks/src/Table/Column_Comparisons.enso
new file mode 100644
index 000000000000..44bef49ce166
--- /dev/null
+++ b/test/Benchmarks/src/Table/Column_Comparisons.enso
@@ -0,0 +1,110 @@
+from Standard.Base import all
+
+from Standard.Table import Table, Value_Type
+
+from Standard.Test import Bench
+
+options = Bench.options . set_warmup (Bench.phase_conf 2 3) . set_measure (Bench.phase_conf 5 1)
+
+create_ints num_rows:Integer -> Table =
+    ints1 = Vector.new num_rows i-> i
+    ints2 = Vector.new num_rows i->
+        case i % 3 of
+            0 -> -i
+            1 -> i + 1
+            2 -> i % 100
+
+    t = Table.new [["ints1", ints1], ["ints2", ints2]]
+    Runtime.assert ((t.at "ints1" . value_type) == Value_Type.Integer)
+    Runtime.assert ((t.at "ints2" . value_type) == Value_Type.Integer)
+    t
+
+create_dates num_rows:Integer -> Table =
+    base_date = Date.new 2020 01 01
+    dates1 = Vector.new num_rows i-> base_date.date_add i ..Day
+    dates2 = Vector.new num_rows i->
+        x = case i % 3 of
+            0 -> -i
+            1 -> i + 1
+            2 -> i % 100
+        base_date.date_add x ..Day
+    t = Table.new [["dates1", dates1], ["dates2", dates2]]
+    Runtime.assert ((t.at "dates1" . value_type) == Value_Type.Date)
+    Runtime.assert ((t.at "dates2" . value_type) == Value_Type.Date)
+    t
+
+create_texts num_rows:Integer -> Table =
+    texts1 = Vector.new num_rows i->
+        case i % 4 of
+            0 -> "abc"
+            1 -> ""
+            2 -> "ąęłśćżź"
+            3 -> "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
+    texts2 = Vector.new num_rows i->
+        case i % 4 of
+            0 -> "def"
+            1 -> "......"
+            2 -> "żżż🚂🚂"
+            3 -> "a"
+    t = Table.new [["texts1", texts1], ["texts2", texts2]]
+    Runtime.assert ((t.at "texts1" . value_type) == Value_Type.Char)
+    Runtime.assert ((t.at "texts2" . value_type) == Value_Type.Char)
+    t
+
+create_bools num_rows:Integer -> Table =
+    bools1 = Vector.new num_rows i-> i % 2 == 0
+    bools2 = Vector.new num_rows i-> i % 3 == 0
+    t = Table.new [["bools1", bools1], ["bools2", bools2]]
+    Runtime.assert ((t.at "bools1" . value_type) == Value_Type.Boolean)
+    Runtime.assert ((t.at "bools2" . value_type) == Value_Type.Boolean)
+    t
+
+
+type Data
+    private Value ~ints ~dates ~texts ~bools
+
+    create num_rows = Data.Value (create_ints num_rows) (create_dates num_rows) (create_texts num_rows) (create_bools num_rows)
+
+collect_benches = Bench.build builder->
+    num_rows = 500 * 1000
+    data = Data.create num_rows
+
+    builder.group ("Column_Comparisons_" + num_rows.to_text) options group_builder->
+        group_builder.specify "integer_constant" <|
+            (data.ints.at "ints1") <= 5
+        group_builder.specify "integer_column" <|
+            (data.ints.at "ints1") <= (data.ints.at "ints2")
+
+        group_builder.specify "date_constant" <|
+            (data.dates.at "dates1") <= (Date.new 2021 01 01)
+        group_builder.specify "date_column" <|
+            (data.dates.at "dates1") <= (data.dates.at "dates2")
+
+        group_builder.specify "text_constant" <|
+            (data.texts.at "texts1") <= "def"
+        group_builder.specify "text_column" <|
+            (data.texts.at "texts1") <= (data.texts.at "texts2")
+
+        group_builder.specify "bool_column" <|
+            (data.bools.at "bools1") <= (data.bools.at "bools2")
+
+    builder.group ("Column_Minmax_" + num_rows.to_text) options group_builder->
+        group_builder.specify "integer_constant" <|
+            (data.ints.at "ints1") . min 5
+        group_builder.specify "integer_column" <|
+            (data.ints.at "ints1") . min (data.ints.at "ints2")
+
+        group_builder.specify "date_constant" <|
+            (data.dates.at "dates1") . min (Date.new 2021 01 01)
+        group_builder.specify "date_column" <|
+            (data.dates.at "dates1") . min (data.dates.at "dates2")
+
+        group_builder.specify "text_constant" <|
+            (data.texts.at "texts1") . min "def"
+        group_builder.specify "text_column" <|
+            (data.texts.at "texts1") . min (data.texts.at "texts2")
+
+        group_builder.specify "bool_column" <|
+            (data.bools.at "bools1") . min (data.bools.at "bools2")
+
+main = collect_benches . run_main
diff --git a/test/Benchmarks/src/Table/Csv.enso b/test/Benchmarks/src/Table/Csv.enso
index e07dea6161c9..accb763306e0 100644
--- a/test/Benchmarks/src/Table/Csv.enso
+++ b/test/Benchmarks/src/Table/Csv.enso
@@ -10,9 +10,9 @@ type Lazy_Data
     private Write ~table:Table
 
 collect_benches = Bench.build builder->
-    assert Examples.csv_2500_rows.exists "Expecting the file to exist at "+Examples.csv_2500_rows.path
-
-    write_data = Lazy_Data.Write (Examples.csv_2500_rows . read)
+    write_data = Lazy_Data.Write <|
+        assert Examples.csv_2500_rows.exists "Expecting the file to exist at "+Examples.csv_2500_rows.path
+        Examples.csv_2500_rows . read
 
     builder.group ("Read_csv_file") options group_builder->
         group_builder.specify "data_csv" <|
diff --git a/test/Benchmarks/src/Table/Mixed_Operations.enso b/test/Benchmarks/src/Table/Mixed_Operations.enso
new file mode 100644
index 000000000000..6f07825edfc0
--- /dev/null
+++ b/test/Benchmarks/src/Table/Mixed_Operations.enso
@@ -0,0 +1,35 @@
+from Standard.Base import all
+
+from Standard.Table import Table, Value_Type
+
+from Standard.Test import Bench
+
+options = Bench.options . set_warmup (Bench.phase_conf 2 3) . set_measure (Bench.phase_conf 5 1)
+
+create_table : Table
+create_table num_rows =
+    mixed_text = Vector.new num_rows i->
+        case i % 4 of
+            0 -> "txt"
+            1 -> ""
+            2 -> 42
+            3 -> Nothing
+    t = Table.new [["mixed text", mixed_text]]
+    Runtime.assert ((t.at "mixed text" . value_type) == Value_Type.Mixed)
+    t
+
+
+type Data
+    private Value ~table
+
+    create num_rows = Data.Value (create_table num_rows)
+
+collect_benches = Bench.build builder->
+    num_rows = 500 * 1000
+    data = Data.create num_rows
+
+    builder.group ("Mixed_Column_Operations_" + num_rows.to_text) options group_builder->
+        group_builder.specify "is_blank" <|
+            data.table.at "mixed text" . is_blank
+
+main = collect_benches . run_main
diff --git a/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso b/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso
index 414af8c4d444..47164a2816d9 100644
--- a/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso
+++ b/test/Table_Tests/src/Common_Table_Operations/Column_Operations_Spec.enso
@@ -19,7 +19,7 @@ from Standard.Test import all
 import enso_dev.Base_Tests.Data.Round_Spec
 
 import project.Common_Table_Operations.Main.Char_Max_Size_After_Substring_Behavior
-from project.Common_Table_Operations.Util import run_default_backend, within_table, is_float_or_decimal
+from project.Common_Table_Operations.Util import all
 
 main filter=Nothing = run_default_backend add_specs filter
 
@@ -52,6 +52,18 @@ type Min_Max_Data
         c = t.at "c"
         [a, b, c, t]
 
+type Min_Max_Datetime_Data
+    Value ~table
+
+    setup table_builder = Min_Max_Datetime_Data.Value <|
+        dates1 = [Date.new 2021 1 1, Date.new 2021 1 2, Date.new 2021 1 3]
+        dates2 = [Date.new 2021 1 1, Date.new 2021 1 3, Date.new 2000 12 1]
+        times1 = [Time_Of_Day.new 1 2 3 4, Time_Of_Day.new 3 4 5 6, Time_Of_Day.new 5 6 7 8]
+        times2 = [Time_Of_Day.new 1 2 3 4, Time_Of_Day.new 1 1 1 1, Time_Of_Day.new 10 10 10 10]
+        date_times1 = [Date_Time.new 2021 1 1 1 2 3 4, Date_Time.new 2021 1 2 3 4 5 6, Date_Time.new 2021 1 3 5 6 7 8]
+        date_times2 = [Date_Time.new 2021 1 1 1 2 3 4, Date_Time.new 2021 1 3 1 2 3 4, Date_Time.new 2000 12 1 10 10 10 10]
+        table_builder [["ix", [1, 2, 3]], ["dates1", dates1], ["dates2", dates2], ["times1", times1], ["times2", times2], ["date_times1", date_times1], ["date_times2", date_times2]] . sort "ix"
+
 type Literal_Data
     Value ~data
 
@@ -1374,6 +1386,46 @@ add_specs suite_builder setup =
             c10.to_vector . should_equal [True, False, True]
             c10.value_type.should_equal Value_Type.Boolean
 
+        group_builder.specify "should allow Date/Time columns" pending=pending_datetime <|
+            dt_data = Min_Max_Datetime_Data.setup setup.table_builder
+            c1 = dt_data.table.at "dates1" . min (Date.new 2021 1 2)
+            c1.to_vector . should_equal [Date.new 2021 1 1, Date.new 2021 1 2, Date.new 2021 1 2]
+            c1.value_type.should_equal Value_Type.Date
+
+            c2 = dt_data.table.at "dates1" . min (dt_data.table.at "dates2")
+            c2.to_vector . should_equal [Date.new 2021 1 1, Date.new 2021 1 2, Date.new 2000 12 1]
+
+            c3 = dt_data.table.at "dates1" . max (Date.new 2021 1 2)
+            c3.to_vector . should_equal [Date.new 2021 1 2, Date.new 2021 1 2, Date.new 2021 1 3]
+
+            c4 = dt_data.table.at "dates1" . max (dt_data.table.at "dates2")
+            c4.to_vector . should_equal [Date.new 2021 1 1, Date.new 2021 1 3, Date.new 2021 1 3]
+
+            c5 = dt_data.table.at "times1" . min (Time_Of_Day.new 2 2 2)
+            c5.to_vector . should_equal [Time_Of_Day.new 1 2 3 4, Time_Of_Day.new 2 2 2, Time_Of_Day.new 2 2 2]
+            c5.value_type.should_equal Value_Type.Time
+
+            c6 = dt_data.table.at "times1" . min (dt_data.table.at "times2")
+            c6.to_vector . should_equal [Time_Of_Day.new 1 2 3 4, Time_Of_Day.new 1 1 1 1, Time_Of_Day.new 5 6 7 8]
+
+            c7 = dt_data.table.at "times1" . max (Time_Of_Day.new 2 2 2)
+            c7.to_vector . should_equal [Time_Of_Day.new 2 2 2, Time_Of_Day.new 3 4 5 6, Time_Of_Day.new 5 6 7 8]
+
+            c8 = dt_data.table.at "times1" . max (dt_data.table.at "times2")
+            c8.to_vector . should_equal [Time_Of_Day.new 1 2 3 4, Time_Of_Day.new 3 4 5 6, Time_Of_Day.new 10 10 10 10]
+
+            c9 = dt_data.table.at "date_times1" . min (Date_Time.new 2021 1 2 2 2 2)
+            c9.to_vector . should_equal_tz_agnostic [Date_Time.new 2021 1 1 1 2 3 4, Date_Time.new 2021 1 2 2 2 2, Date_Time.new 2021 1 2 2 2 2]
+
+            c10 = dt_data.table.at "date_times1" . min (dt_data.table.at "date_times2")
+            c10.to_vector . should_equal_tz_agnostic [Date_Time.new 2021 1 1 1 2 3 4, Date_Time.new 2021 1 2 3 4 5 6, Date_Time.new 2000 12 1 10 10 10 10]
+
+            c11 = dt_data.table.at "date_times1" . max (Date_Time.new 2021 1 2 2 2 2)
+            c11.to_vector . should_equal_tz_agnostic [Date_Time.new 2021 1 2 2 2 2, Date_Time.new 2021 1 2 3 4 5 6, Date_Time.new 2021 1 3 5 6 7 8]
+
+            c12 = dt_data.table.at "date_times1" . max (dt_data.table.at "date_times2")
+            c12.to_vector . should_equal_tz_agnostic [Date_Time.new 2021 1 1 1 2 3 4, Date_Time.new 2021 1 3 1 2 3 4, Date_Time.new 2021 1 3 5 6 7 8]
+
         group_builder.specify "should check types" <|
             [(.min), (.max)].each op->
                 op data.a data.c . should_fail_with Invalid_Value_Type
diff --git a/test/Table_Tests/src/In_Memory/Bool_Spec.enso b/test/Table_Tests/src/In_Memory/Bool_Spec.enso
new file mode 100644
index 000000000000..2e4d8577cb10
--- /dev/null
+++ b/test/Table_Tests/src/In_Memory/Bool_Spec.enso
@@ -0,0 +1,97 @@
+from Standard.Base import all
+
+from Standard.Table import Column
+
+from Standard.Test import all
+
+main filter=Nothing =
+    suite = Test.build suite_builder->
+        add_specs suite_builder
+    suite.run_with_filter filter
+
+## We use some tricks to make boolean operations faster.
+   Because these tricks rely on non-trivial logic, there is also a slightly higher risk of mistakes, so we add a better test coverage.
+add_specs suite_builder = suite_builder.group "[In-Memory] Boolean Column operations" group_builder->
+    # We check all combinations of boolean operations.
+    xs = [True, False, Nothing, True,  False, Nothing, True,    False,   Nothing]
+    ys = [True, True,  True,    False, False, False,   Nothing, Nothing, Nothing]
+    with_transformed_columns f =
+        [False, True].each x_negated->
+            [False, True].each y_negated->
+                [False, True].each y_shortened->
+                    xs_vec = if x_negated then xs.map (x-> if x.is_nothing then Nothing else x.not) else xs
+                    ys_vec_0 = if y_negated then ys.map (y-> if y.is_nothing then Nothing else y.not) else ys
+                    ys_vec = if y_shortened then ys_vec_0.drop (..Last 3) else ys_vec_0
+
+                    x_col_0 = Column.from_vector "X" xs_vec
+                    x_col = if x_negated then x_col_0.not else x_col_0
+
+                    y_col_0 = Column.from_vector "Y" ys_vec
+                    y_col = if y_negated then y_col_0.not else y_col_0
+
+                    x_desc = (if x_negated then ["negated X"] else [])
+                    y_desc = (if y_negated then ["negated Y"] else []) + (if y_shortened then ["shortened Y"] else [])
+                    clue = if x_desc.is_empty && y_desc.is_empty then "" else (x_desc+y_desc).join ", " " (" ") "
+                    Test.with_clue clue <|
+                        f x_col y_col
+
+    group_builder.specify "comparisons" <| with_transformed_columns x_col-> y_col->
+        comparisons = [["<", (<)], ["<=", (<=)], [">", (>)], [">=", (>=)], ["==", (==)], ["!=", (!=)]]
+        comparisons.each p->
+            op_name = p.first
+            op = p.second
+            enso_op x y = if x.is_nothing || y.is_nothing then Nothing else op x y
+            Test.with_clue "("+op_name+"): " <|
+                got_1 = op x_col y_col
+                expected_1 = xs.zip ys enso_op
+                got_1.to_vector . should_equal expected_1
+
+                [True, False, Nothing].each scalar-> Test.with_clue "([X] "+op_name+" "+scalar.to_text+"): " <|
+                    got_2 = op x_col scalar
+                    expected_2 = xs.map x-> enso_op x scalar
+                    got_2.to_vector . should_equal expected_2
+
+    group_builder.specify "logical" <| with_transformed_columns x_col-> y_col->
+        # Or and And work like in Database - if one value is missing, the result is set if that value being set to something would not influence the result.
+        enso_or x y = case Pair.Value x y of
+            Pair.Value True _ -> True
+            Pair.Value _ True -> True
+            Pair.Value False False -> False
+            Pair.Value _ _ -> Nothing
+        enso_and x y = case Pair.Value x y of
+            Pair.Value False _ -> False
+            Pair.Value _ False -> False
+            Pair.Value True True -> True
+            Pair.Value _ _ -> Nothing
+        comparisons = [["||", (||), enso_or], ["&&", (&&), enso_and]]
+        comparisons.each p->
+            op_name = p.first
+            op = p.second
+            enso_op = p.at 2
+            Test.with_clue "("+op_name+"): " <|
+                got_1 = op x_col y_col
+                expected_1 = xs.zip ys enso_op
+                got_1.to_vector . should_equal expected_1
+
+                [True, False, Nothing].each scalar-> Test.with_clue "([X] "+op_name+" "+scalar.to_text+"): " <|
+                    got_2 = op x_col scalar
+                    expected_2 = xs.map x-> enso_op x scalar
+                    got_2.to_vector . should_equal expected_2
+
+    group_builder.specify "min/max" <| with_transformed_columns x_col-> y_col->
+        enso_min x y = if x.is_nothing then y else if y.is_nothing then x else if x < y then x else y
+        enso_max x y = if x.is_nothing then y else if y.is_nothing then x else if x > y then x else y
+        comparisons = [["min", (.min), enso_min], ["max", (.max), enso_max]]
+        comparisons.each p->
+            op_name = p.first
+            op = p.second
+            enso_op = p.at 2
+            Test.with_clue "("+op_name+"): " <|
+                got_1 = op x_col y_col
+                expected_1 = xs.zip ys enso_op
+                got_1.to_vector . should_equal expected_1
+
+                [True, False, Nothing].each scalar-> Test.with_clue op_name+"([X], "+scalar.to_text+"): " <|
+                    got_2 = op x_col scalar
+                    expected_2 = xs.map x-> enso_op x scalar
+                    got_2.to_vector . should_equal expected_2
diff --git a/test/Table_Tests/src/In_Memory/Main.enso b/test/Table_Tests/src/In_Memory/Main.enso
index c81877d7ac27..b2113f775741 100644
--- a/test/Table_Tests/src/In_Memory/Main.enso
+++ b/test/Table_Tests/src/In_Memory/Main.enso
@@ -3,6 +3,7 @@ from Standard.Base import all
 from Standard.Test import all
 
 import project.In_Memory.Aggregate_Column_Spec
+import project.In_Memory.Bool_Spec
 import project.In_Memory.Builders_Spec
 import project.In_Memory.Column_Spec
 import project.In_Memory.Column_Format_Spec
@@ -23,6 +24,7 @@ import project.In_Memory.Table_Running_Spec
 
 add_specs suite_builder =
     Aggregate_Column_Spec.add_specs suite_builder
+    Bool_Spec.add_specs suite_builder
     Builders_Spec.add_specs suite_builder
     Column_Format_Spec.add_specs suite_builder
     Column_Spec.add_specs suite_builder

From 9fc6af12c5e4336e600eb26da5d0796d556edd9c Mon Sep 17 00:00:00 2001
From: AdRiley <riley.ad@gmail.com>
Date: Tue, 13 Aug 2024 11:25:21 +0100
Subject: [PATCH 19/23] Clean up Text option from read and query (#10790)

* Revert

* from

* Fix

* fix

* Last few details

* Fix

* Fix test

* Fix

* Cleanup

* Fix error message

* fix

* Fix

* Improve error message
---
 .../Redshift/Internal/Redshift_Dialect.enso   |  6 ---
 .../0.0.0-dev/src/Connection/Connection.enso  | 41 +++++++------------
 .../Database/0.0.0-dev/src/Dialect.enso       |  8 ----
 .../Database/0.0.0-dev/src/Errors.enso        | 19 +--------
 .../src/Internal/Base_Generator.enso          |  6 ---
 .../Postgres/Postgres_Connection.enso         | 14 +++----
 .../Internal/Postgres/Postgres_Dialect.enso   |  6 ---
 .../Internal/SQLite/SQLite_Connection.enso    | 14 +++----
 .../src/Internal/SQLite/SQLite_Dialect.enso   |  6 ---
 .../Database/0.0.0-dev/src/SQL_Query.enso     |  3 ++
 .../src/Internal/SQLServer_Connection.enso    | 14 +++----
 .../src/Internal/SQLServer_Dialect.enso       |  6 ---
 .../src/Internal/Snowflake_Connection.enso    | 14 +++----
 .../src/Internal/Snowflake_Dialect.enso       |  6 ---
 test/Snowflake_Tests/src/Snowflake_Spec.enso  |  4 +-
 .../src/Database/Common/Audit_Spec.enso       |  4 +-
 .../src/Database/Common/Common_Spec.enso      | 29 -------------
 .../Common/Names_Length_Limits_Spec.enso      |  6 +--
 .../src/Database/Postgres_Spec.enso           | 10 ++---
 .../Table_Tests/src/Database/SQLite_Spec.enso |  4 +-
 .../Types/Postgres_Type_Mapping_Spec.enso     |  6 +--
 .../src/Widgets/Database_Widgets_Spec.enso    |  4 +-
 22 files changed, 64 insertions(+), 166 deletions(-)

diff --git a/distribution/lib/Standard/AWS/0.0.0-dev/src/Database/Redshift/Internal/Redshift_Dialect.enso b/distribution/lib/Standard/AWS/0.0.0-dev/src/Database/Redshift/Internal/Redshift_Dialect.enso
index da342cdb6819..16ded8eae0ee 100644
--- a/distribution/lib/Standard/AWS/0.0.0-dev/src/Database/Redshift/Internal/Redshift_Dialect.enso
+++ b/distribution/lib/Standard/AWS/0.0.0-dev/src/Database/Redshift/Internal/Redshift_Dialect.enso
@@ -103,12 +103,6 @@ type Redshift_Dialect
     prepare_order_descriptor self internal_column sort_direction text_ordering =
         Postgres_Dialect.make_order_descriptor internal_column sort_direction text_ordering
 
-    ## PRIVATE
-       A heuristic used by `Connection.query` to determine if a given text looks
-       like a SQL query for the given dialect or is rather a table name.
-    is_probably_a_query : Text -> Boolean
-    is_probably_a_query self text = Base_Generator.is_probably_a_query text
-
     ## PRIVATE
        Returns the mapping between SQL types of this dialect and Enso
        `Value_Type`.
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Connection/Connection.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Connection/Connection.enso
index 5f3c952cae2e..03e0fccbb589 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Connection/Connection.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Connection/Connection.enso
@@ -202,8 +202,7 @@ type Connection
 
        Arguments:
        - query: name of the table or sql statement to query.
-         If supplied as `Text`, the name is checked against the `tables` list to
-         determine if it is a table or a query.
+         If supplied as `Text` it is treated as a table name.
        - alias: optionally specify a friendly alias for the query.
 
        ! Error Conditions
@@ -214,17 +213,12 @@ type Connection
          - If provided with a `Table_Name` or a text short-hand and the table is
            not found, a `Table_Not_Found` error is raised.
     @query make_table_name_selector
-    query : Text | SQL_Query -> Text -> DB_Table ! Table_Not_Found | SQL_Error
-    query self query alias="" = case query of
-        _ : Text ->
-            result = self.query alias=alias <|
-                if self.table_exists query then (SQL_Query.Table_Name query) else
-                    SQL_Query.Raw_SQL query
-            result.catch SQL_Error sql_error->
-                case self.dialect.is_probably_a_query query of
-                    True -> result
-                    False ->
-                        Error.throw (Table_Not_Found.Error query sql_error treated_as_query=True extra_message="")
+    query : SQL_Query -> Text -> DB_Table ! Table_Not_Found | SQL_Error
+    query self query:SQL_Query alias="" = case query of
+        SQL_Query.Table_Name name ->
+            table_naming_helper = self.base_connection.table_naming_helper
+            table_naming_helper.verify_table_name name <|
+                make_table_for_name self name alias
         SQL_Query.Raw_SQL raw_sql -> handle_sql_errors <| alias.if_not_error <|
             self.jdbc_connection.ensure_query_has_no_holes raw_sql . if_not_error <|
                 columns = self.fetch_columns raw_sql Statement_Setter.null
@@ -242,20 +236,13 @@ type Connection
                 r = DB_Table_Module.make_table self name columns ctx on_problems=Problem_Behavior.Report_Error
                 r.catch Any error->
                     Error.throw (Illegal_Argument.Error "The provided custom SQL query is invalid and may suffer data corruption when being processed, especially if it contains aliased column names, it may not be interpreted correctly. Please ensure the names are unique. The original error was: "+error.to_display_text cause=error)
-        SQL_Query.Table_Name name ->
-            case self.table_naming_helper.is_table_name_valid name of
-                True -> make_table_for_name self name alias
-                False ->
-                    Error.throw (Table_Not_Found.Error name related_query_error=Nothing treated_as_query=False extra_message="")
-
 
     ## PRIVATE
        Execute the query and load the results into memory as a Table.
 
        Arguments:
        - query: name of the table or sql statement to query.
-         If supplied as `Text`, the name is checked against the `tables` list to
-         determine if it is a table or a query.
+         If supplied as `Text` it is treated as a table name.
        - limit: the maximum number of rows to read.
 
        ? Side Effects
@@ -267,8 +254,8 @@ type Connection
          results, the `read` should be wrapped in an execution context check.
     @query make_table_name_selector
     @limit Rows_To_Read.default_widget
-    read : Text | SQL_Query -> Rows_To_Read -> Table ! Table_Not_Found
-    read self query (limit : Rows_To_Read = ..First_With_Warning 1000) =
+    read : SQL_Query -> Rows_To_Read -> Table ! Table_Not_Found
+    read self query:SQL_Query (limit : Rows_To_Read = ..First_With_Warning 1000) =
         self.query query . read max_rows=limit
 
     ## PRIVATE
@@ -513,7 +500,9 @@ make_schema_selector connection include_any:Boolean=False =
 make_table_name_selector : Connection -> Widget
 make_table_name_selector connection =
     tables_to_display = connection.tables.at "Name" . to_vector
-    Single_Choice display=Display.Always values=(tables_to_display.map t-> Option t t.pretty)
+    table_name_values = tables_to_display.map t-> Option t t.pretty
+    values = table_name_values + [Option '<Table_Name>' '..Table_Name ""', Option '<Raw_SQL>' '..Raw_SQL ""']
+    Single_Choice display=Display.Always values=values
 
 ## PRIVATE
 make_structure_creator : Widget
@@ -535,8 +524,8 @@ make_table_for_name connection name alias internal_temporary_keep_alive_referenc
            warning. We do not want to fail, as we do want to allow the user to
            access any table already present in the database.
         DB_Table_Module.make_table connection name columns ctx on_problems=Problem_Behavior.Report_Warning
-    result.catch SQL_Error sql_error->
-        Error.throw (Table_Not_Found.Error name sql_error treated_as_query=False extra_message="")
+    result.catch SQL_Error _->
+        Error.throw (Table_Not_Found.Error name)
 
 ## PRIVATE
 private check_statement_is_allowed connection stmt =
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Dialect.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Dialect.enso
index 89ccd032e54d..4e3cc00d1e8c 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Dialect.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Dialect.enso
@@ -85,14 +85,6 @@ type Dialect
         _ = [table, key_columns, case_sensitivity, problem_builder]
         Unimplemented.throw "This is an interface only."
 
-    ## PRIVATE
-       A heuristic used by `Connection.query` to determine if a given text looks
-       like a SQL query for the given dialect or is rather a table name.
-    is_probably_a_query : Text -> Boolean
-    is_probably_a_query self text =
-        _ = [text]
-        Unimplemented.throw "This is an interface only."
-
     ## PRIVATE
        Returns the mapping between SQL types of this dialect and Enso
        `Value_Type`.
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Errors.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Errors.enso
index e9dc8426e5ca..800f4b3c58ea 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Errors.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Errors.enso
@@ -123,27 +123,12 @@ type Table_Not_Found
 
        Arguments:
        - table_name: The name of the table that was not found.
-       - related_query_error: The error that was thrown when the query looking
-         for the table was executed.
-       - treated_as_query: Whether the table name was treated as a raw query
-         string.
-       - extra_message: An extra message to append.
-    Error (name:Text) (related_query_error:SQL_Error|Nothing) (treated_as_query:Boolean) (extra_message:Text)
+    Error (name:Text)
 
     ## PRIVATE
        Pretty print the table not found error.
     to_display_text : Text
-    to_display_text self =
-        base_repr = case self.treated_as_query of
-            True -> "The name " + self.name + " was treated as a query, but the query failed with the following error: " + self.related_query_error.to_display_text + "; if you want to force to use that as a table name, wrap it in `SQL_Query.Table_Name`."
-            False -> "Table " + self.name + " was not found in the database."
-        base_repr + self.extra_message
-
-    ## PRIVATE
-       Creates a copy of this error with a changed `extra_message`.
-    with_changed_extra_message : Text -> Table_Not_Found
-    with_changed_extra_message self new_extra_message =
-        Table_Not_Found.Error self.name self.related_query_error self.treated_as_query new_extra_message
+    to_display_text self = "Table " + self.name + " was not found in the database."
 
 type Table_Already_Exists
     ## PRIVATE
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Base_Generator.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Base_Generator.enso
index 8744bdfd8b5a..781278c5aa99 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Base_Generator.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Base_Generator.enso
@@ -603,12 +603,6 @@ generate_column_description dialect descriptor =
         SQL_Builder.code " " ++ (SQL_Builder.join " " modifiers)
     (dialect.wrap_identifier descriptor.name) ++ " " ++ descriptor.sql_type ++ suffix
 
-## PRIVATE
-   A heuristic used by `Connection.query` to determine if a given text looks
-   like a SQL query for the given dialect or is rather a table name.
-is_probably_a_query : Text -> Boolean
-is_probably_a_query text = (text.contains "SELECT ") || (text.contains "EXEC ")
-
 ## PRIVATE
    option for implementing generate_truncate_table_sql
 truncate_table_delete_from_style : Dialect -> Text -> SQL_Builder
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Connection.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Connection.enso
index f12298eef3c9..6bbc9c8e4438 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Connection.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Connection.enso
@@ -145,8 +145,7 @@ type Postgres_Connection
 
        Arguments:
        - query: name of the table or sql statement to query.
-         If supplied as `Text`, the name is checked against the `tables` list to
-         determine if it is a table or a query.
+         If supplied as `Text` it is treated as a table name.
        - alias: optionally specify a friendly alias for the query.
 
        ! Error Conditions
@@ -157,8 +156,8 @@ type Postgres_Connection
          - If provided with a `Table_Name` or a text short-hand and the table is
            not found, a `Table_Not_Found` error is raised.
     @query make_table_name_selector
-    query : Text | SQL_Query -> Text -> DB_Table ! Table_Not_Found
-    query self query alias="" = self.connection.query query alias
+    query : SQL_Query -> Text -> DB_Table ! Table_Not_Found
+    query self query:SQL_Query alias="" = self.connection.query query alias
 
     ## GROUP Standard.Base.Input
        ICON data_input
@@ -166,8 +165,7 @@ type Postgres_Connection
 
        Arguments:
        - query: name of the table or sql statement to query.
-         If supplied as `Text`, the name is checked against the `tables` list to
-         determine if it is a table or a query.
+         If supplied as `Text` it is treated as a table name.
        - limit: the maximum number of rows to read.
 
        ? Side Effects
@@ -179,8 +177,8 @@ type Postgres_Connection
          results, the `read` should be wrapped in an execution context check.
     @query make_table_name_selector
     @limit Rows_To_Read.default_widget
-    read : Text | SQL_Query -> Rows_To_Read -> Table ! Table_Not_Found
-    read self query (limit : Rows_To_Read = ..First_With_Warning 1000) =
+    read : SQL_Query -> Rows_To_Read -> Table ! Table_Not_Found
+    read self query:SQL_Query (limit : Rows_To_Read = ..First_With_Warning 1000) =
         self.connection.read query limit
 
     ## GROUP Standard.Base.Output
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Dialect.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Dialect.enso
index 2e55a876b5aa..4835dfaa2ddf 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Dialect.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/Postgres/Postgres_Dialect.enso
@@ -133,12 +133,6 @@ type Postgres_Dialect
         new_context = Context.for_subquery setup.subquery . add_extension (make_distinct_extension distinct_expressions)
         table.updated_context_and_columns new_context new_columns subquery=True
 
-    ## PRIVATE
-       A heuristic used by `Connection.query` to determine if a given text looks
-       like a SQL query for the given dialect or is rather a table name.
-    is_probably_a_query : Text -> Boolean
-    is_probably_a_query self text = Base_Generator.is_probably_a_query text
-
     ## PRIVATE
        Returns the mapping between SQL types of this dialect and Enso
        `Value_Type`.
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Connection.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Connection.enso
index b96b4bf8bb1d..b076f66b5d63 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Connection.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Connection.enso
@@ -131,8 +131,7 @@ type SQLite_Connection
 
        Arguments:
        - query: name of the table or sql statement to query.
-         If supplied as `Text`, the name is checked against the `tables` list to
-         determine if it is a table or a query.
+         If supplied as `Text` it is treated as a table name.
        - alias: optionally specify a friendly alias for the query.
 
        ! Error Conditions
@@ -143,8 +142,8 @@ type SQLite_Connection
          - If provided with a `Table_Name` or a text short-hand and the table is
            not found, a `Table_Not_Found` error is raised.
     @query make_table_name_selector
-    query : Text | SQL_Query -> Text -> DB_Table ! Table_Not_Found
-    query self query alias="" = self.connection.query query alias
+    query : SQL_Query -> Text -> DB_Table ! Table_Not_Found
+    query self query:SQL_Query alias="" = self.connection.query query alias
 
     ## GROUP Standard.Base.Input
        ICON data_input
@@ -152,8 +151,7 @@ type SQLite_Connection
 
        Arguments:
        - query: name of the table or sql statement to query.
-         If supplied as `Text`, the name is checked against the `tables` list to
-         determine if it is a table or a query.
+         If supplied as `Text` it is treated as a table name.
        - limit: the maximum number of rows to read.
 
        ? Side Effects
@@ -165,8 +163,8 @@ type SQLite_Connection
          results, the `read` should be wrapped in an execution context check.
     @query make_table_name_selector
     @limit Rows_To_Read.default_widget
-    read : Text | SQL_Query -> Rows_To_Read -> Table ! Table_Not_Found
-    read self query (limit : Rows_To_Read = ..First_With_Warning 1000) =
+    read : SQL_Query -> Rows_To_Read -> Table ! Table_Not_Found
+    read self query:SQL_Query (limit : Rows_To_Read = ..First_With_Warning 1000) =
         self.connection.read query limit
 
     ## GROUP Standard.Base.Output
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Dialect.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Dialect.enso
index c2bcd7e332f4..32d70b86f37c 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Dialect.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/Internal/SQLite/SQLite_Dialect.enso
@@ -141,12 +141,6 @@ type SQLite_Dialect
         new_context = Context.for_subquery setup.subquery . set_groups distinct_expressions
         table.updated_context_and_columns new_context new_columns subquery=True
 
-    ## PRIVATE
-       A heuristic used by `Connection.query` to determine if a given text looks
-       like a SQL query for the given dialect or is rather a table name.
-    is_probably_a_query : Text -> Boolean
-    is_probably_a_query self text = Base_Generator.is_probably_a_query text
-
     ## PRIVATE
        Returns the mapping between SQL types of this dialect and Enso
        `Value_Type`.
diff --git a/distribution/lib/Standard/Database/0.0.0-dev/src/SQL_Query.enso b/distribution/lib/Standard/Database/0.0.0-dev/src/SQL_Query.enso
index 0ca29500c74f..2c40f1783d0a 100644
--- a/distribution/lib/Standard/Database/0.0.0-dev/src/SQL_Query.enso
+++ b/distribution/lib/Standard/Database/0.0.0-dev/src/SQL_Query.enso
@@ -7,3 +7,6 @@ type SQL_Query
 
     ## Raw SQL query statement.
     Raw_SQL (sql : Text = Missing_Argument.throw "sql")
+
+## PRIVATE
+SQL_Query.from (that:Text) = SQL_Query.Table_Name that
diff --git a/distribution/lib/Standard/Microsoft/0.0.0-dev/src/Internal/SQLServer_Connection.enso b/distribution/lib/Standard/Microsoft/0.0.0-dev/src/Internal/SQLServer_Connection.enso
index 5a438fc03140..c1ff786833f3 100644
--- a/distribution/lib/Standard/Microsoft/0.0.0-dev/src/Internal/SQLServer_Connection.enso
+++ b/distribution/lib/Standard/Microsoft/0.0.0-dev/src/Internal/SQLServer_Connection.enso
@@ -138,8 +138,7 @@ type SQLServer_Connection
 
        Arguments:
        - query: name of the table or sql statement to query.
-         If supplied as `Text`, the name is checked against the `tables` list to
-         determine if it is a table or a query.
+         If supplied as `Text` it is treated as a table name.
        - alias: optionally specify a friendly alias for the query.
 
        ! Error Conditions
@@ -150,8 +149,8 @@ type SQLServer_Connection
          - If provided with a `Table_Name` or a text short-hand and the table is
            not found, a `Table_Not_Found` error is raised.
     @query make_table_name_selector
-    query : Text | SQL_Query -> Text -> DB_Table ! Table_Not_Found
-    query self query alias="" = self.connection.query query alias
+    query : SQL_Query -> Text -> DB_Table ! Table_Not_Found
+    query self query:SQL_Query alias="" = self.connection.query query alias
 
     ## GROUP Standard.Base.Input
        ICON data_input
@@ -159,8 +158,7 @@ type SQLServer_Connection
 
        Arguments:
        - query: name of the table or sql statement to query.
-         If supplied as `Text`, the name is checked against the `tables` list to
-         determine if it is a table or a query.
+         If supplied as `Text` it is treated as a table name.
        - limit: the maximum number of rows to read.
 
        ? Side Effects
@@ -172,8 +170,8 @@ type SQLServer_Connection
          results, the `read` should be wrapped in an execution context check.
     @query make_table_name_selector
     @limit Rows_To_Read.default_widget
-    read : Text | SQL_Query -> Rows_To_Read -> Table ! Table_Not_Found
-    read self query (limit : Rows_To_Read = ..First_With_Warning 1000) =
+    read : SQL_Query -> Rows_To_Read -> Table ! Table_Not_Found
+    read self query:SQL_Query (limit : Rows_To_Read = ..First_With_Warning 1000) =
         self.connection.read query limit
 
     ## GROUP Standard.Base.Output
diff --git a/distribution/lib/Standard/Microsoft/0.0.0-dev/src/Internal/SQLServer_Dialect.enso b/distribution/lib/Standard/Microsoft/0.0.0-dev/src/Internal/SQLServer_Dialect.enso
index 001bc818d683..9338cbf63ff5 100644
--- a/distribution/lib/Standard/Microsoft/0.0.0-dev/src/Internal/SQLServer_Dialect.enso
+++ b/distribution/lib/Standard/Microsoft/0.0.0-dev/src/Internal/SQLServer_Dialect.enso
@@ -132,12 +132,6 @@ type SQLSever_Dialect
         new_context = Context.for_subquery setup.subquery . add_extension (make_distinct_extension distinct_expressions)
         table.updated_context_and_columns new_context new_columns subquery=True
 
-    ## PRIVATE
-       A heuristic used by `Connection.query` to determine if a given text looks
-       like a SQL query for the given dialect or is rather a table name.
-    is_probably_a_query : Text -> Boolean
-    is_probably_a_query self text = Base_Generator.is_probably_a_query text
-
     ## PRIVATE
        Returns the mapping between SQL types of this dialect and Enso
        `Value_Type`.
diff --git a/distribution/lib/Standard/Snowflake/0.0.0-dev/src/Internal/Snowflake_Connection.enso b/distribution/lib/Standard/Snowflake/0.0.0-dev/src/Internal/Snowflake_Connection.enso
index 083a77148d89..8f3f4248552d 100644
--- a/distribution/lib/Standard/Snowflake/0.0.0-dev/src/Internal/Snowflake_Connection.enso
+++ b/distribution/lib/Standard/Snowflake/0.0.0-dev/src/Internal/Snowflake_Connection.enso
@@ -165,8 +165,7 @@ type Snowflake_Connection
 
        Arguments:
        - query: name of the table or sql statement to query.
-         If supplied as `Text`, the name is checked against the `tables` list to
-         determine if it is a table or a query.
+         If supplied as `Text` it is treated as a table name.
        - alias: optionally specify a friendly alias for the query.
 
        ! Error Conditions
@@ -177,8 +176,8 @@ type Snowflake_Connection
          - If provided with a `Table_Name` or a text short-hand and the table is
            not found, a `Table_Not_Found` error is raised.
     @query make_table_name_selector
-    query : Text | SQL_Query -> Text -> DB_Table ! Table_Not_Found
-    query self query alias="" = self.connection.query query alias
+    query : SQL_Query -> Text -> DB_Table ! Table_Not_Found
+    query self query:SQL_Query alias="" = self.connection.query query alias
 
     ## GROUP Standard.Base.Input
        ICON data_input
@@ -186,8 +185,7 @@ type Snowflake_Connection
 
        Arguments:
        - query: name of the table or sql statement to query.
-         If supplied as `Text`, the name is checked against the `tables` list to
-         determine if it is a table or a query.
+         If supplied as `Text` it is treated as a table name.
        - limit: the maximum number of rows to read.
 
        ? Side Effects
@@ -199,8 +197,8 @@ type Snowflake_Connection
          results, the `read` should be wrapped in an execution context check.
     @query make_table_name_selector
     @limit Rows_To_Read.default_widget
-    read : Text | SQL_Query -> Rows_To_Read -> Table ! Table_Not_Found
-    read self query (limit : Rows_To_Read = ..First_With_Warning 1000) =
+    read : SQL_Query -> Rows_To_Read -> Table ! Table_Not_Found
+    read self query:SQL_Query (limit : Rows_To_Read = ..First_With_Warning 1000) =
         self.connection.read query limit
 
     ## GROUP Standard.Base.Output
diff --git a/distribution/lib/Standard/Snowflake/0.0.0-dev/src/Internal/Snowflake_Dialect.enso b/distribution/lib/Standard/Snowflake/0.0.0-dev/src/Internal/Snowflake_Dialect.enso
index c03fbb884dff..17aa7283b4dd 100644
--- a/distribution/lib/Standard/Snowflake/0.0.0-dev/src/Internal/Snowflake_Dialect.enso
+++ b/distribution/lib/Standard/Snowflake/0.0.0-dev/src/Internal/Snowflake_Dialect.enso
@@ -141,12 +141,6 @@ type Snowflake_Dialect
             . add_extension (make_distinct_extension distinct_expressions)
         table.updated_context_and_columns new_context new_columns subquery=True
 
-    ## PRIVATE
-       A heuristic used by `Connection.query` to determine if a given text looks
-       like a SQL query for the given dialect or is rather a table name.
-    is_probably_a_query : Text -> Boolean
-    is_probably_a_query self text = Base_Generator.is_probably_a_query text
-
     ## PRIVATE
        Returns the mapping between SQL types of this dialect and Enso
        `Value_Type`.
diff --git a/test/Snowflake_Tests/src/Snowflake_Spec.enso b/test/Snowflake_Tests/src/Snowflake_Spec.enso
index a150cc9e3950..2be5a7bc9e52 100644
--- a/test/Snowflake_Tests/src/Snowflake_Spec.enso
+++ b/test/Snowflake_Tests/src/Snowflake_Spec.enso
@@ -321,11 +321,11 @@ snowflake_specific_spec suite_builder default_connection db_name setup =
             m2.at "ś"   . to_vector . should_equal ["A"]
             m2.at "ś 1" . to_vector . should_equal [2]
 
-            r3 = default_connection.get.query 'SELECT 1 AS "A", 2 AS "A"'
+            r3 = default_connection.get.query (SQL_Query.Raw_SQL 'SELECT 1 AS "A", 2 AS "A"')
             r3.should_fail_with Illegal_Argument
             r3.catch.cause . should_be_a Duplicate_Output_Column_Names
 
-            r4 = default_connection.get.query 'SELECT 1 AS ""'
+            r4 = default_connection.get.query (SQL_Query.Raw_SQL 'SELECT 1 AS ""')
             r4.should_fail_with Illegal_Argument
             r4.catch.to_display_text . should_contain "The provided custom SQL query is invalid and may suffer data corruption"
             r4.catch.to_display_text . should_contain "The name '' is invalid"
diff --git a/test/Table_Tests/src/Database/Common/Audit_Spec.enso b/test/Table_Tests/src/Database/Common/Audit_Spec.enso
index eb2adb005e5d..63c8ad4113a0 100644
--- a/test/Table_Tests/src/Database/Common/Audit_Spec.enso
+++ b/test/Table_Tests/src/Database/Common/Audit_Spec.enso
@@ -60,7 +60,7 @@ add_specs suite_builder prefix ~datalink_to_connection database_pending =
         group_builder.specify "should see Database operations performed manually" <| cloud_setup.with_prepared_environment <|
             audited_connection = datalink_to_connection.read
             query = "SELECT 1 AS A, 2 AS B, "+(Random.integer 0 1000000).to_text+" AS C"
-            t = audited_connection.read query
+            t = audited_connection.read (SQL_Query.Raw_SQL query)
             # Force the connector to perform the query:
             t.at 0 . to_vector . should_equal [1]
 
@@ -80,7 +80,7 @@ add_specs suite_builder prefix ~datalink_to_connection database_pending =
                 locally_audited_connection = datalink_to_connection.read
 
                 # We just check that we can read queries through this connection:
-                locally_audited_connection.read "SELECT 1" . at 0 . to_vector . should_equal [1]
+                locally_audited_connection.read (SQL_Query.Raw_SQL "SELECT 1") . at 0 . to_vector . should_equal [1]
 
         group_builder.specify "should know the asset id of the data link used for the connection" pending="TODO: https://github.com/enso-org/enso/issues/9869" <|
             ## TODO:
diff --git a/test/Table_Tests/src/Database/Common/Common_Spec.enso b/test/Table_Tests/src/Database/Common/Common_Spec.enso
index 163deb210604..d53e287f8e8f 100644
--- a/test/Table_Tests/src/Database/Common/Common_Spec.enso
+++ b/test/Table_Tests/src/Database/Common/Common_Spec.enso
@@ -229,22 +229,6 @@ add_specs (suite_builder : Suite_Builder) (prefix : Text) (create_connection_fn
             m2.at "b" . to_vector . should_equal [5]
             m2.at "a" . should_fail_with No_Such_Column
 
-        group_builder.specify "should allow a shorthand trying to deduce if the query is a table name or an SQL query" <|
-            name = data.t1.name
-            t2 = data.connection.query name
-            t2.read . should_equal data.t1.read
-
-            t3 = data.connection.query ('SELECT "a", "b" FROM "' + name + '" WHERE "a" >= 3')
-            m3 = t3.read
-            m3.column_names . should_equal ["a", "b"]
-            m3.at "a" . to_vector . should_equal [4]
-
-            t5 = data.connection.query data.t4.name
-            m5 = t5.read
-            m5.column_names . should_equal ["X", "Y"]
-            m5.at "X" . to_vector . should_equal ["a", "B"]
-            m5.at "Y" . to_vector . should_equal [2, 5]
-
         group_builder.specify "should report an error depending on input SQL_Query type" <|
             r2 = data.connection.query (SQL_Query.Table_Name "NONEXISTENT-TABLE")
             r2.should_fail_with Table_Not_Found
@@ -258,19 +242,6 @@ add_specs (suite_builder : Suite_Builder) (prefix : Text) (create_connection_fn
             r = data.connection.query (SQL_Query.Raw_SQL "SELECT 1 + ?")
             r.should_fail_with Illegal_Argument
 
-        group_builder.specify "should make a best-effort attempt at returning a reasonable error for the short-hand" <|
-            r2 = data.connection.query "NONEXISTENT-TABLE"
-            r2.should_fail_with Table_Not_Found
-            r2.catch.name . should_equal "NONEXISTENT-TABLE"
-            r2.catch.treated_as_query . should_be_true
-            error_text = r2.catch.to_display_text
-            Test.with_clue "r2.catch.to_display_text = "+error_text <|
-                error_text.starts_with "The name NONEXISTENT-TABLE was treated as a query, but the query failed" . should_be_true
-                error_text.ends_with "wrap it in `SQL_Query.Table_Name`." . should_be_true
-
-            r3 = data.connection.query "SELECT * FROM ........"
-            r3.should_fail_with SQL_Error
-
         group_builder.specify "will fail if the table is modified and a column gets removed" <|
             name = Name_Generator.random_name "removing-column"
             Problems.assume_no_problems <|
diff --git a/test/Table_Tests/src/Database/Common/Names_Length_Limits_Spec.enso b/test/Table_Tests/src/Database/Common/Names_Length_Limits_Spec.enso
index c24af598ece2..7d14908f4c89 100644
--- a/test/Table_Tests/src/Database/Common/Names_Length_Limits_Spec.enso
+++ b/test/Table_Tests/src/Database/Common/Names_Length_Limits_Spec.enso
@@ -62,7 +62,7 @@ add_specs suite_builder prefix create_connection_func =
                     r2 = data.connection.create_table name [Column_Description.Value "X" Value_Type.Integer] temporary=True
                     r2.should_fail_with Name_Too_Long
 
-                data.connection.query (SQL_Query.Table_Name name) . should_fail_with Table_Not_Found
+                data.connection.query (SQL_Query.Table_Name name) . should_fail_with Name_Too_Long
 
             group_builder.specify "should ensure length is measured in small units, even if grapheme length is lower" <|
                 big_grapheme = '\u{1F926}\u{1F3FC}\u200D\u2642\uFE0F'
@@ -115,8 +115,8 @@ add_specs suite_builder prefix create_connection_func =
                 data.connection.query long_name . at "X" . to_vector . should_equal_ignoring_order [1, 2, 3]
 
                 longer_name_with_same_prefix = long_name + ("z" * 10)
-                data.connection.query longer_name_with_same_prefix . should_fail_with Table_Not_Found
-                data.connection.query (SQL_Query.Table_Name longer_name_with_same_prefix) . should_fail_with Table_Not_Found
+                data.connection.query longer_name_with_same_prefix . should_fail_with Name_Too_Long
+                data.connection.query (SQL_Query.Table_Name longer_name_with_same_prefix) . should_fail_with Name_Too_Long
 
         group_builder.specify "should be fine joining tables with long names" <|
             ## If we know the maximum length, we choose a length that will be
diff --git a/test/Table_Tests/src/Database/Postgres_Spec.enso b/test/Table_Tests/src/Database/Postgres_Spec.enso
index 84f19269b91f..f211161c1d6d 100644
--- a/test/Table_Tests/src/Database/Postgres_Spec.enso
+++ b/test/Table_Tests/src/Database/Postgres_Spec.enso
@@ -377,11 +377,11 @@ postgres_specific_spec suite_builder create_connection_fn db_name setup =
             m2.at "ś"   . to_vector . should_equal ["A"]
             m2.at "ś 1" . to_vector . should_equal [2]
 
-            r3 = data.connection.query 'SELECT 1 AS "A", 2 AS "A"'
+            r3 = data.connection.query (..Raw_SQL 'SELECT 1 AS "A", 2 AS "A"')
             r3.should_fail_with Illegal_Argument
             r3.catch.cause . should_be_a Duplicate_Output_Column_Names
 
-            r4 = data.connection.query 'SELECT 1 AS ""'
+            r4 = data.connection.query (..Raw_SQL 'SELECT 1 AS ""')
             r4.should_fail_with SQL_Error
 
     suite_builder.group "[PostgreSQL] Edge Cases" group_builder->
@@ -777,7 +777,7 @@ add_table_specs suite_builder =
                                 connection.should_succeed
                                 Panic.with_finalizer connection.close <|
                                     connection.tables . should_be_a Table
-                                    table = connection.read "SELECT application_name FROM pg_stat_activity"
+                                    table = connection.read (..Raw_SQL "SELECT application_name FROM pg_stat_activity")
                                     application_names = table.at 0 . to_vector
                                     application_names.should_contain my_secret_name
 
@@ -956,7 +956,7 @@ add_data_link_specs suite_builder =
                 data_link_connection.tables.column_names . should_contain "Name"
 
                 # Test that this is really a DB connection:
-                q = data_link_connection.query 'SELECT 1 AS "A"'
+                q = data_link_connection.query (..Raw_SQL 'SELECT 1 AS "A"')
                 q.column_names . should_equal ["A"]
                 q.at "A" . to_vector . should_equal [1]
 
@@ -1023,7 +1023,7 @@ add_data_link_specs suite_builder =
                 written_data_link_connection = cloud_location.read
                 Panic.with_finalizer written_data_link_connection.close <|
                     written_data_link_connection.tables.column_names . should_contain "Name"
-                    q = written_data_link_connection.query 'SELECT 1 AS "A"'
+                    q = written_data_link_connection.query (..Raw_SQL 'SELECT 1 AS "A"')
                     q.column_names . should_equal ["A"]
                     q.at "A" . to_vector . should_equal [1]
 
diff --git a/test/Table_Tests/src/Database/SQLite_Spec.enso b/test/Table_Tests/src/Database/SQLite_Spec.enso
index 9523d75ac420..26397a38147b 100644
--- a/test/Table_Tests/src/Database/SQLite_Spec.enso
+++ b/test/Table_Tests/src/Database/SQLite_Spec.enso
@@ -182,11 +182,11 @@ sqlite_specific_spec suite_builder prefix create_connection_func setup =
             m2.at "ś"   . to_vector . should_equal ["A"]
             m2.at "ś 1" . to_vector . should_equal [2]
 
-            r3 = data.connection.query 'SELECT 1 AS "A", 2 AS "A"'
+            r3 = data.connection.query (..Raw_SQL 'SELECT 1 AS "A", 2 AS "A"')
             r3.should_fail_with Illegal_Argument
             r3.catch.cause . should_be_a Duplicate_Output_Column_Names
 
-            r4 = data.connection.query 'SELECT 1 AS ""'
+            r4 = data.connection.query (..Raw_SQL 'SELECT 1 AS ""')
             r4.should_fail_with Illegal_Argument
             r4.catch.cause . should_be_a Invalid_Column_Names
 
diff --git a/test/Table_Tests/src/Database/Types/Postgres_Type_Mapping_Spec.enso b/test/Table_Tests/src/Database/Types/Postgres_Type_Mapping_Spec.enso
index 11c531f8bde3..d81f4c414968 100644
--- a/test/Table_Tests/src/Database/Types/Postgres_Type_Mapping_Spec.enso
+++ b/test/Table_Tests/src/Database/Types/Postgres_Type_Mapping_Spec.enso
@@ -173,11 +173,11 @@ add_specs suite_builder create_connection_fn =
             table_clean = table.remove_warnings
 
             Problems.assume_no_problems <|
-                table_clean.update_rows (data.connection.query 'SELECT decode(\'ffff\', \'hex\') AS "B"') update_action=Update_Action.Insert
+                table_clean.update_rows (data.connection.query (..Raw_SQL 'SELECT decode(\'ffff\', \'hex\') AS "B"')) update_action=Update_Action.Insert
             Problems.assume_no_problems <|
-                table_clean.update_rows (data.connection.query 'SELECT decode(\'caffee\', \'hex\') AS "B"') update_action=Update_Action.Insert
+                table_clean.update_rows (data.connection.query (..Raw_SQL 'SELECT decode(\'caffee\', \'hex\') AS "B"')) update_action=Update_Action.Insert
             Problems.assume_no_problems <|
-                table_clean.update_rows (data.connection.query 'SELECT decode(\'beef\', \'hex\') AS "B"') update_action=Update_Action.Insert
+                table_clean.update_rows (data.connection.query (..Raw_SQL 'SELECT decode(\'beef\', \'hex\') AS "B"')) update_action=Update_Action.Insert
 
             materialized_table = table_clean.read
             materialized_table.at "B" . value_type . should_equal Value_Type.Mixed
diff --git a/test/Visualization_Tests/src/Widgets/Database_Widgets_Spec.enso b/test/Visualization_Tests/src/Widgets/Database_Widgets_Spec.enso
index 0d185e384267..f2a25ce38765 100644
--- a/test/Visualization_Tests/src/Widgets/Database_Widgets_Spec.enso
+++ b/test/Visualization_Tests/src/Widgets/Database_Widgets_Spec.enso
@@ -5,6 +5,7 @@ import Standard.Base.Metadata.Widget
 import Standard.Base.Metadata.Display
 
 from Standard.Database import all
+from Standard.Base.Metadata.Choice import Option
 # This ensures that the Redshift connection details are available in the widget.
 from Standard.AWS import all
 
@@ -27,7 +28,8 @@ add_specs suite_builder =
 
     suite_builder.group "Widgets for In-Database Connection with table name sets" group_builder->
         group_builder.specify "works for `query` and `read`" <|
-            choices = ['a_table', 'another', 'mock_table'] . map n-> Choice.Option n n.pretty
+            table_choices = ['a_table', 'another', 'mock_table'] . map n-> Choice.Option n n.pretty
+            choices = table_choices + [Option '<Table_Name>' '..Table_Name ""', Option '<Raw_SQL>' '..Raw_SQL ""']
             expect = [["query", Widget.Single_Choice choices Nothing Display.Always]] . to_json
             Widgets.get_widget_json connection .query ["query"] . should_equal expect
             Widgets.get_widget_json connection .read ["query"] . should_equal expect

From 3ff52817222c57d438db93f825b6842e65f8c8a1 Mon Sep 17 00:00:00 2001
From: Pavel Marek <pavel.marek@enso.org>
Date: Tue, 13 Aug 2024 13:28:43 +0200
Subject: [PATCH 20/23] Add --vm.D cmdline option (#10798)

* Add --vm.D cmdline option

* EngineMainTest uses TemporaryFolder rule

* Test system properties set

* Add note about ignored --jvm option

* Ignore --vm.D options in --jvm mode
---
 build.sbt                                     |  1 +
 .../src/main/java/org/enso/runner/Main.java   | 60 +++++++++++++-
 .../java/org/enso/runner/EngineMainTest.java  | 79 +++++++++++++++----
 3 files changed, 125 insertions(+), 15 deletions(-)

diff --git a/build.sbt b/build.sbt
index 1295c80cfe97..6d9a64f99181 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2599,6 +2599,7 @@ lazy val `engine-runner` = project
       "org.jline"               % "jline"                   % jlineVersion,
       "junit"                   % "junit"                   % junitVersion              % Test,
       "com.github.sbt"          % "junit-interface"         % junitIfVersion            % Test,
+      "org.hamcrest"            % "hamcrest-all"            % hamcrestVersion           % Test,
       "org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion
     ),
     run / connectInput := true
diff --git a/engine/runner/src/main/java/org/enso/runner/Main.java b/engine/runner/src/main/java/org/enso/runner/Main.java
index 98864a28c527..106b28358642 100644
--- a/engine/runner/src/main/java/org/enso/runner/Main.java
+++ b/engine/runner/src/main/java/org/enso/runner/Main.java
@@ -13,6 +13,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -95,6 +96,7 @@ public class Main {
   private static final String AUTO_PARALLELISM_OPTION = "with-auto-parallelism";
   private static final String EXECUTION_ENVIRONMENT_OPTION = "execution-environment";
   private static final String WARNINGS_LIMIT = "warnings-limit";
+  private static final String SYSTEM_PROPERTY = "vm.D";
 
   private static final org.slf4j.Logger logger = LoggerFactory.getLogger(Main.class);
 
@@ -449,6 +451,17 @@ private static Options buildOptions() {
             .desc("Enable static analysis (Experimental type inference).")
             .build();
 
+    var systemPropOption =
+        cliOptionBuilder()
+            .longOpt(SYSTEM_PROPERTY)
+            .argName("<property>=<value>")
+            .desc(
+                "Sets a system property. May be specified multiple times. If `value` is not"
+                    + " specified, 'true' is inserted.")
+            .hasArg(true)
+            .numberOfArgs(1)
+            .build();
+
     var options = new Options();
     options
         .addOption(help)
@@ -495,6 +508,7 @@ private static Options buildOptions() {
         .addOption(executionEnvironmentOption)
         .addOption(warningsLimitOption)
         .addOption(disablePrivateCheckOption)
+        .addOption(systemPropOption)
         .addOption(enableStaticAnalysisOption);
 
     return options;
@@ -1176,6 +1190,32 @@ private static <A> A withProfiling(
     }
   }
 
+  /**
+   * Parses all system properties from the given command line.
+   *
+   * @return null if no cmdline argument was specified.
+   */
+  protected Map<String, String> parseSystemProperties(CommandLine cmdLine) {
+    if (cmdLine.hasOption(SYSTEM_PROPERTY)) {
+      Map<String, String> props = new HashMap<>();
+      var optionValues = cmdLine.getOptionValues(SYSTEM_PROPERTY);
+      for (var optionValue : optionValues) {
+        var items = optionValue.split("=");
+        if (items.length == 2) {
+          props.put(items[0], items[1]);
+        } else if (items.length == 1) {
+          props.put(items[0], "true");
+        } else {
+          println("Argument to " + SYSTEM_PROPERTY + " must be in the form <property>=<value>");
+          throw exitFail();
+        }
+      }
+      return props;
+    } else {
+      return null;
+    }
+  }
+
   private static ProfilingConfig parseProfilingConfig(CommandLine line) throws WrongOption {
     Path profilingPath = null;
     try {
@@ -1236,6 +1276,7 @@ private void launch(String[] args) throws IOException, InterruptedException, URI
 
     var logMasking = new boolean[1];
     var logLevel = setupLogging(line, logMasking);
+    var props = parseSystemProperties(line);
 
     if (line.hasOption(JVM_OPTION)) {
       var jvm = line.getOptionValue(JVM_OPTION);
@@ -1243,7 +1284,10 @@ private void launch(String[] args) throws IOException, InterruptedException, URI
       if (jvm == null) {
         jvm = current;
       }
-      if (current == null || !current.equals(jvm)) {
+      var shouldLaunchJvm = current == null || !current.equals(jvm);
+      if (!shouldLaunchJvm) {
+        println(JVM_OPTION + " option has no effect - already running in JVM " + current);
+      } else {
         var loc = Main.class.getProtectionDomain().getCodeSource().getLocation();
         var commandAndArgs = new ArrayList<String>();
         JVM_FOUND:
@@ -1274,6 +1318,11 @@ private void launch(String[] args) throws IOException, InterruptedException, URI
             commandAndArgs.add(op);
           }
         }
+        if (props != null) {
+          for (var e : props.entrySet()) {
+            commandAndArgs.add("-D" + e.getKey() + "=" + e.getValue());
+          }
+        }
 
         commandAndArgs.add("--add-opens=java.base/java.nio=ALL-UNNAMED");
         commandAndArgs.add("--module-path");
@@ -1293,6 +1342,9 @@ private void launch(String[] args) throws IOException, InterruptedException, URI
           if (JVM_OPTION.equals(op.getLongOpt())) {
             continue;
           }
+          if (SYSTEM_PROPERTY.equals(op.getLongOpt())) {
+            continue;
+          }
           var longName = op.getLongOpt();
           if (longName != null) {
             commandAndArgs.add("--" + longName);
@@ -1318,6 +1370,12 @@ private void launch(String[] args) throws IOException, InterruptedException, URI
       }
     }
 
+    if (props != null) {
+      for (var e : props.entrySet()) {
+        System.setProperty(e.getKey(), e.getValue());
+      }
+    }
+
     launch(line, logLevel, logMasking[0]);
   }
 
diff --git a/engine/runner/src/test/java/org/enso/runner/EngineMainTest.java b/engine/runner/src/test/java/org/enso/runner/EngineMainTest.java
index 5b496f38ef32..9d00c45d9c89 100644
--- a/engine/runner/src/test/java/org/enso/runner/EngineMainTest.java
+++ b/engine/runner/src/test/java/org/enso/runner/EngineMainTest.java
@@ -1,32 +1,27 @@
 package org.enso.runner;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertEquals;
 
-import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 import org.slf4j.event.Level;
 
 public class EngineMainTest {
+  @Rule public TemporaryFolder tempDir = new TemporaryFolder();
+
   private final List<String> linesOut = new ArrayList<>();
 
   @Test
   public void cannotUseReplAndInspectAtOnce() throws Exception {
     try {
-      var m =
-          new Main() {
-            @Override
-            RuntimeException doExit(int code) {
-              throw new ExitCode(code);
-            }
-
-            void println(String line) {
-              linesOut.add(line);
-            }
-          };
-      var file = File.createTempFile("some", ".enso");
-      file.deleteOnExit();
+      var m = new MainMock();
+      var file = tempDir.newFile("some.enso");
       var line = m.preprocessArguments("--repl", "--inspect", "--run", file.getAbsolutePath());
       m.mainEntry(line, Level.INFO, false);
     } catch (ExitCode ex) {
@@ -36,6 +31,62 @@ void println(String line) {
     }
   }
 
+  @Test
+  public void canSetSystemProperty() throws IOException {
+    var m = new MainMock();
+    var file = tempDir.newFile("some.enso");
+    var line = m.preprocessArguments("--run", file.getAbsolutePath(), "--vm.D", "foo=bar");
+    var props = m.parseSystemProperties(line);
+    assertEquals("bar", props.get("foo"));
+  }
+
+  @Test
+  public void canSetMultipleSystemProperties() throws IOException {
+    var m = new MainMock();
+    var file = tempDir.newFile("some.enso");
+    var line =
+        m.preprocessArguments(
+            "--run", file.getAbsolutePath(), "--vm.D", "foo=bar", "--vm.D", "baz=qux");
+    var props = m.parseSystemProperties(line);
+    assertEquals("bar", props.get("foo"));
+    assertEquals("qux", props.get("baz"));
+  }
+
+  @Test
+  public void systemPropertyHasDefaultValue() throws IOException {
+    var m = new MainMock();
+    var file = tempDir.newFile("some.enso");
+    var line = m.preprocessArguments("--run", file.getAbsolutePath(), "--vm.D", "foo");
+    var props = m.parseSystemProperties(line);
+    assertEquals("true is the default value for property", "true", props.get("foo"));
+  }
+
+  @Test
+  public void systemPropertyArgumentIncorrectFormat() throws IOException {
+    try {
+      var m = new MainMock();
+      var file = tempDir.newFile("some.enso");
+      var line = m.preprocessArguments("--run", file.getAbsolutePath(), "--vm.D", "foo=bar=baz");
+      m.parseSystemProperties(line);
+    } catch (ExitCode e) {
+      assertEquals("Execution fails", 1, e.exitCode);
+      assertEquals("One line printed", 1, linesOut.size());
+      assertThat(linesOut.get(0), containsString("must be in the form <property>=<value>"));
+    }
+  }
+
+  private final class MainMock extends Main {
+    @Override
+    RuntimeException doExit(int exitCode) {
+      throw new ExitCode(exitCode);
+    }
+
+    @Override
+    void println(String msg) {
+      linesOut.add(msg);
+    }
+  }
+
   private static final class ExitCode extends RuntimeException {
     final int exitCode;
 

From 0fc09f87231747f1ab1da27be998c424d6bbe9d8 Mon Sep 17 00:00:00 2001
From: somebody1234 <ehern.lee@gmail.com>
Date: Tue, 13 Aug 2024 21:50:07 +1000
Subject: [PATCH 21/23] Show errors in forms in authentication flow (#10739)

- Fix https://github.com/enso-org/cloud-v2/issues/1422
- Show errors on "login" page by switching to custom Form component
- Also convert "registration", "reset password" and "forgot password" pages to use the new component
- Preserve email when navigating between auth pages

# Important Notes
None
---
 app/.vscode/launch.json                       |  93 +++++++++
 app/dashboard/e2e/actions.ts                  |  45 ++---
 app/dashboard/e2e/actions/BaseActions.ts      |  26 ++-
 app/dashboard/e2e/actions/DrivePageActions.ts | 128 ++++++++-----
 .../e2e/actions/ForgotPasswordPageActions.ts  |  54 ++++++
 app/dashboard/e2e/actions/LoginPageActions.ts |  84 +++++++--
 .../e2e/actions/RegisterPageActions.ts        |  92 +++++++++
 ...namePageActions.ts => SetupPageActions.ts} |   4 +-
 app/dashboard/e2e/authPreserveEmail.spec.ts   |  27 +++
 app/dashboard/e2e/labels.spec.ts              |  13 +-
 app/dashboard/e2e/loginScreen.spec.ts         |  53 +++---
 app/dashboard/e2e/signUp.spec.ts              |  38 ++++
 app/dashboard/e2e/userSettings.spec.ts        |  38 ++--
 app/dashboard/src/App.tsx                     |   8 +-
 app/dashboard/src/assets/github_color.svg     |   5 +
 app/dashboard/src/assets/google_color.svg     |   6 +
 .../AriaComponents/Button/Button.tsx          |  13 +-
 .../components/AriaComponents/Form/Form.tsx   |  83 ++++----
 .../AriaComponents/Form/components/Field.tsx  |  26 ++-
 .../Form/components/FormError.tsx             |   7 +-
 .../AriaComponents/Form/components/types.ts   |   4 +-
 .../AriaComponents/Inputs/Input/Input.tsx     |  43 +++--
 .../Inputs/Password/Password.tsx              |  57 ++++++
 .../AriaComponents/Inputs/Password/index.ts   |   6 +
 .../ResizableContentEditableInput.tsx         |   4 +-
 .../Inputs/Selector/Selector.tsx              |  12 --
 .../components/AriaComponents/Inputs/index.ts |   1 +
 .../AriaComponents/Inputs/variants.ts         |  21 ++-
 app/dashboard/src/components/Link.tsx         |  67 +++----
 .../layouts/Settings/ChangePasswordForm.tsx   | 172 +++++++----------
 .../layouts/Settings/SettingsAriaInput.tsx    |  62 ++++++
 .../layouts/Settings/SettingsInputEntry.tsx   |   2 +-
 .../components/PlanSelectorDialog.tsx         | 129 ++++++-------
 .../authentication/AuthenticationPage.tsx     |  88 ++++++---
 .../pages/authentication/ForgotPassword.tsx   |  71 ++++---
 .../src/pages/authentication/Login.tsx        | 177 ++++++++----------
 .../src/pages/authentication/Registration.tsx | 121 ++++++------
 .../pages/authentication/ResetPassword.tsx    | 145 +++++++-------
 .../src/pages/authentication/schemas.ts       |  32 ++++
 app/dashboard/src/providers/AuthProvider.tsx  |  60 ++----
 app/dashboard/src/tailwind.css                |   2 +-
 .../src/utilities/tailwindVariants.ts         |  13 +-
 app/ide-desktop/common/src/text/english.json  |  11 +-
 43 files changed, 1358 insertions(+), 785 deletions(-)
 create mode 100644 app/.vscode/launch.json
 create mode 100644 app/dashboard/e2e/actions/ForgotPasswordPageActions.ts
 create mode 100644 app/dashboard/e2e/actions/RegisterPageActions.ts
 rename app/dashboard/e2e/actions/{SetUsernamePageActions.ts => SetupPageActions.ts} (84%)
 create mode 100644 app/dashboard/e2e/authPreserveEmail.spec.ts
 create mode 100644 app/dashboard/e2e/signUp.spec.ts
 create mode 100644 app/dashboard/src/assets/github_color.svg
 create mode 100644 app/dashboard/src/assets/google_color.svg
 create mode 100644 app/dashboard/src/components/AriaComponents/Inputs/Password/Password.tsx
 create mode 100644 app/dashboard/src/components/AriaComponents/Inputs/Password/index.ts
 create mode 100644 app/dashboard/src/layouts/Settings/SettingsAriaInput.tsx
 create mode 100644 app/dashboard/src/pages/authentication/schemas.ts

diff --git a/app/.vscode/launch.json b/app/.vscode/launch.json
new file mode 100644
index 000000000000..ec7c5ec59fa0
--- /dev/null
+++ b/app/.vscode/launch.json
@@ -0,0 +1,93 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Dashboard",
+      "runtimeExecutable": "npm",
+      "runtimeArgs": ["run", "--workspace=enso-dashboard", "dev"]
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "GUI",
+      "runtimeExecutable": "npm",
+      "runtimeArgs": ["run", "--workspace=enso-gui2", "dev"]
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "GUI (Storybook)",
+      "runtimeExecutable": "npm",
+      "runtimeArgs": ["run", "--workspace=enso-gui2", "story:dev"]
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Dashboard (Build)",
+      "runtimeExecutable": "npm",
+      "runtimeArgs": ["run", "--workspace=enso-gui2", "build:cloud"]
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Dashboard (E2E UI)",
+      "runtimeExecutable": "npm",
+      "runtimeArgs": ["run", "--workspace=enso-dashboard", "test:e2e:debug"]
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "GUI (E2E UI)",
+      "runtimeExecutable": "npm",
+      "runtimeArgs": ["run", "--workspace=enso-gui2", "test:e2e", "--", "--ui"]
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Dashboard (All tests)",
+      "runtimeExecutable": "npm",
+      "runtimeArgs": ["run", "--workspace=enso-dashboard", "test"]
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Dashboard (E2E tests)",
+      "runtimeExecutable": "npm",
+      "runtimeArgs": ["run", "--workspace=enso-dashboard", "test:e2e"],
+      "outputCapture": "std"
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Dashboard (Unit tests)",
+      "runtimeExecutable": "npm",
+      "runtimeArgs": ["run", "--workspace=enso-dashboard", "test:unit"],
+      "outputCapture": "std"
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "GUI (All tests)",
+      "runtimeExecutable": "npm",
+      "runtimeArgs": ["run", "--workspace=enso-gui2", "test"]
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "GUI (E2E tests)",
+      "runtimeExecutable": "npm",
+      "runtimeArgs": ["run", "--workspace=enso-gui2", "test:e2e"],
+      "outputCapture": "std"
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "GUI (Unit tests)",
+      "runtimeExecutable": "npm",
+      "runtimeArgs": ["run", "--workspace=enso-gui2", "test:unit", "--", "run"],
+      "outputCapture": "std"
+    }
+  ]
+}
diff --git a/app/dashboard/e2e/actions.ts b/app/dashboard/e2e/actions.ts
index fc5c5245bee8..b6d558795e03 100644
--- a/app/dashboard/e2e/actions.ts
+++ b/app/dashboard/e2e/actions.ts
@@ -2,6 +2,8 @@
 /** @file Various actions, locators, and constants used in end-to-end tests. */
 import * as test from '@playwright/test'
 
+import * as text from 'enso-common/src/text'
+
 import DrivePageActions from './actions/DrivePageActions'
 import LoginPageActions from './actions/LoginPageActions'
 import * as apiModule from './api'
@@ -18,6 +20,7 @@ export const INVALID_PASSWORD = 'password'
 export const VALID_PASSWORD = 'Password0!'
 /** An example valid email address. */
 export const VALID_EMAIL = 'email@example.com'
+export const TEXT = text.TEXTS.english
 
 // ================
 // === Locators ===
@@ -499,17 +502,21 @@ export namespace settings {
 
     /** Find a "current password" input in the "user account" settings section. */
     export function locateCurrentPasswordInput(page: test.Page) {
-      return locate(page).getByLabel('Current password')
+      return locate(page).getByRole('group', { name: 'Current password' }).getByRole('textbox')
     }
 
     /** Find a "new password" input in the "user account" settings section. */
     export function locateNewPasswordInput(page: test.Page) {
-      return locate(page).getByLabel('New password', { exact: true })
+      return locate(page)
+        .getByRole('group', { name: /^New password/, exact: true })
+        .getByRole('textbox')
     }
 
     /** Find a "confirm new password" input in the "user account" settings section. */
     export function locateConfirmNewPasswordInput(page: test.Page) {
-      return locate(page).getByLabel('Confirm new password')
+      return locate(page)
+        .getByRole('group', { name: /^Confirm new password/, exact: true })
+        .getByRole('textbox')
     }
 
     /** Find a "change" button. */
@@ -706,34 +713,6 @@ export async function expectNotOnScreen(locator: test.Locator) {
   })
 }
 
-// =======================
-// === Mouse utilities ===
-// =======================
-
-// eslint-disable-next-line @typescript-eslint/no-magic-numbers
-export const ASSET_ROW_SAFE_POSITION = { x: 300, y: 16 }
-
-/** Click an asset row. The center must not be clicked as that is the button for adding a label. */
-export async function clickAssetRow(assetRow: test.Locator) {
-  // eslint-disable-next-line @typescript-eslint/no-magic-numbers
-  await assetRow.click({ position: ASSET_ROW_SAFE_POSITION })
-}
-
-/** Drag an asset row. The center must not be clicked as that is the button for adding a label. */
-export async function dragAssetRowToAssetRow(from: test.Locator, to: test.Locator) {
-  // eslint-disable-next-line @typescript-eslint/no-magic-numbers
-  await from.dragTo(to, {
-    sourcePosition: ASSET_ROW_SAFE_POSITION,
-    targetPosition: ASSET_ROW_SAFE_POSITION,
-  })
-}
-
-/** Drag an asset row. The center must not be clicked as that is the button for adding a label. */
-export async function dragAssetRow(from: test.Locator, to: test.Locator) {
-  // eslint-disable-next-line @typescript-eslint/no-magic-numbers
-  await from.dragTo(to, { sourcePosition: ASSET_ROW_SAFE_POSITION })
-}
-
 // ==========================
 // === Keyboard utilities ===
 // ==========================
@@ -781,7 +760,6 @@ export async function login(
   first = true,
 ) {
   await test.test.step('Login', async () => {
-    await page.goto('/')
     await locateEmailInput(page).fill(email)
     await locatePasswordInput(page).fill(password)
     await locateLoginButton(page).click()
@@ -890,6 +868,7 @@ export function mockAll({ page, setupAPI }: MockParams) {
   return new LoginPageActions(page).step('Execute all mocks', async () => {
     await mockApi({ page, setupAPI })
     await mockDate({ page, setupAPI })
+    await page.goto('/')
   })
 }
 
@@ -905,6 +884,7 @@ export function mockAllAndLogin({ page, setupAPI }: MockParams) {
     .step('Execute all mocks', async () => {
       await mockApi({ page, setupAPI })
       await mockDate({ page, setupAPI })
+      await page.goto('/')
     })
     .do((thePage) => login({ page: thePage, setupAPI }))
 }
@@ -921,6 +901,7 @@ export async function mockAllAndLoginAndExposeAPI({ page, setupAPI }: MockParams
   return await test.test.step('Execute all mocks and login', async () => {
     const api = await mockApi({ page, setupAPI })
     await mockDate({ page, setupAPI })
+    await page.goto('/')
     await login({ page, setupAPI })
     return api
   })
diff --git a/app/dashboard/e2e/actions/BaseActions.ts b/app/dashboard/e2e/actions/BaseActions.ts
index 424f9648849d..d9362b1837aa 100644
--- a/app/dashboard/e2e/actions/BaseActions.ts
+++ b/app/dashboard/e2e/actions/BaseActions.ts
@@ -3,7 +3,7 @@ import * as test from '@playwright/test'
 
 import type * as inputBindings from '#/utilities/inputBindings'
 
-import * as actions from '../actions'
+import { modModifier, TEXT } from '../actions'
 
 // ====================
 // === PageCallback ===
@@ -149,10 +149,30 @@ export default class BaseActions implements Promise<void> {
   withModPressed<R extends BaseActions>(callback: (actions: this) => R) {
     return callback(
       this.step('Press "Mod"', async (page) => {
-        await page.keyboard.down(await actions.modModifier(page))
+        await page.keyboard.down(await modModifier(page))
       }),
     ).step('Release "Mod"', async (page) => {
-      await page.keyboard.up(await actions.modModifier(page))
+      await page.keyboard.up(await modModifier(page))
     })
   }
+
+  /** Expect an input to have an error (or no error if the expected value is `null`).
+   * If the expected value is `undefined`, the assertion is skipped. */
+  expectInputError(testId: string, description: string, expected: string | null | undefined) {
+    if (expected === undefined) {
+      return this
+    } else if (expected != null) {
+      return this.step(`Expect ${description} error to be '${expected}'`, async (page) => {
+        await test
+          .expect(page.getByTestId(testId).getByLabel(TEXT.fieldErrorLabel))
+          .toHaveText(expected)
+      })
+    } else {
+      return this.step(`Expect no ${description} error`, async (page) => {
+        await test
+          .expect(page.getByTestId(testId).getByLabel(TEXT.fieldErrorLabel))
+          .not.toBeVisible()
+      })
+    }
+  }
 }
diff --git a/app/dashboard/e2e/actions/DrivePageActions.ts b/app/dashboard/e2e/actions/DrivePageActions.ts
index 5780d53482bc..cf76ab4cea38 100644
--- a/app/dashboard/e2e/actions/DrivePageActions.ts
+++ b/app/dashboard/e2e/actions/DrivePageActions.ts
@@ -1,7 +1,18 @@
 /** @file Actions for the "drive" page. */
 import * as test from 'playwright/test'
 
-import * as actions from '../actions'
+import {
+  locateAssetPanel,
+  locateAssetsTable,
+  locateContextMenus,
+  locateCreateButton,
+  locateDriveView,
+  locateNewSecretIcon,
+  locateNonAssetRows,
+  locateSecretNameInput,
+  locateSecretValueInput,
+  TEXT,
+} from '../actions'
 import type * as baseActions from './BaseActions'
 import * as contextMenuActions from './contextMenuActions'
 import EditorPageActions from './EditorPageActions'
@@ -17,6 +28,15 @@ import StartModalActions from './StartModalActions'
 // eslint-disable-next-line @typescript-eslint/no-magic-numbers
 const ASSET_ROW_SAFE_POSITION = { x: 300, y: 16 }
 
+// =======================
+// === locateAssetRows ===
+// =======================
+
+/** Find all assets table rows (if any). */
+function locateAssetRows(page: test.Page) {
+  return locateAssetsTable(page).getByTestId('asset-row')
+}
+
 // ========================
 // === DrivePageActions ===
 // ========================
@@ -41,25 +61,37 @@ export default class DrivePageActions extends PageActions {
       /** Switch to the "cloud" category. */
       cloud() {
         return self.step('Go to "Cloud" category', (page) =>
-          page.getByRole('button', { name: 'Cloud' }).getByText('Cloud').click(),
+          page
+            .getByRole('button', { name: TEXT.cloudCategory })
+            .getByText(TEXT.cloudCategory)
+            .click(),
         )
       },
       /** Switch to the "local" category. */
       local() {
         return self.step('Go to "Local" category', (page) =>
-          page.getByRole('button', { name: 'Local' }).getByText('Local').click(),
+          page
+            .getByRole('button', { name: TEXT.localCategory })
+            .getByText(TEXT.localCategory)
+            .click(),
         )
       },
       /** Switch to the "recent" category. */
       recent() {
         return self.step('Go to "Recent" category', (page) =>
-          page.getByRole('button', { name: 'Recent' }).getByText('Recent').click(),
+          page
+            .getByRole('button', { name: TEXT.recentCategory })
+            .getByText(TEXT.recentCategory)
+            .click(),
         )
       },
       /** Switch to the "trash" category. */
       trash() {
         return self.step('Go to "Trash" category', (page) =>
-          page.getByRole('button', { name: 'Trash' }).getByText('Trash').click(),
+          page
+            .getByRole('button', { name: TEXT.trashCategory })
+            .getByText(TEXT.trashCategory)
+            .click(),
         )
       },
     }
@@ -73,44 +105,37 @@ export default class DrivePageActions extends PageActions {
       /** Click the column heading for the "name" column to change its sort order. */
       clickNameColumnHeading() {
         return self.step('Click "name" column heading', (page) =>
-          page.getByLabel('Sort by name').or(page.getByLabel('Stop sorting by name')).click(),
+          page.getByLabel(TEXT.sortByName).or(page.getByLabel(TEXT.stopSortingByName)).click(),
         )
       },
       /** Click the column heading for the "modified" column to change its sort order. */
       clickModifiedColumnHeading() {
         return self.step('Click "modified" column heading', (page) =>
           page
-            .getByLabel('Sort by modification date')
-            .or(page.getByLabel('Stop sorting by modification date'))
+            .getByLabel(TEXT.sortByModificationDate)
+            .or(page.getByLabel(TEXT.stopSortingByModificationDate))
             .click(),
         )
       },
       /** Click to select a specific row. */
       clickRow(index: number) {
         return self.step(`Click drive table row #${index}`, (page) =>
-          actions
-            .locateAssetRows(page)
-            .nth(index)
-            .click({ position: actions.ASSET_ROW_SAFE_POSITION }),
+          locateAssetRows(page).nth(index).click({ position: ASSET_ROW_SAFE_POSITION }),
         )
       },
       /** Right click a specific row to bring up its context menu, or the context menu for multiple
        * assets when right clicking on a selected asset when multiple assets are selected. */
       rightClickRow(index: number) {
         return self.step(`Right click drive table row #${index}`, (page) =>
-          actions
-            .locateAssetRows(page)
+          locateAssetRows(page)
             .nth(index)
-            .click({ button: 'right', position: actions.ASSET_ROW_SAFE_POSITION }),
+            .click({ button: 'right', position: ASSET_ROW_SAFE_POSITION }),
         )
       },
       /** Double click a row. */
       doubleClickRow(index: number) {
         return self.step(`Double dlick drive table row #${index}`, (page) =>
-          actions
-            .locateAssetRows(page)
-            .nth(index)
-            .dblclick({ position: actions.ASSET_ROW_SAFE_POSITION }),
+          locateAssetRows(page).nth(index).dblclick({ position: ASSET_ROW_SAFE_POSITION }),
         )
       },
       /** Interact with the set of all rows in the Drive table. */
@@ -118,13 +143,13 @@ export default class DrivePageActions extends PageActions {
         callback: (assetRows: test.Locator, nonAssetRows: test.Locator) => Promise<void> | void,
       ) {
         return self.step('Interact with drive table rows', async (page) => {
-          await callback(actions.locateAssetRows(page), actions.locateNonAssetRows(page))
+          await callback(locateAssetRows(page), locateNonAssetRows(page))
         })
       },
       /** Drag a row onto another row. */
       dragRowToRow(from: number, to: number) {
         return self.step(`Drag drive table row #${from} to row #${to}`, async (page) => {
-          const rows = actions.locateAssetRows(page)
+          const rows = locateAssetRows(page)
           await rows.nth(from).dragTo(rows.nth(to), {
             sourcePosition: ASSET_ROW_SAFE_POSITION,
             targetPosition: ASSET_ROW_SAFE_POSITION,
@@ -134,8 +159,7 @@ export default class DrivePageActions extends PageActions {
       /** Drag a row onto another row. */
       dragRow(from: number, to: test.Locator, force?: boolean) {
         return self.step(`Drag drive table row #${from} to custom locator`, (page) =>
-          actions
-            .locateAssetRows(page)
+          locateAssetRows(page)
             .nth(from)
             .dragTo(to, {
               sourcePosition: ASSET_ROW_SAFE_POSITION,
@@ -147,8 +171,8 @@ export default class DrivePageActions extends PageActions {
        * placeholder row displayed when there are no assets to show. */
       expectPlaceholderRow() {
         return self.step('Expect placeholder row', async (page) => {
-          await test.expect(actions.locateAssetRows(page)).toHaveCount(0)
-          const nonAssetRows = actions.locateNonAssetRows(page)
+          await test.expect(locateAssetRows(page)).toHaveCount(0)
+          const nonAssetRows = locateNonAssetRows(page)
           await test.expect(nonAssetRows).toHaveCount(1)
           await test.expect(nonAssetRows).toHaveText(/You have no files/)
         })
@@ -157,8 +181,8 @@ export default class DrivePageActions extends PageActions {
        * placeholder row displayed when there are no assets in Trash. */
       expectTrashPlaceholderRow() {
         return self.step('Expect trash placeholder row', async (page) => {
-          await test.expect(actions.locateAssetRows(page)).toHaveCount(0)
-          const nonAssetRows = actions.locateNonAssetRows(page)
+          await test.expect(locateAssetRows(page)).toHaveCount(0)
+          const nonAssetRows = locateNonAssetRows(page)
           await test.expect(nonAssetRows).toHaveCount(1)
           await test.expect(nonAssetRows).toHaveText(/Your trash is empty/)
         })
@@ -168,38 +192,38 @@ export default class DrivePageActions extends PageActions {
         return {
           /** Toggle visibility for the "modified" column. */
           modified() {
-            return self.step('Expect trash placeholder row', (page) =>
-              page.getByAltText('Modified').click(),
+            return self.step('Toggle "modified" column', (page) =>
+              page.getByAltText(TEXT.modifiedColumnName).click(),
             )
           },
           /** Toggle visibility for the "shared with" column. */
           sharedWith() {
-            return self.step('Expect trash placeholder row', (page) =>
-              page.getByAltText('Shared With').click(),
+            return self.step('Toggle "shared with" column', (page) =>
+              page.getByAltText(TEXT.sharedWithColumnName).click(),
             )
           },
           /** Toggle visibility for the "labels" column. */
           labels() {
-            return self.step('Expect trash placeholder row', (page) =>
-              page.getByAltText('Labels').click(),
+            return self.step('Toggle "labels" column', (page) =>
+              page.getByAltText(TEXT.labelsColumnName).click(),
             )
           },
           /** Toggle visibility for the "accessed by projects" column. */
           accessedByProjects() {
-            return self.step('Expect trash placeholder row', (page) =>
-              page.getByAltText('Accessed By Projects').click(),
+            return self.step('Toggle "accessed by projects" column', (page) =>
+              page.getByAltText(TEXT.accessedByProjectsColumnName).click(),
             )
           },
           /** Toggle visibility for the "accessed data" column. */
           accessedData() {
-            return self.step('Expect trash placeholder row', (page) =>
-              page.getByAltText('Accessed Data').click(),
+            return self.step('Toggle "accessed data" column', (page) =>
+              page.getByAltText(TEXT.accessedDataColumnName).click(),
             )
           },
           /** Toggle visibility for the "docs" column. */
           docs() {
-            return self.step('Expect trash placeholder row', (page) =>
-              page.getByAltText('Docs').click(),
+            return self.step('Toggle "docs" column', (page) =>
+              page.getByAltText(TEXT.docsColumnName).click(),
             )
           },
         }
@@ -210,26 +234,26 @@ export default class DrivePageActions extends PageActions {
   /** Open the "start" modal. */
   openStartModal() {
     return this.step('Open "start" modal', (page) =>
-      page.getByText('Start with a template').click(),
+      page.getByText(TEXT.startWithATemplate).click(),
     ).into(StartModalActions)
   }
 
   /** Create a new empty project. */
   newEmptyProject() {
     return this.step('Create empty project', (page) =>
-      page.getByText('New Empty Project').click(),
+      page.getByText(TEXT.newEmptyProject).click(),
     ).into(EditorPageActions)
   }
 
   /** Interact with the drive view (the main container of this page). */
   withDriveView(callback: baseActions.LocatorCallback) {
-    return this.step('Interact with drive view', (page) => callback(actions.locateDriveView(page)))
+    return this.step('Interact with drive view', (page) => callback(locateDriveView(page)))
   }
 
   /** Create a new folder using the icon in the Drive Bar. */
   createFolder() {
     return this.step('Create folder', (page) =>
-      page.getByRole('button', { name: 'New Folder', exact: true }).click(),
+      page.getByRole('button', { name: TEXT.newFolder, exact: true }).click(),
     )
   }
 
@@ -241,7 +265,7 @@ export default class DrivePageActions extends PageActions {
   ) {
     return this.step(`Upload file '${name}'`, async (page) => {
       const fileChooserPromise = page.waitForEvent('filechooser')
-      await page.getByRole('button', { name: 'Import' }).click()
+      await page.getByRole('button', { name: TEXT.uploadFiles }).click()
       const fileChooser = await fileChooserPromise
       await fileChooser.setFiles([{ name, buffer: Buffer.from(contents), mimeType }])
     })
@@ -250,10 +274,10 @@ export default class DrivePageActions extends PageActions {
   /** Create a new secret using the icon in the Drive Bar. */
   createSecret(name: string, value: string) {
     return this.step(`Create secret '${name}' = '${value}'`, async (page) => {
-      await actions.locateNewSecretIcon(page).click()
-      await actions.locateSecretNameInput(page).fill(name)
-      await actions.locateSecretValueInput(page).fill(value)
-      await actions.locateCreateButton(page).click()
+      await locateNewSecretIcon(page).click()
+      await locateSecretNameInput(page).fill(name)
+      await locateSecretValueInput(page).fill(value)
+      await locateCreateButton(page).click()
     })
   }
 
@@ -267,28 +291,28 @@ export default class DrivePageActions extends PageActions {
   /** Interact with the container element of the assets table. */
   withAssetsTable(callback: baseActions.LocatorCallback) {
     return this.step('Interact with drive table', async (page) => {
-      await callback(actions.locateAssetsTable(page))
+      await callback(locateAssetsTable(page))
     })
   }
 
   /** Interact with the Asset Panel. */
   withAssetPanel(callback: baseActions.LocatorCallback) {
     return this.step('Interact with asset panel', async (page) => {
-      await callback(actions.locateAssetPanel(page))
+      await callback(locateAssetPanel(page))
     })
   }
 
   /** Open the Data Link creation modal by clicking on the Data Link icon. */
   openDataLinkModal() {
     return this.step('Open "new data link" modal', (page) =>
-      page.getByRole('button', { name: 'New Datalink' }).click(),
+      page.getByRole('button', { name: TEXT.newDatalink }).click(),
     ).into(NewDataLinkModalActions)
   }
 
   /** Interact with the context menus (the context menus MUST be visible). */
   withContextMenus(callback: baseActions.LocatorCallback) {
     return this.step('Interact with context menus', async (page) => {
-      await callback(actions.locateContextMenus(page))
+      await callback(locateContextMenus(page))
     })
   }
 }
diff --git a/app/dashboard/e2e/actions/ForgotPasswordPageActions.ts b/app/dashboard/e2e/actions/ForgotPasswordPageActions.ts
new file mode 100644
index 000000000000..b3dade2d1129
--- /dev/null
+++ b/app/dashboard/e2e/actions/ForgotPasswordPageActions.ts
@@ -0,0 +1,54 @@
+/** @file Available actions for the login page. */
+import * as test from '@playwright/test'
+
+import { TEXT, VALID_EMAIL } from '../actions'
+import BaseActions, { type LocatorCallback } from './BaseActions'
+import LoginPageActions from './LoginPageActions'
+
+// =================================
+// === ForgotPasswordPageActions ===
+// =================================
+
+/** Available actions for the login page. */
+export default class ForgotPasswordPageActions extends BaseActions {
+  /** Actions for navigating to another page. */
+  get goToPage() {
+    return {
+      login: (): LoginPageActions =>
+        this.step("Go to 'login' page", async (page) =>
+          page.getByRole('link', { name: TEXT.goBackToLogin, exact: true }).click(),
+        ).into(LoginPageActions),
+    }
+  }
+
+  /** Perform a successful login. */
+  forgotPassword(email = VALID_EMAIL) {
+    return this.step('Forgot password', () => this.forgotPasswordInternal(email)).into(
+      LoginPageActions,
+    )
+  }
+
+  /** Fill the email input. */
+  fillEmail(email: string) {
+    return this.step(`Fill email with '${email}'`, (page) =>
+      page.getByPlaceholder(TEXT.emailPlaceholder).fill(email),
+    )
+  }
+
+  /** Interact with the email input. */
+  withEmailInput(callback: LocatorCallback) {
+    return this.step('Interact with email input', async (page) => {
+      await callback(page.getByPlaceholder(TEXT.emailPlaceholder))
+    })
+  }
+
+  /** Internal login logic shared between all public methods. */
+  private async forgotPasswordInternal(email: string) {
+    await this.page.getByPlaceholder(TEXT.emailPlaceholder).fill(email)
+    await this.page
+      .getByRole('button', { name: TEXT.login, exact: true })
+      .getByText(TEXT.login)
+      .click()
+    await test.expect(this.page.getByText(TEXT.loadingAppMessage)).not.toBeVisible()
+  }
+}
diff --git a/app/dashboard/e2e/actions/LoginPageActions.ts b/app/dashboard/e2e/actions/LoginPageActions.ts
index 935065acb39e..6a73e9dfbc73 100644
--- a/app/dashboard/e2e/actions/LoginPageActions.ts
+++ b/app/dashboard/e2e/actions/LoginPageActions.ts
@@ -1,10 +1,12 @@
 /** @file Available actions for the login page. */
 import * as test from '@playwright/test'
 
-import * as actions from '../actions'
-import BaseActions from './BaseActions'
+import { TEXT, VALID_EMAIL, VALID_PASSWORD } from '../actions'
+import BaseActions, { type LocatorCallback } from './BaseActions'
 import DrivePageActions from './DrivePageActions'
-import SetUsernamePageActions from './SetUsernamePageActions'
+import ForgotPasswordPageActions from './ForgotPasswordPageActions'
+import RegisterPageActions from './RegisterPageActions'
+import SetupPageActions from './SetupPageActions'
 
 // ========================
 // === LoginPageActions ===
@@ -12,29 +14,85 @@ import SetUsernamePageActions from './SetUsernamePageActions'
 
 /** Available actions for the login page. */
 export default class LoginPageActions extends BaseActions {
+  /** Actions for navigating to another page. */
+  get goToPage() {
+    return {
+      register: (): RegisterPageActions =>
+        this.step("Go to 'register' page", async (page) =>
+          page.getByRole('link', { name: TEXT.dontHaveAnAccount, exact: true }).click(),
+        ).into(RegisterPageActions),
+      forgotPassword: (): ForgotPasswordPageActions =>
+        this.step("Go to 'forgot password' page", async (page) =>
+          page.getByRole('link', { name: TEXT.forgotYourPassword, exact: true }).click(),
+        ).into(ForgotPasswordPageActions),
+    }
+  }
+
   /** Perform a successful login. */
-  login(email = 'email@example.com', password = actions.VALID_PASSWORD) {
+  login(email = VALID_EMAIL, password = VALID_PASSWORD) {
     return this.step('Login', () => this.loginInternal(email, password)).into(DrivePageActions)
   }
 
   /** Perform a login as a new user (a user that does not yet have a username). */
-  loginAsNewUser(email = 'email@example.com', password = actions.VALID_PASSWORD) {
+  loginAsNewUser(email = VALID_EMAIL, password = VALID_PASSWORD) {
     return this.step('Login (as new user)', () => this.loginInternal(email, password)).into(
-      SetUsernamePageActions,
+      SetupPageActions,
     )
   }
 
   /** Perform a failing login. */
-  loginThatShouldFail(email = 'email@example.com', password = actions.VALID_PASSWORD) {
-    return this.step('Login (should fail)', () => this.loginInternal(email, password))
+  loginThatShouldFail(
+    email = VALID_EMAIL,
+    password = VALID_PASSWORD,
+    {
+      assert = {},
+    }: {
+      assert?: {
+        emailError?: string | null
+        passwordError?: string | null
+        formError?: string | null
+      }
+    } = {},
+  ) {
+    const { emailError, passwordError, formError } = assert
+    const next = this.step('Login (should fail)', () => this.loginInternal(email, password))
+      .expectInputError('email-input', 'email', emailError)
+      .expectInputError('password-input', 'password', passwordError)
+    if (formError === undefined) {
+      return next
+    } else if (formError != null) {
+      return next.step(`Expect form error to be '${formError}'`, async (page) => {
+        await test.expect(page.getByTestId('form-submit-error')).toHaveText(formError)
+      })
+    } else {
+      return next.step('Expect no form error', async (page) => {
+        await test.expect(page.getByTestId('form-submit-error')).not.toBeVisible()
+      })
+    }
+  }
+
+  /** Fill the email input. */
+  fillEmail(email: string) {
+    return this.step(`Fill email with '${email}'`, (page) =>
+      page.getByPlaceholder(TEXT.emailPlaceholder).fill(email),
+    )
+  }
+
+  /** Interact with the email input. */
+  withEmailInput(callback: LocatorCallback) {
+    return this.step('Interact with email input', async (page) => {
+      await callback(page.getByPlaceholder(TEXT.emailPlaceholder))
+    })
   }
 
   /** Internal login logic shared between all public methods. */
   private async loginInternal(email: string, password: string) {
-    await this.page.goto('/')
-    await this.page.getByPlaceholder('Enter your email').fill(email)
-    await this.page.getByPlaceholder('Enter your password').fill(password)
-    await this.page.getByRole('button', { name: 'Login', exact: true }).getByText('Login').click()
-    await test.expect(this.page.getByText('Logging in to Enso...')).not.toBeVisible()
+    await this.page.getByPlaceholder(TEXT.emailPlaceholder).fill(email)
+    await this.page.getByPlaceholder(TEXT.passwordPlaceholder).fill(password)
+    await this.page
+      .getByRole('button', { name: TEXT.login, exact: true })
+      .getByText(TEXT.login)
+      .click()
+    await test.expect(this.page.getByText(TEXT.loadingAppMessage)).not.toBeVisible()
   }
 }
diff --git a/app/dashboard/e2e/actions/RegisterPageActions.ts b/app/dashboard/e2e/actions/RegisterPageActions.ts
new file mode 100644
index 000000000000..c78fd08b13a8
--- /dev/null
+++ b/app/dashboard/e2e/actions/RegisterPageActions.ts
@@ -0,0 +1,92 @@
+/** @file Available actions for the login page. */
+import * as test from '@playwright/test'
+
+import { TEXT, VALID_EMAIL, VALID_PASSWORD } from '../actions'
+import BaseActions, { type LocatorCallback } from './BaseActions'
+import LoginPageActions from './LoginPageActions'
+
+// ========================
+// === LoginPageActions ===
+// ========================
+
+/** Available actions for the login page. */
+export default class RegisterPageActions extends BaseActions {
+  /** Actions for navigating to another page. */
+  get goToPage() {
+    return {
+      login: (): LoginPageActions =>
+        this.step("Go to 'login' page", async (page) =>
+          page.getByRole('link', { name: TEXT.alreadyHaveAnAccount, exact: true }).click(),
+        ).into(LoginPageActions),
+    }
+  }
+
+  /** Perform a successful login. */
+  register(email = VALID_EMAIL, password = VALID_PASSWORD, confirmPassword = password) {
+    return this.step('Reegister', () =>
+      this.registerInternal(email, password, confirmPassword),
+    ).into(LoginPageActions)
+  }
+
+  /** Perform a failing login. */
+  registerThatShouldFail(
+    email = VALID_EMAIL,
+    password = VALID_PASSWORD,
+    confirmPassword = password,
+    {
+      assert = {},
+    }: {
+      assert?: {
+        emailError?: string | null
+        passwordError?: string | null
+        confirmPasswordError?: string | null
+        formError?: string | null
+      }
+    } = {},
+  ) {
+    const { emailError, passwordError, confirmPasswordError, formError } = assert
+    const next = this.step('Register (should fail)', () =>
+      this.registerInternal(email, password, confirmPassword),
+    )
+      .expectInputError('email-input', 'email', emailError)
+      .expectInputError('password-input', 'password', passwordError)
+      .expectInputError('confirm-password-input', 'confirmPassword', confirmPasswordError)
+    if (formError === undefined) {
+      return next
+    } else if (formError != null) {
+      return next.step(`Expect form error to be '${formError}'`, async (page) => {
+        await test.expect(page.getByTestId('form-submit-error')).toHaveText(formError)
+      })
+    } else {
+      return next.step('Expect no form error', async (page) => {
+        await test.expect(page.getByTestId('form-submit-error')).not.toBeVisible()
+      })
+    }
+  }
+
+  /** Fill the email input. */
+  fillEmail(email: string) {
+    return this.step(`Fill email with '${email}'`, (page) =>
+      page.getByPlaceholder(TEXT.emailPlaceholder).fill(email),
+    )
+  }
+
+  /** Interact with the email input. */
+  withEmailInput(callback: LocatorCallback) {
+    return this.step('Interact with email input', async (page) => {
+      await callback(page.getByPlaceholder(TEXT.emailPlaceholder))
+    })
+  }
+
+  /** Internal login logic shared between all public methods. */
+  private async registerInternal(email: string, password: string, confirmPassword: string) {
+    await this.page.getByPlaceholder(TEXT.emailPlaceholder).fill(email)
+    await this.page.getByPlaceholder(TEXT.passwordPlaceholder).fill(password)
+    await this.page.getByPlaceholder(TEXT.confirmPasswordPlaceholder).fill(confirmPassword)
+    await this.page
+      .getByRole('button', { name: TEXT.register, exact: true })
+      .getByText(TEXT.register)
+      .click()
+    await test.expect(this.page.getByText(TEXT.loadingAppMessage)).not.toBeVisible()
+  }
+}
diff --git a/app/dashboard/e2e/actions/SetUsernamePageActions.ts b/app/dashboard/e2e/actions/SetupPageActions.ts
similarity index 84%
rename from app/dashboard/e2e/actions/SetUsernamePageActions.ts
rename to app/dashboard/e2e/actions/SetupPageActions.ts
index 2e9e2de6427a..f25b46b1da6c 100644
--- a/app/dashboard/e2e/actions/SetUsernamePageActions.ts
+++ b/app/dashboard/e2e/actions/SetupPageActions.ts
@@ -1,4 +1,4 @@
-/** @file Actions for the "set username" page. */
+/** @file Actions for the "setup" page. */
 import * as actions from '../actions'
 import BaseActions from './BaseActions'
 import DrivePageActions from './DrivePageActions'
@@ -8,7 +8,7 @@ import DrivePageActions from './DrivePageActions'
 // ==============================
 
 /** Actions for the "set username" page. */
-export default class SetUsernamePageActions extends BaseActions {
+export default class SetupPageActions extends BaseActions {
   /** Set the userame for a new user that does not yet have a username. */
   setUsername(username: string) {
     return this.step(`Set username to '${username}'`, async (page) => {
diff --git a/app/dashboard/e2e/authPreserveEmail.spec.ts b/app/dashboard/e2e/authPreserveEmail.spec.ts
new file mode 100644
index 000000000000..20df1440ce25
--- /dev/null
+++ b/app/dashboard/e2e/authPreserveEmail.spec.ts
@@ -0,0 +1,27 @@
+/** @file Test that emails are preserved when navigating between auth pages. */
+import * as test from '@playwright/test'
+import { VALID_EMAIL, mockAll } from './actions'
+
+test.test('preserve email input when changing pages', ({ page }) =>
+  mockAll({ page })
+    .fillEmail(VALID_EMAIL)
+    .goToPage.register()
+    .withEmailInput(async (emailInput) => {
+      await test.expect(emailInput).toHaveValue(VALID_EMAIL)
+    })
+    .fillEmail(`2${VALID_EMAIL}`)
+    .goToPage.login()
+    .withEmailInput(async (emailInput) => {
+      await test.expect(emailInput).toHaveValue(`2${VALID_EMAIL}`)
+    })
+    .fillEmail(`3${VALID_EMAIL}`)
+    .goToPage.forgotPassword()
+    .withEmailInput(async (emailInput) => {
+      await test.expect(emailInput).toHaveValue(`3${VALID_EMAIL}`)
+    })
+    .fillEmail(`4${VALID_EMAIL}`)
+    .goToPage.login()
+    .withEmailInput(async (emailInput) => {
+      await test.expect(emailInput).toHaveValue(`4${VALID_EMAIL}`)
+    }),
+)
diff --git a/app/dashboard/e2e/labels.spec.ts b/app/dashboard/e2e/labels.spec.ts
index 65d813f9350a..4b0d5a726faf 100644
--- a/app/dashboard/e2e/labels.spec.ts
+++ b/app/dashboard/e2e/labels.spec.ts
@@ -5,6 +5,15 @@ import * as backend from '#/services/Backend'
 
 import * as actions from './actions'
 
+// eslint-disable-next-line @typescript-eslint/no-magic-numbers
+export const ASSET_ROW_SAFE_POSITION = { x: 300, y: 16 }
+
+/** Click an asset row. The center must not be clicked as that is the button for adding a label. */
+export async function clickAssetRow(assetRow: test.Locator) {
+  // eslint-disable-next-line @typescript-eslint/no-magic-numbers
+  await assetRow.click({ position: ASSET_ROW_SAFE_POSITION })
+}
+
 test.test('drag labels onto single row', async ({ page }) => {
   const label = 'aaaa'
   await actions.mockAllAndLogin({
@@ -52,8 +61,8 @@ test.test('drag labels onto multiple rows', async ({ page }) => {
 
   await page.keyboard.down(await actions.modModifier(page))
   await test.expect(assetRows).toHaveCount(4)
-  await actions.clickAssetRow(assetRows.nth(0))
-  await actions.clickAssetRow(assetRows.nth(2))
+  await clickAssetRow(assetRows.nth(0))
+  await clickAssetRow(assetRows.nth(2))
   await test.expect(labelEl).toBeVisible()
   await labelEl.dragTo(assetRows.nth(2))
   await page.keyboard.up(await actions.modModifier(page))
diff --git a/app/dashboard/e2e/loginScreen.spec.ts b/app/dashboard/e2e/loginScreen.spec.ts
index 2dbd7be3efc1..61cac698b1ba 100644
--- a/app/dashboard/e2e/loginScreen.spec.ts
+++ b/app/dashboard/e2e/loginScreen.spec.ts
@@ -1,35 +1,34 @@
 /** @file Test the login flow. */
 import * as test from '@playwright/test'
 
-import * as actions from './actions'
-
-test.test.beforeEach(({ page }) => actions.mockAll({ page }))
+import {
+  INVALID_PASSWORD,
+  mockAll,
+  passTermsAndConditionsDialog,
+  TEXT,
+  VALID_EMAIL,
+  VALID_PASSWORD,
+} from './actions'
 
 // =============
 // === Tests ===
 // =============
 
-test.test('login screen', async ({ page }) => {
-  await page.goto('/')
-
-  // Invalid email
-  await actions.locateEmailInput(page).fill('invalid email')
-  test
-    .expect(
-      await page.evaluate(() => document.querySelector('form')?.checkValidity()),
-      'form should reject invalid email',
-    )
-    .toBe(false)
-  await actions.locateLoginButton(page).click()
-
-  // Invalid password
-  await actions.locateEmailInput(page).fill(actions.VALID_EMAIL)
-  await actions.locatePasswordInput(page).fill(actions.INVALID_PASSWORD)
-  test
-    .expect(
-      await page.evaluate(() => document.querySelector('form')?.checkValidity()),
-      'form should accept invalid password',
-    )
-    .toBe(true)
-  await actions.locateLoginButton(page).click()
-})
+test.test('login screen', ({ page }) =>
+  mockAll({ page })
+    .loginThatShouldFail('invalid email', VALID_PASSWORD, {
+      assert: {
+        emailError: TEXT.invalidEmailValidationError,
+        passwordError: null,
+        formError: null,
+      },
+    })
+    // Technically it should not be allowed, but
+    .login(VALID_EMAIL, INVALID_PASSWORD)
+    .do(async (thePage) => {
+      await passTermsAndConditionsDialog({ page: thePage })
+    })
+    .withDriveView(async (driveView) => {
+      await test.expect(driveView).toBeVisible()
+    }),
+)
diff --git a/app/dashboard/e2e/signUp.spec.ts b/app/dashboard/e2e/signUp.spec.ts
new file mode 100644
index 000000000000..6c3426235084
--- /dev/null
+++ b/app/dashboard/e2e/signUp.spec.ts
@@ -0,0 +1,38 @@
+/** @file Test the login flow. */
+import * as test from '@playwright/test'
+
+import { INVALID_PASSWORD, mockAll, TEXT, VALID_EMAIL, VALID_PASSWORD } from './actions'
+
+// =============
+// === Tests ===
+// =============
+
+test.test('sign up without organization id', ({ page }) =>
+  mockAll({ page })
+    .goToPage.register()
+    .registerThatShouldFail('invalid email', VALID_PASSWORD, VALID_PASSWORD, {
+      assert: {
+        emailError: TEXT.invalidEmailValidationError,
+        passwordError: null,
+        confirmPasswordError: null,
+        formError: null,
+      },
+    })
+    .registerThatShouldFail(VALID_EMAIL, INVALID_PASSWORD, INVALID_PASSWORD, {
+      assert: {
+        emailError: null,
+        passwordError: TEXT.passwordValidationError,
+        confirmPasswordError: null,
+        formError: null,
+      },
+    })
+    .registerThatShouldFail(VALID_EMAIL, VALID_PASSWORD, INVALID_PASSWORD, {
+      assert: {
+        emailError: null,
+        passwordError: null,
+        confirmPasswordError: TEXT.passwordMismatchError,
+        formError: null,
+      },
+    })
+    .register(),
+)
diff --git a/app/dashboard/e2e/userSettings.spec.ts b/app/dashboard/e2e/userSettings.spec.ts
index aa6da128c884..6f91554af1f1 100644
--- a/app/dashboard/e2e/userSettings.spec.ts
+++ b/app/dashboard/e2e/userSettings.spec.ts
@@ -25,45 +25,37 @@ test.test('change password form', async ({ page }) => {
   test.expect(api.currentPassword()).toBe(actions.VALID_PASSWORD)
   await localActions.locateCurrentPasswordInput(page).fill(actions.VALID_PASSWORD)
   await localActions.locateNewPasswordInput(page).fill(actions.INVALID_PASSWORD)
-  await test
-    .expect(localActions.locateChangeButton(page), 'incomplete form should be rejected')
-    .toBeDisabled()
 
   await test.test.step('Invalid new password', async () => {
     await localActions.locateCurrentPasswordInput(page).fill(actions.VALID_PASSWORD)
     await localActions.locateNewPasswordInput(page).fill(actions.INVALID_PASSWORD)
     await localActions.locateConfirmNewPasswordInput(page).fill(actions.INVALID_PASSWORD)
-    test
+    await localActions.locateChangeButton(page).click()
+    await test
       .expect(
-        await localActions
-          .locateNewPasswordInput(page)
-          .evaluate((element: HTMLInputElement) => element.validity.valid),
-        'invalid new password should be rejected',
+        localActions
+          .locate(page)
+          .getByRole('group', { name: /^New password/, exact: true })
+          .locator('.text-danger')
+          .last(),
       )
-      .toBe(false)
-    await test
-      .expect(localActions.locateChangeButton(page), 'invalid new password should be rejected')
-      .toBeDisabled()
+      .toHaveText(actions.TEXT.passwordValidationError)
   })
 
   await test.test.step('Invalid new password confirmation', async () => {
     await localActions.locateCurrentPasswordInput(page).fill(actions.VALID_PASSWORD)
     await localActions.locateNewPasswordInput(page).fill(actions.VALID_PASSWORD)
     await localActions.locateConfirmNewPasswordInput(page).fill(actions.VALID_PASSWORD + 'a')
-    test
-      .expect(
-        await localActions
-          .locateConfirmNewPasswordInput(page)
-          .evaluate((element: HTMLInputElement) => element.validity.valid),
-        'invalid new password confirmation should be rejected',
-      )
-      .toBe(false)
+    await localActions.locateChangeButton(page).click()
     await test
       .expect(
-        localActions.locateChangeButton(page),
-        'invalid new password confirmation should be rejected',
+        localActions
+          .locate(page)
+          .getByRole('group', { name: /^Confirm new password/, exact: true })
+          .locator('.text-danger')
+          .last(),
       )
-      .toBeDisabled()
+      .toHaveText(actions.TEXT.passwordMismatchError)
   })
 
   await test.test.step('Successful password change', async () => {
diff --git a/app/dashboard/src/App.tsx b/app/dashboard/src/App.tsx
index c31a214f325b..d4b0f8a72cb9 100644
--- a/app/dashboard/src/App.tsx
+++ b/app/dashboard/src/App.tsx
@@ -501,9 +501,11 @@ function AppRouter(props: AppRouterProps) {
                   <errorBoundary.ErrorBoundary>
                     <VersionChecker />
                     {routes}
-                    <suspense.Suspense>
-                      <devtools.EnsoDevtools />
-                    </suspense.Suspense>
+                    {detect.IS_DEV_MODE && (
+                      <suspense.Suspense>
+                        <devtools.EnsoDevtools />
+                      </suspense.Suspense>
+                    )}
                   </errorBoundary.ErrorBoundary>
                 </DriveProvider>
               </InputBindingsProvider>
diff --git a/app/dashboard/src/assets/github_color.svg b/app/dashboard/src/assets/github_color.svg
new file mode 100644
index 000000000000..43530dea8077
--- /dev/null
+++ b/app/dashboard/src/assets/github_color.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+	<path fill-rule="evenodd" clip-rule="evenodd"
+		d="M7.976 0C3.566 0 0 3.592 0 8.035c0 3.552 2.285 6.559 5.454 7.623 .396.08 .541-.173 .541-.386 0-.186-.013-.825-.013-1.49-2.219 .479-2.681-.958-2.681-.958-.357-.931-.885-1.171-.885-1.171-.726-.492.053-.492.053-.492 .806.053 1.228 .825 1.228 .825 .713 1.224 1.862 .878 2.324 .665.066-.519 .277-.878 .502-1.078-1.77-.186-3.632-.878-3.632-3.965 0-.878 .317-1.596 .819-2.155-.079-.2-.357-1.024.079-2.129 0 0 .673-.213 2.192 .825a7.669 7.669 0 0 1 1.994-.266c.673 0 1.36.093 1.994 .266 1.519-1.038 2.192-.825 2.192-.825 .436 1.104.158 1.929.079 2.129 .515 .559 .819 1.277 .819 2.155 0 3.087-1.862 3.765-3.645 3.965 .291 .253 .541 .732 .541 1.49 0 1.078-.013 1.942-.013 2.208 0 .213.145 .466 .541 .386 3.169-1.064 5.454-4.071 5.454-7.623C15.952 3.592 12.374 0 7.976 0z"
+		fill="#171515" />
+</svg>
\ No newline at end of file
diff --git a/app/dashboard/src/assets/google_color.svg b/app/dashboard/src/assets/google_color.svg
new file mode 100644
index 000000000000..d0b375f80225
--- /dev/null
+++ b/app/dashboard/src/assets/google_color.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.66636 15.8245C10.9925 15.5421 12.2172 14.9291 13.2316 14.0523L10.6177 12.0013C10.127 12.3224 9.57781 12.5527 8.99597 12.6766C7.92483 12.9048 6.80784 12.7583 5.83175 12.2616C4.85566 11.765 4.07963 10.9484 3.6334 9.94824C3.57221 9.81108 3.51772 9.6716 3.46999 9.5303L0.842987 11.5745C1.60697 13.1043 2.84283 14.352 4.37227 15.1302C6.00537 15.9611 7.87422 16.2062 9.66636 15.8245Z" fill="#34A853"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.46999 9.53031L0.842985 11.5745C0.7912 11.4708 0.741583 11.3658 0.69419 11.2596C-0.0523962 9.58629 -0.201934 7.70738 0.270576 5.93702C0.410984 5.41095 0.603788 4.90395 0.844315 4.42282L3.46958 6.4709C3.43669 6.56836 3.40687 6.6671 3.38021 6.76698C3.13653 7.67999 3.16965 8.64131 3.46999 9.53031Z" fill="#FBBC05"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.29011 1.53339C2.24911 2.2916 1.41321 3.28482 0.844299 4.42282L3.46957 6.4709C3.7851 5.53597 4.38327 4.71888 5.18495 4.13498C6.0702 3.49022 7.14995 3.16889 8.24369 3.22471C9.33743 3.28053 10.3789 3.71011 11.1939 4.44165L13.3437 2.04647C11.9801 0.822539 10.2377 0.103794 8.40773 0.0104031C6.57778 -0.0829874 4.77123 0.454637 3.29011 1.53339Z" fill="#EA4335"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 6.50002H16V8.00002C16 9.83234 15.371 11.6091 14.2182 13.0333C13.9184 13.4036 13.588 13.7443 13.2316 14.0523L10.6177 12.0013C11.0304 11.7313 11.4018 11.3972 11.7165 11.0084C12.0481 10.5988 12.3071 10.1404 12.4867 9.653C12.4932 9.63538 12.4996 9.61772 12.5059 9.60002H8V8.00002V6.50002Z" fill="#4285F4"/>
+</svg>
diff --git a/app/dashboard/src/components/AriaComponents/Button/Button.tsx b/app/dashboard/src/components/AriaComponents/Button/Button.tsx
index 95e2dc13524d..55421ed0cb83 100644
--- a/app/dashboard/src/components/AriaComponents/Button/Button.tsx
+++ b/app/dashboard/src/components/AriaComponents/Button/Button.tsx
@@ -100,7 +100,6 @@ export const BUTTON_STYLES = twv.tv({
     },
     loading: { true: { base: 'cursor-wait' } },
     fullWidth: { true: 'w-full' },
-    fullWidthText: { true: { text: 'w-full' } },
     size: {
       custom: { base: '', extraClickZone: '', icon: 'h-full' },
       hero: { base: 'px-8 py-4 text-lg font-bold', content: 'gap-[0.75em]' },
@@ -112,7 +111,7 @@ export const BUTTON_STYLES = twv.tv({
           className: 'flex px-[11px] py-[5.5px]',
         }),
         content: 'gap-2',
-        icon: 'mb-[-0.1cap] h-4.5 w-4.5',
+        icon: 'mb-[-0.1cap] h-4 w-4',
         extraClickZone: 'after:inset-[-6px]',
       },
       medium: {
@@ -218,7 +217,7 @@ export const BUTTON_STYLES = twv.tv({
         extraClickZone: 'flex relative after:absolute after:cursor-pointer',
       },
       false: {
-        extraClickZone: '',
+        extraClickZone: 'after:inset-0',
       },
       xxsmall: {
         extraClickZone: 'after:inset-[-2px]',
@@ -295,7 +294,6 @@ export const Button = React.forwardRef(function Button(
     iconPosition,
     size,
     fullWidth,
-    fullWidthText,
     rounded,
     tooltip,
     tooltipPlacement,
@@ -316,8 +314,7 @@ export const Button = React.forwardRef(function Button(
   const Tag = isLink ? aria.Link : aria.Button
 
   const goodDefaults = {
-    ...(isLink ? { rel: 'noopener noreferrer', ref } : {}),
-    ...(isLink ? {} : { type: 'button' as const }),
+    ...(isLink ? { rel: 'noopener noreferrer' } : { type: 'button' as const }),
     'data-testid': testId ?? (isLink ? 'link' : 'button'),
   }
 
@@ -389,7 +386,6 @@ export const Button = React.forwardRef(function Button(
     isActive,
     loading: isLoading,
     fullWidth,
-    fullWidthText,
     size,
     rounded,
     variant,
@@ -443,7 +439,8 @@ export const Button = React.forwardRef(function Button(
     <Tag
       // @ts-expect-error ts errors are expected here because we are merging props with different types
       {...aria.mergeProps<aria.ButtonProps>()(goodDefaults, ariaProps, focusChildProps, {
-        isDisabled: isDisabled,
+        ref,
+        isDisabled,
         // we use onPressEnd instead of onPress because for some reason react-aria doesn't trigger
         // onPress on EXTRA_CLICK_ZONE, but onPress{start,end} are triggered
         onPressEnd: handlePress,
diff --git a/app/dashboard/src/components/AriaComponents/Form/Form.tsx b/app/dashboard/src/components/AriaComponents/Form/Form.tsx
index 7698f2939382..f03489fe2f8e 100644
--- a/app/dashboard/src/components/AriaComponents/Form/Form.tsx
+++ b/app/dashboard/src/components/AriaComponents/Form/Form.tsx
@@ -13,11 +13,23 @@ import * as aria from '#/components/aria'
 
 import * as errorUtils from '#/utilities/error'
 
+import type { Mutable } from 'enso-common/src/utilities/data/object'
 import * as dialog from '../Dialog'
 import * as components from './components'
 import * as styles from './styles'
 import type * as types from './types'
 
+/**
+ * Maps the value to the event object.
+ */
+function mapValueOnEvent(value: unknown) {
+  if (typeof value === 'object' && value != null && 'target' in value && 'type' in value) {
+    return value
+  } else {
+    return { target: { value } }
+  }
+}
+
 /** Form component. It wraps a `form` and provides form context.
  * It also handles form submission.
  * Provides better error handling and form state management and better UX out of the box. */
@@ -147,30 +159,13 @@ export const Form = React.forwardRef(function Form<
       register: (name, options) => {
         const registered = register(name, options)
 
-        /**
-         * Maps the value to the event object.
-         */
-        function mapValueOnEvent(value: unknown) {
-          if (typeof value === 'object' && value != null && 'target' in value && 'type' in value) {
-            return value
-          } else {
-            return { target: { value } }
-          }
-        }
-
-        const onChange: types.UseFormRegisterReturn<Schema, TFieldValues>['onChange'] = (value) =>
-          registered.onChange(mapValueOnEvent(value))
-
-        const onBlur: types.UseFormRegisterReturn<Schema, TFieldValues>['onBlur'] = (value) =>
-          registered.onBlur(mapValueOnEvent(value))
-
         const result: types.UseFormRegisterReturn<Schema, TFieldValues, typeof name> = {
           ...registered,
-          ...(registered.disabled != null ? { isDisabled: registered.disabled } : {}),
-          ...(registered.required != null ? { isRequired: registered.required } : {}),
-          isInvalid: !!formState.errors[name],
-          onChange,
-          onBlur,
+          isDisabled: registered.disabled ?? false,
+          isRequired: registered.required ?? false,
+          isInvalid: Boolean(formState.errors[name]),
+          onChange: (value) => registered.onChange(mapValueOnEvent(value)),
+          onBlur: (value) => registered.onBlur(mapValueOnEvent(value)),
         }
 
         return result
@@ -226,26 +221,29 @@ export const Form = React.forwardRef(function Form<
       </aria.FormValidationContext.Provider>
     </form>
   )
-}) as unknown as (<
-  Schema extends components.TSchema,
-  TFieldValues extends components.FieldValues<Schema>,
-  TTransformedValues extends components.FieldValues<Schema> | undefined = undefined,
->(
-  props: React.RefAttributes<HTMLFormElement> &
-    types.FormProps<Schema, TFieldValues, TTransformedValues>,
-  // eslint-disable-next-line no-restricted-syntax
-) => React.JSX.Element) & {
-  /* eslint-disable @typescript-eslint/naming-convention */
-  schema: typeof components.schema
-  useForm: typeof components.useForm
-  useField: typeof components.useField
-  Submit: typeof components.Submit
-  Reset: typeof components.Reset
-  Field: typeof components.Field
-  FormError: typeof components.FormError
-  useFormSchema: typeof components.useFormSchema
-  /* eslint-enable @typescript-eslint/naming-convention */
-}
+}) as unknown as Mutable<
+  Pick<
+    typeof components,
+    | 'FIELD_STYLES'
+    | 'Field'
+    | 'FormError'
+    | 'Reset'
+    | 'schema'
+    | 'Submit'
+    | 'useField'
+    | 'useForm'
+    | 'useFormSchema'
+  >
+> &
+  (<
+    Schema extends components.TSchema,
+    TFieldValues extends components.FieldValues<Schema>,
+    TTransformedValues extends components.FieldValues<Schema> | undefined = undefined,
+  >(
+    props: React.RefAttributes<HTMLFormElement> &
+      types.FormProps<Schema, TFieldValues, TTransformedValues>,
+    // eslint-disable-next-line no-restricted-syntax
+  ) => React.JSX.Element)
 
 Form.schema = components.schema
 Form.useForm = components.useForm
@@ -255,3 +253,4 @@ Form.Submit = components.Submit
 Form.Reset = components.Reset
 Form.FormError = components.FormError
 Form.Field = components.Field
+Form.FIELD_STYLES = components.FIELD_STYLES
diff --git a/app/dashboard/src/components/AriaComponents/Form/components/Field.tsx b/app/dashboard/src/components/AriaComponents/Form/components/Field.tsx
index a046589dc8bb..31429f77f7d5 100644
--- a/app/dashboard/src/components/AriaComponents/Form/components/Field.tsx
+++ b/app/dashboard/src/components/AriaComponents/Form/components/Field.tsx
@@ -8,8 +8,8 @@ import * as React from 'react'
 
 import * as aria from '#/components/aria'
 
-import * as twv from '#/utilities/tailwindVariants'
-
+import { useText } from '#/providers/TextProvider'
+import { type ExtractFunction, tv, type VariantProps } from '#/utilities/tailwindVariants'
 import * as text from '../../Text'
 import type * as types from './types'
 import * as formContext from './useFormContext'
@@ -17,9 +17,8 @@ import * as formContext from './useFormContext'
 /**
  * Props for Field component
  */
-export interface FieldComponentProps
-  extends twv.VariantProps<typeof FIELD_STYLES>,
-    types.FieldProps {
+export interface FieldComponentProps extends VariantProps<typeof FIELD_STYLES>, types.FieldProps {
+  readonly 'data-testid'?: string | undefined
   readonly name: string
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   readonly form?: types.FormInstance<any, any, any>
@@ -27,6 +26,7 @@ export interface FieldComponentProps
   readonly className?: string | undefined
   readonly children?: React.ReactNode | ((props: FieldChildrenRenderProps) => React.ReactNode)
   readonly style?: React.CSSProperties | undefined
+  readonly variants?: ExtractFunction<typeof FIELD_STYLES> | undefined
 }
 
 /**
@@ -40,11 +40,12 @@ export interface FieldChildrenRenderProps {
   readonly error?: string | undefined
 }
 
-export const FIELD_STYLES = twv.tv({
+export const FIELD_STYLES = tv({
   base: 'flex flex-col gap-0.5 items-start',
   variants: {
     fullWidth: { true: 'w-full' },
     isInvalid: { true: { label: 'text-danger' } },
+    isHidden: { true: { base: 'hidden' } },
   },
   slots: {
     labelContainer: 'contents',
@@ -53,7 +54,9 @@ export const FIELD_STYLES = twv.tv({
     description: text.TEXT_STYLE({ variant: 'body', color: 'disabled' }),
     error: text.TEXT_STYLE({ variant: 'body', color: 'danger' }),
   },
-  defaultVariants: { fullWidth: true },
+  defaultVariants: {
+    fullWidth: true,
+  },
 })
 
 /**
@@ -73,8 +76,11 @@ export const Field = React.forwardRef(function Field(
     fullWidth,
     error,
     name,
+    isHidden,
     isRequired = false,
+    variants,
   } = props
+  const { getText } = useText()
 
   const fieldState = form.getFieldState(name)
 
@@ -84,9 +90,10 @@ export const Field = React.forwardRef(function Field(
 
   const invalid = isInvalid === true || fieldState.invalid
 
-  const classes = FIELD_STYLES({
+  const classes = (variants ?? FIELD_STYLES)({
     fullWidth,
     isInvalid: invalid,
+    isHidden,
   })
 
   const hasError = (error ?? fieldState.error?.message) != null
@@ -95,6 +102,7 @@ export const Field = React.forwardRef(function Field(
     <fieldset
       ref={ref}
       className={classes.base({ className })}
+      data-testid={props['data-testid']}
       aria-invalid={invalid}
       aria-label={props['aria-label']}
       aria-labelledby={labelId}
@@ -137,7 +145,7 @@ export const Field = React.forwardRef(function Field(
       )}
 
       {hasError && (
-        <span id={errorId} className={classes.error()}>
+        <span aria-label={getText('fieldErrorLabel')} id={errorId} className={classes.error()}>
           {error ?? fieldState.error?.message}
         </span>
       )}
diff --git a/app/dashboard/src/components/AriaComponents/Form/components/FormError.tsx b/app/dashboard/src/components/AriaComponents/Form/components/FormError.tsx
index afc3e19d166b..65e73671342c 100644
--- a/app/dashboard/src/components/AriaComponents/Form/components/FormError.tsx
+++ b/app/dashboard/src/components/AriaComponents/Form/components/FormError.tsx
@@ -65,7 +65,12 @@ export function FormError(props: FormErrorProps) {
   const submitErrorAlert =
     errorMessage != null ?
       <reactAriaComponents.Alert size={size} variant={variant} rounded={rounded} {...alertProps}>
-        <reactAriaComponents.Text variant="body" truncate="3" color="primary">
+        <reactAriaComponents.Text
+          data-testid="form-submit-error"
+          variant="body"
+          truncate="3"
+          color="primary"
+        >
           {errorMessage}
         </reactAriaComponents.Text>
       </reactAriaComponents.Alert>
diff --git a/app/dashboard/src/components/AriaComponents/Form/components/types.ts b/app/dashboard/src/components/AriaComponents/Form/components/types.ts
index 692debeb3eff..46e3ac542d86 100644
--- a/app/dashboard/src/components/AriaComponents/Form/components/types.ts
+++ b/app/dashboard/src/components/AriaComponents/Form/components/types.ts
@@ -14,7 +14,7 @@ import type * as schemaModule from './schema'
  */
 // eslint-disable-next-line no-restricted-syntax
 export type FieldValues<Schema extends TSchema | undefined> =
-  Schema extends z.AnyZodObject ? z.infer<Schema> : reactHookForm.FieldValues
+  Schema extends TSchema ? z.infer<Schema> : reactHookForm.FieldValues
 
 /**
  * Field path type.
@@ -28,7 +28,7 @@ export type FieldPath<
 /**
  * Schema type
  */
-export type TSchema = z.AnyZodObject
+export type TSchema = z.AnyZodObject | z.ZodEffects<z.AnyZodObject>
 
 /**
  * Props for the useForm hook.
diff --git a/app/dashboard/src/components/AriaComponents/Inputs/Input/Input.tsx b/app/dashboard/src/components/AriaComponents/Inputs/Input/Input.tsx
index 2524b7397980..be701975b4c5 100644
--- a/app/dashboard/src/components/AriaComponents/Inputs/Input/Input.tsx
+++ b/app/dashboard/src/components/AriaComponents/Inputs/Input/Input.tsx
@@ -12,8 +12,10 @@ import * as ariaComponents from '#/components/AriaComponents'
 
 import * as mergeRefs from '#/utilities/mergeRefs'
 
+import SvgMask from '#/components/SvgMask'
+import type { ExtractFunction } from '#/utilities/tailwindVariants'
 import { omit } from 'enso-common/src/utilities/data/object'
-import * as variants from '../variants'
+import { INPUT_STYLES } from '../variants'
 
 /**
  * Props for the Input component.
@@ -31,13 +33,18 @@ export interface InputProps<
       TTransformedValues
     >,
     ariaComponents.FieldProps,
-    Omit<twv.VariantProps<typeof variants.INPUT_STYLES>, 'disabled' | 'invalid'> {
+    Omit<twv.VariantProps<typeof INPUT_STYLES>, 'disabled' | 'invalid'> {
+  readonly 'data-testid'?: string | undefined
   readonly className?: string
   readonly style?: React.CSSProperties
   readonly inputRef?: React.Ref<HTMLInputElement>
   readonly addonStart?: React.ReactNode
   readonly addonEnd?: React.ReactNode
   readonly placeholder?: string
+  /** The icon to display in the input. */
+  readonly icon?: React.ReactElement | string | null
+  readonly variants?: ExtractFunction<typeof INPUT_STYLES> | undefined
+  readonly fieldVariants?: ariaComponents.FieldComponentProps['variants']
 }
 
 /**
@@ -68,7 +75,11 @@ export const Input = React.forwardRef(function Input<
     isRequired = false,
     min,
     max,
+    icon,
     type = 'text',
+    variant,
+    variants,
+    fieldVariants,
     ...inputProps
   } = props
 
@@ -81,7 +92,8 @@ export const Input = React.forwardRef(function Input<
     defaultValue,
   })
 
-  const classes = variants.INPUT_STYLES({
+  const classes = (variants ?? INPUT_STYLES)({
+    variant,
     size,
     rounded,
     invalid: fieldState.invalid,
@@ -116,9 +128,11 @@ export const Input = React.forwardRef(function Input<
 
   return (
     <ariaComponents.Form.Field
+      data-testid={props['data-testid']}
       form={formInstance}
       name={name}
       fullWidth
+      isHidden={inputProps.hidden}
       label={label}
       aria-label={props['aria-label']}
       aria-labelledby={props['aria-labelledby']}
@@ -129,22 +143,27 @@ export const Input = React.forwardRef(function Input<
       ref={ref}
       style={props.style}
       className={props.className}
+      variants={fieldVariants}
     >
       <div
         className={classes.base()}
         onClick={() => privateInputRef.current?.focus({ preventScroll: true })}
       >
-        <div className={classes.inputContainer()}>
+        <div className={classes.content()}>
           {addonStart != null && <div className={classes.addonStart()}>{addonStart}</div>}
+          {icon != null &&
+            (typeof icon === 'string' ? <SvgMask src={icon} className={classes.icon()} /> : icon)}
 
-          <aria.Input
-            ref={mergeRefs.mergeRefs(inputRef, privateInputRef, fieldRef)}
-            {...aria.mergeProps<aria.InputProps>()(
-              { className: classes.textArea(), type, name, min, max, isRequired, isDisabled },
-              inputProps,
-              omit(field, 'required', 'disabled'),
-            )}
-          />
+          <div className={classes.inputContainer()}>
+            <aria.Input
+              ref={mergeRefs.mergeRefs(inputRef, privateInputRef, fieldRef)}
+              {...aria.mergeProps<aria.InputProps>()(
+                { className: classes.textArea(), type, name, min, max, isRequired, isDisabled },
+                inputProps,
+                omit(field, 'required', 'disabled'),
+              )}
+            />
+          </div>
 
           {addonEnd != null && <div className={classes.addonEnd()}>{addonEnd}</div>}
         </div>
diff --git a/app/dashboard/src/components/AriaComponents/Inputs/Password/Password.tsx b/app/dashboard/src/components/AriaComponents/Inputs/Password/Password.tsx
new file mode 100644
index 000000000000..c0221c76a06b
--- /dev/null
+++ b/app/dashboard/src/components/AriaComponents/Inputs/Password/Password.tsx
@@ -0,0 +1,57 @@
+/** @file A component wrapping {@link Input} with the ability to show and hide password. */
+import { useState } from 'react'
+import type { Path } from 'react-hook-form'
+
+import EyeIcon from '#/assets/eye.svg'
+import EyeCrossedIcon from '#/assets/eye_crossed.svg'
+import {
+  Button,
+  Input,
+  type FieldValues,
+  type InputProps,
+  type TSchema,
+} from '#/components/AriaComponents'
+
+// ================
+// === Password ===
+// ================
+
+/** Props for a {@link Password}. */
+export interface PasswordProps<
+  Schema extends TSchema,
+  TFieldValues extends FieldValues<Schema>,
+  TFieldName extends Path<TFieldValues>,
+  TTransformedValues extends FieldValues<Schema> | undefined = undefined,
+> extends Omit<InputProps<Schema, TFieldValues, TFieldName, TTransformedValues>, 'type'> {}
+
+/** A component wrapping {@link Input} with the ability to show and hide password. */
+export function Password<
+  Schema extends TSchema,
+  TFieldValues extends FieldValues<Schema>,
+  TFieldName extends Path<TFieldValues>,
+  TTransformedValues extends FieldValues<Schema> | undefined = undefined,
+>(props: PasswordProps<Schema, TFieldValues, TFieldName, TTransformedValues>) {
+  const [showPassword, setShowPassword] = useState(false)
+
+  return (
+    <Input
+      {...props}
+      type={showPassword ? 'text' : 'password'}
+      addonEnd={
+        <>
+          {props.addonEnd}
+
+          <Button
+            size="medium"
+            variant="icon"
+            extraClickZone
+            icon={showPassword ? EyeIcon : EyeCrossedIcon}
+            onPress={() => {
+              setShowPassword(!showPassword)
+            }}
+          />
+        </>
+      }
+    />
+  )
+}
diff --git a/app/dashboard/src/components/AriaComponents/Inputs/Password/index.ts b/app/dashboard/src/components/AriaComponents/Inputs/Password/index.ts
new file mode 100644
index 000000000000..4ad7d62dc16f
--- /dev/null
+++ b/app/dashboard/src/components/AriaComponents/Inputs/Password/index.ts
@@ -0,0 +1,6 @@
+/**
+ * @file
+ *
+ * Barrel file for Password component.
+ */
+export * from './Password'
diff --git a/app/dashboard/src/components/AriaComponents/Inputs/ResizableInput/ResizableContentEditableInput.tsx b/app/dashboard/src/components/AriaComponents/Inputs/ResizableInput/ResizableContentEditableInput.tsx
index eca5fb6ad2e0..3755589a879f 100644
--- a/app/dashboard/src/components/AriaComponents/Inputs/ResizableInput/ResizableContentEditableInput.tsx
+++ b/app/dashboard/src/components/AriaComponents/Inputs/ResizableInput/ResizableContentEditableInput.tsx
@@ -33,7 +33,7 @@ export interface ResizableContentEditableInputProps<
       TFieldName,
       TTransformedValues
     >,
-    ariaComponents.FieldProps,
+    Omit<ariaComponents.FieldProps, 'variant'>,
     Omit<twv.VariantProps<typeof variants.INPUT_STYLES>, 'disabled' | 'invalid'> {
   /**
    * onChange is called when the content of the input changes.
@@ -70,6 +70,7 @@ export const ResizableContentEditableInput = React.forwardRef(
       defaultValue,
       size,
       rounded,
+      variant,
       ...textFieldProps
     } = props
 
@@ -103,6 +104,7 @@ export const ResizableContentEditableInput = React.forwardRef(
       textArea,
       placeholder: placeholderClass,
     } = CONTENT_EDITABLE_STYLES({
+      variant,
       invalid: fieldState.invalid,
       disabled: isDisabled || formInstance.formState.isSubmitting,
       rounded,
diff --git a/app/dashboard/src/components/AriaComponents/Inputs/Selector/Selector.tsx b/app/dashboard/src/components/AriaComponents/Inputs/Selector/Selector.tsx
index cb6f52448d1a..d78e3f4e03a3 100644
--- a/app/dashboard/src/components/AriaComponents/Inputs/Selector/Selector.tsx
+++ b/app/dashboard/src/components/AriaComponents/Inputs/Selector/Selector.tsx
@@ -125,18 +125,6 @@ export const Selector = React.forwardRef(function Selector<
     disabled: isDisabled || formInstance.formState.isSubmitting,
   })
 
-  // const { ref: fieldRef, ...field } = formInstance.register(name, {
-  //   disabled: isDisabled,
-  //   required: isRequired,
-  //   ...(inputProps.onBlur && { onBlur: inputProps.onBlur }),
-  //   ...(inputProps.onChange && { onChange: inputProps.onChange }),
-  //   setValueAs: (value) => {
-  //     console.log('WHAT', value)
-  //     // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-  //     return items[Number(value)]
-  //   },
-  // })
-
   return (
     <Form.Field
       form={formInstance}
diff --git a/app/dashboard/src/components/AriaComponents/Inputs/index.ts b/app/dashboard/src/components/AriaComponents/Inputs/index.ts
index dc23f81f2cc3..2b0056d52c79 100644
--- a/app/dashboard/src/components/AriaComponents/Inputs/index.ts
+++ b/app/dashboard/src/components/AriaComponents/Inputs/index.ts
@@ -5,6 +5,7 @@
  */
 
 export * from './Input'
+export * from './Password'
 export * from './ResizableInput'
 export * from './Selector'
 export * from './variants'
diff --git a/app/dashboard/src/components/AriaComponents/Inputs/variants.ts b/app/dashboard/src/components/AriaComponents/Inputs/variants.ts
index d5eae22b9b57..83b9cdf47bfd 100644
--- a/app/dashboard/src/components/AriaComponents/Inputs/variants.ts
+++ b/app/dashboard/src/components/AriaComponents/Inputs/variants.ts
@@ -3,7 +3,6 @@
  *
  * Variants for the ResizableInput component.
  */
-
 import { tv } from '#/utilities/tailwindVariants'
 import { TEXT_STYLE } from '../Text'
 
@@ -23,8 +22,9 @@ export const INPUT_STYLES = tv({
       false: 'cursor-text',
     },
     size: {
-      medium: { base: 'px-[11px] pb-1.5 pt-2' },
-      small: { base: 'px-[11px] pb-0.5 pt-1' },
+      medium: { base: 'px-[11px] pb-[6.5px] pt-[8.5px]', icon: 'size-4' },
+      small: { base: 'px-[11px] pb-0.5 pt-1', icon: 'size-3' },
+      custom: {},
     },
     rounded: {
       none: 'rounded-none',
@@ -37,22 +37,25 @@ export const INPUT_STYLES = tv({
       full: 'rounded-full',
     },
     variant: {
+      custom: {},
       outline: {
-        base: 'border-[0.5px] outline-offset-2 border-primary/20 focus-within:outline focus-within:outline-2 focus-within:outline-offset-[-1px] focus-within:outline-primary focus-within:border-primary/50',
+        base: 'border-[0.5px] border-primary/20 outline-offset-2 focus-within:border-primary/50 focus-within:outline focus-within:outline-2 focus-within:outline-offset-[-1px] focus-within:outline-primary',
         textArea: 'border-transparent focus-within:border-transparent',
       },
     },
   },
   slots: {
-    addonStart: '',
-    addonEnd: '',
+    icon: 'flex-none',
+    addonStart: 'mt-[-1px] flex flex-none items-center gap-1',
+    addonEnd: 'mt-[-1px] flex flex-none items-center gap-1',
+    content: 'flex items-center gap-2',
     inputContainer: TEXT_STYLE({
-      className: 'flex w-full items-center max-h-32 min-h-6 relative overflow-auto',
+      className: 'relative flex max-h-32 min-h-6 w-full items-center overflow-clip',
       variant: 'body',
     }),
     selectorContainer: 'flex',
-    description: 'block select-none pointer-events-none opacity-80',
-    textArea: 'block h-auto w-full max-h-full resize-none bg-transparent',
+    description: 'pointer-events-none block select-none opacity-80',
+    textArea: 'block h-auto max-h-full w-full resize-none bg-transparent',
     resizableSpan: TEXT_STYLE({
       className:
         'pointer-events-none invisible absolute block max-h-32 min-h-10 overflow-y-auto break-all',
diff --git a/app/dashboard/src/components/Link.tsx b/app/dashboard/src/components/Link.tsx
index 11de3f8123b8..679cbfcc0735 100644
--- a/app/dashboard/src/components/Link.tsx
+++ b/app/dashboard/src/components/Link.tsx
@@ -1,16 +1,13 @@
 /** @file A styled colored link with an icon. */
 import * as React from 'react'
-
-import * as router from 'react-router-dom'
 import * as toastify from 'react-toastify'
 
-import * as focusHooks from '#/hooks/focusHooks'
-
-import * as textProvider from '#/providers/TextProvider'
-
 import * as aria from '#/components/aria'
 import FocusRing from '#/components/styled/FocusRing'
 import SvgMask from '#/components/SvgMask'
+import { useFocusChild } from '#/hooks/focusHooks'
+import { useText } from '#/providers/TextProvider'
+import { twMerge } from 'tailwind-merge'
 
 // ============
 // === Link ===
@@ -24,46 +21,34 @@ export interface LinkProps {
   readonly text: string
 }
 
+export default React.forwardRef(Link)
+
 /** A styled colored link with an icon. */
-export default function Link(props: LinkProps) {
+function Link(props: LinkProps, ref: React.ForwardedRef<HTMLAnchorElement>) {
   const { openInBrowser = false, to, icon, text } = props
-  const { getText } = textProvider.useText()
-  const focusChildProps = focusHooks.useFocusChild()
-  const className =
-    'flex items-center gap-auth-link rounded-full px-auth-link-x py-auth-link-y text-center text-xs font-bold text-blue-500 transition-all duration-auth hover:text-blue-700 focus:text-blue-700'
-
-  const contents = (
-    <>
-      <SvgMask src={icon} />
-      {text}
-    </>
-  )
+  const { getText } = useText()
+  const { className: focusChildClassName, ...focusChildProps } = useFocusChild()
 
   return (
     <FocusRing>
-      {openInBrowser ?
-        <aria.Link
-          {...aria.mergeProps<aria.LinkProps>()(focusChildProps, {
-            href: to,
-            className,
-            target: '_blank',
-            onPress: () => {
-              toastify.toast.success(getText('openedLinkInBrowser'))
-            },
-          })}
-        >
-          {contents}
-        </aria.Link>
-      : <router.Link
-          {...aria.mergeProps<router.LinkProps>()(focusChildProps, {
-            to,
-            className,
-            target: '',
-          })}
-        >
-          {contents}
-        </router.Link>
-      }
+      <aria.Link
+        ref={ref}
+        href={to}
+        rel="noopener noreferrer"
+        className={twMerge(
+          'flex items-center gap-auth-link rounded-full px-auth-link-x py-auth-link-y text-center text-xs font-bold text-blue-500 transition-all duration-auth hover:text-blue-700 focus:text-blue-700',
+          focusChildClassName,
+        )}
+        onPress={() => {
+          if (openInBrowser) {
+            toastify.toast.success(getText('openedLinkInBrowser'))
+          }
+        }}
+        {...focusChildProps}
+      >
+        <SvgMask src={icon} />
+        {text}
+      </aria.Link>
     </FocusRing>
   )
 }
diff --git a/app/dashboard/src/layouts/Settings/ChangePasswordForm.tsx b/app/dashboard/src/layouts/Settings/ChangePasswordForm.tsx
index 937d918a7ae2..d6077e161245 100644
--- a/app/dashboard/src/layouts/Settings/ChangePasswordForm.tsx
+++ b/app/dashboard/src/layouts/Settings/ChangePasswordForm.tsx
@@ -1,16 +1,38 @@
 /** @file A form for changing the user's password. */
 import * as React from 'react'
 
-import * as authProvider from '#/providers/AuthProvider'
-import * as textProvider from '#/providers/TextProvider'
+import * as z from 'zod'
 
-import * as aria from '#/components/aria'
-import * as ariaComponents from '#/components/AriaComponents'
-import SettingsInput from '#/components/styled/SettingsInput'
+import { ButtonGroup, Form, Input } from '#/components/AriaComponents'
+import { useAuth, useNonPartialUserSession } from '#/providers/AuthProvider'
+import { type GetText, useText } from '#/providers/TextProvider'
 
-import * as eventModule from '#/utilities/event'
-import * as uniqueString from '#/utilities/uniqueString'
-import * as validation from '#/utilities/validation'
+import SettingsAriaInput from '#/layouts/Settings/SettingsAriaInput'
+import { passwordSchema, passwordWithPatternSchema } from '#/pages/authentication/schemas'
+import { PASSWORD_REGEX } from '#/utilities/validation'
+
+/** Create the schema for this form. */
+function createChangePasswordFormSchema(getText: GetText) {
+  return z
+    .object({
+      username: z.string().email(getText('invalidEmailValidationError')),
+      currentPassword: passwordSchema(getText),
+      newPassword: passwordWithPatternSchema(getText),
+      confirmNewPassword: z.string(),
+    })
+    .superRefine((object, context) => {
+      if (
+        PASSWORD_REGEX.test(object.newPassword) &&
+        object.newPassword !== object.confirmNewPassword
+      ) {
+        context.addIssue({
+          path: ['confirmNewPassword'],
+          code: 'custom',
+          message: getText('passwordMismatchError'),
+        })
+      }
+    })
+}
 
 // ==========================
 // === ChangePasswordForm ===
@@ -18,102 +40,48 @@ import * as validation from '#/utilities/validation'
 
 /** A form for changing the user's password. */
 export default function ChangePasswordForm() {
-  const { user } = authProvider.useNonPartialUserSession()
-  const { changePassword } = authProvider.useAuth()
-  const { getText } = textProvider.useText()
-  const [key, setKey] = React.useState('')
-  const [currentPassword, setCurrentPassword] = React.useState('')
-  const [newPassword, setNewPassword] = React.useState('')
-  const [confirmNewPassword, setConfirmNewPassword] = React.useState('')
-
-  const canSubmitPassword =
-    currentPassword !== '' &&
-    newPassword !== '' &&
-    confirmNewPassword !== '' &&
-    newPassword === confirmNewPassword &&
-    validation.PASSWORD_REGEX.test(newPassword)
-  const canCancel = currentPassword !== '' || newPassword !== '' || confirmNewPassword !== ''
+  const { user } = useNonPartialUserSession()
+  const { changePassword } = useAuth()
+  const { getText } = useText()
 
   return (
-    <aria.Form
-      key={key}
-      onSubmit={(event) => {
-        event.preventDefault()
-        setKey(uniqueString.uniqueString())
-        setCurrentPassword('')
-        setNewPassword('')
-        setConfirmNewPassword('')
-        void changePassword(currentPassword, newPassword)
-      }}
+    <Form
+      schema={createChangePasswordFormSchema(getText)}
+      gap="none"
+      onSubmit={({ currentPassword, newPassword }) => changePassword(currentPassword, newPassword)}
     >
-      <aria.Input hidden autoComplete="username" value={user.email} readOnly />
-      <aria.TextField className="flex h-row gap-settings-entry" onChange={setCurrentPassword}>
-        <aria.Label className="text my-auto w-change-password-settings-label">
-          {getText('currentPasswordLabel')}
-        </aria.Label>
-        <SettingsInput
-          type="password"
-          autoComplete="current-password"
-          placeholder={getText('currentPasswordPlaceholder')}
-        />
-      </aria.TextField>
-      <aria.TextField
-        className="flex h-row gap-settings-entry"
-        onChange={setNewPassword}
-        validate={(value) =>
-          validation.PASSWORD_REGEX.test(value) ? true
-          : value === '' ? ''
-          : getText('passwordValidationError')
-        }
-      >
-        <aria.Label className="text my-auto w-change-password-settings-label">
-          {getText('newPasswordLabel')}
-        </aria.Label>
-        <SettingsInput
-          type="password"
-          placeholder={getText('newPasswordPlaceholder')}
-          autoComplete="new-password"
-        />
-      </aria.TextField>
-      <aria.TextField
-        className="flex h-row gap-settings-entry"
-        onChange={setConfirmNewPassword}
-        validate={(value) =>
-          value === newPassword ? true
-          : value === '' ? ''
-          : getText('passwordMismatchError')
-        }
-      >
-        <aria.Label className="text my-auto w-change-password-settings-label">
-          {getText('confirmNewPasswordLabel')}
-        </aria.Label>
-        <SettingsInput
-          type="password"
-          placeholder={getText('confirmNewPasswordPlaceholder')}
-          autoComplete="new-password"
-        />
-      </aria.TextField>
-      <ariaComponents.ButtonGroup>
-        <ariaComponents.Button
-          variant="submit"
-          isDisabled={!canSubmitPassword}
-          onPress={eventModule.submitForm}
-        >
-          {getText('change')}
-        </ariaComponents.Button>
-        <ariaComponents.Button
-          variant="cancel"
-          isDisabled={!canCancel}
-          onPress={() => {
-            setKey(uniqueString.uniqueString())
-            setCurrentPassword('')
-            setNewPassword('')
-            setConfirmNewPassword('')
-          }}
-        >
-          {getText('cancel')}
-        </ariaComponents.Button>
-      </ariaComponents.ButtonGroup>
-    </aria.Form>
+      <Input hidden name="username" autoComplete="username" value={user.email} readOnly />
+      <SettingsAriaInput
+        data-testid="current-password-input"
+        name="currentPassword"
+        type="password"
+        autoComplete="current-password"
+        label={getText('currentPasswordLabel')}
+        placeholder={getText('currentPasswordPlaceholder')}
+      />
+      <SettingsAriaInput
+        data-testid="new-password-input"
+        name="newPassword"
+        type="password"
+        label={getText('newPasswordLabel')}
+        placeholder={getText('newPasswordPlaceholder')}
+        autoComplete="new-password"
+        description={getText('passwordValidationMessage')}
+      />
+      <SettingsAriaInput
+        data-testid="confirm-new-password-input"
+        name="confirmNewPassword"
+        type="password"
+        label={getText('confirmNewPasswordLabel')}
+        placeholder={getText('confirmNewPasswordPlaceholder')}
+        autoComplete="new-password"
+      />
+
+      <Form.FormError />
+      <ButtonGroup>
+        <Form.Submit>{getText('change')}</Form.Submit>
+        <Form.Reset>{getText('cancel')}</Form.Reset>
+      </ButtonGroup>
+    </Form>
   )
 }
diff --git a/app/dashboard/src/layouts/Settings/SettingsAriaInput.tsx b/app/dashboard/src/layouts/Settings/SettingsAriaInput.tsx
new file mode 100644
index 000000000000..b76fffa4c33d
--- /dev/null
+++ b/app/dashboard/src/layouts/Settings/SettingsAriaInput.tsx
@@ -0,0 +1,62 @@
+/** @file A styled input for settings pages. */
+import {
+  Form,
+  INPUT_STYLES,
+  Input,
+  type FieldPath,
+  type FieldValues,
+  type InputProps,
+  type TSchema,
+} from '#/components/AriaComponents'
+import { tv } from '#/utilities/tailwindVariants'
+
+const SETTINGS_INPUT_STYLES = tv({
+  extend: INPUT_STYLES,
+  slots: {
+    base: 'p-0',
+    textArea: 'rounded-2xl border-0.5 border-primary/20 px-1',
+  },
+})
+
+const SETTINGS_FIELD_STYLES = tv({
+  extend: Form.FIELD_STYLES,
+  slots: {
+    base: 'flex-row flex-wrap',
+    labelContainer: 'flex min-h-row items-center gap-5 w-full',
+    label: 'text mb-auto w-40 shrink-0',
+    error: 'ml-[180px]',
+  },
+})
+
+// =========================
+// === SettingsAriaInput ===
+// =========================
+
+/** Props for a {@link SettingsAriaInput}. */
+export interface SettingsAriaInputProps<
+  Schema extends TSchema,
+  TFieldValues extends FieldValues<Schema>,
+  TFieldName extends FieldPath<Schema, TFieldValues>,
+  TTransformedValues extends FieldValues<Schema> | undefined = undefined,
+> extends Omit<
+    InputProps<Schema, TFieldValues, TFieldName, TTransformedValues>,
+    'fieldVariants' | 'size' | 'variant' | 'variants'
+  > {}
+
+/** A styled input for settings pages. */
+export default function SettingsAriaInput<
+  Schema extends TSchema,
+  TFieldValues extends FieldValues<Schema>,
+  TFieldName extends FieldPath<Schema, TFieldValues>,
+  TTransformedValues extends FieldValues<Schema> | undefined = undefined,
+>(props: SettingsAriaInputProps<Schema, TFieldValues, TFieldName, TTransformedValues>) {
+  return (
+    <Input
+      {...props}
+      variant="custom"
+      size="custom"
+      variants={SETTINGS_INPUT_STYLES}
+      fieldVariants={SETTINGS_FIELD_STYLES}
+    />
+  )
+}
diff --git a/app/dashboard/src/layouts/Settings/SettingsInputEntry.tsx b/app/dashboard/src/layouts/Settings/SettingsInputEntry.tsx
index b4203aa0a408..b000a2b73e7f 100644
--- a/app/dashboard/src/layouts/Settings/SettingsInputEntry.tsx
+++ b/app/dashboard/src/layouts/Settings/SettingsInputEntry.tsx
@@ -75,7 +75,7 @@ export default function SettingsInputEntry(props: SettingsInputEntryProps) {
         key={value}
         name={FIELD_NAME}
         defaultValue={value}
-        className="flex h-row gap-settings-entry"
+        className="flex h-row items-center gap-settings-entry"
         {...(validate ? { validate: (newValue) => validate(newValue, context) } : {})}
       >
         <aria.Label className="text my-auto w-organization-settings-label">
diff --git a/app/dashboard/src/modules/payments/components/PlanSelector/components/PlanSelectorDialog.tsx b/app/dashboard/src/modules/payments/components/PlanSelector/components/PlanSelectorDialog.tsx
index c31608e6839a..6261f07d0a1e 100644
--- a/app/dashboard/src/modules/payments/components/PlanSelector/components/PlanSelectorDialog.tsx
+++ b/app/dashboard/src/modules/payments/components/PlanSelector/components/PlanSelectorDialog.tsx
@@ -212,88 +212,81 @@ function Summary(props: SummaryProps) {
 
   const billingPeriodText = billingPeriodToString(getText, period)
 
-  if (isError) {
-    // eslint-disable-next-line no-restricted-syntax
-    return (
+  return isError ?
       <ErrorDisplay
         error={error}
         title={getText('asyncHookError')}
         resetErrorBoundary={() => refetch()}
       />
-    )
-  }
-
-  return (
-    <div className="flex flex-col">
-      <Text variant="subtitle">{getText('summary')}</Text>
-
-      <div
-        className={twMerge(
-          '-ml-4 table table-auto border-spacing-x-4 transition-[filter] duration-200',
-          (isLoading || isInvalid) && 'pointer-events-none blur-[4px]',
-          isLoading && 'animate-pulse duration-1000',
-        )}
-      >
-        <div className="table-row">
-          <Text className="table-cell w-[0%]" variant="body" nowrap>
-            {getText('priceMonthly')}
-          </Text>
-          {data && (
-            <Text className="table-cell " variant="body">
-              {formatter.format(data.monthlyPrice)}
-            </Text>
+    : <div className="flex flex-col">
+        <Text variant="subtitle">{getText('summary')}</Text>
+
+        <div
+          className={twMerge(
+            '-ml-4 table table-auto border-spacing-x-4 transition-[filter] duration-200',
+            (isLoading || isInvalid) && 'pointer-events-none blur-[4px]',
+            isLoading && 'animate-pulse duration-1000',
           )}
-        </div>
-
-        <div className="table-row">
-          <Text className="table-cell w-[0%]" variant="body" nowrap>
-            {getText('billingPeriod')}
-          </Text>
+        >
+          <div className="table-row">
+            <Text className="table-cell w-[0%]" variant="body" nowrap>
+              {getText('priceMonthly')}
+            </Text>
+            {data && (
+              <Text className="table-cell " variant="body">
+                {formatter.format(data.monthlyPrice)}
+              </Text>
+            )}
+          </div>
 
-          {data && (
-            <Text className="table-cell" variant="body">
-              {billingPeriodText}
+          <div className="table-row">
+            <Text className="table-cell w-[0%]" variant="body" nowrap>
+              {getText('billingPeriod')}
             </Text>
-          )}
-        </div>
 
-        <div className="table-row">
-          <Text className="table-cell w-[0%]" variant="body" nowrap>
-            {getText('originalPrice')}
-          </Text>
-          {data && (
-            <Text className="table-cell" variant="body">
-              {formatter.format(data.fullPrice)}
+            {data && (
+              <Text className="table-cell" variant="body">
+                {billingPeriodText}
+              </Text>
+            )}
+          </div>
+
+          <div className="table-row">
+            <Text className="table-cell w-[0%]" variant="body" nowrap>
+              {getText('originalPrice')}
             </Text>
-          )}
-        </div>
+            {data && (
+              <Text className="table-cell" variant="body">
+                {formatter.format(data.fullPrice)}
+              </Text>
+            )}
+          </div>
 
-        <div className="table-row">
-          <Text className="table-cell w-[0%]" variant="body" nowrap>
-            {getText('youSave')}
-          </Text>
-          {data && (
-            <Text
-              className="table-cell"
-              color={data.discount > 0 ? 'success' : 'primary'}
-              variant="body"
-            >
-              {formatter.format(data.discount)}
+          <div className="table-row">
+            <Text className="table-cell w-[0%]" variant="body" nowrap>
+              {getText('youSave')}
             </Text>
-          )}
-        </div>
+            {data && (
+              <Text
+                className="table-cell"
+                color={data.discount > 0 ? 'success' : 'primary'}
+                variant="body"
+              >
+                {formatter.format(data.discount)}
+              </Text>
+            )}
+          </div>
 
-        <div className="table-row">
-          <Text className="table-cell w-[0%]" variant="body" nowrap>
-            {getText('subtotalPrice')}
-          </Text>
-          {data && (
-            <Text className="table-cell" variant="body">
-              {formatter.format(data.totalPrice)}
+          <div className="table-row">
+            <Text className="table-cell w-[0%]" variant="body" nowrap>
+              {getText('subtotalPrice')}
             </Text>
-          )}
+            {data && (
+              <Text className="table-cell" variant="body">
+                {formatter.format(data.totalPrice)}
+              </Text>
+            )}
+          </div>
         </div>
       </div>
-    </div>
-  )
 }
diff --git a/app/dashboard/src/pages/authentication/AuthenticationPage.tsx b/app/dashboard/src/pages/authentication/AuthenticationPage.tsx
index f2d7311cf7f4..6b639bb12104 100644
--- a/app/dashboard/src/pages/authentication/AuthenticationPage.tsx
+++ b/app/dashboard/src/pages/authentication/AuthenticationPage.tsx
@@ -1,47 +1,64 @@
 /** @file A styled authentication page.
  * This is a component, NOT a page, but it is here because it is related to the authentication pages
  * and nothing else. */
-import * as React from 'react'
+import type { ReactNode } from 'react'
 
-import * as offlineHooks from '#/hooks/offlineHooks'
-
-import * as textProvider from '#/providers/TextProvider'
-
-import * as ariaComponents from '#/components/AriaComponents'
+import {
+  DIALOG_BACKGROUND,
+  type FieldValues,
+  Form,
+  type FormProps,
+  type TSchema,
+  Text,
+} from '#/components/AriaComponents'
 import Page from '#/components/Page'
+import { useOffline } from '#/hooks/offlineHooks'
+import { useText } from '#/providers/TextProvider'
+import invariant from 'tiny-invariant'
 
 // ==========================
 // === AuthenticationPage ===
 // ==========================
 
 /** Props for an {@link AuthenticationPage}. */
-export interface AuthenticationPageProps extends Readonly<React.PropsWithChildren> {
+interface AuthenticationPagePropsBase {
   readonly supportsOffline?: boolean
   readonly 'data-testid'?: string
-  readonly isNotForm?: boolean
   readonly title: string
-  readonly footer?: React.ReactNode
-  readonly onSubmit?: (event: React.FormEvent<HTMLFormElement>) => void
+  readonly footer?: ReactNode
 }
 
+/** Props for an {@link AuthenticationPage}. */
+export type AuthenticationPageProps<
+  Schema extends TSchema,
+  TFieldValues extends FieldValues<Schema>,
+  TTransformedValues extends FieldValues<Schema> | undefined = undefined,
+> = AuthenticationPagePropsBase & Partial<FormProps<Schema, TFieldValues, TTransformedValues>>
+
 /** A styled authentication page. */
-export default function AuthenticationPage(props: AuthenticationPageProps) {
-  const { isNotForm = false, title, onSubmit, children, footer, supportsOffline = false } = props
+export default function AuthenticationPage<
+  Schema extends TSchema,
+  TFieldValues extends FieldValues<Schema>,
+  TTransformedValues extends FieldValues<Schema> | undefined = undefined,
+>(props: AuthenticationPageProps<Schema, TFieldValues, TTransformedValues>) {
+  const { title, children, footer, supportsOffline = false, ...formProps } = props
+  const { form, schema, onSubmit } = formProps
+  const isForm = onSubmit != null && (form != null || schema != null)
 
-  const { getText } = textProvider.useText()
-  const { isOffline } = offlineHooks.useOffline()
+  const { getText } = useText()
+  const { isOffline } = useOffline()
 
   const heading = (
-    <ariaComponents.Text.Heading level={1} className="self-center" weight="medium">
+    <Text.Heading level={1} className="self-center" weight="medium">
       {title}
-    </ariaComponents.Text.Heading>
+    </Text.Heading>
   )
 
-  const containerClasses = ariaComponents.DIALOG_BACKGROUND({
-    className: 'flex w-full flex-col gap-auth rounded-4xl p-12',
+  const containerClasses = DIALOG_BACKGROUND({
+    className: 'flex w-full flex-col gap-4 rounded-4xl p-12',
   })
 
-  const offlineAlertClasses = ariaComponents.DIALOG_BACKGROUND({
+  const offlineAlertClasses = DIALOG_BACKGROUND({
     className: 'flex mt-auto rounded-sm items-center justify-center p-4 px-12 rounded-4xl',
   })
 
@@ -54,29 +71,38 @@ export default function AuthenticationPage(props: AuthenticationPageProps) {
         >
           {isOffline && (
             <div className={offlineAlertClasses}>
-              <ariaComponents.Text className="text-center" balance elementType="p">
+              <Text className="text-center" balance elementType="p">
                 {getText('loginUnavailableOffline')}{' '}
                 {supportsOffline && getText('loginUnavailableOfflineLocal')}
-              </ariaComponents.Text>
+              </Text>
             </div>
           )}
 
           <div className="row-start-2 row-end-3 flex w-full flex-col items-center gap-auth">
-            {isNotForm ?
+            {!isForm ?
               <div className={containerClasses}>
                 {heading}
-                {children}
+                {(() => {
+                  invariant(
+                    typeof children !== 'function',
+                    'Non-forms should not have a function as a child.',
+                  )
+                  return children
+                })()}
               </div>
-            : <form
+            : <Form
+                // This is SAFE, as the props type of this type extends `FormProps`.
+                // eslint-disable-next-line no-restricted-syntax
+                {...(formProps as FormProps<Schema, TFieldValues, TTransformedValues>)}
                 className={containerClasses}
-                onSubmit={(event) => {
-                  event.preventDefault()
-                  onSubmit?.(event)
-                }}
               >
-                {heading}
-                {children}
-              </form>
+                {(innerProps) => (
+                  <>
+                    {heading}
+                    {typeof children === 'function' ? children(innerProps) : children}
+                  </>
+                )}
+              </Form>
             }
             {footer}
           </div>
diff --git a/app/dashboard/src/pages/authentication/ForgotPassword.tsx b/app/dashboard/src/pages/authentication/ForgotPassword.tsx
index fd1a5a65adb6..97c7607d65ef 100644
--- a/app/dashboard/src/pages/authentication/ForgotPassword.tsx
+++ b/app/dashboard/src/pages/authentication/ForgotPassword.tsx
@@ -1,22 +1,28 @@
 /** @file Container responsible for rendering and interactions in first half of forgot password
  * flow. */
-import * as React from 'react'
+import { useState } from 'react'
 
+import isEmail from 'validator/lib/isEmail'
+import * as z from 'zod'
+
+import { LOGIN_PATH } from '#/appUtils'
 import ArrowRightIcon from '#/assets/arrow_right.svg'
 import AtIcon from '#/assets/at.svg'
 import GoBackIcon from '#/assets/go_back.svg'
-
-import * as appUtils from '#/appUtils'
-
-import * as authProvider from '#/providers/AuthProvider'
-import * as backendProvider from '#/providers/BackendProvider'
-import * as textProvider from '#/providers/TextProvider'
-
+import { Form, Input } from '#/components/AriaComponents'
+import Link from '#/components/Link'
 import AuthenticationPage from '#/pages/authentication/AuthenticationPage'
+import { useAuth } from '#/providers/AuthProvider'
+import { useLocalBackend } from '#/providers/BackendProvider'
+import { type GetText, useText } from '#/providers/TextProvider'
+import { useLocation } from 'react-router'
 
-import Input from '#/components/Input'
-import Link from '#/components/Link'
-import SubmitButton from '#/components/SubmitButton'
+/** Create the schema for this form. */
+function createForgotPasswordFormSchema(getText: GetText) {
+  return z.object({
+    email: z.string().refine(isEmail, getText('invalidEmailValidationError')),
+  })
+}
 
 // ======================
 // === ForgotPassword ===
@@ -24,34 +30,51 @@ import SubmitButton from '#/components/SubmitButton'
 
 /** A form for users to request for their password to be reset. */
 export default function ForgotPassword() {
-  const { forgotPassword } = authProvider.useAuth()
-  const { getText } = textProvider.useText()
-  const [email, setEmail] = React.useState('')
-  const localBackend = backendProvider.useLocalBackend()
+  const { forgotPassword } = useAuth()
+  const location = useLocation()
+  const { getText } = useText()
+  const localBackend = useLocalBackend()
   const supportsOffline = localBackend != null
 
+  const query = new URLSearchParams(location.search)
+  const initialEmail = query.get('email')
+  const [emailInput, setEmailInput] = useState(initialEmail ?? '')
+
   return (
     <AuthenticationPage
       title={getText('forgotYourPassword')}
-      footer={<Link to={appUtils.LOGIN_PATH} icon={GoBackIcon} text={getText('goBackToLogin')} />}
+      schema={createForgotPasswordFormSchema(getText)}
+      footer={
+        <Link
+          to={`${LOGIN_PATH}?${new URLSearchParams({ email: emailInput }).toString()}`}
+          icon={GoBackIcon}
+          text={getText('goBackToLogin')}
+        />
+      }
       supportsOffline={supportsOffline}
-      onSubmit={async (event) => {
-        event.preventDefault()
-        await forgotPassword(email)
-      }}
+      onSubmit={({ email }) => forgotPassword(email)}
     >
       <Input
         autoFocus
         required
-        validate
+        data-testid="email-input"
+        name="email"
+        label={getText('emailLabel')}
         type="email"
         autoComplete="email"
         icon={AtIcon}
         placeholder={getText('emailPlaceholder')}
-        value={email}
-        setValue={setEmail}
+        defaultValue={initialEmail ?? undefined}
+        onChange={(event) => {
+          setEmailInput(event.currentTarget.value)
+        }}
       />
-      <SubmitButton text={getText('sendLink')} icon={ArrowRightIcon} />
+
+      <Form.Submit size="large" icon={ArrowRightIcon} iconPosition="end" fullWidth>
+        {getText('sendLink')}
+      </Form.Submit>
+
+      <Form.FormError />
     </AuthenticationPage>
   )
 }
diff --git a/app/dashboard/src/pages/authentication/Login.tsx b/app/dashboard/src/pages/authentication/Login.tsx
index 0901f15d15a6..d66e0ce659ab 100644
--- a/app/dashboard/src/pages/authentication/Login.tsx
+++ b/app/dashboard/src/pages/authentication/Login.tsx
@@ -1,30 +1,23 @@
 /** @file Login component responsible for rendering and interactions in sign in flow. */
-import * as React from 'react'
-
 import * as router from 'react-router-dom'
 
-import * as common from 'enso-common'
+import { CLOUD_DASHBOARD_DOMAIN } from 'enso-common'
 
+import { FORGOT_PASSWORD_PATH, REGISTRATION_PATH } from '#/appUtils'
 import ArrowRightIcon from '#/assets/arrow_right.svg'
 import AtIcon from '#/assets/at.svg'
 import CreateAccountIcon from '#/assets/create_account.svg'
-import GithubIcon from '#/assets/github.svg'
-import GoogleIcon from '#/assets/google.svg'
+import GithubIcon from '#/assets/github_color.svg'
+import GoogleIcon from '#/assets/google_color.svg'
 import LockIcon from '#/assets/lock.svg'
-
-import * as appUtils from '#/appUtils'
-
-import * as authProvider from '#/providers/AuthProvider'
-import * as backendProvider from '#/providers/BackendProvider'
-import * as textProvider from '#/providers/TextProvider'
-
-import AuthenticationPage from '#/pages/authentication/AuthenticationPage'
-
-import * as ariaComponents from '#/components/AriaComponents'
-import Input from '#/components/Input'
+import { Button, Form, Input, Password } from '#/components/AriaComponents'
 import Link from '#/components/Link'
-import SubmitButton from '#/components/SubmitButton'
-import TextLink from '#/components/TextLink'
+import AuthenticationPage from '#/pages/authentication/AuthenticationPage'
+import { passwordSchema } from '#/pages/authentication/schemas'
+import { useAuth } from '#/providers/AuthProvider'
+import { useLocalBackend } from '#/providers/BackendProvider'
+import { useText } from '#/providers/TextProvider'
+import { useState } from 'react'
 
 // =============
 // === Login ===
@@ -33,119 +26,111 @@ import TextLink from '#/components/TextLink'
 /** A form for users to log in. */
 export default function Login() {
   const location = router.useLocation()
-  const { signInWithGoogle, signInWithGitHub, signInWithPassword } = authProvider.useAuth()
-  const { getText } = textProvider.useText()
-
+  const { signInWithGoogle, signInWithGitHub, signInWithPassword } = useAuth()
+  const { getText } = useText()
   const query = new URLSearchParams(location.search)
   const initialEmail = query.get('email')
-
-  const [email, setEmail] = React.useState(initialEmail ?? '')
-  const [password, setPassword] = React.useState('')
-  const [isSubmitting, setIsSubmitting] = React.useState(false)
-  const shouldReportValidityRef = React.useRef(true)
-  const formRef = React.useRef<HTMLFormElement>(null)
-
-  const localBackend = backendProvider.useLocalBackend()
+  const [emailInput, setEmailInput] = useState(initialEmail ?? '')
+  const localBackend = useLocalBackend()
   const supportsOffline = localBackend != null
 
   return (
     <AuthenticationPage
-      isNotForm
       title={getText('loginToYourAccount')}
       supportsOffline={supportsOffline}
       footer={
-        <>
-          <Link
-            openInBrowser={localBackend != null}
-            to={
-              localBackend != null ?
-                'https://' + common.CLOUD_DASHBOARD_DOMAIN + appUtils.REGISTRATION_PATH
-              : appUtils.REGISTRATION_PATH
-            }
-            icon={CreateAccountIcon}
-            text={getText('dontHaveAnAccount')}
-          />
-        </>
+        <Link
+          openInBrowser={localBackend != null}
+          to={(() => {
+            const newQuery = new URLSearchParams({ email: emailInput }).toString()
+            return localBackend != null ?
+                `https://${CLOUD_DASHBOARD_DOMAIN}${REGISTRATION_PATH}?${newQuery}`
+              : `${REGISTRATION_PATH}?${newQuery}`
+          })()}
+          icon={CreateAccountIcon}
+          text={getText('dontHaveAnAccount')}
+        />
       }
     >
       <div className="flex flex-col gap-auth">
-        <ariaComponents.Button
-          size="custom"
-          variant="custom"
-          fullWidthText
-          icon={GoogleIcon}
-          className="bg-primary/5 px-3 py-2 hover:bg-primary/10 focus:bg-primary/10"
-          onPress={() => {
-            shouldReportValidityRef.current = false
-            void signInWithGoogle()
-            setIsSubmitting(true)
+        <Button
+          size="large"
+          variant="outline"
+          icon={<img src={GoogleIcon} />}
+          onPress={async () => {
+            await signInWithGoogle()
           }}
         >
           {getText('signUpOrLoginWithGoogle')}
-        </ariaComponents.Button>
-        <ariaComponents.Button
-          size="custom"
-          variant="custom"
-          fullWidthText
-          icon={GithubIcon}
-          className="bg-primary/5 px-3 py-2 hover:bg-primary/10 focus:bg-primary/10"
-          onPress={() => {
-            shouldReportValidityRef.current = false
-            void signInWithGitHub()
-            setIsSubmitting(true)
+        </Button>
+        <Button
+          size="large"
+          variant="outline"
+          icon={<img src={GithubIcon} />}
+          onPress={async () => {
+            await signInWithGitHub()
           }}
         >
           {getText('signUpOrLoginWithGitHub')}
-        </ariaComponents.Button>
+        </Button>
       </div>
-      <div />
-      <form
-        ref={formRef}
-        className="flex flex-col gap-auth"
-        onSubmit={async (event) => {
-          event.preventDefault()
-          setIsSubmitting(true)
-          await signInWithPassword(email, password)
-          shouldReportValidityRef.current = true
-          setIsSubmitting(false)
-        }}
+
+      <Form
+        schema={(z) =>
+          z.object({
+            email: z
+              .string()
+              .min(1, getText('arbitraryFieldRequired'))
+              .email(getText('invalidEmailValidationError')),
+            password: passwordSchema(getText),
+          })
+        }
+        gap="medium"
+        onSubmit={({ email, password }) => signInWithPassword(email, password)}
       >
         <Input
           autoFocus
           required
-          validate
+          data-testid="email-input"
+          name="email"
+          label={getText('email')}
           type="email"
           autoComplete="email"
           icon={AtIcon}
+          defaultValue={initialEmail ?? undefined}
           placeholder={getText('emailPlaceholder')}
-          value={email}
-          setValue={setEmail}
-          shouldReportValidityRef={shouldReportValidityRef}
+          onChange={(event) => {
+            setEmailInput(event.currentTarget.value)
+          }}
         />
-        <div className="flex flex-col">
-          <Input
+
+        <div className="flex w-full flex-col">
+          <Password
             required
-            validate
-            allowShowingPassword
-            type="password"
+            data-testid="password-input"
+            name="password"
+            label={getText('password')}
             autoComplete="current-password"
             icon={LockIcon}
             placeholder={getText('passwordPlaceholder')}
-            error={getText('passwordValidationError')}
-            value={password}
-            setValue={setPassword}
-            shouldReportValidityRef={shouldReportValidityRef}
           />
-          <TextLink to={appUtils.FORGOT_PASSWORD_PATH} text={getText('forgotYourPassword')} />
+
+          <Button
+            variant="link"
+            href={`${FORGOT_PASSWORD_PATH}?${new URLSearchParams({ email: emailInput }).toString()}`}
+            size="small"
+            className="self-end"
+          >
+            {getText('forgotYourPassword')}
+          </Button>
         </div>
 
-        <SubmitButton
-          isDisabled={isSubmitting}
-          isLoading={isSubmitting}
-          text={getText('login')}
-          icon={ArrowRightIcon}
-        />
-      </form>
+        <Form.Submit size="large" icon={ArrowRightIcon} iconPosition="end" fullWidth>
+          {getText('login')}
+        </Form.Submit>
+
+        <Form.FormError />
+      </Form>
     </AuthenticationPage>
   )
 }
diff --git a/app/dashboard/src/pages/authentication/Registration.tsx b/app/dashboard/src/pages/authentication/Registration.tsx
index 8af24bef342c..ff1ae5091b54 100644
--- a/app/dashboard/src/pages/authentication/Registration.tsx
+++ b/app/dashboard/src/pages/authentication/Registration.tsx
@@ -1,30 +1,24 @@
 /** @file Registration container responsible for rendering and interactions in sign up flow. */
-import * as React from 'react'
+import { useEffect, useState } from 'react'
+import { useLocation } from 'react-router-dom'
 
-import * as router from 'react-router-dom'
 import * as z from 'zod'
 
+import { LOGIN_PATH } from '#/appUtils'
 import AtIcon from '#/assets/at.svg'
 import CreateAccountIcon from '#/assets/create_account.svg'
 import GoBackIcon from '#/assets/go_back.svg'
 import LockIcon from '#/assets/lock.svg'
-
-import * as appUtils from '#/appUtils'
-
-import * as authProvider from '#/providers/AuthProvider'
-import * as backendProvider from '#/providers/BackendProvider'
-import * as localStorageProvider from '#/providers/LocalStorageProvider'
-import * as textProvider from '#/providers/TextProvider'
-
-import AuthenticationPage from '#/pages/authentication/AuthenticationPage'
-
-import Input from '#/components/Input'
+import { Form, Input, Password } from '#/components/AriaComponents'
 import Link from '#/components/Link'
-import SubmitButton from '#/components/SubmitButton'
-
+import AuthenticationPage from '#/pages/authentication/AuthenticationPage'
+import { passwordWithPatternSchema } from '#/pages/authentication/schemas'
+import { useAuth } from '#/providers/AuthProvider'
+import { useLocalBackend } from '#/providers/BackendProvider'
+import { useLocalStorage } from '#/providers/LocalStorageProvider'
+import { type GetText, useText } from '#/providers/TextProvider'
 import LocalStorage from '#/utilities/LocalStorage'
-import * as string from '#/utilities/string'
-import * as validation from '#/utilities/validation'
+import { PASSWORD_REGEX } from '#/utilities/validation'
 
 // ============================
 // === Global configuration ===
@@ -42,30 +36,45 @@ LocalStorage.registerKey('loginRedirect', {
   schema: z.string(),
 })
 
+/** Create the schema for this form. */
+function createRegistrationFormSchema(getText: GetText) {
+  return z
+    .object({
+      email: z.string().email(getText('invalidEmailValidationError')),
+      password: passwordWithPatternSchema(getText),
+      confirmPassword: z.string(),
+    })
+    .superRefine((object, context) => {
+      if (PASSWORD_REGEX.test(object.password) && object.password !== object.confirmPassword) {
+        context.addIssue({
+          path: ['confirmPassword'],
+          code: 'custom',
+          message: getText('passwordMismatchError'),
+        })
+      }
+    })
+}
+
 // ====================
 // === Registration ===
 // ====================
 
 /** A form for users to register an account. */
 export default function Registration() {
-  const auth = authProvider.useAuth()
-  const location = router.useLocation()
-  const { localStorage } = localStorageProvider.useLocalStorage()
-  const { getText } = textProvider.useText()
-  const localBackend = backendProvider.useLocalBackend()
+  const { signUp } = useAuth()
+  const location = useLocation()
+  const { localStorage } = useLocalStorage()
+  const { getText } = useText()
+  const localBackend = useLocalBackend()
   const supportsOffline = localBackend != null
 
   const query = new URLSearchParams(location.search)
   const initialEmail = query.get('email')
   const organizationId = query.get('organization_id')
   const redirectTo = query.get('redirect_to')
+  const [emailInput, setEmailInput] = useState(initialEmail ?? '')
 
-  const [email, setEmail] = React.useState(initialEmail ?? '')
-  const [password, setPassword] = React.useState('')
-  const [confirmPassword, setConfirmPassword] = React.useState('')
-  const [isSubmitting, setIsSubmitting] = React.useState(false)
-
-  React.useEffect(() => {
+  useEffect(() => {
     if (redirectTo != null) {
       localStorage.set('loginRedirect', redirectTo)
     } else {
@@ -75,56 +84,58 @@ export default function Registration() {
 
   return (
     <AuthenticationPage
+      schema={createRegistrationFormSchema(getText)}
       title={getText('createANewAccount')}
       supportsOffline={supportsOffline}
       footer={
-        <Link to={appUtils.LOGIN_PATH} icon={GoBackIcon} text={getText('alreadyHaveAnAccount')} />
+        <Link
+          to={`${LOGIN_PATH}?${new URLSearchParams({ email: emailInput }).toString()}`}
+          icon={GoBackIcon}
+          text={getText('alreadyHaveAnAccount')}
+        />
       }
-      onSubmit={async (event) => {
-        event.preventDefault()
-        setIsSubmitting(true)
-        await auth.signUp(email, password, organizationId)
-        setIsSubmitting(false)
-      }}
+      onSubmit={({ email, password }) => signUp(email, password, organizationId)}
     >
       <Input
         autoFocus
         required
-        validate
+        data-testid="email-input"
+        name="email"
+        label={getText('emailLabel')}
         type="email"
         autoComplete="email"
         icon={AtIcon}
         placeholder={getText('emailPlaceholder')}
-        value={email}
-        setValue={setEmail}
+        defaultValue={initialEmail ?? undefined}
+        onChange={(event) => {
+          setEmailInput(event.currentTarget.value)
+        }}
       />
-      <Input
+      <Password
         required
-        validate
-        allowShowingPassword
-        type="password"
+        data-testid="password-input"
+        name="password"
+        label={getText('passwordLabel')}
         autoComplete="new-password"
         icon={LockIcon}
         placeholder={getText('passwordPlaceholder')}
-        pattern={validation.PASSWORD_PATTERN}
-        error={getText('passwordValidationError')}
-        value={password}
-        setValue={setPassword}
+        description={getText('passwordValidationMessage')}
       />
-      <Input
+      <Password
         required
-        validate
-        allowShowingPassword
-        type="password"
+        data-testid="confirm-password-input"
+        name="confirmPassword"
+        label={getText('confirmPasswordLabel')}
         autoComplete="new-password"
         icon={LockIcon}
         placeholder={getText('confirmPasswordPlaceholder')}
-        pattern={string.regexEscape(password)}
-        error={getText('passwordMismatchError')}
-        value={confirmPassword}
-        setValue={setConfirmPassword}
       />
-      <SubmitButton isDisabled={isSubmitting} text={getText('register')} icon={CreateAccountIcon} />
+
+      <Form.Submit size="large" icon={CreateAccountIcon} className="w-full">
+        {getText('register')}
+      </Form.Submit>
+
+      <Form.FormError />
     </AuthenticationPage>
   )
 }
diff --git a/app/dashboard/src/pages/authentication/ResetPassword.tsx b/app/dashboard/src/pages/authentication/ResetPassword.tsx
index 7bf3a2ae8a12..41a9a927525f 100644
--- a/app/dashboard/src/pages/authentication/ResetPassword.tsx
+++ b/app/dashboard/src/pages/authentication/ResetPassword.tsx
@@ -1,30 +1,47 @@
 /** @file Container responsible for rendering and interactions in second half of forgot password
  * flow. */
 import * as React from 'react'
-
 import * as router from 'react-router-dom'
 
+import isEmail from 'validator/lib/isEmail'
+import * as z from 'zod'
+
+import { LOGIN_PATH } from '#/appUtils'
 import ArrowRightIcon from '#/assets/arrow_right.svg'
 import GoBackIcon from '#/assets/go_back.svg'
 import LockIcon from '#/assets/lock.svg'
-
-import * as appUtils from '#/appUtils'
-
-import * as toastAndLogHooks from '#/hooks/toastAndLogHooks'
-
-import * as authProvider from '#/providers/AuthProvider'
-import * as backendProvider from '#/providers/BackendProvider'
-import * as textProvider from '#/providers/TextProvider'
-
-import AuthenticationPage from '#/pages/authentication/AuthenticationPage'
-
-import * as aria from '#/components/aria'
-import Input from '#/components/Input'
+import { Form, Input, Password } from '#/components/AriaComponents'
 import Link from '#/components/Link'
-import SubmitButton from '#/components/SubmitButton'
+import { useToastAndLog } from '#/hooks/toastAndLogHooks'
+import AuthenticationPage from '#/pages/authentication/AuthenticationPage'
+import { passwordWithPatternSchema } from '#/pages/authentication/schemas'
+import { useAuth } from '#/providers/AuthProvider'
+import { useLocalBackend } from '#/providers/BackendProvider'
+import { type GetText, useText } from '#/providers/TextProvider'
+import { PASSWORD_REGEX } from '#/utilities/validation'
 
-import * as string from '#/utilities/string'
-import * as validation from '#/utilities/validation'
+/** Create the schema for this form. */
+function createResetPasswordFormSchema(getText: GetText) {
+  return z
+    .object({
+      email: z.string().refine(isEmail, getText('invalidEmailValidationError')),
+      verificationCode: z.string(),
+      newPassword: passwordWithPatternSchema(getText),
+      confirmNewPassword: z.string(),
+    })
+    .superRefine((object, context) => {
+      if (
+        PASSWORD_REGEX.test(object.newPassword) &&
+        object.newPassword !== object.confirmNewPassword
+      ) {
+        context.addIssue({
+          path: ['confirmNewPassword'],
+          code: 'custom',
+          message: getText('passwordMismatchError'),
+        })
+      }
+    })
+}
 
 // =====================
 // === ResetPassword ===
@@ -32,97 +49,91 @@ import * as validation from '#/utilities/validation'
 
 /** A form for users to reset their password. */
 export default function ResetPassword() {
-  const { resetPassword } = authProvider.useAuth()
-  const { getText } = textProvider.useText()
+  const { resetPassword } = useAuth()
+  const { getText } = useText()
   const location = router.useLocation()
   const navigate = router.useNavigate()
-  const toastAndLog = toastAndLogHooks.useToastAndLog()
-  const localBackend = backendProvider.useLocalBackend()
+  const toastAndLog = useToastAndLog()
+  const localBackend = useLocalBackend()
   const supportsOffline = localBackend != null
 
   const query = new URLSearchParams(location.search)
-  const email = query.get('email')
-  const verificationCode = query.get('verification_code')
-
-  const [newPassword, setNewPassword] = React.useState('')
-  const [newPasswordConfirm, setNewPasswordConfirm] = React.useState('')
+  const defaultEmail = query.get('email')
+  const defaultVerificationCode = query.get('verification_code')
 
   React.useEffect(() => {
-    if (email == null) {
+    if (defaultEmail == null) {
       toastAndLog('missingEmailError')
-      navigate(appUtils.LOGIN_PATH)
-    } else if (verificationCode == null) {
+      navigate(LOGIN_PATH)
+    } else if (defaultVerificationCode == null) {
       toastAndLog('missingVerificationCodeError')
-      navigate(appUtils.LOGIN_PATH)
+      navigate(LOGIN_PATH)
     }
-  }, [email, navigate, verificationCode, getText, toastAndLog])
-
-  const doSubmit = () => {
-    if (newPassword !== newPasswordConfirm) {
-      toastAndLog('passwordMismatchError')
-      return Promise.resolve()
-    } else {
-      // These should never be nullish, as the effect should immediately navigate away.
-      return resetPassword(email ?? '', verificationCode ?? '', newPassword)
-    }
-  }
+  }, [defaultEmail, navigate, defaultVerificationCode, getText, toastAndLog])
 
   return (
     <AuthenticationPage
       supportsOffline={supportsOffline}
       title={getText('resetYourPassword')}
-      footer={<Link to={appUtils.LOGIN_PATH} icon={GoBackIcon} text={getText('goBackToLogin')} />}
-      onSubmit={async (event) => {
-        event.preventDefault()
-        await doSubmit()
-      }}
+      schema={createResetPasswordFormSchema(getText)}
+      footer={
+        <Link
+          to={`${LOGIN_PATH}?${new URLSearchParams({ email: defaultEmail ?? '' }).toString()}`}
+          icon={GoBackIcon}
+          text={getText('goBackToLogin')}
+        />
+      }
+      onSubmit={({ email, verificationCode, newPassword }) =>
+        resetPassword(email, verificationCode, newPassword)
+      }
     >
-      <aria.Input
+      <Input
         required
         readOnly
         hidden
+        data-testid="email-input"
+        name="email"
         type="email"
         autoComplete="email"
         placeholder={getText('emailPlaceholder')}
-        value={email ?? ''}
+        value={defaultEmail ?? ''}
       />
-      <aria.Input
+      <Input
         required
         readOnly
         hidden
+        data-testid="verification-code-input"
+        name="verificationCode"
         type="text"
         autoComplete="one-time-code"
         placeholder={getText('confirmationCodePlaceholder')}
-        value={verificationCode ?? ''}
+        value={defaultVerificationCode ?? ''}
       />
-      <Input
+      <Password
         autoFocus
         required
-        validate
-        allowShowingPassword
-        type="password"
+        data-testid="new-password-input"
+        name="newPassword"
+        label={getText('newPasswordLabel')}
         autoComplete="new-password"
         icon={LockIcon}
         placeholder={getText('newPasswordPlaceholder')}
-        pattern={validation.PASSWORD_PATTERN}
-        error={getText('passwordValidationError')}
-        value={newPassword}
-        setValue={setNewPassword}
+        description={getText('passwordValidationMessage')}
       />
-      <Input
+      <Password
         required
-        validate
-        allowShowingPassword
-        type="password"
+        data-testid="confirm-new-password-input"
+        name="confirmNewPassword"
+        label={getText('confirmNewPasswordLabel')}
         autoComplete="new-password"
         icon={LockIcon}
         placeholder={getText('confirmNewPasswordPlaceholder')}
-        pattern={string.regexEscape(newPassword)}
-        error={getText('passwordMismatchError')}
-        value={newPasswordConfirm}
-        setValue={setNewPasswordConfirm}
       />
-      <SubmitButton text={getText('reset')} icon={ArrowRightIcon} />
+
+      <Form.FormError />
+      <Form.Submit size="large" icon={ArrowRightIcon} className="w-full">
+        {getText('reset')}
+      </Form.Submit>
     </AuthenticationPage>
   )
 }
diff --git a/app/dashboard/src/pages/authentication/schemas.ts b/app/dashboard/src/pages/authentication/schemas.ts
new file mode 100644
index 000000000000..3e806e9f9d30
--- /dev/null
+++ b/app/dashboard/src/pages/authentication/schemas.ts
@@ -0,0 +1,32 @@
+/**
+ * @file
+ *
+ * This file contains common schemas for authentication.
+ */
+import type { GetText } from '#/providers/TextProvider'
+import { PASSWORD_REGEX } from '#/utilities/validation'
+import { z } from 'zod'
+
+/**
+ * A schema for validating passwords.
+ */
+export function passwordSchema(getText: GetText) {
+  return (
+    z
+      .string()
+      // eslint-disable-next-line @typescript-eslint/no-magic-numbers
+      .min(6, { message: getText('passwordLengthError') })
+      // eslint-disable-next-line @typescript-eslint/no-magic-numbers
+      .max(256, { message: getText('passwordLengthError') })
+  )
+}
+
+/**
+ * A schema for validating passwords that match the required pattern.
+ */
+export function passwordWithPatternSchema(getText: GetText) {
+  return passwordSchema(getText).refine(
+    (password) => PASSWORD_REGEX.test(password),
+    getText('passwordValidationError'),
+  )
+}
diff --git a/app/dashboard/src/providers/AuthProvider.tsx b/app/dashboard/src/providers/AuthProvider.tsx
index 65d841261763..9fe08c461e59 100644
--- a/app/dashboard/src/providers/AuthProvider.tsx
+++ b/app/dashboard/src/providers/AuthProvider.tsx
@@ -86,20 +86,16 @@ export type UserSession = FullUserSession | PartialUserSession
  *
  * See `Cognito` for details on each of the authentication functions. */
 interface AuthContextType {
-  readonly signUp: (
-    email: string,
-    password: string,
-    organizationId: string | null,
-  ) => Promise<boolean>
+  readonly signUp: (email: string, password: string, organizationId: string | null) => Promise<void>
   readonly authQueryKey: reactQuery.QueryKey
   readonly confirmSignUp: (email: string, code: string) => Promise<boolean>
   readonly setUsername: (username: string) => Promise<boolean>
   readonly signInWithGoogle: () => Promise<boolean>
   readonly signInWithGitHub: () => Promise<boolean>
-  readonly signInWithPassword: (email: string, password: string) => Promise<boolean>
-  readonly forgotPassword: (email: string) => Promise<boolean>
+  readonly signInWithPassword: (email: string, password: string) => Promise<void>
+  readonly forgotPassword: (email: string) => Promise<void>
   readonly changePassword: (oldPassword: string, newPassword: string) => Promise<boolean>
-  readonly resetPassword: (email: string, code: string, password: string) => Promise<boolean>
+  readonly resetPassword: (email: string, code: string, password: string) => Promise<void>
   readonly signOut: () => Promise<void>
   /**
    * @deprecated Never use this function. Prefer particular functions like `setUsername` or `deleteUser`.
@@ -293,18 +289,15 @@ export default function AuthProvider(props: AuthProviderProps) {
 
   const signUp = useEventCallback(
     async (username: string, password: string, organizationId: string | null) => {
-      if (cognito == null) {
-        return false
-      } else {
+      if (cognito != null) {
         gtagEvent('cloud_sign_up')
         const result = await cognito.signUp(username, password, organizationId)
         if (result.ok) {
-          toastSuccess(getText('signUpSuccess'))
           navigate(appUtils.LOGIN_PATH)
         } else {
-          toastError(result.val.message)
+          // eslint-disable-next-line no-restricted-syntax
+          throw new Error(result.val.message)
         }
-        return result.ok
       }
     },
   )
@@ -337,23 +330,16 @@ export default function AuthProvider(props: AuthProviderProps) {
   })
 
   const signInWithPassword = useEventCallback(async (email: string, password: string) => {
-    if (cognito == null) {
-      return false
-    } else {
+    if (cognito != null) {
       gtagEvent('cloud_sign_in', { provider: 'Email' })
       const result = await cognito.signInWithPassword(email, password)
       if (result.ok) {
-        toastSuccess(getText('signInWithPasswordSuccess'))
         void queryClient.invalidateQueries({ queryKey: sessionQueryKey })
         navigate(appUtils.DASHBOARD_PATH)
+        return
       } else {
-        if (result.val.type === cognitoModule.CognitoErrorType.userNotFound) {
-          // It may not be safe to pass the user's password in the URL.
-          navigate(`${appUtils.REGISTRATION_PATH}?${new URLSearchParams({ email }).toString()}`)
-        }
-        toastError(result.val.message)
+        throw new Error(result.val.message)
       }
-      return result.ok
     }
   })
 
@@ -422,32 +408,26 @@ export default function AuthProvider(props: AuthProviderProps) {
   })
 
   const forgotPassword = useEventCallback(async (email: string) => {
-    if (cognito == null) {
-      return false
-    } else {
+    if (cognito != null) {
       const result = await cognito.forgotPassword(email)
       if (result.ok) {
-        toastSuccess(getText('forgotPasswordSuccess'))
         navigate(appUtils.LOGIN_PATH)
+        return
       } else {
-        toastError(result.val.message)
+        throw new Error(result.val.message)
       }
-      return result.ok
     }
   })
 
   const resetPassword = useEventCallback(async (email: string, code: string, password: string) => {
-    if (cognito == null) {
-      return false
-    } else {
+    if (cognito != null) {
       const result = await cognito.forgotPasswordSubmit(email, code, password)
       if (result.ok) {
-        toastSuccess(getText('resetPasswordSuccess'))
         navigate(appUtils.LOGIN_PATH)
+        return
       } else {
-        toastError(result.val.message)
+        throw new Error(result.val.message)
       }
-      return result.ok
     }
   })
 
@@ -521,7 +501,7 @@ export default function AuthProvider(props: AuthProviderProps) {
   }, [userData, onAuthenticated])
 
   const value: AuthContextType = {
-    signUp: withLoadingToast(signUp),
+    signUp,
     confirmSignUp: withLoadingToast(confirmSignUp),
     setUsername,
     isUserMarkedForDeletion,
@@ -557,9 +537,9 @@ export default function AuthProvider(props: AuthProviderProps) {
           )
       }
     }),
-    signInWithPassword: signInWithPassword,
-    forgotPassword: withLoadingToast(forgotPassword),
-    resetPassword: withLoadingToast(resetPassword),
+    signInWithPassword,
+    forgotPassword,
+    resetPassword,
     changePassword: withLoadingToast(changePassword),
     refetchSession: usersMeQuery.refetch,
     session: userData,
diff --git a/app/dashboard/src/tailwind.css b/app/dashboard/src/tailwind.css
index bae6a2d3dbb7..61ec600b09fe 100644
--- a/app/dashboard/src/tailwind.css
+++ b/app/dashboard/src/tailwind.css
@@ -290,7 +290,7 @@
   /* The gap between the header and contents of a section in a settings page. */
   --settings-section-header-gap: 0.625rem;
   /* The gap between the label and value of a settings entry. */
-  --settings-entry-gap: 1.1875rem;
+  --settings-entry-gap: 1.25rem;
   --settings-sidebar-width: 12.875rem;
   /* The gap between each section in the settings sidebar. */
   --settings-sidebar-gap: 1rem;
diff --git a/app/dashboard/src/utilities/tailwindVariants.ts b/app/dashboard/src/utilities/tailwindVariants.ts
index 8215c0910f7f..c3aa3736c12b 100644
--- a/app/dashboard/src/utilities/tailwindVariants.ts
+++ b/app/dashboard/src/utilities/tailwindVariants.ts
@@ -1,7 +1,7 @@
 /** @file `tailwind-variants` with a custom configuration. */
-import * as tailwindVariants from 'tailwind-variants'
+import { createTV } from 'tailwind-variants'
 
-import * as tailwindMerge from '#/utilities/tailwindMerge'
+import { TAILWIND_MERGE_CONFIG } from '#/utilities/tailwindMerge'
 
 export * from 'tailwind-variants'
 
@@ -11,4 +11,11 @@ export * from 'tailwind-variants'
 
 // This is a function, even though it does not contain function syntax.
 // eslint-disable-next-line no-restricted-syntax
-export const tv = tailwindVariants.createTV({ twMergeConfig: tailwindMerge.TAILWIND_MERGE_CONFIG })
+export const tv = createTV({ twMergeConfig: TAILWIND_MERGE_CONFIG })
+
+/** Extract function signatures from a type. */
+export type ExtractFunction<T> =
+  T extends (...args: infer Args) => infer Ret ? (...args: Args) => Ret : never
+
+/** A `tailwind-variants` type, without restrictions onn the `extends` key. */
+export type TVWithoutExtends<T> = ExtractFunction<T> & Omit<T, 'extend'>
diff --git a/app/ide-desktop/common/src/text/english.json b/app/ide-desktop/common/src/text/english.json
index 68a33fc5dcdc..77c23f4bc5bc 100644
--- a/app/ide-desktop/common/src/text/english.json
+++ b/app/ide-desktop/common/src/text/english.json
@@ -51,7 +51,7 @@
   "otherUserIsUsingProjectError": "Someone else is using this project",
   "localBackendNotDetectedError": "Could not detect the local backend",
 
-  "invalidEmailValidationError": "Invalid email",
+  "invalidEmailValidationError": "Please enter a valid email address",
 
   "projectHasNoSourceFilesPhrase": "project has no source files",
   "fileNotFoundPhrase": "file not found",
@@ -61,8 +61,10 @@
   "registrationError": "Something went wrong! Please try again or contact the administrators.",
   "missingEmailError": "Missing email address",
   "missingVerificationCodeError": "Missing verification code",
-  "passwordMismatchError": "Passwords do not match",
-  "passwordValidationError": "Your password must include numbers, letters (both lowercase and uppercase) and symbols, and must be between 6 and 256 characters long.",
+  "passwordMismatchError": "Passwords do not match.",
+  "passwordLengthError": "Your password must be between 6 and 256 characters long.",
+  "passwordValidationMessage": "Your password must include numbers, letters (both lowercase and uppercase) and symbols.",
+  "passwordValidationError": "Your password does not meet the security requirements.",
 
   "confirmSignUpError": "Incorrect email or confirmation code.",
   "setUsernameError": "Could not set your username.",
@@ -287,6 +289,7 @@
   "stopExecution": "Stop execution",
   "openInEditor": "Open in editor",
 
+  "fieldErrorLabel": "Error",
   "unknownPlaceholder": "unknown",
   "expand": "Expand",
   "collapse": "Collapse",
@@ -473,6 +476,8 @@
   "emailPlaceholder": "Enter your email",
   "confirmationCodePlaceholder": "Enter the confirmation code",
 
+  "emailLabel": "Email",
+  "passwordLabel": "Password",
   "changePassword": "Change Password",
   "currentPasswordLabel": "Current password",
   "currentPasswordPlaceholder": "Enter your current password",

From 89f50676cd4200c5906872bae8cba94c8be362dd Mon Sep 17 00:00:00 2001
From: Kaz Wesley <kaz@lambdaverse.org>
Date: Tue, 13 Aug 2024 08:59:44 -0400
Subject: [PATCH 22/23] Fix breadcrumb height (#10801)

Fixes #10652 (extended menu padding seems to have been fixed already; remaining
visual differences are due to icons using different proportions of 16x16 area,
`text1` in particular is tall).
---
 app/gui2/src/components/NavBreadcrumbs.vue | 9 +++++----
 app/gui2/src/composables/stackNavigator.ts | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/gui2/src/components/NavBreadcrumbs.vue b/app/gui2/src/components/NavBreadcrumbs.vue
index 209958af927b..2cc192ee7358 100644
--- a/app/gui2/src/components/NavBreadcrumbs.vue
+++ b/app/gui2/src/components/NavBreadcrumbs.vue
@@ -9,6 +9,7 @@ import { ref } from 'vue'
 export interface BreadcrumbItem {
   label: string
   active: boolean
+  isCurrentTop: boolean
 }
 const renameError = useToast.error()
 const projectNameEdited = ref(false)
@@ -36,6 +37,7 @@ async function renameBreadcrumb(index: number, newName: string) {
           v-if="index > 0"
           name="arrow_right_head_only"
           :disabled="!breadcrumb.active"
+          :class="{ nonInteractive: breadcrumb.isCurrentTop }"
           class="arrow"
         />
         <NavBreadcrumb
@@ -43,6 +45,7 @@ async function renameBreadcrumb(index: number, newName: string) {
           :active="breadcrumb.active"
           :editing="index === 0 && projectNameEdited"
           :title="index === 0 ? 'Project Name' : ''"
+          :class="{ nonInteractive: breadcrumb.isCurrentTop }"
           class="clickable"
           @click.stop="stackNavigator.handleBreadcrumbClick(index)"
           @update:modelValue="renameBreadcrumb(index, $event)"
@@ -63,8 +66,6 @@ async function renameBreadcrumb(index: number, newName: string) {
   gap: 12px;
   padding-left: 8px;
   padding-right: 10px;
-  padding-top: 4px;
-  padding-bottom: 4px;
 }
 
 .NavBreadcrumbs {
@@ -77,7 +78,7 @@ async function renameBreadcrumb(index: number, newName: string) {
   color: #666666;
 }
 
-.inactive {
-  opacity: 0.4;
+.nonInteractive {
+  pointer-events: none;
 }
 </style>
diff --git a/app/gui2/src/composables/stackNavigator.ts b/app/gui2/src/composables/stackNavigator.ts
index 2b8f9db7a6b4..3f2b3168202c 100644
--- a/app/gui2/src/composables/stackNavigator.ts
+++ b/app/gui2/src/composables/stackNavigator.ts
@@ -13,7 +13,8 @@ export function useStackNavigator(projectStore: ProjectStore, graphStore: GraphS
     return breadcrumbs.value.map((item, index) => {
       const label = stackItemToLabel(item, index === 0)
       const isActive = index < activeStackLength
-      return { label, active: isActive } satisfies BreadcrumbItem
+      const isCurrentTop = index == activeStackLength - 1
+      return { label, active: isActive, isCurrentTop } satisfies BreadcrumbItem
     })
   })
 

From fa69e17bd1fec2dcba66fa823754b62cb5cf713c Mon Sep 17 00:00:00 2001
From: Kaz Wesley <kaz@lambdaverse.org>
Date: Tue, 13 Aug 2024 09:01:04 -0400
Subject: [PATCH 23/23] Show scrollbars when scene is scrollable (#10797)

Implements #10681.
---
 app/gui2/src/assets/base.css          | 1 +
 app/gui2/src/components/ScrollBar.vue | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/gui2/src/assets/base.css b/app/gui2/src/assets/base.css
index 710635109077..261fb604d43a 100644
--- a/app/gui2/src/assets/base.css
+++ b/app/gui2/src/assets/base.css
@@ -86,4 +86,5 @@
   --visualization-resize-handle-outside: 3px;
   --right-dock-default-width: 40%;
   --code-editor-default-height: 30%;
+  --scrollbar-scrollable-opacity: 100%;
 }
diff --git a/app/gui2/src/components/ScrollBar.vue b/app/gui2/src/components/ScrollBar.vue
index 6c2b2b0b4307..e57e074cee37 100644
--- a/app/gui2/src/components/ScrollBar.vue
+++ b/app/gui2/src/components/ScrollBar.vue
@@ -121,10 +121,10 @@ export default {}
 
 <template>
   <div ref="element" class="ScrollBar" :style="scrollBarStyles">
-    <div class="track vertical" @pointerdown.stop="clickTrack.y">
+    <div class="track vertical" :class="{ scrollable: !yFull }" @pointerdown.stop="clickTrack.y">
       <div class="bar vertical" v-on.stop="dragSlider.y" />
     </div>
-    <div class="track horizontal" @pointerdown.stop="clickTrack.x">
+    <div class="track horizontal" :class="{ scrollable: !xFull }" @pointerdown.stop="clickTrack.x">
       <div class="bar horizontal" v-on.stop="dragSlider.x" />
     </div>
   </div>
@@ -190,8 +190,10 @@ export default {}
   background-color: rgba(150 150 150 / 15%);
   transition: opacity 0.2s ease-in;
   opacity: 0;
+  &.scrollable {
+    opacity: var(--scrollbar-scrollable-opacity);
+  }
   &:hover {
-    transition: opacity 0.2s ease-in;
     opacity: 1;
   }
   &:active {