diff --git a/src/renderer/src/store/keyed-tab-row-changes.test.ts b/src/renderer/src/store/keyed-tab-row-changes.test.ts index 9df10b39877..26e982917d2 100644 --- a/src/renderer/src/store/keyed-tab-row-changes.test.ts +++ b/src/renderer/src/store/keyed-tab-row-changes.test.ts @@ -39,6 +39,15 @@ describe('addressed tab row references', () => { expect(readTabRowChanges(start, start)).toBeNull() }) + it('requires resync when a removed row is reinserted across skipped writes', () => { + const a = { id: 'a', contentType: 'terminal', entityId: 't0', groupId: 'g' } + const b = { id: 'b', contentType: 'terminal', entityId: 't0', groupId: 'h' } + const start = { workspace: [a, b] } + const removed = replaceTabBuckets(start, [['workspace', [b]]]) + const reinserted = replaceTabBuckets(removed, [['workspace', [b, a]]]) + expect(readTabRowChanges(reinserted, start)).toBe('unknown') + }) + it('requires resync for unavailable or reordered histories', () => { const first = { id: 'first' } const second = { id: 'second' } diff --git a/src/renderer/src/store/keyed-tab-row-changes.ts b/src/renderer/src/store/keyed-tab-row-changes.ts index 081e14f2a0b..5329b697a3e 100644 --- a/src/renderer/src/store/keyed-tab-row-changes.ts +++ b/src/renderer/src/store/keyed-tab-row-changes.ts @@ -46,6 +46,10 @@ export function readTabRowChanges( // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the net endpoints belong to the supplied T snapshots. const change = untypedChange as TabRowChange const earlier = bucket.get(tabId) + // Reinsertion may change which duplicate entity owns the assignment. + if (earlier && earlier.after === undefined && change.after !== undefined) { + return 'unknown' + } bucket.set(tabId, { before: earlier ? earlier.before : change.before, after: change.after }) } }