Revert "Move responsibility of disk watching for active editor into KclManager, don't watch while writing (#10305)"

This reverts commit 7ac36d3.

Author: franknoirot

e2e/playwright/debug-pane.spec.ts

@@ -52,7 +52,6 @@ test.describe('Debug pane', { tag: '@desktop' }, () => {
         await page.keyboard.press('ArrowDown')
       }
     })
-    let lastSegmentText = await segment.innerText()
     // TODO: if you type all the code at once without delay (or paste it in)
     // the initial segment artifact ID is different. This appears to be niche bug
     // that is being sidestepped in this test until https://github.com/KittyCAD/modeling-app/issues/9609 is addressed.
@@ -61,23 +60,20 @@ test.describe('Debug pane', { tag: '@desktop' }, () => {
       // Wait for keyboard input debounce and updated artifact graph.
       await page.waitForTimeout(1000)
     })
-    await expect(segment).not.toHaveText(lastSegmentText)
+    // Extract the artifact IDs from the debug artifact graph.
+    const initialSegmentIds = await segment.innerText({ timeout: 5_000 })
     // The artifact ID should include a UUID.
-    const uuidRegexp =
+    expect(initialSegmentIds).toMatch(
       /[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/
-    await expect(segment).toHaveText(uuidRegexp)
-    const uuid = (await segment.innerText()).match(uuidRegexp)!
-
-    await test.step('Enter another line', async () => {
-      lastSegmentText = await segment.innerText()
+    )
+    await test.step('Enter a comment', async () => {
       await page.keyboard.type('\n|> line(end = [2, 2])', { delay: 10 })
       // Wait for keyboard input debounce and updated artifact graph.
       await page.waitForTimeout(1000)
     })
-
-    // Expect the artifact IDs to be changed (by adding another),
-    await expect(segment).not.toHaveText(lastSegmentText)
-    // but still contain the stable first ID.
-    await expect(segment).toContainText(uuid)
+    const newSegmentIds = await segment.innerText()
+    // Strip off the closing bracket.
+    const initialIds = initialSegmentIds.slice(0, initialSegmentIds.length - 1)
+    expect(newSegmentIds.slice(0, initialIds.length)).toEqual(initialIds)
   })
 })

src/components/CommandBar/CommandBarSelectionMixedInput.spec.tsx

@@ -55,11 +55,10 @@ describe('CommandBarSelectionMixedInput', () => {
   describe('clearSelectionFirst behavior', () => {
     it('should send clear selection command when clearSelectionFirst is true', async () => {
       const app = App.getDefaultSystems()
-      const executingEditor = new KclManager('some-path', {
+      const executingEditor = new KclManager({
         commandBar: app.commands.actor,
         settings: app.settings.actor,
         wasmInstancePromise: app.wasmPromise,
-        projectPath: 'some-project',
       })
       const mockModelingSend = vi.spyOn(
         executingEditor.engineCommandManager,
@@ -86,11 +85,10 @@ describe('CommandBarSelectionMixedInput', () => {
 
     it('should NOT send clear selection command when clearSelectionFirst is false', async () => {
       const app = App.getDefaultSystems()
-      const executingEditor = new KclManager('some-path', {
+      const executingEditor = new KclManager({
         commandBar: app.commands.actor,
         settings: app.settings.actor,
         wasmInstancePromise: app.wasmPromise,
-        projectPath: 'some-project',
       })
       const mockModelingSend = vi.spyOn(
         executingEditor.engineCommandManager,
@@ -114,11 +112,10 @@ describe('CommandBarSelectionMixedInput', () => {
 
     it('should NOT send clear selection command when clearSelectionFirst is undefined', async () => {
       const app = App.getDefaultSystems()
-      const executingEditor = new KclManager('some-path', {
+      const executingEditor = new KclManager({
         commandBar: app.commands.actor,
         settings: app.settings.actor,
         wasmInstancePromise: app.wasmPromise,
-        projectPath: 'some-project',
       })
       const mockModelingSend = vi.spyOn(
         executingEditor.engineCommandManager,
@@ -142,11 +139,10 @@ describe('CommandBarSelectionMixedInput', () => {
 
     it('should send clear selection command only once on mount', async () => {
       const app = App.getDefaultSystems()
-      const executingEditor = new KclManager('some-path', {
+      const executingEditor = new KclManager({
         commandBar: app.commands.actor,
         settings: app.settings.actor,
         wasmInstancePromise: app.wasmPromise,
-        projectPath: 'some-project',
       })
       const mockModelingSend = vi.spyOn(
         executingEditor.engineCommandManager,
@@ -185,11 +181,10 @@ describe('CommandBarSelectionMixedInput', () => {
 
     it('should set hasClearedSelection state after clearing', async () => {
       const app = App.getDefaultSystems()
-      const executingEditor = new KclManager('some-path', {
+      const executingEditor = new KclManager({
         commandBar: app.commands.actor,
         settings: app.settings.actor,
         wasmInstancePromise: app.wasmPromise,
-        projectPath: 'some-project',
       })
       const mockModelingSend = vi.spyOn(
         executingEditor.engineCommandManager,

src/components/RouteProvider.tsx

@@ -1,7 +1,10 @@
+import { isCodeTheSame } from '@src/lib/codeEditor'
 import fsZds from '@src/lib/fs-zds'
 import type { ReactNode } from 'react'
 import { createContext, useEffect, useState } from 'react'
 import { useLocation, useNavigate, useNavigation } from 'react-router-dom'
+import toast from 'react-hot-toast'
+
 import { useAuthNavigation } from '@src/hooks/useAuthNavigation'
 import { useFileSystemWatcher } from '@src/hooks/useFileSystemWatcher'
 import { getAppSettingsFilePath } from '@src/lib/desktop'
@@ -72,10 +75,35 @@ export function RouteProvider({ children }: { children: ReactNode }) {
       // is very high in the context tree, higher than mlEphant's.
       if (kclManager.mlEphantManagerMachineBulkManipulatingFileSystem) return
 
-      // We only react on files other than the currently-executing one here
-      // because the currently-executing one is handled with its own watcher in
-      // KclManager. In future, all files and folders will watch themselves.
-      if (loadedFile?.path !== path) {
+      const isCurrentFile = loadedFile?.path === path
+      if (isCurrentFile) {
+        if (window.electron) {
+          // Your current file is changed, read it from disk and write it into the code manager and execute the AST,
+          // unless the change was initiated by us (the currently running instance).
+          const code = await window.electron.readFile(path, {
+            encoding: 'utf-8',
+          })
+
+          const lastWrittenCode = kclManager.lastWrite?.code
+          if (!lastWrittenCode || !isCodeTheSame(lastWrittenCode, code)) {
+            const isInSketchMode =
+              kclManager.modelingState?.matches('Sketch') ||
+              kclManager.modelingState?.matches('sketchSolveMode')
+
+            // Nothing written out yet by ourselves, or it's not the same as the current file content
+            // -> this must be an external change -> re-execute.
+            kclManager.updateCodeEditor(code, {
+              shouldExecute: !isInSketchMode,
+              shouldResetCamera: !isInSketchMode,
+              // We explicitly do not write to the file here since we are loading from
+              // the file system and not the editor.
+              shouldWriteToDisk: false,
+            })
+
+            toast('Reloading file from disk', { icon: '📁' })
+          }
+        }
+      } else {
         const fileNameWithExtension = getStringAfterLastSeparator(path)
         // Is the file from the change event type imported into the currently opened file
         const isImportedInCurrentFile = kclManager.ast.body.some(