diff --git a/config/scripts/ci-shard-timings.json b/config/scripts/ci-shard-timings.json
index e421147f8b0..8d1d2c38556 100644
--- a/config/scripts/ci-shard-timings.json
+++ b/config/scripts/ci-shard-timings.json
@@ -12636,10 +12636,10 @@
       "src/shared/native-chat-turn-status.test.ts": 52,
       "src/shared/native-chat-unverifiable-turn-status.test.ts": 111,
       "src/shared/native-chat-upgrade-tip-audience.test.ts": 41,
-      "src/shared/native-chat-visual-directive.test.ts": 45,
-      "src/shared/native-chat-visual-height-governor.test.ts": 141,
-      "src/shared/native-chat-visual-shell.reader-scroll.test.ts": 188,
-      "src/shared/native-chat-visual-shell.test.ts": 202,
+      "src/shared/native-chat/native-chat-visual-directive.test.ts": 45,
+      "src/shared/native-chat/native-chat-visual-height-governor.test.ts": 141,
+      "src/shared/native-chat/native-chat-visual-shell.reader-scroll.test.ts": 188,
+      "src/shared/native-chat/native-chat-visual-shell.test.ts": 202,
       "src/shared/native-chat-work-run.test.ts": 127,
       "src/shared/native-chat/native-chat-command-language.test.ts": 42,
       "src/shared/native-chat/native-chat-orca-stop-cut.test.ts": 198,
diff --git a/config/scripts/mobile-web-app/mobile-web-app-native-chat-visual-links.test.mjs b/config/scripts/mobile-web-app/mobile-web-app-native-chat-visual-links.test.mjs
index c89fb7c8c86..f370ad373a7 100644
--- a/config/scripts/mobile-web-app/mobile-web-app-native-chat-visual-links.test.mjs
+++ b/config/scripts/mobile-web-app/mobile-web-app-native-chat-visual-links.test.mjs
@@ -32,7 +32,7 @@ beforeAll(async () => {
   }
   // Import behind dependency gate: transforming mobile/ reads Expo tsconfig absent from root-only shards.
   ;({ buildNativeChatVisualDocument, NATIVE_CHAT_VISUAL_PONG_TYPE: pongType } =
-    await import('../../../src/shared/native-chat-visual-shell'))
+    await import('../../../src/shared/native-chat/native-chat-visual-shell'))
   ;({ buildMobileNativeChatVisualHostDocument } =
     await import('../../../mobile/src/session/mobile-native-chat-visual-host-document'))
   const header = await readShellCsp()
diff --git a/config/scripts/pr-code-change-scope.mjs b/config/scripts/pr-code-change-scope.mjs
index 95f6ff83256..83b118e0af4 100644
--- a/config/scripts/pr-code-change-scope.mjs
+++ b/config/scripts/pr-code-change-scope.mjs
@@ -191,7 +191,7 @@ const MOBILE_WEB_APP_PREFIXES = [
   'mobile/pnpm-lock.yaml',
   'mobile/modules/orca-mobile-web-shell/',
   // Chat visuals on both mobile surfaces are built from it; their in-page links check runs here.
-  'src/shared/native-chat-visual-shell'
+  'src/shared/native-chat/native-chat-visual-shell'
 ]
 
 function changesMobileWebApp(changedFiles) {
diff --git a/config/scripts/pr-code-change-scope.test.mjs b/config/scripts/pr-code-change-scope.test.mjs
index 33e2b8d8307..ab68918a981 100644
--- a/config/scripts/pr-code-change-scope.test.mjs
+++ b/config/scripts/pr-code-change-scope.test.mjs
@@ -346,7 +346,7 @@ describe('per-job path classification', () => {
       'mobile/app/h/[hostId]/index.tsx',
       'mobile/src/transport/client-context.web.tsx',
       'mobile/modules/orca-mobile-web-shell/ios/MobileWebShellCsp.swift',
-      'src/shared/native-chat-visual-shell.ts',
+      'src/shared/native-chat/native-chat-visual-shell.ts',
       // The vendored Expo module the page resolves a .web.ts out of.
       'mobile/packages/expo-two-way-audio/src/ExpoTwoWayAudioModule.web.ts'
     ]) {
diff --git a/mobile/src/components/MobileMarkdown.tsx b/mobile/src/components/MobileMarkdown.tsx
index ea438b65553..d4d400ceb32 100644
--- a/mobile/src/components/MobileMarkdown.tsx
+++ b/mobile/src/components/MobileMarkdown.tsx
@@ -6,7 +6,7 @@ import { renderBlocks, type MarkdownBlockContext } from './mobile-markdown-block
 import { MarkdownText } from './mobile-markdown-text'
 import { MarkdownTextContext, type MarkdownTextSetup } from './mobile-markdown-text-setup'
 import { useMobileMarkdownTree } from './use-mobile-markdown-tree'
-import type { NativeChatVisualDirective } from '../../../src/shared/native-chat-visual-directive'
+import type { NativeChatVisualDirective } from '../../../src/shared/native-chat/native-chat-visual-directive'
 
 type Props = {
   content?: string
diff --git a/mobile/src/components/WorktreeAgentRow.tsx b/mobile/src/components/WorktreeAgentRow.tsx
index 4ad5b4018a3..38dddbc3ee2 100644
--- a/mobile/src/components/WorktreeAgentRow.tsx
+++ b/mobile/src/components/WorktreeAgentRow.tsx
@@ -2,7 +2,7 @@ import { agentNoUpdateLabel } from '../../../src/shared/agent-row-decay-state'
 import { memo } from 'react'
 import { Pressable, StyleSheet, Text, View } from 'react-native'
 import type { RuntimeWorktreeAgentRow } from '../../../src/shared/runtime-types'
-import { withoutNativeChatVisualDirectiveLines } from '../../../src/shared/native-chat-visual-directive'
+import { withoutNativeChatVisualDirectiveLines } from '../../../src/shared/native-chat/native-chat-visual-directive'
 import { colors, spacing } from '../theme/mobile-theme'
 import {
   agentDisplayLabel,
diff --git a/mobile/src/components/mobile-markdown-blocks.tsx b/mobile/src/components/mobile-markdown-blocks.tsx
index fced4c1c260..564396e11e2 100644
--- a/mobile/src/components/mobile-markdown-blocks.tsx
+++ b/mobile/src/components/mobile-markdown-blocks.tsx
@@ -8,7 +8,7 @@ import {
   type StyleProp,
   type TextStyle
 } from 'react-native'
-import type { NativeChatVisualDirective } from '../../../src/shared/native-chat-visual-directive'
+import type { NativeChatVisualDirective } from '../../../src/shared/native-chat/native-chat-visual-directive'
 import { isMobileMermaidLanguage } from './mobile-mermaid-language'
 import { mobileMarkdownTableColumnWidths } from './mobile-markdown-table-columns'
 import { mobileMarkdownVisualPlaceholderIndex } from './mobile-markdown-visual-lines'
diff --git a/mobile/src/components/mobile-markdown-visual-lines.test.ts b/mobile/src/components/mobile-markdown-visual-lines.test.ts
index e4c33f21a40..d22720f21dc 100644
--- a/mobile/src/components/mobile-markdown-visual-lines.test.ts
+++ b/mobile/src/components/mobile-markdown-visual-lines.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { NATIVE_CHAT_VISUAL_MAX_PER_MESSAGE } from '../../../src/shared/native-chat-visual-directive'
+import { NATIVE_CHAT_VISUAL_MAX_PER_MESSAGE } from '../../../src/shared/native-chat/native-chat-visual-directive'
 import { parseMobileMarkdownTree, plainText } from './mobile-markdown-tree'
 import {
   mobileMarkdownVisualPlaceholderIndex,
diff --git a/mobile/src/components/mobile-markdown-visual-lines.ts b/mobile/src/components/mobile-markdown-visual-lines.ts
index 9c033ddbdda..30911e0f8b8 100644
--- a/mobile/src/components/mobile-markdown-visual-lines.ts
+++ b/mobile/src/components/mobile-markdown-visual-lines.ts
@@ -3,7 +3,7 @@ import {
   NATIVE_CHAT_VISUAL_MAX_PER_MESSAGE,
   parseNativeChatVisualDirectiveLine,
   type NativeChatVisualDirective
-} from '../../../src/shared/native-chat-visual-directive'
+} from '../../../src/shared/native-chat/native-chat-visual-directive'
 import { mobileMarkdownCodeLines } from './mobile-markdown-tree'
 // Private-use delimiters, as the preview normalizer's own code placeholders use.
 const PLACEHOLDER_PREFIX = '\uE000ORCA_VISUAL_'
diff --git a/mobile/src/components/use-mobile-markdown-tree.ts b/mobile/src/components/use-mobile-markdown-tree.ts
index 67f7928beb7..9386cc80b51 100644
--- a/mobile/src/components/use-mobile-markdown-tree.ts
+++ b/mobile/src/components/use-mobile-markdown-tree.ts
@@ -1,6 +1,6 @@
 import type { Root } from 'mdast'
 import { useMemo } from 'react'
-import type { NativeChatVisualDirective } from '../../../src/shared/native-chat-visual-directive'
+import type { NativeChatVisualDirective } from '../../../src/shared/native-chat/native-chat-visual-directive'
 import { parseMobileMarkdownTree } from './mobile-markdown-tree'
 import { protectMobileMarkdownVisualLines } from './mobile-markdown-visual-lines'
 
diff --git a/mobile/src/session/MobileNativeChatProse.tsx b/mobile/src/session/MobileNativeChatProse.tsx
index c181bea24ca..00ee1fc889d 100644
--- a/mobile/src/session/MobileNativeChatProse.tsx
+++ b/mobile/src/session/MobileNativeChatProse.tsx
@@ -11,7 +11,7 @@ import {
   AGENT_SESSION_HOST_STATUS_COPY,
   isAgentSessionHostStatusPresentation
 } from '../../../src/shared/agent-session-host-status-rows'
-import { withoutPendingNativeChatVisualDirectiveTail } from '../../../src/shared/native-chat-visual-directive'
+import { withoutPendingNativeChatVisualDirectiveTail } from '../../../src/shared/native-chat/native-chat-visual-directive'
 import { isAgentSessionAttachmentStorePath } from '../../../src/shared/agent-session-attachments'
 import { MobileNativeChatRowOverlaysContext } from './mobile-native-chat-row-overlays'
 import { isRenderableImageUri, readStoredChatImage } from './mobile-native-chat-image-preview'
diff --git a/mobile/src/session/MobileNativeChatVisual.tsx b/mobile/src/session/MobileNativeChatVisual.tsx
index fc95eda7174..68c9bc3af1d 100644
--- a/mobile/src/session/MobileNativeChatVisual.tsx
+++ b/mobile/src/session/MobileNativeChatVisual.tsx
@@ -1,7 +1,7 @@
 import { memo, useCallback, useMemo, useState } from 'react'
 import { ActivityIndicator, Modal, Pressable, StyleSheet, Text, View } from 'react-native'
 import { Maximize2, X } from 'lucide-react-native'
-import type { NativeChatVisualDirective } from '../../../src/shared/native-chat-visual-directive'
+import type { NativeChatVisualDirective } from '../../../src/shared/native-chat/native-chat-visual-directive'
 import { useWindowSafeAreaInsets } from '../layout/side-safe-area'
 import { colors, radii, spacing, typography } from '../theme/mobile-theme'
 import type { MobileNativeChatVisualSource } from './mobile-native-chat-visual-read'
diff --git a/mobile/src/session/MobileNativeChatVisualFrame.tsx b/mobile/src/session/MobileNativeChatVisualFrame.tsx
index 0840000cfb0..5e45ff0d9de 100644
--- a/mobile/src/session/MobileNativeChatVisualFrame.tsx
+++ b/mobile/src/session/MobileNativeChatVisualFrame.tsx
@@ -1,6 +1,6 @@
 import { memo, useMemo } from 'react'
 import { StyleSheet, View } from 'react-native'
-import { buildNativeChatVisualDocument } from '../../../src/shared/native-chat-visual-shell'
+import { buildNativeChatVisualDocument } from '../../../src/shared/native-chat/native-chat-visual-shell'
 import type { MobileNativeChatVisualHostMode } from './mobile-native-chat-visual-host-document'
 import { MOBILE_NATIVE_CHAT_VISUAL_THEME } from './mobile-native-chat-visual-theme'
 
diff --git a/mobile/src/session/mobile-native-chat-message-plain-text.ts b/mobile/src/session/mobile-native-chat-message-plain-text.ts
index 16e070b9eef..4f2a72a0cce 100644
--- a/mobile/src/session/mobile-native-chat-message-plain-text.ts
+++ b/mobile/src/session/mobile-native-chat-message-plain-text.ts
@@ -3,7 +3,7 @@ import {
   isAgentSessionHostStatusPresentation
 } from '../../../src/shared/agent-session-host-status-rows'
 import { isTextBlock } from '../../../src/shared/native-chat-types'
-import { withoutNativeChatVisualDirectiveLines } from '../../../src/shared/native-chat-visual-directive'
+import { withoutNativeChatVisualDirectiveLines } from '../../../src/shared/native-chat/native-chat-visual-directive'
 import type { NativeChatMessage } from '../../../src/shared/native-chat-types'
 
 export function nativeChatMessagePlainText(
diff --git a/mobile/src/session/mobile-native-chat-visual-context.ts b/mobile/src/session/mobile-native-chat-visual-context.ts
index fd86bee738c..3934ffdd2da 100644
--- a/mobile/src/session/mobile-native-chat-visual-context.ts
+++ b/mobile/src/session/mobile-native-chat-visual-context.ts
@@ -1,5 +1,5 @@
 import { createContext, type ReactNode } from 'react'
-import type { NativeChatVisualDirective } from '../../../src/shared/native-chat-visual-directive'
+import type { NativeChatVisualDirective } from '../../../src/shared/native-chat/native-chat-visual-directive'
 
 export type MobileNativeChatVisualRender = (
   directive: NativeChatVisualDirective,
diff --git a/mobile/src/session/mobile-native-chat-visual-host-document.ts b/mobile/src/session/mobile-native-chat-visual-host-document.ts
index 4f5feecebf3..ef981541861 100644
--- a/mobile/src/session/mobile-native-chat-visual-host-document.ts
+++ b/mobile/src/session/mobile-native-chat-visual-host-document.ts
@@ -5,7 +5,7 @@ import {
   NATIVE_CHAT_VISUAL_PONG_TIMEOUT_MS,
   NATIVE_CHAT_VISUAL_PONG_TYPE,
   NATIVE_CHAT_VISUAL_SIZE_TYPE
-} from '../../../src/shared/native-chat-visual-shell'
+} from '../../../src/shared/native-chat/native-chat-visual-shell'
 import { inlineScriptLiteral } from '../components/inline-script-json'
 
 /** `inline` sizes the frame to the height the app applies; `fullscreen` fills the screen and scrolls. */
diff --git a/mobile/src/session/mobile-native-chat-visual-read.ts b/mobile/src/session/mobile-native-chat-visual-read.ts
index aba6ca6b663..fd443592fb7 100644
--- a/mobile/src/session/mobile-native-chat-visual-read.ts
+++ b/mobile/src/session/mobile-native-chat-visual-read.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { NATIVE_CHAT_VISUAL_MAX_BYTES } from '../../../src/shared/native-chat-visual-directive'
+import { NATIVE_CHAT_VISUAL_MAX_BYTES } from '../../../src/shared/native-chat/native-chat-visual-directive'
 import { bindDeferredRpcOperation, defineRpcOperation } from '../transport/rpc-operation'
 import { rpcResultVariant } from '../transport/rpc-operation-result-reader'
 import { isMobileMethodUnavailableError } from '../transport/mobile-method-unavailable'
diff --git a/mobile/src/session/mobile-native-chat-visual-theme.ts b/mobile/src/session/mobile-native-chat-visual-theme.ts
index 6ad4345673b..0f54dd4cddb 100644
--- a/mobile/src/session/mobile-native-chat-visual-theme.ts
+++ b/mobile/src/session/mobile-native-chat-visual-theme.ts
@@ -1,4 +1,4 @@
-import type { NativeChatVisualTheme } from '../../../src/shared/native-chat-visual-shell'
+import type { NativeChatVisualTheme } from '../../../src/shared/native-chat/native-chat-visual-shell'
 import { colors, radii } from '../theme/mobile-theme'
 
 // Match desktop’s dark chart tokens; initialize visual styles before author content runs.
diff --git a/src/main/ai-vault/session-scanner-text-normalization.ts b/src/main/ai-vault/session-scanner-text-normalization.ts
index 62b6acf999d..d8ee163ca30 100644
--- a/src/main/ai-vault/session-scanner-text-normalization.ts
+++ b/src/main/ai-vault/session-scanner-text-normalization.ts
@@ -1,5 +1,5 @@
 import { sliceAtCodeUnitLimit } from '../../shared/surrogate-safe-text-slice'
-import { withoutNativeChatVisualDirectiveLines } from '../../shared/native-chat-visual-directive'
+import { withoutNativeChatVisualDirectiveLines } from '../../shared/native-chat/native-chat-visual-directive'
 
 export { sliceAtCodeUnitLimit }
 
diff --git a/src/main/native-chat/native-chat-visual-file-read.test.ts b/src/main/native-chat/native-chat-visual-file-read.test.ts
index 700b9ee6352..2071f10b60a 100644
--- a/src/main/native-chat/native-chat-visual-file-read.test.ts
+++ b/src/main/native-chat/native-chat-visual-file-read.test.ts
@@ -3,7 +3,7 @@ import { chmod, mkdir, mkdtemp, rm, symlink, writeFile, link } from 'node:fs/pro
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
-import { NATIVE_CHAT_VISUAL_MAX_BYTES } from '../../shared/native-chat-visual-directive'
+import { NATIVE_CHAT_VISUAL_MAX_BYTES } from '../../shared/native-chat/native-chat-visual-directive'
 import { nativeChatScratchFolderFor } from './native-chat-scratch-folder'
 import { nativeChatVisualRevision, readNativeChatVisualFile } from './native-chat-visual-file-read'
 
diff --git a/src/main/native-chat/native-chat-visual-file-read.ts b/src/main/native-chat/native-chat-visual-file-read.ts
index 64e1e623bc9..497914d02e7 100644
--- a/src/main/native-chat/native-chat-visual-file-read.ts
+++ b/src/main/native-chat/native-chat-visual-file-read.ts
@@ -7,7 +7,7 @@ import { basename, dirname, join } from 'node:path'
 import {
   NATIVE_CHAT_VISUAL_MAX_BYTES,
   isNativeChatVisualFileName
-} from '../../shared/native-chat-visual-directive'
+} from '../../shared/native-chat/native-chat-visual-directive'
 import type {
   AgentSessionReadVisualResult,
   AgentSessionVisualReadError
diff --git a/src/main/native-chat/native-chat-visuals-delivery.test.ts b/src/main/native-chat/native-chat-visuals-delivery.test.ts
index b401187a57a..aa5752dc0f9 100644
--- a/src/main/native-chat/native-chat-visuals-delivery.test.ts
+++ b/src/main/native-chat/native-chat-visuals-delivery.test.ts
@@ -6,8 +6,8 @@ import {
   NATIVE_CHAT_VISUAL_MAX_BYTES,
   NATIVE_CHAT_VISUAL_MAX_PER_MESSAGE,
   parseNativeChatVisualDirectiveLine
-} from '../../shared/native-chat-visual-directive'
-import { NATIVE_CHAT_VISUAL_THEME_TOKENS } from '../../shared/native-chat-visual-shell'
+} from '../../shared/native-chat/native-chat-visual-directive'
+import { NATIVE_CHAT_VISUAL_THEME_TOKENS } from '../../shared/native-chat/native-chat-visual-shell'
 import { ORCAD_NATIVE_CHAT_VISUALS_ARTIFACTS } from '../../shared/orcad-artifacts'
 import {
   createNativeChatVisualsDelivery,
diff --git a/src/main/window/host-frame-navigation-guard.test.ts b/src/main/window/host-frame-navigation-guard.test.ts
index 1a4aae3d042..771aed18679 100644
--- a/src/main/window/host-frame-navigation-guard.test.ts
+++ b/src/main/window/host-frame-navigation-guard.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { PLUGIN_PANEL_FRAME_NAME_PREFIX } from '../../shared/plugins/plugin-panel-bridge'
-import { NATIVE_CHAT_VISUAL_FRAME_NAME_PREFIX } from '../../shared/native-chat-visual-shell'
+import { NATIVE_CHAT_VISUAL_FRAME_NAME_PREFIX } from '../../shared/native-chat/native-chat-visual-shell'
 import { HostFrameNavigationRegistry, hostFrameKindForName } from './host-frame-navigation-guard'
 
 function frame(input: { id: number; name?: string; url?: string }) {
diff --git a/src/main/window/host-frame-navigation-guard.ts b/src/main/window/host-frame-navigation-guard.ts
index 7132cbfbc18..b7259142f6e 100644
--- a/src/main/window/host-frame-navigation-guard.ts
+++ b/src/main/window/host-frame-navigation-guard.ts
@@ -1,5 +1,5 @@
 import type { WebContents, WebFrameMain } from 'electron'
-import { NATIVE_CHAT_VISUAL_FRAME_NAME_PREFIX } from '../../shared/native-chat-visual-shell'
+import { NATIVE_CHAT_VISUAL_FRAME_NAME_PREFIX } from '../../shared/native-chat/native-chat-visual-shell'
 import { PLUGIN_PANEL_FRAME_NAME_PREFIX } from '../../shared/plugins/plugin-panel-bridge'
 
 type NavigationFrame = Pick<WebFrameMain, 'frameTreeNodeId' | 'isDestroyed' | 'name'>
diff --git a/src/renderer/src/components/native-chat/NativeChatMarkdown.tsx b/src/renderer/src/components/native-chat/NativeChatMarkdown.tsx
index 311d9a63db7..59b18d03fd3 100644
--- a/src/renderer/src/components/native-chat/NativeChatMarkdown.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMarkdown.tsx
@@ -14,7 +14,7 @@ import CommentMarkdown, {
 } from '@/components/sidebar/CommentMarkdown'
 import { createDocumentCommentMarkdownComponents } from '@/components/sidebar/comment-markdown-element-renderers'
 import { cn } from '@/lib/utils'
-import { withoutPendingNativeChatVisualDirectiveTail } from '../../../../shared/native-chat-visual-directive'
+import { withoutPendingNativeChatVisualDirectiveTail } from '../../../../shared/native-chat/native-chat-visual-directive'
 import { NativeChatMarkdownRowKeyContext } from './native-chat-disclosure-store'
 import { useNativeChatVisualMarkdownExtension } from './native-chat-visual-markdown-extension'
 import { useNativeChatFileLinkExists } from './use-native-chat-file-link-existence'
diff --git a/src/renderer/src/components/native-chat/NativeChatMessageList.visual-scroll.test.tsx b/src/renderer/src/components/native-chat/NativeChatMessageList.visual-scroll.test.tsx
index d85babb95db..a44a0847ee4 100644
--- a/src/renderer/src/components/native-chat/NativeChatMessageList.visual-scroll.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatMessageList.visual-scroll.test.tsx
@@ -6,7 +6,7 @@ import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-libra
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import type * as TranscriptChromeModule from './NativeChatTranscriptChrome'
 import type { NativeChatMessage } from '../../../../shared/native-chat-types'
-import { NATIVE_CHAT_VISUAL_READER_SCROLL_TYPE } from '../../../../shared/native-chat-visual-shell'
+import { NATIVE_CHAT_VISUAL_READER_SCROLL_TYPE } from '../../../../shared/native-chat/native-chat-visual-shell'
 
 const callRuntimeRpc = vi.fn()
 vi.mock('@/runtime/runtime-rpc-client', () => ({
diff --git a/src/renderer/src/components/native-chat/NativeChatTranscriptChrome.tsx b/src/renderer/src/components/native-chat/NativeChatTranscriptChrome.tsx
index 92d97647a70..26a1453bd7b 100644
--- a/src/renderer/src/components/native-chat/NativeChatTranscriptChrome.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatTranscriptChrome.tsx
@@ -7,7 +7,7 @@ import type { NativeChatBlock } from '../../../../shared/native-chat-types'
 import { NativeChatCopyButton } from './NativeChatCopyButton'
 import { NativeChatMessageTimestamp } from './NativeChatMessageTimestamp'
 import { nativeChatProviderFrameSummary } from '../../../../shared/native-chat/native-chat-provider-frame-summary'
-import { withoutNativeChatVisualDirectiveLines } from '../../../../shared/native-chat-visual-directive'
+import { withoutNativeChatVisualDirectiveLines } from '../../../../shared/native-chat/native-chat-visual-directive'
 import { PanZoomImageDialog } from '@/components/editor/PanZoomImageDialog'
 import {
   getLocalImageCacheKey,
diff --git a/src/renderer/src/components/native-chat/NativeChatVisualFrame.test.tsx b/src/renderer/src/components/native-chat/NativeChatVisualFrame.test.tsx
index 2e18f707d47..b249b90db25 100644
--- a/src/renderer/src/components/native-chat/NativeChatVisualFrame.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatVisualFrame.test.tsx
@@ -14,7 +14,7 @@ import {
   NATIVE_CHAT_VISUAL_READER_SCROLL_TYPE,
   NATIVE_CHAT_VISUAL_SIZE_TYPE,
   NATIVE_CHAT_VISUAL_THEME_TYPE
-} from '../../../../shared/native-chat-visual-shell'
+} from '../../../../shared/native-chat/native-chat-visual-shell'
 
 const openHttpLink = vi.fn()
 vi.mock('@/lib/http-link-routing', () => ({
diff --git a/src/renderer/src/components/native-chat/NativeChatVisualFrame.tsx b/src/renderer/src/components/native-chat/NativeChatVisualFrame.tsx
index 5252769fd68..b6b1e076e28 100644
--- a/src/renderer/src/components/native-chat/NativeChatVisualFrame.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatVisualFrame.tsx
@@ -8,9 +8,9 @@ import {
   nativeChatVisualThemeMessage,
   readNativeChatVisualFrameMessage,
   readNativeChatVisualPong
-} from '../../../../shared/native-chat-visual-shell'
+} from '../../../../shared/native-chat/native-chat-visual-shell'
 import type { NativeChatVisualDocument } from './native-chat-visual-read-client'
-import { createNativeChatVisualHeightGovernor } from '../../../../shared/native-chat-visual-height-governor'
+import { createNativeChatVisualHeightGovernor } from '../../../../shared/native-chat/native-chat-visual-height-governor'
 import type { ReaderGesture } from './native-chat-autoscroll'
 import { useNativeChatVisualTheme } from './use-native-chat-visual-theme'
 import { useWebviewDragPassthroughActive } from '../browser-pane/host-guest/use-webview-drag-passthrough-active'
diff --git a/src/renderer/src/components/native-chat/native-chat-message-copy-text.ts b/src/renderer/src/components/native-chat/native-chat-message-copy-text.ts
index c007323c201..190220c63d1 100644
--- a/src/renderer/src/components/native-chat/native-chat-message-copy-text.ts
+++ b/src/renderer/src/components/native-chat/native-chat-message-copy-text.ts
@@ -1,6 +1,6 @@
 import type { NativeChatMessage } from '../../../../shared/native-chat-types'
 import { deriveNativeChatRowContent } from '../../../../shared/native-chat-row-content'
-import { withoutNativeChatVisualDirectiveLines } from '../../../../shared/native-chat-visual-directive'
+import { withoutNativeChatVisualDirectiveLines } from '../../../../shared/native-chat/native-chat-visual-directive'
 import { nativeChatBlocksInOwnWords } from './native-chat-stopped-before-start-row'
 import type { NativeChatTranscriptSlot } from './native-chat-transcript-slots'
 
diff --git a/src/renderer/src/components/native-chat/native-chat-visual-markdown-extension.tsx b/src/renderer/src/components/native-chat/native-chat-visual-markdown-extension.tsx
index e0a97b7e7b7..ec9d677e577 100644
--- a/src/renderer/src/components/native-chat/native-chat-visual-markdown-extension.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-visual-markdown-extension.tsx
@@ -4,7 +4,7 @@ import type { CommentMarkdownExtension } from '@/components/sidebar/CommentMarkd
 import {
   NATIVE_CHAT_VISUAL_TITLE_MAX_LENGTH,
   isNativeChatVisualFileName
-} from '../../../../shared/native-chat-visual-directive'
+} from '../../../../shared/native-chat/native-chat-visual-directive'
 import { NativeChatInlineVisual } from './NativeChatInlineVisual'
 import type { NativeChatVisualOwner } from './native-chat-visual-owner'
 import { useNativeChatVisualOwner } from './native-chat-visual-owner'
diff --git a/src/renderer/src/components/native-chat/native-chat-visual-markdown-syntax.ts b/src/renderer/src/components/native-chat/native-chat-visual-markdown-syntax.ts
index 505e101725b..bc95c8d0269 100644
--- a/src/renderer/src/components/native-chat/native-chat-visual-markdown-syntax.ts
+++ b/src/renderer/src/components/native-chat/native-chat-visual-markdown-syntax.ts
@@ -15,7 +15,7 @@ import {
   NATIVE_CHAT_VISUAL_DIRECTIVE_MAX_LINE_LENGTH,
   NATIVE_CHAT_VISUAL_MAX_PER_MESSAGE,
   parseNativeChatVisualDirectiveLine
-} from '../../../../shared/native-chat-visual-directive'
+} from '../../../../shared/native-chat/native-chat-visual-directive'
 
 const TOKEN_TYPE = 'nativeChatVisual'
 const COLON = 58
diff --git a/src/renderer/src/components/native-chat/use-native-chat-visual-theme.ts b/src/renderer/src/components/native-chat/use-native-chat-visual-theme.ts
index a7a3431368b..544112d2a48 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-visual-theme.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-visual-theme.ts
@@ -2,7 +2,7 @@ import { useEffect, useState, type RefObject } from 'react'
 import {
   NATIVE_CHAT_VISUAL_THEME_TOKENS,
   type NativeChatVisualTheme
-} from '../../../../shared/native-chat-visual-shell'
+} from '../../../../shared/native-chat/native-chat-visual-shell'
 
 // Visuals inherit the chat’s appearance scope, which can differ from the app root.
 const SCOPED_SOURCES: Partial<Record<string, readonly string[]>> = {
diff --git a/src/shared/native-chat-visual-directive.test.ts b/src/shared/native-chat/native-chat-visual-directive.test.ts
similarity index 100%
rename from src/shared/native-chat-visual-directive.test.ts
rename to src/shared/native-chat/native-chat-visual-directive.test.ts
diff --git a/src/shared/native-chat-visual-directive.ts b/src/shared/native-chat/native-chat-visual-directive.ts
similarity index 100%
rename from src/shared/native-chat-visual-directive.ts
rename to src/shared/native-chat/native-chat-visual-directive.ts
diff --git a/src/shared/native-chat-visual-height-governor.test.ts b/src/shared/native-chat/native-chat-visual-height-governor.test.ts
similarity index 100%
rename from src/shared/native-chat-visual-height-governor.test.ts
rename to src/shared/native-chat/native-chat-visual-height-governor.test.ts
diff --git a/src/shared/native-chat-visual-height-governor.ts b/src/shared/native-chat/native-chat-visual-height-governor.ts
similarity index 100%
rename from src/shared/native-chat-visual-height-governor.ts
rename to src/shared/native-chat/native-chat-visual-height-governor.ts
diff --git a/src/shared/native-chat-visual-shell.reader-scroll.test.ts b/src/shared/native-chat/native-chat-visual-shell.reader-scroll.test.ts
similarity index 100%
rename from src/shared/native-chat-visual-shell.reader-scroll.test.ts
rename to src/shared/native-chat/native-chat-visual-shell.reader-scroll.test.ts
diff --git a/src/shared/native-chat-visual-shell.test.ts b/src/shared/native-chat/native-chat-visual-shell.test.ts
similarity index 100%
rename from src/shared/native-chat-visual-shell.test.ts
rename to src/shared/native-chat/native-chat-visual-shell.test.ts
diff --git a/src/shared/native-chat-visual-shell.ts b/src/shared/native-chat/native-chat-visual-shell.ts
similarity index 99%
rename from src/shared/native-chat-visual-shell.ts
rename to src/shared/native-chat/native-chat-visual-shell.ts
index fa149fe298f..7ed42b3ede9 100644
--- a/src/shared/native-chat-visual-shell.ts
+++ b/src/shared/native-chat/native-chat-visual-shell.ts
@@ -1,4 +1,4 @@
-import { PANEL_DESIGN_TOKEN_ALLOWLIST } from './plugins/plugin-panel-shell'
+import { PANEL_DESIGN_TOKEN_ALLOWLIST } from '../plugins/plugin-panel-shell'
 
 /** Shared Electron-free sandbox document. Parse CSP before visual markup so later HTML cannot loosen it.
  * Allow pinned-CDN scripts/styles/fonts/images only; block fetch/sockets/frames/forms. Allowed-CDN requests can still carry data: disclosed accepted risk, not a no-egress guarantee. */
diff --git a/src/shared/rpc-contract/agent-session-visual-params.ts b/src/shared/rpc-contract/agent-session-visual-params.ts
index 1f402658c8b..bc63893789e 100644
--- a/src/shared/rpc-contract/agent-session-visual-params.ts
+++ b/src/shared/rpc-contract/agent-session-visual-params.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { isNativeChatVisualFileName } from '../native-chat-visual-directive'
+import { isNativeChatVisualFileName } from '../native-chat/native-chat-visual-directive'
 import { SessionId } from './structured-agent-session-identifiers'
 
 // Read visuals on their owning host; accept bare filenames, never another host’s paths.
diff --git a/src/shared/structured-agent-session-latest-request.ts b/src/shared/structured-agent-session-latest-request.ts
index 1f05426c5e1..2727dbd3878 100644
--- a/src/shared/structured-agent-session-latest-request.ts
+++ b/src/shared/structured-agent-session-latest-request.ts
@@ -11,7 +11,7 @@ import { agentJournalSubmissionKey } from './agent-session-journal-item-key'
 import { isRootAgentJournalItem } from './agent-session-journal-producer'
 import { readAgentJournalTurn, readAgentJournalTurnOutcome } from './agent-session-turn-record'
 import { classifyDispatchRejection } from './structured-agent-session-dispatch-rejection'
-import { withoutNativeChatVisualDirectiveLines } from './native-chat-visual-directive'
+import { withoutNativeChatVisualDirectiveLines } from './native-chat/native-chat-visual-directive'
 import { isUnansweredStructuredAgentSessionDispatch } from './structured-agent-session-unanswered-dispatch'
 import {
   isStructuredAgentSessionCommandEntry,