refactor: group native-chat merger with pair-window spec (#35714)

mobile/src/session/mobile-native-chat-merge.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { mergeNativeChatMessages } from '../../../src/shared/native-chat-merge'
+import { mergeNativeChatMessages } from '../../../src/shared/native-chat/native-chat-merge'
 import type { NativeChatMessage } from '../../../src/shared/native-chat-types'
 
 function msg(id: string, overrides: Partial<NativeChatMessage> = {}): NativeChatMessage {

mobile/src/session/mobile-native-chat-merger-oracle.test.ts

@@ -6,7 +6,7 @@ import {
   createNativeChatMerger,
   mergeNativeChatMessages,
   replaceList
-} from '../../../src/shared/native-chat-merge'
+} from '../../../src/shared/native-chat/native-chat-merge'
 
 function msg(id: string, overrides: Partial<NativeChatMessage> = {}): NativeChatMessage {
   return {

mobile/src/session/mobile-native-chat-pair-window.test.ts

@@ -1,5 +1,8 @@
 import { describe, expect, it } from 'vitest'
-import { createNativeChatMerger, replaceList } from '../../../src/shared/native-chat-merge'
+import {
+  createNativeChatMerger,
+  replaceList
+} from '../../../src/shared/native-chat/native-chat-merge'
 import type { NativeChatMessage } from '../../../src/shared/native-chat-types'
 import { applyMobileNativeChatStreamFrame } from './native-chat/mobile-native-chat-stream-frame'
 

mobile/src/session/native-chat/mobile-native-chat-stream-frame.test.ts

@@ -1,5 +1,8 @@
 import { describe, expect, it } from 'vitest'
-import { createNativeChatMerger, replaceList } from '../../../../src/shared/native-chat-merge'
+import {
+  createNativeChatMerger,
+  replaceList
+} from '../../../../src/shared/native-chat/native-chat-merge'
 import type { NativeChatMessage } from '../../../../src/shared/native-chat-types'
 import { applyMobileNativeChatStreamFrame } from './mobile-native-chat-stream-frame'
 

mobile/src/session/native-chat/mobile-native-chat-stream-frame.ts

@@ -1,6 +1,6 @@
-import { applyAppend, replaceList } from '../../../../src/shared/native-chat-merge'
+import { applyAppend, replaceList } from '../../../../src/shared/native-chat/native-chat-merge'
 import { translate } from '../../i18n/mobile-i18n'
-import type { NativeChatMerger } from '../../../../src/shared/native-chat-merge'
+import type { NativeChatMerger } from '../../../../src/shared/native-chat/native-chat-merge'
 import type {
   NativeChatMessage,
   NativeChatTurnLifecycle

mobile/src/session/use-mobile-native-chat-session.ts

@@ -3,7 +3,10 @@ import {
   createNativeChatTranscriptRetention,
   encodeNativeChatTranscriptIdentity
 } from '../../../src/shared/native-chat/transcript/native-chat-transcript-retention'
-import { createNativeChatMerger, replaceList } from '../../../src/shared/native-chat-merge'
+import {
+  createNativeChatMerger,
+  replaceList
+} from '../../../src/shared/native-chat/native-chat-merge'
 import type {
   NativeChatMessage,
   NativeChatTurnLifecycle

src/main/native-chat/transcript-window-tool-attribution.test.ts

@@ -3,7 +3,7 @@ import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, describe, expect, it } from 'vitest'
 import { stripNoiseMessages } from '../../shared/native-chat-noise'
-import { mergeNativeChatMessages } from '../../shared/native-chat-merge'
+import { mergeNativeChatMessages } from '../../shared/native-chat/native-chat-merge'
 import { foldToolMessages } from '../../shared/native-chat/tools/native-chat-tool-fold'
 import { pairToolBlocks } from '../../shared/native-chat/tools/native-chat-tool-pairs'
 import { isToolCallBlock, isToolResultBlock } from '../../shared/native-chat-types'

src/renderer/src/components/native-chat/use-native-chat-live-session.ts

@@ -8,7 +8,7 @@ import {
   applyAppend,
   createNativeChatMerger,
   replaceList
-} from '../../../../shared/native-chat-merge'
+} from '../../../../shared/native-chat/native-chat-merge'
 import { mergeNativeChatLiveSession } from '../../../../shared/native-chat/native-chat-live-status'
 import {
   hasMoreNativeChatHistory,

src/shared/native-chat-transcript-contracts.test.ts

@@ -7,7 +7,7 @@ import './native-chat/transcript/native-chat-turn-grouping.spec'
 import './native-chat/input/native-chat-ask-row.spec'
 import './native-chat/tools/native-chat-tool-pairing.spec'
 import './native-chat/transcript/native-chat-live-line.spec'
-import './native-chat-merge-pairs.spec'
+import './native-chat/native-chat-merge-pairs.spec'
 import './native-chat/native-chat-command-envelope.spec'
 import './native-chat/native-chat-streaming.spec'
 import './native-chat/transcript/native-chat-subagent-group-header.spec'

src/shared/native-chat/native-chat-merge-pairs.spec.ts

@@ -5,7 +5,7 @@ import {
   createNativeChatMerger,
   replaceList
 } from './native-chat-merge'
-import type { NativeChatMessage } from './native-chat-types'
+import type { NativeChatMessage } from '../native-chat-types'
 
 function row(id: string, overrides: Partial<NativeChatMessage> = {}): NativeChatMessage {
   return {

src/shared/native-chat/native-chat-merge.ts

@@ -3,7 +3,7 @@ import {
   NATIVE_CHAT_SOURCE_PRIORITY,
   type NativeChatMessage,
   type NativeChatSource
-} from './native-chat-types'
+} from '../native-chat-types'
 
 export type NativeChatSourcePriority = Record<NativeChatSource, number>
 

tests/e2e/native-chat-transcript-file-order.unit.test.ts

@@ -4,7 +4,7 @@ import { join } from 'node:path'
 import { afterEach, describe, expect, it } from 'vitest'
 import type { NativeChatMessage } from '../../src/shared/native-chat-types'
 import { projectNativeChatTranscriptMessages } from '../../src/shared/native-chat-transcript-projection'
-import { createNativeChatMerger, replaceList } from '../../src/shared/native-chat-merge'
+import { createNativeChatMerger, replaceList } from '../../src/shared/native-chat/native-chat-merge'
 import { readNativeChatTranscript } from '../../src/main/native-chat/transcript-reader'
 import {
   readNativeChatTranscriptTail,