fix(editor): a file from a server no longer reloads once after each restart

config/renderer-layout-writer-baseline.txt

@@ -45,7 +45,6 @@
 2 src/renderer/src/runtime/web-session-tabs-sync/apply-preparation-groups.ts
 5 src/renderer/src/runtime/web-session-tabs-sync/apply-terminal-records.ts
 4 src/renderer/src/runtime/web-session-tabs-sync/apply-worktree-records.ts
-1 src/renderer/src/runtime/web-session-tabs-sync/mirrored-editor-file-identity.ts
 2 src/renderer/src/runtime/web-session-tabs-sync/session-tabs-inventory-absence.ts
 1 src/renderer/src/runtime/web-session-terminal-orphan-recovery-surface.ts
 2 src/renderer/src/runtime/web-session-terminal-orphan-topology.ts

src/renderer/src/components/editor/EditorConflictReviewSurface.tsx

@@ -1,4 +1,5 @@
 import React from 'react'
+import { conflictOverviewFileId } from '@/store/slices/editor/file-ids/editor-file-ids'
 import { detectLanguage } from '@/lib/language-detect'
 import { joinPath } from '@/lib/path'
 import { useAppStore } from '@/store'
@@ -82,7 +83,7 @@ export function EditorConflictReviewSurface({
         : undefined
 
     return {
-      id: absolutePath,
+      id: conflictOverviewFileId(openFiles, activeFile.worktreeId, absolutePath),
       filePath: absolutePath,
       relativePath: entry.path,
       worktreeId: activeFile.worktreeId,

src/renderer/src/components/editor/editor-autosave-controller.test.ts

@@ -324,15 +324,15 @@ describe('attachEditorAutosaveController', () => {
         } as never
       ]
     })
-    store.getState().openFile({
+    const fileId = store.getState().openFile({
       filePath: '/runtime/folder/src/file.ts',
       relativePath: 'src/file.ts',
       worktreeId: workspaceKey,
       language: 'typescript',
       mode: 'edit'
     })
-    store.getState().setEditorDraft('/runtime/folder/src/file.ts', 'edited')
-    store.getState().markFileDirty('/runtime/folder/src/file.ts', true)
+    store.getState().setEditorDraft(fileId, 'edited')
+    store.getState().markFileDirty(fileId, true)
 
     const cleanup = attachEditorAutosaveController(withLoadedBaselines(store))
     try {
@@ -397,16 +397,16 @@ describe('attachEditorAutosaveController', () => {
         'repo-1': [{ id: 'wt-1', repoId: 'repo-1', path: '/remote/repo' }] as never
       }
     })
-    store.getState().openFile({
+    const fileId = store.getState().openFile({
       filePath: '/remote/repo/file.ts',
       relativePath: 'file.ts',
       worktreeId: 'wt-1',
       runtimeEnvironmentId: 'env-1',
       language: 'typescript',
       mode: 'edit'
     })
-    store.getState().setEditorDraft('/remote/repo/file.ts', 'edited')
-    store.getState().markFileDirty('/remote/repo/file.ts', true)
+    store.getState().setEditorDraft(fileId, 'edited')
+    store.getState().markFileDirty(fileId, true)
 
     const cleanup = attachEditorAutosaveController(withLoadedBaselines(store))
     try {

src/renderer/src/components/editor/editor-panel-draft-selector.test.ts

@@ -23,7 +23,9 @@ describe('createEditorPanelDraftSelector', () => {
     let scopedInvalidations = 0
     let unrelatedPanelInvalidations = 0
     const selectors = files.map(createEditorPanelDraftSelector)
-    const previousSelections = selectors.map((selector) => selector({ editorDrafts }))
+    const previousSelections = selectors.map((selector) =>
+      selector({ editorDrafts, openFiles: [] })
+    )
 
     for (let edit = 0; edit < 200; edit += 1) {
       const previousDrafts = editorDrafts
@@ -32,7 +34,7 @@ describe('createEditorPanelDraftSelector', () => {
         if (previousDrafts !== editorDrafts) {
           wholeMapInvalidations += 1
         }
-        const nextSelection = selectors[panelIndex]({ editorDrafts })
+        const nextSelection = selectors[panelIndex]({ editorDrafts, openFiles: [] })
         if (previousSelections[panelIndex] !== nextSelection) {
           scopedInvalidations += 1
           if (panelIndex !== 0) {
@@ -65,15 +67,15 @@ describe('createEditorPanelDraftSelector', () => {
     const selectConflictDrafts = createEditorPanelDraftSelector(conflictReview)
     const selectNoDrafts = createEditorPanelDraftSelector(null)
 
-    expect(selectPreviewDrafts({ editorDrafts })).toEqual({
+    expect(selectPreviewDrafts({ editorDrafts, openFiles: [] })).toEqual({
       preview: 'preview draft',
       source: ''
     })
-    expect(selectConflictDrafts({ editorDrafts })).toEqual({
+    expect(selectConflictDrafts({ editorDrafts, openFiles: [] })).toEqual({
       review: 'review draft',
       selected: 'selected draft'
     })
-    expect(selectNoDrafts({ editorDrafts })).toEqual({})
+    expect(selectNoDrafts({ editorDrafts, openFiles: [] })).toEqual({})
   })
 
   it('includes overview conflict drafts and ignores unrelated draft replacements', () => {
@@ -96,14 +98,39 @@ describe('createEditorPanelDraftSelector', () => {
       unrelated: 'other draft'
     }
 
-    const selection = selectDrafts({ editorDrafts })
+    const selection = selectDrafts({ editorDrafts, openFiles: [] })
     expect(selection).toEqual({
       'C:\\repo\\src\\a.ts': 'draft a',
       'C:\\repo\\src\\b.ts': ''
     })
 
     expect(
-      selectDrafts({ editorDrafts: { ...editorDrafts, unrelated: 'changed elsewhere' } })
+      selectDrafts({
+        editorDrafts: { ...editorDrafts, unrelated: 'changed elsewhere' },
+        openFiles: []
+      })
     ).toBe(selection)
   })
+
+  it("shows an overview file open in a server tab under that tab's id, with its unsaved edits", () => {
+    const conflictReview = makeFile('review', {
+      filePath: '/repo',
+      mode: 'conflict-review',
+      conflictReview: {
+        source: 'live-summary',
+        snapshotTimestamp: 1,
+        entries: [{ path: 'src/a.ts', conflictKind: 'both_modified' }]
+      }
+    })
+    const serverFile = makeFile('editor:worktree-1:env-1:%2Frepo%2Fsrc%2Fa.ts', {
+      filePath: '/repo/src/a.ts',
+      relativePath: 'src/a.ts',
+      runtimeEnvironmentId: 'env-1'
+    })
+    const selectDrafts = createEditorPanelDraftSelector(conflictReview)
+
+    expect(
+      selectDrafts({ editorDrafts: { [serverFile.id]: 'unsaved' }, openFiles: [serverFile] })
+    ).toEqual({ [serverFile.id]: 'unsaved' })
+  })
 })

src/renderer/src/components/editor/editor-panel-draft-selector.ts

@@ -1,8 +1,9 @@
 import type { AppState } from '@/store'
 import { joinPath } from '@/lib/path'
 import type { OpenFile } from '@/store/slices/editor'
+import { conflictOverviewFileId } from '@/store/slices/editor/file-ids/editor-file-ids'
 
-type EditorDraftState = Pick<AppState, 'editorDrafts'>
+type EditorDraftState = Pick<AppState, 'editorDrafts' | 'openFiles'>
 type EditorPanelDraftSelector = (state: EditorDraftState) => Record<string, string>
 
 const EMPTY_EDITOR_PANEL_DRAFTS = Object.freeze({}) as Record<string, string>
@@ -13,21 +14,30 @@ export function createEditorPanelDraftSelector(
   // Why: previews and conflict review can render a related file, but drafts
   // from every other panel must not wake this editor on each keystroke.
   const fileIds = activeFile
-    ? Array.from(
-        new Set(
-          [
-            activeFile.id,
-            activeFile.markdownPreviewSourceFileId,
-            activeFile.conflictReview?.selectedFileId,
-            ...(activeFile.mode === 'conflict-review' && !activeFile.conflictReview?.selectedFileId
-              ? (activeFile.conflictReview?.entries ?? []).map((entry) =>
-                  joinPath(activeFile.filePath, entry.path)
-                )
-              : [])
-          ].filter((fileId): fileId is string => Boolean(fileId))
-        )
-      )
+    ? [
+        activeFile.id,
+        activeFile.markdownPreviewSourceFileId,
+        activeFile.conflictReview?.selectedFileId
+      ].filter((fileId): fileId is string => Boolean(fileId))
     : []
+  const overviewPaths =
+    activeFile?.mode === 'conflict-review' && !activeFile.conflictReview?.selectedFileId
+      ? (activeFile.conflictReview?.entries ?? []).map((entry) =>
+          joinPath(activeFile.filePath, entry.path)
+        )
+      : []
+  // Why: an overview file open in a tab shows under that tab's id (a server file's is not its path).
+  const selectedFileIds = (state: EditorDraftState): string[] =>
+    overviewPaths.length === 0 || !activeFile
+      ? fileIds
+      : Array.from(
+          new Set([
+            ...fileIds,
+            ...overviewPaths.map((path) =>
+              conflictOverviewFileId(state.openFiles, activeFile.worktreeId, path)
+            )
+          ])
+        )
   let previousDrafts: AppState['editorDrafts'] | null = null
   let previousSelection = EMPTY_EDITOR_PANEL_DRAFTS
 
@@ -39,7 +49,8 @@ export function createEditorPanelDraftSelector(
     }
     previousDrafts = state.editorDrafts
 
-    const changed = fileIds.some((fileId) => {
+    const ids = selectedFileIds(state)
+    const changed = ids.some((fileId) => {
       const draft = state.editorDrafts[fileId]
       return (
         draft !== previousSelection[fileId] ||
@@ -51,7 +62,7 @@ export function createEditorPanelDraftSelector(
     }
 
     const nextSelection: Record<string, string> = {}
-    for (const fileId of fileIds) {
+    for (const fileId of ids) {
       const draft = state.editorDrafts[fileId]
       if (draft !== undefined) {
         nextSelection[fileId] = draft

src/renderer/src/components/editor/editor-restored-tab-conflict-scan.recheck.test.ts

@@ -33,23 +33,25 @@ const FILE = '/repo/a.ts'
 let store: ReturnType<typeof createTestStore>
 let detach: () => void
 
-const tab = () => store.getState().openFiles.find((file) => file.id === FILE)!
+// A server's file is named by its owned id, not its path.
+let fileId: string
+const tab = () => store.getState().openFiles.find((file) => file.id === fileId)!
 
 beforeEach(() => {
   vi.useFakeTimers()
   vi.clearAllMocks()
   store = createTestStore()
-  store.getState().openFile({
+  fileId = store.getState().openFile({
     filePath: FILE,
     relativePath: 'a.ts',
     worktreeId: 'wt-1',
     runtimeEnvironmentId: 'env-1',
     language: 'typescript',
     mode: 'edit'
   })
-  store.getState().setEditorDraft(FILE, 'unsaved')
-  store.getState().markFileDirty(FILE, true)
-  store.getState().setLastKnownDiskSignature(FILE, getDiskBaselineSignature('v1'))
+  store.getState().setEditorDraft(fileId, 'unsaved')
+  store.getState().markFileDirty(fileId, true)
+  store.getState().setLastKnownDiskSignature(fileId, getDiskBaselineSignature('v1'))
 })
 
 afterEach(() => {
@@ -62,14 +64,14 @@ it('reads once more when a new check is requested while a read is in flight', as
   mocks.readRuntimeFileContent.mockImplementation(
     () => new Promise((resolve) => replies.push((content) => resolve({ content, isBinary: false })))
   )
-  store.getState().setPendingDiskBaselineVerification(FILE, true)
+  store.getState().setPendingDiskBaselineVerification(fileId, true)
   detach = attachRestoredTabConflictScan(store)
   await vi.advanceTimersByTimeAsync(0)
   expect(replies).toHaveLength(1)
 
   // A second catch-up lands mid-read, after an external write.
-  requestRestoredTabReverification(FILE)
-  requestRestoredTabReverification(FILE)
+  requestRestoredTabReverification(fileId)
+  requestRestoredTabReverification(fileId)
   replies[0]('v1')
   await vi.advanceTimersByTimeAsync(0)
   expect(tab().pendingDiskBaselineVerification).toBe(true)
@@ -85,7 +87,7 @@ it('reads once more when a new check is requested while a read is in flight', as
 it('marks a dirty runtime-owned tab deleted when its host says the file is gone', async () => {
   mocks.readRuntimeFileContent.mockRejectedValue(new Error('read failed'))
   mocks.runtimePathsExist.mockResolvedValue([{ exists: false }])
-  store.getState().setPendingDiskBaselineVerification(FILE, true)
+  store.getState().setPendingDiskBaselineVerification(fileId, true)
   detach = attachRestoredTabConflictScan(store)
   await vi.advanceTimersByTimeAsync(0)
 
@@ -102,7 +104,7 @@ it('marks a dirty runtime-owned tab deleted when its host says the file is gone'
 it('stops retrying and shows the conflict banner when the disk can never be checked', async () => {
   mocks.readRuntimeFileContent.mockRejectedValue(new Error('host unreachable'))
   mocks.runtimePathsExist.mockResolvedValue([{ error: 'unverifiable' }])
-  store.getState().setPendingDiskBaselineVerification(FILE, true)
+  store.getState().setPendingDiskBaselineVerification(fileId, true)
   detach = attachRestoredTabConflictScan(store)
   await vi.advanceTimersByTimeAsync(10 * 60_000)
 
@@ -117,12 +119,12 @@ it('does not let an absence answer from before a newer check resolve that check'
   mocks.runtimePathsExist.mockImplementationOnce(
     () => new Promise((resolve) => (answerProbe = resolve))
   )
-  store.getState().setPendingDiskBaselineVerification(FILE, true)
+  store.getState().setPendingDiskBaselineVerification(fileId, true)
   detach = attachRestoredTabConflictScan(store)
   await vi.advanceTimersByTimeAsync(0)
 
   // The file comes back and a new catch-up asks again while the old probe is pending.
-  requestRestoredTabReverification(FILE)
+  requestRestoredTabReverification(fileId)
   mocks.readRuntimeFileContent.mockResolvedValueOnce({ content: 'v2 recreated', isBinary: false })
   answerProbe([{ exists: false }])
   await vi.advanceTimersByTimeAsync(0)
@@ -134,9 +136,9 @@ it('does not let an absence answer from before a newer check resolve that check'
 it("forgets a tab's check requests once the tab closes", async () => {
   mocks.readRuntimeFileContent.mockResolvedValue({ content: 'v1', isBinary: false })
   detach = attachRestoredTabConflictScan(store)
-  requestRestoredTabReverification(FILE)
+  requestRestoredTabReverification(fileId)
   expect(getRestoredTabReverificationRequestCountForTest()).toBeGreaterThan(0)
 
-  store.getState().closeFile(FILE)
+  store.getState().closeFile(fileId)
   expect(getRestoredTabReverificationRequestCountForTest()).toBe(0)
 })

src/renderer/src/components/editor/editor-save-disk-precondition.test.ts

@@ -519,23 +519,21 @@ describe('editor saves through a remote host without the guarded write (client c
           'repo-1': [makeWorktree({ id: 'wt-1', repoId: 'repo-1', path: '/remote/repo' })]
         }
       })
-      store.getState().openFile({
+      const fileId = store.getState().openFile({
         filePath: '/remote/repo/file.ts',
         relativePath: 'file.ts',
         worktreeId: 'wt-1',
         runtimeEnvironmentId: 'env-1',
         language: 'typescript',
         mode: 'edit'
       })
-      store
-        .getState()
-        .setLastKnownDiskSignature('/remote/repo/file.ts', getDiskBaselineSignature('original'))
-      store.getState().setEditorDraft('/remote/repo/file.ts', 'edited')
-      store.getState().markFileDirty('/remote/repo/file.ts', true)
+      store.getState().setLastKnownDiskSignature(fileId, getDiskBaselineSignature('original'))
+      store.getState().setEditorDraft(fileId, 'edited')
+      store.getState().markFileDirty(fileId, true)
 
       const cleanup = attachEditorAutosaveController(store)
       try {
-        const save = requestEditorFileSave({ fileId: '/remote/repo/file.ts' })
+        const save = requestEditorFileSave({ fileId })
         await (written ? save : expect(save).rejects.toThrow(/changed on disk/))
         const methods = runtimeCall.mock.calls.map(([args]) => args.method)
         expect(mocks.readRuntimeFileContent).toHaveBeenCalled()

src/renderer/src/components/editor/useEditorPanelActiveTabContentLoad.ts

@@ -1,4 +1,5 @@
 import { useEffect, type MutableRefObject } from 'react'
+import { conflictOverviewFileId } from '@/store/slices/editor/file-ids/editor-file-ids'
 import type { OpenFile } from '@/store/slices/editor'
 import { joinPath } from '@/lib/path'
 import type { useAppStore } from '@/store'
@@ -13,6 +14,7 @@ type GitStatusByWorktree = ReturnType<typeof useAppStore.getState>['gitStatusByW
 type UseEditorPanelActiveTabContentLoadParams = {
   activeFile: OpenFile | null
   selectedConflictReviewFile: OpenFile | null
+  openFiles: readonly OpenFile[]
   isVisible: boolean
   isChangesMode: boolean
   gitStatusEntries: GitStatusByWorktree[string] | undefined
@@ -41,6 +43,7 @@ function hasLiveRead(
 export function useEditorPanelActiveTabContentLoad({
   activeFile,
   selectedConflictReviewFile,
+  openFiles,
   isVisible,
   isChangesMode,
   gitStatusEntries,
@@ -96,8 +99,9 @@ export function useEditorPanelActiveTabContentLoad({
         }
 
         const absolutePath = joinPath(activeFile.filePath, entry.path)
-        if (needsFileRead(absolutePath)) {
-          void loadFileContent(absolutePath, absolutePath, activeFile.worktreeId, entry.path)
+        const fileId = conflictOverviewFileId(openFiles, activeFile.worktreeId, absolutePath)
+        if (needsFileRead(fileId)) {
+          void loadFileContent(absolutePath, fileId, activeFile.worktreeId, entry.path)
         }
       }
       return

src/renderer/src/components/editor/useEditorPanelContentState.ts

@@ -175,6 +175,7 @@ export function useEditorPanelContentState({
   useEditorPanelActiveTabContentLoad({
     activeFile,
     selectedConflictReviewFile,
+    openFiles,
     isVisible,
     isChangesMode,
     gitStatusEntries,