diff --git a/mobile/src/session/mobile-native-chat-noise.test.ts b/mobile/src/session/mobile-native-chat-noise.test.ts
index 738cf5964a7..a49b58be41f 100644
--- a/mobile/src/session/mobile-native-chat-noise.test.ts
+++ b/mobile/src/session/mobile-native-chat-noise.test.ts
@@ -1,5 +1,8 @@
 import { describe, expect, it } from 'vitest'
-import { isNoiseMessage, stripNoiseMessages } from '../../../src/shared/native-chat-noise'
+import {
+  isNoiseMessage,
+  stripNoiseMessages
+} from '../../../src/shared/native-chat/native-chat-noise'
 import type { NativeChatMessage } from '../../../src/shared/native-chat-types'
 
 function msg(
diff --git a/mobile/src/session/mobile-native-chat-render-data.ts b/mobile/src/session/mobile-native-chat-render-data.ts
index 07133ab9182..25f6ed8eec8 100644
--- a/mobile/src/session/mobile-native-chat-render-data.ts
+++ b/mobile/src/session/mobile-native-chat-render-data.ts
@@ -1,7 +1,7 @@
 import { formatAgentTypeLabel } from '../../../src/shared/agent-type-label'
 import type { NativeChatEmptyStateCopy } from '../../../src/shared/native-chat/native-chat-empty-state'
 import { isRootAgentJournalItem } from '../../../src/shared/agent-session-journal-producer'
-import { stripNoiseMessages } from '../../../src/shared/native-chat-noise'
+import { stripNoiseMessages } from '../../../src/shared/native-chat/native-chat-noise'
 import { nativeChatStreamingMessage } from '../../../src/shared/native-chat/native-chat-streaming'
 import { isWordlessProviderFrameMessage } from '../../../src/shared/native-chat/native-chat-provider-frame-summary'
 import {
diff --git a/src/main/native-chat/transcript-interruption-message.test.ts b/src/main/native-chat/transcript-interruption-message.test.ts
index a365e574482..d5f23312227 100644
--- a/src/main/native-chat/transcript-interruption-message.test.ts
+++ b/src/main/native-chat/transcript-interruption-message.test.ts
@@ -3,7 +3,7 @@ import {
   NATIVE_CHAT_INTERRUPTED_STATUS_TEXT,
   type NativeChatMessage
 } from '../../shared/native-chat-types'
-import { stripNoiseMessages } from '../../shared/native-chat-noise'
+import { stripNoiseMessages } from '../../shared/native-chat/native-chat-noise'
 import { decodeClaudeTranscriptLine } from './transcript-line-decoders-claude'
 import { decodeCodexTranscriptLine } from './transcript-line-decoders-codex'
 
diff --git a/src/main/native-chat/transcript-line-decoders-claude-command-output.test.ts b/src/main/native-chat/transcript-line-decoders-claude-command-output.test.ts
index 3ee23d09f1d..4744024e6d7 100644
--- a/src/main/native-chat/transcript-line-decoders-claude-command-output.test.ts
+++ b/src/main/native-chat/transcript-line-decoders-claude-command-output.test.ts
@@ -2,7 +2,7 @@ import { readFileSync } from 'node:fs'
 import { join } from 'node:path'
 import { describe, expect, it } from 'vitest'
 import { surfaceNativeChatCommandOutputs } from '../../shared/native-chat/tools/native-chat-command-output'
-import { stripNoiseMessages } from '../../shared/native-chat-noise'
+import { stripNoiseMessages } from '../../shared/native-chat/native-chat-noise'
 import type { NativeChatMessage } from '../../shared/native-chat-types'
 import { decodeClaudeTranscriptLine } from './transcript-line-decoders-claude'
 
diff --git a/src/main/native-chat/transcript-turn-lifecycle.ts b/src/main/native-chat/transcript-turn-lifecycle.ts
index 2ec312efc63..bfb6b3e2efc 100644
--- a/src/main/native-chat/transcript-turn-lifecycle.ts
+++ b/src/main/native-chat/transcript-turn-lifecycle.ts
@@ -1,6 +1,6 @@
 import type { AgentType, NativeChatTurnLifecycle } from '../../shared/native-chat-types'
 import { resolveNativeChatTranscriptAgent } from '../../shared/native-chat/native-chat-agent-support'
-import { isNoiseMessage } from '../../shared/native-chat-noise'
+import { isNoiseMessage } from '../../shared/native-chat/native-chat-noise'
 import { claudeBashInputAsTypedCommand } from '../../shared/claude-bash-input'
 import {
   asRecord,
diff --git a/src/main/native-chat/transcript-window-tool-attribution.test.ts b/src/main/native-chat/transcript-window-tool-attribution.test.ts
index 547e4498e07..887b009269d 100644
--- a/src/main/native-chat/transcript-window-tool-attribution.test.ts
+++ b/src/main/native-chat/transcript-window-tool-attribution.test.ts
@@ -2,7 +2,7 @@ import { mkdtemp, rm, writeFile } from 'node:fs/promises'
 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 { stripNoiseMessages } from '../../shared/native-chat/native-chat-noise'
 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'
diff --git a/src/renderer/src/components/native-chat/NativeChatAgentMessageCard.test.tsx b/src/renderer/src/components/native-chat/NativeChatAgentMessageCard.test.tsx
index 4f18542f634..18c7094a2f7 100644
--- a/src/renderer/src/components/native-chat/NativeChatAgentMessageCard.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatAgentMessageCard.test.tsx
@@ -37,7 +37,7 @@ import { projectStructuredItemToNativeChat } from '../../../../shared/structured
 import { isAdmissibleAgentJournalRenderItem } from '../../../../shared/agent-session-journal-schemas'
 import { agentMessageHeading } from '../../../../shared/agent-session/agent-message-presentation'
 import { nativeChatTurnFoldRow } from '../../../../shared/native-chat/transcript/native-chat-turn-fold'
-import { isNoiseMessage } from '../../../../shared/native-chat-noise'
+import { isNoiseMessage } from '../../../../shared/native-chat/native-chat-noise'
 import { nativeChatRowSpeaksOrActs } from '../../../../shared/native-chat/native-chat-trailing-run'
 import type { AgentJournalRenderItem } from '../../../../shared/agent-session-journal-types'
 
diff --git a/src/renderer/src/components/native-chat/native-chat-message-list-projection.test.ts b/src/renderer/src/components/native-chat/native-chat-message-list-projection.test.ts
index 9a5b7fb2d59..e049faf59f4 100644
--- a/src/renderer/src/components/native-chat/native-chat-message-list-projection.test.ts
+++ b/src/renderer/src/components/native-chat/native-chat-message-list-projection.test.ts
@@ -2,7 +2,7 @@ import { expect, it } from 'vitest'
 import type { NativeChatMessage } from '../../../../shared/native-chat-types'
 import { createNativeChatMessageListProjection } from './native-chat-message-list-projection'
 import { orderNativeChatMessages } from './native-chat-message-grouping'
-import { stripNoiseMessages } from './native-chat-noise'
+import { stripNoiseMessages } from '../../../../shared/native-chat/native-chat-noise'
 import { foldToolMessages } from '../../../../shared/native-chat/tools/native-chat-tool-fold'
 import { pairToolBlocks } from '../../../../shared/native-chat/tools/native-chat-tool-pairs'
 
diff --git a/src/renderer/src/components/native-chat/native-chat-noise.ts b/src/renderer/src/components/native-chat/native-chat-noise.ts
deleted file mode 100644
index 6ef06b130a6..00000000000
--- a/src/renderer/src/components/native-chat/native-chat-noise.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { isNoiseMessage, stripNoiseMessages } from '../../../../shared/native-chat-noise'
diff --git a/src/renderer/src/components/native-chat/native-chat-pending.test.ts b/src/renderer/src/components/native-chat/native-chat-pending.test.ts
index 800eebcc433..1d300dedb56 100644
--- a/src/renderer/src/components/native-chat/native-chat-pending.test.ts
+++ b/src/renderer/src/components/native-chat/native-chat-pending.test.ts
@@ -18,7 +18,7 @@ import {
   commandMarkersAsMessages,
   readCommandMarkerCache
 } from './native-chat-command-marker'
-import { stripNoiseMessages } from './native-chat-noise'
+import { stripNoiseMessages } from '../../../../shared/native-chat/native-chat-noise'
 
 function userMessage(id: string, text: string, timestamp = 1): NativeChatMessage {
   return {
diff --git a/src/renderer/src/components/native-chat/native-chat-tool-fold.test.ts b/src/renderer/src/components/native-chat/native-chat-tool-fold.test.ts
index 93d699f16b6..61d3b839d30 100644
--- a/src/renderer/src/components/native-chat/native-chat-tool-fold.test.ts
+++ b/src/renderer/src/components/native-chat/native-chat-tool-fold.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest'
 import type { NativeChatMessage } from '../../../../shared/native-chat-types'
-import { stripNoiseMessages } from './native-chat-noise'
+import { stripNoiseMessages } from '../../../../shared/native-chat/native-chat-noise'
 import {
   foldToolMessages,
   splitNativeChatBlocks
diff --git a/src/shared/native-chat-transcript-projection.ts b/src/shared/native-chat-transcript-projection.ts
index b5238a1b241..e4d6b294a0b 100644
--- a/src/shared/native-chat-transcript-projection.ts
+++ b/src/shared/native-chat-transcript-projection.ts
@@ -4,7 +4,7 @@
 import { nativeChatSemanticRowId, type NativeChatMessage } from './native-chat-types'
 import { compareAgentJournalPositions } from './agent-session-journal-position'
 import { agentJournalItemSubagentId } from './agent-session-journal-producer'
-import { stripNoiseMessages } from './native-chat-noise'
+import { stripNoiseMessages } from './native-chat/native-chat-noise'
 import { foldToolMessages } from './native-chat/tools/native-chat-tool-fold'
 import { foldSubagentItems } from './native-chat/transcript/native-chat-subagent-items'
 import { nativeChatTurnMembership, type NativeChatTurnJournal } from './native-chat-turn-membership'
diff --git a/src/shared/native-chat-noise.ts b/src/shared/native-chat/native-chat-noise.ts
similarity index 83%
rename from src/shared/native-chat-noise.ts
rename to src/shared/native-chat/native-chat-noise.ts
index 71ab0363327..4be1c5f47ef 100644
--- a/src/shared/native-chat-noise.ts
+++ b/src/shared/native-chat/native-chat-noise.ts
@@ -1,5 +1,5 @@
-import { isKnownHarnessInjectedUserTurnText } from './harness-injected-user-turns'
-import { isTextBlock, type NativeChatMessage } from './native-chat-types'
+import { isKnownHarnessInjectedUserTurnText } from '../harness-injected-user-turns'
+import { isTextBlock, type NativeChatMessage } from '../native-chat-types'
 
 function messageText(message: NativeChatMessage): string {
   return message.blocks
diff --git a/src/shared/native-chat/native-chat-terminal-turn.ts b/src/shared/native-chat/native-chat-terminal-turn.ts
index a6cb9569cdb..8e6faa4dc5e 100644
--- a/src/shared/native-chat/native-chat-terminal-turn.ts
+++ b/src/shared/native-chat/native-chat-terminal-turn.ts
@@ -1,7 +1,7 @@
 import type { AgentStatusEntry } from '../agent-status-types'
 import { isInterruptedStatusMessage, type NativeChatMessage } from '../native-chat-types'
 import type { NativeChatSettledTurn, NativeChatSettledTurns } from '../native-chat-turn-status'
-import { isNoiseMessage } from '../native-chat-noise'
+import { isNoiseMessage } from './native-chat-noise'
 import { shouldShowNativeChatWorking } from './native-chat-working-suppression'
 
 /** shown prompts have a card in this pane; unshown prompts require input in the agent’s terminal. */
diff --git a/src/shared/native-chat/tools/native-chat-command-output.test.ts b/src/shared/native-chat/tools/native-chat-command-output.test.ts
index b65bd223e17..88d3fce2bfb 100644
--- a/src/shared/native-chat/tools/native-chat-command-output.test.ts
+++ b/src/shared/native-chat/tools/native-chat-command-output.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { surfaceNativeChatCommandOutputs } from './native-chat-command-output'
-import { stripNoiseMessages } from '../../native-chat-noise'
+import { stripNoiseMessages } from '../native-chat-noise'
 import type { NativeChatMessage } from '../../native-chat-types'
 
 // The two user rows OpenClaude 0.31.0 writes for `/context` (its caveat row is
diff --git a/src/shared/native-chat/tools/native-chat-tool-fold.ts b/src/shared/native-chat/tools/native-chat-tool-fold.ts
index 8128aae412a..1aa19f215d6 100644
--- a/src/shared/native-chat/tools/native-chat-tool-fold.ts
+++ b/src/shared/native-chat/tools/native-chat-tool-fold.ts
@@ -7,7 +7,7 @@ import {
   type NativeChatMessage
 } from '../../native-chat-types'
 import { isKnownHarnessInjectedUserTurnText } from '../../harness-injected-user-turns'
-import { isNoiseMessage } from '../../native-chat-noise'
+import { isNoiseMessage } from '../native-chat-noise'
 import {
   CODEX_PLAN_UPDATED_FRAME_KIND,
   isWordlessProviderFrameMessage