diff --git a/.changeset/web-components-subdirs.md b/.changeset/web-components-subdirs.md
new file mode 100644
index 000000000..208897e1d
--- /dev/null
+++ b/.changeset/web-components-subdirs.md
@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+Reorganize the web app's components into area subdirectories (chat/settings/dialogs/mobile) and refresh the component path comments.
diff --git a/apps/kimi-web/AGENTS.md b/apps/kimi-web/AGENTS.md
index 8a6411ec4..bd7940fef 100644
--- a/apps/kimi-web/AGENTS.md
+++ b/apps/kimi-web/AGENTS.md
@@ -10,7 +10,7 @@ The browser web UI for Kimi Code — a peer to the TUI in `apps/kimi-code`. It t
 
 - `main.ts` — bootstrap (creates the app, installs i18n, mounts `#app`). `App.vue` — root component, holds most app state.
 - `api/` — server client. `index.ts` exposes the `getKimiWebApi()` singleton; `config.ts` builds REST/WS URLs; `daemon/` holds the wire client (`http.ts`, `ws.ts`, `wire.ts`, `mappers.ts`, `agentEventProjector.ts`, `eventReducer.ts`).
-- `components/` — ~50 flat SFCs, no subdirectories.
+- `components/` — SFCs grouped by area: `chat/` (conversation/chat UI), `settings/` (settings & configuration), `dialogs/` (modal dialogs & sheets), `mobile/` (mobile-specific shell), plus shared layout components at the top level.
 - `composables/` — reusable state logic, `useX` naming (`useKimiWebClient`, `useIsDark`, `usePaneLayout`, …).
 - `lib/` — pure helpers (`parseDiff`, `slashCommands`, `sessionRoute`, `toolMeta`, …).
 - `i18n/` — vue-i18n setup plus locale namespaces.
diff --git a/apps/kimi-web/src/App.vue b/apps/kimi-web/src/App.vue
index 64474fc7d..0fa5d7b0c 100644
--- a/apps/kimi-web/src/App.vue
+++ b/apps/kimi-web/src/App.vue
@@ -4,25 +4,25 @@ import { computed, nextTick, onMounted, onUnmounted, provide, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import Sidebar from './components/Sidebar.vue';
 import ResizeHandle from './components/ResizeHandle.vue';
-import ConversationPane from './components/ConversationPane.vue';
+import ConversationPane from './components/chat/ConversationPane.vue';
 import FilePreview from './components/FilePreview.vue';
-import ThinkingPanel from './components/ThinkingPanel.vue';
-import AgentDetailPanel from './components/AgentDetailPanel.vue';
-import SideChatPanel from './components/SideChatPanel.vue';
-import DiffView from './components/DiffView.vue';
-import ModelPicker from './components/ModelPicker.vue';
-import ProviderManager from './components/ProviderManager.vue';
-import LoginDialog from './components/LoginDialog.vue';
-import NewSessionDialog from './components/NewSessionDialog.vue';
-import SettingsDialog from './components/SettingsDialog.vue';
-import SessionsDialog from './components/SessionsDialog.vue';
-import AddWorkspaceDialog from './components/AddWorkspaceDialog.vue';
-import StatusPanel from './components/StatusPanel.vue';
+import ThinkingPanel from './components/chat/ThinkingPanel.vue';
+import AgentDetailPanel from './components/chat/AgentDetailPanel.vue';
+import SideChatPanel from './components/chat/SideChatPanel.vue';
+import DiffView from './components/chat/DiffView.vue';
+import ModelPicker from './components/settings/ModelPicker.vue';
+import ProviderManager from './components/settings/ProviderManager.vue';
+import LoginDialog from './components/dialogs/LoginDialog.vue';
+import NewSessionDialog from './components/dialogs/NewSessionDialog.vue';
+import SettingsDialog from './components/settings/SettingsDialog.vue';
+import SessionsDialog from './components/dialogs/SessionsDialog.vue';
+import AddWorkspaceDialog from './components/dialogs/AddWorkspaceDialog.vue';
+import StatusPanel from './components/chat/StatusPanel.vue';
 import WarningToasts from './components/WarningToasts.vue';
-import MobileTopBar from './components/MobileTopBar.vue';
-import MobileSwitcherSheet from './components/MobileSwitcherSheet.vue';
-import MobileSettingsSheet from './components/MobileSettingsSheet.vue';
-import Onboarding from './components/Onboarding.vue';
+import MobileTopBar from './components/mobile/MobileTopBar.vue';
+import MobileSwitcherSheet from './components/mobile/MobileSwitcherSheet.vue';
+import MobileSettingsSheet from './components/mobile/MobileSettingsSheet.vue';
+import Onboarding from './components/settings/Onboarding.vue';
 import GlobalLoading from './components/GlobalLoading.vue';
 import DebugPanel from './debug/DebugPanel.vue';
 import { isTraceEnabled } from './debug/trace';
diff --git a/apps/kimi-web/src/components/FilePreview.vue b/apps/kimi-web/src/components/FilePreview.vue
index 6474dd9b5..948e50216 100644
--- a/apps/kimi-web/src/components/FilePreview.vue
+++ b/apps/kimi-web/src/components/FilePreview.vue
@@ -3,7 +3,7 @@
 <script setup lang="ts">
 import { computed, inject, nextTick, provide, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
-import Markdown from './Markdown.vue';
+import Markdown from './chat/Markdown.vue';
 import type { FileData, FilePreviewRequest } from '../types';
 
 const { t } = useI18n();
diff --git a/apps/kimi-web/src/components/ActivityNotice.vue b/apps/kimi-web/src/components/chat/ActivityNotice.vue
similarity index 96%
rename from apps/kimi-web/src/components/ActivityNotice.vue
rename to apps/kimi-web/src/components/chat/ActivityNotice.vue
index 7b8176b15..abac0f34b 100644
--- a/apps/kimi-web/src/components/ActivityNotice.vue
+++ b/apps/kimi-web/src/components/chat/ActivityNotice.vue
@@ -1,4 +1,4 @@
-<!-- apps/kimi-web/src/components/ActivityNotice.vue -->
+<!-- apps/kimi-web/src/components/chat/ActivityNotice.vue -->
 <!-- Generic in-transcript "working on X" notice: the moon-phase spinner plus a
      body-sized label. Used for long-running session activities that are not a
      chat turn (e.g. "Compacting context…"). Renders inline at the end of the
diff --git a/apps/kimi-web/src/components/AgentCard.vue b/apps/kimi-web/src/components/chat/AgentCard.vue
similarity index 98%
rename from apps/kimi-web/src/components/AgentCard.vue
rename to apps/kimi-web/src/components/chat/AgentCard.vue
index 1b937e7bb..e275c0115 100644
--- a/apps/kimi-web/src/components/AgentCard.vue
+++ b/apps/kimi-web/src/components/chat/AgentCard.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed } from 'vue';
-import type { AgentMember } from '../types';
+import type { AgentMember } from '../../types';
 
 const props = defineProps<{ member: AgentMember; compact?: boolean }>();
 
diff --git a/apps/kimi-web/src/components/AgentDetailPanel.vue b/apps/kimi-web/src/components/chat/AgentDetailPanel.vue
similarity index 98%
rename from apps/kimi-web/src/components/AgentDetailPanel.vue
rename to apps/kimi-web/src/components/chat/AgentDetailPanel.vue
index d2c975128..59ebc1f35 100644
--- a/apps/kimi-web/src/components/AgentDetailPanel.vue
+++ b/apps/kimi-web/src/components/chat/AgentDetailPanel.vue
@@ -1,4 +1,4 @@
-<!-- apps/kimi-web/src/components/AgentDetailPanel.vue -->
+<!-- apps/kimi-web/src/components/chat/AgentDetailPanel.vue -->
 <!-- A subagent's full detail in the right-side panel (App's shared slot — opening
      this replaces a thinking/compaction/file view and vice versa). Mirrors the
      thinking panel: the content is reactive, so a still-running subagent keeps
@@ -7,7 +7,7 @@
 <script setup lang="ts">
 import { computed, nextTick, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
-import type { AgentMember } from '../types';
+import type { AgentMember } from '../../types';
 
 const props = defineProps<{ member: AgentMember }>();
 
diff --git a/apps/kimi-web/src/components/AgentGroup.vue b/apps/kimi-web/src/components/chat/AgentGroup.vue
similarity index 98%
rename from apps/kimi-web/src/components/AgentGroup.vue
rename to apps/kimi-web/src/components/chat/AgentGroup.vue
index eb1341e04..3f739d8d9 100644
--- a/apps/kimi-web/src/components/AgentGroup.vue
+++ b/apps/kimi-web/src/components/chat/AgentGroup.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue';
-import type { AgentMember } from '../types';
+import type { AgentMember } from '../../types';
 import AgentCard from './AgentCard.vue';
 
 const props = defineProps<{ members: AgentMember[] }>();
diff --git a/apps/kimi-web/src/components/ApprovalCard.vue b/apps/kimi-web/src/components/chat/ApprovalCard.vue
similarity index 98%
rename from apps/kimi-web/src/components/ApprovalCard.vue
rename to apps/kimi-web/src/components/chat/ApprovalCard.vue
index 0c92deee0..a17cf5781 100644
--- a/apps/kimi-web/src/components/ApprovalCard.vue
+++ b/apps/kimi-web/src/components/chat/ApprovalCard.vue
@@ -1,9 +1,9 @@
-<!-- apps/kimi-web/src/components/ApprovalCard.vue -->
+<!-- apps/kimi-web/src/components/chat/ApprovalCard.vue -->
 <script setup lang="ts">
 import { onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import type { ApprovalBlock } from '../types';
-import type { ApprovalDecision } from '../api/types';
+import type { ApprovalBlock } from '../../types';
+import type { ApprovalDecision } from '../../api/types';
 
 const props = defineProps<{
   block: ApprovalBlock;
diff --git a/apps/kimi-web/src/components/ChatDock.vue b/apps/kimi-web/src/components/chat/ChatDock.vue
similarity index 99%
rename from apps/kimi-web/src/components/ChatDock.vue
rename to apps/kimi-web/src/components/chat/ChatDock.vue
index 4b1560a7b..902294174 100644
--- a/apps/kimi-web/src/components/ChatDock.vue
+++ b/apps/kimi-web/src/components/chat/ChatDock.vue
@@ -5,8 +5,8 @@
 <script setup lang="ts">
 import { onUnmounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
-import type { ActivationBadges, ApprovalBlock, ConversationStatus, PermissionMode, QueuedPromptView, TaskItem, TodoView, UIQuestion } from '../types';
-import type { AppGoal, AppModel, AppSkill, QuestionResponse, ThinkingLevel } from '../api/types';
+import type { ActivationBadges, ApprovalBlock, ConversationStatus, PermissionMode, QueuedPromptView, TaskItem, TodoView, UIQuestion } from '../../types';
+import type { AppGoal, AppModel, AppSkill, QuestionResponse, ThinkingLevel } from '../../api/types';
 import type { FileItem } from './MentionMenu.vue';
 import Composer from './Composer.vue';
 import GoalStrip from './GoalStrip.vue';
diff --git a/apps/kimi-web/src/components/ChatHeader.vue b/apps/kimi-web/src/components/chat/ChatHeader.vue
similarity index 99%
rename from apps/kimi-web/src/components/ChatHeader.vue
rename to apps/kimi-web/src/components/chat/ChatHeader.vue
index 780eab63f..9984eccae 100644
--- a/apps/kimi-web/src/components/ChatHeader.vue
+++ b/apps/kimi-web/src/components/chat/ChatHeader.vue
@@ -1,4 +1,4 @@
-<!-- apps/kimi-web/src/components/ChatHeader.vue -->
+<!-- apps/kimi-web/src/components/chat/ChatHeader.vue -->
 <!-- Thin context bar above the chat: workspace / session name, git branch +
      status, "open in editor", and a ⋮ more-menu that bundles copy-all plus
      the same session actions available from the sidebar session row. -->
diff --git a/apps/kimi-web/src/components/ChatPane.vue b/apps/kimi-web/src/components/chat/ChatPane.vue
similarity index 99%
rename from apps/kimi-web/src/components/ChatPane.vue
rename to apps/kimi-web/src/components/chat/ChatPane.vue
index bd0cc5c14..be7f5543c 100644
--- a/apps/kimi-web/src/components/ChatPane.vue
+++ b/apps/kimi-web/src/components/chat/ChatPane.vue
@@ -1,16 +1,16 @@
-<!-- apps/kimi-web/src/components/ChatPane.vue -->
+<!-- apps/kimi-web/src/components/chat/ChatPane.vue -->
 <script setup lang="ts">
 import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
-import type { ChatTurn, ApprovalBlock, FilePreviewRequest, ToolMedia } from '../types';
+import type { ChatTurn, ApprovalBlock, FilePreviewRequest, ToolMedia } from '../../types';
 import ToolCall from './ToolCall.vue';
 import Markdown from './Markdown.vue';
 import ThinkingBlock from './ThinkingBlock.vue';
 import ActivityNotice from './ActivityNotice.vue';
 import AgentCard from './AgentCard.vue';
 import AgentGroup from './AgentGroup.vue';
-import MoonSpinner from './MoonSpinner.vue';
-import { formatMessageTime } from '../lib/formatMessageTime';
+import MoonSpinner from '../MoonSpinner.vue';
+import { formatMessageTime } from '../../lib/formatMessageTime';
 import {
   assistantRenderBlocks,
   formatDuration,
@@ -21,7 +21,7 @@ import {
   turnBlocks,
   turnFinalText,
   turnToMarkdown,
-} from './chatTurnRendering';
+} from '../chatTurnRendering';
 
 const { t } = useI18n();
 
diff --git a/apps/kimi-web/src/components/Composer.vue b/apps/kimi-web/src/components/chat/Composer.vue
similarity index 98%
rename from apps/kimi-web/src/components/Composer.vue
rename to apps/kimi-web/src/components/chat/Composer.vue
index 21a3f9bed..075a7ef24 100644
--- a/apps/kimi-web/src/components/Composer.vue
+++ b/apps/kimi-web/src/components/chat/Composer.vue
@@ -1,19 +1,19 @@
-<!-- apps/kimi-web/src/components/Composer.vue -->
+<!-- apps/kimi-web/src/components/chat/Composer.vue -->
 <script setup lang="ts">
 import { computed, nextTick, onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import SlashMenu from './SlashMenu.vue';
 import MentionMenu from './MentionMenu.vue';
-import { buildSlashItems, parseSlash } from '../lib/slashCommands';
+import { buildSlashItems, parseSlash } from '../../lib/slashCommands';
 import type { FileItem } from './MentionMenu.vue';
-import type { ActivationBadges, ConversationStatus, PermissionMode, QueuedPromptView } from '../types';
-import type { AppModel, AppSkill, ThinkingLevel } from '../api/types';
-import { modelThinkingAvailability } from '../lib/modelThinking';
-import { useInputHistory } from '../composables/useInputHistory';
-import { useSlashMenu } from '../composables/useSlashMenu';
-import { useMentionMenu } from '../composables/useMentionMenu';
-import { useComposerDraft } from '../composables/useComposerDraft';
-import { useAttachmentUpload } from '../composables/useAttachmentUpload';
+import type { ActivationBadges, ConversationStatus, PermissionMode, QueuedPromptView } from '../../types';
+import type { AppModel, AppSkill, ThinkingLevel } from '../../api/types';
+import { modelThinkingAvailability } from '../../lib/modelThinking';
+import { useInputHistory } from '../../composables/useInputHistory';
+import { useSlashMenu } from '../../composables/useSlashMenu';
+import { useMentionMenu } from '../../composables/useMentionMenu';
+import { useComposerDraft } from '../../composables/useComposerDraft';
+import { useAttachmentUpload } from '../../composables/useAttachmentUpload';
 
 // ---------------------------------------------------------------------------
 // Props & emits
diff --git a/apps/kimi-web/src/components/ConversationPane.vue b/apps/kimi-web/src/components/chat/ConversationPane.vue
similarity index 99%
rename from apps/kimi-web/src/components/ConversationPane.vue
rename to apps/kimi-web/src/components/chat/ConversationPane.vue
index 327613053..4738dde4a 100644
--- a/apps/kimi-web/src/components/ConversationPane.vue
+++ b/apps/kimi-web/src/components/chat/ConversationPane.vue
@@ -1,10 +1,10 @@
-<!-- apps/kimi-web/src/components/ConversationPane.vue -->
+<!-- apps/kimi-web/src/components/chat/ConversationPane.vue -->
 <script setup lang="ts">
 import { computed, nextTick, onMounted, onUnmounted, ref, watch, type ComponentPublicInstance } from 'vue';
 import { useI18n } from 'vue-i18n';
-import type { ActivationBadges, ApprovalBlock, ChatTurn, ConversationStatus, FilePreviewRequest, PermissionMode, QueuedPromptView, TaskItem, TodoView, ToolMedia, UIQuestion, WorkspaceView } from '../types';
-import type { AppGoal, AppModel, AppSkill, QuestionResponse, ThinkingLevel } from '../api/types';
-import type { SwarmGroup } from '../composables/swarmGroups';
+import type { ActivationBadges, ApprovalBlock, ChatTurn, ConversationStatus, FilePreviewRequest, PermissionMode, QueuedPromptView, TaskItem, TodoView, ToolMedia, UIQuestion, WorkspaceView } from '../../types';
+import type { AppGoal, AppModel, AppSkill, QuestionResponse, ThinkingLevel } from '../../api/types';
+import type { SwarmGroup } from '../../composables/swarmGroups';
 import type { FileItem } from './MentionMenu.vue';
 import ChatPane from './ChatPane.vue';
 import ChatHeader from './ChatHeader.vue';
@@ -12,8 +12,8 @@ import Composer from './Composer.vue';
 import SwarmCard from './SwarmCard.vue';
 import ChatDock from './ChatDock.vue';
 import ConversationToc, { type ConversationTocItem } from './ConversationToc.vue';
-import { getVisibleWorkspaces } from '../lib/workspacePicker';
-import { safeRemove, STORAGE_KEYS } from '../lib/storage';
+import { getVisibleWorkspaces } from '../../lib/workspacePicker';
+import { safeRemove, STORAGE_KEYS } from '../../lib/storage';
 
 const props = defineProps<{
   turns: ChatTurn[];
diff --git a/apps/kimi-web/src/components/ConversationToc.vue b/apps/kimi-web/src/components/chat/ConversationToc.vue
similarity index 98%
rename from apps/kimi-web/src/components/ConversationToc.vue
rename to apps/kimi-web/src/components/chat/ConversationToc.vue
index aa5b73062..284b53d65 100644
--- a/apps/kimi-web/src/components/ConversationToc.vue
+++ b/apps/kimi-web/src/components/chat/ConversationToc.vue
@@ -1,8 +1,8 @@
-<!-- apps/kimi-web/src/components/ConversationToc.vue -->
+<!-- apps/kimi-web/src/components/chat/ConversationToc.vue -->
 <script setup lang="ts">
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import type { ChatTurn } from '../types';
+import type { ChatTurn } from '../../types';
 
 export interface ConversationTocItem {
   id: string;
diff --git a/apps/kimi-web/src/components/DiffView.vue b/apps/kimi-web/src/components/chat/DiffView.vue
similarity index 99%
rename from apps/kimi-web/src/components/DiffView.vue
rename to apps/kimi-web/src/components/chat/DiffView.vue
index bebf43a5d..49bae0f63 100644
--- a/apps/kimi-web/src/components/DiffView.vue
+++ b/apps/kimi-web/src/components/chat/DiffView.vue
@@ -1,11 +1,11 @@
-<!-- apps/kimi-web/src/components/DiffView.vue -->
+<!-- apps/kimi-web/src/components/chat/DiffView.vue -->
 <!-- ~/diff tab: real git changes from the daemon's fs:git_status, with a
      line-by-line unified-diff view (fs:diff) when a file is tapped.
      The changed-file list can be viewed as a flat list or as a tree. -->
 <script setup lang="ts">
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import type { DiffViewLine } from '../types';
+import type { DiffViewLine } from '../../types';
 
 const { t } = useI18n();
 
diff --git a/apps/kimi-web/src/components/GoalStrip.vue b/apps/kimi-web/src/components/chat/GoalStrip.vue
similarity index 99%
rename from apps/kimi-web/src/components/GoalStrip.vue
rename to apps/kimi-web/src/components/chat/GoalStrip.vue
index c4fa76ff2..47b00803f 100644
--- a/apps/kimi-web/src/components/GoalStrip.vue
+++ b/apps/kimi-web/src/components/chat/GoalStrip.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
-import type { AppGoal } from '../api/types';
+import type { AppGoal } from '../../api/types';
 
 const props = defineProps<{ goal: AppGoal; forceExpanded?: number }>();
 const emit = defineEmits<{ controlGoal: [action: 'pause' | 'resume' | 'cancel'] }>();
diff --git a/apps/kimi-web/src/components/Markdown.vue b/apps/kimi-web/src/components/chat/Markdown.vue
similarity index 98%
rename from apps/kimi-web/src/components/Markdown.vue
rename to apps/kimi-web/src/components/chat/Markdown.vue
index 147721354..a626e0091 100644
--- a/apps/kimi-web/src/components/Markdown.vue
+++ b/apps/kimi-web/src/components/chat/Markdown.vue
@@ -1,12 +1,12 @@
-<!-- apps/kimi-web/src/components/Markdown.vue -->
+<!-- apps/kimi-web/src/components/chat/Markdown.vue -->
 <script setup lang="ts">
 import { computed, inject, nextTick, onMounted, onUnmounted, reactive, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { MarkdownRender } from 'markstream-vue';
-import { useIsDark } from '../composables/useIsDark';
-import type { FilePreviewRequest } from '../types';
-import { collectFilePathAliases, findFilePathLinks } from '../lib/filePathLinks';
-import { markdownRenderPlan } from '../lib/markdownPerformance';
+import { useIsDark } from '../../composables/useIsDark';
+import type { FilePreviewRequest } from '../../types';
+import { collectFilePathAliases, findFilePathLinks } from '../../lib/filePathLinks';
+import { markdownRenderPlan } from '../../lib/markdownPerformance';
 // px-based CSS build (our app is px, not rem). Imported here so the styles
 // load wherever Markdown is used; scoped overrides below re-skin it to
 // Terminal Pro. Importing the same file from multiple components is a no-op
diff --git a/apps/kimi-web/src/components/MentionMenu.vue b/apps/kimi-web/src/components/chat/MentionMenu.vue
similarity index 98%
rename from apps/kimi-web/src/components/MentionMenu.vue
rename to apps/kimi-web/src/components/chat/MentionMenu.vue
index c00943c43..15115a55f 100644
--- a/apps/kimi-web/src/components/MentionMenu.vue
+++ b/apps/kimi-web/src/components/chat/MentionMenu.vue
@@ -1,8 +1,8 @@
-<!-- apps/kimi-web/src/components/MentionMenu.vue -->
+<!-- apps/kimi-web/src/components/chat/MentionMenu.vue -->
 <!-- Popup list of file paths shown when user types @ in the Composer textarea. -->
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n';
-import type { FileItem } from '../types';
+import type { FileItem } from '../../types';
 
 // Re-exported for the .vue consumers (Composer / ChatDock / ConversationPane)
 // that import FileItem from this component.
diff --git a/apps/kimi-web/src/components/OpenInMenu.vue b/apps/kimi-web/src/components/chat/OpenInMenu.vue
similarity index 98%
rename from apps/kimi-web/src/components/OpenInMenu.vue
rename to apps/kimi-web/src/components/chat/OpenInMenu.vue
index 27e89f135..fdf988348 100644
--- a/apps/kimi-web/src/components/OpenInMenu.vue
+++ b/apps/kimi-web/src/components/chat/OpenInMenu.vue
@@ -1,11 +1,11 @@
-<!-- apps/kimi-web/src/components/OpenInMenu.vue -->
+<!-- apps/kimi-web/src/components/chat/OpenInMenu.vue -->
 <!-- "Open" button group for the chat header: workspace path label + quick-open
      (last used target) + dropdown caret, matching the kimi-cli/web pattern.
      Falls back to a simple icon+text "Open" button on non-mac platforms. -->
 <script setup lang="ts">
 import { computed, nextTick, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { safeGetString, safeSetString, STORAGE_KEYS } from '../lib/storage';
+import { safeGetString, safeSetString, STORAGE_KEYS } from '../../lib/storage';
 
 const { t } = useI18n();
 
diff --git a/apps/kimi-web/src/components/QuestionCard.vue b/apps/kimi-web/src/components/chat/QuestionCard.vue
similarity index 98%
rename from apps/kimi-web/src/components/QuestionCard.vue
rename to apps/kimi-web/src/components/chat/QuestionCard.vue
index d41badcb9..319488706 100644
--- a/apps/kimi-web/src/components/QuestionCard.vue
+++ b/apps/kimi-web/src/components/chat/QuestionCard.vue
@@ -1,9 +1,9 @@
-<!-- apps/kimi-web/src/components/QuestionCard.vue -->
+<!-- apps/kimi-web/src/components/chat/QuestionCard.vue -->
 <script setup lang="ts">
 import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
-import type { UIQuestion } from '../types';
-import type { QuestionAnswer, QuestionResponse } from '../api/types';
+import type { UIQuestion } from '../../types';
+import type { QuestionAnswer, QuestionResponse } from '../../api/types';
 import Markdown from './Markdown.vue';
 
 const props = defineProps<{ question: UIQuestion }>();
diff --git a/apps/kimi-web/src/components/QueuePane.vue b/apps/kimi-web/src/components/chat/QueuePane.vue
similarity index 97%
rename from apps/kimi-web/src/components/QueuePane.vue
rename to apps/kimi-web/src/components/chat/QueuePane.vue
index 9a2c82eb6..4adf1592e 100644
--- a/apps/kimi-web/src/components/QueuePane.vue
+++ b/apps/kimi-web/src/components/chat/QueuePane.vue
@@ -1,7 +1,7 @@
-<!-- apps/kimi-web/src/components/QueuePane.vue -->
+<!-- apps/kimi-web/src/components/chat/QueuePane.vue -->
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n';
-import type { QueuedPromptView } from '../types';
+import type { QueuedPromptView } from '../../types';
 
 const props = defineProps<{
   queued: QueuedPromptView[];
diff --git a/apps/kimi-web/src/components/SideChatPanel.vue b/apps/kimi-web/src/components/chat/SideChatPanel.vue
similarity index 97%
rename from apps/kimi-web/src/components/SideChatPanel.vue
rename to apps/kimi-web/src/components/chat/SideChatPanel.vue
index e0f7b6e11..4815b8223 100644
--- a/apps/kimi-web/src/components/SideChatPanel.vue
+++ b/apps/kimi-web/src/components/chat/SideChatPanel.vue
@@ -1,4 +1,4 @@
-<!-- apps/kimi-web/src/components/SideChatPanel.vue -->
+<!-- apps/kimi-web/src/components/chat/SideChatPanel.vue -->
 <!-- BTW "side chat": a side-channel agent rendered in the right-side panel.
      It keeps the parent's context without creating a sidebar session. Reuses
      ChatPane for the transcript; its panel-open emits are no-ops here. -->
@@ -6,8 +6,8 @@
 import { computed, nextTick, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import ChatPane from './ChatPane.vue';
-import MoonSpinner from './MoonSpinner.vue';
-import type { ChatTurn } from '../types';
+import MoonSpinner from '../MoonSpinner.vue';
+import type { ChatTurn } from '../../types';
 
 const props = defineProps<{
   turns: ChatTurn[];
diff --git a/apps/kimi-web/src/components/SlashMenu.vue b/apps/kimi-web/src/components/chat/SlashMenu.vue
similarity index 94%
rename from apps/kimi-web/src/components/SlashMenu.vue
rename to apps/kimi-web/src/components/chat/SlashMenu.vue
index 9925cff35..3b17eb27a 100644
--- a/apps/kimi-web/src/components/SlashMenu.vue
+++ b/apps/kimi-web/src/components/chat/SlashMenu.vue
@@ -1,9 +1,9 @@
-<!-- apps/kimi-web/src/components/SlashMenu.vue -->
+<!-- apps/kimi-web/src/components/chat/SlashMenu.vue -->
 <!-- Popup list of slash commands shown above the Composer textarea. -->
 <script setup lang="ts">
 import { ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
-import type { SlashCommand } from '../lib/slashCommands';
+import type { SlashCommand } from '../../lib/slashCommands';
 
 const { t } = useI18n();
 
diff --git a/apps/kimi-web/src/components/StatusPanel.vue b/apps/kimi-web/src/components/chat/StatusPanel.vue
similarity index 97%
rename from apps/kimi-web/src/components/StatusPanel.vue
rename to apps/kimi-web/src/components/chat/StatusPanel.vue
index e6072b5ff..a03edff38 100644
--- a/apps/kimi-web/src/components/StatusPanel.vue
+++ b/apps/kimi-web/src/components/chat/StatusPanel.vue
@@ -1,11 +1,11 @@
-<!-- apps/kimi-web/src/components/StatusPanel.vue -->
+<!-- apps/kimi-web/src/components/chat/StatusPanel.vue -->
 <!-- /status overlay — renders the CURRENT session status from existing client -->
 <!-- state (no daemon call). Light only, monospace, Kimi blue, no emoji. -->
 <script setup lang="ts">
 import { computed, onMounted, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-import type { ConversationStatus, PermissionMode } from '../types';
-import type { ThinkingLevel } from '../api/types';
+import type { ConversationStatus, PermissionMode } from '../../types';
+import type { ThinkingLevel } from '../../api/types';
 
 const { t } = useI18n();
 
diff --git a/apps/kimi-web/src/components/SwarmCard.vue b/apps/kimi-web/src/components/chat/SwarmCard.vue
similarity index 96%
rename from apps/kimi-web/src/components/SwarmCard.vue
rename to apps/kimi-web/src/components/chat/SwarmCard.vue
index 8245d459c..97afbfa85 100644
--- a/apps/kimi-web/src/components/SwarmCard.vue
+++ b/apps/kimi-web/src/components/chat/SwarmCard.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed } from 'vue';
-import type { AppSubagentPhase } from '../api/types';
-import type { SwarmGroup, SwarmMember } from '../composables/swarmGroups';
+import type { AppSubagentPhase } from '../../api/types';
+import type { SwarmGroup, SwarmMember } from '../../composables/swarmGroups';
 
 const props = defineProps<{ group: SwarmGroup }>();
 
diff --git a/apps/kimi-web/src/components/TasksPane.vue b/apps/kimi-web/src/components/chat/TasksPane.vue
similarity index 98%
rename from apps/kimi-web/src/components/TasksPane.vue
rename to apps/kimi-web/src/components/chat/TasksPane.vue
index d6792de0c..cec4883af 100644
--- a/apps/kimi-web/src/components/TasksPane.vue
+++ b/apps/kimi-web/src/components/chat/TasksPane.vue
@@ -1,10 +1,10 @@
-<!-- apps/kimi-web/src/components/TasksPane.vue -->
+<!-- apps/kimi-web/src/components/chat/TasksPane.vue -->
 <!-- TUI-inspired todo list: clean rows with status glyphs, strikethrough done,
      compact output, minimal chrome. Matches the terminal todo-panel style. -->
 <script setup lang="ts">
 import { reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
-import type { TaskItem } from '../types';
+import type { TaskItem } from '../../types';
 
 defineProps<{ tasks: TaskItem[] }>();
 
diff --git a/apps/kimi-web/src/components/ThinkingBlock.vue b/apps/kimi-web/src/components/chat/ThinkingBlock.vue
similarity index 98%
rename from apps/kimi-web/src/components/ThinkingBlock.vue
rename to apps/kimi-web/src/components/chat/ThinkingBlock.vue
index 5263db5aa..658f4abba 100644
--- a/apps/kimi-web/src/components/ThinkingBlock.vue
+++ b/apps/kimi-web/src/components/chat/ThinkingBlock.vue
@@ -1,4 +1,4 @@
-<!-- apps/kimi-web/src/components/ThinkingBlock.vue -->
+<!-- apps/kimi-web/src/components/chat/ThinkingBlock.vue -->
 <!-- 9e97773-style presentation: while this block is streaming it shows a live
      5-line scrolling window; when the stream moves past it the window folds
      into a one-paragraph teaser (the LAST paragraph of the thinking text).
diff --git a/apps/kimi-web/src/components/ThinkingPanel.vue b/apps/kimi-web/src/components/chat/ThinkingPanel.vue
similarity index 98%
rename from apps/kimi-web/src/components/ThinkingPanel.vue
rename to apps/kimi-web/src/components/chat/ThinkingPanel.vue
index 8aa13a1b7..4630dd93e 100644
--- a/apps/kimi-web/src/components/ThinkingPanel.vue
+++ b/apps/kimi-web/src/components/chat/ThinkingPanel.vue
@@ -1,4 +1,4 @@
-<!-- apps/kimi-web/src/components/ThinkingPanel.vue -->
+<!-- apps/kimi-web/src/components/chat/ThinkingPanel.vue -->
 <!-- Full thinking text in the right-side panel (App's shared preview slot —
      opening this replaces a file preview and vice versa). Content is reactive:
      while the block is still streaming the text keeps growing, and the body
diff --git a/apps/kimi-web/src/components/TodoCard.vue b/apps/kimi-web/src/components/chat/TodoCard.vue
similarity index 98%
rename from apps/kimi-web/src/components/TodoCard.vue
rename to apps/kimi-web/src/components/chat/TodoCard.vue
index 4c23db3d4..0ffbbd567 100644
--- a/apps/kimi-web/src/components/TodoCard.vue
+++ b/apps/kimi-web/src/components/chat/TodoCard.vue
@@ -1,4 +1,4 @@
-<!-- apps/kimi-web/src/components/TodoCard.vue -->
+<!-- apps/kimi-web/src/components/chat/TodoCard.vue -->
 <!-- Todo list driven by the model's TodoList tool (latest full-list write
      wins). Two render modes: a bordered card (used inside the wide-screen
      floating stack — the PARENT positions it) and `inline` for the ~/todo tab.
@@ -6,7 +6,7 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import type { TodoView } from '../types';
+import type { TodoView } from '../../types';
 
 const props = defineProps<{
   todos: TodoView[];
diff --git a/apps/kimi-web/src/components/ToolCall.vue b/apps/kimi-web/src/components/chat/ToolCall.vue
similarity index 98%
rename from apps/kimi-web/src/components/ToolCall.vue
rename to apps/kimi-web/src/components/chat/ToolCall.vue
index a2a579862..fa360659f 100644
--- a/apps/kimi-web/src/components/ToolCall.vue
+++ b/apps/kimi-web/src/components/chat/ToolCall.vue
@@ -1,8 +1,8 @@
-<!-- apps/kimi-web/src/components/ToolCall.vue -->
+<!-- apps/kimi-web/src/components/chat/ToolCall.vue -->
 <script setup lang="ts">
 import { computed, ref, watch } from 'vue';
-import type { ToolCall, ToolMedia } from '../types';
-import { toolLabel, toolGlyph, toolChip, toolSummary } from '../lib/toolMeta';
+import type { ToolCall, ToolMedia } from '../../types';
+import { toolLabel, toolGlyph, toolChip, toolSummary } from '../../lib/toolMeta';
 
 const props = withDefaults(
   defineProps<{
diff --git a/apps/kimi-web/src/components/AddWorkspaceDialog.vue b/apps/kimi-web/src/components/dialogs/AddWorkspaceDialog.vue
similarity index 99%
rename from apps/kimi-web/src/components/AddWorkspaceDialog.vue
rename to apps/kimi-web/src/components/dialogs/AddWorkspaceDialog.vue
index d3b792bc1..53291ddd1 100644
--- a/apps/kimi-web/src/components/AddWorkspaceDialog.vue
+++ b/apps/kimi-web/src/components/dialogs/AddWorkspaceDialog.vue
@@ -1,4 +1,4 @@
-<!-- apps/kimi-web/src/components/AddWorkspaceDialog.vue -->
+<!-- apps/kimi-web/src/components/dialogs/AddWorkspaceDialog.vue -->
 <!-- Daemon-driven folder browser for adding a workspace: starts at $HOME -->
 <!-- (fs:home), shows recent roots as quick-picks, a clickable breadcrumb, and -->
 <!-- the folder list (fs:browse). "Open this folder" adds the current path. -->
@@ -7,7 +7,7 @@
 <script setup lang="ts">
 import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
-import type { FsBrowseEntry, FsBrowseResult } from '../api/types';
+import type { FsBrowseEntry, FsBrowseResult } from '../../api/types';
 
 const { t } = useI18n();
 
diff --git a/apps/kimi-web/src/components/BottomSheet.vue b/apps/kimi-web/src/components/dialogs/BottomSheet.vue
similarity index 98%
rename from apps/kimi-web/src/components/BottomSheet.vue
rename to apps/kimi-web/src/components/dialogs/BottomSheet.vue
index d9a35ddbb..2234bbc48 100644
--- a/apps/kimi-web/src/components/BottomSheet.vue
+++ b/apps/kimi-web/src/components/dialogs/BottomSheet.vue
@@ -1,4 +1,4 @@
-<!-- apps/kimi-web/src/components/BottomSheet.vue -->
+<!-- apps/kimi-web/src/components/dialogs/BottomSheet.vue -->
 <!-- Reusable mobile bottom sheet: a fading scrim + a panel that slides up from -->
 <!-- the bottom (rounded top, grab handle). v-model controls open state; tapping -->
 <!-- the scrim or the grab handle closes it. Terminal Pro styling, no emoji. -->
diff --git a/apps/kimi-web/src/components/LoginDialog.vue b/apps/kimi-web/src/components/dialogs/LoginDialog.vue
similarity index 99%
rename from apps/kimi-web/src/components/LoginDialog.vue
rename to apps/kimi-web/src/components/dialogs/LoginDialog.vue
index 1a932c46b..581411f43 100644
--- a/apps/kimi-web/src/components/LoginDialog.vue
+++ b/apps/kimi-web/src/components/dialogs/LoginDialog.vue
@@ -1,10 +1,10 @@
-<!-- apps/kimi-web/src/components/LoginDialog.vue -->
+<!-- apps/kimi-web/src/components/dialogs/LoginDialog.vue -->
 <!-- Managed Kimi OAuth device-code login dialog. -->
 <!-- Light only, monospace-forward, Kimi blue #1565C0, no emoji. -->
 <script setup lang="ts">
 import { onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useDialogFocus } from '../composables/useDialogFocus';
+import { useDialogFocus } from '../../composables/useDialogFocus';
 
 const { t } = useI18n();
 
diff --git a/apps/kimi-web/src/components/NewSessionDialog.vue b/apps/kimi-web/src/components/dialogs/NewSessionDialog.vue
similarity index 99%
rename from apps/kimi-web/src/components/NewSessionDialog.vue
rename to apps/kimi-web/src/components/dialogs/NewSessionDialog.vue
index 3765899fd..59e1c6336 100644
--- a/apps/kimi-web/src/components/NewSessionDialog.vue
+++ b/apps/kimi-web/src/components/dialogs/NewSessionDialog.vue
@@ -1,4 +1,4 @@
-<!-- apps/kimi-web/src/components/NewSessionDialog.vue -->
+<!-- apps/kimi-web/src/components/dialogs/NewSessionDialog.vue -->
 <!-- Modal dialog for creating a new session with a required working directory. -->
 <!-- Light only, monospace-forward, Kimi blue #1565C0, no emoji. -->
 <script setup lang="ts">
diff --git a/apps/kimi-web/src/components/SessionsDialog.vue b/apps/kimi-web/src/components/dialogs/SessionsDialog.vue
similarity index 98%
rename from apps/kimi-web/src/components/SessionsDialog.vue
rename to apps/kimi-web/src/components/dialogs/SessionsDialog.vue
index 125bbed33..59e426473 100644
--- a/apps/kimi-web/src/components/SessionsDialog.vue
+++ b/apps/kimi-web/src/components/dialogs/SessionsDialog.vue
@@ -1,4 +1,4 @@
-<!-- apps/kimi-web/src/components/SessionsDialog.vue -->
+<!-- apps/kimi-web/src/components/dialogs/SessionsDialog.vue -->
 <!-- Session browser popup: lists ALL client-side sessions, searchable by title, -->
 <!-- click to switch. Reuses the composable's sessions / workspaceGroups / -->
 <!-- attentionBySession view data — no daemon call. -->
@@ -6,7 +6,7 @@
 <script setup lang="ts">
 import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
-import type { Session, WorkspaceGroup } from '../types';
+import type { Session, WorkspaceGroup } from '../../types';
 
 const { t } = useI18n();
 
diff --git a/apps/kimi-web/src/components/MobileSettingsSheet.vue b/apps/kimi-web/src/components/mobile/MobileSettingsSheet.vue
similarity index 97%
rename from apps/kimi-web/src/components/MobileSettingsSheet.vue
rename to apps/kimi-web/src/components/mobile/MobileSettingsSheet.vue
index 16f97eed4..7a0029b37 100644
--- a/apps/kimi-web/src/components/MobileSettingsSheet.vue
+++ b/apps/kimi-web/src/components/mobile/MobileSettingsSheet.vue
@@ -1,4 +1,4 @@
-<!-- apps/kimi-web/src/components/MobileSettingsSheet.vue -->
+<!-- apps/kimi-web/src/components/mobile/MobileSettingsSheet.vue -->
 <!-- Mobile settings: a bottom sheet that surfaces the desktop Composer-toolbar -->
 <!-- controls as big tappable rows — model (opens ModelPicker), thinking level -->
 <!-- (inline cycle picker), plan mode (toggle), permission (cycle), and a -->
@@ -8,11 +8,11 @@
 <script setup lang="ts">
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import type { ConversationStatus, PermissionMode } from '../types';
-import type { ThinkingLevel } from '../api/types';
-import type { ColorScheme, Theme } from '../composables/useKimiWebClient';
-import BottomSheet from './BottomSheet.vue';
-import LanguageSwitcher from './LanguageSwitcher.vue';
+import type { ConversationStatus, PermissionMode } from '../../types';
+import type { ThinkingLevel } from '../../api/types';
+import type { ColorScheme, Theme } from '../../composables/useKimiWebClient';
+import BottomSheet from '../dialogs/BottomSheet.vue';
+import LanguageSwitcher from '../settings/LanguageSwitcher.vue';
 
 const { t } = useI18n();
 
diff --git a/apps/kimi-web/src/components/MobileSwitcherSheet.vue b/apps/kimi-web/src/components/mobile/MobileSwitcherSheet.vue
similarity index 99%
rename from apps/kimi-web/src/components/MobileSwitcherSheet.vue
rename to apps/kimi-web/src/components/mobile/MobileSwitcherSheet.vue
index cbefaaeaa..cfa5dc2f6 100644
--- a/apps/kimi-web/src/components/MobileSwitcherSheet.vue
+++ b/apps/kimi-web/src/components/mobile/MobileSwitcherSheet.vue
@@ -1,4 +1,4 @@
-<!-- apps/kimi-web/src/components/MobileSwitcherSheet.vue -->
+<!-- apps/kimi-web/src/components/mobile/MobileSwitcherSheet.vue -->
 <!-- Mobile switcher bottom sheet, mirroring the desktop sidebar: a "+ New
      chat" row, then collapsible workspace groups (folder icon + name +
      branch/path sub-line + per-group "+") with their session rows beneath.
@@ -7,8 +7,8 @@
 <script setup lang="ts">
 import { onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import type { Session, WorkspaceGroup, WorkspaceView } from '../types';
-import BottomSheet from './BottomSheet.vue';
+import type { Session, WorkspaceGroup, WorkspaceView } from '../../types';
+import BottomSheet from '../dialogs/BottomSheet.vue';
 
 const { t } = useI18n();
 
diff --git a/apps/kimi-web/src/components/MobileTopBar.vue b/apps/kimi-web/src/components/mobile/MobileTopBar.vue
similarity index 97%
rename from apps/kimi-web/src/components/MobileTopBar.vue
rename to apps/kimi-web/src/components/mobile/MobileTopBar.vue
index 9f7b8b9b1..5e27456d3 100644
--- a/apps/kimi-web/src/components/MobileTopBar.vue
+++ b/apps/kimi-web/src/components/mobile/MobileTopBar.vue
@@ -1,4 +1,4 @@
-<!-- apps/kimi-web/src/components/MobileTopBar.vue -->
+<!-- apps/kimi-web/src/components/mobile/MobileTopBar.vue -->
 <!-- Mobile title bar (50px): a 28px dark workspace square, a tappable middle -->
 <!-- zone showing the mono `workspace / session ⌄` path with a status sub-line -->
 <!-- (● running · branch · N sessions), and a trailing sliders button. Tapping -->
@@ -7,7 +7,7 @@
 <script setup lang="ts">
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import type { WorkspaceView } from '../types';
+import type { WorkspaceView } from '../../types';
 
 const { t } = useI18n();
 
diff --git a/apps/kimi-web/src/components/LanguageSwitcher.vue b/apps/kimi-web/src/components/settings/LanguageSwitcher.vue
similarity index 93%
rename from apps/kimi-web/src/components/LanguageSwitcher.vue
rename to apps/kimi-web/src/components/settings/LanguageSwitcher.vue
index 51a643be8..e932a77f4 100644
--- a/apps/kimi-web/src/components/LanguageSwitcher.vue
+++ b/apps/kimi-web/src/components/settings/LanguageSwitcher.vue
@@ -1,7 +1,7 @@
-<!-- apps/kimi-web/src/components/LanguageSwitcher.vue -->
+<!-- apps/kimi-web/src/components/settings/LanguageSwitcher.vue -->
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n';
-import { availableLocales, setLocale, type LocaleCode } from '../i18n';
+import { availableLocales, setLocale, type LocaleCode } from '../../i18n';
 
 const { locale } = useI18n();
 
diff --git a/apps/kimi-web/src/components/ModelPicker.vue b/apps/kimi-web/src/components/settings/ModelPicker.vue
similarity index 98%
rename from apps/kimi-web/src/components/ModelPicker.vue
rename to apps/kimi-web/src/components/settings/ModelPicker.vue
index 8fbed8741..f81291f59 100644
--- a/apps/kimi-web/src/components/ModelPicker.vue
+++ b/apps/kimi-web/src/components/settings/ModelPicker.vue
@@ -1,11 +1,11 @@
-<!-- apps/kimi-web/src/components/ModelPicker.vue -->
+<!-- apps/kimi-web/src/components/settings/ModelPicker.vue -->
 <!-- Modal overlay for switching the active session's model. -->
 <!-- Light only, monospace-forward, Kimi blue #1565C0, no emoji. -->
 <script setup lang="ts">
 import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
-import type { AppModel } from '../api/types';
-import { useDialogFocus } from '../composables/useDialogFocus';
+import type { AppModel } from '../../api/types';
+import { useDialogFocus } from '../../composables/useDialogFocus';
 
 const { t } = useI18n();
 
diff --git a/apps/kimi-web/src/components/Onboarding.vue b/apps/kimi-web/src/components/settings/Onboarding.vue
similarity index 98%
rename from apps/kimi-web/src/components/Onboarding.vue
rename to apps/kimi-web/src/components/settings/Onboarding.vue
index ac000de7b..f130f5898 100644
--- a/apps/kimi-web/src/components/Onboarding.vue
+++ b/apps/kimi-web/src/components/settings/Onboarding.vue
@@ -1,12 +1,12 @@
-<!-- apps/kimi-web/src/components/Onboarding.vue -->
+<!-- apps/kimi-web/src/components/settings/Onboarding.vue -->
 <!-- First-run onboarding overlay: a short welcome + the two preferences
      (language, theme). Both apply live. Re-openable from the settings popover.
      Preferences can be changed any time later, so there's nothing to "lose". -->
 <script setup lang="ts">
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { availableLocales, setLocale, type LocaleCode } from '../i18n';
-import type { Theme } from '../composables/useKimiWebClient';
+import { availableLocales, setLocale, type LocaleCode } from '../../i18n';
+import type { Theme } from '../../composables/useKimiWebClient';
 
 const props = defineProps<{ theme: Theme }>();
 const emit = defineEmits<{ setTheme: [theme: Theme]; complete: []; skip: [] }>();
diff --git a/apps/kimi-web/src/components/ProviderManager.vue b/apps/kimi-web/src/components/settings/ProviderManager.vue
similarity index 98%
rename from apps/kimi-web/src/components/ProviderManager.vue
rename to apps/kimi-web/src/components/settings/ProviderManager.vue
index c7d7ef420..bfa880914 100644
--- a/apps/kimi-web/src/components/ProviderManager.vue
+++ b/apps/kimi-web/src/components/settings/ProviderManager.vue
@@ -1,11 +1,11 @@
-<!-- apps/kimi-web/src/components/ProviderManager.vue -->
+<!-- apps/kimi-web/src/components/settings/ProviderManager.vue -->
 <!-- Modal overlay for managing providers: list, add, refresh, delete. -->
 <!-- Light only, monospace-forward, Kimi blue #1565C0, no emoji. -->
 <script setup lang="ts">
 import { onMounted, onUnmounted, reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import type { AppProvider } from '../api/types';
-import { useDialogFocus } from '../composables/useDialogFocus';
+import type { AppProvider } from '../../api/types';
+import { useDialogFocus } from '../../composables/useDialogFocus';
 
 const { t } = useI18n();
 
diff --git a/apps/kimi-web/src/components/SettingsDialog.vue b/apps/kimi-web/src/components/settings/SettingsDialog.vue
similarity index 98%
rename from apps/kimi-web/src/components/SettingsDialog.vue
rename to apps/kimi-web/src/components/settings/SettingsDialog.vue
index 37ab6fdd4..c54207b85 100644
--- a/apps/kimi-web/src/components/SettingsDialog.vue
+++ b/apps/kimi-web/src/components/settings/SettingsDialog.vue
@@ -1,16 +1,16 @@
-<!-- apps/kimi-web/src/components/SettingsDialog.vue -->
+<!-- apps/kimi-web/src/components/settings/SettingsDialog.vue -->
 <!-- The app's dedicated Settings page (modal). Consolidates what used to be
      scattered in the sidebar account popover: appearance, language, account,
      connection, plus notifications and the troubleshooting-log export. -->
 <script setup lang="ts">
 import { computed, onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useDialogFocus } from '../composables/useDialogFocus';
+import { useDialogFocus } from '../../composables/useDialogFocus';
 import LanguageSwitcher from './LanguageSwitcher.vue';
-import { serverEndpointLabel } from '../api/config';
-import { downloadTraceLog, isTraceEnabled } from '../debug/trace';
-import type { ColorScheme, Theme } from '../composables/useKimiWebClient';
-import type { AppConfig, AppConfigProvider, AppModel } from '../api/types';
+import { serverEndpointLabel } from '../../api/config';
+import { downloadTraceLog, isTraceEnabled } from '../../debug/trace';
+import type { ColorScheme, Theme } from '../../composables/useKimiWebClient';
+import type { AppConfig, AppConfigProvider, AppModel } from '../../api/types';
 
 const { t } = useI18n();