From d44d938a7dc77cc18af7835aa654cddee859fb04 Mon Sep 17 00:00:00 2001
From: Adam Obuchowicz <adam.obuchowicz@enso.org>
Date: Mon, 22 Sep 2025 10:24:48 +0200
Subject: [PATCH 01/17] Module store and adjustments

---
 .../components/AppContainer/RightPanel.vue    |  11 +-
 app/gui/src/components/WithCurrentProject.vue |  65 ++--
 app/gui/src/entrypoint.ts                     |   2 +-
 app/gui/src/project-view/ProjectView.vue      |   2 +-
 .../components/CodeEditor/CodeEditorImpl.vue  |  22 +-
 .../CodeEditor/CodeEditorTooltip.vue          |   6 +-
 .../components/CodeEditor/diagnostics.ts      |  33 +-
 .../components/CodeEditor/sync.ts             |  56 ++--
 .../components/CodeEditor/tooltips.ts         |  15 +-
 .../components/ColorPickerMenu.vue            |  14 +-
 .../components/ComponentBrowser.vue           |   4 +-
 .../ComponentBrowser/ComponentEditorLabel.vue |   2 +-
 .../__tests__/component.test.ts               |  18 +-
 .../__tests__/filtering.bench.ts              |   8 +-
 .../__tests__/filtering.test.ts               |  10 +-
 .../ComponentBrowser/__tests__/input.test.ts  |   9 +-
 .../components/ComponentBrowser/ai.ts         |   2 +-
 .../components/ComponentBrowser/component.ts  |   6 +-
 .../components/ComponentBrowser/filtering.ts  |   9 +-
 .../components/ComponentBrowser/input.ts      |  53 +--
 .../project-view/components/ComponentHelp.vue |  12 +-
 .../components/ComponentHelp/history.ts       |   2 +-
 .../components/ComponentHelp/ir.ts            |  11 +-
 .../components/ComponentHelpPanel.vue         |  38 ++-
 .../project-view/components/ContextMenu.vue   |   2 +-
 .../components/DocumentationEditor.vue        | 141 --------
 .../ClosedProjectDocumentationEditor.vue      |  91 ++++++
 .../DocumentationEditor.vue                   |  36 +++
 .../OpenedProjectDocumentationEditor.vue      |  66 ++++
 .../components/DocumentationEditor/index.ts   |   3 +
 .../components/FunctionSignatureEditor.vue    |  22 +-
 .../project-view/components/GraphEditor.vue   |  26 +-
 .../GraphEditor/CodeMirrorWidgetBase.vue      |   8 +-
 .../GraphEditor/ComponentWidgetTree.vue       |  28 +-
 .../GraphEditor/CreateNodeFromPortButton.vue  |   2 +-
 .../components/GraphEditor/GraphEdge.vue      |   4 +-
 .../components/GraphEditor/GraphEdges.vue     |  82 ++---
 .../components/GraphEditor/GraphNode.vue      |  17 +-
 .../GraphEditor/GraphNode/nodeMessage.ts      |  10 +-
 .../GraphNode/nodeVisualization.ts            |  10 +-
 .../GraphEditor/GraphNodeComment.vue          |   2 +-
 .../GraphEditor/GraphNodeMessage.vue          |  11 +-
 .../GraphEditor/GraphNodeOutputPorts.vue      |   2 +-
 .../components/GraphEditor/GraphNodes.vue     |   2 +-
 .../GraphEditor/GraphVisualization.vue        |   2 +-
 .../VisualizationToolbar.vue                  |   2 +-
 .../GraphVisualization/visualizationData.ts   |   6 +-
 .../components/GraphEditor/NodeWidget.vue     |   4 +-
 .../GraphEditor/ResizableWidget.vue           |   2 +-
 .../components/GraphEditor/WidgetTreeRoot.vue |   9 +-
 .../GraphEditor/__tests__/collapsing.test.ts  |   4 +-
 .../components/GraphEditor/collapsing.ts      |   4 +-
 .../components/GraphEditor/graphClipboard.ts  |   2 +-
 .../components/GraphEditor/nodesDragging.ts   |  22 +-
 .../GraphEditor/selectionActions.ts           |   4 +-
 .../components/GraphEditor/toasts.ts          |   2 +-
 .../GraphEditor/widgets/WidgetAnyToTarget.vue |  12 +-
 .../GraphEditor/widgets/WidgetApplication.vue |  10 +-
 .../widgets/WidgetArgumentName.vue            |   9 +-
 .../GraphEditor/widgets/WidgetBlank.vue       |   7 +-
 .../GraphEditor/widgets/WidgetCheckbox.vue    |  24 +-
 .../widgets/WidgetEnsoExpression.vue          |   9 +-
 .../GraphEditor/widgets/WidgetFileBrowser.vue |  24 +-
 .../WidgetFileBrowser/browsableTypes.ts       |   4 +-
 .../widgets/WidgetFileBrowser/cloudBrowser.ts |  16 +-
 .../widgets/WidgetFileBrowser/localBrowser.ts |  10 +-
 .../GraphEditor/widgets/WidgetFunction.vue    |  29 +-
 .../__tests__/widgetFunctionCallInfo.test.ts  |  24 +-
 .../WidgetFunction/widgetFunctionCallInfo.ts  |  52 +--
 .../widgets/WidgetFunctionDef/ArgumentRow.vue |  18 +-
 .../widgets/WidgetFunctionName.vue            |   7 +-
 .../GraphEditor/widgets/WidgetGroup.vue       |   7 +-
 .../GraphEditor/widgets/WidgetHierarchy.vue   |   2 +-
 .../GraphEditor/widgets/WidgetIcon.vue        |   6 +-
 .../widgets/WidgetMultiSelection.vue          |  18 +-
 .../GraphEditor/widgets/WidgetNumber.vue      |   9 +-
 .../GraphEditor/widgets/WidgetPort.vue        |   9 +-
 .../GraphEditor/widgets/WidgetSelection.vue   |  25 +-
 .../widgets/WidgetSelection/tags.ts           |  46 +--
 .../widgets/WidgetSelectionArrow.vue          |   7 +-
 .../widgets/WidgetSelfAccessChain.vue         |   7 +-
 .../GraphEditor/widgets/WidgetTableEditor.vue |  13 +-
 .../__tests__/editHandler.test.ts             |   7 +-
 .../__tests__/tableInputArgument.test.ts      |   8 +-
 .../widgets/WidgetTableEditor/editHandler.ts  |  11 +-
 .../WidgetTableEditor/tableInputArgument.ts   |  36 +--
 .../GraphEditor/widgets/WidgetTableMethod.vue |   4 +-
 .../GraphEditor/widgets/WidgetText.vue        |  11 +-
 .../GraphEditor/widgets/WidgetToken.vue       |   7 +-
 .../widgets/WidgetTopLevelArgument.vue        |   2 +-
 .../GraphEditor/widgets/WidgetTypeCast.vue    |   7 +-
 .../widgets/WidgetTypeCastPort.vue            |   8 +-
 .../widgets/WidgetTypeExpression.vue          |   4 +-
 .../GraphEditor/widgets/WidgetVector.vue      |  15 +-
 .../components/widgets/FileBrowserWidget.vue  |   2 +-
 .../FileBrowserWidget/FileBrowserNameBar.vue  |   2 +-
 .../FileBrowserWidget/fileExtensions.ts       |  12 +-
 .../composables/componentColors.ts            |   4 +-
 .../project-view/composables/nodeColors.ts    |   6 +-
 .../project-view/composables/nodeCreation.ts  |  30 +-
 .../src/project-view/composables/selection.ts |   2 +-
 .../composables/stackNavigator.ts             |   6 +-
 .../project-view/composables/tableColumns.ts  |   6 +-
 .../__tests__/widgetRegistry.test.ts          |   2 +-
 .../providers/asyncResources/context.ts       |   2 +-
 .../project-view/providers/functionInfo.ts    |   8 +-
 .../project-view/providers/graphSelection.ts  |   2 +-
 .../providers/languageSupportExtensions.ts    |   6 +-
 .../src/project-view/providers/widgetTree.ts  |   4 +-
 .../project-view/providers/widgetUsageInfo.ts |   3 +-
 app/gui/src/project-view/stores/persisted.ts  |   2 +-
 .../src/project-view/stores/projectFiles.ts   |   4 +-
 .../stores/visualization/index.ts             |   4 +-
 .../util/__tests__/callTree.test.ts           |  12 +-
 .../util/__tests__/projectPath.test.ts        |   2 +-
 .../util/__tests__/qualifiedName.test.ts      |   2 +-
 app/gui/src/project-view/util/ast/node.ts     |   7 +-
 app/gui/src/project-view/util/callTree.ts     |  14 +-
 .../language/tableExpression/index.ts         |   8 +-
 app/gui/src/project-view/util/getIconName.ts  |  25 +-
 .../src/project-view/util/methodPointer.ts    |   6 +-
 app/gui/src/providers/openedProjects.ts       |  22 +-
 .../graph/__tests__/graphDatabase.test.ts     |   0
 .../graph/__tests__/imports.test.ts           |  18 +-
 .../openedProjects/graph/graph.ts}            | 302 ++++--------------
 .../openedProjects}/graph/graphDatabase.ts    |  13 +-
 .../providers/openedProjects/graph/index.ts   |  10 +
 .../openedProjects}/graph/unconnectedEdges.ts |   2 +-
 .../openedProjects/module}/imports.ts         |   9 +-
 .../providers/openedProjects/module/index.ts  |   1 +
 .../providers/openedProjects/module/module.ts | 225 +++++++++++++
 .../project/computedValueRegistry.ts          |   7 +-
 .../project/executionContext.ts               |   2 +-
 .../providers/openedProjects/project/index.ts |   1 +
 .../openedProjects}/project/nodeExecution.ts  |   4 +-
 .../openedProjects/project/project.ts}        |  74 ++---
 .../project/visualizationDataRegistry.ts      |   2 +-
 .../openedProjects}/projectNames.ts           |   0
 .../__tests__/documentation.test.ts           |   7 +-
 .../__tests__/lsUpdate.test.ts                |  11 +-
 .../suggestionDatabase/documentation.ts       |   2 +-
 .../suggestionDatabase/entry.ts               |   6 +-
 .../suggestionDatabase/index.ts               |  11 +-
 .../suggestionDatabase/lsUpdate.ts            |   8 +-
 .../suggestionDatabase/mockSuggestion.ts      |  11 +-
 .../openedProjects}/widgetRegistry.ts         |  83 ++---
 .../__tests__/configuration.test.ts           |   0
 .../__tests__/editHandler.test.ts             |   0
 .../widgetRegistry/configuration.ts           |   0
 .../widgetRegistry/devtools.ts                |   2 +-
 .../widgetRegistry/editHandler.ts             |   2 +-
 151 files changed, 1425 insertions(+), 1155 deletions(-)
 delete mode 100644 app/gui/src/project-view/components/DocumentationEditor.vue
 create mode 100644 app/gui/src/project-view/components/DocumentationEditor/ClosedProjectDocumentationEditor.vue
 create mode 100644 app/gui/src/project-view/components/DocumentationEditor/DocumentationEditor.vue
 create mode 100644 app/gui/src/project-view/components/DocumentationEditor/OpenedProjectDocumentationEditor.vue
 create mode 100644 app/gui/src/project-view/components/DocumentationEditor/index.ts
 rename app/gui/src/{project-view/stores => providers/openedProjects}/graph/__tests__/graphDatabase.test.ts (100%)
 rename app/gui/src/{project-view/stores => providers/openedProjects}/graph/__tests__/imports.test.ts (98%)
 rename app/gui/src/{project-view/stores/graph/index.ts => providers/openedProjects/graph/graph.ts} (71%)
 rename app/gui/src/{project-view/stores => providers/openedProjects}/graph/graphDatabase.ts (98%)
 create mode 100644 app/gui/src/providers/openedProjects/graph/index.ts
 rename app/gui/src/{project-view/stores => providers/openedProjects}/graph/unconnectedEdges.ts (98%)
 rename app/gui/src/{project-view/stores/graph => providers/openedProjects/module}/imports.ts (97%)
 create mode 100644 app/gui/src/providers/openedProjects/module/index.ts
 create mode 100644 app/gui/src/providers/openedProjects/module/module.ts
 rename app/gui/src/{project-view/stores => providers/openedProjects}/project/computedValueRegistry.ts (97%)
 rename app/gui/src/{project-view/stores => providers/openedProjects}/project/executionContext.ts (99%)
 create mode 100644 app/gui/src/providers/openedProjects/project/index.ts
 rename app/gui/src/{project-view/stores => providers/openedProjects}/project/nodeExecution.ts (93%)
 rename app/gui/src/{project-view/stores/project/index.ts => providers/openedProjects/project/project.ts} (98%)
 rename app/gui/src/{project-view/stores => providers/openedProjects}/project/visualizationDataRegistry.ts (97%)
 rename app/gui/src/{project-view/stores => providers/openedProjects}/projectNames.ts (100%)
 rename app/gui/src/{project-view/stores => providers/openedProjects}/suggestionDatabase/__tests__/documentation.test.ts (91%)
 rename app/gui/src/{project-view/stores => providers/openedProjects}/suggestionDatabase/__tests__/lsUpdate.test.ts (98%)
 rename app/gui/src/{project-view/stores => providers/openedProjects}/suggestionDatabase/documentation.ts (97%)
 rename app/gui/src/{project-view/stores => providers/openedProjects}/suggestionDatabase/entry.ts (96%)
 rename app/gui/src/{project-view/stores => providers/openedProjects}/suggestionDatabase/index.ts (97%)
 rename app/gui/src/{project-view/stores => providers/openedProjects}/suggestionDatabase/lsUpdate.ts (98%)
 rename app/gui/src/{project-view/stores => providers/openedProjects}/suggestionDatabase/mockSuggestion.ts (95%)
 rename app/gui/src/{project-view/providers => providers/openedProjects}/widgetRegistry.ts (90%)
 rename app/gui/src/{project-view/providers => providers/openedProjects}/widgetRegistry/__tests__/configuration.test.ts (100%)
 rename app/gui/src/{project-view/providers => providers/openedProjects}/widgetRegistry/__tests__/editHandler.test.ts (100%)
 rename app/gui/src/{project-view/providers => providers/openedProjects}/widgetRegistry/configuration.ts (100%)
 rename app/gui/src/{project-view/providers => providers/openedProjects}/widgetRegistry/devtools.ts (97%)
 rename app/gui/src/{project-view/providers => providers/openedProjects}/widgetRegistry/editHandler.ts (99%)

diff --git a/app/gui/src/components/AppContainer/RightPanel.vue b/app/gui/src/components/AppContainer/RightPanel.vue
index 290f1d2075af..45608114135a 100644
--- a/app/gui/src/components/AppContainer/RightPanel.vue
+++ b/app/gui/src/components/AppContainer/RightPanel.vue
@@ -6,11 +6,10 @@ import {
   ProjectSessions,
 } from '$/components/AppContainer/reactTabs'
 import SelectableTab from '$/components/AppContainer/SelectableTab.vue'
-import WithCurrentProject from '$/components/WithCurrentProject.vue'
 import { useRightPanelData, type RightPanelTabId } from '$/providers/rightPanel'
 import ComponentHelpPanel from '@/components/ComponentHelpPanel.vue'
 import DescriptionEditor from '@/components/DescriptionEditor.vue'
-import DocumentationEditor from '@/components/DocumentationEditor.vue'
+import DocumentationEditor from '@/components/DocumentationEditor'
 import ResizeHandles from '@/components/ResizeHandles.vue'
 import SizeTransition from '@/components/SizeTransition.vue'
 import WithFullscreenMode from '@/components/WithFullscreenMode.vue'
@@ -70,11 +69,9 @@ const style = computed(() => (data.width == null ? {} : { '--panel-width': `${da
       <div v-if="component != null" class="sizeWrapper">
         <div ref="contentElement" class="content">
           <WithFullscreenMode v-model="data.fullscreen">
-            <WithCurrentProject :id="data.focusedProject">
-              <div class="contentInner withBackgroundColor">
-                <component :is="component" />
-              </div>
-            </WithCurrentProject>
+            <div class="contentInner withBackgroundColor">
+              <component :is="component" />
+            </div>
           </WithFullscreenMode>
           <ResizeHandles left :modelValue="bounds" @update:modelValue="data.width = $event.width" />
         </div>
diff --git a/app/gui/src/components/WithCurrentProject.vue b/app/gui/src/components/WithCurrentProject.vue
index 58665eaf561c..bb34bc912e8a 100644
--- a/app/gui/src/components/WithCurrentProject.vue
+++ b/app/gui/src/components/WithCurrentProject.vue
@@ -4,6 +4,7 @@ import { isLocalProjectId } from '#/services/LocalBackend'
 import { injectOpenedProjects, type OpenedProject } from '$/providers/openedProjects'
 import { groupColorVar } from '@/composables/nodeColors'
 import { createContextStore } from '@/providers'
+import { assert } from '@/util/assert'
 import { colorFromString } from '@/util/colors'
 import type { Opt } from '@/util/data/opt'
 import type { ToValue } from '@/util/reactivity'
@@ -18,43 +19,50 @@ import { computed, toValue, watch, type ToRefs } from 'vue'
  */
 const [provideCurrentProject, useCurrentProject] = createContextStore(
   'currentProject',
-  (projectId: ToValue<Opt<ProjectId>>) => {
-    const openedProjects = injectOpenedProjects()
-
-    const hybridResolvedProjectId = computed(() => {
-      const id = toValue(projectId)
-      // When we have a hybrid project opened, we have to translate cloud project ID to corresponding hybrid project.
-      if (id && openedProjects.get(id) == null && !isLocalProjectId(id)) {
-        for (const openedId of openedProjects.listIds()) {
-          if (openedId.includes('/cloud-' + id) && isLocalProjectId(openedId)) return openedId
-        }
-      }
-      return id
-    })
-
-    const ref = computed((): OpenedProject | undefined => {
-      const id = hybridResolvedProjectId.value
-      return id != null ? openedProjects.get(id) : undefined
+  (project: ToValue<OpenedProject | undefined>) => {
+    const ref = computed(() => {
+      const proj = toValue(project)
+      assert(proj != null)
+      return proj
     })
-
     return {
-      id: hybridResolvedProjectId,
       /* Current project as a single ref  */
       ref,
       /* Current project's stores decomposed to separate refs. */
       storesRefs: {
-        store: computed(() => ref.value?.store),
-        names: computed(() => ref.value?.names),
-        suggestionDb: computed(() => ref.value?.suggestionDb),
-        graph: computed(() => ref.value?.graph),
-        widgetRegistry: computed(() => ref.value?.widgetRegistry),
-      } satisfies ToRefs<{ [K in keyof OpenedProject]: OpenedProject[K] | undefined }>,
+        store: computed(() => ref.value.store),
+        names: computed(() => ref.value.names),
+        suggestionDb: computed(() => ref.value.suggestionDb),
+        module: computed(() => ref.value.module),
+        graph: computed(() => ref.value.graph),
+        widgetRegistry: computed(() => ref.value.widgetRegistry),
+      } satisfies ToRefs<{ [K in keyof OpenedProject]: OpenedProject[K] }>,
     }
   },
 )
 
 export { useCurrentProject }
 
+function useOpenedProject(projectId: ToValue<Opt<ProjectId>>) {
+  const openedProjects = injectOpenedProjects()
+
+  const hybridResolvedProjectId = computed(() => {
+    const id = toValue(projectId)
+    // When we have a hybrid project opened, we have to translate cloud project ID to corresponding hybrid project.
+    if (id && openedProjects.get(id) == null && !isLocalProjectId(id)) {
+      for (const openedId of openedProjects.listIds()) {
+        if (openedId.includes('/cloud-' + id) && isLocalProjectId(openedId)) return openedId
+      }
+    }
+    return id
+  })
+
+  return computed((): OpenedProject | undefined => {
+    const id = hybridResolvedProjectId.value
+    return id != null ? openedProjects.get(id) : undefined
+  })
+}
+
 function useStoreTemplate<K extends keyof OpenedProject>(
   storeKey: K,
 ): () => NonNullable<OpenedProject[K]> {
@@ -92,7 +100,9 @@ export const useWidgetRegistry = useStoreTemplate('widgetRegistry')
 <script setup lang="ts">
 const { id } = defineProps<{ id: Opt<ProjectId> }>()
 
-const provided = provideCurrentProject(() => id).ref
+const project = useOpenedProject(() => id)
+
+const provided = provideCurrentProject(project).ref
 
 const groupColors = computed(() => {
   const styles: { [key: string]: string } = {}
@@ -105,9 +115,10 @@ const groupColors = computed(() => {
 </script>
 
 <template>
-  <div class="WithCurrentProject" :style="groupColors">
+  <div v-if="project != null" class="WithCurrentProject" :style="groupColors">
     <slot />
   </div>
+  <slot v-else name="fallback" />
 </template>
 
 <style scoped>
diff --git a/app/gui/src/entrypoint.ts b/app/gui/src/entrypoint.ts
index c2f479b10799..0aadb1b356c1 100644
--- a/app/gui/src/entrypoint.ts
+++ b/app/gui/src/entrypoint.ts
@@ -3,8 +3,8 @@ import './beforeMain' // Keep newline below to ensure that this import is always
 import '#/styles.css'
 import '#/tailwind.css'
 import App from '$/App.vue'
+import { widgetDevtools } from '$/providers/openedProjects/widgetRegistry/devtools'
 import router from '$/router'
-import { widgetDevtools } from '@/providers/widgetRegistry/devtools'
 import * as sentry from '@sentry/vue'
 import type { Vue } from '@sentry/vue/types/types'
 import { VueQueryPlugin } from '@tanstack/vue-query'
diff --git a/app/gui/src/project-view/ProjectView.vue b/app/gui/src/project-view/ProjectView.vue
index db84e4e4d42d..0bc2d7efa7da 100644
--- a/app/gui/src/project-view/ProjectView.vue
+++ b/app/gui/src/project-view/ProjectView.vue
@@ -2,11 +2,11 @@
 import Backend, { ProjectId } from '#/services/Backend'
 import WithCurrentProject from '$/components/WithCurrentProject.vue'
 import { injectOpenedProjects } from '$/providers/openedProjects'
+import { type LsUrls } from '$/providers/openedProjects/project'
 import GraphEditor from '@/components/GraphEditor.vue'
 import { provideEventLogger } from '@/providers/eventLogging'
 import { provideProjectBackend } from '@/providers/projectBackend'
 import { provideVisibility } from '@/providers/visibility'
-import type { LsUrls } from '@/stores/project'
 import { provideSettings } from '@/stores/settings'
 import type { Opt } from '@/util/data/opt'
 import { useEventListener } from '@vueuse/core'
diff --git a/app/gui/src/project-view/components/CodeEditor/CodeEditorImpl.vue b/app/gui/src/project-view/components/CodeEditor/CodeEditorImpl.vue
index 66c5c5909e56..89b67da41fb3 100644
--- a/app/gui/src/project-view/components/CodeEditor/CodeEditorImpl.vue
+++ b/app/gui/src/project-view/components/CodeEditor/CodeEditorImpl.vue
@@ -1,9 +1,5 @@
 <script setup lang="ts">
-import {
-  useGraphStore,
-  useProjectStore,
-  useSuggestionDbStore,
-} from '$/components/WithCurrentProject.vue'
+import { useCurrentProject } from '$/components/WithCurrentProject.vue'
 import { useEnsoDiagnostics } from '@/components/CodeEditor/diagnostics'
 import { ensoSyntax } from '@/components/CodeEditor/ensoSyntax'
 import { useEnsoSourceSync } from '@/components/CodeEditor/sync'
@@ -26,9 +22,7 @@ import { highlightSelectionMatches } from '@codemirror/search'
 import { drawSelection, keymap } from '@codemirror/view'
 import { onMounted, toRef, useTemplateRef, type ComponentInstance } from 'vue'
 
-const projectStore = useProjectStore()
-const graphStore = useGraphStore()
-const suggestionDbStore = useSuggestionDbStore()
+const { store: project, suggestionDb, module, graph } = useCurrentProject().storesRefs
 
 const editorRoot = useTemplateRef<ComponentInstance<typeof CodeMirrorRoot>>('editorRoot')
 
@@ -47,8 +41,8 @@ const { editorView, setExtraExtensions } = useCodeMirror(editorRoot, {
     foldGutter(),
     lintGutter(),
     highlightSelectionMatches(),
-    ensoSyntax(toRef(graphStore, 'moduleRoot')),
-    ensoHoverTooltip(graphStore, suggestionDbStore, vueHost),
+    ensoSyntax(toRef(module.value, 'root')),
+    ensoHoverTooltip(graph, suggestionDb, vueHost),
     () => (editorRoot.value ? highlightStyle(editorRoot.value.highlightClasses) : []),
   ],
   vueHost: () => vueHost,
@@ -56,12 +50,8 @@ const { editorView, setExtraExtensions } = useCodeMirror(editorRoot, {
 })
 ;(window as any).__codeEditorApi = testSupport(editorView)
 useAutoBlur(editorView.dom)
-const { updateListener, connectModuleListener } = useEnsoSourceSync(
-  projectStore,
-  graphStore,
-  editorView,
-)
-const ensoDiagnostics = useEnsoDiagnostics(projectStore, graphStore, editorView)
+const { updateListener, connectModuleListener } = useEnsoSourceSync(project, module, editorView)
+const ensoDiagnostics = useEnsoDiagnostics(project, module, graph, editorView)
 setExtraExtensions([updateListener, ensoDiagnostics])
 connectModuleListener()
 
diff --git a/app/gui/src/project-view/components/CodeEditor/CodeEditorTooltip.vue b/app/gui/src/project-view/components/CodeEditor/CodeEditorTooltip.vue
index b0cfdb5e7701..e7862752041b 100644
--- a/app/gui/src/project-view/components/CodeEditor/CodeEditorTooltip.vue
+++ b/app/gui/src/project-view/components/CodeEditor/CodeEditorTooltip.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { useCurrentProject } from '$/components/WithCurrentProject.vue'
-import type { NodeId } from '@/stores/graph'
-import type { GraphDb } from '@/stores/graph/graphDatabase'
-import type { SuggestionDbStore } from '@/stores/suggestionDatabase'
+import type { NodeId } from '$/providers/openedProjects/graph'
+import type { GraphDb } from '$/providers/openedProjects/graph/graphDatabase'
+import type { SuggestionDbStore } from '$/providers/openedProjects/suggestionDatabase'
 import { computed } from 'vue'
 
 const { nodeId, syntax, graphDb, suggestionDbStore } = defineProps<{
diff --git a/app/gui/src/project-view/components/CodeEditor/diagnostics.ts b/app/gui/src/project-view/components/CodeEditor/diagnostics.ts
index 8f24a1f042c3..a71cf5bdd54c 100644
--- a/app/gui/src/project-view/components/CodeEditor/diagnostics.ts
+++ b/app/gui/src/project-view/components/CodeEditor/diagnostics.ts
@@ -1,13 +1,14 @@
-import type { GraphStore } from '@/stores/graph'
-import type { ProjectStore } from '@/stores/project'
-import type { ComputedValueRegistry } from '@/stores/project/computedValueRegistry'
+import type { GraphStore } from '$/providers/openedProjects/graph'
+import type { ModuleStore } from '$/providers/openedProjects/module'
+import type { ProjectStore } from '$/providers/openedProjects/project'
+import type { ComputedValueRegistry } from '$/providers/openedProjects/project/computedValueRegistry'
 import { valueExt, type ValueExt } from '@/util/codemirror/stateEffect'
 import type { ToValue } from '@/util/reactivity'
 import { forceLinting, linter, type Diagnostic } from '@codemirror/lint'
 import type { Extension } from '@codemirror/state'
 import type { EditorView } from '@codemirror/view'
 import * as iter from 'enso-common/src/utilities/data/iter'
-import { computed, toValue, watchEffect, type ComputedRef } from 'vue'
+import { computed, toValue, watchEffect, type ComputedRef, type Ref } from 'vue'
 import type { Diagnostic as LSDiagnostic } from 'ydoc-shared/languageServerTypes'
 import type { SourceRange } from 'ydoc-shared/util/data/text'
 import type { ExternalId } from 'ydoc-shared/yjsModel'
@@ -17,13 +18,14 @@ import type { ExternalId } from 'ydoc-shared/yjsModel'
  * based on dataflow errors and diagnostics the LS provided in an `executionStatus` message.
  */
 export function useEnsoDiagnostics(
-  projectStore: Pick<ProjectStore, 'computedValueRegistry' | 'dataflowErrors' | 'diagnostics'>,
-  graphStore: Pick<GraphStore, 'moduleSource' | 'db'>,
+  projectStore: Ref<Pick<ProjectStore, 'computedValueRegistry' | 'dataflowErrors' | 'diagnostics'>>,
+  moduleStore: Ref<Pick<ModuleStore, 'source'>>,
+  graphStore: Ref<Pick<GraphStore, 'db'>>,
   view: EditorView,
 ): Extension {
   function spanOfExternalId(externalId: ExternalId): SourceRange | undefined {
-    const astId = graphStore.db.idFromExternal(externalId)
-    return astId && graphStore.moduleSource.getSpan(astId)
+    const astId = graphStore.value.db.idFromExternal(externalId)
+    return astId && moduleStore.value.source.getSpan(astId)
   }
   return [
     reactiveDiagnostics(
@@ -31,9 +33,9 @@ export function useEnsoDiagnostics(
       expressionUpdateDiagnostics,
       useExpressionUpdateDiagnostics({
         spanOfExternalId,
-        computedValueDb: projectStore.computedValueRegistry.db,
+        computedValueDb: () => projectStore.value.computedValueRegistry.db,
         getDataflowError: (externalId: ExternalId) =>
-          projectStore.dataflowErrors.lookup(externalId)?.value?.message,
+          projectStore.value.dataflowErrors.lookup(externalId)?.value?.message,
       }),
     ),
     reactiveDiagnostics(
@@ -41,7 +43,7 @@ export function useEnsoDiagnostics(
       executionContextDiagnostics,
       useExecutionContextDiagnostics({
         spanOfExternalId,
-        lsDiagnostics: () => projectStore.diagnostics,
+        lsDiagnostics: () => projectStore.value.diagnostics,
       }),
     ),
   ]
@@ -74,15 +76,16 @@ function useExpressionUpdateDiagnostics({
   getDataflowError,
 }: {
   spanOfExternalId: (externalId: ExternalId) => SourceRange | undefined
-  computedValueDb: ComputedValueRegistry['db']
+  computedValueDb: ToValue<ComputedValueRegistry['db']>
   getDataflowError: (externalId: ExternalId) => string | undefined
 }): ComputedRef<Diagnostic[]> {
   return computed<Diagnostic[]>(() => {
-    const panics = computedValueDb.type.reverseLookup('Panic')
-    const errors = computedValueDb.type.reverseLookup('DataflowError')
+    const db = toValue(computedValueDb)
+    const panics = db.type.reverseLookup('Panic')
+    const errors = db.type.reverseLookup('DataflowError')
     const diagnostics: Diagnostic[] = []
     for (const externalId of iter.chain(panics, errors)) {
-      const update = computedValueDb.get(externalId)
+      const update = db.get(externalId)
       if (!update) continue
       const span = spanOfExternalId(externalId)
       if (!span) continue
diff --git a/app/gui/src/project-view/components/CodeEditor/sync.ts b/app/gui/src/project-view/components/CodeEditor/sync.ts
index d06f1c6de4a4..b427d560e1ba 100644
--- a/app/gui/src/project-view/components/CodeEditor/sync.ts
+++ b/app/gui/src/project-view/components/CodeEditor/sync.ts
@@ -1,6 +1,7 @@
-import type { GraphStore } from '@/stores/graph'
-import type { ProjectStore } from '@/stores/project'
+import type { ModuleStore } from '$/providers/openedProjects/module'
+import type { ProjectStore } from '$/providers/openedProjects/project'
 import { changeSetToTextEdits } from '@/util/codemirror/text'
+import { Err, Ok } from '@/util/data/result'
 import { useToast } from '@/util/toast'
 import {
   Annotation,
@@ -11,20 +12,17 @@ import {
 } from '@codemirror/state'
 import { EditorView } from '@codemirror/view'
 import { createDebouncer } from 'lib0/eventloop'
-import { onUnmounted, watch } from 'vue'
-import { textChangeToEdits, type SourceRangeEdit } from 'ydoc-shared/util/data/text'
-import type { Origin } from 'ydoc-shared/yjsModel'
+import { onUnmounted, type Ref, watch } from 'vue'
+import { type SourceRangeEdit, textChangeToEdits } from 'ydoc-shared/util/data/text'
+import { type Origin } from 'ydoc-shared/yjsModel'
 
 // Indicates a change updating the text to correspond to the given module state.
 const synchronizedModule = Annotation.define<true>()
 
 /** @returns A CodeMirror Extension that synchronizes the editor state with the AST of an Enso module. */
 export function useEnsoSourceSync(
-  projectStore: Pick<ProjectStore, 'module'>,
-  graphStore: Pick<
-    GraphStore,
-    'moduleSource' | 'viewModule' | 'startEdit' | 'commitEdit' | 'onBeforeEdit'
-  >,
+  projectStore: Ref<Pick<ProjectStore, 'module'>>,
+  moduleStore: Ref<Pick<ModuleStore, 'source' | 'ast' | 'edit' | 'onBeforeEdit'>>,
   editorView: EditorView,
 ) {
   let pendingChanges:
@@ -60,7 +58,7 @@ export function useEnsoSourceSync(
   function resetView() {
     pendingChanges = undefined
     const viewText = editorView.state.doc.toString()
-    const code = graphStore.moduleSource.text
+    const code = moduleStore.value.source.text
     const changes = textChangeToEdits(viewText, code)
     console.info('Resetting the editor to the module code.', changes)
     editorView.dispatch({
@@ -76,16 +74,24 @@ export function useEnsoSourceSync(
     pendingChanges = undefined
     const edits = changeSetToTextEdits(changes)
     try {
-      const editedModule = graphStore.startEdit()
-      editedModule.applyTextEdits(edits, graphStore.viewModule)
-      if (editedModule.root()?.code() === editorView.state.doc.toString()) {
-        graphStore.commitEdit(editedModule, undefined, 'local:userAction:CodeEditor')
-        return
+      const result = moduleStore.value.edit(
+        (editedModule) => {
+          editedModule.applyTextEdits(edits, moduleStore.value.ast)
+          if (editedModule.root()?.code() === editorView.state.doc.toString()) {
+            return Ok()
+          } else
+            return Err({
+              expected: editorView.state.doc.toString(),
+              got: editedModule.root()?.code(),
+            })
+        },
+        { origin: 'local:userAction:CodeEditor' },
+      )
+
+      if (result.ok) return
+      else {
+        console.error(`Unable to apply source code edit.`, result.error.payload)
       }
-      console.error(`Unable to apply source code edit.`, {
-        expected: editorView.state.doc.toString(),
-        got: editedModule.root()?.code(),
-      })
     } catch (error) {
       console.error(`Code Editor failed to modify module`, error)
     }
@@ -95,7 +101,7 @@ export function useEnsoSourceSync(
       selection: selectionBefore,
       annotations: synchronizedModule.of(true),
     })
-    if (graphStore.moduleSource.text !== editorView.state.doc.toString()) {
+    if (moduleStore.value.source.text !== editorView.state.doc.toString()) {
       console.warn('Unexpected: Applying inverted edit did not yield original module source')
       resetView()
     }
@@ -121,14 +127,14 @@ export function useEnsoSourceSync(
   function connectModuleListener() {
     let cleanup: (() => void) | undefined = undefined
     watch(
-      () => projectStore.module,
+      () => projectStore.value.module,
       (module, _oldValue, onCleanup) => {
         if (!module) return
-        const beforeEditHandler = graphStore.onBeforeEdit(beforeSourceChange)
-        graphStore.moduleSource.observe(observeSourceChange)
+        const beforeEditHandler = moduleStore.value.onBeforeEdit(beforeSourceChange)
+        moduleStore.value.source.observe(observeSourceChange)
         cleanup = () => {
           beforeEditHandler?.unregister()
-          graphStore.moduleSource.unobserve(observeSourceChange)
+          moduleStore.value.source.unobserve(observeSourceChange)
           cleanup = undefined
         }
         onCleanup(cleanup)
diff --git a/app/gui/src/project-view/components/CodeEditor/tooltips.ts b/app/gui/src/project-view/components/CodeEditor/tooltips.ts
index 43a7a5e18ea6..8da6ff45cc46 100644
--- a/app/gui/src/project-view/components/CodeEditor/tooltips.ts
+++ b/app/gui/src/project-view/components/CodeEditor/tooltips.ts
@@ -1,8 +1,8 @@
+import { type GraphStore } from '$/providers/openedProjects/graph'
+import { type SuggestionDbStore } from '$/providers/openedProjects/suggestionDatabase'
 import CodeEditorTooltip from '@/components/CodeEditor/CodeEditorTooltip.vue'
 import { astProp } from '@/components/CodeEditor/ensoSyntax'
-import type { VueHost } from '@/components/VueHostRender.vue'
-import type { GraphStore } from '@/stores/graph'
-import type { SuggestionDbStore } from '@/stores/suggestionDatabase'
+import { type VueHost } from '@/components/VueHostRender.vue'
 import { Ast } from '@/util/ast'
 import type { ToValue } from '@/util/reactivity'
 import { syntaxTree } from '@codemirror/language'
@@ -51,8 +51,8 @@ function codeEditorTooltip(vueHost: VueHost, props: typeof CodeEditorTooltip.pro
 
 /** @returns A CodeMirror extension that creates tooltips containing type and syntax information for Enso code. */
 export function ensoHoverTooltip(
-  graphStore: Pick<GraphStore, 'moduleSource' | 'db'>,
-  suggestionDbStore: SuggestionDbStore,
+  graphStore: ToValue<Pick<GraphStore, 'db'>>,
+  suggestionDbStore: ToValue<SuggestionDbStore>,
   vueHost: ToValue<VueHost | undefined>,
 ) {
   return hoverTooltip((syn) => {
@@ -61,14 +61,15 @@ export function ensoHoverTooltip(
       console.error('Cannot render tooltip without Vue host.')
       return
     }
+    const graph = toValue(graphStore)
     const enclosingAstNodes = iter.map(syntaxNodeAncestors(syn), (syn) => syn.tree?.prop(astProp))
     const enclosingAsts = iter.filter(enclosingAstNodes, (node) => node instanceof Ast.Ast)
     const enclosingExternalIds = iter.map(enclosingAsts, ({ externalId }) => externalId)
-    const nodeId = iter.find(enclosingExternalIds, graphStore.db.isNodeId.bind(graphStore.db))
+    const nodeId = iter.find(enclosingExternalIds, graph.db.isNodeId.bind(graph.db))
     return codeEditorTooltip(vueHostValue, {
       nodeId,
       syntax: syn.name,
-      graphDb: graphStore.db,
+      graphDb: graph.db,
       suggestionDbStore,
     })
   })
diff --git a/app/gui/src/project-view/components/ColorPickerMenu.vue b/app/gui/src/project-view/components/ColorPickerMenu.vue
index cb324ed5990b..09242aad119e 100644
--- a/app/gui/src/project-view/components/ColorPickerMenu.vue
+++ b/app/gui/src/project-view/components/ColorPickerMenu.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import { useGraphStore } from '$/components/WithCurrentProject.vue'
+import { useCurrentProject } from '$/components/WithCurrentProject.vue'
+import { type NodeId } from '$/providers/openedProjects/graph'
 import ColorRing from '@/components/ColorRing.vue'
 import { injectNodeColors } from '@/providers/graphNodeColors'
 import { injectGraphSelection } from '@/providers/graphSelection'
-import type { NodeId } from '@/stores/graph'
 import * as iter from 'enso-common/src/utilities/data/iter'
 import { ref } from 'vue'
 
@@ -13,7 +13,7 @@ const emit = defineEmits<{
 
 const { getNodeColor, getNodeColors } = injectNodeColors()
 const selection = injectGraphSelection()
-const graphStore = useGraphStore()
+const { module, graph } = useCurrentProject().storesRefs
 
 const displayedColors = new Set<string>(
   iter.filterDefined(iter.map(selection.selected, getNodeColor)),
@@ -24,16 +24,16 @@ const editedNodeInitialColors = new Map<NodeId, string | undefined>()
 
 function setColor(color: string | undefined) {
   currentColor.value = color
-  graphStore.batchEdits(() => {
+  module.value.batchEdits(() => {
     if (color) {
       for (const node of selection.selected) {
         if (!editedNodeInitialColors.has(node))
-          editedNodeInitialColors.set(node, graphStore.getNodeColorOverride(node))
-        graphStore.overrideNodeColor(node, color)
+          editedNodeInitialColors.set(node, graph.value.getNodeColorOverride(node))
+        graph.value.overrideNodeColor(node, color)
       }
     } else {
       for (const [node, color] of editedNodeInitialColors.entries())
-        graphStore.overrideNodeColor(node, color)
+        graph.value.overrideNodeColor(node, color)
     }
   })
 }
diff --git a/app/gui/src/project-view/components/ComponentBrowser.vue b/app/gui/src/project-view/components/ComponentBrowser.vue
index 0d2faf7bc071..8b99162611a7 100644
--- a/app/gui/src/project-view/components/ComponentBrowser.vue
+++ b/app/gui/src/project-view/components/ComponentBrowser.vue
@@ -4,6 +4,8 @@ import {
   useProjectNames,
   useSuggestionDbStore,
 } from '$/components/WithCurrentProject.vue'
+import type { RequiredImport } from '$/providers/openedProjects/module/imports'
+import { type Typename } from '$/providers/openedProjects/suggestionDatabase/entry'
 import { componentBrowserBindings, listBindings } from '@/bindings'
 import ActionButton from '@/components/ActionButton.vue'
 import type { Component } from '@/components/ComponentBrowser/component'
@@ -17,8 +19,6 @@ import { groupColorStyle } from '@/composables/nodeColors'
 import { registerHandlers, toggledAction, type Action } from '@/providers/action'
 import { injectNodeColors } from '@/providers/graphNodeColors'
 import { injectInteractionHandler, type Interaction } from '@/providers/interactionHandler'
-import type { RequiredImport } from '@/stores/graph/imports'
-import type { Typename } from '@/stores/suggestionDatabase/entry'
 import type { VisualizationDataSource } from '@/stores/visualization'
 import { isNodeOutside, targetIsOutside } from '@/util/autoBlur'
 import { tryGetIndex } from '@/util/data/array'
diff --git a/app/gui/src/project-view/components/ComponentBrowser/ComponentEditorLabel.vue b/app/gui/src/project-view/components/ComponentBrowser/ComponentEditorLabel.vue
index a370f4c13d55..e61250e7391f 100644
--- a/app/gui/src/project-view/components/ComponentBrowser/ComponentEditorLabel.vue
+++ b/app/gui/src/project-view/components/ComponentBrowser/ComponentEditorLabel.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
+import { TypeInfo } from '$/providers/openedProjects/project/computedValueRegistry'
 import TooltipTrigger from '@/components/TooltipTrigger.vue'
-import { TypeInfo } from '@/stores/project/computedValueRegistry'
 import { qnLastSegment } from '@/util/qualifiedName'
 import { computed } from 'vue'
 
diff --git a/app/gui/src/project-view/components/ComponentBrowser/__tests__/component.test.ts b/app/gui/src/project-view/components/ComponentBrowser/__tests__/component.test.ts
index c596500549c6..69e29941ddf1 100644
--- a/app/gui/src/project-view/components/ComponentBrowser/__tests__/component.test.ts
+++ b/app/gui/src/project-view/components/ComponentBrowser/__tests__/component.test.ts
@@ -1,3 +1,12 @@
+import { TypeInfo } from '$/providers/openedProjects/project/computedValueRegistry'
+import { SuggestionDb } from '$/providers/openedProjects/suggestionDatabase'
+import {
+  makeConstructor,
+  makeMethod,
+  makeModule,
+  makeModuleMethod,
+  makeStaticMethod,
+} from '$/providers/openedProjects/suggestionDatabase/mockSuggestion'
 import {
   compareSuggestions,
   labelOfEntry,
@@ -6,15 +15,6 @@ import {
   type MatchedSuggestion,
 } from '@/components/ComponentBrowser/component'
 import { Filtering } from '@/components/ComponentBrowser/filtering'
-import { TypeInfo } from '@/stores/project/computedValueRegistry'
-import { SuggestionDb } from '@/stores/suggestionDatabase'
-import {
-  makeConstructor,
-  makeMethod,
-  makeModule,
-  makeModuleMethod,
-  makeStaticMethod,
-} from '@/stores/suggestionDatabase/mockSuggestion'
 import { allRanges } from '@/util/data/range'
 import { ProjectPath, stdPath } from '@/util/projectPath'
 import { QualifiedName } from '@/util/qualifiedName'
diff --git a/app/gui/src/project-view/components/ComponentBrowser/__tests__/filtering.bench.ts b/app/gui/src/project-view/components/ComponentBrowser/__tests__/filtering.bench.ts
index 9e9bcb635de7..588b12f4a16d 100644
--- a/app/gui/src/project-view/components/ComponentBrowser/__tests__/filtering.bench.ts
+++ b/app/gui/src/project-view/components/ComponentBrowser/__tests__/filtering.bench.ts
@@ -1,8 +1,8 @@
+import { TypeInfo } from '$/providers/openedProjects/project/computedValueRegistry'
+import { mockProjectNameStore } from '$/providers/openedProjects/projectNames'
+import { SuggestionDb } from '$/providers/openedProjects/suggestionDatabase'
+import { SuggestionUpdateProcessor } from '$/providers/openedProjects/suggestionDatabase/lsUpdate'
 import { Filtering } from '@/components/ComponentBrowser/filtering'
-import { TypeInfo } from '@/stores/project/computedValueRegistry'
-import { mockProjectNameStore } from '@/stores/projectNames'
-import { SuggestionDb } from '@/stores/suggestionDatabase'
-import { SuggestionUpdateProcessor } from '@/stores/suggestionDatabase/lsUpdate'
 import { stdPath } from '@/util/projectPath'
 import fs from 'fs'
 import { bench, describe, expect } from 'vitest'
diff --git a/app/gui/src/project-view/components/ComponentBrowser/__tests__/filtering.test.ts b/app/gui/src/project-view/components/ComponentBrowser/__tests__/filtering.test.ts
index a6e668b3f993..265901d7fec5 100644
--- a/app/gui/src/project-view/components/ComponentBrowser/__tests__/filtering.test.ts
+++ b/app/gui/src/project-view/components/ComponentBrowser/__tests__/filtering.test.ts
@@ -1,7 +1,6 @@
-import { Filtering, type MatchResult } from '@/components/ComponentBrowser/filtering'
-import { TypeInfo } from '@/stores/project/computedValueRegistry'
-import { SuggestionDb } from '@/stores/suggestionDatabase'
-import type { SuggestionEntry } from '@/stores/suggestionDatabase/entry'
+import { TypeInfo } from '$/providers/openedProjects/project/computedValueRegistry'
+import { SuggestionDb } from '$/providers/openedProjects/suggestionDatabase'
+import { type SuggestionEntry } from '$/providers/openedProjects/suggestionDatabase/entry'
 import {
   makeConstructor,
   makeFunction,
@@ -10,7 +9,8 @@ import {
   makeModule,
   makeModuleMethod,
   makeStaticMethod,
-} from '@/stores/suggestionDatabase/mockSuggestion'
+} from '$/providers/openedProjects/suggestionDatabase/mockSuggestion'
+import { Filtering, type MatchResult } from '@/components/ComponentBrowser/filtering'
 import { stdPath } from '@/util/projectPath'
 import { qnLastSegment } from '@/util/qualifiedName'
 import { describe, expect, test } from 'vitest'
diff --git a/app/gui/src/project-view/components/ComponentBrowser/__tests__/input.test.ts b/app/gui/src/project-view/components/ComponentBrowser/__tests__/input.test.ts
index 0ce0953e964b..80309fc05293 100644
--- a/app/gui/src/project-view/components/ComponentBrowser/__tests__/input.test.ts
+++ b/app/gui/src/project-view/components/ComponentBrowser/__tests__/input.test.ts
@@ -1,8 +1,11 @@
+import {
+  ComputedValueRegistry,
+  TypeInfo,
+} from '$/providers/openedProjects/project/computedValueRegistry'
+import { SuggestionDb } from '$/providers/openedProjects/suggestionDatabase'
+import { makeMethod, makeType } from '$/providers/openedProjects/suggestionDatabase/mockSuggestion'
 import { useComponentBrowserInput } from '@/components/ComponentBrowser/input'
 import { GraphDb, NodeId } from '@/stores/graph/graphDatabase'
-import { ComputedValueRegistry, TypeInfo } from '@/stores/project/computedValueRegistry'
-import { SuggestionDb } from '@/stores/suggestionDatabase'
-import { makeMethod, makeType } from '@/stores/suggestionDatabase/mockSuggestion'
 import { stdPath } from '@/util/projectPath'
 import { expect, test } from 'vitest'
 import { assert, assertUnreachable } from 'ydoc-shared/util/assert'
diff --git a/app/gui/src/project-view/components/ComponentBrowser/ai.ts b/app/gui/src/project-view/components/ComponentBrowser/ai.ts
index 74588d1dc4ea..f8cf1c41875f 100644
--- a/app/gui/src/project-view/components/ComponentBrowser/ai.ts
+++ b/app/gui/src/project-view/components/ComponentBrowser/ai.ts
@@ -1,5 +1,5 @@
 import { useGraphStore, useProjectStore } from '$/components/WithCurrentProject.vue'
-import type { GraphDb } from '@/stores/graph/graphDatabase'
+import type { GraphDb } from '$/providers/openedProjects/graph/graphDatabase'
 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'
diff --git a/app/gui/src/project-view/components/ComponentBrowser/component.ts b/app/gui/src/project-view/components/ComponentBrowser/component.ts
index f32b768c048d..f420e2cff8d7 100644
--- a/app/gui/src/project-view/components/ComponentBrowser/component.ts
+++ b/app/gui/src/project-view/components/ComponentBrowser/component.ts
@@ -1,12 +1,12 @@
-import { Filtering, type MatchResult } from '@/components/ComponentBrowser/filtering'
-import { SuggestionDb } from '@/stores/suggestionDatabase'
+import { SuggestionDb } from '$/providers/openedProjects/suggestionDatabase'
 import {
   entryDisplayPath,
   entryIsStatic,
   SuggestionKind,
   type SuggestionEntry,
   type SuggestionId,
-} from '@/stores/suggestionDatabase/entry'
+} from '$/providers/openedProjects/suggestionDatabase/entry'
+import { Filtering, type MatchResult } from '@/components/ComponentBrowser/filtering'
 import { compareOpt } from '@/util/compare'
 import { isSome } from '@/util/data/opt'
 import { displayedIconOf } from '@/util/getIconName'
diff --git a/app/gui/src/project-view/components/ComponentBrowser/filtering.ts b/app/gui/src/project-view/components/ComponentBrowser/filtering.ts
index bc2906d73cd0..8523ec974720 100644
--- a/app/gui/src/project-view/components/ComponentBrowser/filtering.ts
+++ b/app/gui/src/project-view/components/ComponentBrowser/filtering.ts
@@ -1,6 +1,9 @@
-import { TypeInfo } from '@/stores/project/computedValueRegistry'
-import { SuggestionDb } from '@/stores/suggestionDatabase'
-import { SuggestionKind, type SuggestionEntry } from '@/stores/suggestionDatabase/entry'
+import { TypeInfo } from '$/providers/openedProjects/project/computedValueRegistry'
+import { SuggestionDb } from '$/providers/openedProjects/suggestionDatabase'
+import {
+  SuggestionKind,
+  type SuggestionEntry,
+} from '$/providers/openedProjects/suggestionDatabase/entry'
 import { ANY_TYPE } from '@/util/ensoTypes'
 import type { ProjectPath } from '@/util/projectPath'
 import { qnLastSegment } from '@/util/qualifiedName'
diff --git a/app/gui/src/project-view/components/ComponentBrowser/input.ts b/app/gui/src/project-view/components/ComponentBrowser/input.ts
index 57e048e8218a..4809105f6856 100644
--- a/app/gui/src/project-view/components/ComponentBrowser/input.ts
+++ b/app/gui/src/project-view/components/ComponentBrowser/input.ts
@@ -1,10 +1,12 @@
-import { useGraphStore, useSuggestionDbStore } from '$/components/WithCurrentProject.vue'
-import { useAI } from '@/components/ComponentBrowser/ai'
-import type { Filter, SelfArg } from '@/components/ComponentBrowser/filtering'
-import type { NodeId } from '@/stores/graph'
-import type { GraphDb } from '@/stores/graph/graphDatabase'
-import { requiredImportEquals, requiredImports, type RequiredImport } from '@/stores/graph/imports'
-import type { SuggestionDb } from '@/stores/suggestionDatabase'
+import { useCurrentProject } from '$/components/WithCurrentProject.vue'
+import { type NodeId } from '$/providers/openedProjects/graph'
+import type { GraphDb } from '$/providers/openedProjects/graph/graphDatabase'
+import {
+  requiredImportEquals,
+  requiredImports,
+  type RequiredImport,
+} from '$/providers/openedProjects/module/imports'
+import { type SuggestionDb } from '$/providers/openedProjects/suggestionDatabase'
 import {
   entryDisplayOwner,
   entryDisplayPath,
@@ -12,16 +14,18 @@ import {
   entryIsStatic,
   type SuggestionEntry,
   type SuggestionId,
-} from '@/stores/suggestionDatabase/entry'
+} from '$/providers/openedProjects/suggestionDatabase/entry'
+import { useAI } from '@/components/ComponentBrowser/ai'
+import type { Filter, SelfArg } from '@/components/ComponentBrowser/filtering'
 import { Ast } from '@/util/ast'
 import { selfArgSeparator } from '@/util/ast/abstract'
 import { Err, Ok, type Result } from '@/util/data/result'
 import { ANY_TYPE } from '@/util/ensoTypes'
 import type { ProjectPath } from '@/util/projectPath'
 import { qnLastSegment } from '@/util/qualifiedName'
-import { proxyRefs } from '@/util/reactivity'
+import { proxyRefs, type ToValue } from '@/util/reactivity'
 import { useToast } from '@/util/toast'
-import { computed, readonly, ref, shallowRef, type ComputedRef } from 'vue'
+import { computed, readonly, ref, shallowRef, toValue, type ComputedRef } from 'vue'
 import { Range } from 'ydoc-shared/util/data/range'
 
 /** Information how the component browser is used, needed for proper input initializing. */
@@ -53,8 +57,8 @@ export type ComponentBrowserMode =
 
 /** Component Browser Input Data */
 export function useComponentBrowserInput(
-  graphDb: GraphDb = useGraphStore().db,
-  suggestionDb: SuggestionDb = useSuggestionDbStore().entries,
+  graphDb: ToValue<GraphDb> = () => useCurrentProject().ref.value.graph.db,
+  suggestionDb: ToValue<SuggestionDb> = () => useCurrentProject().ref.value.suggestionDb.entries,
   ai: { query(query: string, sourcePort: string): Promise<Result<string>> } = useAI(),
 ) {
   const text = ref('')
@@ -138,17 +142,19 @@ export function useComponentBrowserInput(
 
   const sourceNodeType = computed<SelfArg | null>(() => {
     if (!sourceNodeIdentifier.value) return null
-    const definition = graphDb.getIdentDefiningNode(sourceNodeIdentifier.value)
+    const graphDbValue = toValue(graphDb)
+    const definition = graphDbValue.getIdentDefiningNode(sourceNodeIdentifier.value)
     if (definition == null) return null
-    const info = graphDb.getExpressionInfo(definition)
+    const info = graphDbValue.getExpressionInfo(definition)
     if (info == null || info.typeInfo == null) return { type: 'unknown' }
-    const ancestors = [...info.typeInfo.ancestors(suggestionDb)]
+    const ancestors = [...info.typeInfo.ancestors(toValue(suggestionDb))]
     return { type: 'known', typeInfo: info.typeInfo, ancestors }
   })
 
   /** Apply given suggested entry to the input. */
   function applySuggestion(id: SuggestionId, suffix: string | undefined): Result {
-    const entry = suggestionDb.get(id)
+    const suggestionDbValue = toValue(suggestionDb)
+    const entry = suggestionDbValue.get(id)
     if (!entry) return Err(`No entry with id ${id}`)
     switchedToCodeMode.value = { appliedSuggestion: entry }
     const { newText, requiredImport } = inputAfterApplyingSuggestion(entry)
@@ -156,15 +162,15 @@ export function useComponentBrowserInput(
     text.value = newTextWithSuffix
     selection.value = Range.emptyAt(newTextWithSuffix.length)
     if (requiredImport) {
-      const importId = suggestionDb.findByProjectPath(requiredImport)
+      const importId = suggestionDbValue.findByProjectPath(requiredImport)
       if (importId) {
-        const requiredEntry = suggestionDb.get(importId)
+        const requiredEntry = suggestionDbValue.get(importId)
         if (requiredEntry) {
-          imports.value = imports.value.concat(requiredImports(suggestionDb, requiredEntry))
+          imports.value = imports.value.concat(requiredImports(suggestionDbValue, requiredEntry))
         }
       }
     } else {
-      imports.value = imports.value.concat(requiredImports(suggestionDb, entry))
+      imports.value = imports.value.concat(requiredImports(suggestionDbValue, entry))
     }
     return Ok()
   }
@@ -232,10 +238,11 @@ export function useComponentBrowserInput(
   }
 
   function reset(usage: Usage) {
+    const graphDbValue = toValue(graphDb)
     switch (usage.type) {
       case 'newNode':
         if (usage.sourcePort) {
-          const ident = graphDb.getOutputPortIdentifier(usage.sourcePort)
+          const ident = graphDbValue.getOutputPortIdentifier(usage.sourcePort)
           sourceNodeIdentifier.value = ident != null && Ast.isIdentifier(ident) ? ident : undefined
         } else {
           sourceNodeIdentifier.value = undefined
@@ -245,7 +252,7 @@ export function useComponentBrowserInput(
         break
       case 'editNode': {
         const parsed = extractSourceNode(
-          graphDb.nodeIdToNode.get(usage.node)?.innerExpr.code() ?? '',
+          graphDbValue.nodeIdToNode.get(usage.node)?.innerExpr.code() ?? '',
         )
         text.value = parsed.text
         sourceNodeIdentifier.value = parsed.sourceNodeIdentifier
@@ -265,7 +272,7 @@ export function useComponentBrowserInput(
       matchedSource != null &&
       Ast.isIdentifier(matchedSource) &&
       matchedCode != null &&
-      graphDb.getIdentDefiningNode(matchedSource)
+      toValue(graphDb).getIdentDefiningNode(matchedSource)
     )
       return {
         text: matchedCode,
diff --git a/app/gui/src/project-view/components/ComponentHelp.vue b/app/gui/src/project-view/components/ComponentHelp.vue
index b8a3c73cab26..2e1467cd44bb 100644
--- a/app/gui/src/project-view/components/ComponentHelp.vue
+++ b/app/gui/src/project-view/components/ComponentHelp.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
 import { useCurrentProject } from '$/components/WithCurrentProject.vue'
+import type { SuggestionId } from '$/providers/openedProjects/suggestionDatabase/entry'
+import { suggestionDocumentationUrl } from '$/providers/openedProjects/suggestionDatabase/entry'
 import Breadcrumbs, {
   type Item as Breadcrumb,
 } from '@/components/ComponentHelp/DocsBreadcrumbs.vue'
@@ -11,8 +13,6 @@ import { lookupDocumentation, placeholder } from '@/components/ComponentHelp/ir'
 import MarkdownEditor from '@/components/MarkdownEditor.vue'
 import SvgButton from '@/components/SvgButton.vue'
 import { groupColorStyle } from '@/composables/nodeColors'
-import type { SuggestionId } from '@/stores/suggestionDatabase/entry'
-import { suggestionDocumentationUrl } from '@/stores/suggestionDatabase/entry'
 import { tryGetIndex } from '@/util/data/array'
 import type { Opt } from '@/util/data/opt'
 import type { Icon as IconName } from '@/util/iconMetadata/iconName'
@@ -30,7 +30,7 @@ const documentation = computed<Docs>(() => {
   if (props.aiMode)
     return placeholder('AI assistant mode: write query in natural language and press Enter.')
   const entry = props.selectedEntry
-  return entry && db.value ?
+  return entry ?
       lookupDocumentation(db.value.entries, entry)
     : placeholder('No suggestion selected.')
 })
@@ -74,11 +74,11 @@ const name = computed<Opt<ProjectPath>>(() => {
 // === Breadcrumbs ===
 
 const suggestion = computed(() =>
-  props.selectedEntry != null && db.value ? db.value.entries.get(props.selectedEntry) : undefined,
+  props.selectedEntry != null ? db.value.entries.get(props.selectedEntry) : undefined,
 )
 
 const color = computed(() =>
-  groupColorStyle(db.value && tryGetIndex(db.value.groups, suggestion.value?.groupIndex)),
+  groupColorStyle(tryGetIndex(db.value.groups, suggestion.value?.groupIndex)),
 )
 
 const style = computed(() => ({
@@ -112,7 +112,7 @@ watch(historyStack.current, (current) => {
 })
 
 const breadcrumbs = computed<Breadcrumb[]>(() => {
-  if (name.value && projectNames.value) {
+  if (name.value) {
     const segments = [...qnSegments(projectNames.value.printProjectPath(name.value))]
     return segments.slice(1).map((s) => ({ label: s.toLowerCase() }))
   } else {
diff --git a/app/gui/src/project-view/components/ComponentHelp/history.ts b/app/gui/src/project-view/components/ComponentHelp/history.ts
index f5466abcec64..b878f6ed2058 100644
--- a/app/gui/src/project-view/components/ComponentHelp/history.ts
+++ b/app/gui/src/project-view/components/ComponentHelp/history.ts
@@ -1,4 +1,4 @@
-import type { SuggestionId } from '@/stores/suggestionDatabase/entry'
+import type { SuggestionId } from '$/providers/openedProjects/suggestionDatabase/entry'
 import type { ComputedRef, Ref } from 'vue'
 import { computed, reactive, ref } from 'vue'
 
diff --git a/app/gui/src/project-view/components/ComponentHelp/ir.ts b/app/gui/src/project-view/components/ComponentHelp/ir.ts
index 6751827f8942..9b8450703036 100644
--- a/app/gui/src/project-view/components/ComponentHelp/ir.ts
+++ b/app/gui/src/project-view/components/ComponentHelp/ir.ts
@@ -1,7 +1,10 @@
-import type { SuggestionDb } from '@/stores/suggestionDatabase'
-import type { SuggestionEntry, SuggestionId } from '@/stores/suggestionDatabase/entry'
-import { SuggestionKind } from '@/stores/suggestionDatabase/entry'
-import type { ProjectPath } from '@/util/projectPath'
+import type { SuggestionDb } from '$/providers/openedProjects/suggestionDatabase'
+import type {
+  SuggestionEntry,
+  SuggestionId,
+} from '$/providers/openedProjects/suggestionDatabase/entry'
+import { SuggestionKind } from '$/providers/openedProjects/suggestionDatabase/entry'
+import { type ProjectPath } from '@/util/projectPath'
 import * as iter from 'enso-common/src/utilities/data/iter'
 import type { SuggestionEntryArgument } from 'ydoc-shared/languageServerTypes/suggestions'
 
diff --git a/app/gui/src/project-view/components/ComponentHelpPanel.vue b/app/gui/src/project-view/components/ComponentHelpPanel.vue
index 0568cf5e32e7..a542153d2251 100644
--- a/app/gui/src/project-view/components/ComponentHelpPanel.vue
+++ b/app/gui/src/project-view/components/ComponentHelpPanel.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import WithCurrentProject from '$/components/WithCurrentProject.vue'
 import { useContainerData } from '$/providers/container'
 import { useRightPanelData } from '$/providers/rightPanel'
 import ComponentHelp from '@/components/ComponentHelp.vue'
@@ -6,13 +7,13 @@ import { Err, Ok } from '@/util/data/result'
 import { ResultComponent } from '@/util/react'
 import { computed } from 'vue'
 
+const UNAVAILABLE_MESSAGE = 'Component help is available in Project View.'
+
 const container = useContainerData()
 const rightPanel = useRightPanelData()
 const displayedId = computed({
   get: () =>
-    rightPanel.context?.help != null ?
-      rightPanel.context.help.item
-    : Err('Component help is available in Project View.'),
+    rightPanel.context?.help != null ? rightPanel.context.help.item : Err(UNAVAILABLE_MESSAGE),
   set: (newSelection) => {
     rightPanel.updateContext(container.tab, (ctx) => {
       if (ctx.help == null) ctx.help = { item: newSelection, aiMode: false }
@@ -24,20 +25,25 @@ const displayedId = computed({
 </script>
 
 <template>
-  <ComponentHelp
-    v-if="displayedId?.ok"
-    :selectedEntry="displayedId.value"
-    :aiMode="rightPanel.context?.help?.aiMode ?? false"
-    @update:selectedEntry="displayedId = Ok($event)"
-  />
-  <!-- Specifying `<ResultComponent ... centered /> does not work with React components
+  <WithCurrentProject :id="rightPanel.focusedProject">
+    <ComponentHelp
+      v-if="displayedId?.ok"
+      :selectedEntry="displayedId.value"
+      :aiMode="rightPanel.context?.help?.aiMode ?? false"
+      @update:selectedEntry="displayedId = Ok($event)"
+    />
+    <!-- Specifying `<ResultComponent ... centered /> does not work with React components
       `="true"` must be there-->
-  <ResultComponent
-    v-else-if="!displayedId.ok"
-    status="info"
-    :title="`${displayedId.error.payload}`"
-    :centered="true"
-  />
+    <ResultComponent
+      v-else-if="!displayedId.ok"
+      status="info"
+      :title="`${displayedId.error.payload}`"
+      :centered="true"
+    />
+    <template #fallback>
+      <ResultComponent status="info" :title="UNAVAILABLE_MESSAGE" :centered="true" />
+    </template>
+  </WithCurrentProject>
 </template>
 
 <style scoped>
diff --git a/app/gui/src/project-view/components/ContextMenu.vue b/app/gui/src/project-view/components/ContextMenu.vue
index c5f4e61df486..a1d27688f99e 100644
--- a/app/gui/src/project-view/components/ContextMenu.vue
+++ b/app/gui/src/project-view/components/ContextMenu.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
+import { WidgetEditHandlerRoot } from '$/providers/openedProjects/widgetRegistry/editHandler'
 import ActionMenu from '@/components/ActionMenu.vue'
 import { unrefElement, useEvent, useResizeObserver } from '@/composables/events'
 import type { DisplayableActionName } from '@/providers/action'
 import { injectInteractionHandler } from '@/providers/interactionHandler'
-import { WidgetEditHandlerRoot } from '@/providers/widgetRegistry/editHandler'
 import { endOnClickOutside, targetIsOutside } from '@/util/autoBlur'
 import { autoUpdate, flip, shift, useFloating } from '@floating-ui/vue'
 import { computed, onMounted, ref, watch } from 'vue'
diff --git a/app/gui/src/project-view/components/DocumentationEditor.vue b/app/gui/src/project-view/components/DocumentationEditor.vue
deleted file mode 100644
index b5f037eb5082..000000000000
--- a/app/gui/src/project-view/components/DocumentationEditor.vue
+++ /dev/null
@@ -1,141 +0,0 @@
-<script setup lang="ts">
-import { useCurrentProject } from '$/components/WithCurrentProject.vue'
-import { useBackends } from '$/providers/backends'
-import { useRightPanelData } from '$/providers/rightPanel'
-import { useDocumentViewId } from '@/components/DocumentationEditor/documentViewId'
-import FunctionSignatureEditor from '@/components/FunctionSignatureEditor.vue'
-import MarkdownEditor from '@/components/MarkdownEditor.vue'
-import { providePopoverRoot } from '@/providers/popoverRoot'
-import { Ast } from '@/util/ast'
-import { parseModule } from '@/util/ast/abstract'
-import { useYTextSync } from '@/util/codemirror'
-import { editorPersistence } from '@/util/codemirror/persistence'
-import { Err, mapOk, Ok, unwrapOr } from '@/util/data/result'
-import { methodPointerEquals } from '@/util/methodPointer'
-import { ResultComponent } from '@/util/react'
-import { useQuery } from '@tanstack/vue-query'
-import { computed, useTemplateRef } from 'vue'
-
-const rightPanel = useRightPanelData()
-const currentProject = useCurrentProject()
-const projectId = computed(() => currentProject.id.value ?? rightPanel.focusedProject)
-const { backendForType } = useBackends()
-const backendForAsset = computed(() => {
-  if (rightPanel.context?.category == null) return null
-  return backendForType(rightPanel.context.category.backend)
-})
-
-const rootElement = useTemplateRef('rootElement')
-providePopoverRoot(rootElement)
-
-const fileContentsFromCloud = useQuery({
-  queryKey: computed(
-    () =>
-      [
-        backendForAsset.value?.type,
-        {
-          method: 'getFileContent',
-          projectId: projectId.value,
-        },
-      ] as const,
-  ),
-  enabled: computed(
-    () =>
-      currentProject.ref.value == null && backendForAsset.value != null && projectId.value != null,
-  ),
-  queryFn: ({ queryKey }) => {
-    const [, { projectId }] = queryKey
-    return projectId && backendForAsset.value?.getMainFileContent(projectId)
-  },
-})
-
-const currentMethodAst = computed(() => {
-  if (currentProject.ref.value) {
-    return mapOk(currentProject.ref.value.graph.currentMethod.ast, (ast) => ({
-      ast,
-      readOnly: false,
-    }))
-  } else if (fileContentsFromCloud.data != null) {
-    if (fileContentsFromCloud.error.value) return Err(fileContentsFromCloud.error.value)
-    if (fileContentsFromCloud.isLoading.value) return Err('Loading documentation...')
-    const code = fileContentsFromCloud.data.value
-    if (code) {
-      const module = parseModule(code)
-      const statement = Ast.findModuleMethod(module, 'main')?.statement
-      if (statement) return Ok({ ast: statement, readOnly: true })
-    }
-  }
-  return Err('No documentation available')
-})
-
-const currentMethodPointer = computed(
-  () =>
-    currentProject.ref.value &&
-    unwrapOr(currentProject.ref.value.graph.currentMethod.pointer, undefined),
-)
-const displaySignatureEditor = computed(
-  () =>
-    currentMethodPointer.value &&
-    currentProject.ref.value?.store.entryPoint &&
-    !methodPointerEquals(currentMethodPointer.value, currentProject.ref.value.store.entryPoint),
-)
-
-const editorMarkdown = computed(() =>
-  mapOk(currentMethodAst.value, ({ ast }) => ast.mutableDocumentationMarkdown()),
-)
-const editorContent = computed(() => unwrapOr(editorMarkdown.value, undefined))
-
-const { syncExt, connectSync } = useYTextSync(editorContent, 'local:userAction:DocEditor')
-const editorPersistenceExt = editorPersistence({
-  documentViewId: useDocumentViewId({
-    projectId,
-    methodPointer: () => unwrapOr(currentProject.ref.value?.graph.currentMethod.pointer, undefined),
-    view: 'DocumentationEditor',
-  }),
-  scroll: { y: true, x: false },
-})
-
-const extensions = [syncExt, editorPersistenceExt]
-</script>
-
-<template>
-  <div ref="rootElement" class="DocumentationEditor">
-    <MarkdownEditor
-      v-if="currentMethodAst.ok"
-      :extensions="extensions"
-      :readonly="currentMethodAst.value.readOnly"
-      contentTestId="documentation-editor-content"
-      scrollerTestId="documentation-editor-scroller"
-      :editorReadyCallback="connectSync"
-    >
-      <template #belowToolbar>
-        <FunctionSignatureEditor
-          v-if="displaySignatureEditor && currentMethodAst.ok"
-          :projectId="projectId"
-          :functionAst="currentMethodAst.value.ast"
-          :methodPointer="currentMethodPointer"
-        />
-      </template>
-    </MarkdownEditor>
-    <!-- Specifying `<ResultComponent ... centered /> does not work with React components
-      `="true"` must be there-->
-    <ResultComponent
-      v-else
-      status="info"
-      :title="currentMethodAst.error.message('')"
-      :centered="true"
-    />
-  </div>
-</template>
-
-<style scoped>
-.DocumentationEditor {
-  display: flex;
-  flex-direction: column;
-  background-color: #fff;
-  height: 100%;
-  width: 100%;
-  padding-left: 4px;
-  padding-right: 4px;
-}
-</style>
diff --git a/app/gui/src/project-view/components/DocumentationEditor/ClosedProjectDocumentationEditor.vue b/app/gui/src/project-view/components/DocumentationEditor/ClosedProjectDocumentationEditor.vue
new file mode 100644
index 000000000000..4ab18ff53bd8
--- /dev/null
+++ b/app/gui/src/project-view/components/DocumentationEditor/ClosedProjectDocumentationEditor.vue
@@ -0,0 +1,91 @@
+<script setup lang="ts">
+import { useBackends } from '$/providers/backends'
+import { useRightPanelData } from '$/providers/rightPanel'
+import { useDocumentViewId } from '@/components/DocumentationEditor/documentViewId'
+import MarkdownEditor from '@/components/MarkdownEditor.vue'
+import { Ast } from '@/util/ast'
+import { parseModule } from '@/util/ast/abstract'
+import { useYTextSync } from '@/util/codemirror'
+import { editorPersistence } from '@/util/codemirror/persistence'
+import { Err, mapOk, Ok, Result, unwrapOr } from '@/util/data/result'
+import { ResultComponent } from '@/util/react'
+import { useQuery } from '@tanstack/vue-query'
+import { computed } from 'vue'
+
+const rightPanel = useRightPanelData()
+const projectId = computed(() => rightPanel.focusedProject)
+const { backendForType } = useBackends()
+const backendForAsset = computed(() => {
+  if (rightPanel.context?.category == null) return null
+  return backendForType(rightPanel.context.category.backend)
+})
+
+const fileContentsFromCloud = useQuery({
+  queryKey: computed(
+    () =>
+      [
+        backendForAsset.value?.type,
+        {
+          method: 'getFileContent',
+          projectId: projectId.value,
+        },
+      ] as const,
+  ),
+  enabled: computed(() => backendForAsset.value != null && projectId.value != null),
+  queryFn: ({ queryKey }) => {
+    const [, { projectId }] = queryKey
+    return projectId && backendForAsset.value?.getMainFileContent(projectId)
+  },
+})
+
+const currentMethodAst = computed((): Result<Ast.FunctionDef> => {
+  if (fileContentsFromCloud.data != null) {
+    if (fileContentsFromCloud.error.value) return Err(fileContentsFromCloud.error.value)
+    if (fileContentsFromCloud.isLoading.value) return Err('Loading documentation...')
+    const code = fileContentsFromCloud.data.value
+    if (code) {
+      const module = parseModule(code)
+      const statement = Ast.findModuleMethod(module, 'main')?.statement
+      if (statement) return Ok(statement)
+    }
+  }
+  return Err('No documentation available')
+})
+
+const editorMarkdown = computed(() =>
+  mapOk(currentMethodAst.value, (ast) => ast.mutableDocumentationMarkdown()),
+)
+const editorContent = computed(() => unwrapOr(editorMarkdown.value, undefined))
+
+const { syncExt, connectSync } = useYTextSync(editorContent, 'local:userAction:DocEditor')
+const editorPersistenceExt = editorPersistence({
+  documentViewId: useDocumentViewId({
+    projectId,
+    methodPointer: undefined,
+    view: 'DocumentationEditor',
+  }),
+  scroll: { y: true, x: false },
+})
+
+const extensions = [syncExt, editorPersistenceExt]
+</script>
+
+<template>
+  <MarkdownEditor
+    v-if="editorMarkdown.ok"
+    :extensions="extensions"
+    :readonly="true"
+    contentTestId="documentation-editor-content"
+    scrollerTestId="documentation-editor-scroller"
+    :editorReadyCallback="connectSync"
+  >
+  </MarkdownEditor>
+  <!-- Specifying `<ResultComponent ... centered /> does not work with React components
+      `="true"` must be there-->
+  <ResultComponent
+    v-else
+    status="info"
+    :title="editorMarkdown.error.message('')"
+    :centered="true"
+  />
+</template>
diff --git a/app/gui/src/project-view/components/DocumentationEditor/DocumentationEditor.vue b/app/gui/src/project-view/components/DocumentationEditor/DocumentationEditor.vue
new file mode 100644
index 000000000000..6850c6172698
--- /dev/null
+++ b/app/gui/src/project-view/components/DocumentationEditor/DocumentationEditor.vue
@@ -0,0 +1,36 @@
+<script setup lang="ts">
+import WithCurrentProject from '$/components/WithCurrentProject.vue'
+import { useRightPanelData } from '$/providers/rightPanel'
+import { providePopoverRoot } from '@/providers/popoverRoot'
+import { useTemplateRef } from 'vue'
+import ClosedProjectDocumentationEditor from './ClosedProjectDocumentationEditor.vue'
+import OpenedProjectDocumentationEditor from './OpenedProjectDocumentationEditor.vue'
+
+const rightPanel = useRightPanelData()
+
+const rootElement = useTemplateRef('rootElement')
+providePopoverRoot(rootElement)
+</script>
+
+<template>
+  <div ref="rootElement" class="DocumentationEditor">
+    <WithCurrentProject :id="rightPanel.focusedProject">
+      <OpenedProjectDocumentationEditor />
+      <template #fallback>
+        <ClosedProjectDocumentationEditor />
+      </template>
+    </WithCurrentProject>
+  </div>
+</template>
+
+<style scoped>
+.DocumentationEditor {
+  display: flex;
+  flex-direction: column;
+  background-color: #fff;
+  height: 100%;
+  width: 100%;
+  padding-left: 4px;
+  padding-right: 4px;
+}
+</style>
diff --git a/app/gui/src/project-view/components/DocumentationEditor/OpenedProjectDocumentationEditor.vue b/app/gui/src/project-view/components/DocumentationEditor/OpenedProjectDocumentationEditor.vue
new file mode 100644
index 000000000000..153f10fa2ae9
--- /dev/null
+++ b/app/gui/src/project-view/components/DocumentationEditor/OpenedProjectDocumentationEditor.vue
@@ -0,0 +1,66 @@
+<script setup lang="ts">
+import { useCurrentProject } from '$/components/WithCurrentProject.vue'
+import { useDocumentViewId } from '@/components/DocumentationEditor/documentViewId'
+import FunctionSignatureEditor from '@/components/FunctionSignatureEditor.vue'
+import MarkdownEditor from '@/components/MarkdownEditor.vue'
+import { useYTextSync } from '@/util/codemirror'
+import { editorPersistence } from '@/util/codemirror/persistence'
+import { mapOk, unwrapOr } from '@/util/data/result'
+import { methodPointerEquals } from '@/util/methodPointer'
+import { ResultComponent } from '@/util/react'
+import { computed } from 'vue'
+
+const { store: project, graph } = useCurrentProject().storesRefs
+const projectId = computed(() => project.value.id)
+
+const currentMethodPointer = computed(() => unwrapOr(graph.value.currentMethod.pointer, undefined))
+const displaySignatureEditor = computed(
+  () =>
+    currentMethodPointer.value &&
+    !methodPointerEquals(currentMethodPointer.value, project.value.entryPoint),
+)
+
+const editorMarkdown = computed(() =>
+  mapOk(graph.value.currentMethod.ast, (ast) => ast.mutableDocumentationMarkdown()),
+)
+const editorContent = computed(() => unwrapOr(editorMarkdown.value, undefined))
+
+const { syncExt, connectSync } = useYTextSync(editorContent, 'local:userAction:DocEditor')
+const editorPersistenceExt = editorPersistence({
+  documentViewId: useDocumentViewId({
+    projectId,
+    methodPointer: currentMethodPointer,
+    view: 'DocumentationEditor',
+  }),
+  scroll: { y: true, x: false },
+})
+
+const extensions = [syncExt, editorPersistenceExt]
+</script>
+
+<template>
+  <MarkdownEditor
+    v-if="graph.currentMethod.ast.ok"
+    :extensions="extensions"
+    contentTestId="documentation-editor-content"
+    scrollerTestId="documentation-editor-scroller"
+    :editorReadyCallback="connectSync"
+  >
+    <template #belowToolbar>
+      <FunctionSignatureEditor
+        v-if="displaySignatureEditor"
+        :projectId="projectId"
+        :functionAst="graph.currentMethod.ast.value"
+        :methodPointer="currentMethodPointer"
+      />
+    </template>
+  </MarkdownEditor>
+  <!-- Specifying `<ResultComponent ... centered /> does not work with React components
+      `="true"` must be there-->
+  <ResultComponent
+    v-else
+    status="info"
+    :title="graph.currentMethod.ast.error.message('')"
+    :centered="true"
+  />
+</template>
diff --git a/app/gui/src/project-view/components/DocumentationEditor/index.ts b/app/gui/src/project-view/components/DocumentationEditor/index.ts
new file mode 100644
index 000000000000..71752a89f252
--- /dev/null
+++ b/app/gui/src/project-view/components/DocumentationEditor/index.ts
@@ -0,0 +1,3 @@
+import * as DocumentationEditor from './DocumentationEditor.vue'
+
+export default DocumentationEditor
diff --git a/app/gui/src/project-view/components/FunctionSignatureEditor.vue b/app/gui/src/project-view/components/FunctionSignatureEditor.vue
index e3eb6e122a1b..f475a0012cd0 100644
--- a/app/gui/src/project-view/components/FunctionSignatureEditor.vue
+++ b/app/gui/src/project-view/components/FunctionSignatureEditor.vue
@@ -1,11 +1,15 @@
 <script setup lang="ts">
 import { useCurrentProject } from '$/components/WithCurrentProject.vue'
+import { documentationData } from '$/providers/openedProjects/suggestionDatabase/documentation'
+import {
+  applyWidgetUpdates,
+  WidgetInput,
+  WidgetUpdate,
+} from '$/providers/openedProjects/widgetRegistry'
 import WidgetTreeRoot from '@/components/GraphEditor/WidgetTreeRoot.vue'
 import DraggableList from '@/components/widgets/DraggableList.vue'
 import { providePopoverRoot } from '@/providers/popoverRoot'
 import { syntheticPortId } from '@/providers/portInfo'
-import { applyWidgetUpdates, WidgetInput, type WidgetUpdate } from '@/providers/widgetRegistry'
-import { documentationData } from '@/stores/suggestionDatabase/documentation'
 import { assertUnreachable } from '@/util/assert'
 import { Ast } from '@/util/ast'
 import { useYText } from '@/util/crdt'
@@ -28,25 +32,19 @@ const { functionAst, methodPointer } = defineProps<{
 const rootElement = useTemplateRef('rootElement')
 providePopoverRoot(rootElement)
 
-const currentProject = useCurrentProject()
+const { suggestionDb, module } = useCurrentProject().storesRefs
 
 const docsString = useYText(() => functionAst.mutableDocumentationMarkdown())
 
 const docsData = computed(() => {
   const definedIn = methodPointer?.module
   return (
-    definedIn &&
-    documentationData(
-      docsString.value,
-      definedIn.project,
-      currentProject.ref.value?.suggestionDb.groups ?? [],
-    )
+    definedIn && documentationData(docsString.value, definedIn.project, suggestionDb.value.groups)
   )
 })
 
 function handleWidgetUpdates(update: WidgetUpdate) {
-  const graph = currentProject.ref.value?.graph
-  if (graph) applyWidgetUpdates(update, graph)
+  applyWidgetUpdates(update, module.value)
   return Ok()
 }
 
@@ -80,7 +78,7 @@ function handleAddItem() {
 }
 
 function doEdit(editFn: (ast: Ast.MutableFunctionDef, edit: Ast.MutableModule) => void) {
-  const edit = currentProject.ref.value?.graph.startEdit()
+  const edit = module.value.startEdit()
   if (!edit) return
   editFn(edit.getVersion(functionAst), edit)
   handleWidgetUpdates({ edit, directInteraction: true })
diff --git a/app/gui/src/project-view/components/GraphEditor.vue b/app/gui/src/project-view/components/GraphEditor.vue
index 3ac32b707652..b7f7dbd26a60 100644
--- a/app/gui/src/project-view/components/GraphEditor.vue
+++ b/app/gui/src/project-view/components/GraphEditor.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import {
+  useCurrentProject,
   useGraphStore,
   useProjectNames,
   useProjectStore,
@@ -7,6 +8,12 @@ import {
   useWidgetRegistry,
 } from '$/components/WithCurrentProject.vue'
 import { useContainerData } from '$/providers/container'
+import type { Node, NodeId } from '$/providers/openedProjects/graph'
+import { isInputNode, nodeId } from '$/providers/openedProjects/graph/graphDatabase'
+import type { RequiredImport } from '$/providers/openedProjects/module/imports'
+import { provideNodeExecution } from '$/providers/openedProjects/project/nodeExecution'
+import type { SuggestionId, Typename } from '$/providers/openedProjects/suggestionDatabase/entry'
+import { suggestionDocumentationUrl } from '$/providers/openedProjects/suggestionDatabase/entry'
 import { useRightPanelData } from '$/providers/rightPanel'
 import { graphBindings } from '@/bindings'
 import BottomPanel from '@/components/BottomPanel.vue'
@@ -42,13 +49,7 @@ import { provideStackNavigator } from '@/providers/graphStackNavigator'
 import { injectKeyboard } from '@/providers/keyboard'
 import { provideLanguageSupportExtensions } from '@/providers/languageSupportExtensions'
 import { providePopoverRoot } from '@/providers/popoverRoot'
-import type { Node, NodeId } from '@/stores/graph'
-import { isInputNode, nodeId } from '@/stores/graph/graphDatabase'
-import type { RequiredImport } from '@/stores/graph/imports'
 import { providePersisted } from '@/stores/persisted'
-import { provideNodeExecution } from '@/stores/project/nodeExecution'
-import type { SuggestionId, Typename } from '@/stores/suggestionDatabase/entry'
-import { suggestionDocumentationUrl } from '@/stores/suggestionDatabase/entry'
 import { provideVisualizationStore } from '@/stores/visualization'
 import { assert, bail } from '@/util/assert'
 import { Ast } from '@/util/ast'
@@ -80,6 +81,7 @@ const containerData = useContainerData()
 const projectStore = useProjectStore()
 const projectNames = useProjectNames()
 const graphStore = useGraphStore()
+const { module } = useCurrentProject().storesRefs
 const widgetRegistry = useWidgetRegistry()
 const suggestionDb = useSuggestionDbStore()
 provideVisualizationStore(projectStore)
@@ -152,9 +154,7 @@ function panToSelected() {
 
 const projectNameEdited = ref(false)
 const stackNavigator = provideStackNavigator(projectStore, graphStore, projectNames)
-const graphMissing = computed(
-  () => graphStore.moduleRoot != null && !graphStore.currentMethod.ast.ok,
-)
+const graphMissing = computed(() => module.value.root != null && !graphStore.currentMethod.ast.ok)
 
 // === Toasts ===
 
@@ -305,7 +305,7 @@ const actionHandlers = registerHandlers({
         selected,
         (id) => graphStore.db.nodeIdToNode.get(id)?.vis?.visible === true,
       )
-      graphStore.batchEdits(() => {
+      module.value.batchEdits(() => {
         for (const nodeId of selected) {
           graphStore.setNodeVisualization(nodeId, { visible: !allVisible })
         }
@@ -506,7 +506,7 @@ function clearFocus() {
 function createNodesFromSource(sourceNode: NodeId, options: NodeCreationOptions[]) {
   const sourcePort = graphStore.db.getNodeFirstOutputPort(sourceNode)
   if (sourcePort == null) return
-  const sourcePortAst = graphStore.viewModule.get(sourcePort)
+  const sourcePortAst = module.value.ast.get(sourcePort)
   assert(sourcePortAst.isExpression())
   const [toCommit, toEdit] = partition(options, (opts) => opts.commit)
   createNodes(
@@ -562,12 +562,12 @@ function collapseNodes(nodes: Node[]) {
     if (currentMethodName == null) {
       bail(`Cannot get the method name for the current execution stack item.`)
     }
-    const topLevel = graphStore.moduleRoot
+    const topLevel = module.value.root
     if (!topLevel) {
       bail('BUG: no top level, creating User Defined Component not possible.')
     }
     const selectedNodeRects = iter.filterDefined(iter.map(selected, graphStore.visibleArea))
-    graphStore.edit((edit) => {
+    module.value.edit((edit) => {
       const { collapsedCallRoot, collapsedNodeIds, outputAstId } = performCollapse(
         info.value,
         edit.getVersion(topLevel),
diff --git a/app/gui/src/project-view/components/GraphEditor/CodeMirrorWidgetBase.vue b/app/gui/src/project-view/components/GraphEditor/CodeMirrorWidgetBase.vue
index 00e08e83e575..931e8ac99e60 100644
--- a/app/gui/src/project-view/components/GraphEditor/CodeMirrorWidgetBase.vue
+++ b/app/gui/src/project-view/components/GraphEditor/CodeMirrorWidgetBase.vue
@@ -1,8 +1,12 @@
 <script setup lang="ts">
+import type {
+  HandledUpdate,
+  WidgetInput,
+  WidgetTypeId,
+} from '$/providers/openedProjects/widgetRegistry'
+import { WidgetEditHandler } from '$/providers/openedProjects/widgetRegistry/editHandler'
 import CodeMirrorRoot from '@/components/CodeMirrorRoot.vue'
 import VueHostRender, { VueHostInstance } from '@/components/VueHostRender.vue'
-import type { HandledUpdate, WidgetInput, WidgetTypeId } from '@/providers/widgetRegistry'
-import { WidgetEditHandler } from '@/providers/widgetRegistry/editHandler'
 import { Ast } from '@/util/ast'
 import { targetIsOutside } from '@/util/autoBlur'
 import { selectOnMouseFocus, useCodeMirror, useStringSync } from '@/util/codemirror'
diff --git a/app/gui/src/project-view/components/GraphEditor/ComponentWidgetTree.vue b/app/gui/src/project-view/components/GraphEditor/ComponentWidgetTree.vue
index 74acbf4426d8..f663fd3858ff 100644
--- a/app/gui/src/project-view/components/GraphEditor/ComponentWidgetTree.vue
+++ b/app/gui/src/project-view/components/GraphEditor/ComponentWidgetTree.vue
@@ -1,12 +1,19 @@
 <script setup lang="ts">
-import { useGraphStore } from '$/components/WithCurrentProject.vue'
+import { useCurrentProject } from '$/components/WithCurrentProject.vue'
+import { type NodeId } from '$/providers/openedProjects/graph'
+import {
+  type NodeType,
+  type PrimaryApplication,
+} from '$/providers/openedProjects/graph/graphDatabase'
+import {
+  applyWidgetUpdates,
+  WidgetInput,
+  type WidgetUpdate,
+} from '$/providers/openedProjects/widgetRegistry'
+import { WidgetEditHandlerParent } from '$/providers/openedProjects/widgetRegistry/editHandler'
 import { DisplayIcon } from '@/components/GraphEditor/widgets/WidgetIcon.vue'
 import WidgetTreeRoot from '@/components/GraphEditor/WidgetTreeRoot.vue'
 import { injectGraphSelection } from '@/providers/graphSelection'
-import { applyWidgetUpdates, WidgetInput, type WidgetUpdate } from '@/providers/widgetRegistry'
-import { WidgetEditHandlerParent } from '@/providers/widgetRegistry/editHandler'
-import type { NodeId } from '@/stores/graph'
-import type { NodeType, PrimaryApplication } from '@/stores/graph/graphDatabase'
 import { Ast } from '@/util/ast'
 import type { Opt } from '@/util/data/opt'
 import { iconOfNode, useDisplayedIcon } from '@/util/getIconName'
@@ -24,17 +31,18 @@ const props = defineProps<{
   extended: boolean
 }>()
 
-const graph = useGraphStore()
+const { module, graph } = useCurrentProject().storesRefs
 const selection = injectGraphSelection()
 
-const baseIcon = computed(() => iconOfNode(props.nodeId, graph.db))
-const { displayedIcon } = useDisplayedIcon(graph.db, toRef(props, 'nodeId'), baseIcon)
+const baseIcon = computed(() => iconOfNode(props.nodeId, graph.value.db))
+const { displayedIcon } = useDisplayedIcon(graph.value.db, toRef(props, 'nodeId'), baseIcon)
 
 const rootPort = computed(() => {
   const input = WidgetInput.FromAst(props.ast)
   if (
     props.ast instanceof Ast.Ident &&
-    (!graph.db.isKnownFunctionCall(props.ast.id) || graph.db.connections.hasValue(props.ast.id))
+    (!graph.value.db.isKnownFunctionCall(props.ast.id) ||
+      graph.value.db.connections.hasValue(props.ast.id))
   ) {
     input.forcePort = true
   }
@@ -56,7 +64,7 @@ function handleWidgetUpdates(update: WidgetUpdate) {
   if (update.directInteraction) {
     selectNode()
   }
-  applyWidgetUpdates(update, graph)
+  applyWidgetUpdates(update, module.value)
   return Ok()
 }
 
diff --git a/app/gui/src/project-view/components/GraphEditor/CreateNodeFromPortButton.vue b/app/gui/src/project-view/components/GraphEditor/CreateNodeFromPortButton.vue
index 8192858e988f..2bcf9483647f 100644
--- a/app/gui/src/project-view/components/GraphEditor/CreateNodeFromPortButton.vue
+++ b/app/gui/src/project-view/components/GraphEditor/CreateNodeFromPortButton.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { useCurrentProject } from '$/components/WithCurrentProject.vue'
+import type { NodeId } from '$/providers/openedProjects/graph'
 import { usePointer } from '@/composables/events'
 import { injectGraphNavigator } from '@/providers/graphNavigator'
-import type { NodeId } from '@/stores/graph'
 import { Vec2 } from '@/util/data/vec2'
 import { computed, shallowRef } from 'vue'
 import type { AstId } from 'ydoc-shared/ast'
diff --git a/app/gui/src/project-view/components/GraphEditor/GraphEdge.vue b/app/gui/src/project-view/components/GraphEditor/GraphEdge.vue
index a493bef2753a..4e5276e72ea3 100644
--- a/app/gui/src/project-view/components/GraphEditor/GraphEdge.vue
+++ b/app/gui/src/project-view/components/GraphEditor/GraphEdge.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import { useGraphStore } from '$/components/WithCurrentProject.vue'
+import type { Edge } from '$/providers/openedProjects/graph'
+import { isConnected } from '$/providers/openedProjects/graph'
 import { junctionPoints, pathElements, toSvgPath } from '@/components/GraphEditor/GraphEdge/layout'
 import { useComponentColors } from '@/composables/componentColors'
 import { injectGraphNavigator } from '@/providers/graphNavigator'
 import { injectGraphSelection } from '@/providers/graphSelection'
-import type { Edge } from '@/stores/graph'
-import { isConnected } from '@/stores/graph'
 import { assert } from '@/util/assert'
 import { Rect } from '@/util/data/rect'
 import { Vec2 } from '@/util/data/vec2'
diff --git a/app/gui/src/project-view/components/GraphEditor/GraphEdges.vue b/app/gui/src/project-view/components/GraphEditor/GraphEdges.vue
index 900fdc45cd24..4aa3931eb3d2 100644
--- a/app/gui/src/project-view/components/GraphEditor/GraphEdges.vue
+++ b/app/gui/src/project-view/components/GraphEditor/GraphEdges.vue
@@ -1,10 +1,7 @@
 <script setup lang="ts">
-import {
-  useGraphStore,
-  useProjectNames,
-  useProjectStore,
-  useSuggestionDbStore,
-} from '$/components/WithCurrentProject.vue'
+import { useCurrentProject } from '$/components/WithCurrentProject.vue'
+import { type NodeId } from '$/providers/openedProjects/graph'
+import { requiredImports } from '$/providers/openedProjects/module/imports'
 import GraphEdge from '@/components/GraphEditor/GraphEdge.vue'
 import GraphNodeOutputPorts from '@/components/GraphEditor/GraphNodeOutputPorts.vue'
 import type { NodeCreationOptions } from '@/components/GraphEditor/nodeCreation'
@@ -13,8 +10,6 @@ import type { GraphNavigator } from '@/providers/graphNavigator'
 import { injectGraphSelection } from '@/providers/graphSelection'
 import { injectInteractionHandler, type Interaction } from '@/providers/interactionHandler'
 import type { PortId } from '@/providers/portInfo'
-import type { NodeId } from '@/stores/graph'
-import { requiredImports } from '@/stores/graph/imports'
 import { Ast } from '@/util/ast'
 import { isAstId, type AstId } from '@/util/ast/abstract'
 import { unwrapOr, unwrapOrWithLog } from '@/util/data/result'
@@ -23,10 +18,13 @@ import { ProjectPath } from '@/util/projectPath'
 import { toast } from 'react-toastify'
 import { computed } from 'vue'
 
-const project = useProjectStore()
-const projectNames = useProjectNames()
-const graph = useGraphStore()
-const suggestionDb = useSuggestionDbStore()
+const {
+  names: projectNames,
+  store: project,
+  module,
+  graph,
+  suggestionDb,
+} = useCurrentProject().storesRefs
 const selection = injectGraphSelection(true)
 const interaction = injectInteractionHandler()
 const nodeSelection = injectGraphSelection(true)
@@ -44,8 +42,8 @@ const emit = defineEmits<{
 const MIN_DRAG_MOVE = 10
 
 const editingEdge: Interaction = {
-  cancel: () => (graph.mouseEditedEdge = undefined),
-  end: () => (graph.mouseEditedEdge = undefined),
+  cancel: () => (graph.value.mouseEditedEdge = undefined),
+  end: () => (graph.value.mouseEditedEdge = undefined),
   pointerdown: (e: PointerEvent) => {
     if (edgeInteractionClick()) {
       e.preventDefault()
@@ -59,7 +57,7 @@ useEventConditional(
   'pointerup',
   () => interaction.getCurrent() === editingEdge,
   (e: PointerEvent) => {
-    const originEvent = graph.mouseEditedEdge?.event
+    const originEvent = graph.value.mouseEditedEdge?.event
     if (originEvent?.type === 'pointerdown') {
       const delta = new Vec2(e.screenX, e.screenY).sub(
         new Vec2(originEvent.screenX, originEvent.screenY),
@@ -73,23 +71,23 @@ useEventConditional(
 )
 
 function edgeInteractionClick() {
-  if (graph.mouseEditedEdge == null) return false
+  if (graph.value.mouseEditedEdge == null) return false
   let source: AstId | undefined
   let sourceNode: NodeId | undefined
-  if (graph.mouseEditedEdge.source) {
-    source = graph.mouseEditedEdge.source
-    sourceNode = graph.db.getPatternExpressionNodeId(source)
+  if (graph.value.mouseEditedEdge.source) {
+    source = graph.value.mouseEditedEdge.source
+    sourceNode = graph.value.db.getPatternExpressionNodeId(source)
   } else if (selection?.hoveredNode) {
     sourceNode = selection.hoveredNode
-    source = graph.db.getNodeFirstOutputPort(sourceNode)
+    source = graph.value.db.getNodeFirstOutputPort(sourceNode)
   }
-  const target = graph.mouseEditedEdge.target ?? selection?.hoveredPort
-  const targetNode = target && graph.getPortNodeId(target)
-  graph.batchEdits(() => {
+  const target = graph.value.mouseEditedEdge.target ?? selection?.hoveredPort
+  const targetNode = target && graph.value.getPortNodeId(target)
+  module.value.batchEdits(() => {
     if (source != null && sourceNode != targetNode) {
       if (target == null) {
-        if (graph.mouseEditedEdge?.disconnectedEdgeTarget != null)
-          disconnectEdge(graph.mouseEditedEdge.disconnectedEdgeTarget)
+        if (graph.value.mouseEditedEdge?.disconnectedEdgeTarget != null)
+          disconnectEdge(graph.value.mouseEditedEdge.disconnectedEdgeTarget)
         emit('createNodeFromEdge', source, props.navigator.sceneMousePos ?? Vec2.Zero)
       } else {
         createEdge(source, target)
@@ -97,16 +95,16 @@ function edgeInteractionClick() {
     } else if (source == null && target != null) {
       disconnectEdge(target)
     }
-    graph.mouseEditedEdge = undefined
+    graph.value.mouseEditedEdge = undefined
   })
   return true
 }
 
-interaction.setWhen(() => graph.mouseEditedEdge != null, editingEdge)
+interaction.setWhen(() => graph.value.mouseEditedEdge != null, editingEdge)
 
 function disconnectEdge(target: PortId) {
-  graph.edit((edit) => {
-    if (!graph.updatePortValue(edit, target, undefined, false)) {
+  module.edit((edit) => {
+    if (!graph.value.updatePortValue(target, undefined, edit, false)) {
       if (isAstId(target)) {
         console.warn(`Failed to disconnect edge from port ${target}, falling back to direct edit.`)
         edit.replaceValue(target, Ast.Wildcard.new(edit))
@@ -118,27 +116,29 @@ function disconnectEdge(target: PortId) {
 }
 
 function createEdge(source: AstId, target: PortId) {
-  const ident = graph.db.getOutputPortIdentifier(source)
+  const graph_ = graph.value
+  const ident = graph_.db.getOutputPortIdentifier(source)
   if (ident == null) return
 
-  const sourceNode = graph.getSourceNodeId(source)
-  const targetNode = graph.getPortNodeId(target)
+  const sourceNode = graph_.getSourceNodeId(source)
+  const targetNode = graph_.getPortNodeId(target)
   if (sourceNode == null || targetNode == null) {
     return console.error(`Failed to connect edge, source or target node not found.`)
   }
 
-  const edit = graph.startEdit()
-  const reorderResult = graph.ensureCorrectNodeOrder(edit, sourceNode, targetNode)
+  const edit = module.value.startEdit()
+  const reorderResult = graph_.ensureCorrectNodeOrder(edit, sourceNode, targetNode)
   if (reorderResult === 'circular') {
     // Creating this edge would create a circular dependency. Prevent that and display error.
     toast.error('Could not connect due to circular dependency.')
   } else {
     const identAst = Ast.parseExpression(ident, edit)!
     const expectedType = unwrapOr(
-      projectNames.parseProjectPathRaw(graph.getPortExpectedType(target) ?? ''),
+      projectNames.value.parseProjectPathRaw(graph_.getPortExpectedType(target) ?? ''),
       undefined,
     )
-    const connectionType = project.computedValueRegistry.getExpressionInfo(sourceNode)?.typeInfo
+    const connectionType =
+      project.value.computedValueRegistry.getExpressionInfo(sourceNode)?.typeInfo
     // Check if type cast to the target type is both possible and necessary.
     const findCompatibleType = (
       list: ProjectPath[] | undefined,
@@ -146,7 +146,7 @@ function createEdge(source: AstId, target: PortId) {
     ) => {
       return list
         ?.flatMap((type) =>
-          unwrapOrWithLog(suggestionDb.entries.getTypeAndItsParentsEntries(type), []),
+          unwrapOrWithLog(suggestionDb.value.entries.getTypeAndItsParentsEntries(type), []),
         )
         .find((type) => withType?.equals(type.definitionPath))
     }
@@ -154,7 +154,7 @@ function createEdge(source: AstId, target: PortId) {
     const targetType = castNeeded && findCompatibleType(connectionType?.hiddenTypes, expectedType)
     let portValueToSet = undefined
     if (targetType) {
-      graph.addMissingImports(edit, requiredImports(suggestionDb.entries, targetType))
+      module.value.addMissingImports(edit, requiredImports(suggestionDb.value.entries, targetType))
       if (!Ast.isIdentifier(targetType.name)) {
         console.error(
           'SuggestionDB has a type which is not an identifier:',
@@ -166,11 +166,11 @@ function createEdge(source: AstId, target: PortId) {
     }
     portValueToSet = portValueToSet ?? identAst
 
-    if (!graph.updatePortValue(edit, target, portValueToSet)) {
+    if (!graph_.updatePortValue(target, portValueToSet, edit)) {
       if (isAstId(target)) {
         console.warn(`Failed to connect edge to port ${target}, falling back to direct edit.`)
         edit.replaceValue(target, portValueToSet)
-        graph.commitEdit(edit)
+        module.commitEdit(edit)
       } else {
         console.error(`Failed to connect edge to port ${target}, no fallback possible.`)
       }
@@ -179,7 +179,7 @@ function createEdge(source: AstId, target: PortId) {
 }
 
 const nodeIdsWithOutputPorts = computed(() =>
-  [...graph.db.nodeOutputPorts.allForward()].map(([id]) => id),
+  [...graph.value.db.nodeOutputPorts.allForward()].map(([id]) => id),
 )
 
 function onNewNodeClick(id: NodeId, position: Vec2) {
diff --git a/app/gui/src/project-view/components/GraphEditor/GraphNode.vue b/app/gui/src/project-view/components/GraphEditor/GraphNode.vue
index 08aa79a9a19c..ece1ffff0dff 100644
--- a/app/gui/src/project-view/components/GraphEditor/GraphNode.vue
+++ b/app/gui/src/project-view/components/GraphEditor/GraphNode.vue
@@ -5,7 +5,15 @@ const MENU_CLOSE_TIMEOUT_MS = 300
 </script>
 
 <script setup lang="ts">
-import { useGraphStore, useProjectStore } from '$/components/WithCurrentProject.vue'
+import {
+  useCurrentProject,
+  useGraphStore,
+  useProjectStore,
+} from '$/components/WithCurrentProject.vue'
+import { type Node } from '$/providers/openedProjects/graph'
+import { asNodeId } from '$/providers/openedProjects/graph/graphDatabase'
+import { evaluationProgress } from '$/providers/openedProjects/project/computedValueRegistry'
+import { useNodeExecution } from '$/providers/openedProjects/project/nodeExecution'
 import { nodeEditBindings } from '@/bindings'
 import ComponentMenu from '@/components/ComponentMenu.vue'
 import ContextMenuTrigger from '@/components/ContextMenuTrigger.vue'
@@ -32,10 +40,6 @@ import { injectNodeColors } from '@/providers/graphNodeColors'
 import { injectGraphSelection } from '@/providers/graphSelection'
 import { providePopoverRoot } from '@/providers/popoverRoot'
 import { provideResizableWidgetRegistry } from '@/providers/resizableWidgetRegistry'
-import type { Node } from '@/stores/graph'
-import { asNodeId } from '@/stores/graph/graphDatabase'
-import { evaluationProgress } from '@/stores/project/computedValueRegistry'
-import { useNodeExecution } from '@/stores/project/nodeExecution'
 import { Ast } from '@/util/ast'
 import { prefixes } from '@/util/ast/node'
 import { onWindowBlur } from '@/util/autoBlur'
@@ -75,6 +79,7 @@ const emit = defineEmits<{
 const nodeSelection = injectGraphSelection(true)
 const projectStore = useProjectStore()
 const graph = useGraphStore()
+const { module } = useCurrentProject().storesRefs
 const navigator = injectGraphNavigator(true)
 const nodeExecution = useNodeExecution()
 
@@ -237,7 +242,7 @@ const isRecordingOverridden = computed({
         [Ast.TextLiteral.new(projectStore.executionMode, edit)]
       : undefined
     prefixes.value.modify(edit.getVersion(props.node.rootExpr), { enableRecording: replacement })
-    graph.commitEdit(edit)
+    module.commitEdit(edit)
   },
 })
 
diff --git a/app/gui/src/project-view/components/GraphEditor/GraphNode/nodeMessage.ts b/app/gui/src/project-view/components/GraphEditor/GraphNode/nodeMessage.ts
index d891e4fa3c03..2eedd239823d 100644
--- a/app/gui/src/project-view/components/GraphEditor/GraphNode/nodeMessage.ts
+++ b/app/gui/src/project-view/components/GraphEditor/GraphNode/nodeMessage.ts
@@ -1,3 +1,6 @@
+import { type NodeId } from '$/providers/openedProjects/graph'
+import { type GraphDb } from '$/providers/openedProjects/graph/graphDatabase'
+import { type ProjectStore } from '$/providers/openedProjects/project'
 import type GraphNodeMessage from '@/components/GraphEditor/GraphNodeMessage.vue'
 import {
   colorForMessageType,
@@ -5,11 +8,8 @@ import {
   type MessageType,
 } from '@/components/GraphEditor/GraphNodeMessage.vue'
 import type SvgIcon from '@/components/SvgIcon.vue'
-import type { NodeId } from '@/stores/graph'
-import type { GraphDb } from '@/stores/graph/graphDatabase'
-import type { ProjectStore } from '@/stores/project'
-import type { Opt } from '@/util/data/opt'
-import type { ToValue } from '@/util/reactivity'
+import { type Opt } from '@/util/data/opt'
+import { type ToValue } from '@/util/reactivity'
 import { computed, toValue } from 'vue'
 import type { ComponentProps } from 'vue-component-type-helpers'
 import type { ExternalId } from 'ydoc-shared/yjsModel'
diff --git a/app/gui/src/project-view/components/GraphEditor/GraphNode/nodeVisualization.ts b/app/gui/src/project-view/components/GraphEditor/GraphNode/nodeVisualization.ts
index 462fd5b71ab8..8bed0392c4ce 100644
--- a/app/gui/src/project-view/components/GraphEditor/GraphNode/nodeVisualization.ts
+++ b/app/gui/src/project-view/components/GraphEditor/GraphNode/nodeVisualization.ts
@@ -1,11 +1,11 @@
+import type { TypeInfo } from '$/providers/openedProjects/project/computedValueRegistry'
 import type GraphVisualization from '@/components/GraphEditor/GraphVisualization.vue'
 import type { RawDataSource } from '@/components/GraphEditor/GraphVisualization/visualizationData'
 import { injectBubblingKeyboard } from '@/providers/keyboard'
-import type { TypeInfo } from '@/stores/project/computedValueRegistry'
-import type { VisualizationDataSource } from '@/stores/visualization'
-import type { Opt } from '@/util/data/opt'
-import type { Rect } from '@/util/data/rect'
-import type { ToValue } from '@/util/reactivity'
+import { type VisualizationDataSource } from '@/stores/visualization'
+import { type Opt } from '@/util/data/opt'
+import { type Rect } from '@/util/data/rect'
+import { type ToValue } from '@/util/reactivity'
 import { computed, ref, shallowRef, toValue, watch } from 'vue'
 import type { ComponentProps } from 'vue-component-type-helpers'
 import type { VisualizationIdentifier, VisualizationMetadata } from 'ydoc-shared/yjsModel'
diff --git a/app/gui/src/project-view/components/GraphEditor/GraphNodeComment.vue b/app/gui/src/project-view/components/GraphEditor/GraphNodeComment.vue
index fc3d4f2d17da..74bb4cacf95b 100644
--- a/app/gui/src/project-view/components/GraphEditor/GraphNodeComment.vue
+++ b/app/gui/src/project-view/components/GraphEditor/GraphNodeComment.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
+import { type Node } from '$/providers/openedProjects/graph'
 import PlainTextEditor from '@/components/PlainTextEditor.vue'
 import { useFocusDelayed } from '@/composables/focus'
-import type { Node } from '@/stores/graph'
 import { nodeMutableDocumentation } from '@/util/ast/node'
 import { useYTextSync } from '@/util/codemirror'
 import { syncRef } from '@vueuse/core'
diff --git a/app/gui/src/project-view/components/GraphEditor/GraphNodeMessage.vue b/app/gui/src/project-view/components/GraphEditor/GraphNodeMessage.vue
index 842078836e50..fb44ec6baabf 100644
--- a/app/gui/src/project-view/components/GraphEditor/GraphNodeMessage.vue
+++ b/app/gui/src/project-view/components/GraphEditor/GraphNodeMessage.vue
@@ -1,13 +1,12 @@
 <script setup lang="ts">
-import { useGraphStore, useProjectNames } from '$/components/WithCurrentProject.vue'
+import { useCurrentProject } from '$/components/WithCurrentProject.vue'
+import { QualifiedImport } from '$/providers/openedProjects/module/imports'
 import SvgButton from '@/components/SvgButton.vue'
 import SvgIcon from '@/components/SvgIcon.vue'
-import type { QualifiedImport } from '@/stores/graph/imports'
 import type { Icon } from '@/util/iconMetadata/iconName'
 import { ProjectPath } from '@/util/projectPath'
 
-const graph = useGraphStore()
-const projectNames = useProjectNames()
+const { names, module, graph } = useCurrentProject().storesRefs
 
 const props = defineProps<{
   message: string
@@ -21,7 +20,7 @@ function containsLibraryName(): ProjectPath | null {
     const rest = props.message.substring(prefix.length)
     const libName = rest.split(' ')
     if (!libName[0]) return null
-    const path = projectNames.parseProjectPathRaw(libName[0])
+    const path = names.value.parseProjectPathRaw(libName[0])
     if (!path.ok) return null
     return path.value
   } else {
@@ -38,7 +37,7 @@ function fixImport() {
       kind: 'Qualified',
       module: libName,
     } satisfies QualifiedImport
-    graph.edit((edit) => graph.addMissingImports(edit, [theImport]))
+    module.value.edit((edit) => module.value.addMissingImports(edit, [theImport]))
   }
 }
 </script>
diff --git a/app/gui/src/project-view/components/GraphEditor/GraphNodeOutputPorts.vue b/app/gui/src/project-view/components/GraphEditor/GraphNodeOutputPorts.vue
index 92a806894e11..22f5944a57be 100644
--- a/app/gui/src/project-view/components/GraphEditor/GraphNodeOutputPorts.vue
+++ b/app/gui/src/project-view/components/GraphEditor/GraphNodeOutputPorts.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
 import { useCurrentProject } from '$/components/WithCurrentProject.vue'
+import type { NodeId } from '$/providers/openedProjects/graph'
 import CreateNodeFromPortButton from '@/components/GraphEditor/CreateNodeFromPortButton.vue'
 import { useApproach } from '@/composables/animation'
 import { useComponentColors } from '@/composables/componentColors'
 import { useDoubleClick } from '@/composables/doubleClick'
 import { useGraphEditorState } from '@/providers/graphEditorState'
 import { injectGraphSelection } from '@/providers/graphSelection'
-import type { NodeId } from '@/stores/graph'
 import type { Vec2 } from '@/util/data/vec2'
 import { isDef } from '@vueuse/core'
 import { setsIntersect } from 'enso-common/src/utilities/data/set'
diff --git a/app/gui/src/project-view/components/GraphEditor/GraphNodes.vue b/app/gui/src/project-view/components/GraphEditor/GraphNodes.vue
index 64994d7dd2e5..d3efeff67228 100644
--- a/app/gui/src/project-view/components/GraphEditor/GraphNodes.vue
+++ b/app/gui/src/project-view/components/GraphEditor/GraphNodes.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { useGraphStore, useProjectStore } from '$/components/WithCurrentProject.vue'
+import { type NodeId } from '$/providers/openedProjects/graph'
 import GraphNode from '@/components/GraphEditor/GraphNode.vue'
 import UploadingFile from '@/components/GraphEditor/UploadingFile.vue'
 import type { NodeCreationOptions } from '@/components/GraphEditor/nodeCreation'
@@ -8,7 +9,6 @@ import { useArrows, useEvent } from '@/composables/events'
 import { injectGraphNavigator } from '@/providers/graphNavigator'
 import { injectGraphSelection } from '@/providers/graphSelection'
 import type { UploadingFile as File, FileName } from '@/stores/awareness'
-import type { NodeId } from '@/stores/graph'
 import type { AstId } from '@/util/ast/abstract'
 import type { Vec2 } from '@/util/data/vec2'
 import { set } from 'lib0'
diff --git a/app/gui/src/project-view/components/GraphEditor/GraphVisualization.vue b/app/gui/src/project-view/components/GraphEditor/GraphVisualization.vue
index f2a3706a7143..1f76379a3667 100644
--- a/app/gui/src/project-view/components/GraphEditor/GraphVisualization.vue
+++ b/app/gui/src/project-view/components/GraphEditor/GraphVisualization.vue
@@ -213,10 +213,10 @@ const resizableWidgets = injectResizableWidgetRegistry(true)
 </script>
 
 <script lang="ts">
+import { TypeInfo } from '$/providers/openedProjects/project/computedValueRegistry'
 import VisualizationHost, {
   type VisualizationHostParams,
 } from '@/components/visualizations/VisualizationHost.vue'
-import { TypeInfo } from '@/stores/project/computedValueRegistry'
 import { defineCustomElement } from 'vue'
 
 // ==========================
diff --git a/app/gui/src/project-view/components/GraphEditor/GraphVisualization/VisualizationToolbar.vue b/app/gui/src/project-view/components/GraphEditor/GraphVisualization/VisualizationToolbar.vue
index 8feb06f99c36..b4b33d1fde66 100644
--- a/app/gui/src/project-view/components/GraphEditor/GraphVisualization/VisualizationToolbar.vue
+++ b/app/gui/src/project-view/components/GraphEditor/GraphVisualization/VisualizationToolbar.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { TypeInfo } from '$/providers/openedProjects/project/computedValueRegistry'
 import ActionButton from '@/components/ActionButton.vue'
 import ComponentEditorLabel from '@/components/ComponentBrowser/ComponentEditorLabel.vue'
 import { useVisualizationSelector } from '@/components/GraphEditor/GraphVisualization/visualizationSelector'
@@ -12,7 +13,6 @@ import {
   isTextSelectionMenu,
   isToggleButton,
 } from '@/components/visualizations/toolbar'
-import { TypeInfo } from '@/stores/project/computedValueRegistry'
 import { ProjectPath } from '@/util/projectPath'
 import { qnLastSegment } from '@/util/qualifiedName'
 import { toRef, toValue } from 'vue'
diff --git a/app/gui/src/project-view/components/GraphEditor/GraphVisualization/visualizationData.ts b/app/gui/src/project-view/components/GraphEditor/GraphVisualization/visualizationData.ts
index 80e91c063577..7e63531559e8 100644
--- a/app/gui/src/project-view/components/GraphEditor/GraphVisualization/visualizationData.ts
+++ b/app/gui/src/project-view/components/GraphEditor/GraphVisualization/visualizationData.ts
@@ -1,10 +1,10 @@
 import { useGraphStore, useProjectStore } from '$/components/WithCurrentProject.vue'
+import { type NodeId } from '$/providers/openedProjects/graph/graphDatabase'
+import { TypeInfo } from '$/providers/openedProjects/project/computedValueRegistry'
+import type { NodeVisualizationConfiguration } from '$/providers/openedProjects/project/executionContext'
 import LoadingErrorVisualization from '@/components/visualizations/LoadingErrorVisualization.vue'
 import LoadingVisualization from '@/components/visualizations/LoadingVisualization.vue'
 import type { ToolbarItem } from '@/components/visualizations/toolbar'
-import type { NodeId } from '@/stores/graph/graphDatabase'
-import { TypeInfo } from '@/stores/project/computedValueRegistry'
-import type { NodeVisualizationConfiguration } from '@/stores/project/executionContext'
 import {
   DEFAULT_VISUALIZATION_CONFIGURATION,
   DEFAULT_VISUALIZATION_IDENTIFIER,
diff --git a/app/gui/src/project-view/components/GraphEditor/NodeWidget.vue b/app/gui/src/project-view/components/GraphEditor/NodeWidget.vue
index 80d731f33b91..4e24b5f1d2e9 100644
--- a/app/gui/src/project-view/components/GraphEditor/NodeWidget.vue
+++ b/app/gui/src/project-view/components/GraphEditor/NodeWidget.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useCurrentProject } from '$/components/WithCurrentProject.vue'
-import type { UpdateHandler, WidgetModule } from '@/providers/widgetRegistry'
-import { WidgetInput } from '@/providers/widgetRegistry'
+import type { UpdateHandler, WidgetModule } from '$/providers/openedProjects/widgetRegistry'
+import { WidgetInput } from '$/providers/openedProjects/widgetRegistry'
 import {
   injectWidgetUsageInfo,
   provideWidgetUsageInfo,
diff --git a/app/gui/src/project-view/components/GraphEditor/ResizableWidget.vue b/app/gui/src/project-view/components/GraphEditor/ResizableWidget.vue
index 4632c8c757b2..63f9d5c3e9d8 100644
--- a/app/gui/src/project-view/components/GraphEditor/ResizableWidget.vue
+++ b/app/gui/src/project-view/components/GraphEditor/ResizableWidget.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
+import { UpdateHandler, WidgetInput } from '$/providers/openedProjects/widgetRegistry'
 import ResizeHandles from '@/components/ResizeHandles.vue'
 import { useResizeObserver } from '@/composables/events'
 import { injectGraphNavigator } from '@/providers/graphNavigator'
 import { injectResizableWidgetRegistry } from '@/providers/resizableWidgetRegistry'
-import { WidgetInput, type UpdateHandler } from '@/providers/widgetRegistry'
 import { Rect } from '@/util/data/rect'
 import { Vec2 } from '@/util/data/vec2'
 import { computed, ref, watch } from 'vue'
diff --git a/app/gui/src/project-view/components/GraphEditor/WidgetTreeRoot.vue b/app/gui/src/project-view/components/GraphEditor/WidgetTreeRoot.vue
index 97a38917ad9b..a9bb537c31e4 100644
--- a/app/gui/src/project-view/components/GraphEditor/WidgetTreeRoot.vue
+++ b/app/gui/src/project-view/components/GraphEditor/WidgetTreeRoot.vue
@@ -1,11 +1,14 @@
 <script setup lang="ts">
+import {
+  emptyPrimaryApplication,
+  type PrimaryApplication,
+} from '$/providers/openedProjects/graph/graphDatabase'
+import { UpdateHandler, WidgetInput } from '$/providers/openedProjects/widgetRegistry'
+import { WidgetEditHandlerParent } from '$/providers/openedProjects/widgetRegistry/editHandler'
 import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
 import { useTransitioning } from '@/composables/animation'
 import { useLayoutAnimationsState } from '@/providers/animationCounter'
-import { WidgetInput, type UpdateHandler } from '@/providers/widgetRegistry'
-import { WidgetEditHandlerParent } from '@/providers/widgetRegistry/editHandler'
 import { provideWidgetTree } from '@/providers/widgetTree'
-import { emptyPrimaryApplication, type PrimaryApplication } from '@/stores/graph/graphDatabase'
 import { Ast } from '@/util/ast'
 import type { Opt } from '@/util/data/opt'
 import { templateRef } from '@vueuse/core'
diff --git a/app/gui/src/project-view/components/GraphEditor/__tests__/collapsing.test.ts b/app/gui/src/project-view/components/GraphEditor/__tests__/collapsing.test.ts
index 6f2c25854859..33229141f7cd 100644
--- a/app/gui/src/project-view/components/GraphEditor/__tests__/collapsing.test.ts
+++ b/app/gui/src/project-view/components/GraphEditor/__tests__/collapsing.test.ts
@@ -12,8 +12,8 @@ import { tryIdentifier } from '@/util/qualifiedName'
 import * as iter from 'enso-common/src/utilities/data/iter'
 import { expect, test } from 'vitest'
 import { watchEffect } from 'vue'
-import type { Identifier } from 'ydoc-shared/ast'
-import { nodeIdFromOuterAst } from '../../../stores/graph/graphDatabase'
+import { Identifier } from 'ydoc-shared/ast'
+import { nodeIdFromOuterAst } from '../../../../providers/openedProjects/graph/graphDatabase'
 
 // ===============================
 // === Collapse Analysis Tests ===
diff --git a/app/gui/src/project-view/components/GraphEditor/collapsing.ts b/app/gui/src/project-view/components/GraphEditor/collapsing.ts
index c11184b06120..391bb751dbca 100644
--- a/app/gui/src/project-view/components/GraphEditor/collapsing.ts
+++ b/app/gui/src/project-view/components/GraphEditor/collapsing.ts
@@ -1,5 +1,5 @@
-import type { GraphDb, NodeId } from '@/stores/graph/graphDatabase'
-import { nodeIdFromOuterAst } from '@/stores/graph/graphDatabase'
+import type { GraphDb, NodeId } from '$/providers/openedProjects/graph/graphDatabase'
+import { nodeIdFromOuterAst } from '$/providers/openedProjects/graph/graphDatabase'
 import { assert } from '@/util/assert'
 import { Ast } from '@/util/ast'
 import type { Identifier } from '@/util/ast/abstract'
diff --git a/app/gui/src/project-view/components/GraphEditor/graphClipboard.ts b/app/gui/src/project-view/components/GraphEditor/graphClipboard.ts
index 09d13391c951..3c857aad1cd5 100644
--- a/app/gui/src/project-view/components/GraphEditor/graphClipboard.ts
+++ b/app/gui/src/project-view/components/GraphEditor/graphClipboard.ts
@@ -1,9 +1,9 @@
+import type { Node } from '$/providers/openedProjects/graph'
 import {
   parseTsvData,
   tableToEnsoExpression,
 } from '@/components/GraphEditor/widgets/WidgetTableEditor/tableParsing'
 import type { NodeCreationOptions } from '@/composables/nodeCreation'
-import type { Node } from '@/stores/graph'
 import { nodeDocumentationText } from '@/util/ast/node'
 import { Vec2 } from '@/util/data/vec2'
 import * as iter from 'enso-common/src/utilities/data/iter'
diff --git a/app/gui/src/project-view/components/GraphEditor/nodesDragging.ts b/app/gui/src/project-view/components/GraphEditor/nodesDragging.ts
index c0889548e5ff..0d370f487d1d 100644
--- a/app/gui/src/project-view/components/GraphEditor/nodesDragging.ts
+++ b/app/gui/src/project-view/components/GraphEditor/nodesDragging.ts
@@ -1,7 +1,7 @@
-import { useGraphStore } from '$/components/WithCurrentProject.vue'
+import { useCurrentProject } from '$/components/WithCurrentProject.vue'
+import { type NodeId } from '$/providers/openedProjects/graph'
 import { useApproach } from '@/composables/animation'
 import { injectGraphSelection } from '@/providers/graphSelection'
-import type { NodeId } from '@/stores/graph'
 import { partitionPoint } from '@/util/data/array'
 import type { Opt } from '@/util/data/opt'
 import { Rect } from '@/util/data/rect'
@@ -112,7 +112,7 @@ export class SnapGrid {
  * The `offset` is always based of the nodes' initial positions.
  */
 export function useNodesDragging() {
-  const graphStore = useGraphStore()
+  const { module, graph } = useCurrentProject().storesRefs
   const selection = injectGraphSelection(true)
 
   // Logically, those fields could be inside CurrentDrag, but animations need component scope.
@@ -141,7 +141,7 @@ export function useNodesDragging() {
       function* draggedNodes(): Generator<[NodeId, DraggedNode]> {
         const ids = selection?.isSelected(movedId) ? selection.selected : [movedId]
         for (const id of ids) {
-          const node = graphStore.db.nodeIdToNode.get(id)
+          const node = graph.value.db.nodeIdToNode.get(id)
           if (node != null) yield [id, { initialPos: node.position, currentPos: node.position }]
         }
       }
@@ -161,8 +161,8 @@ export function useNodesDragging() {
       const oldSnappedOffset = snappedOffset.value
       const rects: Rect[] = []
       for (const [id, { initialPos }] of this.draggedNodes) {
-        const rect = graphStore.nodeRects.get(id)
-        const node = graphStore.db.nodeIdToNode.get(id)
+        const rect = graph.value.nodeRects.get(id)
+        const node = graph.value.db.nodeIdToNode.get(id)
         if (rect != null && node != null) rects.push(new Rect(initialPos.add(newOffset), rect.size))
       }
       const snap = this.grid.snappedMany(rects, DRAG_SNAP_THRESHOLD)
@@ -200,25 +200,25 @@ export function useNodesDragging() {
     private createSnapGrid() {
       const nonDraggedRects = computed(() => {
         const nonDraggedNodes = iter.filter(
-          graphStore.db.nodeIds(),
+          graph.value.db.nodeIds(),
           (id) => !this.draggedNodes.has(id),
         )
-        return Array.from(nonDraggedNodes, (id) => graphStore.nodeRects.get(id)!)
+        return Array.from(nonDraggedNodes, (id) => graph.value.nodeRects.get(id)!)
       })
       return new SnapGrid(nonDraggedRects)
     }
 
     private updateNodesPosition() {
-      graphStore.batchEdits(() => {
+      module.value.batchEdits(() => {
         for (const [id, dragged] of this.draggedNodes) {
-          const node = graphStore.db.nodeIdToNode.get(id)
+          const node = graph.value.db.nodeIdToNode.get(id)
           if (node == null) continue
           // If node was moved in other way than current dragging, we want to stop dragging it.
           if (node.position.distanceSquared(dragged.currentPos) > 1.0) {
             this.draggedNodes.delete(id)
           } else {
             dragged.currentPos = dragged.initialPos.add(snappedOffset.value)
-            graphStore.setNodePosition(id, dragged.currentPos)
+            graph.value.setNodePosition(id, dragged.currentPos)
           }
         }
       })
diff --git a/app/gui/src/project-view/components/GraphEditor/selectionActions.ts b/app/gui/src/project-view/components/GraphEditor/selectionActions.ts
index 3e75ba1216f0..72c6ac8951c4 100644
--- a/app/gui/src/project-view/components/GraphEditor/selectionActions.ts
+++ b/app/gui/src/project-view/components/GraphEditor/selectionActions.ts
@@ -1,6 +1,6 @@
+import { type Node } from '$/providers/openedProjects/graph'
 import { toggledAction } from '@/providers/action'
-import type { Node } from '@/stores/graph'
-import type { ToValue } from '@/util/reactivity'
+import { type ToValue } from '@/util/reactivity'
 import * as iter from 'enso-common/src/utilities/data/iter'
 import { computed, toValue } from 'vue'
 
diff --git a/app/gui/src/project-view/components/GraphEditor/toasts.ts b/app/gui/src/project-view/components/GraphEditor/toasts.ts
index 13647a5fcee2..ae5de4f9bec7 100644
--- a/app/gui/src/project-view/components/GraphEditor/toasts.ts
+++ b/app/gui/src/project-view/components/GraphEditor/toasts.ts
@@ -1,4 +1,4 @@
-import type { ProjectStore } from '@/stores/project'
+import { type ProjectStore } from '$/providers/openedProjects/project'
 import { useToast } from '@/util/toast'
 import { onScopeDispose } from 'vue'
 
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetAnyToTarget.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetAnyToTarget.vue
index 07aa3622aa4a..9baf2efed2cb 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetAnyToTarget.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetAnyToTarget.vue
@@ -1,11 +1,19 @@
 <script setup lang="ts">
 import { useCurrentProject } from '$/components/WithCurrentProject.vue'
+import {
+  SuggestionEntry,
+  SuggestionKind,
+} from '$/providers/openedProjects/suggestionDatabase/entry'
+import {
+  defineWidget,
+  Score,
+  WidgetInput,
+  widgetProps,
+} from '$/providers/openedProjects/widgetRegistry'
 import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
 import { withDropdownItems } from '@/components/GraphEditor/widgets/WidgetSelection.vue'
 import { ExpressionTag } from '@/components/GraphEditor/widgets/WidgetSelection/tags'
 import { injectFunctionInfo } from '@/providers/functionInfo'
-import { defineWidget, Score, WidgetInput, widgetProps } from '@/providers/widgetRegistry'
-import { SuggestionKind, type SuggestionEntry } from '@/stores/suggestionDatabase/entry'
 import { ANY_TYPE_QN } from '@/util/ensoTypes'
 import { ProjectPath } from '@/util/projectPath'
 import type { QualifiedName } from '@/util/qualifiedName'
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetApplication.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetApplication.vue
index f7784244006f..0ef31f9ca54a 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetApplication.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetApplication.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-import { useGraphStore } from '$/components/WithCurrentProject.vue'
+import { useCurrentProject } from '$/components/WithCurrentProject.vue'
+import { entryMethodPointer } from '$/providers/openedProjects/suggestionDatabase/entry'
+import { WidgetInput, defineWidget, widgetProps } from '$/providers/openedProjects/widgetRegistry'
 import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
 import { CallInfo } from '@/components/GraphEditor/widgets/WidgetFunction.vue'
 import SizeTransition from '@/components/SizeTransition.vue'
-import { WidgetInput, defineWidget, widgetProps } from '@/providers/widgetRegistry'
 import { injectWidgetTree } from '@/providers/widgetTree'
-import { entryMethodPointer } from '@/stores/suggestionDatabase/entry'
 import { Ast } from '@/util/ast'
 import { ArgumentApplication, ArgumentApplicationKey } from '@/util/callTree'
 import { computed } from 'vue'
@@ -15,7 +15,7 @@ const props = defineProps(widgetProps(widgetDefinition))
 const tree = injectWidgetTree()
 
 const application = computed(() => props.input[ArgumentApplicationKey])
-const graph = useGraphStore()
+const { module } = useCurrentProject().storesRefs
 
 const targetMaybePort = computed(() => {
   const target = application.value.target
@@ -25,7 +25,7 @@ const targetMaybePort = computed(() => {
     if (!application.value.calledFunction) return input
     const ptr = entryMethodPointer(application.value.calledFunction)
     if (!ptr) return input
-    const definition = graph.getMethodAst(ptr)
+    const definition = module.value.getMethodAst(ptr)
     if (!definition.ok) return input
     return input
   } else {
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetArgumentName.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetArgumentName.vue
index a2e3d8c4ed21..27e36d5dfef8 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetArgumentName.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetArgumentName.vue
@@ -1,8 +1,13 @@
 <script setup lang="ts">
+import { isRequiredArgument } from '$/providers/openedProjects/suggestionDatabase/entry'
+import {
+  Score,
+  WidgetInput,
+  defineWidget,
+  widgetProps,
+} from '$/providers/openedProjects/widgetRegistry'
 import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
 import { injectPortInfo } from '@/providers/portInfo'
-import { Score, WidgetInput, defineWidget, widgetProps } from '@/providers/widgetRegistry'
-import { isRequiredArgument } from '@/stores/suggestionDatabase/entry'
 import { Ast } from '@/util/ast'
 import { ApplicationKind, ArgumentInfoKey } from '@/util/callTree'
 import { computed } from 'vue'
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetBlank.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetBlank.vue
index 6ba75d772f23..0911700771ab 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetBlank.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetBlank.vue
@@ -1,5 +1,10 @@
 <script setup lang="ts">
-import { Score, WidgetInput, defineWidget, widgetProps } from '@/providers/widgetRegistry'
+import {
+  Score,
+  WidgetInput,
+  defineWidget,
+  widgetProps,
+} from '$/providers/openedProjects/widgetRegistry'
 import { Ast } from '@/util/ast'
 const _props = defineProps(widgetProps(widgetDefinition))
 </script>
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetCheckbox.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetCheckbox.vue
index 934c6284bbae..f80d8530ea37 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetCheckbox.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetCheckbox.vue
@@ -1,9 +1,14 @@
 <script setup lang="ts">
-import { useGraphStore, useSuggestionDbStore } from '$/components/WithCurrentProject.vue'
+import { useCurrentProject } from '$/components/WithCurrentProject.vue'
+import { requiredImportsByProjectPath } from '$/providers/openedProjects/module/imports'
+import {
+  Score,
+  WidgetInput,
+  defineWidget,
+  widgetProps,
+} from '$/providers/openedProjects/widgetRegistry'
 import { ArgumentNameShownKey } from '@/components/GraphEditor/widgets/WidgetArgumentName.vue'
 import CheckboxWidget from '@/components/widgets/CheckboxWidget.vue'
-import { Score, WidgetInput, defineWidget, widgetProps } from '@/providers/widgetRegistry'
-import { requiredImportsByProjectPath } from '@/stores/graph/imports'
 import { assert } from '@/util/assert'
 import { Ast } from '@/util/ast'
 import { ArgumentInfoKey } from '@/util/callTree'
@@ -12,12 +17,11 @@ import type { Identifier, QualifiedName } from '@/util/qualifiedName'
 import { computed } from 'vue'
 
 const props = defineProps(widgetProps(widgetDefinition))
-const graph = useGraphStore()
-const suggestionDb = useSuggestionDbStore()
+const { suggestionDb, module } = useCurrentProject().storesRefs
 
 const trueImport = computed(() =>
   requiredImportsByProjectPath(
-    suggestionDb.entries,
+    suggestionDb.value.entries,
     ProjectPath.create(
       'Standard.Base' as QualifiedName,
       'Data.Boolean.Boolean.True' as QualifiedName,
@@ -27,7 +31,7 @@ const trueImport = computed(() =>
 )
 const falseImport = computed(() =>
   requiredImportsByProjectPath(
-    suggestionDb.entries,
+    suggestionDb.value.entries,
     ProjectPath.create(
       'Standard.Base' as QualifiedName,
       'Data.Boolean.Boolean.False' as QualifiedName,
@@ -40,7 +44,7 @@ const value = computed({
     return WidgetInput.valueRepr(props.input)?.endsWith('True') ?? false
   },
   set(value) {
-    const edit = graph.startEdit()
+    const edit = module.value.startEdit()
     const theImport = value ? trueImport.value : falseImport.value
     const inputValue: Ast.Expression | string | undefined = props.input.value
     if (inputValue instanceof Ast.Ast) {
@@ -48,10 +52,10 @@ const value = computed({
         edit.getVersion(inputValue),
         value ? ('True' as Identifier) : ('False' as Identifier),
       )
-      if (requiresImport) graph.addMissingImports(edit, theImport)
+      if (requiresImport) module.value.addMissingImports(edit, theImport)
       props.updateCallback({ edit, directInteraction: true })
     } else {
-      graph.addMissingImports(edit, theImport)
+      module.value.addMissingImports(edit, theImport)
       props.updateCallback({
         edit,
         portUpdate: {
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetEnsoExpression.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetEnsoExpression.vue
index adfb24f0351a..246c70b93930 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetEnsoExpression.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetEnsoExpression.vue
@@ -1,13 +1,12 @@
 <script setup lang="ts">
-import { ensoSyntax } from '@/components/CodeEditor/ensoSyntax'
-import CodeMirrorWidgetBase from '@/components/GraphEditor/CodeMirrorWidgetBase.vue'
 import {
   defineWidget,
   Score,
   WidgetInput,
   widgetProps,
-  type HandledUpdate,
-} from '@/providers/widgetRegistry'
+} from '$/providers/openedProjects/widgetRegistry'
+import { ensoSyntax } from '@/components/CodeEditor/ensoSyntax'
+import CodeMirrorWidgetBase from '@/components/GraphEditor/CodeMirrorWidgetBase.vue'
 import { Ast } from '@/util/ast'
 import { defaultHighlightStyle, syntaxHighlighting } from '@codemirror/language'
 import { computed, ref, useTemplateRef } from 'vue'
@@ -46,7 +45,7 @@ const cmWidget = useTemplateRef('cmWidget')
 
 <script lang="ts">
 export const EnsoExpression: unique symbol = Symbol.for('WidgetInput:EnsoExpression')
-declare module '@/providers/widgetRegistry' {
+declare module '$/providers/openedProjects/widgetRegistry' {
   export interface WidgetInput {
     [EnsoExpression]?: {
       weakMatch?: boolean
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser.vue
index 76eeddf67dc1..e214c5f02524 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser.vue
@@ -1,5 +1,12 @@
 <script setup lang="ts">
-import { useGraphStore, useSuggestionDbStore } from '$/components/WithCurrentProject.vue'
+import { useCurrentProject } from '$/components/WithCurrentProject.vue'
+import { requiredImportsByProjectPath } from '$/providers/openedProjects/module/imports'
+import {
+  Score,
+  WidgetInput,
+  defineWidget,
+  widgetProps,
+} from '$/providers/openedProjects/widgetRegistry'
 import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
 import {
   SUPPORTED_DYNAMIC_CONFIG_KINDS,
@@ -16,14 +23,11 @@ import {
   type CustomDropdownItem,
   ExpressionTag,
 } from '@/components/GraphEditor/widgets/WidgetSelection/tags'
-import { Score, WidgetInput, defineWidget, widgetProps } from '@/providers/widgetRegistry'
-import { requiredImportsByProjectPath } from '@/stores/graph/imports'
 import { ArgumentInfoKey } from '@/util/callTree'
 import { computed } from 'vue'
 
 const props = defineProps(widgetProps(widgetDefinition))
-const graph = useGraphStore()
-const suggestionDb = useSuggestionDbStore()
+const { suggestionDb, module, graph } = useCurrentProject().storesRefs
 
 const reprType = computed(() => props.input[ArgumentInfoKey]?.info?.reprType)
 
@@ -35,7 +39,7 @@ const typeInfo = useBrowserTypeInfo({
 const currentPathAst = useCurrentPath({
   typeInfo,
   input: () => props.input.value,
-  getMethodPointer: (id) => graph.db.getMethodCallInfo(id)?.methodCall.methodPointer,
+  getMethodPointer: (id) => graph.value.db.getMethodCallInfo(id)?.methodCall.methodPointer,
 })
 
 const dialogKind = computed(() => {
@@ -59,10 +63,12 @@ const makeSetPathUpdate = useSetPath({
   currentPath: currentPathAst,
   preferRawPath: () => !!typeInfo.value.rawPath?.prefer,
   portId: () => props.input.portId,
-  edit: () => graph.startEdit(),
+  edit: () => module.value.startEdit(),
   addMissingConstructorImports: (edit, type) =>
-    graph.addMissingImports(edit, requiredImportsByProjectPath(suggestionDb.entries, type, true)) ==
-    null,
+    module.value.addMissingImports(
+      edit,
+      requiredImportsByProjectPath(suggestionDb.value.entries, type, true),
+    ) == null,
 })
 
 function setPath(type: 'file' | 'secret', path: string) {
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/browsableTypes.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/browsableTypes.ts
index 59bd2d2d8294..d7e08ee9bce4 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/browsableTypes.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/browsableTypes.ts
@@ -1,6 +1,6 @@
+import { type WidgetUpdate } from '$/providers/openedProjects/widgetRegistry'
 import { ExpressionTag } from '@/components/GraphEditor/widgets/WidgetSelection/tags'
-import type { PortId } from '@/providers/portInfo'
-import type { WidgetUpdate } from '@/providers/widgetRegistry'
+import { type PortId } from '@/providers/portInfo'
 import { Ast } from '@/util/ast'
 import { Pattern } from '@/util/ast/match'
 import type { DynamicConfig } from '@/util/callTree'
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/cloudBrowser.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/cloudBrowser.ts
index 1a8481366314..703413733ec5 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/cloudBrowser.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/cloudBrowser.ts
@@ -1,13 +1,13 @@
-import type { BrowserItem } from '@/components/GraphEditor/widgets/WidgetFileBrowser/browsableTypes'
-import type {
-  Actions,
-  CustomDropdownItem,
+import { type FileType } from '$/providers/openedProjects/widgetRegistry/configuration'
+import { type BrowserItem } from '@/components/GraphEditor/widgets/WidgetFileBrowser/browsableTypes'
+import {
+  type Actions,
+  type CustomDropdownItem,
 } from '@/components/GraphEditor/widgets/WidgetSelection/tags'
 import FileBrowserWidget from '@/components/widgets/FileBrowserWidget.vue'
-import type { FileType } from '@/providers/widgetRegistry/configuration'
-import type { Icon } from '@/util/iconMetadata/iconName'
-import type { ToValue } from '@/util/reactivity'
-import { computed, h, toValue, type ComputedRef } from 'vue'
+import { type Icon } from '@/util/iconMetadata/iconName'
+import { type ToValue } from '@/util/reactivity'
+import { computed, type ComputedRef, h, toValue } from 'vue'
 
 const TYPES = new Map<BrowserItem, { label: string; icon?: Icon }>([
   ['directory', { label: 'Choose directory in cloud…' }],
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/localBrowser.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/localBrowser.ts
index a0eece154030..737d8c364fb4 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/localBrowser.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/localBrowser.ts
@@ -1,6 +1,10 @@
-import type { BrowserItem } from '@/components/GraphEditor/widgets/WidgetFileBrowser/browsableTypes'
-import type { CustomDropdownItem } from '@/components/GraphEditor/widgets/WidgetSelection/tags'
-import { isExtensions, isFileTypes, type FileType } from '@/providers/widgetRegistry/configuration'
+import {
+  type FileType,
+  isExtensions,
+  isFileTypes,
+} from '$/providers/openedProjects/widgetRegistry/configuration'
+import { type BrowserItem } from '@/components/GraphEditor/widgets/WidgetFileBrowser/browsableTypes'
+import { type CustomDropdownItem } from '@/components/GraphEditor/widgets/WidgetSelection/tags'
 import { assert } from '@/util/assert'
 import type { FileFilter } from '@/util/fileFilter'
 import type { ToValue } from '@/util/reactivity'
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction.vue
index c7088db94f85..b747aef25b41 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction.vue
@@ -1,12 +1,6 @@
 <script setup lang="ts">
-import {
-  useGraphStore,
-  useProjectNames,
-  useProjectStore,
-} from '$/components/WithCurrentProject.vue'
-import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
-import { useWidgetFunctionCallInfo } from '@/components/GraphEditor/widgets/WidgetFunction/widgetFunctionCallInfo'
-import { injectFunctionInfo, provideFunctionInfo } from '@/providers/functionInfo'
+import { useCurrentProject, useProjectNames } from '$/components/WithCurrentProject.vue'
+import type { MethodCallInfo } from '$/providers/openedProjects/graph/graphDatabase'
 import {
   Score,
   WidgetInput,
@@ -14,8 +8,10 @@ import {
   widgetProps,
   type HandledUpdate,
   type WidgetUpdate,
-} from '@/providers/widgetRegistry'
-import type { MethodCallInfo } from '@/stores/graph/graphDatabase'
+} from '$/providers/openedProjects/widgetRegistry'
+import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
+import { useWidgetFunctionCallInfo } from '@/components/GraphEditor/widgets/WidgetFunction/widgetFunctionCallInfo'
+import { injectFunctionInfo, provideFunctionInfo } from '@/providers/functionInfo'
 import { assert, assertUnreachable } from '@/util/assert'
 import { Ast } from '@/util/ast'
 import type { AstId } from '@/util/ast/abstract'
@@ -34,15 +30,14 @@ import { computed } from 'vue'
 import { Ok } from 'ydoc-shared/util/data/result'
 
 const props = defineProps(widgetProps(widgetDefinition))
-const graph = useGraphStore()
-const project = useProjectStore()
+const { store: project, module, graph } = useCurrentProject().storesRefs
 
-const exprInfo = computed(() => graph.db.getExpressionInfo(props.input.value.externalId))
+const exprInfo = computed(() => graph.value.db.getExpressionInfo(props.input.value.externalId))
 const outputType = computed(() => exprInfo.value?.typeInfo?.primaryType)
 
 const { methodCallInfo, application, subject, subjectInfo } = useWidgetFunctionCallInfo(
   () => props.input,
-  graph.db,
+  () => graph.value.db,
   project,
   useProjectNames(),
 )
@@ -94,7 +89,7 @@ function handleArgUpdate(update: WidgetUpdate): HandledUpdate {
       directInteraction,
     } = update
 
-    const edit = update.edit ?? graph.startEdit()
+    const edit = update.edit ?? module.value.startEdit()
     // Find the updated argument by matching origin port/expression with the appropriate argument.
     // We are interested only in updates at the top level of the argument AST. Updates from nested
     // widgets do not need to be processed at the function application level.
@@ -189,7 +184,7 @@ function handleArgUpdate(update: WidgetUpdate): HandledUpdate {
             // Found the application with the argument to remove. Skip the argument and use the
             // application target's code. This is the final iteration of the loop.
             const appTree = edit.getVersion(argApp.appTree)
-            if (graph.db.isNodeId(appTree.externalId)) {
+            if (graph.value.db.isNodeId(appTree.externalId)) {
               // If the modified application is a node root, preserve its identity and metadata.
               appTree.updateValue((appTree) => appTree.function.take())
             } else {
@@ -220,7 +215,7 @@ function handleArgUpdate(update: WidgetUpdate): HandledUpdate {
 </script>
 <script lang="ts">
 export const CallInfo: unique symbol = Symbol.for('WidgetInput:CallInfo')
-declare module '@/providers/widgetRegistry' {
+declare module '$/providers/openedProjects/widgetRegistry' {
   export interface WidgetInput {
     [CallInfo]?: MethodCallInfo
   }
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction/__tests__/widgetFunctionCallInfo.test.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction/__tests__/widgetFunctionCallInfo.test.ts
index 67f0f4033f9e..cf9c0a371f6a 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction/__tests__/widgetFunctionCallInfo.test.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction/__tests__/widgetFunctionCallInfo.test.ts
@@ -1,21 +1,21 @@
-import {
-  GET_WIDGETS_METHOD,
-  WIDGETS_ENSO_MODULE,
-  useWidgetFunctionCallInfo,
-} from '@/components/GraphEditor/widgets/WidgetFunction/widgetFunctionCallInfo'
-import { WidgetInput } from '@/providers/widgetRegistry'
-import { parseWithSpans } from '@/stores/graph/__tests__/graphDatabase.test'
-import { TypeInfo } from '@/stores/project/computedValueRegistry'
-import type { NodeVisualizationConfiguration } from '@/stores/project/executionContext'
-import { mockProjectNameStore } from '@/stores/projectNames'
-import { entryMethodPointer } from '@/stores/suggestionDatabase/entry'
+import { TypeInfo } from '$/providers/openedProjects/project/computedValueRegistry'
+import { type NodeVisualizationConfiguration } from '$/providers/openedProjects/project/executionContext'
+import { mockProjectNameStore } from '$/providers/openedProjects/projectNames'
+import { entryMethodPointer } from '$/providers/openedProjects/suggestionDatabase/entry'
 import {
   makeArgument,
   makeConstructor,
   makeMethod,
   makeModuleMethod,
   makeStaticMethod,
-} from '@/stores/suggestionDatabase/mockSuggestion'
+} from '$/providers/openedProjects/suggestionDatabase/mockSuggestion'
+import { WidgetInput } from '$/providers/openedProjects/widgetRegistry'
+import {
+  GET_WIDGETS_METHOD,
+  WIDGETS_ENSO_MODULE,
+  useWidgetFunctionCallInfo,
+} from '@/components/GraphEditor/widgets/WidgetFunction/widgetFunctionCallInfo'
+import { parseWithSpans } from '@/stores/graph/__tests__/graphDatabase.test'
 import { assert } from '@/util/assert'
 import { Ast } from '@/util/ast'
 import { expect, test } from 'vitest'
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction/widgetFunctionCallInfo.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction/widgetFunctionCallInfo.ts
index 18a6df528c7b..b1b68549a2bd 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction/widgetFunctionCallInfo.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction/widgetFunctionCallInfo.ts
@@ -1,14 +1,14 @@
-import type { WidgetInput } from '@/providers/widgetRegistry'
+import type { GraphDb } from '$/providers/openedProjects/graph/graphDatabase'
+import { type ProjectStore } from '$/providers/openedProjects/project'
+import { type NodeVisualizationConfiguration } from '$/providers/openedProjects/project/executionContext'
+import { type ProjectNameStore } from '$/providers/openedProjects/projectNames'
+import { entryIsAnnotatable } from '$/providers/openedProjects/suggestionDatabase/entry'
+import type { WidgetInput } from '$/providers/openedProjects/widgetRegistry'
 import {
   argsWidgetConfigurationSchema,
   functionCallConfiguration,
   pending,
-  type FunctionCall,
-} from '@/providers/widgetRegistry/configuration'
-import type { GraphDb } from '@/stores/graph/graphDatabase'
-import type { NodeVisualizationConfiguration } from '@/stores/project/executionContext'
-import type { ProjectNameStore } from '@/stores/projectNames'
-import { entryIsAnnotatable } from '@/stores/suggestionDatabase/entry'
+} from '$/providers/openedProjects/widgetRegistry/configuration'
 import { Ast } from '@/util/ast'
 import {
   ArgumentApplication,
@@ -16,11 +16,10 @@ import {
   getMethodCallInfoRecursively,
   interpretCall,
 } from '@/util/callTree'
-import type { Result } from '@/util/data/result'
 import { ProjectPath } from '@/util/projectPath'
 import type { QualifiedName } from '@/util/qualifiedName'
 import type { ToValue } from '@/util/reactivity'
-import { computed, toValue, type Ref } from 'vue'
+import { computed, toValue } from 'vue'
 import type { Opt } from 'ydoc-shared/util/data/opt'
 import type { ExternalId } from 'ydoc-shared/yjsModel'
 
@@ -37,24 +36,23 @@ export const WIDGETS_ENSO_PATH = ProjectPath.create(
  */
 export function useWidgetFunctionCallInfo(
   input: ToValue<WidgetInput & { value: Ast.Expression }>,
-  graphDb: GraphDb,
-  project: {
-    useVisualizationData(config: Ref<Opt<NodeVisualizationConfiguration>>): Ref<Result<any> | null>
-    moduleProjectPath: Result<ProjectPath> | undefined
-  },
-  projectNames: ProjectNameStore,
+  graphDb: ToValue<GraphDb>,
+  project: ToValue<Pick<ProjectStore, 'useVisualizationData' | 'moduleProjectPath'>>,
+  projectNames: ToValue<ProjectNameStore>,
 ) {
-  const methodCallInfo = computed(() => getMethodCallInfoRecursively(toValue(input).value, graphDb))
+  const methodCallInfo = computed(() =>
+    getMethodCallInfoRecursively(toValue(input).value, toValue(graphDb)),
+  )
   const interpreted = computed(() => interpretCall(toValue(input).value))
 
   const appFunc = computed(() =>
     interpreted.value.kind === 'prefix' ? interpreted.value.func : undefined,
   )
 
-  const appFuncIsNodeUsage = computed(() => graphDb.isNodeUsage(appFunc.value?.id))
+  const appFuncIsNodeUsage = computed(() => toValue(graphDb).isNodeUsage(appFunc.value?.id))
 
   const subject = computed(() => getAccessOprSubject(appFunc.value))
-  const subjectInfo = computed(() => graphDb.getExpressionInfo(subject.value?.id))
+  const subjectInfo = computed(() => toValue(graphDb).getExpressionInfo(subject.value?.id))
 
   const selfArgumentPreapplied = computed(() => {
     const info = methodCallInfo.value
@@ -118,10 +116,12 @@ export function useWidgetFunctionCallInfo(
     ]
 
     let modulePath: ProjectPath = WIDGETS_ENSO_PATH
-    if (project.moduleProjectPath?.ok) {
-      modulePath = project.moduleProjectPath.value
+    const projectValue = toValue(project)
+    const projectNamesValue = toValue(projectNames)
+    if (projectValue.moduleProjectPath?.ok) {
+      modulePath = projectValue.moduleProjectPath.value
     }
-    const moduleFqn = projectNames.serializeProjectPathForBackend(modulePath)
+    const moduleFqn = projectNamesValue.serializeProjectPathForBackend(modulePath)
 
     const expressionId = widgetQuerySubjectExpressionId.value
     if (expressionId != null) {
@@ -141,7 +141,7 @@ export function useWidgetFunctionCallInfo(
       return {
         expressionId: toValue(input).value.externalId,
         visualizationModule: moduleFqn,
-        expression: `_ -> ${WIDGETS_ENSO_MODULE}.${GET_WIDGETS_METHOD} ${projectNames.printProjectPath(info.suggestion.memberOf)}`,
+        expression: `_ -> ${WIDGETS_ENSO_MODULE}.${GET_WIDGETS_METHOD} ${projectNamesValue.printProjectPath(info.suggestion.memberOf)}`,
         positionalArgumentsExpressions,
       }
     }
@@ -164,14 +164,15 @@ export function useWidgetFunctionCallInfo(
       const fullName = info?.suggestion.definitionPath
       const autoscopedName = '..' + info?.suggestion.name
       return (
-        cfg.possibleFunctions.get(projectNames.serializeProjectPathForBackend(fullName)) ??
+        cfg.possibleFunctions.get(toValue(projectNames).serializeProjectPathForBackend(fullName)) ??
         cfg.possibleFunctions.get(autoscopedName)
       )
     }
     return undefined
   })
 
-  const visualizationData = project.useVisualizationData(visualizationConfig)
+  // TODO[ao]:
+  const visualizationData = toValue(project).useVisualizationData(visualizationConfig)
 
   const widgetConfiguration = computed(() => {
     const data = visualizationData.value
@@ -198,7 +199,8 @@ export function useWidgetFunctionCallInfo(
   const application = computed(() => {
     const call = interpreted.value
     if (!call) return null
-    const noArgsCall = call.kind === 'prefix' ? graphDb.getMethodCallInfo(call.func.id) : undefined
+    const noArgsCall =
+      call.kind === 'prefix' ? toValue(graphDb).getMethodCallInfo(call.func.id) : undefined
 
     return ArgumentApplication.FromInterpretedWithInfo(call, {
       suggestion: methodCallInfo.value?.suggestion,
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunctionDef/ArgumentRow.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunctionDef/ArgumentRow.vue
index bb3df6660992..3699ed019c67 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunctionDef/ArgumentRow.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunctionDef/ArgumentRow.vue
@@ -1,5 +1,12 @@
 <script setup lang="ts">
 import { useCurrentProject } from '$/components/WithCurrentProject.vue'
+import {
+  rewritePortValueUpdate,
+  WidgetInput,
+  type UpdateHandler,
+  type WidgetUpdate,
+} from '$/providers/openedProjects/widgetRegistry'
+import { WidgetEditHandler } from '$/providers/openedProjects/widgetRegistry/editHandler'
 import { EnsoExpression } from '@/components/GraphEditor/widgets/WidgetEnsoExpression.vue'
 import {
   createDefaultExpressionOfKind,
@@ -9,15 +16,8 @@ import {
 import SelectionSubmenu from '@/components/GraphEditor/widgets/WidgetSelection/SelectionSubmenu.vue'
 import { EnsoTypeExpression } from '@/components/GraphEditor/widgets/WidgetTypeExpression.vue'
 import SvgIcon from '@/components/SvgIcon.vue'
-import type { DropdownEntry } from '@/components/widgets/DropdownWidget.vue'
-import { syntheticPortId, type PortId } from '@/providers/portInfo'
-import {
-  rewritePortValueUpdate,
-  WidgetInput,
-  type UpdateHandler,
-  type WidgetUpdate,
-} from '@/providers/widgetRegistry'
-import { WidgetEditHandler } from '@/providers/widgetRegistry/editHandler'
+import { type DropdownEntry } from '@/components/widgets/DropdownWidget.vue'
+import { PortId, syntheticPortId } from '@/providers/portInfo'
 import { Ast } from '@/util/ast'
 import { mapOrUndefined, type Opt } from '@/util/data/opt'
 import { Err, Ok } from '@/util/data/result'
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunctionName.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunctionName.vue
index 2dd4136e11e2..d26678ad7d62 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunctionName.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunctionName.vue
@@ -4,14 +4,13 @@ import {
   useProjectNames,
   useProjectStore,
 } from '$/components/WithCurrentProject.vue'
-import CodeMirrorWidgetBase from '@/components/GraphEditor/CodeMirrorWidgetBase.vue'
 import {
   defineWidget,
   Score,
   WidgetInput,
   widgetProps,
-  type UpdateResult,
-} from '@/providers/widgetRegistry'
+} from '$/providers/openedProjects/widgetRegistry'
+import CodeMirrorWidgetBase from '@/components/GraphEditor/CodeMirrorWidgetBase.vue'
 import { usePersisted } from '@/stores/persisted'
 import { Ast } from '@/util/ast'
 import { Err, Ok } from '@/util/data/result'
@@ -63,7 +62,7 @@ async function renameFunction(newName: string): Promise<UpdateResult> {
 
 <script lang="ts">
 export const FunctionName: unique symbol = Symbol.for('WidgetInput:FunctionName')
-declare module '@/providers/widgetRegistry' {
+declare module '$/providers/openedProjects/widgetRegistry' {
   export interface WidgetInput {
     [FunctionName]?: {
       /**
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetGroup.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetGroup.vue
index 4f25e9dab49f..e8150ba5e5eb 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetGroup.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetGroup.vue
@@ -1,6 +1,11 @@
 <script setup lang="ts">
+import {
+  Score,
+  WidgetInput,
+  defineWidget,
+  widgetProps,
+} from '$/providers/openedProjects/widgetRegistry'
 import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
-import { Score, WidgetInput, defineWidget, widgetProps } from '@/providers/widgetRegistry'
 import { Ast } from '@/util/ast'
 import { computed } from 'vue'
 
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetHierarchy.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetHierarchy.vue
index 5491750257ff..fada0389df94 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetHierarchy.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetHierarchy.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
+import { WidgetInput, defineWidget, widgetProps } from '$/providers/openedProjects/widgetRegistry'
 import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
-import { WidgetInput, defineWidget, widgetProps } from '@/providers/widgetRegistry'
 import { Ast } from '@/util/ast'
 import { computed } from 'vue'
 import { isToken } from 'ydoc-shared/ast'
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetIcon.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetIcon.vue
index dec0aeed7347..af6586f3a61b 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetIcon.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetIcon.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
+import { Score, defineWidget, widgetProps } from '$/providers/openedProjects/widgetRegistry'
 import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
 import GrowingSpinner from '@/components/shared/GrowingSpinner.vue'
 import SvgIcon from '@/components/SvgIcon.vue'
-import { Score, defineWidget, widgetProps } from '@/providers/widgetRegistry'
-import type { AnyWidgetIcon } from '@/util/icons'
+import { type AnyWidgetIcon } from '@/util/icons'
 import { computed } from 'vue'
 
 const props = defineProps(widgetProps(widgetDefinition))
@@ -13,7 +13,7 @@ const icon = computed(() => props.input[DisplayIcon].icon)
 
 <script lang="ts">
 export const DisplayIcon: unique symbol = Symbol.for('WidgetInput:DisplayIcon')
-declare module '@/providers/widgetRegistry' {
+declare module '$/providers/openedProjects/widgetRegistry' {
   export interface WidgetInput {
     [DisplayIcon]?: {
       icon: AnyWidgetIcon
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetMultiSelection.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetMultiSelection.vue
index 6faae946a658..c4c9a6f2558f 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetMultiSelection.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetMultiSelection.vue
@@ -1,5 +1,13 @@
 <script setup lang="ts">
 import { useCurrentProject } from '$/components/WithCurrentProject.vue'
+import {
+  Score,
+  WidgetInput,
+  defineWidget,
+  widgetProps,
+} from '$/providers/openedProjects/widgetRegistry'
+import { multipleChoiceConfiguration } from '$/providers/openedProjects/widgetRegistry/configuration'
+import { WidgetEditHandler } from '$/providers/openedProjects/widgetRegistry/editHandler'
 import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
 import SelectionArrow from '@/components/GraphEditor/widgets/WidgetSelection/SelectionArrow.vue'
 import SelectionSubmenu from '@/components/GraphEditor/widgets/WidgetSelection/SelectionSubmenu.vue'
@@ -12,9 +20,6 @@ import {
 import { unrefElement } from '@/composables/events'
 import { provideSelectionArrow } from '@/providers/selectionArrow'
 import { useTopLevelArgument } from '@/providers/topLevelArgument'
-import { Score, WidgetInput, defineWidget, widgetProps } from '@/providers/widgetRegistry'
-import { multipleChoiceConfiguration } from '@/providers/widgetRegistry/configuration'
-import { WidgetEditHandler } from '@/providers/widgetRegistry/editHandler'
 import { injectWidgetTree } from '@/providers/widgetTree'
 import { Ast } from '@/util/ast'
 import { targetIsOutside } from '@/util/autoBlur'
@@ -23,7 +28,7 @@ import { computed, ref, toRef, useTemplateRef } from 'vue'
 
 const props = defineProps(widgetProps(widgetDefinition))
 const {
-  graph,
+  module,
   names: projectNames,
   suggestionDb: suggestionDbStore,
 } = useCurrentProject().storesRefs
@@ -137,12 +142,11 @@ function onClick({
   tag: ExpressionTag | NestedChoiceTag
   selected: boolean
 }) {
-  if (!graph.value) return
   if (tag instanceof NestedChoiceTag) return
 
-  const edit = graph.value.startEdit()
+  const edit = module.value.startEdit()
   const directInteraction = true
-  const tagValue = tag.resolveExpression(edit, graph.value)
+  const tagValue = tag.resolveExpression(edit, module.value)
   const inputValue = editedValue.value ?? props.input.value
   if (inputValue instanceof Ast.Vector) {
     toggleVectorValue(edit.getVersion(inputValue), tagValue, previousState)
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetNumber.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetNumber.vue
index fb0c8d00ed2c..09c11eeae841 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetNumber.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetNumber.vue
@@ -1,7 +1,12 @@
 <script setup lang="ts">
+import {
+  Score,
+  WidgetInput,
+  defineWidget,
+  widgetProps,
+} from '$/providers/openedProjects/widgetRegistry'
+import { WidgetEditHandler } from '$/providers/openedProjects/widgetRegistry/editHandler'
 import NumericInputWidget from '@/components/widgets/NumericInputWidget.vue'
-import { Score, WidgetInput, defineWidget, widgetProps } from '@/providers/widgetRegistry'
-import { WidgetEditHandler } from '@/providers/widgetRegistry/editHandler'
 import { Ast } from '@/util/ast'
 import { targetIsOutside } from '@/util/autoBlur'
 import { unrefElement } from '@vueuse/core'
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetPort.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetPort.vue
index c751b28c5d75..5a6246ff2ac3 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetPort.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetPort.vue
@@ -1,5 +1,12 @@
 <script setup lang="ts">
 import { useGraphStore } from '$/components/WithCurrentProject.vue'
+import { PortViewInstance } from '$/providers/openedProjects/graph'
+import {
+  Score,
+  WidgetInput,
+  defineWidget,
+  widgetProps,
+} from '$/providers/openedProjects/widgetRegistry'
 import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
 import { useRaf } from '@/composables/animation'
 import { useResizeObserver } from '@/composables/events'
@@ -8,9 +15,7 @@ import { injectGraphNavigator } from '@/providers/graphNavigator'
 import { injectGraphSelection } from '@/providers/graphSelection'
 import { injectKeyboard } from '@/providers/keyboard'
 import { injectPortInfo, providePortInfo, type PortId } from '@/providers/portInfo'
-import { Score, WidgetInput, defineWidget, widgetProps } from '@/providers/widgetRegistry'
 import { injectWidgetTree } from '@/providers/widgetTree'
-import { PortViewInstance } from '@/stores/graph'
 import { assert } from '@/util/assert'
 import { Ast } from '@/util/ast'
 import { ArgumentInfoKey } from '@/util/callTree'
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelection.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelection.vue
index a64cd947ae42..60fc350d1113 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelection.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelection.vue
@@ -1,5 +1,14 @@
 <script setup lang="ts">
 import { useCurrentProject } from '$/components/WithCurrentProject.vue'
+import { type SuggestionEntryArgument } from '$/providers/openedProjects/suggestionDatabase/entry'
+import {
+  Score,
+  WidgetInput,
+  defineWidget,
+  widgetProps,
+} from '$/providers/openedProjects/widgetRegistry'
+import { singleChoiceConfiguration } from '$/providers/openedProjects/widgetRegistry/configuration'
+import { WidgetEditHandler } from '$/providers/openedProjects/widgetRegistry/editHandler'
 import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
 import SelectionArrow from '@/components/GraphEditor/widgets/WidgetSelection/SelectionArrow.vue'
 import SelectionSubmenu from '@/components/GraphEditor/widgets/WidgetSelection/SelectionSubmenu.vue'
@@ -20,11 +29,7 @@ import { unrefElement } from '@/composables/events'
 import { usePopoverRoot } from '@/providers/popoverRoot'
 import { provideSelectionArrow } from '@/providers/selectionArrow'
 import { useTopLevelArgument } from '@/providers/topLevelArgument'
-import { Score, WidgetInput, defineWidget, widgetProps } from '@/providers/widgetRegistry'
-import { singleChoiceConfiguration } from '@/providers/widgetRegistry/configuration'
-import { WidgetEditHandler } from '@/providers/widgetRegistry/editHandler'
 import { injectWidgetTree } from '@/providers/widgetTree'
-import type { SuggestionEntryArgument } from '@/stores/suggestionDatabase/entry'
 import { Ast } from '@/util/ast'
 import { targetIsOutside } from '@/util/autoBlur'
 import { ArgumentInfoKey } from '@/util/callTree'
@@ -34,7 +39,7 @@ import { computed, ref, shallowRef, toRef, toValue, useTemplateRef, type VNode }
 
 const props = defineProps(widgetProps(widgetDefinition))
 const {
-  graph,
+  module,
   names: projectNames,
   suggestionDb: suggestionDbStore,
 } = useCurrentProject().storesRefs
@@ -90,7 +95,7 @@ function makeExpressionFilter(pattern: Ast.Ast | string | undefined): Expression
 const expressionTags = useExpressionTags({
   dynamicConfig: () => props.input.dynamicConfig,
   staticTags: () => props.input[ArgumentInfoKey]?.info?.tagValues,
-  suggestionDb: () => suggestionDbStore.value?.entries,
+  suggestionDb: () => suggestionDbStore.value.entries,
   projectNames,
 })
 
@@ -210,10 +215,8 @@ function onClick(clickedEntry: Entry, keepOpen: boolean) {
 }
 
 function expressionTagClicked(tag: ExpressionTag) {
-  if (!graph.value) return
-
-  const edit = graph.value.startEdit()
-  const tagValue = tag.resolveExpression(edit, graph.value)
+  const edit = module.value.startEdit()
+  const tagValue = tag.resolveExpression(edit, module.value)
   props.updateCallback({
     edit,
     portUpdate: { value: tagValue, origin: props.input.portId },
@@ -262,7 +265,7 @@ export const widgetDefinition = defineWidget(
 )
 
 export { CustomDropdownItemsKey }
-declare module '@/providers/widgetRegistry' {
+declare module '$/providers/openedProjects/widgetRegistry' {
   export interface WidgetInput {
     [CustomDropdownItemsKey]?: readonly DropdownItem[]
   }
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelection/tags.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelection/tags.ts
index 97a89981f215..aac576c4152f 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelection/tags.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelection/tags.ts
@@ -1,15 +1,21 @@
-import type { SubmenuEntry } from '@/components/GraphEditor/widgets/WidgetSelection/submenuEntry'
-import type { Choice, WidgetConfiguration } from '@/providers/widgetRegistry/configuration'
-import type { GraphStore } from '@/stores/graph'
-import { printRequiredImport, requiredImports, type RequiredImport } from '@/stores/graph/imports'
-import type { ProjectNameStore } from '@/stores/projectNames'
-import { SuggestionDb } from '@/stores/suggestionDatabase'
+import { type ModuleStore } from '$/providers/openedProjects/module'
+import {
+  printRequiredImport,
+  type RequiredImport,
+  requiredImports,
+} from '$/providers/openedProjects/module/imports'
+import { type ProjectNameStore } from '$/providers/openedProjects/projectNames'
+import { SuggestionDb } from '$/providers/openedProjects/suggestionDatabase'
 import {
   entryDisplayPath,
   entryIsStatic,
   SuggestionKind,
-  type SuggestionEntry,
-} from '@/stores/suggestionDatabase/entry'
+} from '$/providers/openedProjects/suggestionDatabase/entry'
+import type {
+  Choice,
+  WidgetConfiguration,
+} from '$/providers/openedProjects/widgetRegistry/configuration'
+import type { SubmenuEntry } from '@/components/GraphEditor/widgets/WidgetSelection/submenuEntry'
 import { Ast } from '@/util/ast'
 import type { Opt } from '@/util/data/opt'
 import { isIconName, type Icon } from '@/util/iconMetadata/iconName'
@@ -135,9 +141,9 @@ export class ExpressionTag {
    * Add any needed imports to the provided module, and return the expression with any necessary
    * qualification.
    */
-  resolveExpression(edit: Ast.MutableModule, graph: GraphStore) {
+  resolveExpression(edit: Ast.MutableModule, module: ModuleStore) {
     if (this.requiredImports) {
-      const conflicts = graph.addMissingImports(edit, this.requiredImports)
+      const conflicts = module.addMissingImports(edit, this.requiredImports)
       if (conflicts != null && conflicts.length > 0) {
         // TODO: Substitution does not work, because we interpret imports wrongly. To be fixed in
         // https://github.com/enso-org/enso/issues/9356
@@ -244,8 +250,8 @@ export interface Entry extends SubmenuEntry<Entry> {
 export interface DynamicConfigTagsOptions {
   dynamicConfig: ToValue<Opt<WidgetConfiguration>>
   staticTags: ToValue<Opt<string[]>>
-  suggestionDb: ToValue<Opt<SuggestionDb>>
-  projectNames: Readonly<Ref<Opt<ProjectNameStore>>>
+  suggestionDb: ToValue<SuggestionDb>
+  projectNames: Readonly<Ref<ProjectNameStore>>
 }
 /** @returns The dropdown tags applicable to an expression. */
 export function useExpressionTags({
@@ -255,19 +261,13 @@ export function useExpressionTags({
   projectNames,
 }: DynamicConfigTagsOptions): ComputedRef<(ExpressionTag | NestedChoiceTag)[]> {
   const staticExpressionTags = computed((): ExpressionTag[] | null => {
-    const suggestionDbValue = toValue(suggestionDb)
-    const projectNamesValue = projectNames.value
-    if (!suggestionDbValue || !projectNamesValue) return null
-
     const tags = toValue(staticTags)
     if (tags == null) return null
-    return tags.map((t) => ExpressionTag.FromExpression(suggestionDbValue, projectNamesValue, t))
+    return tags.map((t) =>
+      ExpressionTag.FromExpression(toValue(suggestionDb), projectNames.value, t),
+    )
   })
   const dynamicTags = computed((): (ExpressionTag | NestedChoiceTag)[] | null => {
-    const suggestionDbValue = toValue(suggestionDb)
-    const projectNamesValue = projectNames.value
-    if (!suggestionDbValue || !projectNamesValue) return null
-
     const config = toValue(dynamicConfig)
     if (config?.kind !== 'Single_Choice' && config?.kind !== 'Multiple_Choice') return null
 
@@ -275,8 +275,8 @@ export function useExpressionTags({
       Array.isArray(choice.value) ?
         new NestedChoiceTag(choice.label ?? '…', choice.value.map(choiceToTag))
       : ExpressionTag.FromExpression(
-          suggestionDbValue,
-          projectNamesValue,
+          toValue(suggestionDb),
+          projectNames.value,
           choice.value,
           choice.label,
           choice.icon,
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelectionArrow.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelectionArrow.vue
index 8340dee0d993..26d51c576710 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelectionArrow.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelectionArrow.vue
@@ -1,9 +1,14 @@
 <script setup lang="ts">
+import {
+  Score,
+  WidgetInput,
+  defineWidget,
+  widgetProps,
+} from '$/providers/openedProjects/widgetRegistry'
 import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
 import { ArgumentNameShownKey } from '@/components/GraphEditor/widgets/WidgetArgumentName.vue'
 import { useMounted } from '@/composables/events'
 import { injectSelectionArrow } from '@/providers/selectionArrow'
-import { Score, WidgetInput, defineWidget, widgetProps } from '@/providers/widgetRegistry'
 import { Ast } from '@/util/ast'
 import { computed, ref } from 'vue'
 import { assert } from 'ydoc-shared/util/assert'
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelfAccessChain.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelfAccessChain.vue
index 217637960a4e..9dd820154d8c 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelfAccessChain.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelfAccessChain.vue
@@ -1,9 +1,14 @@
 <script setup lang="ts">
 import { useGraphStore } from '$/components/WithCurrentProject.vue'
+import {
+  Score,
+  WidgetInput,
+  defineWidget,
+  widgetProps,
+} from '$/providers/openedProjects/widgetRegistry'
 import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
 import { DisplayIcon } from '@/components/GraphEditor/widgets/WidgetIcon.vue'
 import { injectFunctionInfo } from '@/providers/functionInfo'
-import { Score, WidgetInput, defineWidget, widgetProps } from '@/providers/widgetRegistry'
 import { injectWidgetTree } from '@/providers/widgetTree'
 import { Ast } from '@/util/ast'
 import { unwrapGroups } from '@/util/ast/abstract'
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor.vue
index 349387256781..774653556d3d 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
-import { useGraphStore, useSuggestionDbStore } from '$/components/WithCurrentProject.vue'
+import { useCurrentProject } from '$/components/WithCurrentProject.vue'
+import { defineWidget, Score, widgetProps } from '$/providers/openedProjects/widgetRegistry'
+import { WidgetEditHandler } from '$/providers/openedProjects/widgetRegistry/editHandler'
 import { WidgetInputIsSpecificMethodCall } from '@/components/GraphEditor/widgets/WidgetFunction.vue'
 import {
   CELLS_LIMIT,
@@ -8,8 +10,6 @@ import {
   type RowData,
 } from '@/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument'
 import AgGridTableView from '@/components/shared/AgGridTableView.vue'
-import { defineWidget, Score, widgetProps } from '@/providers/widgetRegistry'
-import { WidgetEditHandler } from '@/providers/widgetRegistry/editHandler'
 import { targetIsOutside } from '@/util/autoBlur'
 import { ProjectPath } from '@/util/projectPath'
 import type { Identifier, QualifiedName } from '@/util/qualifiedName'
@@ -31,8 +31,7 @@ import TableHeader, { type HeaderParams } from './WidgetTableEditor/TableHeader.
 import { useTableEditHandler } from './WidgetTableEditor/editHandler'
 
 const props = defineProps(widgetProps(widgetDefinition))
-const graph = useGraphStore()
-const suggestionDb = useSuggestionDbStore()
+const { suggestionDb, module } = useCurrentProject().storesRefs
 const grid = ref<
   ComponentInstance<typeof AgGridTableView<RowData, any>> &
     ComponentExposed<typeof AgGridTableView<RowData, any>>
@@ -59,8 +58,8 @@ const config = computed(() => {
 
 const { rowData, columnDefs, moveColumn, moveRow, pasteFromClipboard } = useTableInputArgument(
   () => props.input,
-  graph,
-  suggestionDb.entries,
+  module,
+  () => suggestionDb.value.entries,
   props.updateCallback,
 )
 
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/__tests__/editHandler.test.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/__tests__/editHandler.test.ts
index 69d6f06f65bf..fb96b4ea0216 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/__tests__/editHandler.test.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/__tests__/editHandler.test.ts
@@ -1,7 +1,10 @@
+import {
+  WidgetEditHandler,
+  WidgetInstanceId,
+} from '$/providers/openedProjects/widgetRegistry/editHandler'
 import { InteractionHandler } from '@/providers/interactionHandler'
 import { PortId } from '@/providers/portInfo'
-import { WidgetEditHandler, WidgetInstanceId } from '@/providers/widgetRegistry/editHandler'
-import type { CellPosition } from 'ag-grid-enterprise'
+import { CellPosition } from 'ag-grid-enterprise'
 import { expect, test, vi } from 'vitest'
 import { nextTick } from 'vue'
 import { useTableEditHandler, type EditedCell } from '../editHandler'
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/__tests__/tableInputArgument.test.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/__tests__/tableInputArgument.test.ts
index 3f5ceefce971..3fd1c6e000f5 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/__tests__/tableInputArgument.test.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/__tests__/tableInputArgument.test.ts
@@ -1,3 +1,6 @@
+import { SuggestionDb } from '$/providers/openedProjects/suggestionDatabase'
+import { makeType } from '$/providers/openedProjects/suggestionDatabase/mockSuggestion'
+import { WidgetInput } from '$/providers/openedProjects/widgetRegistry'
 import {
   CELLS_LIMIT,
   DEFAULT_COLUMN_PREFIX,
@@ -8,10 +11,7 @@ import {
   useTableInputArgument,
 } from '@/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument'
 import { MenuItem } from '@/components/shared/AgGridTableView.vue'
-import { WidgetInput } from '@/providers/widgetRegistry'
-import type { RequiredImport } from '@/stores/graph/imports'
-import { SuggestionDb } from '@/stores/suggestionDatabase'
-import { makeType } from '@/stores/suggestionDatabase/mockSuggestion'
+import { type RequiredImport } from '@/stores/graph/imports'
 import { assert } from '@/util/assert'
 import { Ast } from '@/util/ast'
 import type { Identifier } from '@/util/ast/abstract'
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/editHandler.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/editHandler.ts
index 1d0d66f2b05e..f5bf2ab341e9 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/editHandler.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/editHandler.ts
@@ -1,8 +1,11 @@
+import {
+  WidgetEditHandler,
+  type WidgetEditHooks,
+} from '$/providers/openedProjects/widgetRegistry/editHandler'
 import { NEW_COLUMN_ID } from '@/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument'
-import { WidgetEditHandler, type WidgetEditHooks } from '@/providers/widgetRegistry/editHandler'
-import type { ToValue } from '@/util/reactivity'
-import type { CellPosition, StartEditingCellParams } from 'ag-grid-enterprise'
-import { computed, ref, toValue, watch, type ShallowRef } from 'vue'
+import { type ToValue } from '@/util/reactivity'
+import { type CellPosition, type StartEditingCellParams } from 'ag-grid-enterprise'
+import { computed, ref, type ShallowRef, toValue, watch } from 'vue'
 
 export interface EditedCell {
   rowIndex: number | 'header'
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts
index 48d82550670f..a9c2a30125e6 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts
@@ -1,7 +1,8 @@
+import { type ModuleStore } from '$/providers/openedProjects/module'
+import { requiredImportsByProjectPath } from '$/providers/openedProjects/module/imports'
+import type { SuggestionDb } from '$/providers/openedProjects/suggestionDatabase'
+import type { WidgetInput, WidgetUpdate } from '$/providers/openedProjects/widgetRegistry'
 import { commonContextMenuActions, type MenuItem } from '@/components/shared/AgGridTableView.vue'
-import type { WidgetInput, WidgetUpdate } from '@/providers/widgetRegistry'
-import { requiredImportsByProjectPath, type RequiredImport } from '@/stores/graph/imports'
-import type { SuggestionDb } from '@/stores/suggestionDatabase'
 import { Ast } from '@/util/ast'
 import { findIndexOpt } from '@/util/data/array'
 import { Err, Ok, transposeResult, unwrapOrWithLog, type Result } from '@/util/data/result'
@@ -134,16 +135,13 @@ export function tableInputCallMayBeHandled(call: Ast.Expression) {
  * A composable responsible for interpreting `Table.input` expressions, creating AGGrid column
  * definitions allowing also editing AST through AGGrid editing.
  * @param input the widget's input
- * @param graph the graph store
+ * @param module the module store
  * @param onUpdate callback called when AGGrid was edited by user, resulting in AST change.
  */
 export function useTableInputArgument(
   input: ToValue<WidgetInput & { value: Ast.Expression }>,
-  graph: {
-    startEdit(): Ast.MutableModule
-    addMissingImports(edit: Ast.MutableModule, newImports: RequiredImport[]): void
-  },
-  suggestions: SuggestionDb,
+  module: ToValue<Pick<ModuleStore, 'addMissingImports'>>,
+  suggestions: ToValue<SuggestionDb>,
   onUpdate: (update: WidgetUpdate) => void,
 ) {
   const errorMessagePreamble = 'Table Editor Widget should not have been matched'
@@ -273,7 +271,7 @@ export function useTableInputArgument(
     name: 'Remove Row',
     action: ({ node }: { node: { data: RowData | undefined } | null }) => {
       if (!node?.data) return
-      const edit = graph.startEdit()
+      const edit = toValue(module).startEdit()
       fixColumns(edit)
       removeRow(edit, node.data.index)
       onUpdate({ edit, directInteraction: true })
@@ -283,7 +281,7 @@ export function useTableInputArgument(
   const removeColumnMenuItem = (colId: Ast.AstId) => ({
     name: 'Remove Column',
     action: () => {
-      const edit = graph.startEdit()
+      const edit = toValue(module).startEdit()
       fixColumns(edit)
       removeColumn(edit, colId)
       onUpdate({ edit, directInteraction: true })
@@ -304,7 +302,7 @@ export function useTableInputArgument(
         type: 'newColumn',
         enabled: mayAddNewColumnCurrently.value,
         newColumnRequested: () => {
-          const edit = graph.startEdit()
+          const edit = toValue(module).startEdit()
           fixColumns(edit)
           addColumn(edit, `${DEFAULT_COLUMN_PREFIX}${columns.value.length + 1}`)
           onUpdate({ edit, directInteraction: true })
@@ -364,7 +362,7 @@ export function useTableInputArgument(
               return false
             }
             const ast = colData.at(data.index)
-            const edit = graph.startEdit()
+            const edit = toValue(module).startEdit()
             fixColumns(edit)
             if (data.index === rowCount.value) {
               addRow(edit, (colId) => (colId === col.id ? newValue : null))
@@ -380,7 +378,7 @@ export function useTableInputArgument(
             columnParams: {
               type: 'astColumn',
               nameSetter: (newName: string) => {
-                const edit = graph.startEdit()
+                const edit = toValue(module).startEdit()
                 const column = columns.value[i]
                 if (column == null) {
                   console.error('Tried to rename column no longer existing in code')
@@ -421,13 +419,13 @@ export function useTableInputArgument(
   )
 
   const nothingImport = computed(() =>
-    requiredImportsByProjectPath(suggestions, NOTHING_PATH, true),
+    requiredImportsByProjectPath(toValue(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)
+      toValue(module).addMissingImports(edit, nothingImport.value)
     }
     return ast
   }
@@ -441,7 +439,7 @@ export function useTableInputArgument(
       console.error('Cannot reorder columns on placeholders! This should not be possible in the UI')
       return
     }
-    const edit = graph.startEdit()
+    const edit = toValue(module).startEdit()
     const columns = edit.getVersion(columnsAst.value.value)
     const fromIndex = iter.find(columns.enumerate(), ([, ast]) => ast?.id === colId)?.[0]
     if (fromIndex != null) {
@@ -461,7 +459,7 @@ export function useTableInputArgument(
     }
     // If dragged out of grid, we do nothing.
     if (overIndex === -1) return
-    const edit = graph.startEdit()
+    const edit = toValue(module).startEdit()
     for (const col of columns.value) {
       const editedCol = edit.getVersion(col.data)
       editedCol.move(rowIndex, overIndex)
@@ -471,7 +469,7 @@ export function useTableInputArgument(
 
   function pasteFromClipboard(data: string[][], focusedCell: { rowIndex: number; colId: string }) {
     if (data.length === 0) return { rows: 0, columns: 0 }
-    const edit = graph.startEdit()
+    const edit = toValue(module).startEdit()
     const focusedColIndex =
       findIndexOpt(columns.value, ({ id }) => id === focusedCell.colId) ?? columns.value.length
 
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableMethod.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableMethod.vue
index 4be79d7eee40..7d74d6a9c9d7 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableMethod.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableMethod.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup>
+import { widgetProps } from '$/providers/openedProjects/widgetRegistry'
 import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
 import { injectFunctionInfo } from '@/providers/functionInfo'
 import { provideTableContext } from '@/providers/tableContext'
-import { widgetProps } from '@/providers/widgetRegistry'
 import { computed } from 'vue'
 
 defineProps(widgetProps(widgetDefinition))
@@ -13,8 +13,8 @@ provideTableContext(computed(() => fi.subject?.externalId))
 </script>
 
 <script lang="ts">
+import { defineWidget, Score } from '$/providers/openedProjects/widgetRegistry'
 import { WidgetInputIsSpecificMethodCall } from '@/components/GraphEditor/widgets/WidgetFunction.vue'
-import { defineWidget, Score } from '@/providers/widgetRegistry'
 import { ProjectPath } from '@/util/projectPath'
 import type { Identifier, QualifiedName } from '@/util/qualifiedName'
 
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetText.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetText.vue
index ab3ef575a36a..4ab53705d94b 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetText.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetText.vue
@@ -1,14 +1,14 @@
 <script setup lang="ts">
 import { useCurrentProject } from '$/components/WithCurrentProject.vue'
-import CodeMirrorWidgetBase from '@/components/GraphEditor/CodeMirrorWidgetBase.vue'
-import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
 import {
   defineWidget,
   type HandledUpdate,
   Score,
   WidgetInput,
   widgetProps,
-} from '@/providers/widgetRegistry'
+} from '$/providers/openedProjects/widgetRegistry'
+import CodeMirrorWidgetBase from '@/components/GraphEditor/CodeMirrorWidgetBase.vue'
+import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
 import { Ast } from '@/util/ast'
 import { useLanguageSupport } from '@/util/codemirror/language'
 import { computed, ref, useTemplateRef } from 'vue'
@@ -26,11 +26,10 @@ const textContents = computed(() =>
   props.input.value instanceof Ast.TextLiteral ? props.input.value.rawTextContent : '',
 )
 function acceptValue(text: string): HandledUpdate {
-  if (!currentProject.value) return Ok()
-  const graph = currentProject.value.graph
+  const module = currentProject.value.module
 
   if (props.input.value instanceof Ast.TextLiteral) {
-    const edit = graph.startEdit()
+    const edit = module.startEdit()
     const value = edit.getVersion(props.input.value)
     if (value.rawTextContent === text) return Ok()
     value.setRawTextContent(text)
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetToken.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetToken.vue
index 40a194947ecb..f27b85dfac02 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetToken.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetToken.vue
@@ -1,5 +1,10 @@
 <script setup lang="ts">
-import { Score, WidgetInput, defineWidget, widgetProps } from '@/providers/widgetRegistry'
+import {
+  Score,
+  WidgetInput,
+  defineWidget,
+  widgetProps,
+} from '$/providers/openedProjects/widgetRegistry'
 import { computed } from 'vue'
 import { Token as RawToken } from 'ydoc-shared/ast/generated/ast'
 
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTopLevelArgument.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTopLevelArgument.vue
index c7c94231ac92..43a647f102ef 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTopLevelArgument.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTopLevelArgument.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
+import { defineWidget, Score, widgetProps } from '$/providers/openedProjects/widgetRegistry'
 import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
 import { provideTopLevelArgument } from '@/providers/topLevelArgument'
-import { defineWidget, Score, widgetProps } from '@/providers/widgetRegistry'
 import { ApplicationKind, ArgumentInfoKey } from '@/util/callTree'
 import { useTemplateRef } from 'vue'
 
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTypeCast.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTypeCast.vue
index 59f5fd3599cb..52713e8d9eed 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTypeCast.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTypeCast.vue
@@ -1,6 +1,11 @@
 <script setup lang="ts">
+import {
+  defineWidget,
+  Score,
+  WidgetInput,
+  widgetProps,
+} from '$/providers/openedProjects/widgetRegistry'
 import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
-import { defineWidget, Score, WidgetInput, widgetProps } from '@/providers/widgetRegistry'
 import { injectWidgetTree } from '@/providers/widgetTree'
 import { Ast } from '@/util/ast'
 import { computed } from 'vue'
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTypeCastPort.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTypeCastPort.vue
index fcfa315d11fd..e33a8cfc0628 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTypeCastPort.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTypeCastPort.vue
@@ -5,14 +5,14 @@
  * This way aliasing analysis for connections still works as intended, but we have a nice port around the whole thing.
  * It also makes the updates affecting entire typecast, not only inner expression.
  */
-import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
 import {
   defineWidget,
   Score,
   WidgetInput,
   widgetProps,
-  type WidgetUpdate,
-} from '@/providers/widgetRegistry'
+  WidgetUpdate,
+} from '$/providers/openedProjects/widgetRegistry'
+import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
 import { Ast } from '@/util/ast'
 import { computed } from 'vue'
 
@@ -51,7 +51,7 @@ export const widgetDefinition = defineWidget(
 )
 
 export const IsTypeCastKey: unique symbol = Symbol.for('WidgetInput:IsTypeCast')
-declare module '@/providers/widgetRegistry' {
+declare module '$/providers/openedProjects/widgetRegistry' {
   export interface WidgetInput {
     [IsTypeCastKey]?: true | undefined
   }
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTypeExpression.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTypeExpression.vue
index 859a940baed8..9d1cff6a1134 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTypeExpression.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTypeExpression.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useSuggestionDbStore } from '$/components/WithCurrentProject.vue'
+import { defineWidget, Score, widgetProps } from '$/providers/openedProjects/widgetRegistry'
 import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
-import { defineWidget, Score, widgetProps } from '@/providers/widgetRegistry'
 import { computed } from 'vue'
 import { EnsoExpression } from './WidgetEnsoExpression.vue'
 import { withDropdownItems } from './WidgetSelection.vue'
@@ -18,7 +18,7 @@ const input = computed(() => ({
 
 <script lang="ts">
 export const EnsoTypeExpression: unique symbol = Symbol.for('WidgetInput:EnsoTypeExpression')
-declare module '@/providers/widgetRegistry' {
+declare module '$/providers/openedProjects/widgetRegistry' {
   export interface WidgetInput {
     [EnsoTypeExpression]?: object
   }
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetVector.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetVector.vue
index cf95988bbb07..69b5865a9138 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetVector.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetVector.vue
@@ -1,23 +1,28 @@
 <script setup lang="ts">
-import { useGraphStore } from '$/components/WithCurrentProject.vue'
+import { useCurrentProject } from '$/components/WithCurrentProject.vue'
+import {
+  defineWidget,
+  Score,
+  WidgetInput,
+  widgetProps,
+} from '$/providers/openedProjects/widgetRegistry'
+import { WidgetEditHandler } from '$/providers/openedProjects/widgetRegistry/editHandler'
 import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
 import DraggableList from '@/components/widgets/DraggableList.vue'
 import { injectGraphNavigator } from '@/providers/graphNavigator'
 import type { PortId } from '@/providers/portInfo'
-import { defineWidget, Score, WidgetInput, widgetProps } from '@/providers/widgetRegistry'
-import { WidgetEditHandler } from '@/providers/widgetRegistry/editHandler'
 import { injectWidgetTree } from '@/providers/widgetTree'
 import { Ast } from '@/util/ast'
 import { computed, shallowRef, toRef, toValue, watchEffect, type WatchSource } from 'vue'
 import { isAstId, MutableModule } from 'ydoc-shared/ast'
 
 const props = defineProps(widgetProps(widgetDefinition))
-const graph = useGraphStore()
+const project = useCurrentProject().ref
 const tree = injectWidgetTree()
 
 function doEdit(editFn: (ast: Ast.MutableVector) => void) {
   if (props.input.value instanceof Ast.Vector) {
-    const edit = graph.startEdit()
+    const edit = project.value.module.startEdit()
     editFn(edit.getVersion(props.input.value))
     props.updateCallback({ edit, directInteraction: true })
   } else {
diff --git a/app/gui/src/project-view/components/widgets/FileBrowserWidget.vue b/app/gui/src/project-view/components/widgets/FileBrowserWidget.vue
index 72cd4c7d51b4..a2b37826ae6b 100644
--- a/app/gui/src/project-view/components/widgets/FileBrowserWidget.vue
+++ b/app/gui/src/project-view/components/widgets/FileBrowserWidget.vue
@@ -6,6 +6,7 @@ export default {
 
 <script setup lang="ts">
 import { useBackends } from '$/providers/backends'
+import { FileType } from '$/providers/openedProjects/widgetRegistry/configuration'
 import ActionButton from '@/components/ActionButton.vue'
 import LoadingSpinner from '@/components/shared/LoadingSpinner.vue'
 import UpsertSecretPanel from '@/components/UpsertSecretPanel.vue'
@@ -32,7 +33,6 @@ import { useUserFiles } from '@/components/widgets/FileBrowserWidget/userFiles'
 import { useBackend } from '@/composables/backend'
 import { registerHandlers } from '@/providers/action'
 import { providePopoverRoot } from '@/providers/popoverRoot'
-import type { FileType } from '@/providers/widgetRegistry/configuration'
 import type { AnyAsset } from 'enso-common/src/services/Backend'
 import { assetIsDirectory, AssetType } from 'enso-common/src/services/Backend'
 import { computed, ref, toValue, useTemplateRef, watch } from 'vue'
diff --git a/app/gui/src/project-view/components/widgets/FileBrowserWidget/FileBrowserNameBar.vue b/app/gui/src/project-view/components/widgets/FileBrowserWidget/FileBrowserNameBar.vue
index 59c41ab5d25a..70c076447e81 100644
--- a/app/gui/src/project-view/components/widgets/FileBrowserWidget/FileBrowserNameBar.vue
+++ b/app/gui/src/project-view/components/widgets/FileBrowserWidget/FileBrowserNameBar.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import type { FileType } from '$/providers/openedProjects/widgetRegistry/configuration'
 import SelectionSubmenu, {
   type SubmenuComponent,
 } from '@/components/GraphEditor/widgets/WidgetSelection/SelectionSubmenu.vue'
@@ -7,7 +8,6 @@ import SvgIcon from '@/components/SvgIcon.vue'
 import AutoSizedInput from '@/components/widgets/AutoSizedInput.vue'
 import type { Filter } from '@/components/widgets/FileBrowserWidget/fileExtensionFilter'
 import { useFileExtensions } from '@/components/widgets/FileBrowserWidget/fileExtensions'
-import type { FileType } from '@/providers/widgetRegistry/configuration'
 import type { Opt } from '@/util/data/opt'
 import { toRef, useTemplateRef } from 'vue'
 
diff --git a/app/gui/src/project-view/components/widgets/FileBrowserWidget/fileExtensions.ts b/app/gui/src/project-view/components/widgets/FileBrowserWidget/fileExtensions.ts
index de2db879a9f2..0a6b13fc0f2d 100644
--- a/app/gui/src/project-view/components/widgets/FileBrowserWidget/fileExtensions.ts
+++ b/app/gui/src/project-view/components/widgets/FileBrowserWidget/fileExtensions.ts
@@ -1,15 +1,15 @@
+import {
+  type FileType,
+  isExtensions,
+  isFileTypes,
+  isGlobAll,
+} from '$/providers/openedProjects/widgetRegistry/configuration'
 import type SelectionSubmenu from '@/components/GraphEditor/widgets/WidgetSelection/SelectionSubmenu.vue'
 import type { SubmenuComponent } from '@/components/GraphEditor/widgets/WidgetSelection/SelectionSubmenu.vue'
 import type { SubmenuEntry } from '@/components/GraphEditor/widgets/WidgetSelection/submenuEntry'
 import type AutoSizedInput from '@/components/widgets/AutoSizedInput.vue'
 import type { Filter } from '@/components/widgets/FileBrowserWidget/fileExtensionFilter'
 import { injectInteractionHandler, type Interaction } from '@/providers/interactionHandler'
-import {
-  type FileType,
-  isExtensions,
-  isFileTypes,
-  isGlobAll,
-} from '@/providers/widgetRegistry/configuration'
 import { endOnClick, targetIsOutside } from '@/util/autoBlur'
 import type { ToValue } from '@/util/reactivity'
 import type { HTMLElementEventHandler } from '@/util/vueDom'
diff --git a/app/gui/src/project-view/composables/componentColors.ts b/app/gui/src/project-view/composables/componentColors.ts
index a23d21a3426c..c9f695c5fba1 100644
--- a/app/gui/src/project-view/composables/componentColors.ts
+++ b/app/gui/src/project-view/composables/componentColors.ts
@@ -1,5 +1,5 @@
-import type { NodeId } from '@/stores/graph'
-import type { GraphDb } from '@/stores/graph/graphDatabase'
+import type { NodeId } from '$/providers/openedProjects/graph'
+import type { GraphDb } from '$/providers/openedProjects/graph/graphDatabase'
 import type { Opt } from '@/util/data/opt'
 import type { ToValue } from '@/util/reactivity'
 import { computed, toValue } from 'vue'
diff --git a/app/gui/src/project-view/composables/nodeColors.ts b/app/gui/src/project-view/composables/nodeColors.ts
index d8115fbc79ac..84f17066c57e 100644
--- a/app/gui/src/project-view/composables/nodeColors.ts
+++ b/app/gui/src/project-view/composables/nodeColors.ts
@@ -1,6 +1,6 @@
-import type { GraphStore, NodeId } from '@/stores/graph'
-import type { NodeType } from '@/stores/graph/graphDatabase'
-import type { GroupInfo } from '@/stores/suggestionDatabase'
+import { type GraphStore, type NodeId } from '$/providers/openedProjects/graph'
+import type { NodeType } from '$/providers/openedProjects/graph/graphDatabase'
+import { type GroupInfo } from '$/providers/openedProjects/suggestionDatabase'
 import { colorFromString } from '@/util/colors'
 import { ProjectPath } from '@/util/projectPath'
 import { computed } from 'vue'
diff --git a/app/gui/src/project-view/composables/nodeCreation.ts b/app/gui/src/project-view/composables/nodeCreation.ts
index 03d82af399b5..7cb956b2ca5a 100644
--- a/app/gui/src/project-view/composables/nodeCreation.ts
+++ b/app/gui/src/project-view/composables/nodeCreation.ts
@@ -1,3 +1,8 @@
+import { type GraphStore, type NodeId } from '$/providers/openedProjects/graph'
+import { asNodeId } from '$/providers/openedProjects/graph/graphDatabase'
+import { type ModuleStore } from '$/providers/openedProjects/module'
+import type { RequiredImport } from '$/providers/openedProjects/module/imports'
+import type { Typename } from '$/providers/openedProjects/suggestionDatabase/entry'
 import {
   DEFAULT_NODE_SIZE,
   mouseDictatedPlacement,
@@ -5,10 +10,6 @@ import {
   usePlacement,
 } from '@/components/ComponentBrowser/placement'
 import type { GraphNavigator } from '@/providers/graphNavigator'
-import type { GraphStore, NodeId } from '@/stores/graph'
-import { asNodeId } from '@/stores/graph/graphDatabase'
-import type { RequiredImport } from '@/stores/graph/imports'
-import type { Typename } from '@/stores/suggestionDatabase/entry'
 import { Ast } from '@/util/ast'
 import { isIdentifier, substituteIdentifier, type Identifier } from '@/util/ast/abstract'
 import { partition } from '@/util/data/array'
@@ -56,7 +57,8 @@ export interface NodeCreationOptions<Placement extends PlacementStrategy = Place
 
 /** TODO: Add docs */
 export function useNodeCreation(
-  graphStore: GraphStore,
+  moduleStore: ToValue<Pick<ModuleStore, 'edit' | 'addMissingImports'>>,
+  graphStore: ToValue<GraphStore>,
   viewport: ToValue<GraphNavigator['viewport']>,
   sceneMousePos: ToValue<GraphNavigator['sceneMousePos']>,
   onCreated: (nodes: Set<NodeId>) => void,
@@ -78,7 +80,7 @@ export function useNodeCreation(
       : placement.type === 'mouseRelative' ? (tryMouseRelative(placement.posOffset) ?? place())
       : placement.type === 'mouseEvent' ? mouseDictatedPlacement(placement.position)
       : placement.type === 'source' ?
-        place(iter.filterDefined([graphStore.visibleArea(placement.node)]))
+        place(iter.filterDefined([toValue(graphStore).visibleArea(placement.node)]))
       : placement.type === 'fixed' ? placement.position
       : assertNever(placement)
     )
@@ -108,7 +110,7 @@ export function useNodeCreation(
     // other uncommitted nodes already placed in the same batch.
     const adjust = (pos: Vec2) => seekHorizontal(new Rect(pos, DEFAULT_NODE_SIZE), rects)
     placedOptions.push(...Array.from(independentNodesOptions, doPlace(adjust)))
-    rects.push(...graphStore.visibleNodeAreas)
+    rects.push(...toValue(graphStore).visibleNodeAreas)
     placedOptions.push(...Array.from(dependentNodesOptions, doPlace()))
     return placedOptions
   }
@@ -116,7 +118,8 @@ export function useNodeCreation(
   function createNodes(nodesOptions: Iterable<NodeCreationOptions>) {
     const placedNodes = placeNodes(nodesOptions)
     if (placedNodes.length === 0) return new Set()
-    const methodAst = graphStore.currentMethod.ast
+    const graph = toValue(graphStore)
+    const methodAst = graph.currentMethod.ast
     if (!methodAst.ok) {
       methodAst.error.log(`BUG: Cannot add node: No current function.`)
       return new Set()
@@ -124,7 +127,7 @@ export function useNodeCreation(
     const created = new Set<NodeId>()
     const createdIdentifiers = new Set<Identifier>()
     const identifiersRenameMap = new Map<Identifier, Identifier>()
-    graphStore.edit((edit) => {
+    toValue(moduleStore).edit((edit) => {
       const statements = new Array<Ast.Owned<Ast.MutableStatement>>()
       for (const options of placedNodes) {
         const rhs = Ast.parseExpression(options.expression, edit)
@@ -144,11 +147,11 @@ export function useNodeCreation(
         statements.push(rootExpression)
         created.add(id)
         assert(options.metadata?.position != null, 'Node should already be placed')
-        graphStore.nodeRects.set(id, new Rect(Vec2.FromXY(options.metadata.position), Vec2.Zero))
+        graph.nodeRects.set(id, new Rect(Vec2.FromXY(options.metadata.position), Vec2.Zero))
       }
       insertNodeStatements(edit.getVersion(methodAst.value).bodyAsBlock(), statements)
     })
-    graphStore.doAfterUpdate(() => onCreated(created))
+    graph.doAfterUpdate(() => onCreated(created))
   }
 
   /** We resolve import conflicts and substitute identifiers if needed. */
@@ -169,7 +172,8 @@ export function useNodeCreation(
     }
 
     // Resolve import conflicts.
-    const conflicts = graphStore.addMissingImports(edit, options.requiredImports ?? []) ?? []
+    const conflicts =
+      toValue(moduleStore).addMissingImports(edit, options.requiredImports ?? []) ?? []
     for (const _conflict of conflicts) {
       // TODO: Substitution does not work, because we interpret imports wrongly. To be fixed in
       // https://github.com/enso-org/enso/issues/9356
@@ -216,7 +220,7 @@ export function useNodeCreation(
       options.binding ? existingNameToPrefix(options.binding)
       : options.type ? typeToPrefix(options.type)
       : inferPrefixFromAst(expr)
-    const ident = graphStore.generateLocallyUniqueIdent(namePrefix, alreadyCreated)
+    const ident = toValue(graphStore).generateLocallyUniqueIdent(namePrefix, alreadyCreated)
     return ident
   }
 
diff --git a/app/gui/src/project-view/composables/selection.ts b/app/gui/src/project-view/composables/selection.ts
index 6d5e89db5dce..bad59de340dd 100644
--- a/app/gui/src/project-view/composables/selection.ts
+++ b/app/gui/src/project-view/composables/selection.ts
@@ -1,8 +1,8 @@
 /** @file A Vue composable for keeping track of selected DOM elements. */
+import { type NodeId } from '$/providers/openedProjects/graph'
 import { selectionMouseBindings } from '@/bindings'
 import { useEvent } from '@/composables/events'
 import type { PortId } from '@/providers/portInfo.ts'
-import type { NodeId } from '@/stores/graph'
 import type { Rect } from '@/util/data/rect'
 import { intersectionSize } from '@/util/data/set'
 import { Vec2 } from '@/util/data/vec2'
diff --git a/app/gui/src/project-view/composables/stackNavigator.ts b/app/gui/src/project-view/composables/stackNavigator.ts
index 9cbeb84dd254..93a7d7c63fbd 100644
--- a/app/gui/src/project-view/composables/stackNavigator.ts
+++ b/app/gui/src/project-view/composables/stackNavigator.ts
@@ -1,7 +1,7 @@
+import { type GraphStore, type NodeId } from '$/providers/openedProjects/graph'
+import { type ProjectStore } from '$/providers/openedProjects/project'
+import { type ProjectNameStore } from '$/providers/openedProjects/projectNames'
 import type { BreadcrumbItem } from '@/components/NavBreadcrumbs.vue'
-import type { GraphStore, NodeId } from '@/stores/graph'
-import type { ProjectStore } from '@/stores/project'
-import type { ProjectNameStore } from '@/stores/projectNames'
 import { methodPointerEquals, type StackItem } from '@/util/methodPointer'
 import { computed, onMounted, ref } from 'vue'
 
diff --git a/app/gui/src/project-view/composables/tableColumns.ts b/app/gui/src/project-view/composables/tableColumns.ts
index cd1ca563fff7..03cb2f82f6f4 100644
--- a/app/gui/src/project-view/composables/tableColumns.ts
+++ b/app/gui/src/project-view/composables/tableColumns.ts
@@ -1,6 +1,6 @@
-import type { ProjectStore } from '@/stores/project'
-import type { NodeVisualizationConfiguration } from '@/stores/project/executionContext'
-import type { ProjectNameStore } from '@/stores/projectNames'
+import type { ProjectStore } from '$/providers/openedProjects/project'
+import type { NodeVisualizationConfiguration } from '$/providers/openedProjects/project/executionContext'
+import type { ProjectNameStore } from '$/providers/openedProjects/projectNames'
 import { Ast } from '@/util/ast'
 import { ProjectPath } from '@/util/projectPath'
 import type { QualifiedName } from '@/util/qualifiedName'
diff --git a/app/gui/src/project-view/providers/__tests__/widgetRegistry.test.ts b/app/gui/src/project-view/providers/__tests__/widgetRegistry.test.ts
index 13bb2e10a9e9..fbc6e6fedcc2 100644
--- a/app/gui/src/project-view/providers/__tests__/widgetRegistry.test.ts
+++ b/app/gui/src/project-view/providers/__tests__/widgetRegistry.test.ts
@@ -5,7 +5,7 @@ import {
   defineWidget,
   type WidgetDefinition,
   type WidgetModule,
-} from '@/providers/widgetRegistry'
+} from '$/providers/openedProjects/widgetRegistry'
 import { GraphDb } from '@/stores/graph/graphDatabase'
 import { Ast } from '@/util/ast'
 import { ApplicationKind, ArgumentInfoKey } from '@/util/callTree'
diff --git a/app/gui/src/project-view/providers/asyncResources/context.ts b/app/gui/src/project-view/providers/asyncResources/context.ts
index 5f17ea339afb..bfa07e5efe8f 100644
--- a/app/gui/src/project-view/providers/asyncResources/context.ts
+++ b/app/gui/src/project-view/providers/asyncResources/context.ts
@@ -36,7 +36,7 @@ export function captureResourceContext(context: ResourceContext): ResourceContex
 export function useCurrentProjectResourceContext(): ResourceContext {
   const currentProject = useCurrentProject(true)
   return {
-    project: () => currentProject?.id.value ?? undefined,
+    project: () => currentProject?.ref.value.store.id ?? undefined,
     basePathSegments: () => {
       if (!currentProject) return
       const openedProjectStore = currentProject.storesRefs.store.value
diff --git a/app/gui/src/project-view/providers/functionInfo.ts b/app/gui/src/project-view/providers/functionInfo.ts
index 788ebc73e573..e4bf113c68c3 100644
--- a/app/gui/src/project-view/providers/functionInfo.ts
+++ b/app/gui/src/project-view/providers/functionInfo.ts
@@ -1,8 +1,8 @@
+import type { MethodCallInfo } from '$/providers/openedProjects/graph/graphDatabase'
+import { type ExpressionInfo } from '$/providers/openedProjects/project/computedValueRegistry'
 import { createContextStore } from '@/providers'
-import type { MethodCallInfo } from '@/stores/graph/graphDatabase'
-import type { ExpressionInfo } from '@/stores/project/computedValueRegistry'
-import type { Ast } from '@/util/ast'
-import type { ProjectPath } from '@/util/projectPath'
+import { Ast } from '@/util/ast'
+import { ProjectPath } from '@/util/projectPath'
 import { identity } from '@vueuse/core'
 
 interface FunctionInfo {
diff --git a/app/gui/src/project-view/providers/graphSelection.ts b/app/gui/src/project-view/providers/graphSelection.ts
index 34c2175d14bd..d9090d8bee9f 100644
--- a/app/gui/src/project-view/providers/graphSelection.ts
+++ b/app/gui/src/project-view/providers/graphSelection.ts
@@ -1,7 +1,7 @@
+import { type NodeId } from '$/providers/openedProjects/graph'
 import type { NavigatorComposable } from '@/composables/navigator'
 import { useGraphHover, useSelection, type SelectionOptions } from '@/composables/selection'
 import { createContextStore } from '@/providers'
-import type { NodeId } from '@/stores/graph'
 import type { Rect } from '@/util/data/rect'
 import { proxyRefs } from '@/util/reactivity'
 import type { ExternalId } from 'ydoc-shared/yjsModel'
diff --git a/app/gui/src/project-view/providers/languageSupportExtensions.ts b/app/gui/src/project-view/providers/languageSupportExtensions.ts
index b598623be47d..3f9e660ee903 100644
--- a/app/gui/src/project-view/providers/languageSupportExtensions.ts
+++ b/app/gui/src/project-view/providers/languageSupportExtensions.ts
@@ -1,7 +1,7 @@
+import type { ProjectStore } from '$/providers/openedProjects/project'
+import type { ProjectNameStore } from '$/providers/openedProjects/projectNames'
+import type { SuggestionDb } from '$/providers/openedProjects/suggestionDatabase'
 import { createContextStore } from '@/providers'
-import type { ProjectStore } from '@/stores/project'
-import type { ProjectNameStore } from '@/stores/projectNames'
-import type { SuggestionDb } from '@/stores/suggestionDatabase'
 import { useTableExpressionExtension } from '@/util/codemirror/language/tableExpression'
 import type { ToValue } from '@/util/reactivity'
 import type { Extension } from '@codemirror/state'
diff --git a/app/gui/src/project-view/providers/widgetTree.ts b/app/gui/src/project-view/providers/widgetTree.ts
index 6ae336caee4e..7b4d8fb39491 100644
--- a/app/gui/src/project-view/providers/widgetTree.ts
+++ b/app/gui/src/project-view/providers/widgetTree.ts
@@ -1,6 +1,6 @@
+import { type PrimaryApplication } from '$/providers/openedProjects/graph/graphDatabase'
+import { type WidgetEditHandlerRoot } from '$/providers/openedProjects/widgetRegistry/editHandler'
 import { createContextStore } from '@/providers'
-import type { WidgetEditHandlerRoot } from '@/providers/widgetRegistry/editHandler'
-import type { PrimaryApplication } from '@/stores/graph/graphDatabase'
 import { Ast } from '@/util/ast'
 import type { Opt } from '@/util/data/opt'
 import { proxyRefs } from '@/util/reactivity'
diff --git a/app/gui/src/project-view/providers/widgetUsageInfo.ts b/app/gui/src/project-view/providers/widgetUsageInfo.ts
index e09438e9c6c1..dec456ec96f1 100644
--- a/app/gui/src/project-view/providers/widgetUsageInfo.ts
+++ b/app/gui/src/project-view/providers/widgetUsageInfo.ts
@@ -1,5 +1,6 @@
+import type { WidgetComponent, WidgetInput } from '$/providers/openedProjects/widgetRegistry'
+import { type UpdateHandler } from '$/providers/openedProjects/widgetRegistry'
 import { createContextStore } from '@/providers'
-import type { UpdateHandler, WidgetComponent, WidgetInput } from '@/providers/widgetRegistry'
 import { identity } from '@vueuse/core'
 
 export const [provideWidgetUsageInfo, injectWidgetUsageInfo] = createContextStore(
diff --git a/app/gui/src/project-view/stores/persisted.ts b/app/gui/src/project-view/stores/persisted.ts
index 4858e59a4444..31f54faf22bf 100644
--- a/app/gui/src/project-view/stores/persisted.ts
+++ b/app/gui/src/project-view/stores/persisted.ts
@@ -9,7 +9,7 @@ import { proxyRefs, type ToValue } from '@/util/reactivity'
 import { until } from '@vueuse/core'
 import { encoding } from 'lib0'
 import { computed, toValue } from 'vue'
-import type { GraphStore } from './graph'
+import { type GraphStore } from '../../providers/openedProjects/graph'
 
 export type PersistedStore = ReturnType<typeof usePersisted>
 
diff --git a/app/gui/src/project-view/stores/projectFiles.ts b/app/gui/src/project-view/stores/projectFiles.ts
index 50543416438d..e8ed1310eae3 100644
--- a/app/gui/src/project-view/stores/projectFiles.ts
+++ b/app/gui/src/project-view/stores/projectFiles.ts
@@ -1,9 +1,9 @@
+import { type ProjectStore } from '$/providers/openedProjects/project'
 import { bytesToHex, Hash } from '@noble/hashes/utils'
 import { Error as DataError } from 'ydoc-shared/binaryProtocol'
 import { ErrorCode, RemoteRpcError } from 'ydoc-shared/languageServer'
-import type { Path } from 'ydoc-shared/languageServerTypes'
+import { type Path } from 'ydoc-shared/languageServerTypes'
 import { Err, Ok, type Result, withContext } from 'ydoc-shared/util/data/result'
-import type { ProjectStore } from './project'
 
 export type ProjectFiles = ReturnType<typeof useProjectFiles>
 
diff --git a/app/gui/src/project-view/stores/visualization/index.ts b/app/gui/src/project-view/stores/visualization/index.ts
index 0aeefc0b6191..42984b5164bb 100644
--- a/app/gui/src/project-view/stores/visualization/index.ts
+++ b/app/gui/src/project-view/stores/visualization/index.ts
@@ -1,3 +1,5 @@
+import { type ProjectStore } from '$/providers/openedProjects/project'
+import { TypeInfo } from '$/providers/openedProjects/project/computedValueRegistry'
 import * as geoMapVisualization from '@/components/visualizations/GeoMapVisualization.vue'
 import * as imageBase64Visualization from '@/components/visualizations/ImageBase64Visualization.vue'
 import * as jsonVisualization from '@/components/visualizations/JSONVisualization'
@@ -6,7 +8,6 @@ import * as sqlVisualization from '@/components/visualizations/SQLVisualization.
 import * as tableVisualization from '@/components/visualizations/TableVisualization.vue'
 import * as warningsVisualization from '@/components/visualizations/WarningsVisualization.vue'
 import { createContextStore } from '@/providers'
-import type { ProjectStore } from '@/stores/project'
 import {
   compile,
   currentProjectProtocol,
@@ -30,7 +31,6 @@ 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'
-import { TypeInfo } from '../project/computedValueRegistry'
 
 /** The directory in the project under which custom visualizations can be found. */
 const customVisualizationsDirectory = 'visualizations'
diff --git a/app/gui/src/project-view/util/__tests__/callTree.test.ts b/app/gui/src/project-view/util/__tests__/callTree.test.ts
index 3134d21f49e6..fc85d399e575 100644
--- a/app/gui/src/project-view/util/__tests__/callTree.test.ts
+++ b/app/gui/src/project-view/util/__tests__/callTree.test.ts
@@ -1,12 +1,10 @@
-import * as widgetCfg from '@/providers/widgetRegistry/configuration'
-import { GraphDb } from '@/stores/graph/graphDatabase'
 import {
   ComputedValueRegistry,
   TypeInfo,
   type ExpressionInfo,
-} from '@/stores/project/computedValueRegistry'
-import { SuggestionDb } from '@/stores/suggestionDatabase'
-import type { SuggestionEntry } from '@/stores/suggestionDatabase/entry'
+} from '$/providers/openedProjects/project/computedValueRegistry'
+import { SuggestionDb } from '$/providers/openedProjects/suggestionDatabase'
+import { type SuggestionEntry } from '$/providers/openedProjects/suggestionDatabase/entry'
 import {
   makeArgument,
   makeConstructor,
@@ -14,7 +12,9 @@ import {
   makeModule,
   makeModuleMethod,
   makeType,
-} from '@/stores/suggestionDatabase/mockSuggestion'
+} from '$/providers/openedProjects/suggestionDatabase/mockSuggestion'
+import * as widgetCfg from '$/providers/openedProjects/widgetRegistry/configuration'
+import { GraphDb } from '@/stores/graph/graphDatabase'
 import { Ast } from '@/util/ast'
 import type { AstId } from '@/util/ast/abstract'
 import {
diff --git a/app/gui/src/project-view/util/__tests__/projectPath.test.ts b/app/gui/src/project-view/util/__tests__/projectPath.test.ts
index 5b4ebc16726a..23bebcf8de67 100644
--- a/app/gui/src/project-view/util/__tests__/projectPath.test.ts
+++ b/app/gui/src/project-view/util/__tests__/projectPath.test.ts
@@ -1,4 +1,4 @@
-import { mockProjectNameStore } from '@/stores/projectNames'
+import { mockProjectNameStore } from '$/providers/openedProjects/projectNames'
 import { unwrap } from '@/util/data/result'
 import { ProjectPath } from '@/util/projectPath'
 import type { QualifiedName } from '@/util/qualifiedName'
diff --git a/app/gui/src/project-view/util/__tests__/qualifiedName.test.ts b/app/gui/src/project-view/util/__tests__/qualifiedName.test.ts
index e1ed38d0f438..c5945d32143d 100644
--- a/app/gui/src/project-view/util/__tests__/qualifiedName.test.ts
+++ b/app/gui/src/project-view/util/__tests__/qualifiedName.test.ts
@@ -1,4 +1,4 @@
-import { mockProjectNameStore } from '@/stores/projectNames'
+import { mockProjectNameStore } from '$/providers/openedProjects/projectNames'
 import { unwrap } from '@/util/data/result'
 import {
   isQualifiedName,
diff --git a/app/gui/src/project-view/util/ast/node.ts b/app/gui/src/project-view/util/ast/node.ts
index 92f16116ca82..2240aa6a0408 100644
--- a/app/gui/src/project-view/util/ast/node.ts
+++ b/app/gui/src/project-view/util/ast/node.ts
@@ -1,5 +1,8 @@
-import type { NodeDataFromAst } from '@/stores/graph'
-import { emptyPrimaryApplication, type PrimaryApplication } from '@/stores/graph/graphDatabase'
+import type { NodeDataFromAst } from '$/providers/openedProjects/graph'
+import {
+  emptyPrimaryApplication,
+  type PrimaryApplication,
+} from '$/providers/openedProjects/graph/graphDatabase'
 import { Ast } from '@/util/ast'
 import { Prefixes } from '@/util/ast/prefixes'
 import { computed } from 'vue'
diff --git a/app/gui/src/project-view/util/callTree.ts b/app/gui/src/project-view/util/callTree.ts
index e2a23b15fc84..bd0becd72798 100644
--- a/app/gui/src/project-view/util/callTree.ts
+++ b/app/gui/src/project-view/util/callTree.ts
@@ -1,15 +1,15 @@
+import { WidgetInput } from '$/providers/openedProjects/widgetRegistry'
+import type { WidgetConfiguration } from '$/providers/openedProjects/widgetRegistry/configuration'
+import * as widgetCfg from '$/providers/openedProjects/widgetRegistry/configuration'
+import { DisplayMode } from '$/providers/openedProjects/widgetRegistry/configuration'
 import { syntheticPortId, type PortId } from '@/providers/portInfo'
-import { WidgetInput } from '@/providers/widgetRegistry'
-import type { WidgetConfiguration } from '@/providers/widgetRegistry/configuration'
-import * as widgetCfg from '@/providers/widgetRegistry/configuration'
-import { DisplayMode } from '@/providers/widgetRegistry/configuration'
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-import type { GraphDb, MethodCallInfo } from '@/stores/graph/graphDatabase'
+import { type GraphDb, type MethodCallInfo } from '$/providers/openedProjects/graph/graphDatabase'
 import {
   isRequiredArgument,
   type CallableSuggestionEntry,
   type SuggestionEntryArgument,
-} from '@/stores/suggestionDatabase/entry'
+} from '$/providers/openedProjects/suggestionDatabase/entry'
 import { Ast } from '@/util/ast'
 import type { AstId } from '@/util/ast/abstract'
 import { findLastIndex, tryGetIndex } from '@/util/data/array'
@@ -562,7 +562,7 @@ export function getMethodCallInfoRecursively(
 
 export const ArgumentApplicationKey: unique symbol = Symbol.for('WidgetInput:ArgumentApplication')
 export const ArgumentInfoKey: unique symbol = Symbol.for('WidgetInput:ArgumentInfo')
-declare module '@/providers/widgetRegistry' {
+declare module '$/providers/openedProjects/widgetRegistry' {
   export interface WidgetInput {
     [ArgumentApplicationKey]?: ArgumentApplication
     [ArgumentInfoKey]?: {
diff --git a/app/gui/src/project-view/util/codemirror/language/tableExpression/index.ts b/app/gui/src/project-view/util/codemirror/language/tableExpression/index.ts
index 4406c15372d9..929f89cf5368 100644
--- a/app/gui/src/project-view/util/codemirror/language/tableExpression/index.ts
+++ b/app/gui/src/project-view/util/codemirror/language/tableExpression/index.ts
@@ -1,9 +1,9 @@
+import type { ProjectStore } from '$/providers/openedProjects/project'
+import type { ProjectNameStore } from '$/providers/openedProjects/projectNames'
+import type { SuggestionDb } from '$/providers/openedProjects/suggestionDatabase'
+import type { MethodSuggestionEntry } from '$/providers/openedProjects/suggestionDatabase/entry'
 import { useTableColumns } from '@/composables/tableColumns'
 import { useTableContext } from '@/providers/tableContext'
-import type { ProjectStore } from '@/stores/project'
-import type { ProjectNameStore } from '@/stores/projectNames'
-import type { SuggestionDb } from '@/stores/suggestionDatabase'
-import type { MethodSuggestionEntry } from '@/stores/suggestionDatabase/entry'
 import { ProjectPath } from '@/util/projectPath'
 import type { QualifiedName } from '@/util/qualifiedName'
 import type { ToValue } from '@/util/reactivity'
diff --git a/app/gui/src/project-view/util/getIconName.ts b/app/gui/src/project-view/util/getIconName.ts
index 65e688a767ac..7e6c5edfb04d 100644
--- a/app/gui/src/project-view/util/getIconName.ts
+++ b/app/gui/src/project-view/util/getIconName.ts
@@ -1,12 +1,15 @@
-import type { NodeId } from '@/stores/graph'
-import type { GraphDb } from '@/stores/graph/graphDatabase'
-import { evaluationProgress } from '@/stores/project/computedValueRegistry'
-import { SuggestionKind, type SuggestionEntry } from '@/stores/suggestionDatabase/entry'
-import type { Icon } from '@/util/iconMetadata/iconName'
-import type { MethodPointer } from '@/util/methodPointer'
-import type { ProjectPath } from '@/util/projectPath'
-import type { QualifiedName } from '@/util/qualifiedName'
-import type { ToValue } from '@/util/reactivity'
+import { type NodeId } from '$/providers/openedProjects/graph'
+import { type GraphDb } from '$/providers/openedProjects/graph/graphDatabase'
+import { evaluationProgress } from '$/providers/openedProjects/project/computedValueRegistry'
+import {
+  SuggestionKind,
+  type SuggestionEntry,
+} from '$/providers/openedProjects/suggestionDatabase/entry'
+import { type Icon } from '@/util/iconMetadata/iconName'
+import { type MethodPointer } from '@/util/methodPointer'
+import { type ProjectPath } from '@/util/projectPath'
+import { type QualifiedName } from '@/util/qualifiedName'
+import { type ToValue } from '@/util/reactivity'
 import { computed, toValue, type ComputedRef } from 'vue'
 import type { ExternalId } from 'ydoc-shared/yjsModel'
 import type { AnyIcon, AnyWidgetIcon } from './icons'
@@ -81,7 +84,7 @@ export function iconOfNode(node: NodeId, graphDb: GraphDb) {
  * representing its current status.
  */
 export function useDisplayedIcon(
-  graphDb: GraphDb,
+  graphDb: ToValue<GraphDb>,
   externalId: ToValue<ExternalId | undefined>,
   baseIcon: ToValue<AnyIcon>,
 ): {
@@ -89,7 +92,7 @@ export function useDisplayedIcon(
 } {
   return {
     displayedIcon: computed(() =>
-      evaluationProgress(graphDb.getExpressionInfo(toValue(externalId))) == null ?
+      evaluationProgress(toValue(graphDb).getExpressionInfo(toValue(externalId))) == null ?
         toValue(baseIcon)
       : '$evaluating',
     ),
diff --git a/app/gui/src/project-view/util/methodPointer.ts b/app/gui/src/project-view/util/methodPointer.ts
index b16bdb9c9d56..55639241f838 100644
--- a/app/gui/src/project-view/util/methodPointer.ts
+++ b/app/gui/src/project-view/util/methodPointer.ts
@@ -1,7 +1,7 @@
-import type { ProjectNameStore } from '@/stores/projectNames'
+import { type ProjectNameStore } from '$/providers/openedProjects/projectNames'
 import { Ok, type Result } from '@/util/data/result'
-import type { ProjectPath } from '@/util/projectPath'
-import type { QualifiedName } from '@/util/qualifiedName'
+import { type ProjectPath } from '@/util/projectPath'
+import { type QualifiedName } from '@/util/qualifiedName'
 import * as encoding from 'lib0/encoding'
 import type { Identifier, IdentifierOrOperatorIdentifier } from 'ydoc-shared/ast'
 import type {
diff --git a/app/gui/src/providers/openedProjects.ts b/app/gui/src/providers/openedProjects.ts
index ed9f7b8783d6..8e849f69e4d5 100644
--- a/app/gui/src/providers/openedProjects.ts
+++ b/app/gui/src/providers/openedProjects.ts
@@ -1,18 +1,24 @@
 import { ProjectId } from '#/services/Backend'
+import { createGraphStore, type GraphStore } from '$/providers/openedProjects/graph'
+import { createProjectStore, type ProjectStore } from '$/providers/openedProjects/project'
+import { createProjectNameStore, type ProjectNameStore } from '$/providers/openedProjects/projectNames'
+import {
+  createSuggestionDbStore,
+  type SuggestionDbStore,
+} from '$/providers/openedProjects/suggestionDatabase'
+import { WidgetRegistry } from '$/providers/openedProjects/widgetRegistry'
 import { createContextStore } from '@/providers'
-import { WidgetRegistry } from '@/providers/widgetRegistry'
-import { createGraphStore, type GraphStore } from '@/stores/graph'
-import { createProjectStore, type LsUrls, type ProjectStore } from '@/stores/project'
-import { createProjectNameStore, type ProjectNameStore } from '@/stores/projectNames'
-import { createSuggestionDbStore, type SuggestionDbStore } from '@/stores/suggestionDatabase'
 import { assert } from '@/util/assert'
 import { EffectScope, effectScope, shallowReactive, toValue, type ToRefs } from 'vue'
+import { createModuleStore, type ModuleStore } from './openedProjects/module'
+import { type LsUrls } from './openedProjects/project/project'
 
 /** All stores of a single opened project */
 export interface OpenedProject {
   store: ProjectStore
   names: ProjectNameStore
   suggestionDb: SuggestionDbStore
+  module: ModuleStore
   graph: GraphStore
   widgetRegistry: WidgetRegistry
 }
@@ -53,7 +59,7 @@ export const [provideOpenedProjects, injectOpenedProjects] = createContextStore(
       new Map<ProjectId, OpenedProject & { storesScope: EffectScope }>(),
     )
 
-    function registerProject(props: ToRefs<ProjectProps>) {
+    async function registerProject(props: ToRefs<ProjectProps>) {
       const { projectId, projectDisplayedName, projectNamespace } = props
       assert(!projects.has(toValue(projectId)), 'Registering already registered project')
       const storesScope = effectScope()
@@ -73,11 +79,13 @@ export const [provideOpenedProjects, injectOpenedProjects] = createContextStore(
           names,
         )
         const suggestionDb = createSuggestionDbStore(store, names)
-        const graph = createGraphStore(store, suggestionDb, names)
+        const module = createModuleStore(store, names, suggestionDb)
+        const graph = createGraphStore(store, suggestionDb, names, module)
         const widgetRegistry = new WidgetRegistry(graph.db)
         projects.set(toValue(projectId), {
           names,
           store,
+          module,
           suggestionDb,
           graph,
           widgetRegistry,
diff --git a/app/gui/src/project-view/stores/graph/__tests__/graphDatabase.test.ts b/app/gui/src/providers/openedProjects/graph/__tests__/graphDatabase.test.ts
similarity index 100%
rename from app/gui/src/project-view/stores/graph/__tests__/graphDatabase.test.ts
rename to app/gui/src/providers/openedProjects/graph/__tests__/graphDatabase.test.ts
diff --git a/app/gui/src/project-view/stores/graph/__tests__/imports.test.ts b/app/gui/src/providers/openedProjects/graph/__tests__/imports.test.ts
similarity index 98%
rename from app/gui/src/project-view/stores/graph/__tests__/imports.test.ts
rename to app/gui/src/providers/openedProjects/graph/__tests__/imports.test.ts
index 74689a55418d..7bd54b3e3952 100644
--- a/app/gui/src/project-view/stores/graph/__tests__/imports.test.ts
+++ b/app/gui/src/providers/openedProjects/graph/__tests__/imports.test.ts
@@ -1,3 +1,12 @@
+import { mockProjectNameStore } from '$/providers/openedProjects/projectNames'
+import { SuggestionDb } from '$/providers/openedProjects/suggestionDatabase'
+import {
+  makeConstructor,
+  makeMethod,
+  makeModule,
+  makeStaticMethod,
+  makeType,
+} from '$/providers/openedProjects/suggestionDatabase/mockSuggestion'
 import {
   addImports,
   covers,
@@ -9,15 +18,6 @@ import {
   type Import,
   type RequiredImport,
 } from '@/stores/graph/imports'
-import { mockProjectNameStore } from '@/stores/projectNames'
-import { SuggestionDb } from '@/stores/suggestionDatabase'
-import {
-  makeConstructor,
-  makeMethod,
-  makeModule,
-  makeStaticMethod,
-  makeType,
-} from '@/stores/suggestionDatabase/mockSuggestion'
 import { Ast } from '@/util/ast'
 import { unwrap } from '@/util/data/result'
 import { tryIdentifier, tryQualifiedName, type Identifier } from '@/util/qualifiedName'
diff --git a/app/gui/src/project-view/stores/graph/index.ts b/app/gui/src/providers/openedProjects/graph/graph.ts
similarity index 71%
rename from app/gui/src/project-view/stores/graph/index.ts
rename to app/gui/src/providers/openedProjects/graph/graph.ts
index 2bb472550812..7a9f4d30ca24 100644
--- a/app/gui/src/project-view/stores/graph/index.ts
+++ b/app/gui/src/providers/openedProjects/graph/graph.ts
@@ -1,25 +1,28 @@
+import {
+  GraphDb,
+  nodeIdFromOuterAst,
+  type NodeId,
+} from '$/providers/openedProjects/graph/graphDatabase'
+import {
+  useUnconnectedEdges,
+  type UnconnectedEdge,
+} from '$/providers/openedProjects/graph/unconnectedEdges'
+import { type RequiredImport } from '$/providers/openedProjects/module/imports'
+import { type ProjectStore } from '$/providers/openedProjects/project'
+import { type ProjectNameStore } from '$/providers/openedProjects/projectNames'
+import { type SuggestionDbStore } from '$/providers/openedProjects/suggestionDatabase'
+import { type Typename } from '$/providers/openedProjects/suggestionDatabase/entry'
+import type {
+  UpdateHandler,
+  UpdateResult,
+  WidgetUpdate,
+} from '$/providers/openedProjects/widgetRegistry'
 import { usePlacement } from '@/components/ComponentBrowser/placement'
 import type { PortId } from '@/providers/portInfo'
-import type { WidgetUpdate } from '@/providers/widgetRegistry'
-import { GraphDb, nodeIdFromOuterAst, type NodeId } from '@/stores/graph/graphDatabase'
-import {
-  addImports,
-  analyzeImports,
-  detectImportConflicts,
-  filterOutRedundantImports,
-  type AbstractImport,
-  type DetectedConflict,
-  type RequiredImport,
-} from '@/stores/graph/imports'
-import { useUnconnectedEdges, type UnconnectedEdge } from '@/stores/graph/unconnectedEdges'
-import type { ProjectStore } from '@/stores/project'
-import type { ProjectNameStore } from '@/stores/projectNames'
-import type { SuggestionDbStore } from '@/stores/suggestionDatabase'
-import { assert, assertDefined, assertNever } from '@/util/assert'
+import { assert, assertNever } from '@/util/assert'
 import { Ast } from '@/util/ast'
 import type { AstId, Identifier, MutableModule } from '@/util/ast/abstract'
 import { isAstId, isIdentifier } from '@/util/ast/abstract'
-import { reactiveModule } from '@/util/ast/reactive'
 import { partition } from '@/util/data/array'
 import { stringUnionToArray, type Events } from '@/util/data/observable'
 import { Rect } from '@/util/data/rect'
@@ -46,18 +49,12 @@ import {
   type ShallowReactive,
   type ShallowRef,
 } from 'vue'
-import { SourceDocument } from 'ydoc-shared/ast/sourceDocument'
 import type { ExpressionUpdate, Path as LsPath } from 'ydoc-shared/languageServerTypes'
 import { reachable } from 'ydoc-shared/util/data/graph'
-import type {
-  ExternalId,
-  LocalUserActionOrigin,
-  Origin,
-  VisualizationMetadata,
-} from 'ydoc-shared/yjsModel'
-import { defaultLocalOrigin, visMetadataEquals } from 'ydoc-shared/yjsModel'
+import type { ExternalId, VisualizationMetadata } from 'ydoc-shared/yjsModel'
+import { visMetadataEquals } from 'ydoc-shared/yjsModel'
 import * as Y from 'yjs'
-import type { Typename } from '../suggestionDatabase/entry'
+import { type ModuleStore } from '../module'
 
 const FALLBACK_BINDING_PREFIX = 'node'
 
@@ -73,7 +70,7 @@ export type {
   NodeDataFromAst,
   NodeDataFromMetadata,
   NodeId,
-} from '@/stores/graph/graphDatabase'
+} from '$/providers/openedProjects/graph/graphDatabase'
 
 export interface NodeEditInfo {
   id: NodeId
@@ -92,7 +89,7 @@ export class PortViewInstance {
     public rect: ShallowRef<Rect | undefined>,
     public expectedType: Ref<Typename | undefined>,
     public nodeId: NodeId,
-    public onUpdate: (update: WidgetUpdate) => void,
+    public onUpdate: UpdateHandler,
   ) {
     markRaw(this)
   }
@@ -141,9 +138,8 @@ export function createGraphStore(
   proj: ProjectStore,
   suggestionDb: SuggestionDbStore,
   projectNames: ProjectNameStore,
+  module: ModuleStore,
 ) {
-  proj.setObservedFileName('Main.enso')
-
   const { run: cleanup, register: onCleanup } =
     useCallbackRegistry<Parameters<(key: NodeId) => void>>()
   const nodeState = {
@@ -176,50 +172,7 @@ export function createGraphStore(
   const portInstances = shallowReactive(new Map<PortId, Set<PortViewInstance>>())
   const editedNodeInfo = ref<NodeEditInfo>()
 
-  const moduleSource = SourceDocument.Empty(reactive)
-  const moduleRoot = ref<Ast.BodyBlock>()
-  const syncModule = computed(() => moduleRoot.value?.module as Ast.MutableModule | undefined)
-
-  watch(
-    () => proj.module,
-    (projModule, _, onCleanup) => {
-      if (!projModule) return
-      const module = reactiveModule(projModule.doc.ydoc, onCleanup)
-      const handle = module.observe((update) => {
-        const root = module.root()
-        if (root instanceof Ast.BodyBlock) {
-          moduleRoot.value = root
-          if (
-            update.nodesAdded.size != 0 ||
-            update.nodesDeleted.size != 0 ||
-            update.nodesUpdated.size != 0 ||
-            update.updateRoots.size != 0
-          ) {
-            moduleSource.applyUpdate(module, update)
-            db.updateExternalIds(root)
-          }
-          // We can cast maps of unknown metadata fields to `NodeMetadata` because all `NodeMetadata` fields are optional.
-          const nodeMetadataUpdates = update.metadataUpdated as any as {
-            id: AstId
-            changes: Ast.NodeMetadata
-          }[]
-          for (const { id, changes } of nodeMetadataUpdates) db.updateMetadata(id, changes)
-        } else {
-          moduleRoot.value = undefined
-        }
-      })
-      onCleanup(() => {
-        module.unobserve(handle)
-        moduleSource.clear()
-      })
-    },
-  )
-
-  const immediateMethodAst = computed<Result<Ast.FunctionDef>>(() =>
-    syncModule.value ?
-      getExecutedMethodAst(syncModule.value)
-    : Err('Graph editor not yet initialized'),
-  )
+  const immediateMethodAst = computed<Result<Ast.FunctionDef>>(() => getExecutedMethodAst())
 
   // When renaming a function, we temporarily lose track of edited function AST. Ensure that we
   // still resolve it before the refactor code change is received.
@@ -237,7 +190,7 @@ export function createGraphStore(
 
   const fallbackMethodAst = computed(() => {
     const id = lastKnownResolvedMethodAstId.value
-    const ast = id != null ? syncModule.value?.tryGet(id) : undefined
+    const ast = id != null ? module.ast.tryGet(id) : undefined
     if (ast instanceof Ast.FunctionDef) return ast
     return undefined
   })
@@ -269,8 +222,8 @@ export function createGraphStore(
   })
 
   watchEffect(() => {
-    if (methodAst.value.ok && moduleSource.text)
-      db.updateBindings(methodAst.value.value, moduleSource)
+    if (methodAst.value.ok && module.source.text)
+      db.updateBindings(methodAst.value.value, module.source)
   })
 
   const currentMethodPointer = computed((): Result<MethodPointer> => {
@@ -291,25 +244,8 @@ export function createGraphStore(
     }
   })
 
-  function getExecutedMethodAst(module?: Ast.Module): Result<Ast.FunctionDef> {
-    return andThen(currentMethodPointer.value, (ptr) => getMethodAst(ptr, module))
-  }
-
-  function getMethodAst(ptr: MethodPointer, edit?: Ast.Module): Result<Ast.FunctionDef> {
-    const topLevel = (edit ?? syncModule.value)?.root()
-    if (!topLevel) return Err('Module unavailable')
-    assert(topLevel instanceof Ast.BodyBlock)
-    if (!proj.moduleProjectPath?.ok)
-      return proj.moduleProjectPath ?? Err('Unknown module project path')
-    if (!ptr.module.equals(proj.moduleProjectPath.value))
-      return Err('Cannot read method from different module')
-    if (!ptr.module.equals(ptr.definedOnType)) return Err('Method pointer is not a module method')
-    const method = Ast.findModuleMethod(topLevel, ptr.name)
-    if (!method) {
-      const modulePath = projectNames.printProjectPath(proj.moduleProjectPath.value)
-      return Err(`No method with name ${ptr.name} in ${modulePath}`)
-    }
-    return Ok(method.statement)
+  function getExecutedMethodAst(edit?: Ast.Module): Result<Ast.FunctionDef> {
+    return andThen(currentMethodPointer.value, (ptr) => module.getMethodAst(ptr, edit))
   }
 
   /**
@@ -354,55 +290,8 @@ export function createGraphStore(
     return edges
   })
 
-  /* Try adding imports. Does nothing if conflict is detected, and returns `DectedConflict` in such case. */
-  function addMissingImports(
-    edit: MutableModule,
-    newImports: RequiredImport[],
-  ): DetectedConflict[] | undefined {
-    if (!moduleRoot.value) {
-      console.error(`BUG: Cannot add required imports: No BodyBlock module root.`)
-      return
-    }
-    const topLevel = edit.getVersion(moduleRoot.value)
-    const existingImports = [...analyzeImports(topLevel, projectNames)]
-
-    const conflicts = []
-    const nonConflictingImports = []
-    for (const newImport of newImports) {
-      const conflictInfo = detectImportConflicts(suggestionDb.entries, existingImports, newImport)
-      if (conflictInfo?.detected) {
-        conflicts.push(conflictInfo)
-      } else {
-        nonConflictingImports.push(newImport)
-      }
-    }
-    addMissingImportsDisregardConflicts(edit, nonConflictingImports, existingImports)
-
-    if (conflicts.length > 0) return conflicts
-  }
-
-  /* Adds imports, ignores any possible conflicts.
-   * `existingImports` are optional and will be used instead of `readImports(topLevel)` if provided. */
-  function addMissingImportsDisregardConflicts(
-    edit: MutableModule,
-    imports: RequiredImport[],
-    existingImports?: AbstractImport[] | undefined,
-  ) {
-    if (!imports.length) return
-    if (!moduleRoot.value) {
-      console.error(`BUG: Cannot add required imports: No BodyBlock module root.`)
-      return
-    }
-    const topLevel = edit.getVersion(moduleRoot.value)
-    const existingImports_ = existingImports ?? [...analyzeImports(topLevel, projectNames)]
-
-    const importsToAdd = filterOutRedundantImports(existingImports_, imports)
-    if (!importsToAdd.length) return
-    addImports(edit.getVersion(topLevel), importsToAdd, projectNames)
-  }
-
   function deleteNodes(ids: Iterable<NodeId>) {
-    edit((edit) => {
+    return module.edit(async (edit) => {
       const deletedNodes = new Set<NodeId>()
       for (const id of ids) {
         const node = db.nodeIdToNode.get(id)
@@ -414,29 +303,32 @@ export function createGraphStore(
           // Skip ports on already deleted nodes.
           if (nodeId && deletedNodes.has(nodeId)) continue
 
-          updatePortValue(edit, usage, undefined, false)
+          const result = await updatePortValue(usage, undefined, edit)
+          if (!result.ok) return result
         }
         const outerAst = edit.getVersion(node.outerAst)
         if (outerAst.isStatement()) Ast.deleteFromParentBlock(outerAst)
         deletedNodes.add(id)
         cleanup(id)
       }
+      return Ok()
     })
   }
 
   function setNodeContent(id: NodeId, content: string, withImports?: RequiredImport[] | undefined) {
     const node = db.nodeIdToNode.get(id)
     if (!node) return
-    edit((edit) => {
+    module.edit((edit) => {
       const editExpr = edit.getVersion(node.innerExpr)
       editExpr.syncToCode(content)
       if (withImports) {
-        const conflicts = addMissingImports(edit, withImports)
-        if (conflicts == null) return
+        const conflicts = module.addMissingImports(edit, withImports)
+        if (conflicts == null) return Ok()
         const wholeAssignment = editExpr.mutableParent()
         if (wholeAssignment == null) {
           console.error('Cannot find parent of the node expression. Conflict resolution failed.')
-          return
+          // We still want to commit change.
+          return Ok()
         }
         for (const _conflict of conflicts) {
           // TODO: Substitution does not work, because we interpret imports wrongly. To be fixed in
@@ -444,6 +336,7 @@ export function createGraphStore(
           // substituteQualifiedNameByPattern(wholeAssignment, conflict.pattern, conflict.fullyQualified)
         }
       }
+      return Ok()
     })
   }
 
@@ -485,18 +378,16 @@ export function createGraphStore(
   })
 
   function setNodePosition(nodeId: NodeId, position: Vec2) {
-    const nodeAst = syncModule.value?.tryGet(db.idFromExternal(nodeId))
-    if (!nodeAst) return
-    const metadata = nodeAst.mutableNodeMetadata()
+    const metadata = module.mutableNodeMetadata(db.idFromExternal(nodeId))
+    if (!metadata) return
     const oldPos = metadata.get('position')
     if (oldPos?.x !== position.x || oldPos?.y !== position.y)
       metadata.set('position', { x: position.x, y: position.y })
   }
 
   function overrideNodeColor(nodeId: NodeId, color: string | undefined) {
-    const nodeAst = syncModule.value?.tryGet(db.idFromExternal(nodeId))
-    if (!nodeAst) return
-    nodeAst.mutableNodeMetadata().set('colorOverride', color)
+    const metadata = module.mutableNodeMetadata(db.idFromExternal(nodeId))
+    metadata?.set('colorOverride', color)
   }
 
   function getNodeColorOverride(node: NodeId) {
@@ -504,20 +395,13 @@ export function createGraphStore(
   }
 
   function setNodeVisualization(nodeId: NodeId, update: Partial<VisualizationMetadata>) {
-    const nodeAst = syncModule.value?.tryGet(db.idFromExternal(nodeId))
-    if (!nodeAst) return
-    const metadata = nodeAst.mutableNodeMetadata()
+    const metadata = module.mutableNodeMetadata(db.idFromExternal(nodeId))
+    if (!metadata) return
     const data = Object.assign({ ...VIS_METADATA_DEFAULTS }, metadata.get('visualization'), update)
     const normalized = visMetadataEquals(data, VIS_METADATA_DEFAULTS) ? undefined : data
     metadata.set('visualization', normalized)
   }
 
-  function setWidgetMetadata(widget: AstId, widgetKey: string, md: unknown) {
-    const ast = syncModule.value?.tryGet(widget)
-    if (!ast) return
-    ast.setWidgetMetadata(widgetKey, md)
-  }
-
   function updateNodeRect(nodeId: NodeId, rect: Rect) {
     nodeRects.set(nodeId, rect)
     if (rect.pos.equals(Vec2.Infinity)) {
@@ -548,14 +432,13 @@ export function createGraphStore(
       })
       const nodesToProcess = [...nonInputNodesSortedByLines, ...inputNodesSortedByArgIndex]
       nodesToPlace.length = 0
-      batchEdits(() => {
+      module.batchEdits(() => {
         for (const nodeId of nodesToProcess) {
           const nodeType = db.nodeIdToNode.get(nodeId)?.type
           const rect = nodeRects.get(nodeId)
           if (!rect) continue
-          const nodeAst = syncModule.value?.get(db.idFromExternal(nodeId))
-          if (!nodeAst) continue
-          const metadata = nodeAst.mutableNodeMetadata()
+          const metadata = module.mutableNodeMetadata(db.idFromExternal(nodeId))
+          if (!metadata) continue
           if (metadata.get('position') != null) continue
           let position
           if (nodeType === 'input') {
@@ -640,83 +523,26 @@ export function createGraphStore(
   }
 
   /**
-   * Emit a value update to a port view under specific ID. Returns `true` if the port view is
-   * registered and the update was emitted, or `false` otherwise.
+   * Emit a value update to a port view under specific ID. Returns Err if the port view is
+   * not registered.
    *
    * The properties are analogous to {@link WidgetUpdate fields}.
-   *
-   * NOTE: If this returns `true,` The update handlers called `graph.commitEdit` on their own.
-   * Therefore, the passed in `edit` should not be modified afterward, as it is already committed.
    */
   function updatePortValue(
-    edit: MutableModule,
     id: PortId,
     value: Ast.Owned<Ast.MutableExpression> | undefined,
+    edit?: MutableModule,
     directInteraction: boolean = true,
-  ): boolean {
+  ): UpdateResult | Promise<UpdateResult> {
     const update = getPortPrimaryInstance(id)?.onUpdate
-    if (!update) return false
-    update({
+    if (!update) return Err('Port not registered')
+    return update({
       edit,
       portUpdate: { value, origin: id },
       directInteraction,
     })
-    return true
-  }
-
-  function startEdit(): MutableModule {
-    return syncModule.value!.edit()
-  }
-
-  /**
-   * Apply the given `edit` to the state.
-   *  @param skipTreeRepair - If the edit is known not to require any parenthesis insertion, this may be set to `true`
-   *  for better performance.
-   */
-  function commitEdit(
-    edit: MutableModule,
-    skipTreeRepair?: boolean,
-    origin: LocalUserActionOrigin = defaultLocalOrigin,
-  ) {
-    const root = edit.root()
-    if (!(root instanceof Ast.BodyBlock)) {
-      console.error(`BUG: Cannot commit edit: No module root block.`)
-      return
-    }
-    if (!skipTreeRepair) edit.transact(() => Ast.repair(root, edit))
-    syncModule.value!.applyEdit(edit, origin)
-  }
-
-  /**
-   * Edit the AST module.
-   *
-   * Optimization options: These are safe to use for metadata-only edits; otherwise, they require extreme caution.
-   *  @param skipTreeRepair - If the edit is certain not to produce incorrect or non-canonical syntax, this may be set
-   *  to `true` for better performance.
-   */
-  function edit<T>(f: (edit: MutableModule) => T, skipTreeRepair?: boolean): T {
-    assertDefined(syncModule.value)
-    const edit = syncModule.value.edit()
-    let result
-    edit.transact(() => {
-      result = f(edit)
-      if (!skipTreeRepair) {
-        const root = edit.root()
-        assert(root instanceof Ast.BodyBlock)
-        Ast.repair(root, edit)
-      }
-    })
-    syncModule.value.applyEdit(edit)
-    return result!
   }
 
-  function batchEdits(f: () => void, origin: Origin = defaultLocalOrigin) {
-    assert(syncModule.value != null)
-    syncModule.value.transact(f, origin)
-  }
-
-  const viewModule = computed((): Ast.Module => syncModule.value!)
-
   // expose testing hook
   ;(window as any)._mockExpressionUpdate = mockExpressionUpdate
 
@@ -757,8 +583,7 @@ export function createGraphStore(
   /** Iterate over code lines, return node IDs from `ids` set in the order of code positions. */
   function pickInCodeOrder(ids: Set<NodeId>): NodeId[] {
     if (ids.size === 0) return []
-    assert(syncModule.value != null)
-    const func = unwrap(getExecutedMethodAst(syncModule.value))
+    const func = unwrap(getExecutedMethodAst())
     const body = func.bodyExpressions()
     const result: NodeId[] = []
     for (const expr of body) {
@@ -860,23 +685,18 @@ export function createGraphStore(
     mockExpressionUpdate,
     doAfterUpdate,
     editedNodeInfo,
-    moduleSource,
     visibleNodeAreas,
     visibleArea,
     unregisterNodeRect,
-    getMethodAst,
     generateLocallyUniqueIdent,
-    moduleRoot,
     deleteNodes,
     pickInCodeOrder,
     ensureCorrectNodeOrder,
-    batchEdits,
     overrideNodeColor,
     getNodeColorOverride,
     setNodeContent,
     setNodePosition,
     setNodeVisualization,
-    setWidgetMetadata,
     undoManager,
     updateNodeRect,
     updateNodeOutputAnim,
@@ -890,13 +710,7 @@ export function createGraphStore(
     isPortEnabled,
     updatePortValue,
     setEditedNode,
-    startEdit,
-    commitEdit,
-    edit,
     onBeforeEdit,
-    viewModule,
-    addMissingImports,
-    addMissingImportsDisregardConflicts,
     isConnectedSource,
     isConnectedTarget,
     nodeCanBeEntered,
diff --git a/app/gui/src/project-view/stores/graph/graphDatabase.ts b/app/gui/src/providers/openedProjects/graph/graphDatabase.ts
similarity index 98%
rename from app/gui/src/project-view/stores/graph/graphDatabase.ts
rename to app/gui/src/providers/openedProjects/graph/graphDatabase.ts
index 67e71cc3a0df..2e1f0b9f6085 100644
--- a/app/gui/src/project-view/stores/graph/graphDatabase.ts
+++ b/app/gui/src/providers/openedProjects/graph/graphDatabase.ts
@@ -1,12 +1,15 @@
-import { computeNodeColor } from '@/composables/nodeColors'
 import {
   ComputedValueRegistry,
   translateMethodCall,
   type ExpressionInfo,
-} from '@/stores/project/computedValueRegistry'
-import { mockProjectNameStore, type ProjectNameStore } from '@/stores/projectNames'
-import { SuggestionDb, type GroupInfo } from '@/stores/suggestionDatabase'
-import type { CallableSuggestionEntry } from '@/stores/suggestionDatabase/entry'
+} from '$/providers/openedProjects/project/computedValueRegistry'
+import {
+  mockProjectNameStore,
+  type ProjectNameStore,
+} from '$/providers/openedProjects/projectNames'
+import { SuggestionDb, type GroupInfo } from '$/providers/openedProjects/suggestionDatabase'
+import { type CallableSuggestionEntry } from '$/providers/openedProjects/suggestionDatabase/entry'
+import { computeNodeColor } from '@/composables/nodeColors'
 import { Ast } from '@/util/ast'
 import type { AstId, NodeMetadata } from '@/util/ast/abstract'
 import { MutableModule } from '@/util/ast/abstract'
diff --git a/app/gui/src/providers/openedProjects/graph/index.ts b/app/gui/src/providers/openedProjects/graph/index.ts
new file mode 100644
index 000000000000..faf258ac762e
--- /dev/null
+++ b/app/gui/src/providers/openedProjects/graph/index.ts
@@ -0,0 +1,10 @@
+export {
+  PortViewInstance,
+  createGraphStore,
+  isConnected,
+  type Edge,
+  type GraphStore,
+  type Node,
+  type NodeDataFromAst,
+  type NodeId,
+} from './graph'
diff --git a/app/gui/src/project-view/stores/graph/unconnectedEdges.ts b/app/gui/src/providers/openedProjects/graph/unconnectedEdges.ts
similarity index 98%
rename from app/gui/src/project-view/stores/graph/unconnectedEdges.ts
rename to app/gui/src/providers/openedProjects/graph/unconnectedEdges.ts
index 65e3204bf6e8..0371e0d9d152 100644
--- a/app/gui/src/project-view/stores/graph/unconnectedEdges.ts
+++ b/app/gui/src/providers/openedProjects/graph/unconnectedEdges.ts
@@ -1,5 +1,5 @@
+import type { ConnectedEdge } from '$/providers/openedProjects/graph/graph'
 import type { PortId } from '@/providers/portInfo'
-import type { ConnectedEdge } from '@/stores/graph/index'
 import { Vec2 } from '@/util/data/vec2'
 import * as iter from 'enso-common/src/utilities/data/iter'
 import { computed, onBeforeUnmount, reactive, ref, watch, type WatchSource } from 'vue'
diff --git a/app/gui/src/project-view/stores/graph/imports.ts b/app/gui/src/providers/openedProjects/module/imports.ts
similarity index 97%
rename from app/gui/src/project-view/stores/graph/imports.ts
rename to app/gui/src/providers/openedProjects/module/imports.ts
index 8af28d7af2f8..316076534336 100644
--- a/app/gui/src/project-view/stores/graph/imports.ts
+++ b/app/gui/src/providers/openedProjects/module/imports.ts
@@ -1,6 +1,9 @@
-import type { ProjectNameStore } from '@/stores/projectNames'
-import { SuggestionDb } from '@/stores/suggestionDatabase'
-import { SuggestionKind, type SuggestionEntry } from '@/stores/suggestionDatabase/entry'
+import { type ProjectNameStore } from '$/providers/openedProjects/projectNames'
+import { SuggestionDb } from '$/providers/openedProjects/suggestionDatabase'
+import {
+  SuggestionKind,
+  type SuggestionEntry,
+} from '$/providers/openedProjects/suggestionDatabase/entry'
 import { Ast } from '@/util/ast'
 import {
   astToQualifiedName,
diff --git a/app/gui/src/providers/openedProjects/module/index.ts b/app/gui/src/providers/openedProjects/module/index.ts
new file mode 100644
index 000000000000..6c9f7505c571
--- /dev/null
+++ b/app/gui/src/providers/openedProjects/module/index.ts
@@ -0,0 +1 @@
+export { createModuleStore, type ModuleStore } from './module'
diff --git a/app/gui/src/providers/openedProjects/module/module.ts b/app/gui/src/providers/openedProjects/module/module.ts
new file mode 100644
index 000000000000..36283a479926
--- /dev/null
+++ b/app/gui/src/providers/openedProjects/module/module.ts
@@ -0,0 +1,225 @@
+import { type ProjectStore } from '$/providers/openedProjects/project'
+import { assert, assertDefined } from '@/util/assert'
+import { Ast } from '@/util/ast'
+import { type AstId, MutableModule } from '@/util/ast/abstract'
+import { reactiveModule } from '@/util/ast/reactive'
+import { Err, Ok, type Result } from '@/util/data/result'
+import { type MethodPointer } from '@/util/methodPointer'
+import { proxyRefs } from '@/util/reactivity'
+import { computedAsync } from '@vueuse/core'
+import { isPromise } from 'util/types'
+import { computed, reactive, type Ref, ref, watch } from 'vue'
+import { SourceDocument } from 'ydoc-shared/ast/sourceDocument'
+import type { Path as LsPath } from 'ydoc-shared/languageServerTypes'
+import { defaultLocalOrigin, type Origin } from 'ydoc-shared/yjsModel'
+import * as Y from 'yjs'
+import { type ProjectNameStore } from '../projectNames'
+import { type SuggestionDbStore } from '../suggestionDatabase'
+import {
+  type AbstractImport,
+  addImports,
+  analyzeImports,
+  type DetectedConflict,
+  detectImportConflicts,
+  filterOutRedundantImports,
+  type RequiredImport,
+} from './imports'
+
+export type ModuleStore = ReturnType<typeof createModuleStore>
+
+export function createModuleStore(
+  proj: ProjectStore,
+  projectNames: ProjectNameStore,
+  suggestionDb: SuggestionDbStore,
+) {
+  proj.setObservedFileName('Main.enso')
+
+  const source = SourceDocument.Empty(reactive)
+  const root = ref<Ast.BodyBlock>()
+  const synced = computed(() => root.value?.module as Ast.MutableModule | undefined)
+  const ast = computed((): Ast.Module => synced.value!)
+  const modulePath: Ref<LsPath | undefined> = computedAsync(
+    async () => {
+      const rootId = await proj.projectRootId
+      const segments = ['src', 'Main.enso']
+      return rootId ? { rootId, segments } : undefined
+    },
+    undefined,
+    { onError: console.error },
+  )
+
+  watch(
+    () => proj.module,
+    (projModule, _, onCleanup) => {
+      if (!projModule) return
+      const module = reactiveModule(projModule.doc.ydoc, onCleanup)
+      const handle = module.observe((update) => {
+        const rootAst = module.root()
+        if (rootAst instanceof Ast.BodyBlock) {
+          root.value = rootAst
+          if (
+            update.nodesAdded.size != 0 ||
+            update.nodesDeleted.size != 0 ||
+            update.nodesUpdated.size != 0 ||
+            update.updateRoots.size != 0
+          ) {
+            source.applyUpdate(module, update)
+            console.debug('Fix the below:')
+            // db.updateExternalIds(root)
+          }
+          // We can cast maps of unknown metadata fields to `NodeMetadata` because all `NodeMetadata` fields are optional.
+          //   const nodeMetadataUpdates = update.metadataUpdated as any as {
+          //     id: AstId
+          //     changes: Ast.NodeMetadata
+          //   }[]
+          //   for (const { id, changes } of nodeMetadataUpdates) db.updateMetadata(id, changes)
+        } else {
+          root.value = undefined
+        }
+      })
+      onCleanup(() => {
+        module.unobserve(handle)
+        source.clear()
+      })
+    },
+  )
+
+  /**
+   * Edit the AST module.
+   *
+   * Optimization options: These are safe to use for metadata-only edits; otherwise, they require extreme caution.
+   *  @param skipTreeRepair - If the edit is certain not to produce incorrect or non-canonical syntax, this may be set
+   *  to `true` for better performance.
+   */
+  function edit<T, R extends Result<T> | Promise<Result<T>>>(
+    f: (edit: MutableModule) => R,
+    options: { skipTreeRepair?: boolean; origin?: Origin } = {},
+  ): R {
+    assertDefined(synced.value)
+    const edit = synced.value.edit()
+
+    const treeRepair = (result: Result<T>) => {
+      if (result.ok && options.skipTreeRepair !== true) {
+        const root = edit.root()
+        assert(root instanceof Ast.BodyBlock)
+        Ast.repair(root, edit)
+      }
+      return result
+    }
+
+    const applyEdit = (result: Result<T>) => {
+      if (result.ok) synced.value?.applyEdit(edit, options.origin)
+      return result
+    }
+
+    const result = edit.transact(() => {
+      const result = f(edit)
+      if (isPromise(result)) {
+        return result.then(treeRepair)
+      } else {
+        return treeRepair(result)
+      }
+    })
+    if (isPromise(result)) return result.then(applyEdit) as R
+    else return applyEdit(result) as R
+  }
+
+  function batchEdits(f: () => void, origin: Origin = defaultLocalOrigin) {
+    assert(synced.value != null)
+    synced.value.transact(f, origin)
+  }
+
+  function getMethodAst(ptr: MethodPointer, edit?: Ast.Module): Result<Ast.FunctionDef> {
+    const topLevel = (edit ?? ast.value).root()
+    if (!topLevel) return Err('Module unavailable')
+    assert(topLevel instanceof Ast.BodyBlock)
+    if (!proj.moduleProjectPath?.ok)
+      return proj.moduleProjectPath ?? Err('Unknown module project path')
+    if (!ptr.module.equals(proj.moduleProjectPath.value))
+      return Err('Cannot read method from different module')
+    if (!ptr.module.equals(ptr.definedOnType)) return Err('Method pointer is not a module method')
+    const method = Ast.findModuleMethod(topLevel, ptr.name)
+    if (!method) {
+      const modulePath = projectNames.printProjectPath(proj.moduleProjectPath.value)
+      return Err(`No method with name ${ptr.name} in ${modulePath}`)
+    }
+    return Ok(method.statement)
+  }
+
+  function mutableNodeMetadata(node: AstId | undefined, edit?: Ast.MutableModule) {
+    edit ??= synced.value
+    return edit?.tryGet(node)?.mutableNodeMetadata()
+  }
+
+  function setWidgetMetadata(widget: AstId, widgetKey: string, md: unknown) {
+    const ast = synced.value?.tryGet(widget)
+    if (!ast) return
+    ast.setWidgetMetadata(widgetKey, md)
+  }
+
+  /* Try adding imports. Does nothing if conflict is detected, and returns `DectedConflict` in such case. */
+  function addMissingImports(
+    edit: MutableModule,
+    newImports: RequiredImport[],
+  ): DetectedConflict[] | undefined {
+    if (!root.value) {
+      console.error(`BUG: Cannot add required imports: No BodyBlock module root.`)
+      return
+    }
+    const topLevel = edit.getVersion(root.value)
+    const existingImports = [...analyzeImports(topLevel, projectNames)]
+
+    const conflicts = []
+    const nonConflictingImports = []
+    for (const newImport of newImports) {
+      const conflictInfo = detectImportConflicts(suggestionDb.entries, existingImports, newImport)
+      if (conflictInfo?.detected) {
+        conflicts.push(conflictInfo)
+      } else {
+        nonConflictingImports.push(newImport)
+      }
+    }
+    addMissingImportsDisregardConflicts(edit, nonConflictingImports, existingImports)
+
+    if (conflicts.length > 0) return conflicts
+  }
+
+  /* Adds imports, ignores any possible conflicts.
+   * `existingImports` are optional and will be used instead of `readImports(topLevel)` if provided. */
+  function addMissingImportsDisregardConflicts(
+    edit: MutableModule,
+    imports: RequiredImport[],
+    existingImports?: AbstractImport[] | undefined,
+  ) {
+    if (!imports.length) return
+    if (!root.value) {
+      console.error(`BUG: Cannot add required imports: No BodyBlock module root.`)
+      return
+    }
+    const topLevel = edit.getVersion(root.value)
+    const existingImports_ = existingImports ?? [...analyzeImports(topLevel, projectNames)]
+
+    const importsToAdd = filterOutRedundantImports(existingImports_, imports)
+    if (!importsToAdd.length) return
+    addImports(edit.getVersion(topLevel), importsToAdd, projectNames)
+  }
+
+  function onBeforeEdit(f: (transaction: Y.Transaction) => void): { unregister: () => void } {
+    proj.module?.doc.ydoc.on('beforeTransaction', f)
+    return { unregister: () => proj.module?.doc.ydoc.off('beforeTransaction', f) }
+  }
+
+  return proxyRefs({
+    source,
+    ast,
+    root,
+    edit,
+    batchEdits,
+    onBeforeEdit,
+    getMethodAst,
+    mutableNodeMetadata,
+    setWidgetMetadata,
+    addMissingImports,
+    addMissingImportsDisregardConflicts,
+  })
+}
diff --git a/app/gui/src/project-view/stores/project/computedValueRegistry.ts b/app/gui/src/providers/openedProjects/project/computedValueRegistry.ts
similarity index 97%
rename from app/gui/src/project-view/stores/project/computedValueRegistry.ts
rename to app/gui/src/providers/openedProjects/project/computedValueRegistry.ts
index 2a5c8299841b..e6e54c7ec99d 100644
--- a/app/gui/src/project-view/stores/project/computedValueRegistry.ts
+++ b/app/gui/src/providers/openedProjects/project/computedValueRegistry.ts
@@ -1,5 +1,8 @@
-import type { ExecutionContext } from '@/stores/project/executionContext'
-import { mockProjectNameStore, type ProjectNameStore } from '@/stores/projectNames'
+import type { ExecutionContext } from '$/providers/openedProjects/project/executionContext'
+import {
+  mockProjectNameStore,
+  type ProjectNameStore,
+} from '$/providers/openedProjects/projectNames'
 import { Ok, type Result } from '@/util/data/result'
 import { ReactiveDb, ReactiveIndex } from '@/util/database/reactiveDb'
 import { arrayEquals } from '@/util/equals'
diff --git a/app/gui/src/project-view/stores/project/executionContext.ts b/app/gui/src/providers/openedProjects/project/executionContext.ts
similarity index 99%
rename from app/gui/src/project-view/stores/project/executionContext.ts
rename to app/gui/src/providers/openedProjects/project/executionContext.ts
index c77d49b29e67..da48d4154c90 100644
--- a/app/gui/src/project-view/stores/project/executionContext.ts
+++ b/app/gui/src/providers/openedProjects/project/executionContext.ts
@@ -1,4 +1,4 @@
-import type { ProjectNameStore } from '@/stores/projectNames'
+import { type ProjectNameStore } from '$/providers/openedProjects/projectNames'
 import { assert } from '@/util/assert'
 import { findDifferenceIndex } from '@/util/data/array'
 import { isSome, type Opt } from '@/util/data/opt'
diff --git a/app/gui/src/providers/openedProjects/project/index.ts b/app/gui/src/providers/openedProjects/project/index.ts
new file mode 100644
index 000000000000..54d801e2552d
--- /dev/null
+++ b/app/gui/src/providers/openedProjects/project/index.ts
@@ -0,0 +1 @@
+export { createProjectStore, type LsUrls, type ProjectStore } from './project'
diff --git a/app/gui/src/project-view/stores/project/nodeExecution.ts b/app/gui/src/providers/openedProjects/project/nodeExecution.ts
similarity index 93%
rename from app/gui/src/project-view/stores/project/nodeExecution.ts
rename to app/gui/src/providers/openedProjects/project/nodeExecution.ts
index 9012d473a614..4cdcf205a4af 100644
--- a/app/gui/src/project-view/stores/project/nodeExecution.ts
+++ b/app/gui/src/providers/openedProjects/project/nodeExecution.ts
@@ -1,6 +1,6 @@
+import { type NodeId } from '$/providers/openedProjects/graph'
+import { type ProjectStore } from '$/providers/openedProjects/project'
 import { createContextStore } from '@/providers'
-import type { NodeId } from '@/stores/graph'
-import type { ProjectStore } from '@/stores/project'
 import { computed, reactive, ref } from 'vue'
 import type { ExecutionEnvironment } from 'ydoc-shared/languageServerTypes'
 import type { ExternalId } from 'ydoc-shared/yjsModel'
diff --git a/app/gui/src/project-view/stores/project/index.ts b/app/gui/src/providers/openedProjects/project/project.ts
similarity index 98%
rename from app/gui/src/project-view/stores/project/index.ts
rename to app/gui/src/providers/openedProjects/project/project.ts
index 3e87e809f61a..b0686e442497 100644
--- a/app/gui/src/project-view/stores/project/index.ts
+++ b/app/gui/src/providers/openedProjects/project/project.ts
@@ -1,13 +1,13 @@
 import { ProjectId } from '#/services/Backend'
-import { Awareness } from '@/stores/awareness'
-import { ComputedValueRegistry } from '@/stores/project/computedValueRegistry'
+import { ComputedValueRegistry } from '$/providers/openedProjects/project/computedValueRegistry'
 import {
   ExecutionContext,
   visualizationConfigPreprocessorEqual,
   type NodeVisualizationConfiguration,
-} from '@/stores/project/executionContext'
-import { VisualizationDataRegistry } from '@/stores/project/visualizationDataRegistry'
-import type { ProjectNameStore } from '@/stores/projectNames'
+} from '$/providers/openedProjects/project/executionContext'
+import { VisualizationDataRegistry } from '$/providers/openedProjects/project/visualizationDataRegistry'
+import { type ProjectNameStore } from '$/providers/openedProjects/projectNames'
+import { Awareness } from '@/stores/awareness'
 import { attachProvider, useObserveYjs } from '@/util/crdt'
 import { nextEvent } from '@/util/data/observable'
 import type { Opt } from '@/util/data/opt'
@@ -56,38 +56,6 @@ const VISUALIZATION_PREPROCESSOR_PATH = ProjectPath.create(
   'Preprocessor' as Identifier,
 )
 
-function resolveYDocUrl(rpcUrl: string, url: string): URL {
-  let resolved
-  if (url == '') {
-    resolved = new URL(location.origin)
-    resolved.protocol = location.protocol.replace(/^http/, 'ws')
-  } else if (URL.canParse(url)) {
-    resolved = new URL(url)
-  } else {
-    resolved = new URL(rpcUrl)
-    resolved.port = '1234'
-  }
-  resolved.pathname = '/project'
-  return resolved
-}
-
-function createLsRpcConnection(clientId: Uuid, url: string, abort: AbortScope): LanguageServer {
-  const transport = createRpcTransport(url)
-  const connection = new LanguageServer(clientId, transport)
-  abort.onAbort(() => {
-    connection.stopReconnecting()
-    connection.release()
-  })
-  return connection
-}
-
-function initializeDataConnection(clientId: Uuid, url: string, abort: AbortScope) {
-  const client = createDataWebsocket(url, 'arraybuffer')
-  const connection = new DataServer(clientId, client, abort)
-  onScopeDispose(() => connection.dispose())
-  return connection
-}
-
 export type ProjectStore = ReturnType<typeof createProjectStore>
 
 /**
@@ -506,6 +474,38 @@ export function createProjectStore(
   })
 }
 
+function resolveYDocUrl(rpcUrl: string, url: string): URL {
+  let resolved
+  if (url == '') {
+    resolved = new URL(location.origin)
+    resolved.protocol = location.protocol.replace(/^http/, 'ws')
+  } else if (URL.canParse(url)) {
+    resolved = new URL(url)
+  } else {
+    resolved = new URL(rpcUrl)
+    resolved.port = '1234'
+  }
+  resolved.pathname = '/project'
+  return resolved
+}
+
+function createLsRpcConnection(clientId: Uuid, url: string, abort: AbortScope): LanguageServer {
+  const transport = createRpcTransport(url)
+  const connection = new LanguageServer(clientId, transport)
+  abort.onAbort(() => {
+    connection.stopReconnecting()
+    connection.release()
+  })
+  return connection
+}
+
+function initializeDataConnection(clientId: Uuid, url: string, abort: AbortScope) {
+  const client = createDataWebsocket(url, 'arraybuffer')
+  const connection = new DataServer(clientId, client, abort)
+  onScopeDispose(() => connection.dispose())
+  return connection
+}
+
 type ExecutionMode = 'live' | 'design'
 type Settings = { executionMode: WritableComputedRef<ExecutionMode> }
 function setupSettings(project: DistributedProject | null): Settings {
diff --git a/app/gui/src/project-view/stores/project/visualizationDataRegistry.ts b/app/gui/src/providers/openedProjects/project/visualizationDataRegistry.ts
similarity index 97%
rename from app/gui/src/project-view/stores/project/visualizationDataRegistry.ts
rename to app/gui/src/providers/openedProjects/project/visualizationDataRegistry.ts
index 3d4bab2cd9a7..c309bdd49cca 100644
--- a/app/gui/src/project-view/stores/project/visualizationDataRegistry.ts
+++ b/app/gui/src/providers/openedProjects/project/visualizationDataRegistry.ts
@@ -1,4 +1,4 @@
-import type { ExecutionContext } from '@/stores/project/executionContext'
+import type { ExecutionContext } from '$/providers/openedProjects/project/executionContext'
 import { Err, Ok, type Result } from '@/util/data/result'
 import type { DataServer } from '@/util/net/dataServer'
 import { reactive } from 'vue'
diff --git a/app/gui/src/project-view/stores/projectNames.ts b/app/gui/src/providers/openedProjects/projectNames.ts
similarity index 100%
rename from app/gui/src/project-view/stores/projectNames.ts
rename to app/gui/src/providers/openedProjects/projectNames.ts
diff --git a/app/gui/src/project-view/stores/suggestionDatabase/__tests__/documentation.test.ts b/app/gui/src/providers/openedProjects/suggestionDatabase/__tests__/documentation.test.ts
similarity index 91%
rename from app/gui/src/project-view/stores/suggestionDatabase/__tests__/documentation.test.ts
rename to app/gui/src/providers/openedProjects/suggestionDatabase/__tests__/documentation.test.ts
index ee37735a7b0a..6336ac38247b 100644
--- a/app/gui/src/project-view/stores/suggestionDatabase/__tests__/documentation.test.ts
+++ b/app/gui/src/providers/openedProjects/suggestionDatabase/__tests__/documentation.test.ts
@@ -1,5 +1,8 @@
-import { mockProjectNameStore } from '@/stores/projectNames'
-import { getDocumentationSummary, getGroupIndex } from '@/stores/suggestionDatabase/documentation'
+import { mockProjectNameStore } from '$/providers/openedProjects/projectNames'
+import {
+  getDocumentationSummary,
+  getGroupIndex,
+} from '$/providers/openedProjects/suggestionDatabase/documentation'
 import { unwrap } from '@/util/data/result'
 import { parseAbsoluteProjectPathRaw } from '@/util/projectPath'
 import type { QualifiedName } from '@/util/qualifiedName'
diff --git a/app/gui/src/project-view/stores/suggestionDatabase/__tests__/lsUpdate.test.ts b/app/gui/src/providers/openedProjects/suggestionDatabase/__tests__/lsUpdate.test.ts
similarity index 98%
rename from app/gui/src/project-view/stores/suggestionDatabase/__tests__/lsUpdate.test.ts
rename to app/gui/src/providers/openedProjects/suggestionDatabase/__tests__/lsUpdate.test.ts
index e2874e9ae5ec..97682ec03c11 100644
--- a/app/gui/src/project-view/stores/suggestionDatabase/__tests__/lsUpdate.test.ts
+++ b/app/gui/src/providers/openedProjects/suggestionDatabase/__tests__/lsUpdate.test.ts
@@ -1,8 +1,11 @@
+import { mockProjectNameStore } from '$/providers/openedProjects/projectNames'
+import { SuggestionDb, type GroupInfo } from '$/providers/openedProjects/suggestionDatabase'
+import {
+  SuggestionKind,
+  type SuggestionEntry,
+} from '$/providers/openedProjects/suggestionDatabase/entry'
+import { SuggestionUpdateProcessor } from '$/providers/openedProjects/suggestionDatabase/lsUpdate'
 import { frontmatter } from '@/components/ComponentHelp/metadata'
-import { mockProjectNameStore } from '@/stores/projectNames'
-import { SuggestionDb, type GroupInfo } from '@/stores/suggestionDatabase'
-import { SuggestionKind, type SuggestionEntry } from '@/stores/suggestionDatabase/entry'
-import { SuggestionUpdateProcessor } from '@/stores/suggestionDatabase/lsUpdate'
 import { assert, assertDefined } from '@/util/assert'
 import { unwrap } from '@/util/data/result'
 import { parseAbsoluteProjectPathRaw, ProjectPath } from '@/util/projectPath'
diff --git a/app/gui/src/project-view/stores/suggestionDatabase/documentation.ts b/app/gui/src/providers/openedProjects/suggestionDatabase/documentation.ts
similarity index 97%
rename from app/gui/src/project-view/stores/suggestionDatabase/documentation.ts
rename to app/gui/src/providers/openedProjects/suggestionDatabase/documentation.ts
index b18612b66469..8dff24ce04a1 100644
--- a/app/gui/src/project-view/stores/suggestionDatabase/documentation.ts
+++ b/app/gui/src/providers/openedProjects/suggestionDatabase/documentation.ts
@@ -1,5 +1,5 @@
+import type { GroupInfo } from '$/providers/openedProjects/suggestionDatabase'
 import { extractMetadata } from '@/components/ComponentHelp/metadata'
-import type { GroupInfo } from '@/stores/suggestionDatabase'
 import { findIndexOpt } from '@/util/data/array'
 import type { Opt } from '@/util/data/opt'
 import { isIconName, type Icon } from '@/util/iconMetadata/iconName'
diff --git a/app/gui/src/project-view/stores/suggestionDatabase/entry.ts b/app/gui/src/providers/openedProjects/suggestionDatabase/entry.ts
similarity index 96%
rename from app/gui/src/project-view/stores/suggestionDatabase/entry.ts
rename to app/gui/src/providers/openedProjects/suggestionDatabase/entry.ts
index 038206e5a66e..cbcb0e744e75 100644
--- a/app/gui/src/project-view/stores/suggestionDatabase/entry.ts
+++ b/app/gui/src/providers/openedProjects/suggestionDatabase/entry.ts
@@ -1,6 +1,6 @@
-import type { ProjectNameStore } from '@/stores/projectNames'
-import type { DocumentationData } from '@/stores/suggestionDatabase/documentation'
-import type { MethodPointer } from '@/util/methodPointer'
+import { type ProjectNameStore } from '$/providers/openedProjects/projectNames'
+import { type DocumentationData } from '$/providers/openedProjects/suggestionDatabase/documentation'
+import { type MethodPointer } from '@/util/methodPointer'
 import { standardBaseMainPath, type ProjectPath } from '@/util/projectPath'
 import {
   qnJoin,
diff --git a/app/gui/src/project-view/stores/suggestionDatabase/index.ts b/app/gui/src/providers/openedProjects/suggestionDatabase/index.ts
similarity index 97%
rename from app/gui/src/project-view/stores/suggestionDatabase/index.ts
rename to app/gui/src/providers/openedProjects/suggestionDatabase/index.ts
index bc07950370aa..2faf7f95b180 100644
--- a/app/gui/src/project-view/stores/suggestionDatabase/index.ts
+++ b/app/gui/src/providers/openedProjects/suggestionDatabase/index.ts
@@ -1,6 +1,5 @@
-import { ExpressionTag } from '@/components/GraphEditor/widgets/WidgetSelection/tags'
-import type { ProjectStore } from '@/stores/project'
-import type { ProjectNameStore } from '@/stores/projectNames'
+import type { ProjectStore } from '$/providers/openedProjects/project'
+import type { ProjectNameStore } from '$/providers/openedProjects/projectNames'
 import {
   entryIsCallable,
   isUserSelectableType,
@@ -9,9 +8,9 @@ import {
   type MethodSuggestionEntry,
   type SuggestionEntry,
   type SuggestionId,
-  type TypeSuggestionEntry,
-} from '@/stores/suggestionDatabase/entry'
-import { SuggestionUpdateProcessor } from '@/stores/suggestionDatabase/lsUpdate'
+} from '$/providers/openedProjects/suggestionDatabase/entry'
+import { SuggestionUpdateProcessor } from '$/providers/openedProjects/suggestionDatabase/lsUpdate'
+import { ExpressionTag } from '@/components/GraphEditor/widgets/WidgetSelection/tags'
 import { assert } from '@/util/assert'
 import { Err, Ok, type Result } from '@/util/data/result'
 import { ReactiveDb, ReactiveIndex } from '@/util/database/reactiveDb'
diff --git a/app/gui/src/project-view/stores/suggestionDatabase/lsUpdate.ts b/app/gui/src/providers/openedProjects/suggestionDatabase/lsUpdate.ts
similarity index 98%
rename from app/gui/src/project-view/stores/suggestionDatabase/lsUpdate.ts
rename to app/gui/src/providers/openedProjects/suggestionDatabase/lsUpdate.ts
index 655fd292dd4a..968ebb49466a 100644
--- a/app/gui/src/project-view/stores/suggestionDatabase/lsUpdate.ts
+++ b/app/gui/src/providers/openedProjects/suggestionDatabase/lsUpdate.ts
@@ -1,9 +1,9 @@
-import type { ProjectNameStore } from '@/stores/projectNames'
-import { SuggestionDb, type GroupInfo } from '@/stores/suggestionDatabase'
+import type { ProjectNameStore } from '$/providers/openedProjects/projectNames'
+import { SuggestionDb, type GroupInfo } from '$/providers/openedProjects/suggestionDatabase'
 import {
   documentationData,
   type DocumentationData,
-} from '@/stores/suggestionDatabase/documentation'
+} from '$/providers/openedProjects/suggestionDatabase/documentation'
 import {
   SuggestionKind,
   type ConstructorSuggestionEntry,
@@ -16,7 +16,7 @@ import {
   type SuggestionEntryCommon,
   type Typename,
   type TypeSuggestionEntry,
-} from '@/stores/suggestionDatabase/entry'
+} from '$/providers/openedProjects/suggestionDatabase/entry'
 import { assert, assertNever } from '@/util/assert'
 import type { Opt } from '@/util/data/opt'
 import { Err, Ok, withContext, type Result } from '@/util/data/result'
diff --git a/app/gui/src/project-view/stores/suggestionDatabase/mockSuggestion.ts b/app/gui/src/providers/openedProjects/suggestionDatabase/mockSuggestion.ts
similarity index 95%
rename from app/gui/src/project-view/stores/suggestionDatabase/mockSuggestion.ts
rename to app/gui/src/providers/openedProjects/suggestionDatabase/mockSuggestion.ts
index 015b4530ea72..1dc96d2f1f71 100644
--- a/app/gui/src/project-view/stores/suggestionDatabase/mockSuggestion.ts
+++ b/app/gui/src/providers/openedProjects/suggestionDatabase/mockSuggestion.ts
@@ -1,11 +1,14 @@
-import { frontmatter } from '@/components/ComponentHelp/metadata'
-import { mockProjectNameStore, type ProjectNameStore } from '@/stores/projectNames'
+import {
+  mockProjectNameStore,
+  type ProjectNameStore,
+} from '$/providers/openedProjects/projectNames'
 import {
   type MethodSuggestionEntry,
   type SuggestionEntry,
   type SuggestionEntryArgument,
-} from '@/stores/suggestionDatabase/entry'
-import { SuggestionUpdateProcessor } from '@/stores/suggestionDatabase/lsUpdate'
+} from '$/providers/openedProjects/suggestionDatabase/entry'
+import { SuggestionUpdateProcessor } from '$/providers/openedProjects/suggestionDatabase/lsUpdate'
+import { frontmatter } from '@/components/ComponentHelp/metadata'
 import { ANY_TYPE_QN } from '@/util/ensoTypes'
 import { isQualifiedName, qnParent, qnSplit, tryQualifiedName } from '@/util/qualifiedName'
 import * as lsTypes from 'ydoc-shared/languageServerTypes/suggestions'
diff --git a/app/gui/src/project-view/providers/widgetRegistry.ts b/app/gui/src/providers/openedProjects/widgetRegistry.ts
similarity index 90%
rename from app/gui/src/project-view/providers/widgetRegistry.ts
rename to app/gui/src/providers/openedProjects/widgetRegistry.ts
index af9211649278..397e19dd1fd2 100644
--- a/app/gui/src/project-view/providers/widgetRegistry.ts
+++ b/app/gui/src/providers/openedProjects/widgetRegistry.ts
@@ -1,19 +1,19 @@
+import type { GraphDb } from '$/providers/openedProjects/graph/graphDatabase'
+import type { Typename } from '$/providers/openedProjects/suggestionDatabase/entry'
+import type { WidgetConfiguration } from '$/providers/openedProjects/widgetRegistry/configuration'
+import {
+  devtoolsAddWidgetScore,
+  devtoolsEndSelection,
+  devtoolsStartSelection,
+} from '$/providers/openedProjects/widgetRegistry/devtools'
+import type { WidgetEditHandlerParent } from '$/providers/openedProjects/widgetRegistry/editHandler'
 import type { PortId } from '@/providers/portInfo'
-import type { WidgetConfiguration } from '@/providers/widgetRegistry/configuration'
-import type { GraphStore } from '@/stores/graph'
-import type { GraphDb } from '@/stores/graph/graphDatabase'
-import type { Typename } from '@/stores/suggestionDatabase/entry'
 import { Ast } from '@/util/ast'
-import type { Result } from '@/util/data/result'
+import { Err, Ok, type Result } from '@/util/data/result'
 import type { ViteHotContext } from 'vite/types/hot.js'
 import { computed, shallowReactive, type Component, type PropType } from 'vue'
 import type { Class } from 'ydoc-shared/util/types'
-import {
-  devtoolsAddWidgetScore,
-  devtoolsEndSelection,
-  devtoolsStartSelection,
-} from './widgetRegistry/devtools'
-import type { WidgetEditHandlerParent } from './widgetRegistry/editHandler'
+import type { ModuleStore } from './module'
 
 export type WidgetComponent<T extends WidgetInput> = Component<WidgetProps<T>>
 
@@ -128,7 +128,7 @@ export namespace WidgetInput {
  * ```ts
  * export const ArgumentApplicationKey: unique symbol = Symbol('ArgumentApplicationKey')
  * export const ArgumentInfoKey: unique symbol = Symbol('ArgumentInfoKey')
- * declare module '@/providers/widgetRegistry' {
+ * declare module '$/providers/openedProjects/widgetRegistry' {
  *   export interface WidgetInput {
  *     [ArgumentApplicationKey]?: ArgumentApplication
  *     [ArgumentInfoKey]?: {
@@ -255,9 +255,9 @@ function originMatches(
 /**
  * Apply graph edits described by a `WidgetUpdate` struct.
  */
-export function applyWidgetUpdates(update: WidgetUpdate, graph: GraphStore) {
-  function reportInvalidOrigin(origin: PortId) {
-    console.error(`[UPDATE ${origin}] Invalid top-level origin. Expected expression ID.`)
+export function applyWidgetUpdates(update: WidgetUpdate, module: ModuleStore) {
+  function invalidOriginErr(origin: PortId) {
+    return Err(`[UPDATE ${origin}] Invalid top-level origin. Expected expression ID.`)
   }
 
   if (!update.edit && update.portUpdate && !('value' in update.portUpdate)) {
@@ -265,36 +265,41 @@ export function applyWidgetUpdates(update: WidgetUpdate, graph: GraphStore) {
     // and we don't need it in this case.
     const { origin, metadata, metadataKey } = update.portUpdate
     if (Ast.isAstId(origin)) {
-      graph.setWidgetMetadata(origin, metadataKey, metadata)
+      module.setWidgetMetadata(origin, metadataKey, metadata)
+      return Ok()
     } else {
-      reportInvalidOrigin(origin)
+      return invalidOriginErr(origin)
     }
   } else {
-    const edit = update.edit ?? graph.startEdit()
-    if (update.portUpdate) {
-      const { origin } = update.portUpdate
-      if (Ast.isAstId(origin)) {
-        if ('value' in update.portUpdate) {
-          const value = update.portUpdate.value
-          const ast =
-            value instanceof Ast.Ast ? value
-            : value == null ? Ast.Wildcard.new(edit)
-            : undefined
-          if (ast) {
-            edit.replaceValue(origin, ast)
-          } else if (typeof value === 'string') {
-            edit.tryGet(origin)?.syncToCode(value)
+    const f = (edit: Ast.MutableModule) => {
+      if (update.portUpdate) {
+        const { origin } = update.portUpdate
+        if (Ast.isAstId(origin)) {
+          if ('value' in update.portUpdate) {
+            const value = update.portUpdate.value
+            const ast =
+              value instanceof Ast.Ast ? value
+              : value == null ? Ast.Wildcard.new(edit)
+              : undefined
+            if (ast) {
+              edit.replaceValue(origin, ast)
+            } else if (typeof value === 'string') {
+              edit.tryGet(origin)?.syncToCode(value)
+            }
           }
+          if ('metadata' in update.portUpdate) {
+            const { metadataKey, metadata } = update.portUpdate
+            edit.tryGet(origin)?.setWidgetMetadata(metadataKey, metadata)
+          }
+          return Ok()
+        } else {
+          return invalidOriginErr(origin)
         }
-        if ('metadata' in update.portUpdate) {
-          const { metadataKey, metadata } = update.portUpdate
-          edit.tryGet(origin)?.setWidgetMetadata(metadataKey, metadata)
-        }
-      } else {
-        reportInvalidOrigin(origin)
-      }
+      } else return Ok()
     }
-    graph.commitEdit(edit)
+
+    if (update.edit) return f(update.edit)
+    else return module.edit(f)
   }
 }
 
diff --git a/app/gui/src/project-view/providers/widgetRegistry/__tests__/configuration.test.ts b/app/gui/src/providers/openedProjects/widgetRegistry/__tests__/configuration.test.ts
similarity index 100%
rename from app/gui/src/project-view/providers/widgetRegistry/__tests__/configuration.test.ts
rename to app/gui/src/providers/openedProjects/widgetRegistry/__tests__/configuration.test.ts
diff --git a/app/gui/src/project-view/providers/widgetRegistry/__tests__/editHandler.test.ts b/app/gui/src/providers/openedProjects/widgetRegistry/__tests__/editHandler.test.ts
similarity index 100%
rename from app/gui/src/project-view/providers/widgetRegistry/__tests__/editHandler.test.ts
rename to app/gui/src/providers/openedProjects/widgetRegistry/__tests__/editHandler.test.ts
diff --git a/app/gui/src/project-view/providers/widgetRegistry/configuration.ts b/app/gui/src/providers/openedProjects/widgetRegistry/configuration.ts
similarity index 100%
rename from app/gui/src/project-view/providers/widgetRegistry/configuration.ts
rename to app/gui/src/providers/openedProjects/widgetRegistry/configuration.ts
diff --git a/app/gui/src/project-view/providers/widgetRegistry/devtools.ts b/app/gui/src/providers/openedProjects/widgetRegistry/devtools.ts
similarity index 97%
rename from app/gui/src/project-view/providers/widgetRegistry/devtools.ts
rename to app/gui/src/providers/openedProjects/widgetRegistry/devtools.ts
index ac3b1bec5261..ab04e8962a42 100644
--- a/app/gui/src/project-view/providers/widgetRegistry/devtools.ts
+++ b/app/gui/src/providers/openedProjects/widgetRegistry/devtools.ts
@@ -1,4 +1,4 @@
-import { Score, type WidgetModule } from '@/providers/widgetRegistry'
+import { Score, type WidgetModule } from '$/providers/openedProjects/widgetRegistry'
 import { setupDevtoolsPlugin } from '@vue/devtools-api'
 import { getCurrentInstance, type App, type ComponentInternalInstance } from 'vue'
 
diff --git a/app/gui/src/project-view/providers/widgetRegistry/editHandler.ts b/app/gui/src/providers/openedProjects/widgetRegistry/editHandler.ts
similarity index 99%
rename from app/gui/src/project-view/providers/widgetRegistry/editHandler.ts
rename to app/gui/src/providers/openedProjects/widgetRegistry/editHandler.ts
index c4417c2dc329..c236ebbdaf9b 100644
--- a/app/gui/src/project-view/providers/widgetRegistry/editHandler.ts
+++ b/app/gui/src/providers/openedProjects/widgetRegistry/editHandler.ts
@@ -1,7 +1,7 @@
+import type { WidgetInput, WidgetTypeId } from '$/providers/openedProjects/widgetRegistry'
 import type { Interaction, InteractionHandler } from '@/providers/interactionHandler'
 import { injectInteractionHandler } from '@/providers/interactionHandler'
 import type { PortId } from '@/providers/portInfo'
-import { WidgetInput, type WidgetTypeId } from '@/providers/widgetRegistry'
 import { injectWidgetTree, type CurrentEdit } from '@/providers/widgetTree'
 import type { Ast } from '@/util/ast'
 import { ArgumentInfoKey } from '@/util/callTree'

From 6afc0f11f736fa9e7d5fa8eb46e5dccd12be52e4 Mon Sep 17 00:00:00 2001
From: Adam Obuchowicz <adam.obuchowicz@enso.org>
Date: Tue, 23 Sep 2025 15:19:39 +0200
Subject: [PATCH 02/17] New edit API for opened module

---
 .../components/FunctionSignatureEditor.vue    |  11 +-
 .../project-view/components/GraphEditor.vue   |  18 +-
 .../components/GraphEditor/GraphEdges.vue     | 146 +++++-----
 .../components/GraphEditor/GraphNode.vue      |  16 +-
 .../GraphEditor/GraphNodeMessage.vue          |   8 +-
 .../GraphEditor/widgets/WidgetCheckbox.vue    |  43 +--
 .../GraphEditor/widgets/WidgetFileBrowser.vue |   3 +-
 .../WidgetFileBrowser/browsableTypes.ts       |  15 +-
 .../GraphEditor/widgets/WidgetFunction.vue    | 210 ++++++++-------
 .../widgets/WidgetMultiSelection.vue          |  39 +--
 .../GraphEditor/widgets/WidgetSelection.vue   |  13 +-
 .../GraphEditor/widgets/WidgetTableEditor.vue |  16 +-
 .../WidgetTableEditor/tableInputArgument.ts   | 249 ++++++++++--------
 .../GraphEditor/widgets/WidgetText.vue        |  39 +--
 .../GraphEditor/widgets/WidgetVector.vue      |  26 +-
 .../project-view/composables/nodeCreation.ts  |   2 +
 .../providers/openedProjects/graph/graph.ts   |  22 +-
 .../providers/openedProjects/module/module.ts |  28 +-
 app/ydoc-shared/src/util/data/result.ts       |  21 ++
 19 files changed, 500 insertions(+), 425 deletions(-)

diff --git a/app/gui/src/project-view/components/FunctionSignatureEditor.vue b/app/gui/src/project-view/components/FunctionSignatureEditor.vue
index f475a0012cd0..c37a1b5e658f 100644
--- a/app/gui/src/project-view/components/FunctionSignatureEditor.vue
+++ b/app/gui/src/project-view/components/FunctionSignatureEditor.vue
@@ -44,8 +44,7 @@ const docsData = computed(() => {
 })
 
 function handleWidgetUpdates(update: WidgetUpdate) {
-  applyWidgetUpdates(update, module.value)
-  return Ok()
+  return applyWidgetUpdates(update, module.value)
 }
 
 const funcNameInput = computed(() => {
@@ -78,10 +77,10 @@ function handleAddItem() {
 }
 
 function doEdit(editFn: (ast: Ast.MutableFunctionDef, edit: Ast.MutableModule) => void) {
-  const edit = module.value.startEdit()
-  if (!edit) return
-  editFn(edit.getVersion(functionAst), edit)
-  handleWidgetUpdates({ edit, directInteraction: true })
+  module.value.edit((edit) => {
+    editFn(edit.getVersion(functionAst), edit)
+    return Ok()
+  })
 }
 
 const currentArgNames = (ast: Ast.FunctionDef) =>
diff --git a/app/gui/src/project-view/components/GraphEditor.vue b/app/gui/src/project-view/components/GraphEditor.vue
index b7f7dbd26a60..280db00cba9a 100644
--- a/app/gui/src/project-view/components/GraphEditor.vue
+++ b/app/gui/src/project-view/components/GraphEditor.vue
@@ -201,6 +201,7 @@ const { place: nodePlacement, collapse: collapsedNodePlacement } = usePlacement(
 )
 
 const { scheduleCreateNode, createNodes, placeNode } = provideNodeCreation(
+  module,
   graphStore,
   toRef(graphNavigator, 'viewport'),
   toRef(graphNavigator, 'sceneMousePos'),
@@ -576,14 +577,15 @@ function collapseNodes(nodes: Node[]) {
       )
       const position = collapsedNodePlacement(selectedNodeRects)
       edit.get(collapsedCallRoot).mutableNodeMetadata().set('position', position.xy())
-      if (outputAstId != null) {
-        const collapsedNodeRects = iter.filterDefined(
-          iter.map(collapsedNodeIds, graphStore.visibleArea),
-        )
-        const { place } = usePlacement(collapsedNodeRects, graphNavigator.viewport)
-        const position = place(collapsedNodeRects)
-        edit.get(outputAstId).mutableNodeMetadata().set('position', position.xy())
-      }
+
+      const collapsedNodeRects = iter.filterDefined(
+        iter.map(collapsedNodeIds, graphStore.visibleArea),
+      )
+      const { place } = usePlacement(collapsedNodeRects, graphNavigator.viewport)
+      const outputPosition = place(collapsedNodeRects)
+      edit.get(outputAstId).mutableNodeMetadata().set('position', outputPosition.xy())
+
+      return Ok()
     })
   } catch (err) {
     console.error('Error while creating User Defined Component, this is not normal.', err)
diff --git a/app/gui/src/project-view/components/GraphEditor/GraphEdges.vue b/app/gui/src/project-view/components/GraphEditor/GraphEdges.vue
index 4aa3931eb3d2..4fcd67d065a2 100644
--- a/app/gui/src/project-view/components/GraphEditor/GraphEdges.vue
+++ b/app/gui/src/project-view/components/GraphEditor/GraphEdges.vue
@@ -12,10 +12,10 @@ import { injectInteractionHandler, type Interaction } from '@/providers/interact
 import type { PortId } from '@/providers/portInfo'
 import { Ast } from '@/util/ast'
 import { isAstId, type AstId } from '@/util/ast/abstract'
-import { unwrapOr, unwrapOrWithLog } from '@/util/data/result'
+import { Err, Ok, unwrapOr, unwrapOrWithLog } from '@/util/data/result'
 import { Vec2 } from '@/util/data/vec2'
 import { ProjectPath } from '@/util/projectPath'
-import { toast } from 'react-toastify'
+import { useToast } from '@/util/toast'
 import { computed } from 'vue'
 
 const {
@@ -28,6 +28,7 @@ const {
 const selection = injectGraphSelection(true)
 const interaction = injectInteractionHandler()
 const nodeSelection = injectGraphSelection(true)
+const connectionToast = useToast.error()
 
 const props = defineProps<{
   navigator: GraphNavigator
@@ -83,39 +84,39 @@ function edgeInteractionClick() {
   }
   const target = graph.value.mouseEditedEdge.target ?? selection?.hoveredPort
   const targetNode = target && graph.value.getPortNodeId(target)
-  module.value.batchEdits(() => {
-    if (source != null && sourceNode != targetNode) {
-      if (target == null) {
-        if (graph.value.mouseEditedEdge?.disconnectedEdgeTarget != null)
-          disconnectEdge(graph.value.mouseEditedEdge.disconnectedEdgeTarget)
-        emit('createNodeFromEdge', source, props.navigator.sceneMousePos ?? Vec2.Zero)
-      } else {
-        createEdge(source, target)
-      }
-    } else if (source == null && target != null) {
-      disconnectEdge(target)
+  if (source != null && sourceNode != targetNode) {
+    if (target == null) {
+      if (graph.value.mouseEditedEdge?.disconnectedEdgeTarget != null)
+        disconnectEdge(graph.value.mouseEditedEdge.disconnectedEdgeTarget)
+      emit('createNodeFromEdge', source, props.navigator.sceneMousePos ?? Vec2.Zero)
+    } else {
+      createEdge(source, target)
     }
-    graph.value.mouseEditedEdge = undefined
-  })
+  } else if (source == null && target != null) {
+    disconnectEdge(target)
+  }
+  graph.value.mouseEditedEdge = undefined
   return true
 }
 
 interaction.setWhen(() => graph.value.mouseEditedEdge != null, editingEdge)
 
-function disconnectEdge(target: PortId) {
-  module.edit((edit) => {
-    if (!graph.value.updatePortValue(target, undefined, edit, false)) {
+async function disconnectEdge(target: PortId) {
+  const result = await module.value.edit(async (edit) => {
+    const updateResult = await graph.value.updatePortValue(target, undefined, edit, false)
+    if (!updateResult.ok) {
       if (isAstId(target)) {
         console.warn(`Failed to disconnect edge from port ${target}, falling back to direct edit.`)
         edit.replaceValue(target, Ast.Wildcard.new(edit))
-      } else {
-        console.error(`Failed to disconnect edge from port ${target}, no fallback possible.`)
+        return Ok()
       }
     }
+    return updateResult
   })
+  if (!result.ok) result.error.log(`Failed to disconnect edge from port ${target}`)
 }
 
-function createEdge(source: AstId, target: PortId) {
+async function createEdge(source: AstId, target: PortId) {
   const graph_ = graph.value
   const ident = graph_.db.getOutputPortIdentifier(source)
   if (ident == null) return
@@ -126,56 +127,67 @@ function createEdge(source: AstId, target: PortId) {
     return console.error(`Failed to connect edge, source or target node not found.`)
   }
 
-  const edit = module.value.startEdit()
-  const reorderResult = graph_.ensureCorrectNodeOrder(edit, sourceNode, targetNode)
-  if (reorderResult === 'circular') {
-    // Creating this edge would create a circular dependency. Prevent that and display error.
-    toast.error('Could not connect due to circular dependency.')
-  } else {
-    const identAst = Ast.parseExpression(ident, edit)!
-    const expectedType = unwrapOr(
-      projectNames.value.parseProjectPathRaw(graph_.getPortExpectedType(target) ?? ''),
-      undefined,
-    )
-    const connectionType =
-      project.value.computedValueRegistry.getExpressionInfo(sourceNode)?.typeInfo
-    // Check if type cast to the target type is both possible and necessary.
-    const findCompatibleType = (
-      list: ProjectPath[] | undefined,
-      withType: ProjectPath | undefined,
-    ) => {
-      return list
-        ?.flatMap((type) =>
-          unwrapOrWithLog(suggestionDb.value.entries.getTypeAndItsParentsEntries(type), []),
-        )
-        .find((type) => withType?.equals(type.definitionPath))
-    }
-    const castNeeded = findCompatibleType(connectionType?.visibleTypes, expectedType) == null
-    const targetType = castNeeded && findCompatibleType(connectionType?.hiddenTypes, expectedType)
-    let portValueToSet = undefined
-    if (targetType) {
-      module.value.addMissingImports(edit, requiredImports(suggestionDb.value.entries, targetType))
-      if (!Ast.isIdentifier(targetType.name)) {
-        console.error(
-          'SuggestionDB has a type which is not an identifier:',
-          targetType.definitionPath,
+  const result = await module.value.edit(async (edit) => {
+    const reorderResult = graph_.ensureCorrectNodeOrder(edit, sourceNode, targetNode)
+    if (reorderResult === 'circular') {
+      // Creating this edge would create a circular dependency. Prevent that and display error.
+      const err = Err('Could not connect due to circular dependency')
+      connectionToast.show(err.error.payload)
+      return err
+    } else {
+      const identAst = Ast.parseExpression(ident, edit)!
+      const expectedType = unwrapOr(
+        projectNames.value.parseProjectPathRaw(graph_.getPortExpectedType(target) ?? ''),
+        undefined,
+      )
+      const connectionType =
+        project.value.computedValueRegistry.getExpressionInfo(sourceNode)?.typeInfo
+      // Check if type cast to the target type is both possible and necessary.
+      const findCompatibleType = (
+        list: ProjectPath[] | undefined,
+        withType: ProjectPath | undefined,
+      ) => {
+        return list
+          ?.flatMap((type) =>
+            unwrapOrWithLog(suggestionDb.value.entries.getTypeAndItsParentsEntries(type), []),
+          )
+          .find((type) => withType?.equals(type.definitionPath))
+      }
+      const castNeeded = findCompatibleType(connectionType?.visibleTypes, expectedType) == null
+      const targetType = castNeeded && findCompatibleType(connectionType?.hiddenTypes, expectedType)
+      let portValueToSet = undefined
+      if (targetType) {
+        module.value.addMissingImports(
+          edit,
+          requiredImports(suggestionDb.value.entries, targetType),
         )
-      } else {
-        portValueToSet = Ast.TypeAnnotated.new(edit, identAst, Ast.Ident.new(edit, targetType.name))
+        if (!Ast.isIdentifier(targetType.name)) {
+          console.error(
+            'SuggestionDB has a type which is not an identifier:',
+            targetType.definitionPath,
+          )
+        } else {
+          portValueToSet = Ast.TypeAnnotated.new(
+            edit,
+            identAst,
+            Ast.Ident.new(edit, targetType.name),
+          )
+        }
       }
-    }
-    portValueToSet = portValueToSet ?? identAst
-
-    if (!graph_.updatePortValue(target, portValueToSet, edit)) {
-      if (isAstId(target)) {
-        console.warn(`Failed to connect edge to port ${target}, falling back to direct edit.`)
-        edit.replaceValue(target, portValueToSet)
-        module.commitEdit(edit)
-      } else {
-        console.error(`Failed to connect edge to port ${target}, no fallback possible.`)
+      portValueToSet = portValueToSet ?? identAst
+
+      const updateResult = await graph_.updatePortValue(target, portValueToSet, edit)
+      if (!updateResult.ok) {
+        if (isAstId(target)) {
+          console.warn(`Failed to connect edge to port ${target}, falling back to direct edit.`)
+          edit.replaceValue(target, portValueToSet)
+          return Ok()
+        }
       }
+      return updateResult
     }
-  }
+  })
+  if (!result.ok) result.error.log(`Failed to connect edge to port ${target}`)
 }
 
 const nodeIdsWithOutputPorts = computed(() =>
diff --git a/app/gui/src/project-view/components/GraphEditor/GraphNode.vue b/app/gui/src/project-view/components/GraphEditor/GraphNode.vue
index ece1ffff0dff..e99c8eb0dcbc 100644
--- a/app/gui/src/project-view/components/GraphEditor/GraphNode.vue
+++ b/app/gui/src/project-view/components/GraphEditor/GraphNode.vue
@@ -45,6 +45,7 @@ import { prefixes } from '@/util/ast/node'
 import { onWindowBlur } from '@/util/autoBlur'
 import type { Opt } from '@/util/data/opt'
 import { Rect } from '@/util/data/rect'
+import { Ok } from '@/util/data/result'
 import { Vec2 } from '@/util/data/vec2'
 import { computed, onUnmounted, ref, toRef, watch, watchEffect, type ComponentInstance } from 'vue'
 import type { VisualizationIdentifier } from 'ydoc-shared/yjsModel'
@@ -236,13 +237,14 @@ const isRecordingOverridden = computed({
     return props.node.prefixes.enableRecording != null
   },
   set(shouldOverride) {
-    const edit = props.node.rootExpr.module.edit()
-    const replacement =
-      shouldOverride && !projectStore.isRecordingEnabled ?
-        [Ast.TextLiteral.new(projectStore.executionMode, edit)]
-      : undefined
-    prefixes.value.modify(edit.getVersion(props.node.rootExpr), { enableRecording: replacement })
-    module.commitEdit(edit)
+    module.value.edit((edit) => {
+      const replacement =
+        shouldOverride && !projectStore.isRecordingEnabled ?
+          [Ast.TextLiteral.new(projectStore.executionMode, edit)]
+        : undefined
+      prefixes.value.modify(edit.getVersion(props.node.rootExpr), { enableRecording: replacement })
+      return Ok()
+    })
   },
 })
 
diff --git a/app/gui/src/project-view/components/GraphEditor/GraphNodeMessage.vue b/app/gui/src/project-view/components/GraphEditor/GraphNodeMessage.vue
index fb44ec6baabf..4ccbc73278de 100644
--- a/app/gui/src/project-view/components/GraphEditor/GraphNodeMessage.vue
+++ b/app/gui/src/project-view/components/GraphEditor/GraphNodeMessage.vue
@@ -3,10 +3,11 @@ import { useCurrentProject } from '$/components/WithCurrentProject.vue'
 import { QualifiedImport } from '$/providers/openedProjects/module/imports'
 import SvgButton from '@/components/SvgButton.vue'
 import SvgIcon from '@/components/SvgIcon.vue'
+import { Ok } from '@/util/data/result'
 import type { Icon } from '@/util/iconMetadata/iconName'
 import { ProjectPath } from '@/util/projectPath'
 
-const { names, module, graph } = useCurrentProject().storesRefs
+const { names, module } = useCurrentProject().storesRefs
 
 const props = defineProps<{
   message: string
@@ -37,7 +38,10 @@ function fixImport() {
       kind: 'Qualified',
       module: libName,
     } satisfies QualifiedImport
-    module.value.edit((edit) => module.value.addMissingImports(edit, [theImport]))
+    module.value.edit((edit) => {
+      module.value.addMissingImports(edit, [theImport])
+      return Ok()
+    })
   }
 }
 </script>
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetCheckbox.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetCheckbox.vue
index f80d8530ea37..f9d238a5d0b4 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetCheckbox.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetCheckbox.vue
@@ -44,27 +44,28 @@ const value = computed({
     return WidgetInput.valueRepr(props.input)?.endsWith('True') ?? false
   },
   set(value) {
-    const edit = module.value.startEdit()
-    const theImport = value ? trueImport.value : falseImport.value
-    const inputValue: Ast.Expression | string | undefined = props.input.value
-    if (inputValue instanceof Ast.Ast) {
-      const { requiresImport } = setBoolNode(
-        edit.getVersion(inputValue),
-        value ? ('True' as Identifier) : ('False' as Identifier),
-      )
-      if (requiresImport) module.value.addMissingImports(edit, theImport)
-      props.updateCallback({ edit, directInteraction: true })
-    } else {
-      module.value.addMissingImports(edit, theImport)
-      props.updateCallback({
-        edit,
-        portUpdate: {
-          value: value ? 'True' : 'False',
-          origin: props.input.portId,
-        },
-        directInteraction: true,
-      })
-    }
+    module.value.edit((edit) => {
+      const theImport = value ? trueImport.value : falseImport.value
+      const inputValue: Ast.Expression | string | undefined = props.input.value
+      if (inputValue instanceof Ast.Ast) {
+        const { requiresImport } = setBoolNode(
+          edit.getVersion(inputValue),
+          value ? ('True' as Identifier) : ('False' as Identifier),
+        )
+        if (requiresImport) module.value.addMissingImports(edit, theImport)
+        return props.updateCallback({ edit, directInteraction: true })
+      } else {
+        module.value.addMissingImports(edit, theImport)
+        return props.updateCallback({
+          edit,
+          portUpdate: {
+            value: value ? 'True' : 'False',
+            origin: props.input.portId,
+          },
+          directInteraction: true,
+        })
+      }
+    })
   },
 })
 
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser.vue
index e214c5f02524..5482dea8d15c 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser.vue
@@ -63,7 +63,6 @@ const makeSetPathUpdate = useSetPath({
   currentPath: currentPathAst,
   preferRawPath: () => !!typeInfo.value.rawPath?.prefer,
   portId: () => props.input.portId,
-  edit: () => module.value.startEdit(),
   addMissingConstructorImports: (edit, type) =>
     module.value.addMissingImports(
       edit,
@@ -72,7 +71,7 @@ const makeSetPathUpdate = useSetPath({
 })
 
 function setPath(type: 'file' | 'secret', path: string) {
-  props.updateCallback(makeSetPathUpdate(type, path))
+  module.value.edit((edit) => props.updateCallback(makeSetPathUpdate(type, path, edit)))
 }
 
 const write = computed(() => typeInfo.value.write)
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/browsableTypes.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/browsableTypes.ts
index d7e08ee9bce4..012b4c3d9fcb 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/browsableTypes.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/browsableTypes.ts
@@ -217,13 +217,11 @@ export function useSetPath({
   currentPath,
   preferRawPath,
   portId,
-  edit,
   addMissingConstructorImports,
 }: {
   currentPath: ToValue<CurrentPath | undefined>
   preferRawPath: ToValue<boolean>
   portId: ToValue<PortId>
-  edit: ToValue<Ast.MutableModule>
   addMissingConstructorImports: (module: Ast.MutableModule, type: ProjectPath) => boolean
 }) {
   const FILE_CONSTRUCTOR_PATTERN = {
@@ -264,6 +262,7 @@ export function useSetPath({
       makeValue,
       preferRawPath,
     }: { type: AbsoluteProjectPath; makeValue: MakeValue; preferRawPath: boolean },
+    edit: Ast.MutableModule,
   ): WidgetUpdate {
     if (currentPath || preferRawPath) {
       return {
@@ -274,22 +273,21 @@ export function useSetPath({
         directInteraction: true,
       }
     } else {
-      const module = toValue(edit)
-      const importsOk = addMissingConstructorImports(module, type)
-      const pathText = Ast.TextLiteral.new(path, module)
+      const importsOk = addMissingConstructorImports(edit, type)
+      const pathText = Ast.TextLiteral.new(path, edit)
       const pathStyle = importsOk ? 'default' : 'full'
       return {
         portUpdate: {
-          value: makeValue(module, pathText, pathStyle),
+          value: makeValue(edit, pathText, pathStyle),
           origin: toValue(portId),
         },
-        edit: module,
+        edit,
         directInteraction: true,
       }
     }
   }
 
-  function setPath(type: 'file' | 'secret', path: string) {
+  function setPath(type: 'file' | 'secret', path: string, edit: Ast.MutableModule) {
     const oldPathInfo = toValue(currentPath)
     const oldPath = oldPathInfo?.type === type ? oldPathInfo.path : undefined
     return widgetUpdate(
@@ -306,6 +304,7 @@ export function useSetPath({
           makeValue: makeFile,
           preferRawPath: toValue(preferRawPath),
         },
+      edit,
     )
   }
 
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction.vue
index b747aef25b41..9967e1e09234 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useCurrentProject, useProjectNames } from '$/components/WithCurrentProject.vue'
+import { useCurrentProject } from '$/components/WithCurrentProject.vue'
 import type { MethodCallInfo } from '$/providers/openedProjects/graph/graphDatabase'
 import {
   Score,
@@ -27,10 +27,10 @@ import { methodPointerEquals, type MethodPointer } from '@/util/methodPointer'
 import { isIdentifier } from '@/util/qualifiedName'
 import { proxyRefs } from '@/util/reactivity'
 import { computed } from 'vue'
-import { Ok } from 'ydoc-shared/util/data/result'
+import { Err, Ok } from 'ydoc-shared/util/data/result'
 
 const props = defineProps(widgetProps(widgetDefinition))
-const { store: project, module, graph } = useCurrentProject().storesRefs
+const { names: projectNames, store: project, module, graph } = useCurrentProject().storesRefs
 
 const exprInfo = computed(() => graph.value.db.getExpressionInfo(props.input.value.externalId))
 const outputType = computed(() => exprInfo.value?.typeInfo?.primaryType)
@@ -39,7 +39,7 @@ const { methodCallInfo, application, subject, subjectInfo } = useWidgetFunctionC
   () => props.input,
   () => graph.value.db,
   project,
-  useProjectNames(),
+  projectNames,
 )
 
 provideFunctionInfo(
@@ -89,125 +89,131 @@ function handleArgUpdate(update: WidgetUpdate): HandledUpdate {
       directInteraction,
     } = update
 
-    const edit = update.edit ?? module.value.startEdit()
-    // Find the updated argument by matching origin port/expression with the appropriate argument.
-    // We are interested only in updates at the top level of the argument AST. Updates from nested
-    // widgets do not need to be processed at the function application level.
-    const applications = [...app.iterApplications()]
-    const argAppIndex = applications.findIndex(
-      (app) => 'portId' in app.argument && app.argument.portId === origin,
-    )
-    const argApp = applications[argAppIndex]
+    const f = (edit: Ast.MutableModule) => {
+      // Find the updated argument by matching origin port/expression with the appropriate argument.
+      // We are interested only in updates at the top level of the argument AST. Updates from nested
+      // widgets do not need to be processed at the function application level.
+      const applications = [...app.iterApplications()]
+      const argAppIndex = applications.findIndex(
+        (app) => 'portId' in app.argument && app.argument.portId === origin,
+      )
+      const argApp = applications[argAppIndex]
 
-    // Perform appropriate AST update, either insertion or deletion.
-    if (value != null && argApp?.argument instanceof ArgumentPlaceholder) {
-      /* Case: Inserting value to a placeholder. */
-      const newArg = value instanceof Ast.Ast ? value : Ast.parseExpression(value, edit)!
-      if (argApp.appTree instanceof Ast.OprApp) {
-        edit.getVersion(argApp.appTree)[argApp.argument.index === 0 ? 'setLhs' : 'setRhs'](newArg)
-      } else {
-        const name =
-          argApp.argument.insertAsNamed && isIdentifier(argApp.argument.argInfo.name) ?
-            argApp.argument.argInfo.name
-          : undefined
-        edit
-          .getVersion(argApp.appTree)
-          .updateValue((oldAppTree) => Ast.App.new(edit, oldAppTree, name, newArg))
-      }
-      return props.updateCallback({ edit, directInteraction })
-    } else if (value == null && argApp?.argument instanceof ArgumentAst) {
-      /* Case: Removing existing argument. */
+      // Perform appropriate AST update, either insertion or deletion.
+      if (value != null && argApp?.argument instanceof ArgumentPlaceholder) {
+        /* Case: Inserting value to a placeholder. */
+        const newArg = value instanceof Ast.Ast ? value : Ast.parseExpression(value, edit)!
+        if (argApp.appTree instanceof Ast.OprApp) {
+          edit.getVersion(argApp.appTree)[argApp.argument.index === 0 ? 'setLhs' : 'setRhs'](newArg)
+        } else {
+          const name =
+            argApp.argument.insertAsNamed && isIdentifier(argApp.argument.argInfo.name) ?
+              argApp.argument.argInfo.name
+            : undefined
+          edit
+            .getVersion(argApp.appTree)
+            .updateValue((oldAppTree) => Ast.App.new(edit, oldAppTree, name, newArg))
+        }
+        return props.updateCallback({ edit, directInteraction })
+      } else if (value == null && argApp?.argument instanceof ArgumentAst) {
+        /* Case: Removing existing argument. */
 
-      // HACK: Temporarily modify expression info to include the deleted argument on a list, so it
-      // immediately appears back as a placeholder after deletion, before the engine respones.
-      // The engine will soon send another expression update, overwriting this change anyway.
-      //
-      // This update is unfortunately not saved in the undo stack. Undoing and redoing the edit will
-      // still cause the placeholder to glitch out temporarily, but this is good enough for now.
-      // Proper fix would involve adding a proper "optimistic response" mechanism that can also be
-      // saved in the undo transaction.
-      const deletedArgIdx = argApp.argument.index
-      if (deletedArgIdx != null && methodCallInfo.value) {
-        // Grab original expression info data straight from DB, so we modify the original state.
-        const notAppliedArguments = graph.db.getExpressionInfo(
-          methodCallInfo.value.methodCallSource,
-        )?.methodCall?.notAppliedArguments
-        if (notAppliedArguments != null) {
-          const insertAt = partitionPoint(notAppliedArguments, (i) => i < deletedArgIdx)
-          if (notAppliedArguments[insertAt] != deletedArgIdx) {
-            // Insert the deleted argument back to the method info. This directly modifies observable
-            // data in `ComputedValueRegistry`. That's on purpose.
-            notAppliedArguments.splice(insertAt, 0, deletedArgIdx)
+        // HACK: Temporarily modify expression info to include the deleted argument on a list, so it
+        // immediately appears back as a placeholder after deletion, before the engine respones.
+        // The engine will soon send another expression update, overwriting this change anyway.
+        //
+        // This update is unfortunately not saved in the undo stack. Undoing and redoing the edit will
+        // still cause the placeholder to glitch out temporarily, but this is good enough for now.
+        // Proper fix would involve adding a proper "optimistic response" mechanism that can also be
+        // saved in the undo transaction.
+        const deletedArgIdx = argApp.argument.index
+        if (deletedArgIdx != null && methodCallInfo.value) {
+          // Grab original expression info data straight from DB, so we modify the original state.
+          const notAppliedArguments = graph.value.db.getExpressionInfo(
+            methodCallInfo.value.methodCallSource,
+          )?.methodCall?.notAppliedArguments
+          if (notAppliedArguments != null) {
+            const insertAt = partitionPoint(notAppliedArguments, (i) => i < deletedArgIdx)
+            if (notAppliedArguments[insertAt] != deletedArgIdx) {
+              // Insert the deleted argument back to the method info. This directly modifies observable
+              // data in `ComputedValueRegistry`. That's on purpose.
+              notAppliedArguments.splice(insertAt, 0, deletedArgIdx)
+            }
           }
         }
-      }
-
-      if (argApp.appTree instanceof Ast.App && argApp.appTree.argumentName != null) {
-        /* Case: Removing named prefix argument. */
 
-        // Named argument can always be removed immediately. Replace the whole application with its
-        // target, effectively removing the argument from the call.
-        const func = edit.getVersion(argApp.appTree.function).take()
-        return props.updateCallback({
-          edit,
-          portUpdate: {
-            value: func,
-            origin: argApp.appTree.id,
-          },
-          directInteraction,
-        })
-      } else if (argApp.appTree instanceof Ast.OprApp) {
-        /* Case: Removing infix application. */
+        if (argApp.appTree instanceof Ast.App && argApp.appTree.argumentName != null) {
+          /* Case: Removing named prefix argument. */
 
-        // Infix application is removed as a whole. Only the target is kept.
-        if (argApp.appTree.lhs) {
-          const lhs = edit.getVersion(argApp.appTree.lhs).take()
+          // Named argument can always be removed immediately. Replace the whole application with its
+          // target, effectively removing the argument from the call.
+          const func = edit.getVersion(argApp.appTree.function).take()
           return props.updateCallback({
             edit,
             portUpdate: {
-              value: lhs,
+              value: func,
               origin: argApp.appTree.id,
             },
             directInteraction,
           })
-        }
-      } else if (argApp.appTree instanceof Ast.App && argApp.appTree.argumentName == null) {
-        /* Case: Removing positional prefix argument. */
+        } else if (argApp.appTree instanceof Ast.OprApp) {
+          /* Case: Removing infix application. */
 
-        // Since the update of this kind can affect following arguments, it may be necessary to
-        // replace the AST for multiple levels of application.
+          // Infix application is removed as a whole. Only the target is kept.
+          if (argApp.appTree.lhs) {
+            const lhs = edit.getVersion(argApp.appTree.lhs).take()
+            return props.updateCallback({
+              edit,
+              portUpdate: {
+                value: lhs,
+                origin: argApp.appTree.id,
+              },
+              directInteraction,
+            })
+          } else {
+            return Err('Cannot remove operand of infix without target')
+          }
+        } else if (argApp.appTree instanceof Ast.App && argApp.appTree.argumentName == null) {
+          /* Case: Removing positional prefix argument. */
+
+          // Since the update of this kind can affect following arguments, it may be necessary to
+          // replace the AST for multiple levels of application.
 
-        // Traverse the application chain, starting from the outermost application and going
-        // towards the innermost target.
-        for (const innerApp of applications) {
-          if (innerApp.appTree.id === argApp.appTree.id) {
-            // Found the application with the argument to remove. Skip the argument and use the
-            // application target's code. This is the final iteration of the loop.
-            const appTree = edit.getVersion(argApp.appTree)
-            if (graph.value.db.isNodeId(appTree.externalId)) {
-              // If the modified application is a node root, preserve its identity and metadata.
-              appTree.updateValue((appTree) => appTree.function.take())
+          // Traverse the application chain, starting from the outermost application and going
+          // towards the innermost target.
+          for (const innerApp of applications) {
+            if (innerApp.appTree.id === argApp.appTree.id) {
+              // Found the application with the argument to remove. Skip the argument and use the
+              // application target's code. This is the final iteration of the loop.
+              const appTree = edit.getVersion(argApp.appTree)
+              if (graph.value.db.isNodeId(appTree.externalId)) {
+                // If the modified application is a node root, preserve its identity and metadata.
+                appTree.updateValue((appTree) => appTree.function.take())
+              } else {
+                appTree.update((appTree) => appTree.function.take())
+              }
+              return props.updateCallback({ edit, directInteraction })
             } else {
-              appTree.update((appTree) => appTree.function.take())
-            }
-            return props.updateCallback({ edit, directInteraction })
-          } else {
-            // Process an argument to the right of the removed argument.
-            assert(innerApp.appTree instanceof Ast.App)
-            const infoName = innerApp.argument.argInfo?.name
-            // Positional arguments following the deleted argument must all be rewritten to named.
-            if (infoName && isIdentifier(infoName) && !innerApp.appTree.argumentName) {
-              edit.getVersion(innerApp.appTree).setArgumentName(infoName)
+              // Process an argument to the right of the removed argument.
+              assert(innerApp.appTree instanceof Ast.App)
+              const infoName = innerApp.argument.argInfo?.name
+              // Positional arguments following the deleted argument must all be rewritten to named.
+              if (infoName && isIdentifier(infoName) && !innerApp.appTree.argumentName) {
+                edit.getVersion(innerApp.appTree).setArgumentName(infoName)
+              }
             }
           }
+          assertUnreachable()
+        } else if (value == null && argApp.argument instanceof ArgumentPlaceholder) {
+          /* Case: Removing placeholder value. */
+          // Do nothing. The argument already doesn't exist, so there is nothing to update.
+          return Ok()
         }
-        assertUnreachable()
-      } else if (value == null && argApp.argument instanceof ArgumentPlaceholder) {
-        /* Case: Removing placeholder value. */
-        // Do nothing. The argument already doesn't exist, so there is nothing to update.
-        return Ok()
       }
+      return Err('Unknown case for updating argument')
     }
+    if (update.edit) f(update.edit)
+    else module.value.edit(f)
   }
   // Any other case is handled by the default handler.
   return props.updateCallback(update)
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetMultiSelection.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetMultiSelection.vue
index c4c9a6f2558f..29e6bf847b62 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetMultiSelection.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetMultiSelection.vue
@@ -144,25 +144,26 @@ function onClick({
 }) {
   if (tag instanceof NestedChoiceTag) return
 
-  const edit = module.value.startEdit()
-  const directInteraction = true
-  const tagValue = tag.resolveExpression(edit, module.value)
-  const inputValue = editedValue.value ?? props.input.value
-  if (inputValue instanceof Ast.Vector) {
-    toggleVectorValue(edit.getVersion(inputValue), tagValue, previousState)
-    props.updateCallback({ edit, directInteraction })
-  } else {
-    const vector = Ast.Vector.new(
-      edit,
-      inputValue instanceof Ast.Ast ? [edit.take(inputValue.id)] : [],
-    )
-    toggleVectorValue(vector, tagValue, previousState)
-    props.updateCallback({
-      edit,
-      portUpdate: { value: vector, origin: props.input.portId },
-      directInteraction,
-    })
-  }
+  module.value.edit((edit) => {
+    const directInteraction = true
+    const tagValue = tag.resolveExpression(edit, module.value)
+    const inputValue = editedValue.value ?? props.input.value
+    if (inputValue instanceof Ast.Vector) {
+      toggleVectorValue(edit.getVersion(inputValue), tagValue, previousState)
+      return props.updateCallback({ edit, directInteraction })
+    } else {
+      const vector = Ast.Vector.new(
+        edit,
+        inputValue instanceof Ast.Ast ? [edit.take(inputValue.id)] : [],
+      )
+      toggleVectorValue(vector, tagValue, previousState)
+      return props.updateCallback({
+        edit,
+        portUpdate: { value: vector, origin: props.input.portId },
+        directInteraction,
+      })
+    }
+  })
 }
 </script>
 
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelection.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelection.vue
index 60fc350d1113..ded06de53bb5 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelection.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelection.vue
@@ -215,12 +215,13 @@ function onClick(clickedEntry: Entry, keepOpen: boolean) {
 }
 
 function expressionTagClicked(tag: ExpressionTag) {
-  const edit = module.value.startEdit()
-  const tagValue = tag.resolveExpression(edit, module.value)
-  props.updateCallback({
-    edit,
-    portUpdate: { value: tagValue, origin: props.input.portId },
-    directInteraction: true,
+  module.value.edit((edit) => {
+    const tagValue = tag.resolveExpression(edit, module.value)
+    return props.updateCallback({
+      edit,
+      portUpdate: { value: tagValue, origin: props.input.portId },
+      directInteraction: true,
+    })
   })
 }
 </script>
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor.vue
index 774653556d3d..6852c6d0b148 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor.vue
@@ -11,6 +11,7 @@ import {
 } from '@/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument'
 import AgGridTableView from '@/components/shared/AgGridTableView.vue'
 import { targetIsOutside } from '@/util/autoBlur'
+import { Result } from '@/util/data/result'
 import { ProjectPath } from '@/util/projectPath'
 import type { Identifier, QualifiedName } from '@/util/qualifiedName'
 import { proxyRefs } from '@/util/reactivity'
@@ -23,7 +24,7 @@ import type {
   ProcessDataFromClipboardParams,
   RowDragEndEvent,
 } from 'ag-grid-enterprise'
-import { computed, ref, watch, type ComponentInstance, type ComputedRef } from 'vue'
+import { ComponentInstance, computed, ComputedRef, ref, watch } from 'vue'
 import type { ComponentExposed } from 'vue-component-type-helpers'
 import { z } from 'zod'
 import ResizableWidget from '../ResizableWidget.vue'
@@ -116,13 +117,20 @@ function processDataFromClipboard({ data, api }: ProcessDataFromClipboardParams<
   const focusedCell = api.getFocusedCell()
   if (focusedCell === null) console.warn('Pasting while no cell is focused!')
   else {
+    const checkAndWarn = (pasted: Result<{ rows: number; columns: number }>) => {
+      if (
+        pasted.ok &&
+        (pasted.value.rows < data.length || pasted.value.columns < (data[0]?.length ?? 0))
+      ) {
+        pasteWarning.show(`Truncated pasted data to keep table within ${CELLS_LIMIT} limit`)
+      }
+    }
     const pasted = pasteFromClipboard(data, {
       rowIndex: focusedCell.rowIndex,
       colId: focusedCell.column.getColId(),
     })
-    if (pasted.rows < data.length || pasted.columns < (data[0]?.length ?? 0)) {
-      pasteWarning.show(`Truncated pasted data to keep table within ${CELLS_LIMIT} limit`)
-    }
+    if (pasted instanceof Promise) pasted.then(checkAndWarn)
+    else checkAndWarn(pasted)
   }
   return []
 }
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts
index a9c2a30125e6..07cebf73765c 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts
@@ -1,7 +1,7 @@
 import { type ModuleStore } from '$/providers/openedProjects/module'
 import { requiredImportsByProjectPath } from '$/providers/openedProjects/module/imports'
 import type { SuggestionDb } from '$/providers/openedProjects/suggestionDatabase'
-import type { WidgetInput, WidgetUpdate } from '$/providers/openedProjects/widgetRegistry'
+import type { UpdateHandler, WidgetInput } from '$/providers/openedProjects/widgetRegistry'
 import { commonContextMenuActions, type MenuItem } from '@/components/shared/AgGridTableView.vue'
 import { Ast } from '@/util/ast'
 import { findIndexOpt } from '@/util/data/array'
@@ -12,6 +12,7 @@ import { qnLastSegment, type QualifiedName } from '@/util/qualifiedName'
 import { cachedGetter, type ToValue } from '@/util/reactivity'
 import type { ColDef } from 'ag-grid-enterprise'
 import * as iter from 'enso-common/src/utilities/data/iter'
+import { isPromise } from 'util/types'
 import { computed, toValue } from 'vue'
 import type { ColumnSpecificParams } from './TableHeader.vue'
 
@@ -140,9 +141,9 @@ export function tableInputCallMayBeHandled(call: Ast.Expression) {
  */
 export function useTableInputArgument(
   input: ToValue<WidgetInput & { value: Ast.Expression }>,
-  module: ToValue<Pick<ModuleStore, 'addMissingImports'>>,
+  module: ToValue<Pick<ModuleStore, 'edit' | 'addMissingImports'>>,
   suggestions: ToValue<SuggestionDb>,
-  onUpdate: (update: WidgetUpdate) => void,
+  onUpdate: UpdateHandler,
 ) {
   const errorMessagePreamble = 'Table Editor Widget should not have been matched'
   const columnsAst = computed(() => retrieveColumnsAst(toValue(input).value))
@@ -270,21 +271,29 @@ export function useTableInputArgument(
   const removeRowMenuItem = {
     name: 'Remove Row',
     action: ({ node }: { node: { data: RowData | undefined } | null }) => {
-      if (!node?.data) return
-      const edit = toValue(module).startEdit()
-      fixColumns(edit)
-      removeRow(edit, node.data.index)
-      onUpdate({ edit, directInteraction: true })
+      toValue(module).edit(
+        (edit) => {
+          if (!node?.data) return Err('No node data')
+          fixColumns(edit)
+          removeRow(edit, node.data.index)
+          return onUpdate({ edit, directInteraction: true })
+        },
+        { logPreamble: 'Cannot remove row in Table Widget' },
+      )
     },
   }
 
   const removeColumnMenuItem = (colId: Ast.AstId) => ({
     name: 'Remove Column',
     action: () => {
-      const edit = toValue(module).startEdit()
-      fixColumns(edit)
-      removeColumn(edit, colId)
-      onUpdate({ edit, directInteraction: true })
+      toValue(module).edit(
+        (edit) => {
+          fixColumns(edit)
+          removeColumn(edit, colId)
+          return onUpdate({ edit, directInteraction: true })
+        },
+        { logPreamble: 'Cannot remove column in Table Widget' },
+      )
     },
   })
 
@@ -302,10 +311,14 @@ export function useTableInputArgument(
         type: 'newColumn',
         enabled: mayAddNewColumnCurrently.value,
         newColumnRequested: () => {
-          const edit = toValue(module).startEdit()
-          fixColumns(edit)
-          addColumn(edit, `${DEFAULT_COLUMN_PREFIX}${columns.value.length + 1}`)
-          onUpdate({ edit, directInteraction: true })
+          toValue(module).edit(
+            (edit) => {
+              fixColumns(edit)
+              addColumn(edit, `${DEFAULT_COLUMN_PREFIX}${columns.value.length + 1}`)
+              return onUpdate({ edit, directInteraction: true })
+            },
+            { logPreamble: 'Cannot add new column' },
+          )
         },
       },
     },
@@ -362,31 +375,40 @@ export function useTableInputArgument(
               return false
             }
             const ast = colData.at(data.index)
-            const edit = toValue(module).startEdit()
-            fixColumns(edit)
-            if (data.index === rowCount.value) {
-              addRow(edit, (colId) => (colId === col.id ? newValue : null))
-            } else {
-              const newValueAst = convertWithImport(newValue, edit)
-              if (ast != null) edit.getVersion(ast).replace(newValueAst)
-              else edit.getVersion(colData).set(data.index, newValueAst)
-            }
-            onUpdate({ edit, directInteraction: true })
-            return true
+            const result = toValue(module).edit(
+              (edit) => {
+                fixColumns(edit)
+                if (data.index === rowCount.value) {
+                  addRow(edit, (colId) => (colId === col.id ? newValue : null))
+                } else {
+                  const newValueAst = convertWithImport(newValue, edit)
+                  if (ast != null) edit.getVersion(ast).replace(newValueAst)
+                  else edit.getVersion(colData).set(data.index, newValueAst)
+                }
+                return onUpdate({ edit, directInteraction: true })
+              },
+              { logPreamble: 'Cannot set value on table cell' },
+            )
+            return isPromise(result) ? true : result.ok
           },
           headerComponentParams: {
             columnParams: {
               type: 'astColumn',
               nameSetter: (newName: string) => {
-                const edit = toValue(module).startEdit()
-                const column = columns.value[i]
-                if (column == null) {
-                  console.error('Tried to rename column no longer existing in code')
-                  return
-                }
-                fixColumns(edit)
-                edit.getVersion(column.name).setRawTextContent(newName)
-                onUpdate({ edit, directInteraction: true })
+                toValue(module).edit(
+                  (edit) => {
+                    const column = columns.value[i]
+                    if (column == null) {
+                      const err = Err('Tried to rename column no longer existing in code')
+                      err.error.log()
+                      return err
+                    }
+                    fixColumns(edit)
+                    edit.getVersion(column.name).setRawTextContent(newName)
+                    return onUpdate({ edit, directInteraction: true })
+                  },
+                  { logPreamble: 'Cannot rename header' },
+                )
               },
             },
           },
@@ -431,52 +453,58 @@ export function useTableInputArgument(
   }
 
   function moveColumn(colId: string, toIndex: number) {
-    if (!columnsAst.value.ok) {
-      columnsAst.value.error.log('Cannot reorder columns: The table AST is not available')
-      return
-    }
-    if (!columnsAst.value.value) {
-      console.error('Cannot reorder columns on placeholders! This should not be possible in the UI')
-      return
-    }
-    const edit = toValue(module).startEdit()
-    const columns = edit.getVersion(columnsAst.value.value)
-    const fromIndex = iter.find(columns.enumerate(), ([, ast]) => ast?.id === colId)?.[0]
-    if (fromIndex != null) {
-      columns.move(fromIndex, toIndex - 1)
-      onUpdate({ edit, directInteraction: true })
-    }
+    toValue(module).edit(
+      (edit) => {
+        if (!columnsAst.value.ok) {
+          return columnsAst.value
+        }
+        if (!columnsAst.value.value) {
+          return Err(
+            'Cannot reorder columns on placeholders! This should not be possible in the UI',
+          )
+        }
+        const columns = edit.getVersion(columnsAst.value.value)
+        const fromIndex = iter.find(columns.enumerate(), ([, ast]) => ast?.id === colId)?.[0]
+        if (fromIndex != null) {
+          columns.move(fromIndex, toIndex - 1)
+          return onUpdate({ edit, directInteraction: true })
+        }
+        return Err(`Uknown columnId ${colId}`)
+      },
+      { logPreamble: 'Cannot reorder columns' },
+    )
   }
 
   function moveRow(rowIndex: number, overIndex: number) {
-    if (!columnsAst.value.ok) {
-      columnsAst.value.error.log('Cannot reorder rows: The table AST is not available')
-      return
-    }
-    if (!columnsAst.value.value) {
-      console.error('Cannot reorder rows on placeholders! This should not be possible in the UI')
-      return
-    }
     // If dragged out of grid, we do nothing.
     if (overIndex === -1) return
-    const edit = toValue(module).startEdit()
-    for (const col of columns.value) {
-      const editedCol = edit.getVersion(col.data)
-      editedCol.move(rowIndex, overIndex)
-    }
-    onUpdate({ edit, directInteraction: true })
+    toValue(module).edit(
+      (edit) => {
+        if (!columnsAst.value.ok) {
+          return columnsAst.value
+        }
+        if (!columnsAst.value.value) {
+          return Err('Cannot reorder rows on placeholders! This should not be possible in the UI')
+        }
+        for (const col of columns.value) {
+          const editedCol = edit.getVersion(col.data)
+          editedCol.move(rowIndex, overIndex)
+        }
+        return onUpdate({ edit, directInteraction: true })
+      },
+      { logPreamble: 'Cannot move row' },
+    )
   }
 
   function pasteFromClipboard(data: string[][], focusedCell: { rowIndex: number; colId: string }) {
-    if (data.length === 0) return { rows: 0, columns: 0 }
-    const edit = toValue(module).startEdit()
+    if (data.length === 0) return Ok({ rows: 0, columns: 0 })
     const focusedColIndex =
       findIndexOpt(columns.value, ({ id }) => id === focusedCell.colId) ?? columns.value.length
 
     const newValueGetter = (rowIndex: number, colIndex: number) => {
       if (rowIndex < focusedCell.rowIndex) return undefined
       if (colIndex < focusedColIndex) return undefined
-      return data[rowIndex - focusedCell.rowIndex]?.[colIndex - focusedColIndex]
+      return Ok(data[rowIndex - focusedCell.rowIndex]?.[colIndex - focusedColIndex])
     }
     const pastedRowsEnd = focusedCell.rowIndex + data.length
     const pastedColsEnd = focusedColIndex + data[0]!.length
@@ -484,53 +512,56 @@ export function useTableInputArgument(
     let actuallyPastedRowsEnd = pastedRowsEnd
     let actuallyPastedColsEnd = pastedColsEnd
 
-    // Set data in existing cells.
-    for (
-      let rowIndex = focusedCell.rowIndex;
-      rowIndex < Math.min(pastedRowsEnd, rowCount.value);
-      ++rowIndex
-    ) {
+    return toValue(module).edit(async (edit) => {
+      // Set data in existing cells.
       for (
-        let colIndex = focusedColIndex;
-        colIndex < Math.min(pastedColsEnd, columns.value.length);
-        ++colIndex
+        let rowIndex = focusedCell.rowIndex;
+        rowIndex < Math.min(pastedRowsEnd, rowCount.value);
+        ++rowIndex
       ) {
-        const column = columns.value[colIndex]!
-        const newValueAst = convertWithImport(newValueGetter(rowIndex, colIndex), edit)
-        edit.getVersion(column.data).set(rowIndex, newValueAst)
+        for (
+          let colIndex = focusedColIndex;
+          colIndex < Math.min(pastedColsEnd, columns.value.length);
+          ++colIndex
+        ) {
+          const column = columns.value[colIndex]!
+          const newValueAst = convertWithImport(newValueGetter(rowIndex, colIndex), edit)
+          edit.getVersion(column.data).set(rowIndex, newValueAst)
+        }
       }
-    }
 
-    // Extend the table if necessary.
-    const newRowCount = Math.max(pastedRowsEnd, rowCount.value)
-    for (let i = rowCount.value; i < newRowCount; ++i) {
-      if (!mayAddNewRow(i)) {
-        actuallyPastedRowsEnd = i
-        break
-      }
+      // Extend the table if necessary.
+      const newRowCount = Math.max(pastedRowsEnd, rowCount.value)
+      for (let i = rowCount.value; i < newRowCount; ++i) {
+        if (!mayAddNewRow(i)) {
+          actuallyPastedRowsEnd = i
+          break
+        }
 
-      addRow(edit, (_colId, index) => newValueGetter(i, index))
-    }
-    const newColCount = Math.max(pastedColsEnd, columns.value.length)
-    let modifiedColumnsAst: Ast.Vector | undefined = undefined
-    for (let i = columns.value.length; i < newColCount; ++i) {
-      if (!mayAddNewColumn(newRowCount, i)) {
-        actuallyPastedColsEnd = i
-        break
+        addRow(edit, (_colId, index) => newValueGetter(i, index))
       }
-      modifiedColumnsAst = addColumn(
-        edit,
-        `${DEFAULT_COLUMN_PREFIX}${i + 1}`,
-        (index) => newValueGetter(index, i),
-        newRowCount,
-        modifiedColumnsAst,
-      )
-    }
-    onUpdate({ edit, directInteraction: true })
-    return {
-      rows: actuallyPastedRowsEnd - focusedCell.rowIndex,
-      columns: actuallyPastedColsEnd - focusedColIndex,
-    }
+      const newColCount = Math.max(pastedColsEnd, columns.value.length)
+      let modifiedColumnsAst: Ast.Vector | undefined = undefined
+      for (let i = columns.value.length; i < newColCount; ++i) {
+        if (!mayAddNewColumn(newRowCount, i)) {
+          actuallyPastedColsEnd = i
+          break
+        }
+        modifiedColumnsAst = addColumn(
+          edit,
+          `${DEFAULT_COLUMN_PREFIX}${i + 1}`,
+          (index) => newValueGetter(index, i),
+          newRowCount,
+          modifiedColumnsAst,
+        )
+      }
+      const updateResult = await onUpdate({ edit, directInteraction: true })
+      if (!updateResult.ok) return updateResult
+      return Ok({
+        rows: actuallyPastedRowsEnd - focusedCell.rowIndex,
+        columns: actuallyPastedColsEnd - focusedColIndex,
+      })
+    })
   }
 
   return {
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetText.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetText.vue
index 4ab53705d94b..089fa27520b9 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetText.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetText.vue
@@ -28,28 +28,29 @@ const textContents = computed(() =>
 function acceptValue(text: string): HandledUpdate {
   const module = currentProject.value.module
 
-  if (props.input.value instanceof Ast.TextLiteral) {
-    const edit = module.startEdit()
-    const value = edit.getVersion(props.input.value)
-    if (value.rawTextContent === text) return Ok()
-    value.setRawTextContent(text)
-    return props.updateCallback({ edit, directInteraction: true })
-  } else {
-    let value: Ast.Owned<Ast.MutableTextLiteral>
-    if (inputTextLiteral.value) {
-      value = Ast.copyIntoNewModule(inputTextLiteral.value)
+  return module.edit((edit) => {
+    if (props.input.value instanceof Ast.TextLiteral) {
+      const value = edit.getVersion(props.input.value)
+      if (value.rawTextContent === text) return Ok()
       value.setRawTextContent(text)
+      return props.updateCallback({ edit, directInteraction: true })
     } else {
-      value = Ast.TextLiteral.new(text)
+      let value: Ast.Owned<Ast.MutableTextLiteral>
+      if (inputTextLiteral.value) {
+        value = Ast.copyIntoNewModule(inputTextLiteral.value)
+        value.setRawTextContent(text)
+      } else {
+        value = Ast.TextLiteral.new(text)
+      }
+      return props.updateCallback({
+        portUpdate: {
+          value,
+          origin: props.input.portId,
+        },
+        directInteraction: true,
+      })
     }
-    return props.updateCallback({
-      portUpdate: {
-        value,
-        origin: props.input.portId,
-      },
-      directInteraction: true,
-    })
-  }
+  })
 }
 
 /** Widget Input as Text Literal; undefined if there's no value, or the value is not a Text literal. */
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetVector.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetVector.vue
index 69b5865a9138..90e5b1f33ca9 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetVector.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetVector.vue
@@ -21,18 +21,20 @@ const project = useCurrentProject().ref
 const tree = injectWidgetTree()
 
 function doEdit(editFn: (ast: Ast.MutableVector) => void) {
-  if (props.input.value instanceof Ast.Vector) {
-    const edit = project.value.module.startEdit()
-    editFn(edit.getVersion(props.input.value))
-    props.updateCallback({ edit, directInteraction: true })
-  } else {
-    const value = Ast.Vector.new(MutableModule.Transient(), [])
-    editFn(value)
-    props.updateCallback({
-      portUpdate: { value, origin: props.input.portId },
-      directInteraction: true,
-    })
-  }
+  project.value.module.edit((edit) => {
+    if (props.input.value instanceof Ast.Vector) {
+      editFn(edit.getVersion(props.input.value))
+      return props.updateCallback({ edit, directInteraction: true })
+    } else {
+      const value = Ast.Vector.new(MutableModule.Transient(), [])
+      editFn(value)
+      return props.updateCallback({
+        edit,
+        portUpdate: { value, origin: props.input.portId },
+        directInteraction: true,
+      })
+    }
+  })
 }
 
 const itemConfig = computed(() =>
diff --git a/app/gui/src/project-view/composables/nodeCreation.ts b/app/gui/src/project-view/composables/nodeCreation.ts
index 7cb956b2ca5a..11fa8931da13 100644
--- a/app/gui/src/project-view/composables/nodeCreation.ts
+++ b/app/gui/src/project-view/composables/nodeCreation.ts
@@ -14,6 +14,7 @@ import { Ast } from '@/util/ast'
 import { isIdentifier, substituteIdentifier, type Identifier } from '@/util/ast/abstract'
 import { partition } from '@/util/data/array'
 import { Rect } from '@/util/data/rect'
+import { Ok } from '@/util/data/result'
 import { Vec2 } from '@/util/data/vec2'
 import { qnLastSegment, tryQualifiedName } from '@/util/qualifiedName'
 import type { ToValue } from '@/util/reactivity'
@@ -150,6 +151,7 @@ export function useNodeCreation(
         graph.nodeRects.set(id, new Rect(Vec2.FromXY(options.metadata.position), Vec2.Zero))
       }
       insertNodeStatements(edit.getVersion(methodAst.value).bodyAsBlock(), statements)
+      return Ok()
     })
     graph.doAfterUpdate(() => onCreated(created))
   }
diff --git a/app/gui/src/providers/openedProjects/graph/graph.ts b/app/gui/src/providers/openedProjects/graph/graph.ts
index 7a9f4d30ca24..316f41585842 100644
--- a/app/gui/src/providers/openedProjects/graph/graph.ts
+++ b/app/gui/src/providers/openedProjects/graph/graph.ts
@@ -11,12 +11,8 @@ import { type RequiredImport } from '$/providers/openedProjects/module/imports'
 import { type ProjectStore } from '$/providers/openedProjects/project'
 import { type ProjectNameStore } from '$/providers/openedProjects/projectNames'
 import { type SuggestionDbStore } from '$/providers/openedProjects/suggestionDatabase'
-import { type Typename } from '$/providers/openedProjects/suggestionDatabase/entry'
-import type {
-  UpdateHandler,
-  UpdateResult,
-  WidgetUpdate,
-} from '$/providers/openedProjects/widgetRegistry'
+import { Typename } from '$/providers/openedProjects/suggestionDatabase/entry'
+import type { UpdateHandler, UpdateResult } from '$/providers/openedProjects/widgetRegistry'
 import { usePlacement } from '@/components/ComponentBrowser/placement'
 import type { PortId } from '@/providers/portInfo'
 import { assert, assertNever } from '@/util/assert'
@@ -30,7 +26,6 @@ import { andThen, Err, Ok, unwrap, type Result } from '@/util/data/result'
 import { Vec2 } from '@/util/data/vec2'
 import type { MethodPointer } from '@/util/methodPointer'
 import { proxyRefs, useWatchContext } from '@/util/reactivity'
-import { computedAsync } from '@vueuse/core'
 import { useCallbackRegistry } from 'enso-common/src/utilities/data/callbacks'
 import * as iter from 'enso-common/src/utilities/data/iter'
 import { map, set } from 'lib0'
@@ -49,7 +44,7 @@ import {
   type ShallowReactive,
   type ShallowRef,
 } from 'vue'
-import type { ExpressionUpdate, Path as LsPath } from 'ydoc-shared/languageServerTypes'
+import type { ExpressionUpdate } from 'ydoc-shared/languageServerTypes'
 import { reachable } from 'ydoc-shared/util/data/graph'
 import type { ExternalId, VisualizationMetadata } from 'ydoc-shared/yjsModel'
 import { visMetadataEquals } from 'ydoc-shared/yjsModel'
@@ -665,16 +660,6 @@ export function createGraphStore(
     return true
   }
 
-  const modulePath: Ref<LsPath | undefined> = computedAsync(
-    async () => {
-      const rootId = await proj.projectRootId
-      const segments = ['src', 'Main.enso']
-      return rootId ? { rootId, segments } : undefined
-    },
-    undefined,
-    { onError: console.error },
-  )
-
   function onBeforeEdit(f: (transaction: Y.Transaction) => void): { unregister: () => void } {
     proj.module?.doc.ydoc.on('beforeTransaction', f)
     return { unregister: () => proj.module?.doc.ydoc.off('beforeTransaction', f) }
@@ -714,7 +699,6 @@ export function createGraphStore(
     isConnectedSource,
     isConnectedTarget,
     nodeCanBeEntered,
-    modulePath,
     connectedEdges,
     currentMethod: proxyRefs({
       ast: methodAst,
diff --git a/app/gui/src/providers/openedProjects/module/module.ts b/app/gui/src/providers/openedProjects/module/module.ts
index 36283a479926..96148f3cf848 100644
--- a/app/gui/src/providers/openedProjects/module/module.ts
+++ b/app/gui/src/providers/openedProjects/module/module.ts
@@ -6,11 +6,9 @@ import { reactiveModule } from '@/util/ast/reactive'
 import { Err, Ok, type Result } from '@/util/data/result'
 import { type MethodPointer } from '@/util/methodPointer'
 import { proxyRefs } from '@/util/reactivity'
-import { computedAsync } from '@vueuse/core'
 import { isPromise } from 'util/types'
-import { computed, reactive, type Ref, ref, watch } from 'vue'
+import { computed, reactive, ref, watch } from 'vue'
 import { SourceDocument } from 'ydoc-shared/ast/sourceDocument'
-import type { Path as LsPath } from 'ydoc-shared/languageServerTypes'
 import { defaultLocalOrigin, type Origin } from 'ydoc-shared/yjsModel'
 import * as Y from 'yjs'
 import { type ProjectNameStore } from '../projectNames'
@@ -38,15 +36,6 @@ export function createModuleStore(
   const root = ref<Ast.BodyBlock>()
   const synced = computed(() => root.value?.module as Ast.MutableModule | undefined)
   const ast = computed((): Ast.Module => synced.value!)
-  const modulePath: Ref<LsPath | undefined> = computedAsync(
-    async () => {
-      const rootId = await proj.projectRootId
-      const segments = ['src', 'Main.enso']
-      return rootId ? { rootId, segments } : undefined
-    },
-    undefined,
-    { onError: console.error },
-  )
 
   watch(
     () => proj.module,
@@ -93,10 +82,16 @@ export function createModuleStore(
    */
   function edit<T, R extends Result<T> | Promise<Result<T>>>(
     f: (edit: MutableModule) => R,
-    options: { skipTreeRepair?: boolean; origin?: Origin } = {},
+    options: {
+      skipTreeRepair?: boolean
+      origin?: Origin
+      logLevel?: 'none' | 'info' | 'warn' | 'error'
+      logPreamble?: string
+    } = {},
   ): R {
     assertDefined(synced.value)
     const edit = synced.value.edit()
+    const logLevel = options.logLevel ?? 'error'
 
     const treeRepair = (result: Result<T>) => {
       if (result.ok && options.skipTreeRepair !== true) {
@@ -109,6 +104,8 @@ export function createModuleStore(
 
     const applyEdit = (result: Result<T>) => {
       if (result.ok) synced.value?.applyEdit(edit, options.origin)
+      else if (logLevel !== 'none')
+        console[logLevel](result.error.message(options.logPreamble ?? 'Cannot commit AST edit.'))
       return result
     }
 
@@ -157,7 +154,10 @@ export function createModuleStore(
     ast.setWidgetMetadata(widgetKey, md)
   }
 
-  /* Try adding imports. Does nothing if conflict is detected, and returns `DectedConflict` in such case. */
+  /**
+   * Try adding imports. Do not add those conflicting with existing imports - return
+   * `DectedConflict` in such case.
+   */
   function addMissingImports(
     edit: MutableModule,
     newImports: RequiredImport[],
diff --git a/app/ydoc-shared/src/util/data/result.ts b/app/ydoc-shared/src/util/data/result.ts
index 50e2e24a21f6..00c40764ec66 100644
--- a/app/ydoc-shared/src/util/data/result.ts
+++ b/app/ydoc-shared/src/util/data/result.ts
@@ -3,6 +3,7 @@
  * or an error.
  */
 
+import { isPromise } from 'util/types'
 import { isSome, type Opt } from './opt'
 
 /**
@@ -60,6 +61,26 @@ export function unwrap<T, E>(result: Result<T, E>): T {
   else throw result.error
 }
 
+export function logIfError<T, E>(result: Result<T, E>, preamble?: string): Result<T, E>
+export function logIfError<T, E>(
+  result: Promise<Result<T, E>>,
+  preamble?: string,
+): Promise<Result<T, E>>
+export function logIfError<T, E>(
+  result: Result<T, E> | Promise<Result<T, E>>,
+  preamble?: string,
+): Result<T, E> | Promise<Result<T, E>>
+/** Log if the result of this potentially asynchronous operation is an error. */
+export function logIfError<T, E>(result: Result<T, E> | Promise<Result<T, E>>, preamble?: string) {
+  if (isPromise(result))
+    return result.then((result) => {
+      if (!result.ok) result.error.log(preamble)
+      return result
+    })
+  else if (!result.ok) result.error.log(preamble)
+  return result
+}
+
 /**
  * Unwraps the {@link Result} value. If the result is absent or is an error value, an alternative is
  * returned.

From d273631cf520e13dffd38861e0302947bc5fbb15 Mon Sep 17 00:00:00 2001
From: Adam Obuchowicz <adam.obuchowicz@enso.org>
Date: Wed, 24 Sep 2025 12:03:14 +0200
Subject: [PATCH 03/17] Fix for WithCurrentProject

---
 app/gui/src/components/WithCurrentProject.vue | 69 ++++++++++++------
 .../components/ComponentBrowser/input.ts      |  9 ++-
 .../components/DocumentationEditor/index.ts   |  3 +-
 .../project-view/components/GraphEditor.vue   |  4 +-
 .../WidgetTableEditor/tableInputArgument.ts   |  3 +-
 app/gui/src/project-view/providers/index.ts   |  2 +
 .../providers/openedProjects/graph/graph.ts   | 70 ++++++++++++-------
 .../providers/openedProjects/module/module.ts | 30 ++++----
 app/ydoc-shared/src/util/data/result.ts       |  3 +-
 9 files changed, 123 insertions(+), 70 deletions(-)

diff --git a/app/gui/src/components/WithCurrentProject.vue b/app/gui/src/components/WithCurrentProject.vue
index bb34bc912e8a..2a8419964224 100644
--- a/app/gui/src/components/WithCurrentProject.vue
+++ b/app/gui/src/components/WithCurrentProject.vue
@@ -6,26 +6,20 @@ import { groupColorVar } from '@/composables/nodeColors'
 import { createContextStore } from '@/providers'
 import { assert } from '@/util/assert'
 import { colorFromString } from '@/util/colors'
-import type { Opt } from '@/util/data/opt'
-import type { ToValue } from '@/util/reactivity'
-import { computed, toValue, watch, type ToRefs } from 'vue'
+import { Opt } from '@/util/data/opt'
+import { ToValue } from '@/util/reactivity'
+import { computed, Ref, shallowRef, ToRefs, toValue, watch } from 'vue'
 
-/**
- * A context of a single opened project.
- *
- * Use `WithCurrentProject` component to provide which project is the current for entire component
- * tree (it's injects context and also sets proper css properties). Inside, inject will bring all
- * project-related stores. If the project is closed, all stores becomes undefined.
- */
-const [provideCurrentProject, useCurrentProject] = createContextStore(
+export type CurrentProjectStore = ReturnType<typeof useCurrentProjectRaw>
+const [provideCurrentProject, useCurrentProjectRaw] = createContextStore(
   'currentProject',
-  (project: ToValue<OpenedProject | undefined>) => {
+  (project: Ref<OpenedProject | undefined>) => {
     const ref = computed(() => {
-      const proj = toValue(project)
-      assert(proj != null)
-      return proj
+      assert(project.value != null)
+      return project.value
     })
     return {
+      maybeRef: project,
       /* Current project as a single ref  */
       ref,
       /* Current project's stores decomposed to separate refs. */
@@ -41,7 +35,25 @@ const [provideCurrentProject, useCurrentProject] = createContextStore(
   },
 )
 
-export { useCurrentProject }
+export function useCurrentProject(allowMissing: true): CurrentProjectStore | undefined
+export function useCurrentProject(allowMissing?: false): CurrentProjectStore
+export function useCurrentProject(allowMissing?: boolean): CurrentProjectStore | undefined
+/**
+ * A context of a single opened project.
+ *
+ * Use `WithCurrentProject` component to provide which project is the current for entire component
+ * tree (it injects context, makes sure the project is available, and sets proper css properties).
+ */
+export function useCurrentProject(allowMissing?: boolean) {
+  const currentProjectStore = useCurrentProjectRaw(allowMissing)
+  if (currentProjectStore == null) return undefined
+  // If the store is defined, but there is no project in it, it has to be fallback component.
+  if (currentProjectStore.maybeRef.value == null) {
+    if (allowMissing) return undefined
+    else throw new Error(`Trying to inject currentProject in WithProject's fallback component`)
+  }
+  return currentProjectStore
+}
 
 function useOpenedProject(projectId: ToValue<Opt<ProjectId>>) {
   const openedProjects = injectOpenedProjects()
@@ -101,12 +113,27 @@ export const useWidgetRegistry = useStoreTemplate('widgetRegistry')
 const { id } = defineProps<{ id: Opt<ProjectId> }>()
 
 const project = useOpenedProject(() => id)
+const providedProject = shallowRef<OpenedProject | undefined>(project.value)
+watch(
+  project,
+  (project) => {
+    if (project != null) providedProject.value = project
+  },
+  { flush: 'pre' },
+)
+watch(
+  project,
+  (project) => {
+    if (project == null) providedProject.value = project
+  },
+  { flush: 'post' },
+)
 
-const provided = provideCurrentProject(project).ref
+provideCurrentProject(providedProject)
 
 const groupColors = computed(() => {
   const styles: { [key: string]: string } = {}
-  const groups = provided.value?.suggestionDb.groups ?? []
+  const groups = project.value?.suggestionDb.groups ?? []
   for (const group of groups) {
     styles[groupColorVar(group)] = group.color ?? colorFromString(group.name)
   }
@@ -115,10 +142,10 @@ const groupColors = computed(() => {
 </script>
 
 <template>
-  <div v-if="project != null" class="WithCurrentProject" :style="groupColors">
-    <slot />
+  <div class="WithCurrentProject" :style="groupColors">
+    <slot v-if="project != null" />
+    <slot v-else name="fallback" />
   </div>
-  <slot v-else name="fallback" />
 </template>
 
 <style scoped>
diff --git a/app/gui/src/project-view/components/ComponentBrowser/input.ts b/app/gui/src/project-view/components/ComponentBrowser/input.ts
index 4809105f6856..3034e5f91452 100644
--- a/app/gui/src/project-view/components/ComponentBrowser/input.ts
+++ b/app/gui/src/project-view/components/ComponentBrowser/input.ts
@@ -25,7 +25,7 @@ import type { ProjectPath } from '@/util/projectPath'
 import { qnLastSegment } from '@/util/qualifiedName'
 import { proxyRefs, type ToValue } from '@/util/reactivity'
 import { useToast } from '@/util/toast'
-import { computed, readonly, ref, shallowRef, toValue, type ComputedRef } from 'vue'
+import { computed, readonly, ref, shallowRef, toRef, toValue, type ComputedRef } from 'vue'
 import { Range } from 'ydoc-shared/util/data/range'
 
 /** Information how the component browser is used, needed for proper input initializing. */
@@ -57,8 +57,11 @@ export type ComponentBrowserMode =
 
 /** Component Browser Input Data */
 export function useComponentBrowserInput(
-  graphDb: ToValue<GraphDb> = () => useCurrentProject().ref.value.graph.db,
-  suggestionDb: ToValue<SuggestionDb> = () => useCurrentProject().ref.value.suggestionDb.entries,
+  graphDb: ToValue<GraphDb> = toRef(useCurrentProject().storesRefs.graph.value, 'db'),
+  suggestionDb: ToValue<SuggestionDb> = toRef(
+    useCurrentProject().storesRefs.suggestionDb.value,
+    'entries',
+  ),
   ai: { query(query: string, sourcePort: string): Promise<Result<string>> } = useAI(),
 ) {
   const text = ref('')
diff --git a/app/gui/src/project-view/components/DocumentationEditor/index.ts b/app/gui/src/project-view/components/DocumentationEditor/index.ts
index 71752a89f252..3fc5e803584a 100644
--- a/app/gui/src/project-view/components/DocumentationEditor/index.ts
+++ b/app/gui/src/project-view/components/DocumentationEditor/index.ts
@@ -1,3 +1,4 @@
-import * as DocumentationEditor from './DocumentationEditor.vue'
+import DocumentationEditor from './DocumentationEditor.vue'
 
+export * from './DocumentationEditor.vue'
 export default DocumentationEditor
diff --git a/app/gui/src/project-view/components/GraphEditor.vue b/app/gui/src/project-view/components/GraphEditor.vue
index 280db00cba9a..aadd485bc2f2 100644
--- a/app/gui/src/project-view/components/GraphEditor.vue
+++ b/app/gui/src/project-view/components/GraphEditor.vue
@@ -507,8 +507,8 @@ function clearFocus() {
 function createNodesFromSource(sourceNode: NodeId, options: NodeCreationOptions[]) {
   const sourcePort = graphStore.db.getNodeFirstOutputPort(sourceNode)
   if (sourcePort == null) return
-  const sourcePortAst = module.value.ast.get(sourcePort)
-  assert(sourcePortAst.isExpression())
+  const sourcePortAst = module.value.ast?.get(sourcePort)
+  assert(sourcePortAst?.isExpression() === true)
   const [toCommit, toEdit] = partition(options, (opts) => opts.commit)
   createNodes(
     toCommit.map((options: NodeCreationOptions) => ({
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts
index 07cebf73765c..947168249963 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts
@@ -12,7 +12,6 @@ import { qnLastSegment, type QualifiedName } from '@/util/qualifiedName'
 import { cachedGetter, type ToValue } from '@/util/reactivity'
 import type { ColDef } from 'ag-grid-enterprise'
 import * as iter from 'enso-common/src/utilities/data/iter'
-import { isPromise } from 'util/types'
 import { computed, toValue } from 'vue'
 import type { ColumnSpecificParams } from './TableHeader.vue'
 
@@ -389,7 +388,7 @@ export function useTableInputArgument(
               },
               { logPreamble: 'Cannot set value on table cell' },
             )
-            return isPromise(result) ? true : result.ok
+            return result instanceof Promise ? true : result.ok
           },
           headerComponentParams: {
             columnParams: {
diff --git a/app/gui/src/project-view/providers/index.ts b/app/gui/src/project-view/providers/index.ts
index 789d38cb89dd..87797ce55bd8 100644
--- a/app/gui/src/project-view/providers/index.ts
+++ b/app/gui/src/project-view/providers/index.ts
@@ -30,6 +30,7 @@ export type ContextStore<Factory extends (...args: any[]) => any> = [
   injectFn: {
     (allowMissing?: false): ReturnType<Factory>
     (allowMissing: true): ReturnType<Factory> | undefined
+    (allowMissing?: boolean): ReturnType<Factory> | undefined
     (orProvideWith: () => Parameters<Factory>): ReturnType<Factory>
   },
 ]
@@ -72,6 +73,7 @@ export function createContextStore<F extends (...args: any[]) => any>(
 
   function injectFn(allowMissing: true): ReturnType<F> | undefined
   function injectFn(allowMissing?: false): ReturnType<F>
+  function injectFn(allowMissing?: boolean): ReturnType<F> | undefined
   function injectFn(orProvideWith: () => Parameters<F>): ReturnType<F>
   function injectFn(
     missingBehavior: boolean | (() => Parameters<F>) = false,
diff --git a/app/gui/src/providers/openedProjects/graph/graph.ts b/app/gui/src/providers/openedProjects/graph/graph.ts
index 316f41585842..5b6d3cdd3537 100644
--- a/app/gui/src/providers/openedProjects/graph/graph.ts
+++ b/app/gui/src/providers/openedProjects/graph/graph.ts
@@ -11,7 +11,7 @@ import { type RequiredImport } from '$/providers/openedProjects/module/imports'
 import { type ProjectStore } from '$/providers/openedProjects/project'
 import { type ProjectNameStore } from '$/providers/openedProjects/projectNames'
 import { type SuggestionDbStore } from '$/providers/openedProjects/suggestionDatabase'
-import { Typename } from '$/providers/openedProjects/suggestionDatabase/entry'
+import { type Typename } from '$/providers/openedProjects/suggestionDatabase/entry'
 import type { UpdateHandler, UpdateResult } from '$/providers/openedProjects/widgetRegistry'
 import { usePlacement } from '@/components/ComponentBrowser/placement'
 import type { PortId } from '@/providers/portInfo'
@@ -33,6 +33,7 @@ import {
   computed,
   markRaw,
   nextTick,
+  onScopeDispose,
   reactive,
   ref,
   shallowReactive,
@@ -137,6 +138,7 @@ export function createGraphStore(
 ) {
   const { run: cleanup, register: onCleanup } =
     useCallbackRegistry<Parameters<(key: NodeId) => void>>()
+
   const nodeState = {
     nodeHovered: useAssociatedFlag({ onCleanup }),
     nodeExtended: useAssociatedFlag({ onCleanup }),
@@ -148,6 +150,28 @@ export function createGraphStore(
   } as const
   const { nodeRects, vizRects, nodeOutputAnimations } = nodeState
 
+  const currentMethodPointer = computed((): Result<MethodPointer> => {
+    const executionStackTop = proj.executionContext.getStackTop()
+    switch (executionStackTop.type) {
+      case 'ExplicitCall': {
+        return Ok(executionStackTop.methodPointer)
+      }
+      case 'LocalCall': {
+        const exprId = executionStackTop.expressionId
+        const info = db.getExpressionInfo(exprId)
+        const ptr = info?.methodCall?.methodPointer
+        if (!ptr) return Err("Unknown method pointer of execution stack's top frame")
+        return Ok(ptr)
+      }
+      default:
+        return assertNever(executionStackTop)
+    }
+  })
+
+  function getExecutedMethodAst(edit?: Ast.Module): Result<Ast.FunctionDef> {
+    return andThen(currentMethodPointer.value, (ptr) => module.getMethodAst(ptr, edit))
+  }
+
   // The currently visible nodes' areas (including visualization).
   const visibleNodeAreas = computed(() => {
     const existing = iter.filter(nodeRects.entries(), ([id]) => db.isNodeId(id))
@@ -166,7 +190,6 @@ export function createGraphStore(
   )
   const portInstances = shallowReactive(new Map<PortId, Set<PortViewInstance>>())
   const editedNodeInfo = ref<NodeEditInfo>()
-
   const immediateMethodAst = computed<Result<Ast.FunctionDef>>(() => getExecutedMethodAst())
 
   // When renaming a function, we temporarily lose track of edited function AST. Ensure that we
@@ -185,7 +208,7 @@ export function createGraphStore(
 
   const fallbackMethodAst = computed(() => {
     const id = lastKnownResolvedMethodAstId.value
-    const ast = id != null ? module.ast.tryGet(id) : undefined
+    const ast = id != null ? module.ast?.tryGet(id) : undefined
     if (ast instanceof Ast.FunctionDef) return ast
     return undefined
   })
@@ -198,6 +221,25 @@ export function createGraphStore(
     return imm
   })
 
+  const unobserveModule = module.observe((update) => {
+    if (
+      module.root &&
+      (update.nodesAdded.size != 0 ||
+        update.nodesDeleted.size != 0 ||
+        update.nodesUpdated.size != 0 ||
+        update.updateRoots.size != 0)
+    ) {
+      db.updateExternalIds(module.root)
+    }
+    // We can cast maps of unknown metadata fields to `NodeMetadata` because all `NodeMetadata` fields are optional.
+    const nodeMetadataUpdates = update.metadataUpdated as any as {
+      id: AstId
+      changes: Ast.NodeMetadata
+    }[]
+    for (const { id, changes } of nodeMetadataUpdates) db.updateMetadata(id, changes)
+  })
+  onScopeDispose(unobserveModule)
+
   const watchContext = useWatchContext()
 
   const afterUpdate: (() => void)[] = []
@@ -221,28 +263,6 @@ export function createGraphStore(
       db.updateBindings(methodAst.value.value, module.source)
   })
 
-  const currentMethodPointer = computed((): Result<MethodPointer> => {
-    const executionStackTop = proj.executionContext.getStackTop()
-    switch (executionStackTop.type) {
-      case 'ExplicitCall': {
-        return Ok(executionStackTop.methodPointer)
-      }
-      case 'LocalCall': {
-        const exprId = executionStackTop.expressionId
-        const info = db.getExpressionInfo(exprId)
-        const ptr = info?.methodCall?.methodPointer
-        if (!ptr) return Err("Unknown method pointer of execution stack's top frame")
-        return Ok(ptr)
-      }
-      default:
-        return assertNever(executionStackTop)
-    }
-  })
-
-  function getExecutedMethodAst(edit?: Ast.Module): Result<Ast.FunctionDef> {
-    return andThen(currentMethodPointer.value, (ptr) => module.getMethodAst(ptr, edit))
-  }
-
   /**
    * Generate unique identifier from `prefix` and some numeric suffix.
    * @param prefix - of the identifier
diff --git a/app/gui/src/providers/openedProjects/module/module.ts b/app/gui/src/providers/openedProjects/module/module.ts
index 96148f3cf848..a6e2030b91a2 100644
--- a/app/gui/src/providers/openedProjects/module/module.ts
+++ b/app/gui/src/providers/openedProjects/module/module.ts
@@ -6,8 +6,7 @@ import { reactiveModule } from '@/util/ast/reactive'
 import { Err, Ok, type Result } from '@/util/data/result'
 import { type MethodPointer } from '@/util/methodPointer'
 import { proxyRefs } from '@/util/reactivity'
-import { isPromise } from 'util/types'
-import { computed, reactive, ref, watch } from 'vue'
+import { computed, reactive, type Ref, ref, watch } from 'vue'
 import { SourceDocument } from 'ydoc-shared/ast/sourceDocument'
 import { defaultLocalOrigin, type Origin } from 'ydoc-shared/yjsModel'
 import * as Y from 'yjs'
@@ -35,7 +34,8 @@ export function createModuleStore(
   const source = SourceDocument.Empty(reactive)
   const root = ref<Ast.BodyBlock>()
   const synced = computed(() => root.value?.module as Ast.MutableModule | undefined)
-  const ast = computed((): Ast.Module => synced.value!)
+  const ast = synced as Ref<Ast.Module | undefined>
+  const observers: ((update: Ast.ModuleUpdate) => void)[] = []
 
   watch(
     () => proj.module,
@@ -53,15 +53,8 @@ export function createModuleStore(
             update.updateRoots.size != 0
           ) {
             source.applyUpdate(module, update)
-            console.debug('Fix the below:')
-            // db.updateExternalIds(root)
           }
-          // We can cast maps of unknown metadata fields to `NodeMetadata` because all `NodeMetadata` fields are optional.
-          //   const nodeMetadataUpdates = update.metadataUpdated as any as {
-          //     id: AstId
-          //     changes: Ast.NodeMetadata
-          //   }[]
-          //   for (const { id, changes } of nodeMetadataUpdates) db.updateMetadata(id, changes)
+          for (const observer of observers) observer(update)
         } else {
           root.value = undefined
         }
@@ -73,6 +66,14 @@ export function createModuleStore(
     },
   )
 
+  function observe(f: (update: Ast.ModuleUpdate) => void) {
+    observers.push(f)
+    return () => {
+      const index = observers.indexOf(f)
+      if (index !== -1) observers.splice(index, 1)
+    }
+  }
+
   /**
    * Edit the AST module.
    *
@@ -111,13 +112,13 @@ export function createModuleStore(
 
     const result = edit.transact(() => {
       const result = f(edit)
-      if (isPromise(result)) {
+      if (result instanceof Promise) {
         return result.then(treeRepair)
       } else {
         return treeRepair(result)
       }
     })
-    if (isPromise(result)) return result.then(applyEdit) as R
+    if (result instanceof Promise) return result.then(applyEdit) as R
     else return applyEdit(result) as R
   }
 
@@ -127,7 +128,7 @@ export function createModuleStore(
   }
 
   function getMethodAst(ptr: MethodPointer, edit?: Ast.Module): Result<Ast.FunctionDef> {
-    const topLevel = (edit ?? ast.value).root()
+    const topLevel = (edit ?? ast.value)?.root()
     if (!topLevel) return Err('Module unavailable')
     assert(topLevel instanceof Ast.BodyBlock)
     if (!proj.moduleProjectPath?.ok)
@@ -213,6 +214,7 @@ export function createModuleStore(
     source,
     ast,
     root,
+    observe,
     edit,
     batchEdits,
     onBeforeEdit,
diff --git a/app/ydoc-shared/src/util/data/result.ts b/app/ydoc-shared/src/util/data/result.ts
index 00c40764ec66..93264c1ddb63 100644
--- a/app/ydoc-shared/src/util/data/result.ts
+++ b/app/ydoc-shared/src/util/data/result.ts
@@ -3,7 +3,6 @@
  * or an error.
  */
 
-import { isPromise } from 'util/types'
 import { isSome, type Opt } from './opt'
 
 /**
@@ -72,7 +71,7 @@ export function logIfError<T, E>(
 ): Result<T, E> | Promise<Result<T, E>>
 /** Log if the result of this potentially asynchronous operation is an error. */
 export function logIfError<T, E>(result: Result<T, E> | Promise<Result<T, E>>, preamble?: string) {
-  if (isPromise(result))
+  if (result instanceof Promise)
     return result.then((result) => {
       if (!result.ok) result.error.log(preamble)
       return result

From 8593f5e9f9217d0407f935218cc48c29c96fe9db Mon Sep 17 00:00:00 2001
From: Adam Obuchowicz <adam.obuchowicz@enso.org>
Date: Wed, 24 Sep 2025 13:10:53 +0200
Subject: [PATCH 04/17] Fix unit tests

---
 .../ComponentBrowser/__tests__/input.test.ts  |  2 +-
 .../GraphEditor/__tests__/clipboard.test.ts   |  2 +-
 .../GraphEditor/__tests__/collapsing.test.ts  |  2 +-
 .../__tests__/browsableTypes.test.ts          | 16 +++-------
 .../__tests__/widgetFunctionCallInfo.test.ts  |  2 +-
 .../__tests__/tableInputArgument.test.ts      | 31 ++++++++++++-------
 .../util/__tests__/callTree.test.ts           |  2 +-
 .../graph/__tests__/graphDatabase.test.ts     |  2 +-
 .../graph/__tests__/imports.test.ts           | 20 ++++++------
 .../__tests__/widgetRegistry.test.ts          | 10 ++++--
 .../openedProjects/widgetRegistry/index.ts    |  1 +
 .../{ => widgetRegistry}/widgetRegistry.ts    |  2 +-
 12 files changed, 49 insertions(+), 43 deletions(-)
 rename app/gui/src/{project-view/providers => providers/openedProjects/widgetRegistry}/__tests__/widgetRegistry.test.ts (95%)
 create mode 100644 app/gui/src/providers/openedProjects/widgetRegistry/index.ts
 rename app/gui/src/providers/openedProjects/{ => widgetRegistry}/widgetRegistry.ts (99%)

diff --git a/app/gui/src/project-view/components/ComponentBrowser/__tests__/input.test.ts b/app/gui/src/project-view/components/ComponentBrowser/__tests__/input.test.ts
index 80309fc05293..1e90f93a69bf 100644
--- a/app/gui/src/project-view/components/ComponentBrowser/__tests__/input.test.ts
+++ b/app/gui/src/project-view/components/ComponentBrowser/__tests__/input.test.ts
@@ -1,3 +1,4 @@
+import { GraphDb, NodeId } from '$/providers/openedProjects/graph/graphDatabase'
 import {
   ComputedValueRegistry,
   TypeInfo,
@@ -5,7 +6,6 @@ import {
 import { SuggestionDb } from '$/providers/openedProjects/suggestionDatabase'
 import { makeMethod, makeType } from '$/providers/openedProjects/suggestionDatabase/mockSuggestion'
 import { useComponentBrowserInput } from '@/components/ComponentBrowser/input'
-import { GraphDb, NodeId } from '@/stores/graph/graphDatabase'
 import { stdPath } from '@/util/projectPath'
 import { expect, test } from 'vitest'
 import { assert, assertUnreachable } from 'ydoc-shared/util/assert'
diff --git a/app/gui/src/project-view/components/GraphEditor/__tests__/clipboard.test.ts b/app/gui/src/project-view/components/GraphEditor/__tests__/clipboard.test.ts
index f70b396e6fd2..2448bfba9206 100644
--- a/app/gui/src/project-view/components/GraphEditor/__tests__/clipboard.test.ts
+++ b/app/gui/src/project-view/components/GraphEditor/__tests__/clipboard.test.ts
@@ -1,10 +1,10 @@
+import { type Node } from '$/providers/openedProjects/graph'
 import testCases from '@/components/GraphEditor/__tests__/clipboardTestCases.json' with { type: 'json' }
 import {
   isSpreadsheetTsv,
   nodesFromClipboardContent,
   nodesToClipboardData,
 } from '@/components/GraphEditor/graphClipboard'
-import type { Node } from '@/stores/graph'
 import { Ast } from '@/util/ast'
 import { nodeDocumentationText, nodeFromAst } from '@/util/ast/node'
 import { Blob } from 'node:buffer'
diff --git a/app/gui/src/project-view/components/GraphEditor/__tests__/collapsing.test.ts b/app/gui/src/project-view/components/GraphEditor/__tests__/collapsing.test.ts
index 33229141f7cd..6109adbea019 100644
--- a/app/gui/src/project-view/components/GraphEditor/__tests__/collapsing.test.ts
+++ b/app/gui/src/project-view/components/GraphEditor/__tests__/collapsing.test.ts
@@ -1,9 +1,9 @@
+import { GraphDb, type NodeId } from '$/providers/openedProjects/graph/graphDatabase'
 import {
   COLLAPSED_FUNCTION_NAME,
   performCollapseImpl,
   prepareCollapsedInfo,
 } from '@/components/GraphEditor/collapsing'
-import { GraphDb, type NodeId } from '@/stores/graph/graphDatabase'
 import { assert } from '@/util/assert'
 import { Ast } from '@/util/ast'
 import { findExpressions } from '@/util/ast/__tests__/testCase'
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/__tests__/browsableTypes.test.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/__tests__/browsableTypes.test.ts
index 56ff6b067e72..c0eb1f7e047f 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/__tests__/browsableTypes.test.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/__tests__/browsableTypes.test.ts
@@ -281,26 +281,22 @@ test.each([
 
 describe('Set path', () => {
   test('File, prefer raw, no current path', () => {
-    const edit = vi.fn()
     const addMissingConstructorImports = vi.fn()
     const portId = 'MOCK-PORT-ID' as Ast.AstId
     const setPath = useSetPath({
       currentPath: undefined,
       preferRawPath: true,
       portId,
-      edit,
       addMissingConstructorImports,
     })
-    const widgetUpdate = setPath('file', 'New path')
+    const widgetUpdate = setPath('file', 'New path', Ast.MutableModule.Transient())
     expect(widgetUpdate.portUpdate?.origin).toBe(portId)
     expect(widgetUpdate.portUpdate).toHaveProperty('value')
     expect((widgetUpdate.portUpdate as any).value.code()).toBe("'New path'")
-    expect(edit).not.toHaveBeenCalled()
     expect(addMissingConstructorImports).not.toHaveBeenCalled()
   })
 
   test.each(['file', 'secret'] as const)('Replace current path, type: %s', (type) => {
-    const edit = vi.fn()
     const addMissingConstructorImports = vi.fn()
     const currentPath = Ast.TextLiteral.tryParse("'Old path'")
     assertDefined(currentPath)
@@ -308,14 +304,12 @@ describe('Set path', () => {
       currentPath: { type, path: currentPath },
       preferRawPath: true,
       portId: 'MOCK-PORT-ID' as Ast.AstId,
-      edit,
       addMissingConstructorImports,
     })
-    const widgetUpdate = setPath(type, 'New path')
+    const widgetUpdate = setPath(type, 'New path', Ast.MutableModule.Transient())
     expect(widgetUpdate.portUpdate?.origin).toBe(currentPath.id)
     expect(widgetUpdate.portUpdate).toHaveProperty('value')
     expect((widgetUpdate.portUpdate as any).value.code()).toBe("'New path'")
-    expect(edit).not.toHaveBeenCalled()
     expect(addMissingConstructorImports).not.toHaveBeenCalled()
   })
 
@@ -341,21 +335,19 @@ describe('Set path', () => {
       expected: "(Standard.Base.Enso_Cloud.Enso_Secret.Enso_Secret.get 'New path')",
     },
   ])('Set path with constructor: $type, conflicts=$conflicts', ({ type, conflicts, expected }) => {
-    const edit = vi.fn(() => Ast.MutableModule.Transient())
+    const module = Ast.MutableModule.Transient()
     const addMissingConstructorImports = vi.fn(() => !conflicts)
     const portId = 'MOCK-PORT-ID' as Ast.AstId
     const setPath = useSetPath({
       currentPath: { type: 'wrong-type' as any, path: Ast.TextLiteral.tryParse("'Old path'")! },
       preferRawPath: false,
       portId,
-      edit,
       addMissingConstructorImports,
     })
-    const widgetUpdate = setPath(type, 'New path')
+    const widgetUpdate = setPath(type, 'New path', module)
     expect(widgetUpdate.portUpdate?.origin).toBe(portId)
     expect(widgetUpdate.portUpdate).toHaveProperty('value')
     expect((widgetUpdate.portUpdate as any).value.code()).toBe(expected)
-    expect(edit).toHaveBeenCalled()
     expect(addMissingConstructorImports).toHaveBeenCalled()
   })
 })
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction/__tests__/widgetFunctionCallInfo.test.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction/__tests__/widgetFunctionCallInfo.test.ts
index cf9c0a371f6a..d4beed827af6 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction/__tests__/widgetFunctionCallInfo.test.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction/__tests__/widgetFunctionCallInfo.test.ts
@@ -1,3 +1,4 @@
+import { parseWithSpans } from '$/providers/openedProjects/graph/__tests__/graphDatabase.test'
 import { TypeInfo } from '$/providers/openedProjects/project/computedValueRegistry'
 import { type NodeVisualizationConfiguration } from '$/providers/openedProjects/project/executionContext'
 import { mockProjectNameStore } from '$/providers/openedProjects/projectNames'
@@ -15,7 +16,6 @@ import {
   WIDGETS_ENSO_MODULE,
   useWidgetFunctionCallInfo,
 } from '@/components/GraphEditor/widgets/WidgetFunction/widgetFunctionCallInfo'
-import { parseWithSpans } from '@/stores/graph/__tests__/graphDatabase.test'
 import { assert } from '@/util/assert'
 import { Ast } from '@/util/ast'
 import { expect, test } from 'vitest'
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/__tests__/tableInputArgument.test.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/__tests__/tableInputArgument.test.ts
index 3fd1c6e000f5..8750c62f40d4 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/__tests__/tableInputArgument.test.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/__tests__/tableInputArgument.test.ts
@@ -1,3 +1,4 @@
+import { type RequiredImport } from '$/providers/openedProjects/module/imports'
 import { SuggestionDb } from '$/providers/openedProjects/suggestionDatabase'
 import { makeType } from '$/providers/openedProjects/suggestionDatabase/mockSuggestion'
 import { WidgetInput } from '$/providers/openedProjects/widgetRegistry'
@@ -11,7 +12,6 @@ import {
   useTableInputArgument,
 } from '@/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument'
 import { MenuItem } from '@/components/shared/AgGridTableView.vue'
-import { type RequiredImport } from '@/stores/graph/imports'
 import { assert } from '@/util/assert'
 import { Ast } from '@/util/ast'
 import type { Identifier } from '@/util/ast/abstract'
@@ -19,7 +19,7 @@ import { parseAbsoluteProjectPathRaw } from '@/util/projectPath'
 import type { GetContextMenuItems, GetMainMenuItems } from 'ag-grid-enterprise'
 import { expect, test, vi } from 'vitest'
 import { assertDefined } from 'ydoc-shared/util/assert'
-import { unwrap } from 'ydoc-shared/util/data/result'
+import { Ok, unwrap } from 'ydoc-shared/util/data/result'
 
 function suggestionDbWithNothing() {
   const db = new SuggestionDb()
@@ -104,12 +104,12 @@ test.each([
   assertDefined(ast)
   expect(tableInputCallMayBeHandled(ast)).toBeTruthy()
   const input = WidgetInput.FromAst(ast)
-  const startEdit = vi.fn()
+  const edit = vi.fn()
   const addMissingImports = vi.fn()
   const onUpdate = vi.fn()
   const tableNewArgs = useTableInputArgument(
     input,
-    { startEdit, addMissingImports },
+    { edit, addMissingImports },
     suggestionDbWithNothing(),
     onUpdate,
   )
@@ -129,7 +129,7 @@ test.each([
     }
   }
   expect(tableNewArgs.rowData.value).toEqual([...expectedIndices()])
-  expect(startEdit).not.toHaveBeenCalled()
+  expect(edit).not.toHaveBeenCalled()
   expect(onUpdate).not.toHaveBeenCalled()
   expect(addMissingImports).not.toHaveBeenCalled()
 })
@@ -171,7 +171,7 @@ test.each([
     const input = WidgetInput.FromAst(generateTableOfOnes(rows, cols))
     const tableNewArgs = useTableInputArgument(
       input,
-      { startEdit: vi.fn(), addMissingImports: vi.fn() },
+      { edit: vi.fn(), addMissingImports: vi.fn() },
       suggestionDbWithNothing(),
       vi.fn(),
     )
@@ -202,10 +202,15 @@ function tableEditFixture(code: string, expectedCode: string) {
   assert(firstStatement instanceof Ast.MutableExpressionStatement)
   const inputAst = firstStatement.expression
   const input = WidgetInput.FromAst(inputAst)
-  const startEdit = vi.fn(() => ast.module.edit())
+  const edit = vi.fn(async (f) => {
+    const result = await f(ast.module.edit())
+    expect(result).toEqual(Ok())
+    return result
+  })
   const onUpdate = vi.fn((update) => {
     const inputAst = [...update.edit.getVersion(ast).statements()][0]
     expect(inputAst?.code()).toBe(expectedCode)
+    return Ok()
   })
   const addMissingImports = vi.fn((_, imports) => {
     // the only import we're going to add is Nothing.
@@ -216,10 +221,11 @@ function tableEditFixture(code: string, expectedCode: string) {
         import: 'Nothing' as Identifier,
       } satisfies RequiredImport,
     ])
+    return []
   })
   const tableNewArgs = useTableInputArgument(
     input,
-    { startEdit, addMissingImports },
+    { edit, addMissingImports },
     suggestionDbWithNothing(),
     onUpdate,
   )
@@ -228,7 +234,7 @@ function tableEditFixture(code: string, expectedCode: string) {
     copyToClipboard: vi.fn(),
     pasteFromClipboard: vi.fn(),
   }
-  return { tableNewArgs, startEdit, onUpdate, addMissingImports, gridApi }
+  return { tableNewArgs, edit, onUpdate, addMissingImports, gridApi }
 }
 
 test.each([
@@ -590,7 +596,9 @@ test('Pasted data which would exceed cells limit is truncated', () => {
   const initialCols = CELLS_LIMIT_SQRT - 1
   const ast = generateTableOfOnes(initialRows, initialCols)
   const input = WidgetInput.FromAst(ast)
-  const startEdit = vi.fn(() => ast.module.edit())
+  const edit = vi.fn((f) => {
+    return f(ast.module.edit())
+  })
   const onUpdate = vi.fn((update) => {
     const inputAst = update.edit!.getVersion(ast)
     // We expect the table to be fully extended, so the number of cells (numbers or Nothings) should be equal to the limit.
@@ -601,11 +609,12 @@ test('Pasted data which would exceed cells limit is truncated', () => {
       if (ast instanceof Ast.TextLiteral || ast.code() === 'Nothing') cellCount++
     })
     expect(cellCount).toBe(CELLS_LIMIT)
+    return Ok()
   })
   const addMissingImports = vi.fn()
   const tableNewArgs = useTableInputArgument(
     input,
-    { startEdit, addMissingImports },
+    { edit, addMissingImports },
     suggestionDbWithNothing(),
     onUpdate,
   )
diff --git a/app/gui/src/project-view/util/__tests__/callTree.test.ts b/app/gui/src/project-view/util/__tests__/callTree.test.ts
index fc85d399e575..81ebd537669f 100644
--- a/app/gui/src/project-view/util/__tests__/callTree.test.ts
+++ b/app/gui/src/project-view/util/__tests__/callTree.test.ts
@@ -1,3 +1,4 @@
+import { GraphDb } from '$/providers/openedProjects/graph/graphDatabase'
 import {
   ComputedValueRegistry,
   TypeInfo,
@@ -14,7 +15,6 @@ import {
   makeType,
 } from '$/providers/openedProjects/suggestionDatabase/mockSuggestion'
 import * as widgetCfg from '$/providers/openedProjects/widgetRegistry/configuration'
-import { GraphDb } from '@/stores/graph/graphDatabase'
 import { Ast } from '@/util/ast'
 import type { AstId } from '@/util/ast/abstract'
 import {
diff --git a/app/gui/src/providers/openedProjects/graph/__tests__/graphDatabase.test.ts b/app/gui/src/providers/openedProjects/graph/__tests__/graphDatabase.test.ts
index 2846012b2da3..958ad4665670 100644
--- a/app/gui/src/providers/openedProjects/graph/__tests__/graphDatabase.test.ts
+++ b/app/gui/src/providers/openedProjects/graph/__tests__/graphDatabase.test.ts
@@ -1,4 +1,4 @@
-import { asNodeId, GraphDb } from '@/stores/graph/graphDatabase'
+import { asNodeId, GraphDb } from '$/providers/openedProjects/graph/graphDatabase'
 import { assert, assertDefined } from '@/util/assert'
 import { Ast } from '@/util/ast'
 import * as iter from 'enso-common/src/utilities/data/iter'
diff --git a/app/gui/src/providers/openedProjects/graph/__tests__/imports.test.ts b/app/gui/src/providers/openedProjects/graph/__tests__/imports.test.ts
index 7bd54b3e3952..927ec0e785b7 100644
--- a/app/gui/src/providers/openedProjects/graph/__tests__/imports.test.ts
+++ b/app/gui/src/providers/openedProjects/graph/__tests__/imports.test.ts
@@ -1,12 +1,3 @@
-import { mockProjectNameStore } from '$/providers/openedProjects/projectNames'
-import { SuggestionDb } from '$/providers/openedProjects/suggestionDatabase'
-import {
-  makeConstructor,
-  makeMethod,
-  makeModule,
-  makeStaticMethod,
-  makeType,
-} from '$/providers/openedProjects/suggestionDatabase/mockSuggestion'
 import {
   addImports,
   covers,
@@ -17,7 +8,16 @@ import {
   type ConflictInfo,
   type Import,
   type RequiredImport,
-} from '@/stores/graph/imports'
+} from '$/providers/openedProjects/module/imports'
+import { mockProjectNameStore } from '$/providers/openedProjects/projectNames'
+import { SuggestionDb } from '$/providers/openedProjects/suggestionDatabase'
+import {
+  makeConstructor,
+  makeMethod,
+  makeModule,
+  makeStaticMethod,
+  makeType,
+} from '$/providers/openedProjects/suggestionDatabase/mockSuggestion'
 import { Ast } from '@/util/ast'
 import { unwrap } from '@/util/data/result'
 import { tryIdentifier, tryQualifiedName, type Identifier } from '@/util/qualifiedName'
diff --git a/app/gui/src/project-view/providers/__tests__/widgetRegistry.test.ts b/app/gui/src/providers/openedProjects/widgetRegistry/__tests__/widgetRegistry.test.ts
similarity index 95%
rename from app/gui/src/project-view/providers/__tests__/widgetRegistry.test.ts
rename to app/gui/src/providers/openedProjects/widgetRegistry/__tests__/widgetRegistry.test.ts
index fbc6e6fedcc2..1a30364b6aee 100644
--- a/app/gui/src/project-view/providers/__tests__/widgetRegistry.test.ts
+++ b/app/gui/src/providers/openedProjects/widgetRegistry/__tests__/widgetRegistry.test.ts
@@ -1,3 +1,4 @@
+import { GraphDb } from '$/providers/openedProjects/graph/graphDatabase'
 import {
   Score,
   WidgetInput,
@@ -6,13 +7,15 @@ import {
   type WidgetDefinition,
   type WidgetModule,
 } from '$/providers/openedProjects/widgetRegistry'
-import { GraphDb } from '@/stores/graph/graphDatabase'
+import {
+  DisplayMode,
+  argsWidgetConfigurationSchema,
+} from '$/providers/openedProjects/widgetRegistry/configuration'
+import type { PortId } from '@/providers/portInfo'
 import { Ast } from '@/util/ast'
 import { ApplicationKind, ArgumentInfoKey } from '@/util/callTree'
 import { describe, expect, test } from 'vitest'
 import { defineComponent } from 'vue'
-import type { PortId } from '../portInfo'
-import { DisplayMode, argsWidgetConfigurationSchema } from '../widgetRegistry/configuration'
 
 describe('WidgetRegistry', () => {
   function makeMockWidget<T extends WidgetInput>(
@@ -70,6 +73,7 @@ describe('WidgetRegistry', () => {
       },
       appKind: ApplicationKind.Prefix,
       argId: undefined,
+      callInfo: undefined,
     },
   }
 
diff --git a/app/gui/src/providers/openedProjects/widgetRegistry/index.ts b/app/gui/src/providers/openedProjects/widgetRegistry/index.ts
new file mode 100644
index 000000000000..8557bff6affd
--- /dev/null
+++ b/app/gui/src/providers/openedProjects/widgetRegistry/index.ts
@@ -0,0 +1 @@
+export * from './widgetRegistry'
diff --git a/app/gui/src/providers/openedProjects/widgetRegistry.ts b/app/gui/src/providers/openedProjects/widgetRegistry/widgetRegistry.ts
similarity index 99%
rename from app/gui/src/providers/openedProjects/widgetRegistry.ts
rename to app/gui/src/providers/openedProjects/widgetRegistry/widgetRegistry.ts
index 397e19dd1fd2..cc5c9755090a 100644
--- a/app/gui/src/providers/openedProjects/widgetRegistry.ts
+++ b/app/gui/src/providers/openedProjects/widgetRegistry/widgetRegistry.ts
@@ -1,4 +1,5 @@
 import type { GraphDb } from '$/providers/openedProjects/graph/graphDatabase'
+import { ModuleStore } from '$/providers/openedProjects/module'
 import type { Typename } from '$/providers/openedProjects/suggestionDatabase/entry'
 import type { WidgetConfiguration } from '$/providers/openedProjects/widgetRegistry/configuration'
 import {
@@ -13,7 +14,6 @@ import { Err, Ok, type Result } from '@/util/data/result'
 import type { ViteHotContext } from 'vite/types/hot.js'
 import { computed, shallowReactive, type Component, type PropType } from 'vue'
 import type { Class } from 'ydoc-shared/util/types'
-import type { ModuleStore } from './module'
 
 export type WidgetComponent<T extends WidgetInput> = Component<WidgetProps<T>>
 

From a8e6c2a7fd045ef3a9a656aed9848e3a67ee29a3 Mon Sep 17 00:00:00 2001
From: Adam Obuchowicz <adam.obuchowicz@enso.org>
Date: Thu, 25 Sep 2025 09:45:17 +0200
Subject: [PATCH 05/17] WIP

---
 .../ClosedProjectDocumentationEditor.vue      |  6 ++++++
 .../OpenedProjectDocumentationEditor.vue      |  8 ++++++++
 .../WidgetTableEditor/tableInputArgument.ts   |  2 +-
 .../components/MarkdownEditor.vue             |  2 ++
 .../MarkdownEditor/MarkdownEditorImpl.vue     | 11 +++++-----
 .../project-view/providers/asyncResources.ts  |  3 +--
 .../providers/asyncResources/context.ts       | 20 -------------------
 .../providers/openedProjects/graph/graph.ts   |  2 +-
 8 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/app/gui/src/project-view/components/DocumentationEditor/ClosedProjectDocumentationEditor.vue b/app/gui/src/project-view/components/DocumentationEditor/ClosedProjectDocumentationEditor.vue
index 4ab18ff53bd8..fc506dfe8fe9 100644
--- a/app/gui/src/project-view/components/DocumentationEditor/ClosedProjectDocumentationEditor.vue
+++ b/app/gui/src/project-view/components/DocumentationEditor/ClosedProjectDocumentationEditor.vue
@@ -56,6 +56,11 @@ const editorMarkdown = computed(() =>
   mapOk(currentMethodAst.value, (ast) => ast.mutableDocumentationMarkdown()),
 )
 const editorContent = computed(() => unwrapOr(editorMarkdown.value, undefined))
+const resourceContext = {
+  project: projectId,
+  // We display documentation of `main` function, so image access is relative to the main module.
+  basePathSegments: ['src', 'Main.enso'],
+}
 
 const { syncExt, connectSync } = useYTextSync(editorContent, 'local:userAction:DocEditor')
 const editorPersistenceExt = editorPersistence({
@@ -78,6 +83,7 @@ const extensions = [syncExt, editorPersistenceExt]
     contentTestId="documentation-editor-content"
     scrollerTestId="documentation-editor-scroller"
     :editorReadyCallback="connectSync"
+    :resourceContext="resourceContext"
   >
   </MarkdownEditor>
   <!-- Specifying `<ResultComponent ... centered /> does not work with React components
diff --git a/app/gui/src/project-view/components/DocumentationEditor/OpenedProjectDocumentationEditor.vue b/app/gui/src/project-view/components/DocumentationEditor/OpenedProjectDocumentationEditor.vue
index 153f10fa2ae9..f334a307b699 100644
--- a/app/gui/src/project-view/components/DocumentationEditor/OpenedProjectDocumentationEditor.vue
+++ b/app/gui/src/project-view/components/DocumentationEditor/OpenedProjectDocumentationEditor.vue
@@ -24,6 +24,13 @@ const editorMarkdown = computed(() =>
   mapOk(graph.value.currentMethod.ast, (ast) => ast.mutableDocumentationMarkdown()),
 )
 const editorContent = computed(() => unwrapOr(editorMarkdown.value, undefined))
+const resourceContext = {
+  project: () => project.value.id,
+  basePathSegments: () => {
+    const fileName = project.value.observedFileName
+    if (fileName) return ['src', ...fileName.split('/')]
+  },
+}
 
 const { syncExt, connectSync } = useYTextSync(editorContent, 'local:userAction:DocEditor')
 const editorPersistenceExt = editorPersistence({
@@ -45,6 +52,7 @@ const extensions = [syncExt, editorPersistenceExt]
     contentTestId="documentation-editor-content"
     scrollerTestId="documentation-editor-scroller"
     :editorReadyCallback="connectSync"
+    :resourceContext="resourceContext"
   >
     <template #belowToolbar>
       <FunctionSignatureEditor
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts
index 947168249963..cb745feb8b34 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts
@@ -503,7 +503,7 @@ export function useTableInputArgument(
     const newValueGetter = (rowIndex: number, colIndex: number) => {
       if (rowIndex < focusedCell.rowIndex) return undefined
       if (colIndex < focusedColIndex) return undefined
-      return Ok(data[rowIndex - focusedCell.rowIndex]?.[colIndex - focusedColIndex])
+      return data[rowIndex - focusedCell.rowIndex]?.[colIndex - focusedColIndex]
     }
     const pastedRowsEnd = focusedCell.rowIndex + data.length
     const pastedColsEnd = focusedColIndex + data[0]!.length
diff --git a/app/gui/src/project-view/components/MarkdownEditor.vue b/app/gui/src/project-view/components/MarkdownEditor.vue
index 7d632b34f6b0..52e27410a884 100644
--- a/app/gui/src/project-view/components/MarkdownEditor.vue
+++ b/app/gui/src/project-view/components/MarkdownEditor.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import type { ResourceContext } from '@/providers/asyncResources/context'
 import type { Extension } from '@codemirror/state'
 import { EditorView } from '@codemirror/view'
 import { defineAsyncComponent } from 'vue'
@@ -12,6 +13,7 @@ const { toolbar = true, ...props } = defineProps<{
   contentTestId?: string
   scrollerTestId?: string | undefined
   editorReadyCallback?: ((view: EditorView) => void) | undefined
+  resourceContext?: ResourceContext
 }>()
 
 defineOptions({
diff --git a/app/gui/src/project-view/components/MarkdownEditor/MarkdownEditorImpl.vue b/app/gui/src/project-view/components/MarkdownEditor/MarkdownEditorImpl.vue
index 0d3db1b134ae..e2dba7e15ace 100644
--- a/app/gui/src/project-view/components/MarkdownEditor/MarkdownEditorImpl.vue
+++ b/app/gui/src/project-view/components/MarkdownEditor/MarkdownEditorImpl.vue
@@ -12,9 +12,9 @@ import {
 import { useFormatActions } from '@/components/MarkdownEditor/formatActions'
 import SelectionDropdown from '@/components/SelectionDropdown.vue'
 import VueHostRender, { VueHostInstance } from '@/components/VueHostRender.vue'
-import { useAsyncResources, type StartedUpload } from '@/providers/asyncResources'
-import { useCurrentProjectResourceContext } from '@/providers/asyncResources/context'
-import { selectResourceFiles, type AnyUploadSource } from '@/providers/asyncResources/upload'
+import { type StartedUpload, useAsyncResources } from '@/providers/asyncResources'
+import type { ResourceContext } from '@/providers/asyncResources/context'
+import { type AnyUploadSource, selectResourceFiles } from '@/providers/asyncResources/upload'
 import { useCodeMirror, useEditorFocus } from '@/util/codemirror'
 import { highlightStyle } from '@/util/codemirror/highlight'
 import { useLinkTitles } from '@/util/codemirror/links'
@@ -23,7 +23,7 @@ import { useToast } from '@/util/toast'
 import { defaultHighlightStyle, syntaxHighlighting } from '@codemirror/language'
 import type { Extension } from '@codemirror/state'
 import { drawSelection, EditorView } from '@codemirror/view'
-import { computed, useCssModule, useTemplateRef, watch, type ComponentInstance } from 'vue'
+import { type ComponentInstance, computed, useCssModule, useTemplateRef, watch } from 'vue'
 
 const {
   toolbar = true,
@@ -32,6 +32,7 @@ const {
   contentTestId,
   scrollerTestId,
   editorReadyCallback = () => {},
+  resourceContext = { project: undefined, asset: undefined, basePathSegments: undefined },
 } = defineProps<{
   toolbar?: boolean | undefined
   readonly?: boolean | undefined
@@ -48,10 +49,10 @@ const {
    * defined as signal)
    */
   editorReadyCallback?: ((view: EditorView) => void) | undefined
+  resourceContext?: ResourceContext | undefined
 }>()
 defineOptions({ inheritAttrs: false })
 
-const resourceContext = useCurrentProjectResourceContext()
 const res = useAsyncResources(true)
 
 async function selectAndUpload() {
diff --git a/app/gui/src/project-view/providers/asyncResources.ts b/app/gui/src/project-view/providers/asyncResources.ts
index 8c615b69de15..35b336ac8ff6 100644
--- a/app/gui/src/project-view/providers/asyncResources.ts
+++ b/app/gui/src/project-view/providers/asyncResources.ts
@@ -12,7 +12,6 @@ import {
 } from './asyncResources/AsyncResource'
 import {
   captureResourceContext,
-  useCurrentProjectResourceContext,
   type ResourceContext,
   type ResourceContextSnapshot,
 } from './asyncResources/context'
@@ -86,7 +85,7 @@ export const [provideAsyncResources, useAsyncResources] = createContextStore(
        */
       useResourceFromUrl(
         resourceUrl: ToValue<string>,
-        context: ResourceContext = useCurrentProjectResourceContext(),
+        context: ResourceContext,
       ): ComputedRef<Result<AsyncResource>> {
         const resolved = computed(() => resolveResourceInContext(toValue(resourceUrl), context))
 
diff --git a/app/gui/src/project-view/providers/asyncResources/context.ts b/app/gui/src/project-view/providers/asyncResources/context.ts
index bfa07e5efe8f..c899ebada540 100644
--- a/app/gui/src/project-view/providers/asyncResources/context.ts
+++ b/app/gui/src/project-view/providers/asyncResources/context.ts
@@ -1,5 +1,4 @@
 import { ProjectId } from '#/services/Backend'
-import { useCurrentProject } from '$/components/WithCurrentProject.vue'
 import type { ToValue } from '@/util/reactivity'
 import { toValue } from 'vue'
 
@@ -29,22 +28,3 @@ export function captureResourceContext(context: ResourceContext): ResourceContex
     basePathSegments: toValue(context.basePathSegments),
   }
 }
-
-/**
- * Assemble resource context based on `currentProject` structure present in Vue's context.
- */
-export function useCurrentProjectResourceContext(): ResourceContext {
-  const currentProject = useCurrentProject(true)
-  return {
-    project: () => currentProject?.ref.value.store.id ?? undefined,
-    basePathSegments: () => {
-      if (!currentProject) return
-      const openedProjectStore = currentProject.storesRefs.store.value
-      // When project is not opened, we assume that all image access is relative to main module.
-      if (!openedProjectStore) return ['src', 'Main.enso']
-
-      const fileName = openedProjectStore.observedFileName
-      if (fileName) return ['src', ...fileName.split('/')]
-    },
-  }
-}
diff --git a/app/gui/src/providers/openedProjects/graph/graph.ts b/app/gui/src/providers/openedProjects/graph/graph.ts
index 5b6d3cdd3537..ab2d4b507c6b 100644
--- a/app/gui/src/providers/openedProjects/graph/graph.ts
+++ b/app/gui/src/providers/openedProjects/graph/graph.ts
@@ -318,7 +318,7 @@ export function createGraphStore(
           // Skip ports on already deleted nodes.
           if (nodeId && deletedNodes.has(nodeId)) continue
 
-          const result = await updatePortValue(usage, undefined, edit)
+          const result = await updatePortValue(usage, undefined, edit, false)
           if (!result.ok) return result
         }
         const outerAst = edit.getVersion(node.outerAst)

From abb52644ad7d76901204838c506f554222a005d7 Mon Sep 17 00:00:00 2001
From: Adam Obuchowicz <adam.obuchowicz@enso.org>
Date: Thu, 25 Sep 2025 11:42:58 +0200
Subject: [PATCH 06/17] Fix type imports

---
 app/gui/src/components/WithCurrentProject.vue               | 6 +++---
 .../components/ComponentBrowser/__tests__/component.test.ts | 2 +-
 .../components/ComponentBrowser/__tests__/input.test.ts     | 2 +-
 .../components/GraphEditor/__tests__/collapsing.test.ts     | 2 +-
 .../widgets/WidgetTableEditor/__tests__/editHandler.test.ts | 6 +++---
 .../WidgetTableEditor/__tests__/tableInputArgument.test.ts  | 2 +-
 .../widgets/FileBrowserWidget/__tests__/mockData.ts         | 4 ++--
 .../__tests__/useAcceptCurrentFile.test.ts                  | 2 +-
 .../providers/__tests__/resizableWidgetRegistry.test.ts     | 2 +-
 app/gui/src/providers/openedProjects/module/module.ts       | 3 +++
 .../openedProjects/widgetRegistry/widgetRegistry.ts         | 2 +-
 app/gui/src/router/__tests__/initialProject.test.ts         | 4 ++--
 12 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/app/gui/src/components/WithCurrentProject.vue b/app/gui/src/components/WithCurrentProject.vue
index 2a8419964224..63bda3bfa643 100644
--- a/app/gui/src/components/WithCurrentProject.vue
+++ b/app/gui/src/components/WithCurrentProject.vue
@@ -6,9 +6,9 @@ import { groupColorVar } from '@/composables/nodeColors'
 import { createContextStore } from '@/providers'
 import { assert } from '@/util/assert'
 import { colorFromString } from '@/util/colors'
-import { Opt } from '@/util/data/opt'
-import { ToValue } from '@/util/reactivity'
-import { computed, Ref, shallowRef, ToRefs, toValue, watch } from 'vue'
+import type { Opt } from '@/util/data/opt'
+import type { ToValue } from '@/util/reactivity'
+import { computed, type Ref, shallowRef, type ToRefs, toValue, watch } from 'vue'
 
 export type CurrentProjectStore = ReturnType<typeof useCurrentProjectRaw>
 const [provideCurrentProject, useCurrentProjectRaw] = createContextStore(
diff --git a/app/gui/src/project-view/components/ComponentBrowser/__tests__/component.test.ts b/app/gui/src/project-view/components/ComponentBrowser/__tests__/component.test.ts
index 69e29941ddf1..0ff3daec80c0 100644
--- a/app/gui/src/project-view/components/ComponentBrowser/__tests__/component.test.ts
+++ b/app/gui/src/project-view/components/ComponentBrowser/__tests__/component.test.ts
@@ -17,7 +17,7 @@ import {
 import { Filtering } from '@/components/ComponentBrowser/filtering'
 import { allRanges } from '@/util/data/range'
 import { ProjectPath, stdPath } from '@/util/projectPath'
-import { QualifiedName } from '@/util/qualifiedName'
+import { type QualifiedName } from '@/util/qualifiedName'
 import shuffleSeed from 'shuffle-seed'
 import { expect, test } from 'vitest'
 
diff --git a/app/gui/src/project-view/components/ComponentBrowser/__tests__/input.test.ts b/app/gui/src/project-view/components/ComponentBrowser/__tests__/input.test.ts
index 1e90f93a69bf..0e895a2e147c 100644
--- a/app/gui/src/project-view/components/ComponentBrowser/__tests__/input.test.ts
+++ b/app/gui/src/project-view/components/ComponentBrowser/__tests__/input.test.ts
@@ -1,4 +1,4 @@
-import { GraphDb, NodeId } from '$/providers/openedProjects/graph/graphDatabase'
+import { GraphDb, type NodeId } from '$/providers/openedProjects/graph/graphDatabase'
 import {
   ComputedValueRegistry,
   TypeInfo,
diff --git a/app/gui/src/project-view/components/GraphEditor/__tests__/collapsing.test.ts b/app/gui/src/project-view/components/GraphEditor/__tests__/collapsing.test.ts
index 6109adbea019..efa38b7e63bb 100644
--- a/app/gui/src/project-view/components/GraphEditor/__tests__/collapsing.test.ts
+++ b/app/gui/src/project-view/components/GraphEditor/__tests__/collapsing.test.ts
@@ -12,7 +12,7 @@ import { tryIdentifier } from '@/util/qualifiedName'
 import * as iter from 'enso-common/src/utilities/data/iter'
 import { expect, test } from 'vitest'
 import { watchEffect } from 'vue'
-import { Identifier } from 'ydoc-shared/ast'
+import { type Identifier } from 'ydoc-shared/ast'
 import { nodeIdFromOuterAst } from '../../../../providers/openedProjects/graph/graphDatabase'
 
 // ===============================
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/__tests__/editHandler.test.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/__tests__/editHandler.test.ts
index fb96b4ea0216..7f5f9c96ec99 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/__tests__/editHandler.test.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/__tests__/editHandler.test.ts
@@ -1,10 +1,10 @@
 import {
   WidgetEditHandler,
-  WidgetInstanceId,
+  type WidgetInstanceId,
 } from '$/providers/openedProjects/widgetRegistry/editHandler'
 import { InteractionHandler } from '@/providers/interactionHandler'
-import { PortId } from '@/providers/portInfo'
-import { CellPosition } from 'ag-grid-enterprise'
+import { type PortId } from '@/providers/portInfo'
+import { type CellPosition } from 'ag-grid-enterprise'
 import { expect, test, vi } from 'vitest'
 import { nextTick } from 'vue'
 import { useTableEditHandler, type EditedCell } from '../editHandler'
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/__tests__/tableInputArgument.test.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/__tests__/tableInputArgument.test.ts
index 8750c62f40d4..3a8936342806 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/__tests__/tableInputArgument.test.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/__tests__/tableInputArgument.test.ts
@@ -7,7 +7,7 @@ import {
   DEFAULT_COLUMN_PREFIX,
   NEW_COLUMN_ID,
   ROW_INDEX_HEADER,
-  RowData,
+  type RowData,
   tableInputCallMayBeHandled,
   useTableInputArgument,
 } from '@/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument'
diff --git a/app/gui/src/project-view/components/widgets/FileBrowserWidget/__tests__/mockData.ts b/app/gui/src/project-view/components/widgets/FileBrowserWidget/__tests__/mockData.ts
index 54100717ae4e..93bf13c4f70c 100644
--- a/app/gui/src/project-view/components/widgets/FileBrowserWidget/__tests__/mockData.ts
+++ b/app/gui/src/project-view/components/widgets/FileBrowserWidget/__tests__/mockData.ts
@@ -1,5 +1,5 @@
-import { AnyAsset, AssetType, ListDirectoryResponseBody } from '#/services/Backend'
-import { Directory } from '@/components/widgets/FileBrowserWidget/pathBrowsing'
+import { type AnyAsset, AssetType, type ListDirectoryResponseBody } from '#/services/Backend'
+import { type Directory } from '@/components/widgets/FileBrowserWidget/pathBrowsing'
 
 interface MockAssetSpec {
   type: AssetType
diff --git a/app/gui/src/project-view/components/widgets/FileBrowserWidget/__tests__/useAcceptCurrentFile.test.ts b/app/gui/src/project-view/components/widgets/FileBrowserWidget/__tests__/useAcceptCurrentFile.test.ts
index eb18c04d4588..1ae03f47a2c8 100644
--- a/app/gui/src/project-view/components/widgets/FileBrowserWidget/__tests__/useAcceptCurrentFile.test.ts
+++ b/app/gui/src/project-view/components/widgets/FileBrowserWidget/__tests__/useAcceptCurrentFile.test.ts
@@ -1,5 +1,5 @@
 import { AssetType, DirectoryId } from '#/services/Backend'
-import { Err, Ok, Result } from '@/util/data/result'
+import { Err, Ok, type Result } from '@/util/data/result'
 import { uuidv4 } from 'lib0/random'
 import { describe, expect, test, vi } from 'vitest'
 import { ref, type Ref } from 'vue'
diff --git a/app/gui/src/project-view/providers/__tests__/resizableWidgetRegistry.test.ts b/app/gui/src/project-view/providers/__tests__/resizableWidgetRegistry.test.ts
index 29bf77d8ebb3..21f93f4820aa 100644
--- a/app/gui/src/project-view/providers/__tests__/resizableWidgetRegistry.test.ts
+++ b/app/gui/src/project-view/providers/__tests__/resizableWidgetRegistry.test.ts
@@ -1,4 +1,4 @@
-import { PortId } from '@/providers/portInfo'
+import { type PortId } from '@/providers/portInfo'
 import { useResizableWidgetRegistry } from '@/providers/resizableWidgetRegistry'
 import { Rect } from '@/util/data/rect'
 import { Vec2 } from '@/util/data/vec2'
diff --git a/app/gui/src/providers/openedProjects/module/module.ts b/app/gui/src/providers/openedProjects/module/module.ts
index a6e2030b91a2..cbeb460c86c4 100644
--- a/app/gui/src/providers/openedProjects/module/module.ts
+++ b/app/gui/src/providers/openedProjects/module/module.ts
@@ -24,6 +24,9 @@ import {
 
 export type ModuleStore = ReturnType<typeof createModuleStore>
 
+/**
+ *
+ */
 export function createModuleStore(
   proj: ProjectStore,
   projectNames: ProjectNameStore,
diff --git a/app/gui/src/providers/openedProjects/widgetRegistry/widgetRegistry.ts b/app/gui/src/providers/openedProjects/widgetRegistry/widgetRegistry.ts
index cc5c9755090a..557a30cd5770 100644
--- a/app/gui/src/providers/openedProjects/widgetRegistry/widgetRegistry.ts
+++ b/app/gui/src/providers/openedProjects/widgetRegistry/widgetRegistry.ts
@@ -1,5 +1,5 @@
 import type { GraphDb } from '$/providers/openedProjects/graph/graphDatabase'
-import { ModuleStore } from '$/providers/openedProjects/module'
+import type { ModuleStore } from '$/providers/openedProjects/module'
 import type { Typename } from '$/providers/openedProjects/suggestionDatabase/entry'
 import type { WidgetConfiguration } from '$/providers/openedProjects/widgetRegistry/configuration'
 import {
diff --git a/app/gui/src/router/__tests__/initialProject.test.ts b/app/gui/src/router/__tests__/initialProject.test.ts
index e763cc83da2b..a218c1a4ab51 100644
--- a/app/gui/src/router/__tests__/initialProject.test.ts
+++ b/app/gui/src/router/__tests__/initialProject.test.ts
@@ -1,11 +1,11 @@
 import {
-  AnyRealAsset,
+  type AnyRealAsset,
   AssetType,
   EmailAddress,
   OrganizationId,
   Path,
   Plan,
-  User,
+  type User,
   UserId,
 } from '#/services/Backend'
 import { newDirectoryId } from '#/services/LocalBackend'

From 6abeffb9eabf17d2988e2d4381ad7f3ce22d2485 Mon Sep 17 00:00:00 2001
From: Adam Obuchowicz <adam.obuchowicz@enso.org>
Date: Thu, 25 Sep 2025 12:08:38 +0200
Subject: [PATCH 07/17] Fix current resource context

---
 .../ClosedProjectDocumentationEditor.vue      |  8 +-----
 .../OpenedProjectDocumentationEditor.vue      |  8 ------
 .../components/FunctionSignatureEditor.vue    |  2 +-
 .../GraphEditor/GraphNodeMessage.vue          |  2 +-
 .../GraphEditor/ResizableWidget.vue           |  2 +-
 .../components/GraphEditor/WidgetTreeRoot.vue |  2 +-
 .../GraphEditor/widgets/WidgetAnyToTarget.vue |  2 +-
 .../widgets/WidgetEnsoExpression.vue          |  1 +
 .../WidgetFunction/widgetFunctionCallInfo.ts  |  1 +
 .../widgets/WidgetFunctionDef/ArgumentRow.vue |  2 +-
 .../widgets/WidgetFunctionName.vue            |  1 +
 .../widgets/WidgetSelection/tags.ts           |  3 ++-
 .../GraphEditor/widgets/WidgetTableEditor.vue |  6 ++---
 .../widgets/WidgetTypeCastPort.vue            |  2 +-
 .../components/MarkdownEditor.vue             |  2 --
 .../MarkdownEditor/MarkdownEditorImpl.vue     |  5 ++--
 .../components/widgets/FileBrowserWidget.vue  |  2 +-
 .../project-view/providers/asyncResources.ts  |  3 ++-
 .../providers/asyncResources/context.ts       | 26 +++++++++++++++++++
 .../suggestionDatabase/index.ts               |  1 +
 20 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/app/gui/src/project-view/components/DocumentationEditor/ClosedProjectDocumentationEditor.vue b/app/gui/src/project-view/components/DocumentationEditor/ClosedProjectDocumentationEditor.vue
index fc506dfe8fe9..46ac74bfa1d7 100644
--- a/app/gui/src/project-view/components/DocumentationEditor/ClosedProjectDocumentationEditor.vue
+++ b/app/gui/src/project-view/components/DocumentationEditor/ClosedProjectDocumentationEditor.vue
@@ -7,7 +7,7 @@ import { Ast } from '@/util/ast'
 import { parseModule } from '@/util/ast/abstract'
 import { useYTextSync } from '@/util/codemirror'
 import { editorPersistence } from '@/util/codemirror/persistence'
-import { Err, mapOk, Ok, Result, unwrapOr } from '@/util/data/result'
+import { Err, mapOk, Ok, type Result, unwrapOr } from '@/util/data/result'
 import { ResultComponent } from '@/util/react'
 import { useQuery } from '@tanstack/vue-query'
 import { computed } from 'vue'
@@ -56,11 +56,6 @@ const editorMarkdown = computed(() =>
   mapOk(currentMethodAst.value, (ast) => ast.mutableDocumentationMarkdown()),
 )
 const editorContent = computed(() => unwrapOr(editorMarkdown.value, undefined))
-const resourceContext = {
-  project: projectId,
-  // We display documentation of `main` function, so image access is relative to the main module.
-  basePathSegments: ['src', 'Main.enso'],
-}
 
 const { syncExt, connectSync } = useYTextSync(editorContent, 'local:userAction:DocEditor')
 const editorPersistenceExt = editorPersistence({
@@ -83,7 +78,6 @@ const extensions = [syncExt, editorPersistenceExt]
     contentTestId="documentation-editor-content"
     scrollerTestId="documentation-editor-scroller"
     :editorReadyCallback="connectSync"
-    :resourceContext="resourceContext"
   >
   </MarkdownEditor>
   <!-- Specifying `<ResultComponent ... centered /> does not work with React components
diff --git a/app/gui/src/project-view/components/DocumentationEditor/OpenedProjectDocumentationEditor.vue b/app/gui/src/project-view/components/DocumentationEditor/OpenedProjectDocumentationEditor.vue
index f334a307b699..153f10fa2ae9 100644
--- a/app/gui/src/project-view/components/DocumentationEditor/OpenedProjectDocumentationEditor.vue
+++ b/app/gui/src/project-view/components/DocumentationEditor/OpenedProjectDocumentationEditor.vue
@@ -24,13 +24,6 @@ const editorMarkdown = computed(() =>
   mapOk(graph.value.currentMethod.ast, (ast) => ast.mutableDocumentationMarkdown()),
 )
 const editorContent = computed(() => unwrapOr(editorMarkdown.value, undefined))
-const resourceContext = {
-  project: () => project.value.id,
-  basePathSegments: () => {
-    const fileName = project.value.observedFileName
-    if (fileName) return ['src', ...fileName.split('/')]
-  },
-}
 
 const { syncExt, connectSync } = useYTextSync(editorContent, 'local:userAction:DocEditor')
 const editorPersistenceExt = editorPersistence({
@@ -52,7 +45,6 @@ const extensions = [syncExt, editorPersistenceExt]
     contentTestId="documentation-editor-content"
     scrollerTestId="documentation-editor-scroller"
     :editorReadyCallback="connectSync"
-    :resourceContext="resourceContext"
   >
     <template #belowToolbar>
       <FunctionSignatureEditor
diff --git a/app/gui/src/project-view/components/FunctionSignatureEditor.vue b/app/gui/src/project-view/components/FunctionSignatureEditor.vue
index c37a1b5e658f..2744e46b2b38 100644
--- a/app/gui/src/project-view/components/FunctionSignatureEditor.vue
+++ b/app/gui/src/project-view/components/FunctionSignatureEditor.vue
@@ -4,7 +4,7 @@ import { documentationData } from '$/providers/openedProjects/suggestionDatabase
 import {
   applyWidgetUpdates,
   WidgetInput,
-  WidgetUpdate,
+  type WidgetUpdate,
 } from '$/providers/openedProjects/widgetRegistry'
 import WidgetTreeRoot from '@/components/GraphEditor/WidgetTreeRoot.vue'
 import DraggableList from '@/components/widgets/DraggableList.vue'
diff --git a/app/gui/src/project-view/components/GraphEditor/GraphNodeMessage.vue b/app/gui/src/project-view/components/GraphEditor/GraphNodeMessage.vue
index 4ccbc73278de..4a49a8bfc8b8 100644
--- a/app/gui/src/project-view/components/GraphEditor/GraphNodeMessage.vue
+++ b/app/gui/src/project-view/components/GraphEditor/GraphNodeMessage.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useCurrentProject } from '$/components/WithCurrentProject.vue'
-import { QualifiedImport } from '$/providers/openedProjects/module/imports'
+import type { QualifiedImport } from '$/providers/openedProjects/module/imports'
 import SvgButton from '@/components/SvgButton.vue'
 import SvgIcon from '@/components/SvgIcon.vue'
 import { Ok } from '@/util/data/result'
diff --git a/app/gui/src/project-view/components/GraphEditor/ResizableWidget.vue b/app/gui/src/project-view/components/GraphEditor/ResizableWidget.vue
index 63f9d5c3e9d8..d3452a425a8a 100644
--- a/app/gui/src/project-view/components/GraphEditor/ResizableWidget.vue
+++ b/app/gui/src/project-view/components/GraphEditor/ResizableWidget.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { UpdateHandler, WidgetInput } from '$/providers/openedProjects/widgetRegistry'
+import { type UpdateHandler, WidgetInput } from '$/providers/openedProjects/widgetRegistry'
 import ResizeHandles from '@/components/ResizeHandles.vue'
 import { useResizeObserver } from '@/composables/events'
 import { injectGraphNavigator } from '@/providers/graphNavigator'
diff --git a/app/gui/src/project-view/components/GraphEditor/WidgetTreeRoot.vue b/app/gui/src/project-view/components/GraphEditor/WidgetTreeRoot.vue
index a9bb537c31e4..d37570dd52cd 100644
--- a/app/gui/src/project-view/components/GraphEditor/WidgetTreeRoot.vue
+++ b/app/gui/src/project-view/components/GraphEditor/WidgetTreeRoot.vue
@@ -3,7 +3,7 @@ import {
   emptyPrimaryApplication,
   type PrimaryApplication,
 } from '$/providers/openedProjects/graph/graphDatabase'
-import { UpdateHandler, WidgetInput } from '$/providers/openedProjects/widgetRegistry'
+import { type UpdateHandler, WidgetInput } from '$/providers/openedProjects/widgetRegistry'
 import { WidgetEditHandlerParent } from '$/providers/openedProjects/widgetRegistry/editHandler'
 import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
 import { useTransitioning } from '@/composables/animation'
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetAnyToTarget.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetAnyToTarget.vue
index 9baf2efed2cb..45da8530a8be 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetAnyToTarget.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetAnyToTarget.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useCurrentProject } from '$/components/WithCurrentProject.vue'
 import {
-  SuggestionEntry,
+  type SuggestionEntry,
   SuggestionKind,
 } from '$/providers/openedProjects/suggestionDatabase/entry'
 import {
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetEnsoExpression.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetEnsoExpression.vue
index 246c70b93930..d3eada0d892f 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetEnsoExpression.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetEnsoExpression.vue
@@ -4,6 +4,7 @@ import {
   Score,
   WidgetInput,
   widgetProps,
+  type HandledUpdate,
 } from '$/providers/openedProjects/widgetRegistry'
 import { ensoSyntax } from '@/components/CodeEditor/ensoSyntax'
 import CodeMirrorWidgetBase from '@/components/GraphEditor/CodeMirrorWidgetBase.vue'
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction/widgetFunctionCallInfo.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction/widgetFunctionCallInfo.ts
index b1b68549a2bd..758a8c45a38c 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction/widgetFunctionCallInfo.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction/widgetFunctionCallInfo.ts
@@ -8,6 +8,7 @@ import {
   argsWidgetConfigurationSchema,
   functionCallConfiguration,
   pending,
+  type FunctionCall,
 } from '$/providers/openedProjects/widgetRegistry/configuration'
 import { Ast } from '@/util/ast'
 import {
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunctionDef/ArgumentRow.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunctionDef/ArgumentRow.vue
index 3699ed019c67..5dd41a29d838 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunctionDef/ArgumentRow.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunctionDef/ArgumentRow.vue
@@ -17,7 +17,7 @@ import SelectionSubmenu from '@/components/GraphEditor/widgets/WidgetSelection/S
 import { EnsoTypeExpression } from '@/components/GraphEditor/widgets/WidgetTypeExpression.vue'
 import SvgIcon from '@/components/SvgIcon.vue'
 import { type DropdownEntry } from '@/components/widgets/DropdownWidget.vue'
-import { PortId, syntheticPortId } from '@/providers/portInfo'
+import { syntheticPortId, type PortId } from '@/providers/portInfo'
 import { Ast } from '@/util/ast'
 import { mapOrUndefined, type Opt } from '@/util/data/opt'
 import { Err, Ok } from '@/util/data/result'
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunctionName.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunctionName.vue
index d26678ad7d62..fdf75be0df70 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunctionName.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunctionName.vue
@@ -9,6 +9,7 @@ import {
   Score,
   WidgetInput,
   widgetProps,
+  type UpdateResult,
 } from '$/providers/openedProjects/widgetRegistry'
 import CodeMirrorWidgetBase from '@/components/GraphEditor/CodeMirrorWidgetBase.vue'
 import { usePersisted } from '@/stores/persisted'
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelection/tags.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelection/tags.ts
index aac576c4152f..afd5f77d7c08 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelection/tags.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelection/tags.ts
@@ -1,8 +1,8 @@
 import { type ModuleStore } from '$/providers/openedProjects/module'
 import {
   printRequiredImport,
-  type RequiredImport,
   requiredImports,
+  type RequiredImport,
 } from '$/providers/openedProjects/module/imports'
 import { type ProjectNameStore } from '$/providers/openedProjects/projectNames'
 import { SuggestionDb } from '$/providers/openedProjects/suggestionDatabase'
@@ -10,6 +10,7 @@ import {
   entryDisplayPath,
   entryIsStatic,
   SuggestionKind,
+  type SuggestionEntry,
 } from '$/providers/openedProjects/suggestionDatabase/entry'
 import type {
   Choice,
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor.vue
index 6852c6d0b148..af3c96985419 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor.vue
@@ -5,13 +5,13 @@ import { WidgetEditHandler } from '$/providers/openedProjects/widgetRegistry/edi
 import { WidgetInputIsSpecificMethodCall } from '@/components/GraphEditor/widgets/WidgetFunction.vue'
 import {
   CELLS_LIMIT,
+  type RowData,
   tableInputCallMayBeHandled,
   useTableInputArgument,
-  type RowData,
 } from '@/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument'
 import AgGridTableView from '@/components/shared/AgGridTableView.vue'
 import { targetIsOutside } from '@/util/autoBlur'
-import { Result } from '@/util/data/result'
+import type { Result } from '@/util/data/result'
 import { ProjectPath } from '@/util/projectPath'
 import type { Identifier, QualifiedName } from '@/util/qualifiedName'
 import { proxyRefs } from '@/util/reactivity'
@@ -24,7 +24,7 @@ import type {
   ProcessDataFromClipboardParams,
   RowDragEndEvent,
 } from 'ag-grid-enterprise'
-import { ComponentInstance, computed, ComputedRef, ref, watch } from 'vue'
+import { type ComponentInstance, computed, type ComputedRef, ref, watch } from 'vue'
 import type { ComponentExposed } from 'vue-component-type-helpers'
 import { z } from 'zod'
 import ResizableWidget from '../ResizableWidget.vue'
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTypeCastPort.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTypeCastPort.vue
index e33a8cfc0628..abe4b27102be 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTypeCastPort.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTypeCastPort.vue
@@ -10,7 +10,7 @@ import {
   Score,
   WidgetInput,
   widgetProps,
-  WidgetUpdate,
+  type WidgetUpdate,
 } from '$/providers/openedProjects/widgetRegistry'
 import NodeWidget from '@/components/GraphEditor/NodeWidget.vue'
 import { Ast } from '@/util/ast'
diff --git a/app/gui/src/project-view/components/MarkdownEditor.vue b/app/gui/src/project-view/components/MarkdownEditor.vue
index 52e27410a884..7d632b34f6b0 100644
--- a/app/gui/src/project-view/components/MarkdownEditor.vue
+++ b/app/gui/src/project-view/components/MarkdownEditor.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import type { ResourceContext } from '@/providers/asyncResources/context'
 import type { Extension } from '@codemirror/state'
 import { EditorView } from '@codemirror/view'
 import { defineAsyncComponent } from 'vue'
@@ -13,7 +12,6 @@ const { toolbar = true, ...props } = defineProps<{
   contentTestId?: string
   scrollerTestId?: string | undefined
   editorReadyCallback?: ((view: EditorView) => void) | undefined
-  resourceContext?: ResourceContext
 }>()
 
 defineOptions({
diff --git a/app/gui/src/project-view/components/MarkdownEditor/MarkdownEditorImpl.vue b/app/gui/src/project-view/components/MarkdownEditor/MarkdownEditorImpl.vue
index e2dba7e15ace..2ba8c2913008 100644
--- a/app/gui/src/project-view/components/MarkdownEditor/MarkdownEditorImpl.vue
+++ b/app/gui/src/project-view/components/MarkdownEditor/MarkdownEditorImpl.vue
@@ -13,7 +13,7 @@ import { useFormatActions } from '@/components/MarkdownEditor/formatActions'
 import SelectionDropdown from '@/components/SelectionDropdown.vue'
 import VueHostRender, { VueHostInstance } from '@/components/VueHostRender.vue'
 import { type StartedUpload, useAsyncResources } from '@/providers/asyncResources'
-import type { ResourceContext } from '@/providers/asyncResources/context'
+import { useCurrentProjectResourceContext } from '@/providers/asyncResources/context'
 import { type AnyUploadSource, selectResourceFiles } from '@/providers/asyncResources/upload'
 import { useCodeMirror, useEditorFocus } from '@/util/codemirror'
 import { highlightStyle } from '@/util/codemirror/highlight'
@@ -32,7 +32,6 @@ const {
   contentTestId,
   scrollerTestId,
   editorReadyCallback = () => {},
-  resourceContext = { project: undefined, asset: undefined, basePathSegments: undefined },
 } = defineProps<{
   toolbar?: boolean | undefined
   readonly?: boolean | undefined
@@ -49,10 +48,10 @@ const {
    * defined as signal)
    */
   editorReadyCallback?: ((view: EditorView) => void) | undefined
-  resourceContext?: ResourceContext | undefined
 }>()
 defineOptions({ inheritAttrs: false })
 
+const resourceContext = useCurrentProjectResourceContext()
 const res = useAsyncResources(true)
 
 async function selectAndUpload() {
diff --git a/app/gui/src/project-view/components/widgets/FileBrowserWidget.vue b/app/gui/src/project-view/components/widgets/FileBrowserWidget.vue
index a2b37826ae6b..e1556d3fc9d9 100644
--- a/app/gui/src/project-view/components/widgets/FileBrowserWidget.vue
+++ b/app/gui/src/project-view/components/widgets/FileBrowserWidget.vue
@@ -6,7 +6,7 @@ export default {
 
 <script setup lang="ts">
 import { useBackends } from '$/providers/backends'
-import { FileType } from '$/providers/openedProjects/widgetRegistry/configuration'
+import type { FileType } from '$/providers/openedProjects/widgetRegistry/configuration'
 import ActionButton from '@/components/ActionButton.vue'
 import LoadingSpinner from '@/components/shared/LoadingSpinner.vue'
 import UpsertSecretPanel from '@/components/UpsertSecretPanel.vue'
diff --git a/app/gui/src/project-view/providers/asyncResources.ts b/app/gui/src/project-view/providers/asyncResources.ts
index 35b336ac8ff6..8c615b69de15 100644
--- a/app/gui/src/project-view/providers/asyncResources.ts
+++ b/app/gui/src/project-view/providers/asyncResources.ts
@@ -12,6 +12,7 @@ import {
 } from './asyncResources/AsyncResource'
 import {
   captureResourceContext,
+  useCurrentProjectResourceContext,
   type ResourceContext,
   type ResourceContextSnapshot,
 } from './asyncResources/context'
@@ -85,7 +86,7 @@ export const [provideAsyncResources, useAsyncResources] = createContextStore(
        */
       useResourceFromUrl(
         resourceUrl: ToValue<string>,
-        context: ResourceContext,
+        context: ResourceContext = useCurrentProjectResourceContext(),
       ): ComputedRef<Result<AsyncResource>> {
         const resolved = computed(() => resolveResourceInContext(toValue(resourceUrl), context))
 
diff --git a/app/gui/src/project-view/providers/asyncResources/context.ts b/app/gui/src/project-view/providers/asyncResources/context.ts
index c899ebada540..077f4a9d2181 100644
--- a/app/gui/src/project-view/providers/asyncResources/context.ts
+++ b/app/gui/src/project-view/providers/asyncResources/context.ts
@@ -1,4 +1,6 @@
 import { ProjectId } from '#/services/Backend'
+import { useCurrentProject } from '$/components/WithCurrentProject.vue'
+import { useRightPanelData } from '$/providers/rightPanel'
 import type { ToValue } from '@/util/reactivity'
 import { toValue } from 'vue'
 
@@ -28,3 +30,27 @@ export function captureResourceContext(context: ResourceContext): ResourceContex
     basePathSegments: toValue(context.basePathSegments),
   }
 }
+
+/**
+ * Assemble resource context based on available project information in Vue's context.
+ *
+ * It will check `currentProject` from `WithCurrentProject` component first, and then `focusedAsset` in container.
+ */
+export function useCurrentProjectResourceContext(): ResourceContext {
+  const currentProject = useCurrentProject(true)
+  if (currentProject != null) {
+    return {
+      project: () => currentProject.ref.value.store.id,
+      basePathSegments: () => {
+        const fileName = currentProject.ref.value.store.observedFileName
+        if (fileName) return ['src', ...fileName.split('/')]
+      },
+    }
+  }
+  const rightPanel = useRightPanelData(true)
+  return {
+    project: () => rightPanel?.focusedProject,
+    // We display documentation of `main` function, so image access is relative to the main module.
+    basePathSegments: ['src', 'Main.enso'],
+  }
+}
diff --git a/app/gui/src/providers/openedProjects/suggestionDatabase/index.ts b/app/gui/src/providers/openedProjects/suggestionDatabase/index.ts
index 2faf7f95b180..01637045846f 100644
--- a/app/gui/src/providers/openedProjects/suggestionDatabase/index.ts
+++ b/app/gui/src/providers/openedProjects/suggestionDatabase/index.ts
@@ -8,6 +8,7 @@ import {
   type MethodSuggestionEntry,
   type SuggestionEntry,
   type SuggestionId,
+  type TypeSuggestionEntry,
 } from '$/providers/openedProjects/suggestionDatabase/entry'
 import { SuggestionUpdateProcessor } from '$/providers/openedProjects/suggestionDatabase/lsUpdate'
 import { ExpressionTag } from '@/components/GraphEditor/widgets/WidgetSelection/tags'

From 7c167f732ada9f9a6de8de77aaec6732244a04e0 Mon Sep 17 00:00:00 2001
From: Adam Obuchowicz <adam.obuchowicz@enso.org>
Date: Mon, 29 Sep 2025 15:58:56 +0200
Subject: [PATCH 08/17] Fixes and a lot of debug assertions

---
 .../dashboard/layouts/AssetContextMenu.tsx    |  2 +-
 app/ydoc-shared/src/ast/tree.ts               | 20 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/gui/src/dashboard/layouts/AssetContextMenu.tsx b/app/gui/src/dashboard/layouts/AssetContextMenu.tsx
index e735fb28b359..fee2ef26ed25 100644
--- a/app/gui/src/dashboard/layouts/AssetContextMenu.tsx
+++ b/app/gui/src/dashboard/layouts/AssetContextMenu.tsx
@@ -29,8 +29,8 @@ import * as backendModule from '#/services/Backend'
 import * as permissions from '#/utilities/permissions'
 import { useMutationCallback } from '#/utilities/tanstackQuery'
 import { useBackends, useFullUserSession, useRouter, useText } from '$/providers/react'
+import { useRightPanelData } from '$/providers/react/container'
 import * as featureFlagsProvider from '$/providers/react/featureFlags'
-import { useRightPanelData } from '$/providers/rightPanel'
 import {
   TEAMS_DIRECTORY_ID,
   USERS_DIRECTORY_ID,
diff --git a/app/ydoc-shared/src/ast/tree.ts b/app/ydoc-shared/src/ast/tree.ts
index 1fe461aa55fe..71048a3fcbf2 100644
--- a/app/ydoc-shared/src/ast/tree.ts
+++ b/app/ydoc-shared/src/ast/tree.ts
@@ -3188,13 +3188,17 @@ export class Vector extends BaseExpression {
   declare fields: FixedMapView<AstFields & VectorFields>
   /** TODO: Add docs */
   constructor(module: Module, fields: FixedMapView<AstFields & VectorFields>) {
+    assertDefined(fields.get('elements'))
     super(module, fields)
   }
 
   /** TODO: Add docs */
   static tryParse(source: string, module?: MutableModule): Owned<MutableVector> | undefined {
     const parsed = parseExpression(source, module)
-    if (parsed instanceof MutableVector) return parsed
+    if (parsed instanceof MutableVector) {
+      assertDefined(parsed.fields.get('elements'))
+      return parsed
+    }
   }
 
   /** TODO: Add docs */
@@ -3204,6 +3208,7 @@ export class Vector extends BaseExpression {
     elements: AbstractVectorElement<OwnedRefs>[],
     close: NodeChild<Token> | undefined,
   ) {
+    assertDefined(elements)
     const base = module.baseObject('Vector')
     const id_ = base.get('id')
     const fields = composeFieldData(base, {
@@ -3216,6 +3221,7 @@ export class Vector extends BaseExpression {
 
   /** TODO: Add docs */
   static new(module: MutableModule, elements: Owned[]) {
+    assertDefined(elements)
     return this.concrete(
       module,
       undefined,
@@ -3266,6 +3272,7 @@ export class Vector extends BaseExpression {
     const { open, elements, close } = getAll(this.fields)
     yield ensureUnspaced(open, verbatim)
     let isFirst = true
+    assertDefined(elements)
     for (const { delimiter, value } of elements) {
       if (isFirst) {
         if (value) yield preferUnspaced(value)
@@ -3280,12 +3287,14 @@ export class Vector extends BaseExpression {
 
   /** TODO: Add docs */
   *values(): IterableIterator<Expression> {
+    assertDefined(this.fields.get('elements'))
     for (const element of this.fields.get('elements'))
       if (element.value) yield this.module.get(element.value.node) as Expression
   }
 
   /** TODO: Add docs */
   *enumerate(): IterableIterator<[number, Expression | undefined]> {
+    assertDefined(this.fields.get('elements'))
     for (const [index, element] of this.fields.get('elements').entries()) {
       yield [index, this.module.get(element.value?.node) as Expression]
     }
@@ -3293,11 +3302,13 @@ export class Vector extends BaseExpression {
 
   /** Get element under given index. */
   at(index: number): Expression | undefined {
+    assertDefined(this.fields.get('elements'))
     return this.module.get(this.fields.get('elements')[index]?.value?.node) as Expression
   }
 
   /** TODO: Add docs */
   get length() {
+    assertDefined(this.fields.get('elements'))
     return this.fields.get('elements').length
   }
 }
@@ -3310,6 +3321,7 @@ export class MutableVector extends Vector implements MutableExpression {
     const elements = this.fields.get('elements')
     const element = this.valueToElement(value)
     this.fields.set('elements', [...elements, element])
+    assertDefined(this.fields.get('elements'))
   }
 
   pop(): Owned | undefined {
@@ -3319,8 +3331,10 @@ export class MutableVector extends Vector implements MutableExpression {
     const lastNode = this.module.get(last)
     if (lastNode != null) {
       lastNode.fields.set('parent', undefined)
+      assertDefined(this.fields.get('elements'))
       return lastNode as Owned
     } else {
+      assertDefined(this.fields.get('elements'))
       return undefined
     }
   }
@@ -3332,6 +3346,7 @@ export class MutableVector extends Vector implements MutableExpression {
       value: autospaced(this.claimChild(value)),
     }
     this.fields.set('elements', elements)
+    assertDefined(this.fields.get('elements'))
   }
 
   splice(start: number, deletedCount: number, ...newValues: Owned[]) {
@@ -3340,6 +3355,7 @@ export class MutableVector extends Vector implements MutableExpression {
     elements.splice(start, deletedCount, ...newElements)
     MutableVector.autospaceElement(elements[start + newValues.length])
     this.fields.set('elements', elements)
+    assertDefined(this.fields.get('elements'))
   }
 
   /**
@@ -3359,6 +3375,7 @@ export class MutableVector extends Vector implements MutableExpression {
       MutableVector.autospaceElement(elements[toIndex + 1])
       this.fields.set('elements', elements)
     }
+    assertDefined(this.fields.get('elements'))
   }
 
   keep(predicate: (ast: Expression) => boolean) {
@@ -3373,6 +3390,7 @@ export class MutableVector extends Vector implements MutableExpression {
       filtered[0] = { ...filtered[0], value: { ...filtered[0].value, whitespace: firstSpacing } }
     }
     this.fields.set('elements', filtered)
+    assertDefined(this.fields.get('elements'))
   }
 
   private valueToElement(value: Owned) {

From 4ee374a58f803992f8b04b20f000f6d63076313f Mon Sep 17 00:00:00 2001
From: Adam Obuchowicz <adam.obuchowicz@enso.org>
Date: Tue, 30 Sep 2025 13:53:22 +0200
Subject: [PATCH 09/17] WIP more debugs

---
 .../WidgetTableEditor/tableInputArgument.ts   | 34 +++++++++++-----
 app/gui/src/project-view/util/ast/reactive.ts | 21 +++++++++-
 .../openedProjects/graph/graphDatabase.ts     |  1 +
 .../providers/openedProjects/module/module.ts | 40 +++++++++++++++++--
 app/ydoc-shared/src/ast/mutableModule.ts      | 16 +++++++-
 5 files changed, 95 insertions(+), 17 deletions(-)

diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts
index cb745feb8b34..b75677c4deb2 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts
@@ -6,10 +6,9 @@ import { commonContextMenuActions, type MenuItem } from '@/components/shared/AgG
 import { Ast } from '@/util/ast'
 import { findIndexOpt } from '@/util/data/array'
 import { Err, Ok, transposeResult, unwrapOrWithLog, type Result } from '@/util/data/result'
-import { arrayEquals } from '@/util/equals'
 import { ProjectPath } from '@/util/projectPath'
 import { qnLastSegment, type QualifiedName } from '@/util/qualifiedName'
-import { cachedGetter, type ToValue } from '@/util/reactivity'
+import { type ToValue } from '@/util/reactivity'
 import type { ColDef } from 'ag-grid-enterprise'
 import * as iter from 'enso-common/src/utilities/data/iter'
 import { computed, toValue } from 'vue'
@@ -154,14 +153,20 @@ export function useTableInputArgument(
     return unwrapOrWithLog(cols, [], errorMessagePreamble)
   })
 
-  // Why cachedGetter - see comment on columnDefs.
-  const columnHeaders = cachedGetter(
-    () => Array.from(columns.value, (col) => ({ id: col.id, name: col.name.rawTextContent })),
-    (a, b) => arrayEquals(a, b, (a, b) => a.id === b.id && a.name === b.name),
+  // // Why cachedGetter - see comment on columnDefs.
+  // const columnHeaders = cachedGetter(
+  //   () => Array.from(columns.value, (col) => ({ id: col.id, name: col.name.rawTextContent })),
+  //   (a, b) => arrayEquals(a, b, (a, b) => a.id === b.id && a.name === b.name),
+  // )
+
+  // // Why cachedGetter - see comment on rowData.
+  // const rowCount = cachedGetter(() =>
+  //   columns.value.reduce((soFar, col) => Math.max(soFar, col.data.length), 0),
+  // )
+  const columnHeaders = computed(() =>
+    Array.from(columns.value, (col) => ({ id: col.id, name: col.name.rawTextContent })),
   )
-
-  // Why cachedGetter - see comment on rowData.
-  const rowCount = cachedGetter(() =>
+  const rowCount = computed(() =>
     columns.value.reduce((soFar, col) => Math.max(soFar, col.data.length), 0),
   )
 
@@ -195,8 +200,11 @@ export function useTableInputArgument(
     return rowCount_ * (colCount + 1) <= CELLS_LIMIT
   }
 
-  const mayAddNewColumnCurrently = cachedGetter(() => mayAddNewColumn())
-  const mayAddNewRowCurrently = cachedGetter(() => mayAddNewRow())
+  // const mayAddNewColumnCurrently = cachedGetter(() => mayAddNewColumn())
+  // const mayAddNewRowCurrently = cachedGetter(() => mayAddNewRow())
+
+  const mayAddNewColumnCurrently = computed(() => mayAddNewColumn())
+  const mayAddNewRowCurrently = computed(() => mayAddNewRow())
 
   function addRow(
     edit: Ast.MutableModule,
@@ -526,6 +534,7 @@ export function useTableInputArgument(
           const column = columns.value[colIndex]!
           const newValueAst = convertWithImport(newValueGetter(rowIndex, colIndex), edit)
           edit.getVersion(column.data).set(rowIndex, newValueAst)
+          toValue(module).assertConsistency()
         }
       }
 
@@ -538,6 +547,7 @@ export function useTableInputArgument(
         }
 
         addRow(edit, (_colId, index) => newValueGetter(i, index))
+        toValue(module).assertConsistency()
       }
       const newColCount = Math.max(pastedColsEnd, columns.value.length)
       let modifiedColumnsAst: Ast.Vector | undefined = undefined
@@ -553,8 +563,10 @@ export function useTableInputArgument(
           newRowCount,
           modifiedColumnsAst,
         )
+        toValue(module).assertConsistency()
       }
       const updateResult = await onUpdate({ edit, directInteraction: true })
+      toValue(module).assertConsistency()
       if (!updateResult.ok) return updateResult
       return Ok({
         rows: actuallyPastedRowsEnd - focusedCell.rowIndex,
diff --git a/app/gui/src/project-view/util/ast/reactive.ts b/app/gui/src/project-view/util/ast/reactive.ts
index aa8e596d01ad..4521c69895f0 100644
--- a/app/gui/src/project-view/util/ast/reactive.ts
+++ b/app/gui/src/project-view/util/ast/reactive.ts
@@ -1,4 +1,4 @@
-import { markRaw, shallowReactive } from 'vue'
+import { customRef, markRaw, shallowReactive } from 'vue'
 import { MutableModule } from 'ydoc-shared/ast'
 import * as Y from 'yjs'
 
@@ -11,6 +11,25 @@ import * as Y from 'yjs'
  */
 export function reactiveModule(doc: Y.Doc, onCleanup: (f: () => void) => void): MutableModule {
   const module = markRaw(new MutableModule(doc))
+  const changes = []
+
+  const debouncedReactive = (map: any) => {
+    let trigger: (() => void) | undefined
+    const ref = customRef((track, trigger_) => {
+      trigger = trigger_
+      return {
+        get: () => {
+          track()
+          return map
+        },
+        set: (value) => {
+          trigger()
+        },
+      }
+    })
+    ref.value
+  }
+
   const handle = module.observe((update) => {
     update.nodesAdded.forEach((astId) => {
       const fields = module.get(astId).fields
diff --git a/app/gui/src/providers/openedProjects/graph/graphDatabase.ts b/app/gui/src/providers/openedProjects/graph/graphDatabase.ts
index 2e1f0b9f6085..56063424e9d3 100644
--- a/app/gui/src/providers/openedProjects/graph/graphDatabase.ts
+++ b/app/gui/src/providers/openedProjects/graph/graphDatabase.ts
@@ -82,6 +82,7 @@ export class GraphDb {
 
   private nodeIdToExprIds = new ReactiveIndex(this.nodeIdToNode, (id, entry) => {
     const exprs: AstId[] = []
+    entry.innerExpr.module.assertConsistency()
     Ast.visitRecursive(entry.innerExpr, (ast) => void exprs.push(ast.id))
     return Array.from(exprs, (expr) => [id, expr])
   })
diff --git a/app/gui/src/providers/openedProjects/module/module.ts b/app/gui/src/providers/openedProjects/module/module.ts
index cbeb460c86c4..2bec34d186b2 100644
--- a/app/gui/src/providers/openedProjects/module/module.ts
+++ b/app/gui/src/providers/openedProjects/module/module.ts
@@ -40,6 +40,8 @@ export function createModuleStore(
   const ast = synced as Ref<Ast.Module | undefined>
   const observers: ((update: Ast.ModuleUpdate) => void)[] = []
 
+  let module___: any
+  let handle___: any
   watch(
     () => proj.module,
     (projModule, _, onCleanup) => {
@@ -62,6 +64,8 @@ export function createModuleStore(
           root.value = undefined
         }
       })
+      module___ = module
+      handle___ = handle
       onCleanup(() => {
         module.unobserve(handle)
         source.clear()
@@ -107,9 +111,33 @@ export function createModuleStore(
     }
 
     const applyEdit = (result: Result<T>) => {
-      if (result.ok) synced.value?.applyEdit(edit, options.origin)
-      else if (logLevel !== 'none')
-        console[logLevel](result.error.message(options.logPreamble ?? 'Cannot commit AST edit.'))
+      assertConsistency()
+      edit.assertConsistency()
+
+      console.debug('>>> STUNT')
+      const stunt = synced.value!.edit()
+      stunt.assertConsistency()
+      stunt.observe(() => {
+        try {
+          stunt.assertConsistency()
+        } catch (err) {
+          console.error('Stunt observer failed', err)
+        }
+      })
+      stunt.applyEdit(edit)
+      stunt.assertConsistency()
+
+      console.debug('>>> BEFORE APPLY')
+      try {
+        if (result.ok) synced.value?.applyEdit(edit, options.origin)
+        else if (logLevel !== 'none')
+          console[logLevel](result.error.message(options.logPreamble ?? 'Cannot commit AST edit.'))
+      } catch (err) {
+        console.error("HERE's THE CATCH", err)
+        throw err
+      }
+      console.debug('>>> AFTER APPLY')
+      assertConsistency()
       return result
     }
 
@@ -213,6 +241,11 @@ export function createModuleStore(
     return { unregister: () => proj.module?.doc.ydoc.off('beforeTransaction', f) }
   }
 
+  function assertConsistency() {
+    assertDefined(synced.value)
+    synced.value.assertConsistency()
+  }
+
   return proxyRefs({
     source,
     ast,
@@ -226,5 +259,6 @@ export function createModuleStore(
     setWidgetMetadata,
     addMissingImports,
     addMissingImportsDisregardConflicts,
+    assertConsistency,
   })
 }
diff --git a/app/ydoc-shared/src/ast/mutableModule.ts b/app/ydoc-shared/src/ast/mutableModule.ts
index 3f003e0010eb..0552ca7640c8 100644
--- a/app/ydoc-shared/src/ast/mutableModule.ts
+++ b/app/ydoc-shared/src/ast/mutableModule.ts
@@ -213,8 +213,13 @@ export class MutableModule implements Module {
   private attachObserver() {
     if (this.yjsObserver) return
     this.yjsObserver = (events: Y.YEvent<any>[], transaction: Y.Transaction) => {
-      const update = this.observeEvents(events, tryAsOrigin(transaction.origin))
-      for (const observer of this.updateObservers ?? []) observer(update)
+      try {
+        this.assertConsistency()
+        const update = this.observeEvents(events, tryAsOrigin(transaction.origin))
+        for (const observer of this.updateObservers ?? []) observer(update)
+      } catch (err) {
+        console.error('Observer caught an exception', err)
+      }
     }
     this.nodes.observeDeep(this.yjsObserver)
   }
@@ -438,6 +443,13 @@ export class MutableModule implements Module {
   has(id: AstId) {
     return this.nodes.has(id)
   }
+
+  assertConsistency() {
+    for (const key of this.nodes.keys()) {
+      const node = this.get(key as AstId)
+      assert(node.module === this)
+    }
+  }
 }
 
 type MutableRootPointer = MutableInvalid & { get expression(): MutableAst | undefined }

From fc0d8502a72de76ad77291735ad44a7cc74220fb Mon Sep 17 00:00:00 2001
From: Adam Obuchowicz <adam.obuchowicz@enso.org>
Date: Wed, 1 Oct 2025 13:10:56 +0200
Subject: [PATCH 10/17] Remove sync watchers tracking AST

---
 .../GraphEditor/widgets/WidgetPort.vue        | 11 +++---
 .../WidgetTableEditor/tableInputArgument.ts   | 35 ++++++------------
 app/gui/src/project-view/util/reactivity.ts   |  7 ++--
 .../openedProjects/graph/graphDatabase.ts     |  1 -
 .../providers/openedProjects/module/module.ts | 36 ++-----------------
 app/ydoc-shared/src/ast/mutableModule.ts      | 12 ++-----
 app/ydoc-shared/src/ast/tree.ts               | 16 ---------
 7 files changed, 28 insertions(+), 90 deletions(-)

diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetPort.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetPort.vue
index 5a6246ff2ac3..7302988fee04 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetPort.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetPort.vue
@@ -75,10 +75,13 @@ const portRect = shallowRef<Rect>()
 // Since the port ID computation has many dependencies but rarely changes its final output, store
 // its result in an intermediate ref, and update it only when the value actually changes. That way
 // effects depending on the port ID value will not be re-triggered unnecessarily.
-const portId = cachedGetter<PortId>(() => {
-  assert(!isUuid(props.input.portId))
-  return props.input.portId
-})
+const portId = cachedGetter<PortId>(
+  () => {
+    assert(!isUuid(props.input.portId))
+    return props.input.portId
+  },
+  { flush: 'sync' },
+)
 
 const innerWidget = computed(() => {
   return { ...props.input, forcePort: false }
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts
index b75677c4deb2..f3ef8fd3d874 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor/tableInputArgument.ts
@@ -4,11 +4,11 @@ import type { SuggestionDb } from '$/providers/openedProjects/suggestionDatabase
 import type { UpdateHandler, WidgetInput } from '$/providers/openedProjects/widgetRegistry'
 import { commonContextMenuActions, type MenuItem } from '@/components/shared/AgGridTableView.vue'
 import { Ast } from '@/util/ast'
-import { findIndexOpt } from '@/util/data/array'
+import { arrayEquals, findIndexOpt } from '@/util/data/array'
 import { Err, Ok, transposeResult, unwrapOrWithLog, type Result } from '@/util/data/result'
 import { ProjectPath } from '@/util/projectPath'
 import { qnLastSegment, type QualifiedName } from '@/util/qualifiedName'
-import { type ToValue } from '@/util/reactivity'
+import { cachedGetter, type ToValue } from '@/util/reactivity'
 import type { ColDef } from 'ag-grid-enterprise'
 import * as iter from 'enso-common/src/utilities/data/iter'
 import { computed, toValue } from 'vue'
@@ -153,20 +153,14 @@ export function useTableInputArgument(
     return unwrapOrWithLog(cols, [], errorMessagePreamble)
   })
 
-  // // Why cachedGetter - see comment on columnDefs.
-  // const columnHeaders = cachedGetter(
-  //   () => Array.from(columns.value, (col) => ({ id: col.id, name: col.name.rawTextContent })),
-  //   (a, b) => arrayEquals(a, b, (a, b) => a.id === b.id && a.name === b.name),
-  // )
-
-  // // Why cachedGetter - see comment on rowData.
-  // const rowCount = cachedGetter(() =>
-  //   columns.value.reduce((soFar, col) => Math.max(soFar, col.data.length), 0),
-  // )
-  const columnHeaders = computed(() =>
-    Array.from(columns.value, (col) => ({ id: col.id, name: col.name.rawTextContent })),
+  // Why cachedGetter - see comment on columnDefs.
+  const columnHeaders = cachedGetter(
+    () => Array.from(columns.value, (col) => ({ id: col.id, name: col.name.rawTextContent })),
+    { equalFn: (a, b) => arrayEquals(a, b, (a, b) => a.id === b.id && a.name === b.name) },
   )
-  const rowCount = computed(() =>
+
+  // Why cachedGetter - see comment on rowData.
+  const rowCount = cachedGetter(() =>
     columns.value.reduce((soFar, col) => Math.max(soFar, col.data.length), 0),
   )
 
@@ -200,11 +194,8 @@ export function useTableInputArgument(
     return rowCount_ * (colCount + 1) <= CELLS_LIMIT
   }
 
-  // const mayAddNewColumnCurrently = cachedGetter(() => mayAddNewColumn())
-  // const mayAddNewRowCurrently = cachedGetter(() => mayAddNewRow())
-
-  const mayAddNewColumnCurrently = computed(() => mayAddNewColumn())
-  const mayAddNewRowCurrently = computed(() => mayAddNewRow())
+  const mayAddNewColumnCurrently = cachedGetter(() => mayAddNewColumn())
+  const mayAddNewRowCurrently = cachedGetter(() => mayAddNewRow())
 
   function addRow(
     edit: Ast.MutableModule,
@@ -534,7 +525,6 @@ export function useTableInputArgument(
           const column = columns.value[colIndex]!
           const newValueAst = convertWithImport(newValueGetter(rowIndex, colIndex), edit)
           edit.getVersion(column.data).set(rowIndex, newValueAst)
-          toValue(module).assertConsistency()
         }
       }
 
@@ -547,7 +537,6 @@ export function useTableInputArgument(
         }
 
         addRow(edit, (_colId, index) => newValueGetter(i, index))
-        toValue(module).assertConsistency()
       }
       const newColCount = Math.max(pastedColsEnd, columns.value.length)
       let modifiedColumnsAst: Ast.Vector | undefined = undefined
@@ -563,10 +552,8 @@ export function useTableInputArgument(
           newRowCount,
           modifiedColumnsAst,
         )
-        toValue(module).assertConsistency()
       }
       const updateResult = await onUpdate({ edit, directInteraction: true })
-      toValue(module).assertConsistency()
       if (!updateResult.ok) return updateResult
       return Ok({
         rows: actuallyPastedRowsEnd - focusedCell.rowIndex,
diff --git a/app/gui/src/project-view/util/reactivity.ts b/app/gui/src/project-view/util/reactivity.ts
index d25a9e39dd31..40fbc3930207 100644
--- a/app/gui/src/project-view/util/reactivity.ts
+++ b/app/gui/src/project-view/util/reactivity.ts
@@ -189,16 +189,17 @@ export function useWatchContext(): { watchEffect: (f: () => void) => WatchStopHa
  */
 export function cachedGetter<T>(
   getter: () => T,
-  equalFn: (a: T, b: T) => boolean = defaultEquality,
+  options: { flush?: 'sync' | 'pre' | 'post'; equalFn?: (a: T, b: T) => boolean } = {},
 ): Ref<T> {
   const valueRef = shallowRef<T>(getter())
+  const eq = options.equalFn ?? defaultEquality
   watch(
     getter,
     (newValue) => {
       const oldValue = valueRef.value
-      if (!equalFn(oldValue, newValue)) valueRef.value = newValue
+      if (!eq(oldValue, newValue)) valueRef.value = newValue
     },
-    { flush: 'sync' },
+    options,
   )
 
   return valueRef
diff --git a/app/gui/src/providers/openedProjects/graph/graphDatabase.ts b/app/gui/src/providers/openedProjects/graph/graphDatabase.ts
index 56063424e9d3..2e1f0b9f6085 100644
--- a/app/gui/src/providers/openedProjects/graph/graphDatabase.ts
+++ b/app/gui/src/providers/openedProjects/graph/graphDatabase.ts
@@ -82,7 +82,6 @@ export class GraphDb {
 
   private nodeIdToExprIds = new ReactiveIndex(this.nodeIdToNode, (id, entry) => {
     const exprs: AstId[] = []
-    entry.innerExpr.module.assertConsistency()
     Ast.visitRecursive(entry.innerExpr, (ast) => void exprs.push(ast.id))
     return Array.from(exprs, (expr) => [id, expr])
   })
diff --git a/app/gui/src/providers/openedProjects/module/module.ts b/app/gui/src/providers/openedProjects/module/module.ts
index 2bec34d186b2..d80f21eab863 100644
--- a/app/gui/src/providers/openedProjects/module/module.ts
+++ b/app/gui/src/providers/openedProjects/module/module.ts
@@ -111,33 +111,9 @@ export function createModuleStore(
     }
 
     const applyEdit = (result: Result<T>) => {
-      assertConsistency()
-      edit.assertConsistency()
-
-      console.debug('>>> STUNT')
-      const stunt = synced.value!.edit()
-      stunt.assertConsistency()
-      stunt.observe(() => {
-        try {
-          stunt.assertConsistency()
-        } catch (err) {
-          console.error('Stunt observer failed', err)
-        }
-      })
-      stunt.applyEdit(edit)
-      stunt.assertConsistency()
-
-      console.debug('>>> BEFORE APPLY')
-      try {
-        if (result.ok) synced.value?.applyEdit(edit, options.origin)
-        else if (logLevel !== 'none')
-          console[logLevel](result.error.message(options.logPreamble ?? 'Cannot commit AST edit.'))
-      } catch (err) {
-        console.error("HERE's THE CATCH", err)
-        throw err
-      }
-      console.debug('>>> AFTER APPLY')
-      assertConsistency()
+      if (result.ok) synced.value?.applyEdit(edit, options.origin)
+      else if (logLevel !== 'none')
+        console[logLevel](result.error.message(options.logPreamble ?? 'Cannot commit AST edit.'))
       return result
     }
 
@@ -241,11 +217,6 @@ export function createModuleStore(
     return { unregister: () => proj.module?.doc.ydoc.off('beforeTransaction', f) }
   }
 
-  function assertConsistency() {
-    assertDefined(synced.value)
-    synced.value.assertConsistency()
-  }
-
   return proxyRefs({
     source,
     ast,
@@ -259,6 +230,5 @@ export function createModuleStore(
     setWidgetMetadata,
     addMissingImports,
     addMissingImportsDisregardConflicts,
-    assertConsistency,
   })
 }
diff --git a/app/ydoc-shared/src/ast/mutableModule.ts b/app/ydoc-shared/src/ast/mutableModule.ts
index 0552ca7640c8..0bdb5be431d7 100644
--- a/app/ydoc-shared/src/ast/mutableModule.ts
+++ b/app/ydoc-shared/src/ast/mutableModule.ts
@@ -214,11 +214,12 @@ export class MutableModule implements Module {
     if (this.yjsObserver) return
     this.yjsObserver = (events: Y.YEvent<any>[], transaction: Y.Transaction) => {
       try {
-        this.assertConsistency()
         const update = this.observeEvents(events, tryAsOrigin(transaction.origin))
         for (const observer of this.updateObservers ?? []) observer(update)
       } catch (err) {
-        console.error('Observer caught an exception', err)
+        console.error('AST observer caught an exception', err)
+        // We drop the exception here, because otherwise we may land with partially updated YDoc
+        // what may produce more confusing bugs.
       }
     }
     this.nodes.observeDeep(this.yjsObserver)
@@ -443,13 +444,6 @@ export class MutableModule implements Module {
   has(id: AstId) {
     return this.nodes.has(id)
   }
-
-  assertConsistency() {
-    for (const key of this.nodes.keys()) {
-      const node = this.get(key as AstId)
-      assert(node.module === this)
-    }
-  }
 }
 
 type MutableRootPointer = MutableInvalid & { get expression(): MutableAst | undefined }
diff --git a/app/ydoc-shared/src/ast/tree.ts b/app/ydoc-shared/src/ast/tree.ts
index 71048a3fcbf2..a2375d120b91 100644
--- a/app/ydoc-shared/src/ast/tree.ts
+++ b/app/ydoc-shared/src/ast/tree.ts
@@ -3188,7 +3188,6 @@ export class Vector extends BaseExpression {
   declare fields: FixedMapView<AstFields & VectorFields>
   /** TODO: Add docs */
   constructor(module: Module, fields: FixedMapView<AstFields & VectorFields>) {
-    assertDefined(fields.get('elements'))
     super(module, fields)
   }
 
@@ -3196,7 +3195,6 @@ export class Vector extends BaseExpression {
   static tryParse(source: string, module?: MutableModule): Owned<MutableVector> | undefined {
     const parsed = parseExpression(source, module)
     if (parsed instanceof MutableVector) {
-      assertDefined(parsed.fields.get('elements'))
       return parsed
     }
   }
@@ -3208,7 +3206,6 @@ export class Vector extends BaseExpression {
     elements: AbstractVectorElement<OwnedRefs>[],
     close: NodeChild<Token> | undefined,
   ) {
-    assertDefined(elements)
     const base = module.baseObject('Vector')
     const id_ = base.get('id')
     const fields = composeFieldData(base, {
@@ -3221,7 +3218,6 @@ export class Vector extends BaseExpression {
 
   /** TODO: Add docs */
   static new(module: MutableModule, elements: Owned[]) {
-    assertDefined(elements)
     return this.concrete(
       module,
       undefined,
@@ -3272,7 +3268,6 @@ export class Vector extends BaseExpression {
     const { open, elements, close } = getAll(this.fields)
     yield ensureUnspaced(open, verbatim)
     let isFirst = true
-    assertDefined(elements)
     for (const { delimiter, value } of elements) {
       if (isFirst) {
         if (value) yield preferUnspaced(value)
@@ -3287,14 +3282,12 @@ export class Vector extends BaseExpression {
 
   /** TODO: Add docs */
   *values(): IterableIterator<Expression> {
-    assertDefined(this.fields.get('elements'))
     for (const element of this.fields.get('elements'))
       if (element.value) yield this.module.get(element.value.node) as Expression
   }
 
   /** TODO: Add docs */
   *enumerate(): IterableIterator<[number, Expression | undefined]> {
-    assertDefined(this.fields.get('elements'))
     for (const [index, element] of this.fields.get('elements').entries()) {
       yield [index, this.module.get(element.value?.node) as Expression]
     }
@@ -3302,13 +3295,11 @@ export class Vector extends BaseExpression {
 
   /** Get element under given index. */
   at(index: number): Expression | undefined {
-    assertDefined(this.fields.get('elements'))
     return this.module.get(this.fields.get('elements')[index]?.value?.node) as Expression
   }
 
   /** TODO: Add docs */
   get length() {
-    assertDefined(this.fields.get('elements'))
     return this.fields.get('elements').length
   }
 }
@@ -3321,7 +3312,6 @@ export class MutableVector extends Vector implements MutableExpression {
     const elements = this.fields.get('elements')
     const element = this.valueToElement(value)
     this.fields.set('elements', [...elements, element])
-    assertDefined(this.fields.get('elements'))
   }
 
   pop(): Owned | undefined {
@@ -3331,10 +3321,8 @@ export class MutableVector extends Vector implements MutableExpression {
     const lastNode = this.module.get(last)
     if (lastNode != null) {
       lastNode.fields.set('parent', undefined)
-      assertDefined(this.fields.get('elements'))
       return lastNode as Owned
     } else {
-      assertDefined(this.fields.get('elements'))
       return undefined
     }
   }
@@ -3346,7 +3334,6 @@ export class MutableVector extends Vector implements MutableExpression {
       value: autospaced(this.claimChild(value)),
     }
     this.fields.set('elements', elements)
-    assertDefined(this.fields.get('elements'))
   }
 
   splice(start: number, deletedCount: number, ...newValues: Owned[]) {
@@ -3355,7 +3342,6 @@ export class MutableVector extends Vector implements MutableExpression {
     elements.splice(start, deletedCount, ...newElements)
     MutableVector.autospaceElement(elements[start + newValues.length])
     this.fields.set('elements', elements)
-    assertDefined(this.fields.get('elements'))
   }
 
   /**
@@ -3375,7 +3361,6 @@ export class MutableVector extends Vector implements MutableExpression {
       MutableVector.autospaceElement(elements[toIndex + 1])
       this.fields.set('elements', elements)
     }
-    assertDefined(this.fields.get('elements'))
   }
 
   keep(predicate: (ast: Expression) => boolean) {
@@ -3390,7 +3375,6 @@ export class MutableVector extends Vector implements MutableExpression {
       filtered[0] = { ...filtered[0], value: { ...filtered[0].value, whitespace: firstSpacing } }
     }
     this.fields.set('elements', filtered)
-    assertDefined(this.fields.get('elements'))
   }
 
   private valueToElement(value: Owned) {

From 83eb8246c8a762d9c336f9eac0ad4251666f0f8a Mon Sep 17 00:00:00 2001
From: Adam Obuchowicz <adam.obuchowicz@enso.org>
Date: Wed, 1 Oct 2025 13:14:15 +0200
Subject: [PATCH 11/17] Remove unused code and add a disclaimer

---
 app/gui/src/project-view/util/ast/reactive.ts | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/app/gui/src/project-view/util/ast/reactive.ts b/app/gui/src/project-view/util/ast/reactive.ts
index 4521c69895f0..8b89a42b6761 100644
--- a/app/gui/src/project-view/util/ast/reactive.ts
+++ b/app/gui/src/project-view/util/ast/reactive.ts
@@ -1,4 +1,4 @@
-import { customRef, markRaw, shallowReactive } from 'vue'
+import { markRaw, shallowReactive } from 'vue'
 import { MutableModule } from 'ydoc-shared/ast'
 import * as Y from 'yjs'
 
@@ -8,27 +8,13 @@ import * as Y from 'yjs'
  * Note that non-Ast structured fields (e.g. ArgumentDefinition) are not themselves reactive --
  * an access is tracked when obtaining the object from the Ast, not when accessing the inner
  * object's fields.
+ *
+ * **Important**: avoid watching AST structures synchronously (with `flush: 'sync'` option),
+ * because you may be notified with partially updated AST data. There are no consistency
+ * guarantees in this case and exceptions are likely to follow.
  */
 export function reactiveModule(doc: Y.Doc, onCleanup: (f: () => void) => void): MutableModule {
   const module = markRaw(new MutableModule(doc))
-  const changes = []
-
-  const debouncedReactive = (map: any) => {
-    let trigger: (() => void) | undefined
-    const ref = customRef((track, trigger_) => {
-      trigger = trigger_
-      return {
-        get: () => {
-          track()
-          return map
-        },
-        set: (value) => {
-          trigger()
-        },
-      }
-    })
-    ref.value
-  }
 
   const handle = module.observe((update) => {
     update.nodesAdded.forEach((astId) => {

From 75206d21884fdff7c69a39b0887b60e6fe403b70 Mon Sep 17 00:00:00 2001
From: Adam Obuchowicz <adam.obuchowicz@enso.org>
Date: Wed, 1 Oct 2025 14:44:05 +0200
Subject: [PATCH 12/17] Add necessary comment

---
 app/gui/src/components/WithCurrentProject.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/gui/src/components/WithCurrentProject.vue b/app/gui/src/components/WithCurrentProject.vue
index 63bda3bfa643..05f7ccb24f59 100644
--- a/app/gui/src/components/WithCurrentProject.vue
+++ b/app/gui/src/components/WithCurrentProject.vue
@@ -114,6 +114,10 @@ const { id } = defineProps<{ id: Opt<ProjectId> }>()
 
 const project = useOpenedProject(() => id)
 const providedProject = shallowRef<OpenedProject | undefined>(project.value)
+
+// When project appears, the setup and mount handlers should already see it in context. But when project disappears,
+// we want to keep stores while unmounting (because unmount handlers may still read some computed values).
+// That's why we use two separate watches.
 watch(
   project,
   (project) => {

From 3fa6127907e668357d002970d8c1d599b596d819 Mon Sep 17 00:00:00 2001
From: Adam Obuchowicz <adam.obuchowicz@enso.org>
Date: Wed, 1 Oct 2025 15:18:24 +0200
Subject: [PATCH 13/17] Lint

---
 .../components/TableExpressionFunctionDocs.vue            | 2 +-
 .../codemirror/language/tableExpression/completionData.ts | 2 +-
 app/gui/src/providers/openedProjects/module/module.ts     | 8 ++------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/gui/src/project-view/components/TableExpressionFunctionDocs.vue b/app/gui/src/project-view/components/TableExpressionFunctionDocs.vue
index 3a92e0b16744..895250d3355f 100644
--- a/app/gui/src/project-view/components/TableExpressionFunctionDocs.vue
+++ b/app/gui/src/project-view/components/TableExpressionFunctionDocs.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
+import type { MethodSuggestionEntry } from '$/providers/openedProjects/suggestionDatabase/entry'
 import MarkdownEditor from '@/components/MarkdownEditor.vue'
-import type { MethodSuggestionEntry } from '@/stores/suggestionDatabase/entry'
 import { useStringSync } from '@/util/codemirror'
 import { computed } from 'vue'
 
diff --git a/app/gui/src/project-view/util/codemirror/language/tableExpression/completionData.ts b/app/gui/src/project-view/util/codemirror/language/tableExpression/completionData.ts
index 35d10a5be5a7..0daf7f6d2f47 100644
--- a/app/gui/src/project-view/util/codemirror/language/tableExpression/completionData.ts
+++ b/app/gui/src/project-view/util/codemirror/language/tableExpression/completionData.ts
@@ -2,7 +2,7 @@
  * @file This module supports maintaining a collection of CodeMirror completions, based on provided
  * method information and the rules of the syntax.
  */
-import type { MethodSuggestionEntry } from '@/stores/suggestionDatabase/entry'
+import type { MethodSuggestionEntry } from '$/providers/openedProjects/suggestionDatabase/entry'
 import type { Completion } from '@codemirror/autocomplete'
 import { record } from 'enso-common/src/utilities/data/object'
 import { computed } from 'vue'
diff --git a/app/gui/src/providers/openedProjects/module/module.ts b/app/gui/src/providers/openedProjects/module/module.ts
index d80f21eab863..87dc47bc62a7 100644
--- a/app/gui/src/providers/openedProjects/module/module.ts
+++ b/app/gui/src/providers/openedProjects/module/module.ts
@@ -40,8 +40,6 @@ export function createModuleStore(
   const ast = synced as Ref<Ast.Module | undefined>
   const observers: ((update: Ast.ModuleUpdate) => void)[] = []
 
-  let module___: any
-  let handle___: any
   watch(
     () => proj.module,
     (projModule, _, onCleanup) => {
@@ -64,8 +62,6 @@ export function createModuleStore(
           root.value = undefined
         }
       })
-      module___ = module
-      handle___ = handle
       onCleanup(() => {
         module.unobserve(handle)
         source.clear()
@@ -85,8 +81,8 @@ export function createModuleStore(
    * Edit the AST module.
    *
    * Optimization options: These are safe to use for metadata-only edits; otherwise, they require extreme caution.
-   *  @param skipTreeRepair - If the edit is certain not to produce incorrect or non-canonical syntax, this may be set
-   *  to `true` for better performance.
+   * @param options.skipTreeRepair - If the edit is certain not to produce incorrect or non-canonical syntax, this may be set
+   * to `true` for better performance.
    */
   function edit<T, R extends Result<T> | Promise<Result<T>>>(
     f: (edit: MutableModule) => R,

From 42cccd9e8c4e2de40614be4fef228f69cf1ac965 Mon Sep 17 00:00:00 2001
From: Adam Obuchowicz <adam.obuchowicz@enso.org>
Date: Thu, 2 Oct 2025 11:12:57 +0200
Subject: [PATCH 14/17] Prettier

---
 .../GraphEditor/widgets/WidgetFileBrowser/localBrowser.ts    | 2 +-
 app/gui/src/providers/openedProjects.ts                      | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/localBrowser.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/localBrowser.ts
index 737d8c364fb4..92026bee9a4a 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/localBrowser.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser/localBrowser.ts
@@ -1,7 +1,7 @@
 import {
-  type FileType,
   isExtensions,
   isFileTypes,
+  type FileType,
 } from '$/providers/openedProjects/widgetRegistry/configuration'
 import { type BrowserItem } from '@/components/GraphEditor/widgets/WidgetFileBrowser/browsableTypes'
 import { type CustomDropdownItem } from '@/components/GraphEditor/widgets/WidgetSelection/tags'
diff --git a/app/gui/src/providers/openedProjects.ts b/app/gui/src/providers/openedProjects.ts
index 8e849f69e4d5..02ed6683f5e6 100644
--- a/app/gui/src/providers/openedProjects.ts
+++ b/app/gui/src/providers/openedProjects.ts
@@ -1,7 +1,10 @@
 import { ProjectId } from '#/services/Backend'
 import { createGraphStore, type GraphStore } from '$/providers/openedProjects/graph'
 import { createProjectStore, type ProjectStore } from '$/providers/openedProjects/project'
-import { createProjectNameStore, type ProjectNameStore } from '$/providers/openedProjects/projectNames'
+import {
+  createProjectNameStore,
+  type ProjectNameStore,
+} from '$/providers/openedProjects/projectNames'
 import {
   createSuggestionDbStore,
   type SuggestionDbStore,

From 626ddba943f09f1862108f5b31812c6737a65d60 Mon Sep 17 00:00:00 2001
From: Adam Obuchowicz <adam.obuchowicz@enso.org>
Date: Tue, 7 Oct 2025 14:47:49 +0200
Subject: [PATCH 15/17] Update
 app/gui/src/providers/openedProjects/module/module.ts

Co-authored-by: Keziah Wesley <kaz@lambdaverse.org>
---
 app/gui/src/providers/openedProjects/module/module.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/gui/src/providers/openedProjects/module/module.ts b/app/gui/src/providers/openedProjects/module/module.ts
index 87dc47bc62a7..d52fc777055a 100644
--- a/app/gui/src/providers/openedProjects/module/module.ts
+++ b/app/gui/src/providers/openedProjects/module/module.ts
@@ -160,7 +160,7 @@ export function createModuleStore(
 
   /**
    * Try adding imports. Do not add those conflicting with existing imports - return
-   * `DectedConflict` in such case.
+   * {@link DetectedConflict} in such case.
    */
   function addMissingImports(
     edit: MutableModule,

From 999d112800e950bb87c4816e84db932fcd367c31 Mon Sep 17 00:00:00 2001
From: Adam Obuchowicz <adam.obuchowicz@enso.org>
Date: Tue, 7 Oct 2025 16:34:49 +0200
Subject: [PATCH 16/17] Apply review

---
 app/gui/src/components/WithCurrentProject.vue | 22 +++++++++----------
 .../components/CodeEditor/CodeEditorImpl.vue  |  2 +-
 .../CodeEditor/CodeEditorTooltip.vue          |  2 +-
 .../components/ColorPickerMenu.vue            |  2 +-
 .../components/ComponentBrowser/input.ts      |  7 ++----
 .../project-view/components/ComponentHelp.vue |  2 +-
 .../OpenedProjectDocumentationEditor.vue      |  2 +-
 .../components/FunctionSignatureEditor.vue    |  2 +-
 .../project-view/components/GraphEditor.vue   |  2 +-
 .../GraphEditor/ComponentWidgetTree.vue       |  2 +-
 .../GraphEditor/CreateNodeFromPortButton.vue  |  2 +-
 .../components/GraphEditor/GraphEdges.vue     |  4 ++--
 .../components/GraphEditor/GraphNode.vue      |  2 +-
 .../GraphEditor/GraphNodeMessage.vue          |  2 +-
 .../GraphEditor/GraphNodeOutputPorts.vue      |  2 +-
 .../components/GraphEditor/nodesDragging.ts   |  2 +-
 .../GraphEditor/widgets/WidgetAnyToTarget.vue |  2 +-
 .../GraphEditor/widgets/WidgetApplication.vue |  2 +-
 .../GraphEditor/widgets/WidgetCheckbox.vue    |  2 +-
 .../GraphEditor/widgets/WidgetFileBrowser.vue |  2 +-
 .../GraphEditor/widgets/WidgetFunction.vue    | 11 +++++-----
 .../WidgetFunction/widgetFunctionCallInfo.ts  | 13 ++++++-----
 .../widgets/WidgetFunctionDef/ArgumentRow.vue |  6 ++---
 .../widgets/WidgetMultiSelection.vue          |  6 +----
 .../GraphEditor/widgets/WidgetSelection.vue   |  6 +----
 .../GraphEditor/widgets/WidgetTableEditor.vue |  2 +-
 .../GraphEditor/widgets/WidgetText.vue        |  6 ++---
 .../GraphEditor/widgets/WidgetVector.vue      |  4 ++--
 app/gui/src/providers/openedProjects.ts       |  4 ++--
 .../providers/openedProjects/graph/graph.ts   |  4 +++-
 .../providers/openedProjects/module/module.ts | 11 ++++++----
 .../widgetRegistry/widgetRegistry.ts          |  6 ++---
 app/ydoc-shared/src/ast/mutableModule.ts      | 10 ++-------
 33 files changed, 72 insertions(+), 84 deletions(-)

diff --git a/app/gui/src/components/WithCurrentProject.vue b/app/gui/src/components/WithCurrentProject.vue
index 05f7ccb24f59..9fedf0534392 100644
--- a/app/gui/src/components/WithCurrentProject.vue
+++ b/app/gui/src/components/WithCurrentProject.vue
@@ -21,16 +21,14 @@ const [provideCurrentProject, useCurrentProjectRaw] = createContextStore(
     return {
       maybeRef: project,
       /* Current project as a single ref  */
-      ref,
-      /* Current project's stores decomposed to separate refs. */
-      storesRefs: {
-        store: computed(() => ref.value.store),
-        names: computed(() => ref.value.names),
-        suggestionDb: computed(() => ref.value.suggestionDb),
-        module: computed(() => ref.value.module),
-        graph: computed(() => ref.value.graph),
-        widgetRegistry: computed(() => ref.value.widgetRegistry),
-      } satisfies ToRefs<{ [K in keyof OpenedProject]: OpenedProject[K] }>,
+      store: computed(() => ref.value.store),
+      projectNames: computed(() => ref.value.projectNames),
+      suggestionDb: computed(() => ref.value.suggestionDb),
+      module: computed(() => ref.value.module),
+      graph: computed(() => ref.value.graph),
+      widgetRegistry: computed(() => ref.value.widgetRegistry),
+    } satisfies ToRefs<{ [K in keyof OpenedProject]: OpenedProject[K] }> & {
+      maybeRef: Ref<OpenedProject | undefined>
     }
   },
 )
@@ -43,6 +41,8 @@ export function useCurrentProject(allowMissing?: boolean): CurrentProjectStore |
  *
  * Use `WithCurrentProject` component to provide which project is the current for entire component
  * tree (it injects context, makes sure the project is available, and sets proper css properties).
+ *
+ * The refs inside aren't proxied, so this store may be deconstructed.
  */
 export function useCurrentProject(allowMissing?: boolean) {
   const currentProjectStore = useCurrentProjectRaw(allowMissing)
@@ -79,7 +79,7 @@ function useStoreTemplate<K extends keyof OpenedProject>(
   storeKey: K,
 ): () => NonNullable<OpenedProject[K]> {
   return () => {
-    const currentProject = useCurrentProject().ref
+    const currentProject = useCurrentProject().maybeRef
     const store: Opt<OpenedProject[K]> = currentProject.value?.[storeKey]
     if (store == null) {
       throw new Error('Current Project missing, probably closed.')
diff --git a/app/gui/src/project-view/components/CodeEditor/CodeEditorImpl.vue b/app/gui/src/project-view/components/CodeEditor/CodeEditorImpl.vue
index 89b67da41fb3..e06475953b2d 100644
--- a/app/gui/src/project-view/components/CodeEditor/CodeEditorImpl.vue
+++ b/app/gui/src/project-view/components/CodeEditor/CodeEditorImpl.vue
@@ -22,7 +22,7 @@ import { highlightSelectionMatches } from '@codemirror/search'
 import { drawSelection, keymap } from '@codemirror/view'
 import { onMounted, toRef, useTemplateRef, type ComponentInstance } from 'vue'
 
-const { store: project, suggestionDb, module, graph } = useCurrentProject().storesRefs
+const { store: project, suggestionDb, module, graph } = useCurrentProject()
 
 const editorRoot = useTemplateRef<ComponentInstance<typeof CodeMirrorRoot>>('editorRoot')
 
diff --git a/app/gui/src/project-view/components/CodeEditor/CodeEditorTooltip.vue b/app/gui/src/project-view/components/CodeEditor/CodeEditorTooltip.vue
index e7862752041b..2f53319bda93 100644
--- a/app/gui/src/project-view/components/CodeEditor/CodeEditorTooltip.vue
+++ b/app/gui/src/project-view/components/CodeEditor/CodeEditorTooltip.vue
@@ -12,7 +12,7 @@ const { nodeId, syntax, graphDb, suggestionDbStore } = defineProps<{
   suggestionDbStore: SuggestionDbStore
 }>()
 
-const { names: projectNames } = useCurrentProject().storesRefs
+const { projectNames: projectNames } = useCurrentProject()
 
 const expressionInfo = computed(() => nodeId && graphDb.getExpressionInfo(nodeId))
 const typeName = computed(() => {
diff --git a/app/gui/src/project-view/components/ColorPickerMenu.vue b/app/gui/src/project-view/components/ColorPickerMenu.vue
index 09242aad119e..5ff9df632dd1 100644
--- a/app/gui/src/project-view/components/ColorPickerMenu.vue
+++ b/app/gui/src/project-view/components/ColorPickerMenu.vue
@@ -13,7 +13,7 @@ const emit = defineEmits<{
 
 const { getNodeColor, getNodeColors } = injectNodeColors()
 const selection = injectGraphSelection()
-const { module, graph } = useCurrentProject().storesRefs
+const { module, graph } = useCurrentProject()
 
 const displayedColors = new Set<string>(
   iter.filterDefined(iter.map(selection.selected, getNodeColor)),
diff --git a/app/gui/src/project-view/components/ComponentBrowser/input.ts b/app/gui/src/project-view/components/ComponentBrowser/input.ts
index 3034e5f91452..ce90227a0bd1 100644
--- a/app/gui/src/project-view/components/ComponentBrowser/input.ts
+++ b/app/gui/src/project-view/components/ComponentBrowser/input.ts
@@ -57,11 +57,8 @@ export type ComponentBrowserMode =
 
 /** Component Browser Input Data */
 export function useComponentBrowserInput(
-  graphDb: ToValue<GraphDb> = toRef(useCurrentProject().storesRefs.graph.value, 'db'),
-  suggestionDb: ToValue<SuggestionDb> = toRef(
-    useCurrentProject().storesRefs.suggestionDb.value,
-    'entries',
-  ),
+  graphDb: ToValue<GraphDb> = toRef(useCurrentProject().graph.value, 'db'),
+  suggestionDb: ToValue<SuggestionDb> = toRef(useCurrentProject().suggestionDb.value, 'entries'),
   ai: { query(query: string, sourcePort: string): Promise<Result<string>> } = useAI(),
 ) {
   const text = ref('')
diff --git a/app/gui/src/project-view/components/ComponentHelp.vue b/app/gui/src/project-view/components/ComponentHelp.vue
index 2e1467cd44bb..6b88e4b5fb42 100644
--- a/app/gui/src/project-view/components/ComponentHelp.vue
+++ b/app/gui/src/project-view/components/ComponentHelp.vue
@@ -24,7 +24,7 @@ import { computed, watch } from 'vue'
 const props = defineProps<{ selectedEntry: SuggestionId | undefined; aiMode?: boolean }>()
 const emit = defineEmits<{ 'update:selectedEntry': [value: SuggestionId | undefined] }>()
 
-const { suggestionDb: db, names: projectNames } = useCurrentProject().storesRefs
+const { suggestionDb: db, projectNames } = useCurrentProject()
 
 const documentation = computed<Docs>(() => {
   if (props.aiMode)
diff --git a/app/gui/src/project-view/components/DocumentationEditor/OpenedProjectDocumentationEditor.vue b/app/gui/src/project-view/components/DocumentationEditor/OpenedProjectDocumentationEditor.vue
index 153f10fa2ae9..bf99c58c170a 100644
--- a/app/gui/src/project-view/components/DocumentationEditor/OpenedProjectDocumentationEditor.vue
+++ b/app/gui/src/project-view/components/DocumentationEditor/OpenedProjectDocumentationEditor.vue
@@ -10,7 +10,7 @@ import { methodPointerEquals } from '@/util/methodPointer'
 import { ResultComponent } from '@/util/react'
 import { computed } from 'vue'
 
-const { store: project, graph } = useCurrentProject().storesRefs
+const { store: project, graph } = useCurrentProject()
 const projectId = computed(() => project.value.id)
 
 const currentMethodPointer = computed(() => unwrapOr(graph.value.currentMethod.pointer, undefined))
diff --git a/app/gui/src/project-view/components/FunctionSignatureEditor.vue b/app/gui/src/project-view/components/FunctionSignatureEditor.vue
index 2744e46b2b38..d7af78976918 100644
--- a/app/gui/src/project-view/components/FunctionSignatureEditor.vue
+++ b/app/gui/src/project-view/components/FunctionSignatureEditor.vue
@@ -32,7 +32,7 @@ const { functionAst, methodPointer } = defineProps<{
 const rootElement = useTemplateRef('rootElement')
 providePopoverRoot(rootElement)
 
-const { suggestionDb, module } = useCurrentProject().storesRefs
+const { suggestionDb, module } = useCurrentProject()
 
 const docsString = useYText(() => functionAst.mutableDocumentationMarkdown())
 
diff --git a/app/gui/src/project-view/components/GraphEditor.vue b/app/gui/src/project-view/components/GraphEditor.vue
index aadd485bc2f2..0a8d88f8d99f 100644
--- a/app/gui/src/project-view/components/GraphEditor.vue
+++ b/app/gui/src/project-view/components/GraphEditor.vue
@@ -81,7 +81,7 @@ const containerData = useContainerData()
 const projectStore = useProjectStore()
 const projectNames = useProjectNames()
 const graphStore = useGraphStore()
-const { module } = useCurrentProject().storesRefs
+const { module } = useCurrentProject()
 const widgetRegistry = useWidgetRegistry()
 const suggestionDb = useSuggestionDbStore()
 provideVisualizationStore(projectStore)
diff --git a/app/gui/src/project-view/components/GraphEditor/ComponentWidgetTree.vue b/app/gui/src/project-view/components/GraphEditor/ComponentWidgetTree.vue
index f663fd3858ff..d42c04055efd 100644
--- a/app/gui/src/project-view/components/GraphEditor/ComponentWidgetTree.vue
+++ b/app/gui/src/project-view/components/GraphEditor/ComponentWidgetTree.vue
@@ -31,7 +31,7 @@ const props = defineProps<{
   extended: boolean
 }>()
 
-const { module, graph } = useCurrentProject().storesRefs
+const { module, graph } = useCurrentProject()
 const selection = injectGraphSelection()
 
 const baseIcon = computed(() => iconOfNode(props.nodeId, graph.value.db))
diff --git a/app/gui/src/project-view/components/GraphEditor/CreateNodeFromPortButton.vue b/app/gui/src/project-view/components/GraphEditor/CreateNodeFromPortButton.vue
index 2bcf9483647f..c00cefd6ce6d 100644
--- a/app/gui/src/project-view/components/GraphEditor/CreateNodeFromPortButton.vue
+++ b/app/gui/src/project-view/components/GraphEditor/CreateNodeFromPortButton.vue
@@ -15,7 +15,7 @@ const emit = defineEmits<{
   newNodeClick: [portId: AstId, position: Vec2]
 }>()
 
-const { graph } = useCurrentProject().storesRefs
+const { graph } = useCurrentProject()
 const graphNavigator = injectGraphNavigator()
 
 const nodeRect = computed(() => graph.value?.nodeRects.get(nodeId))
diff --git a/app/gui/src/project-view/components/GraphEditor/GraphEdges.vue b/app/gui/src/project-view/components/GraphEditor/GraphEdges.vue
index 4fcd67d065a2..060fb327c078 100644
--- a/app/gui/src/project-view/components/GraphEditor/GraphEdges.vue
+++ b/app/gui/src/project-view/components/GraphEditor/GraphEdges.vue
@@ -19,12 +19,12 @@ import { useToast } from '@/util/toast'
 import { computed } from 'vue'
 
 const {
-  names: projectNames,
+  projectNames: projectNames,
   store: project,
   module,
   graph,
   suggestionDb,
-} = useCurrentProject().storesRefs
+} = useCurrentProject()
 const selection = injectGraphSelection(true)
 const interaction = injectInteractionHandler()
 const nodeSelection = injectGraphSelection(true)
diff --git a/app/gui/src/project-view/components/GraphEditor/GraphNode.vue b/app/gui/src/project-view/components/GraphEditor/GraphNode.vue
index e99c8eb0dcbc..cfbcd16fd488 100644
--- a/app/gui/src/project-view/components/GraphEditor/GraphNode.vue
+++ b/app/gui/src/project-view/components/GraphEditor/GraphNode.vue
@@ -80,7 +80,7 @@ const emit = defineEmits<{
 const nodeSelection = injectGraphSelection(true)
 const projectStore = useProjectStore()
 const graph = useGraphStore()
-const { module } = useCurrentProject().storesRefs
+const { module } = useCurrentProject()
 const navigator = injectGraphNavigator(true)
 const nodeExecution = useNodeExecution()
 
diff --git a/app/gui/src/project-view/components/GraphEditor/GraphNodeMessage.vue b/app/gui/src/project-view/components/GraphEditor/GraphNodeMessage.vue
index 4a49a8bfc8b8..313de0c9b818 100644
--- a/app/gui/src/project-view/components/GraphEditor/GraphNodeMessage.vue
+++ b/app/gui/src/project-view/components/GraphEditor/GraphNodeMessage.vue
@@ -7,7 +7,7 @@ import { Ok } from '@/util/data/result'
 import type { Icon } from '@/util/iconMetadata/iconName'
 import { ProjectPath } from '@/util/projectPath'
 
-const { names, module } = useCurrentProject().storesRefs
+const { projectNames: names, module } = useCurrentProject()
 
 const props = defineProps<{
   message: string
diff --git a/app/gui/src/project-view/components/GraphEditor/GraphNodeOutputPorts.vue b/app/gui/src/project-view/components/GraphEditor/GraphNodeOutputPorts.vue
index 22f5944a57be..c1c9cb60cbbc 100644
--- a/app/gui/src/project-view/components/GraphEditor/GraphNodeOutputPorts.vue
+++ b/app/gui/src/project-view/components/GraphEditor/GraphNodeOutputPorts.vue
@@ -30,7 +30,7 @@ const emit = defineEmits<{
   newNodeClick: [portId: AstId, position: Vec2]
 }>()
 
-const { graph } = useCurrentProject().storesRefs
+const { graph } = useCurrentProject()
 
 const nodeRect = computed(() => graph.value?.nodeRects.get(props.nodeId))
 const nodeHovered = computed(
diff --git a/app/gui/src/project-view/components/GraphEditor/nodesDragging.ts b/app/gui/src/project-view/components/GraphEditor/nodesDragging.ts
index 0d370f487d1d..bbd5ee3186f1 100644
--- a/app/gui/src/project-view/components/GraphEditor/nodesDragging.ts
+++ b/app/gui/src/project-view/components/GraphEditor/nodesDragging.ts
@@ -112,7 +112,7 @@ export class SnapGrid {
  * The `offset` is always based of the nodes' initial positions.
  */
 export function useNodesDragging() {
-  const { module, graph } = useCurrentProject().storesRefs
+  const { module, graph } = useCurrentProject()
   const selection = injectGraphSelection(true)
 
   // Logically, those fields could be inside CurrentDrag, but animations need component scope.
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetAnyToTarget.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetAnyToTarget.vue
index 45da8530a8be..be655eb5f349 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetAnyToTarget.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetAnyToTarget.vue
@@ -21,7 +21,7 @@ import { map } from 'enso-common/src/utilities/data/iter'
 import { computed } from 'vue'
 
 const props = defineProps(widgetProps(widgetDefinition))
-const { suggestionDb, names } = useCurrentProject().storesRefs
+const { suggestionDb, projectNames: names } = useCurrentProject()
 const { subjectInfo } = injectFunctionInfo()
 
 const sourceValueType = computed(() => {
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetApplication.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetApplication.vue
index 0ef31f9ca54a..1d84ce6719a3 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetApplication.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetApplication.vue
@@ -15,7 +15,7 @@ const props = defineProps(widgetProps(widgetDefinition))
 const tree = injectWidgetTree()
 
 const application = computed(() => props.input[ArgumentApplicationKey])
-const { module } = useCurrentProject().storesRefs
+const { module } = useCurrentProject()
 
 const targetMaybePort = computed(() => {
   const target = application.value.target
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetCheckbox.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetCheckbox.vue
index f9d238a5d0b4..ffb6d331acab 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetCheckbox.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetCheckbox.vue
@@ -17,7 +17,7 @@ import type { Identifier, QualifiedName } from '@/util/qualifiedName'
 import { computed } from 'vue'
 
 const props = defineProps(widgetProps(widgetDefinition))
-const { suggestionDb, module } = useCurrentProject().storesRefs
+const { suggestionDb, module } = useCurrentProject()
 
 const trueImport = computed(() =>
   requiredImportsByProjectPath(
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser.vue
index 5482dea8d15c..ecee81dd6f00 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFileBrowser.vue
@@ -27,7 +27,7 @@ import { ArgumentInfoKey } from '@/util/callTree'
 import { computed } from 'vue'
 
 const props = defineProps(widgetProps(widgetDefinition))
-const { suggestionDb, module, graph } = useCurrentProject().storesRefs
+const { suggestionDb, module, graph } = useCurrentProject()
 
 const reprType = computed(() => props.input[ArgumentInfoKey]?.info?.reprType)
 
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction.vue
index 9967e1e09234..556ece541390 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useCurrentProject } from '$/components/WithCurrentProject.vue'
+import { useCurrentProject, useProjectStore } from '$/components/WithCurrentProject.vue'
 import type { MethodCallInfo } from '$/providers/openedProjects/graph/graphDatabase'
 import {
   Score,
@@ -30,7 +30,8 @@ import { computed } from 'vue'
 import { Err, Ok } from 'ydoc-shared/util/data/result'
 
 const props = defineProps(widgetProps(widgetDefinition))
-const { names: projectNames, store: project, module, graph } = useCurrentProject().storesRefs
+const { projectNames: projectNames, module, graph } = useCurrentProject()
+const project = useProjectStore()
 
 const exprInfo = computed(() => graph.value.db.getExpressionInfo(props.input.value.externalId))
 const outputType = computed(() => exprInfo.value?.typeInfo?.primaryType)
@@ -89,7 +90,7 @@ function handleArgUpdate(update: WidgetUpdate): HandledUpdate {
       directInteraction,
     } = update
 
-    const f = (edit: Ast.MutableModule) => {
+    const applyInEdit = (edit: Ast.MutableModule) => {
       // Find the updated argument by matching origin port/expression with the appropriate argument.
       // We are interested only in updates at the top level of the argument AST. Updates from nested
       // widgets do not need to be processed at the function application level.
@@ -212,8 +213,8 @@ function handleArgUpdate(update: WidgetUpdate): HandledUpdate {
       }
       return Err('Unknown case for updating argument')
     }
-    if (update.edit) f(update.edit)
-    else module.value.edit(f)
+    if (update.edit) applyInEdit(update.edit)
+    else module.value.edit(applyInEdit)
   }
   // Any other case is handled by the default handler.
   return props.updateCallback(update)
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction/widgetFunctionCallInfo.ts b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction/widgetFunctionCallInfo.ts
index 758a8c45a38c..5bd3d58aa158 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction/widgetFunctionCallInfo.ts
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunction/widgetFunctionCallInfo.ts
@@ -38,7 +38,8 @@ export const WIDGETS_ENSO_PATH = ProjectPath.create(
 export function useWidgetFunctionCallInfo(
   input: ToValue<WidgetInput & { value: Ast.Expression }>,
   graphDb: ToValue<GraphDb>,
-  project: ToValue<Pick<ProjectStore, 'useVisualizationData' | 'moduleProjectPath'>>,
+  // Cannot be ToValue - see TODO next to visualizationData
+  project: Pick<ProjectStore, 'useVisualizationData' | 'moduleProjectPath'>,
   projectNames: ToValue<ProjectNameStore>,
 ) {
   const methodCallInfo = computed(() =>
@@ -117,10 +118,9 @@ export function useWidgetFunctionCallInfo(
     ]
 
     let modulePath: ProjectPath = WIDGETS_ENSO_PATH
-    const projectValue = toValue(project)
     const projectNamesValue = toValue(projectNames)
-    if (projectValue.moduleProjectPath?.ok) {
-      modulePath = projectValue.moduleProjectPath.value
+    if (project.moduleProjectPath?.ok) {
+      modulePath = project.moduleProjectPath.value
     }
     const moduleFqn = projectNamesValue.serializeProjectPathForBackend(modulePath)
 
@@ -172,8 +172,9 @@ export function useWidgetFunctionCallInfo(
     return undefined
   })
 
-  // TODO[ao]:
-  const visualizationData = toValue(project).useVisualizationData(visualizationConfig)
+  // TODO[ao]: This does not work with project change. Either useVisualizationData API must
+  //  change, or useCurrentRef should not return ref.
+  const visualizationData = project.useVisualizationData(visualizationConfig)
 
   const widgetConfiguration = computed(() => {
     const data = visualizationData.value
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunctionDef/ArgumentRow.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunctionDef/ArgumentRow.vue
index 5dd41a29d838..e8cb70b7613f 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunctionDef/ArgumentRow.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetFunctionDef/ArgumentRow.vue
@@ -40,7 +40,7 @@ const emit = defineEmits<{
   updateDefault: [value: Ast.Owned<Ast.MutableExpression> | undefined]
 }>()
 type TreeProps = ComponentProps<typeof WidgetTreeRoot>
-const openedProject = useCurrentProject().ref
+const openedProject = useCurrentProject()
 
 function defaultWidget(ast: Ast.Token | Ast.Ast): TreeProps {
   return { input: WidgetInput.FromAst(ast), updateCallback }
@@ -101,11 +101,11 @@ function resolveType(typeExpr: Ast.Ast) {
   const tyCode = typeExpr.code()
   // Hack: We have to resolve the fully qualified type name ourselves based on present imports.
   // To avoid implementing that for now, we only look up types selectable from dropdown.
-  const matchingTypeEntry = openedProject.value?.suggestionDb.entries.selectableTypes.value.find(
+  const matchingTypeEntry = openedProject.suggestionDb.value.entries.selectableTypes.value.find(
     (ty) => ty.name === tyCode,
   )
   return matchingTypeEntry ?
-      openedProject.value?.names.printProjectPath(matchingTypeEntry.definitionPath)
+      openedProject.projectNames.value.printProjectPath(matchingTypeEntry.definitionPath)
     : undefined
 }
 
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetMultiSelection.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetMultiSelection.vue
index 29e6bf847b62..4b94e1100d07 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetMultiSelection.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetMultiSelection.vue
@@ -27,11 +27,7 @@ import { ArgumentInfoKey } from '@/util/callTree'
 import { computed, ref, toRef, useTemplateRef } from 'vue'
 
 const props = defineProps(widgetProps(widgetDefinition))
-const {
-  module,
-  names: projectNames,
-  suggestionDb: suggestionDbStore,
-} = useCurrentProject().storesRefs
+const { module, projectNames: projectNames, suggestionDb: suggestionDbStore } = useCurrentProject()
 
 const tree = injectWidgetTree()
 
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelection.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelection.vue
index ded06de53bb5..419beeb5d8dd 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelection.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetSelection.vue
@@ -38,11 +38,7 @@ import type { ToValue } from '@/util/reactivity'
 import { computed, ref, shallowRef, toRef, toValue, useTemplateRef, type VNode } from 'vue'
 
 const props = defineProps(widgetProps(widgetDefinition))
-const {
-  module,
-  names: projectNames,
-  suggestionDb: suggestionDbStore,
-} = useCurrentProject().storesRefs
+const { module, projectNames: projectNames, suggestionDb: suggestionDbStore } = useCurrentProject()
 
 const tree = injectWidgetTree()
 
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor.vue
index af3c96985419..bcb739f5415f 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetTableEditor.vue
@@ -32,7 +32,7 @@ import TableHeader, { type HeaderParams } from './WidgetTableEditor/TableHeader.
 import { useTableEditHandler } from './WidgetTableEditor/editHandler'
 
 const props = defineProps(widgetProps(widgetDefinition))
-const { suggestionDb, module } = useCurrentProject().storesRefs
+const { suggestionDb, module } = useCurrentProject()
 const grid = ref<
   ComponentInstance<typeof AgGridTableView<RowData, any>> &
     ComponentExposed<typeof AgGridTableView<RowData, any>>
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetText.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetText.vue
index 089fa27520b9..07cb19f3a4fe 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetText.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetText.vue
@@ -16,7 +16,7 @@ import { Ok } from 'ydoc-shared/util/data/result'
 
 const baseEditor = useTemplateRef('baseEditor')
 const props = defineProps(widgetProps(widgetDefinition))
-const currentProject = useCurrentProject().ref
+const { module } = useCurrentProject()
 
 function focusAndSelect() {
   baseEditor.value?.focusAndSelect()
@@ -26,9 +26,7 @@ const textContents = computed(() =>
   props.input.value instanceof Ast.TextLiteral ? props.input.value.rawTextContent : '',
 )
 function acceptValue(text: string): HandledUpdate {
-  const module = currentProject.value.module
-
-  return module.edit((edit) => {
+  return module.value.edit((edit) => {
     if (props.input.value instanceof Ast.TextLiteral) {
       const value = edit.getVersion(props.input.value)
       if (value.rawTextContent === text) return Ok()
diff --git a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetVector.vue b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetVector.vue
index 90e5b1f33ca9..f290bbaf0b92 100644
--- a/app/gui/src/project-view/components/GraphEditor/widgets/WidgetVector.vue
+++ b/app/gui/src/project-view/components/GraphEditor/widgets/WidgetVector.vue
@@ -17,11 +17,11 @@ import { computed, shallowRef, toRef, toValue, watchEffect, type WatchSource } f
 import { isAstId, MutableModule } from 'ydoc-shared/ast'
 
 const props = defineProps(widgetProps(widgetDefinition))
-const project = useCurrentProject().ref
+const project = useCurrentProject()
 const tree = injectWidgetTree()
 
 function doEdit(editFn: (ast: Ast.MutableVector) => void) {
-  project.value.module.edit((edit) => {
+  project.module.value.edit((edit) => {
     if (props.input.value instanceof Ast.Vector) {
       editFn(edit.getVersion(props.input.value))
       return props.updateCallback({ edit, directInteraction: true })
diff --git a/app/gui/src/providers/openedProjects.ts b/app/gui/src/providers/openedProjects.ts
index 02ed6683f5e6..8cf6ddb25a30 100644
--- a/app/gui/src/providers/openedProjects.ts
+++ b/app/gui/src/providers/openedProjects.ts
@@ -19,7 +19,7 @@ import { type LsUrls } from './openedProjects/project/project'
 /** All stores of a single opened project */
 export interface OpenedProject {
   store: ProjectStore
-  names: ProjectNameStore
+  projectNames: ProjectNameStore
   suggestionDb: SuggestionDbStore
   module: ModuleStore
   graph: GraphStore
@@ -86,7 +86,7 @@ export const [provideOpenedProjects, injectOpenedProjects] = createContextStore(
         const graph = createGraphStore(store, suggestionDb, names, module)
         const widgetRegistry = new WidgetRegistry(graph.db)
         projects.set(toValue(projectId), {
-          names,
+          projectNames: names,
           store,
           module,
           suggestionDb,
diff --git a/app/gui/src/providers/openedProjects/graph/graph.ts b/app/gui/src/providers/openedProjects/graph/graph.ts
index ab2d4b507c6b..62d1844c9f51 100644
--- a/app/gui/src/providers/openedProjects/graph/graph.ts
+++ b/app/gui/src/providers/openedProjects/graph/graph.ts
@@ -126,10 +126,12 @@ function useAssociatedValue<K extends string, V>({
   return values
 }
 
-export type GraphStore = ReturnType<typeof createGraphStore>
 /**
  * A store containing state of currently displayed graph.
  */
+export type GraphStore = ReturnType<typeof createGraphStore>
+
+/** Constructor of {@link GraphStore} */
 export function createGraphStore(
   proj: ProjectStore,
   suggestionDb: SuggestionDbStore,
diff --git a/app/gui/src/providers/openedProjects/module/module.ts b/app/gui/src/providers/openedProjects/module/module.ts
index d52fc777055a..f30a3d45aa28 100644
--- a/app/gui/src/providers/openedProjects/module/module.ts
+++ b/app/gui/src/providers/openedProjects/module/module.ts
@@ -22,11 +22,15 @@ import {
   type RequiredImport,
 } from './imports'
 
-export type ModuleStore = ReturnType<typeof createModuleStore>
-
 /**
+ * Module Store
  *
+ * This store keeps the module AST and provides methods for analyzing and modifying it from
+ * "code" perspective. It does not manage graph's nodes and connections, although it exposes
+ * API for node and widgets metadata, as it is defined at AST level.
  */
+export type ModuleStore = ReturnType<typeof createModuleStore>
+
 export function createModuleStore(
   proj: ProjectStore,
   projectNames: ProjectNameStore,
@@ -205,7 +209,7 @@ export function createModuleStore(
 
     const importsToAdd = filterOutRedundantImports(existingImports_, imports)
     if (!importsToAdd.length) return
-    addImports(edit.getVersion(topLevel), importsToAdd, projectNames)
+    addImports(topLevel, importsToAdd, projectNames)
   }
 
   function onBeforeEdit(f: (transaction: Y.Transaction) => void): { unregister: () => void } {
@@ -225,6 +229,5 @@ export function createModuleStore(
     mutableNodeMetadata,
     setWidgetMetadata,
     addMissingImports,
-    addMissingImportsDisregardConflicts,
   })
 }
diff --git a/app/gui/src/providers/openedProjects/widgetRegistry/widgetRegistry.ts b/app/gui/src/providers/openedProjects/widgetRegistry/widgetRegistry.ts
index 557a30cd5770..d3fa42b258dc 100644
--- a/app/gui/src/providers/openedProjects/widgetRegistry/widgetRegistry.ts
+++ b/app/gui/src/providers/openedProjects/widgetRegistry/widgetRegistry.ts
@@ -271,7 +271,7 @@ export function applyWidgetUpdates(update: WidgetUpdate, module: ModuleStore) {
       return invalidOriginErr(origin)
     }
   } else {
-    const f = (edit: Ast.MutableModule) => {
+    const applyInEdit = (edit: Ast.MutableModule) => {
       if (update.portUpdate) {
         const { origin } = update.portUpdate
         if (Ast.isAstId(origin)) {
@@ -298,8 +298,8 @@ export function applyWidgetUpdates(update: WidgetUpdate, module: ModuleStore) {
       } else return Ok()
     }
 
-    if (update.edit) return f(update.edit)
-    else return module.edit(f)
+    if (update.edit) return applyInEdit(update.edit)
+    else return module.edit(applyInEdit)
   }
 }
 
diff --git a/app/ydoc-shared/src/ast/mutableModule.ts b/app/ydoc-shared/src/ast/mutableModule.ts
index 0bdb5be431d7..3f003e0010eb 100644
--- a/app/ydoc-shared/src/ast/mutableModule.ts
+++ b/app/ydoc-shared/src/ast/mutableModule.ts
@@ -213,14 +213,8 @@ export class MutableModule implements Module {
   private attachObserver() {
     if (this.yjsObserver) return
     this.yjsObserver = (events: Y.YEvent<any>[], transaction: Y.Transaction) => {
-      try {
-        const update = this.observeEvents(events, tryAsOrigin(transaction.origin))
-        for (const observer of this.updateObservers ?? []) observer(update)
-      } catch (err) {
-        console.error('AST observer caught an exception', err)
-        // We drop the exception here, because otherwise we may land with partially updated YDoc
-        // what may produce more confusing bugs.
-      }
+      const update = this.observeEvents(events, tryAsOrigin(transaction.origin))
+      for (const observer of this.updateObservers ?? []) observer(update)
     }
     this.nodes.observeDeep(this.yjsObserver)
   }

From f2a6be46b85eb361d8bfac7fab11ea6d2f86d9b0 Mon Sep 17 00:00:00 2001
From: Adam Obuchowicz <adam.obuchowicz@enso.org>
Date: Thu, 9 Oct 2025 10:42:39 +0200
Subject: [PATCH 17/17] Fix and docs

---
 app/gui/src/components/WithCurrentProject.vue                 | 2 +-
 .../src/project-view/components/GraphEditor/NodeWidget.vue    | 2 +-
 app/gui/src/project-view/providers/asyncResources/context.ts  | 4 ++--
 app/gui/src/providers/openedProjects/module/module.ts         | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/gui/src/components/WithCurrentProject.vue b/app/gui/src/components/WithCurrentProject.vue
index 9fedf0534392..d39c820c6d6d 100644
--- a/app/gui/src/components/WithCurrentProject.vue
+++ b/app/gui/src/components/WithCurrentProject.vue
@@ -97,7 +97,7 @@ function useStoreTemplate<K extends keyof OpenedProject>(
 export const useProjectStore = useStoreTemplate('store')
 
 /** @deprecated it expects the current project will not change. Use {@link useCurrentProject} instead. */
-export const useProjectNames = useStoreTemplate('names')
+export const useProjectNames = useStoreTemplate('projectNames')
 
 /** @deprecated it expects the current project will not change. Use {@link useCurrentProject} instead. */
 export const useSuggestionDbStore = useStoreTemplate('suggestionDb')
diff --git a/app/gui/src/project-view/components/GraphEditor/NodeWidget.vue b/app/gui/src/project-view/components/GraphEditor/NodeWidget.vue
index 4e24b5f1d2e9..47035a4882c8 100644
--- a/app/gui/src/project-view/components/GraphEditor/NodeWidget.vue
+++ b/app/gui/src/project-view/components/GraphEditor/NodeWidget.vue
@@ -40,7 +40,7 @@ const nesting = computed(() => (parentUsageInfo?.nesting ?? 0) + (props.nest ===
 
 const selectedWidget = shallowRef<WidgetModule<WidgetInput> | undefined>()
 const updateSelection = withCtx(() => {
-  const registry = currentProject.ref.value?.widgetRegistry
+  const registry = currentProject.widgetRegistry.value
   selectedWidget.value = registry?.select(
     {
       input: props.input,
diff --git a/app/gui/src/project-view/providers/asyncResources/context.ts b/app/gui/src/project-view/providers/asyncResources/context.ts
index 077f4a9d2181..d527e8fa59ad 100644
--- a/app/gui/src/project-view/providers/asyncResources/context.ts
+++ b/app/gui/src/project-view/providers/asyncResources/context.ts
@@ -40,9 +40,9 @@ export function useCurrentProjectResourceContext(): ResourceContext {
   const currentProject = useCurrentProject(true)
   if (currentProject != null) {
     return {
-      project: () => currentProject.ref.value.store.id,
+      project: () => currentProject.store.value.id,
       basePathSegments: () => {
-        const fileName = currentProject.ref.value.store.observedFileName
+        const fileName = currentProject.store.value.observedFileName
         if (fileName) return ['src', ...fileName.split('/')]
       },
     }
diff --git a/app/gui/src/providers/openedProjects/module/module.ts b/app/gui/src/providers/openedProjects/module/module.ts
index f30a3d45aa28..de206732cd58 100644
--- a/app/gui/src/providers/openedProjects/module/module.ts
+++ b/app/gui/src/providers/openedProjects/module/module.ts
@@ -31,6 +31,7 @@ import {
  */
 export type ModuleStore = ReturnType<typeof createModuleStore>
 
+/** Constructor of {@link ModuleStore} */
 export function createModuleStore(
   proj: ProjectStore,
   projectNames: ProjectNameStore,