diff --git a/apps/desktop/src/renderer/src/components/common/index.ts b/apps/desktop/src/renderer/src/components/common/index.ts
new file mode 100644
index 0000000..38bb6a4
--- /dev/null
+++ b/apps/desktop/src/renderer/src/components/common/index.ts
@@ -0,0 +1,16 @@
+// components/common 对外公共 API barrel：通用展示组件 + 图标 + markdown 渲染工具。
+// 跨域消费方（features/* · layout/* · App 等）经此 barrel 引入；common 内部模块相互引用
+// （markdownMermaid → MermaidDiagram、Modal → icons、ConfirmModal → Modal）走相对路径，
+// 不经此 barrel，避免循环依赖。
+export * from './Avatar';
+export * from './BitbucketImage';
+export * from './ConfirmModal';
+export * from './ErrorBoundary';
+export * from './LlmProviderIcon';
+export * from './Loading';
+export * from './MermaidDiagram';
+export * from './Modal';
+export * from './PlatformIcon';
+export * from './StatusChip';
+export * from './icons';
+export * from './markdownMermaid';
diff --git a/apps/desktop/src/renderer/src/components/features/chat/ChatPane.tsx b/apps/desktop/src/renderer/src/components/features/chat/ChatPane.tsx
index 8fc8c40..8b1bc89 100644
--- a/apps/desktop/src/renderer/src/components/features/chat/ChatPane.tsx
+++ b/apps/desktop/src/renderer/src/components/features/chat/ChatPane.tsx
@@ -1,9 +1,7 @@
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import type { LocalPrStatus, PrAgentStatus, StoredPullRequest } from '@meebox/shared';
-import { ChatIcon, TrashIcon } from '../../common/icons';
-import { ConfirmModal } from '../../common/ConfirmModal';
-import { PaneLoading } from '../../common/Loading';
+import { ChatIcon, TrashIcon, ConfirmModal, PaneLoading } from '../../common';
 import { useChatRunStore } from '../../../stores/chat-run-store';
 import { useDraftsForPr } from '../../../stores/drafts-store';
 import { CHAT_MAX_WIDTH, CHAT_MIN_WIDTH } from './constants';
diff --git a/apps/desktop/src/renderer/src/components/features/chat/components/AgentStep.tsx b/apps/desktop/src/renderer/src/components/features/chat/components/AgentStep.tsx
index 1c3c8d6..5c418de 100644
--- a/apps/desktop/src/renderer/src/components/features/chat/components/AgentStep.tsx
+++ b/apps/desktop/src/renderer/src/components/features/chat/components/AgentStep.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import type { AgentStep } from '@meebox/shared';
-import { RobotIcon } from '../../../common/icons';
+import { RobotIcon } from '../../../common';
 import { formatElapsed, formatTokens } from '../utils/format';
 import { Spinner } from './shared';
 
diff --git a/apps/desktop/src/renderer/src/components/features/chat/components/ChatEmpty.tsx b/apps/desktop/src/renderer/src/components/features/chat/components/ChatEmpty.tsx
index f3d351d..55d3f04 100644
--- a/apps/desktop/src/renderer/src/components/features/chat/components/ChatEmpty.tsx
+++ b/apps/desktop/src/renderer/src/components/features/chat/components/ChatEmpty.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from 'react-i18next';
 import type { PrAgentStatus, StoredPullRequest } from '@meebox/shared';
-import { ChatIcon } from '../../../common/icons';
+import { ChatIcon } from '../../../common';
 import { Bullet } from './shared';
 
 export function ChatEmpty({
diff --git a/apps/desktop/src/renderer/src/components/features/chat/components/ChatInputBar.tsx b/apps/desktop/src/renderer/src/components/features/chat/components/ChatInputBar.tsx
index 2616b37..820c16c 100644
--- a/apps/desktop/src/renderer/src/components/features/chat/components/ChatInputBar.tsx
+++ b/apps/desktop/src/renderer/src/components/features/chat/components/ChatInputBar.tsx
@@ -1,7 +1,12 @@
 import { useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import type { LocalPrStatus, PrAgentStatus, ReviewRunTool, StoredPullRequest } from '@meebox/shared';
-import { AutoReviewIcon, SendIcon, StopIcon } from '../../../common/icons';
+import type {
+  LocalPrStatus,
+  PrAgentStatus,
+  ReviewRunTool,
+  StoredPullRequest,
+} from '@meebox/shared';
+import { AutoReviewIcon, SendIcon, StopIcon } from '../../../common';
 import { COMMANDS, type CommandSpec } from '../commands';
 import { loadChatHistory, pushChatHistory } from '../utils/chat-history';
 
diff --git a/apps/desktop/src/renderer/src/components/features/chat/components/ConversationMessage.tsx b/apps/desktop/src/renderer/src/components/features/chat/components/ConversationMessage.tsx
index 54a06e6..d27bd01 100644
--- a/apps/desktop/src/renderer/src/components/features/chat/components/ConversationMessage.tsx
+++ b/apps/desktop/src/renderer/src/components/features/chat/components/ConversationMessage.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from 'react-i18next';
 import type { AgentMessage } from '@meebox/shared';
-import { ChatIcon } from '../../../common/icons';
+import { ChatIcon } from '../../../common';
 import { VERDICT_LABEL_KEY } from '../constants';
 import { Md } from './shared';
 
diff --git a/apps/desktop/src/renderer/src/components/features/chat/components/FindingCard.tsx b/apps/desktop/src/renderer/src/components/features/chat/components/FindingCard.tsx
index c3094cc..5ec260a 100644
--- a/apps/desktop/src/renderer/src/components/features/chat/components/FindingCard.tsx
+++ b/apps/desktop/src/renderer/src/components/features/chat/components/FindingCard.tsx
@@ -4,8 +4,7 @@ import ReactMarkdown from 'react-markdown';
 import remarkBreaks from 'remark-breaks';
 import remarkGfm from 'remark-gfm';
 import type { Finding, PrDocSectionKey, ReviewDraft } from '@meebox/shared';
-import { ChevronIcon } from '../../../common/icons';
-import { mermaidComponents, walkthroughMdComponents } from '../../../common/markdownMermaid';
+import { ChevronIcon, mermaidComponents, walkthroughMdComponents } from '../../../common';
 import { REMOTE_REHYPE_PLUGINS } from '../../../../lib/markdown';
 import { translatePrAgentLabels } from '../../../../utils/translate-pr-agent';
 import {
diff --git a/apps/desktop/src/renderer/src/components/features/chat/components/QueuedView.tsx b/apps/desktop/src/renderer/src/components/features/chat/components/QueuedView.tsx
index 2319e28..a6491b8 100644
--- a/apps/desktop/src/renderer/src/components/features/chat/components/QueuedView.tsx
+++ b/apps/desktop/src/renderer/src/components/features/chat/components/QueuedView.tsx
@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import type { ReviewRunTool } from '@meebox/shared';
-import { CloseIcon } from '../../../common/icons';
+import { CloseIcon } from '../../../common';
 import { AskQuestion } from './shared';
 
 /**
diff --git a/apps/desktop/src/renderer/src/components/features/chat/components/RulePreviewModal.tsx b/apps/desktop/src/renderer/src/components/features/chat/components/RulePreviewModal.tsx
index d9ba3a7..7c6a91a 100644
--- a/apps/desktop/src/renderer/src/components/features/chat/components/RulePreviewModal.tsx
+++ b/apps/desktop/src/renderer/src/components/features/chat/components/RulePreviewModal.tsx
@@ -2,8 +2,7 @@ import { useTranslation } from 'react-i18next';
 import ReactMarkdown from 'react-markdown';
 import remarkBreaks from 'remark-breaks';
 import remarkGfm from 'remark-gfm';
-import { Modal } from '../../../common/Modal';
-import { mermaidComponents } from '../../../common/markdownMermaid';
+import { Modal, mermaidComponents } from '../../../common';
 import { REMOTE_REHYPE_PLUGINS } from '../../../../lib/markdown';
 import type { MatchedRule } from '../types';
 
diff --git a/apps/desktop/src/renderer/src/components/features/chat/components/RunResultView.tsx b/apps/desktop/src/renderer/src/components/features/chat/components/RunResultView.tsx
index 83e7f25..847752d 100644
--- a/apps/desktop/src/renderer/src/components/features/chat/components/RunResultView.tsx
+++ b/apps/desktop/src/renderer/src/components/features/chat/components/RunResultView.tsx
@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import type { Finding, ReviewDraft, ReviewRun } from '@meebox/shared';
-import { RetryIcon } from '../../../common/icons';
+import { RetryIcon } from '../../../common';
 import { orderFindings } from '../utils/findings';
 import { formatStartTime, formatTokens, runStatusLabel } from '../utils/format';
 import { extractTokenUsage, type TokenUsage } from '../utils/tokens';
diff --git a/apps/desktop/src/renderer/src/components/features/chat/components/shared.tsx b/apps/desktop/src/renderer/src/components/features/chat/components/shared.tsx
index c29fb18..228898b 100644
--- a/apps/desktop/src/renderer/src/components/features/chat/components/shared.tsx
+++ b/apps/desktop/src/renderer/src/components/features/chat/components/shared.tsx
@@ -3,8 +3,7 @@ import { useTranslation } from 'react-i18next';
 import ReactMarkdown from 'react-markdown';
 import remarkBreaks from 'remark-breaks';
 import remarkGfm from 'remark-gfm';
-import { QuestionIcon } from '../../../common/icons';
-import { mermaidComponents } from '../../../common/markdownMermaid';
+import { QuestionIcon, mermaidComponents } from '../../../common';
 import { REMOTE_REHYPE_PLUGINS } from '../../../../lib/markdown';
 import { parseAnsi, segmentStyle } from '../../../../utils/ansi';
 
diff --git a/apps/desktop/src/renderer/src/components/features/chat/statusbar/AutopilotChip.tsx b/apps/desktop/src/renderer/src/components/features/chat/statusbar/AutopilotChip.tsx
index e8bebbf..6d56cc5 100644
--- a/apps/desktop/src/renderer/src/components/features/chat/statusbar/AutopilotChip.tsx
+++ b/apps/desktop/src/renderer/src/components/features/chat/statusbar/AutopilotChip.tsx
@@ -1,17 +1,10 @@
 import { useTranslation } from 'react-i18next';
-import { RobotIcon, RobotOffIcon } from '../../../common/icons';
-import { StatusChip } from '../../../common/StatusChip';
+import { RobotIcon, RobotOffIcon, StatusChip } from '../../../common';
 
 /**
  * AutoPilot 开关 chip：默认关，点击切换（持久化到 agent.autopilot.enabled，下次 poll 生效）。
  */
-export function AutopilotChip({
-  enabled,
-  onToggle,
-}: {
-  enabled: boolean;
-  onToggle: () => void;
-}) {
+export function AutopilotChip({ enabled, onToggle }: { enabled: boolean; onToggle: () => void }) {
   const { t } = useTranslation();
   return (
     <StatusChip
diff --git a/apps/desktop/src/renderer/src/components/features/chat/statusbar/PrAgentActiveChip.tsx b/apps/desktop/src/renderer/src/components/features/chat/statusbar/PrAgentActiveChip.tsx
index 8b430a9..3418c67 100644
--- a/apps/desktop/src/renderer/src/components/features/chat/statusbar/PrAgentActiveChip.tsx
+++ b/apps/desktop/src/renderer/src/components/features/chat/statusbar/PrAgentActiveChip.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import { invoke } from '../../../../api';
 import { useChatRunStore } from '../../../../stores/chat-run-store';
 import { formatElapsed } from '../../../../utils/time';
-import { StatusChip } from '../../../common/StatusChip';
+import { StatusChip } from '../../../common';
 
 /**
  * 队列弹出菜单：状态栏 chip 上方弹出。先列全部运行中（active）行，再列 waiting 行。
@@ -173,7 +173,9 @@ export function PrAgentActiveChip({ onJumpToPr }: { onJumpToPr?: (localId: strin
     <>
       <span className="statusbar-pragent-dot" aria-hidden="true" />
       <span>/{primary.tool}</span>
-      <span className="statusbar-pragent-elapsed">{formatElapsed(elapsedMs, { compact: true })}</span>
+      <span className="statusbar-pragent-elapsed">
+        {formatElapsed(elapsedMs, { compact: true })}
+      </span>
       {extraCount > 0 && (
         <span
           className="statusbar-pragent-queue-count"
diff --git a/apps/desktop/src/renderer/src/components/features/onboarding/steps/DoneStep.tsx b/apps/desktop/src/renderer/src/components/features/onboarding/steps/DoneStep.tsx
index 9d2033c..cc796db 100644
--- a/apps/desktop/src/renderer/src/components/features/onboarding/steps/DoneStep.tsx
+++ b/apps/desktop/src/renderer/src/components/features/onboarding/steps/DoneStep.tsx
@@ -1,5 +1,5 @@
 import { useTranslation } from 'react-i18next';
-import { SuccessBadgeIcon } from '../../../common/icons';
+import { SuccessBadgeIcon } from '../../../common';
 
 export function DoneStep({ submitting, error }: { submitting: boolean; error: string | null }) {
   const { t } = useTranslation();
diff --git a/apps/desktop/src/renderer/src/components/features/onboarding/steps/LlmStep.tsx b/apps/desktop/src/renderer/src/components/features/onboarding/steps/LlmStep.tsx
index 2498a77..e5a1f43 100644
--- a/apps/desktop/src/renderer/src/components/features/onboarding/steps/LlmStep.tsx
+++ b/apps/desktop/src/renderer/src/components/features/onboarding/steps/LlmStep.tsx
@@ -2,7 +2,7 @@ import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import type { LlmProfile } from '@meebox/shared';
 import { LLM_PROVIDERS, LlmProfileForm } from '../../settings';
-import { LlmProviderIcon } from '../../../common/LlmProviderIcon';
+import { LlmProviderIcon } from '../../../common';
 
 export function LlmStep({
   draft,
diff --git a/apps/desktop/src/renderer/src/components/features/onboarding/steps/PlatformStep.tsx b/apps/desktop/src/renderer/src/components/features/onboarding/steps/PlatformStep.tsx
index d1259bb..9cf7e80 100644
--- a/apps/desktop/src/renderer/src/components/features/onboarding/steps/PlatformStep.tsx
+++ b/apps/desktop/src/renderer/src/components/features/onboarding/steps/PlatformStep.tsx
@@ -1,8 +1,7 @@
 import { useTranslation } from 'react-i18next';
 import { invoke } from '../../../../api';
 import { ConnectionForm, type ConnDraft } from '../../settings';
-import { PLATFORM_META } from '../../../common/PlatformIcon';
-import { FolderIcon } from '../../../common/icons';
+import { PLATFORM_META, FolderIcon } from '../../../common';
 
 export function PlatformStep({
   connDraft,
diff --git a/apps/desktop/src/renderer/src/components/features/onboarding/steps/WelcomeStep.tsx b/apps/desktop/src/renderer/src/components/features/onboarding/steps/WelcomeStep.tsx
index eca3036..c9296c0 100644
--- a/apps/desktop/src/renderer/src/components/features/onboarding/steps/WelcomeStep.tsx
+++ b/apps/desktop/src/renderer/src/components/features/onboarding/steps/WelcomeStep.tsx
@@ -1,7 +1,7 @@
 import { useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { invoke } from '../../../../api';
-import { PullRequestIcon } from '../../../common/icons';
+import { PullRequestIcon } from '../../../common';
 
 export function WelcomeStep({ onStart }: { onStart: () => void }) {
   const { t } = useTranslation();
diff --git a/apps/desktop/src/renderer/src/components/features/pr/PrHeader.tsx b/apps/desktop/src/renderer/src/components/features/pr/PrHeader.tsx
index 2689eab..f564320 100644
--- a/apps/desktop/src/renderer/src/components/features/pr/PrHeader.tsx
+++ b/apps/desktop/src/renderer/src/components/features/pr/PrHeader.tsx
@@ -5,7 +5,7 @@ import type {
   ReviewerStatus,
   StoredPullRequest,
 } from '@meebox/shared';
-import { ApproveIcon, GlobeIcon, NeedsWorkIcon, PullRequestIcon } from '../../common/icons';
+import { ApproveIcon, GlobeIcon, NeedsWorkIcon, PullRequestIcon } from '../../common';
 
 /**
  * PR 详情头：标题 / 元信息 + 动作区（浏览器打开 · 提交评论 N · 合并 · 通过 / 需修改）。
@@ -123,7 +123,9 @@ export function PrHeader({
               className={`btn btn-sm review-action review-action-needs-work ${pr.localStatus === 'needs_work' ? 'active' : ''}`}
               type="button"
               disabled={isOwnPr}
-              onClick={() => onSetStatus(pr.localStatus === 'needs_work' ? 'pending' : 'needs_work')}
+              onClick={() =>
+                onSetStatus(pr.localStatus === 'needs_work' ? 'pending' : 'needs_work')
+              }
               title={
                 ownPrReason ??
                 (pr.localStatus === 'needs_work'
diff --git a/apps/desktop/src/renderer/src/components/features/pr/PrItem.tsx b/apps/desktop/src/renderer/src/components/features/pr/PrItem.tsx
index 104bc10..3be1afa 100644
--- a/apps/desktop/src/renderer/src/components/features/pr/PrItem.tsx
+++ b/apps/desktop/src/renderer/src/components/features/pr/PrItem.tsx
@@ -1,7 +1,6 @@
 import { useTranslation } from 'react-i18next';
 import type { AgentRecommendationVerdict, StoredPullRequest } from '@meebox/shared';
-import { Avatar } from '../../common/Avatar';
-import { PersonIcon, PullRequestIcon, StarIcon } from '../../common/icons';
+import { Avatar, PersonIcon, PullRequestIcon, StarIcon } from '../../common';
 
 /** 评审建议 verdict → 复用 chatPane.agent.* 文案（不另加 i18n）。 */
 const VERDICT_TITLE: Record<string, string> = {
@@ -62,7 +61,11 @@ export function PrItem({ pr, selected, onClick, reviewVerdict, executing }: PrIt
               <PersonIcon />
               {pr.author.displayName}
             </span>
-            {(approvedCount > 0 || needsWorkCount > 0 || canMerge || reviewVerdict || executing) && (
+            {(approvedCount > 0 ||
+              needsWorkCount > 0 ||
+              canMerge ||
+              reviewVerdict ||
+              executing) && (
               <span className="pr-item-review-chips">
                 {/* 执行中优先占位（同 ★ 位置）：复用运行卡片同款 .spinner（蓝色环旋转、中心对称），
                     裸图标无 chip 外框，表示该 PR 有在跑的 agent 任务。 */}
diff --git a/apps/desktop/src/renderer/src/components/features/pr/PrPanel.tsx b/apps/desktop/src/renderer/src/components/features/pr/PrPanel.tsx
index 0e2e53f..d963097 100644
--- a/apps/desktop/src/renderer/src/components/features/pr/PrPanel.tsx
+++ b/apps/desktop/src/renderer/src/components/features/pr/PrPanel.tsx
@@ -9,7 +9,7 @@ import type {
 } from '@meebox/shared';
 import { invoke } from '../../../api';
 import { useDraftsForPr } from '../../../stores/drafts-store';
-import { PaneLoading } from '../../common/Loading';
+import { PaneLoading } from '../../common';
 import { ActivityPanel } from './tabs/activity/ActivityPanel';
 import { CommitsPanel } from './tabs/CommitsPanel';
 // Monaco 编辑器（~10MB）懒加载：只有真正切到 Diff tab 才拉取 DiffView chunk，
diff --git a/apps/desktop/src/renderer/src/components/features/pr/statusbar/LastSyncChip.tsx b/apps/desktop/src/renderer/src/components/features/pr/statusbar/LastSyncChip.tsx
index 73a9ef0..77cbd41 100644
--- a/apps/desktop/src/renderer/src/components/features/pr/statusbar/LastSyncChip.tsx
+++ b/apps/desktop/src/renderer/src/components/features/pr/statusbar/LastSyncChip.tsx
@@ -1,7 +1,6 @@
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { SyncIcon } from '../../../common/icons';
-import { StatusChip } from '../../../common/StatusChip';
+import { SyncIcon, StatusChip } from '../../../common';
 import { formatRelative } from '../../../../utils/time';
 
 /**
diff --git a/apps/desktop/src/renderer/src/components/features/pr/statusbar/PrsCountChip.tsx b/apps/desktop/src/renderer/src/components/features/pr/statusbar/PrsCountChip.tsx
index 3258852..563d673 100644
--- a/apps/desktop/src/renderer/src/components/features/pr/statusbar/PrsCountChip.tsx
+++ b/apps/desktop/src/renderer/src/components/features/pr/statusbar/PrsCountChip.tsx
@@ -1,6 +1,5 @@
 import { useTranslation } from 'react-i18next';
-import { PullRequestIcon } from '../../../common/icons';
-import { StatusChip } from '../../../common/StatusChip';
+import { PullRequestIcon, StatusChip } from '../../../common';
 
 /** 待处理 PR 计数 chip。 */
 export function PrsCountChip({ count }: { count: number }) {
diff --git a/apps/desktop/src/renderer/src/components/features/pr/statusbar/RepoSyncChip.tsx b/apps/desktop/src/renderer/src/components/features/pr/statusbar/RepoSyncChip.tsx
index d0b65ef..cb83637 100644
--- a/apps/desktop/src/renderer/src/components/features/pr/statusbar/RepoSyncChip.tsx
+++ b/apps/desktop/src/renderer/src/components/features/pr/statusbar/RepoSyncChip.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from 'react-i18next';
 import { useRepoSyncStore } from '../../../../stores/repo-sync-store';
-import { StatusChip } from '../../../common/StatusChip';
+import { StatusChip } from '../../../common';
 
 /**
  * Repo sync 活动 chip：显示当前正在 clone/fetch 的 repo + 阶段 + 百分比。
diff --git a/apps/desktop/src/renderer/src/components/features/pr/tabs/CommitsPanel.tsx b/apps/desktop/src/renderer/src/components/features/pr/tabs/CommitsPanel.tsx
index eecbcf2..9f2b583 100644
--- a/apps/desktop/src/renderer/src/components/features/pr/tabs/CommitsPanel.tsx
+++ b/apps/desktop/src/renderer/src/components/features/pr/tabs/CommitsPanel.tsx
@@ -4,7 +4,7 @@ import type { TFunction } from 'i18next';
 import type { PrCommit, StoredPullRequest } from '@meebox/shared';
 import { invoke } from '../../../../api';
 import { formatBackendError, type FormattedError } from '../../../../errors';
-import { Avatar } from '../../../common/Avatar';
+import { Avatar } from '../../../common';
 import { formatExactTime } from './comments/CommentItem';
 
 interface CommitsPanelProps {
@@ -110,7 +110,10 @@ function CommitRow({
       <td className="pr-commits-col-sha">
         <code>{commit.abbreviatedSha}</code>
         {isMerge && (
-          <span className="pr-commits-merge-tag" title={`merge commit (${String(commit.parents.length)} parents)`}>
+          <span
+            className="pr-commits-merge-tag"
+            title={`merge commit (${String(commit.parents.length)} parents)`}
+          >
             merge
           </span>
         )}
diff --git a/apps/desktop/src/renderer/src/components/features/pr/tabs/PrInfoView.tsx b/apps/desktop/src/renderer/src/components/features/pr/tabs/PrInfoView.tsx
index 7285d97..e6864fc 100644
--- a/apps/desktop/src/renderer/src/components/features/pr/tabs/PrInfoView.tsx
+++ b/apps/desktop/src/renderer/src/components/features/pr/tabs/PrInfoView.tsx
@@ -4,10 +4,14 @@ import ReactMarkdown from 'react-markdown';
 import remarkGfm from 'remark-gfm';
 import type { ReviewerStatus, StoredPullRequest } from '@meebox/shared';
 import { REMOTE_REHYPE_PLUGINS } from '../../../../lib/markdown';
-import { Avatar } from '../../../common/Avatar';
-import { makeBitbucketImageFor, transformBitbucketUrl } from '../../../common/BitbucketImage';
-import { ApproveIcon, NeedsWorkIcon } from '../../../common/icons';
-import { mermaidComponents } from '../../../common/markdownMermaid';
+import {
+  Avatar,
+  makeBitbucketImageFor,
+  transformBitbucketUrl,
+  ApproveIcon,
+  NeedsWorkIcon,
+  mermaidComponents,
+} from '../../../common';
 
 interface PrInfoViewProps {
   pr: StoredPullRequest;
diff --git a/apps/desktop/src/renderer/src/components/features/pr/tabs/PrTabs.tsx b/apps/desktop/src/renderer/src/components/features/pr/tabs/PrTabs.tsx
index 63d31b9..df0685f 100644
--- a/apps/desktop/src/renderer/src/components/features/pr/tabs/PrTabs.tsx
+++ b/apps/desktop/src/renderer/src/components/features/pr/tabs/PrTabs.tsx
@@ -1,5 +1,5 @@
 import { useTranslation } from 'react-i18next';
-import { ChatIcon, PersonIcon, WhitespaceIcon } from '../../../common/icons';
+import { ChatIcon, PersonIcon, WhitespaceIcon } from '../../../common';
 
 export type PrTab = 'diff' | 'activity' | 'drafts' | 'commits' | 'info';
 
diff --git a/apps/desktop/src/renderer/src/components/features/pr/tabs/activity/ActivityPanel.tsx b/apps/desktop/src/renderer/src/components/features/pr/tabs/activity/ActivityPanel.tsx
index bcee0bd..4eff700 100644
--- a/apps/desktop/src/renderer/src/components/features/pr/tabs/activity/ActivityPanel.tsx
+++ b/apps/desktop/src/renderer/src/components/features/pr/tabs/activity/ActivityPanel.tsx
@@ -11,9 +11,15 @@ import type {
 } from '@meebox/shared';
 import { invoke, subscribe } from '../../../../../api';
 import { formatBackendError, type FormattedError } from '../../../../../errors';
-import { Avatar } from '../../../../common/Avatar';
-import { ApproveIcon, ChatIcon, CloseIcon, CommitIcon, NeedsWorkIcon } from '../../../../common/icons';
-import { PaneLoading } from '../../../../common/Loading';
+import {
+  Avatar,
+  ApproveIcon,
+  ChatIcon,
+  CloseIcon,
+  CommitIcon,
+  NeedsWorkIcon,
+  PaneLoading,
+} from '../../../../common';
 import { CommentComposer } from '../comments/CommentComposer';
 import {
   CommentItem,
diff --git a/apps/desktop/src/renderer/src/components/features/pr/tabs/comments/CommentItem.tsx b/apps/desktop/src/renderer/src/components/features/pr/tabs/comments/CommentItem.tsx
index 2fa0079..d07057e 100644
--- a/apps/desktop/src/renderer/src/components/features/pr/tabs/comments/CommentItem.tsx
+++ b/apps/desktop/src/renderer/src/components/features/pr/tabs/comments/CommentItem.tsx
@@ -2,13 +2,15 @@ import { lazy, Suspense, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import type { PrComment, PrCommentAnchor, StoredPullRequest } from '@meebox/shared';
 import i18n from '../../../../../i18n';
-import { Avatar } from '../../../../common/Avatar';
-import { makeBitbucketImageFor } from '../../../../common/BitbucketImage';
-import { ChatIcon } from '../../../../common/icons';
+import {
+  Avatar,
+  makeBitbucketImageFor,
+  ChatIcon,
+  ConfirmModal,
+  mermaidComponents,
+} from '../../../../common';
 import { CommentEditEditor } from './CommentEditEditor';
 import { CommentReplyEditor } from './CommentReplyEditor';
-import { ConfirmModal } from '../../../../common/ConfirmModal';
-import { mermaidComponents } from '../../../../common/markdownMermaid';
 import { CommentMarkdown } from '../shared/CommentMarkdown';
 import { useCommentThread } from '../shared/useCommentThread';
 // 行内代码上下文用 Monaco，懒加载随 DiffView 同一套 Monaco chunk 按需拉取，不进入口包。
diff --git a/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/DiffPane.tsx b/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/DiffPane.tsx
index a44eaa3..a1edea3 100644
--- a/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/DiffPane.tsx
+++ b/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/DiffPane.tsx
@@ -5,7 +5,7 @@ import { type editor as MonacoEditor } from 'monaco-editor';
 import type { DiffChangedFile } from '@meebox/ipc';
 import { editorFontSize } from '../../../../../lib/editor-font';
 import { languageFor } from '../../../../../utils/language';
-import { PaneLoading } from '../../../../common/Loading';
+import { PaneLoading } from '../../../../common';
 import { Spinner } from './DiffStatus';
 import type { LoadedContent } from './diff-types';
 
diff --git a/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/DiffScopeSelect.tsx b/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/DiffScopeSelect.tsx
index aed1160..4ad87b7 100644
--- a/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/DiffScopeSelect.tsx
+++ b/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/DiffScopeSelect.tsx
@@ -2,8 +2,7 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { createPortal } from 'react-dom';
 import type { PrCommit } from '@meebox/shared';
-import { Avatar } from '../../../../common/Avatar';
-import { ChevronIcon, CommitIcon, PullRequestIcon } from '../../../../common/icons';
+import { Avatar, ChevronIcon, CommitIcon, PullRequestIcon } from '../../../../common';
 import { formatRelativeTime } from '../comments/CommentItem';
 import type { DiffScope } from './diff-types';
 
diff --git a/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/DiffView.tsx b/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/DiffView.tsx
index fa99dab..36ed916 100644
--- a/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/DiffView.tsx
+++ b/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/DiffView.tsx
@@ -6,9 +6,7 @@ import { useTranslation } from 'react-i18next';
 import { type editor as MonacoEditor } from 'monaco-editor';
 import type { PlatformCapabilities, StoredPullRequest } from '@meebox/shared';
 import { useDraftsForPr } from '../../../../../stores/drafts-store';
-import { ErrorBoundary } from '../../../../common/ErrorBoundary';
-import { PaneLoading } from '../../../../common/Loading';
-import { FileTreeIcon, SearchIcon } from '../../../../common/icons';
+import { ErrorBoundary, PaneLoading, FileTreeIcon, SearchIcon } from '../../../../common';
 import { DiffSearchPanel } from './DiffSearchPanel';
 import { FileTree } from './FileTree';
 import { DiffScopeSelect } from './DiffScopeSelect';
diff --git a/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/FileTree.tsx b/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/FileTree.tsx
index caa300a..1a8f5aa 100644
--- a/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/FileTree.tsx
+++ b/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/FileTree.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import type { TFunction } from 'i18next';
 import { Icon } from '@iconify/react';
 import type { DiffChangedFile } from '@meebox/ipc';
-import { ChevronIcon } from '../../../../common/icons';
+import { ChevronIcon } from '../../../../common';
 
 interface FileTreeProps {
   files: DiffChangedFile[];
diff --git a/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/blame/BlameColumn.tsx b/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/blame/BlameColumn.tsx
index 3afc43b..ff14ee2 100644
--- a/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/blame/BlameColumn.tsx
+++ b/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/blame/BlameColumn.tsx
@@ -2,7 +2,7 @@ import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { type editor as MonacoEditor } from 'monaco-editor';
 import type { DiffBlameLine } from '@meebox/ipc';
-import { Avatar } from '../../../../../common/Avatar';
+import { Avatar } from '../../../../../common';
 import {
   BLAME_COLUMN_WIDTH,
   formatIsoDate,
diff --git a/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/inline-comments/InlineCommentZone.tsx b/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/inline-comments/InlineCommentZone.tsx
index 4f3e797..3658b1e 100644
--- a/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/inline-comments/InlineCommentZone.tsx
+++ b/apps/desktop/src/renderer/src/components/features/pr/tabs/diff/inline-comments/InlineCommentZone.tsx
@@ -2,9 +2,7 @@ import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import type ReactMarkdown from 'react-markdown';
 import type { PrComment } from '@meebox/shared';
-import { Avatar } from '../../../../../common/Avatar';
-import { makeBitbucketImageFor } from '../../../../../common/BitbucketImage';
-import { ConfirmModal } from '../../../../../common/ConfirmModal';
+import { Avatar, makeBitbucketImageFor, ConfirmModal } from '../../../../../common';
 import { CommentEditEditor } from '../../comments/CommentEditEditor';
 import { CommentReplyEditor } from '../../comments/CommentReplyEditor';
 import { CommentMarkdown } from '../../shared/CommentMarkdown';
diff --git a/apps/desktop/src/renderer/src/components/features/pr/tabs/drafts/DraftZone.tsx b/apps/desktop/src/renderer/src/components/features/pr/tabs/drafts/DraftZone.tsx
index ff41c8f..1172f2d 100644
--- a/apps/desktop/src/renderer/src/components/features/pr/tabs/drafts/DraftZone.tsx
+++ b/apps/desktop/src/renderer/src/components/features/pr/tabs/drafts/DraftZone.tsx
@@ -4,8 +4,7 @@ import ReactMarkdown from 'react-markdown';
 import remarkBreaks from 'remark-breaks';
 import remarkGfm from 'remark-gfm';
 import type { ReviewDraft } from '@meebox/shared';
-import { ConfirmModal } from '../../../../common/ConfirmModal';
-import { TrashIcon } from '../../../../common/icons';
+import { ConfirmModal, TrashIcon } from '../../../../common';
 
 interface DraftZoneProps {
   draft: ReviewDraft;
@@ -443,9 +442,7 @@ export function DraftZone({
                 onClick={() => void handlePublishFromEdit()}
                 disabled={saving || publishing || !canSave}
                 title={
-                  !canSave
-                    ? t('draftZone.emptyCommentTitle')
-                    : t('draftZone.publishFromEditTitle')
+                  !canSave ? t('draftZone.emptyCommentTitle') : t('draftZone.publishFromEditTitle')
                 }
               >
                 {publishing
@@ -532,4 +529,3 @@ export function DraftZone({
     </div>
   );
 }
-
diff --git a/apps/desktop/src/renderer/src/components/features/pr/tabs/drafts/DraftsPanel.tsx b/apps/desktop/src/renderer/src/components/features/pr/tabs/drafts/DraftsPanel.tsx
index 8a15424..9b62062 100644
--- a/apps/desktop/src/renderer/src/components/features/pr/tabs/drafts/DraftsPanel.tsx
+++ b/apps/desktop/src/renderer/src/components/features/pr/tabs/drafts/DraftsPanel.tsx
@@ -6,7 +6,7 @@ import remarkGfm from 'remark-gfm';
 import type { PlatformCapabilities, ReviewDraft, StoredPullRequest } from '@meebox/shared';
 import { invoke } from '../../../../../api';
 import { useDraftsForPr } from '../../../../../stores/drafts-store';
-import { ConfirmModal } from '../../../../common/ConfirmModal';
+import { ConfirmModal } from '../../../../common';
 
 // posted 已不存在 (发布成功即删本地)，筛选项只保留 publishable / all / rejected
 type Filter = 'all' | 'publishable' | 'rejected';
@@ -56,11 +56,13 @@ export function DraftsPanel({ pr, onJumpToAnchor, capabilities }: DraftsPanelPro
     const list = drafts ?? [];
     // 排序：同文件按 startLine 升序 (跟代码自上而下阅读顺序一致)；不同文件按
     // path 字典序 (跟文件树顺序对齐，扫起来不跳跃)
-    const sorted = list.slice().sort((a, b) =>
-      a.anchor.path === b.anchor.path
-        ? a.anchor.startLine - b.anchor.startLine
-        : a.anchor.path.localeCompare(b.anchor.path),
-    );
+    const sorted = list
+      .slice()
+      .sort((a, b) =>
+        a.anchor.path === b.anchor.path
+          ? a.anchor.startLine - b.anchor.startLine
+          : a.anchor.path.localeCompare(b.anchor.path),
+      );
     if (filter === 'all') return sorted;
     if (filter === 'publishable')
       return sorted.filter((d) => d.status === 'pending' || d.status === 'edited');
@@ -142,9 +144,7 @@ export function DraftsPanel({ pr, onJumpToAnchor, capabilities }: DraftsPanelPro
             aria-selected={filter === f}
           >
             {t(FILTER_LABEL_KEY[f])}
-            {counts[f] > 0 && (
-              <span className="drafts-panel-filter-badge">{counts[f]}</span>
-            )}
+            {counts[f] > 0 && <span className="drafts-panel-filter-badge">{counts[f]}</span>}
           </button>
         ))}
       </nav>
@@ -157,15 +157,13 @@ export function DraftsPanel({ pr, onJumpToAnchor, capabilities }: DraftsPanelPro
               d.anchor.endLine !== d.anchor.startLine
                 ? `${String(d.anchor.startLine)}-${String(d.anchor.endLine)}`
                 : String(d.anchor.startLine);
-            const sideLabel = d.anchor.side === 'old' ? t('draftsPanel.sideOld') : t('draftsPanel.sideNew');
+            const sideLabel =
+              d.anchor.side === 'old' ? t('draftsPanel.sideOld') : t('draftsPanel.sideNew');
             const publishable = d.status === 'pending' || d.status === 'edited';
             const pubErr = errors.get(d.id);
             const isPublishing = publishingIds.has(d.id);
             return (
-              <li
-                key={d.id}
-                className={`drafts-panel-item drafts-panel-item-${d.status}`}
-              >
+              <li key={d.id} className={`drafts-panel-item drafts-panel-item-${d.status}`}>
                 <div className="drafts-panel-item-head">
                   {onJumpToAnchor ? (
                     <button
@@ -227,7 +225,9 @@ export function DraftsPanel({ pr, onJumpToAnchor, capabilities }: DraftsPanelPro
                 </div>
                 <div className="drafts-panel-item-body markdown">
                   {d.body.trim() ? (
-                    <ReactMarkdown remarkPlugins={hardBreaks ? [remarkGfm, remarkBreaks] : [remarkGfm]}>
+                    <ReactMarkdown
+                      remarkPlugins={hardBreaks ? [remarkGfm, remarkBreaks] : [remarkGfm]}
+                    >
                       {d.body}
                     </ReactMarkdown>
                   ) : (
diff --git a/apps/desktop/src/renderer/src/components/features/pr/tabs/shared/CommentMarkdown.tsx b/apps/desktop/src/renderer/src/components/features/pr/tabs/shared/CommentMarkdown.tsx
index b89fb78..fe66e68 100644
--- a/apps/desktop/src/renderer/src/components/features/pr/tabs/shared/CommentMarkdown.tsx
+++ b/apps/desktop/src/renderer/src/components/features/pr/tabs/shared/CommentMarkdown.tsx
@@ -2,7 +2,7 @@ import ReactMarkdown from 'react-markdown';
 import remarkBreaks from 'remark-breaks';
 import remarkGfm from 'remark-gfm';
 import { REMOTE_REHYPE_PLUGINS } from '../../../../../lib/markdown';
-import { transformBitbucketUrl } from '../../../../common/BitbucketImage';
+import { transformBitbucketUrl } from '../../../../common';
 
 /**
  * 评论正文 markdown 渲染样板：评论/活动 tab 与 diff 行内评论 zone 共用同一套
diff --git a/apps/desktop/src/renderer/src/components/features/settings/ConnectionForm.tsx b/apps/desktop/src/renderer/src/components/features/settings/ConnectionForm.tsx
index 5f601b2..c1a4d50 100644
--- a/apps/desktop/src/renderer/src/components/features/settings/ConnectionForm.tsx
+++ b/apps/desktop/src/renderer/src/components/features/settings/ConnectionForm.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import type { TFunction } from 'i18next';
 import { GITHUB_DOTCOM_API_BASE, GITLAB_DOTCOM_API_BASE, type Config } from '@meebox/shared';
 import { invoke } from '../../../api';
-import { EyeIcon, EyeOffIcon } from '../../common/icons';
+import { EyeIcon, EyeOffIcon } from '../../common';
 
 // 连接编辑用的扁平草稿（Connection 是嵌套的 auth/clone，拍平后表单好写），存盘前还原。
 // 设置页 ConnectionEditorModal 与首启向导 PlatformStep 共用同一份草稿形状 + 表单。
@@ -54,7 +54,9 @@ export function fromConnDraft(d: ConnDraft): ConnEntry {
 }
 
 /** 各平台的字段文案（名称 / Base URL / 令牌 占位） */
-function kindHints(t: TFunction): Record<ConnKind, { name: string; baseUrl: string; token: string }> {
+function kindHints(
+  t: TFunction,
+): Record<ConnKind, { name: string; baseUrl: string; token: string }> {
   return {
     github: {
       name: t('connectionForm.githubNamePlaceholder'),
@@ -212,7 +214,12 @@ export function ConnectionForm({
       </div>
       {/* 测试连接：独立一行，左按钮右结果。保存 / 取消 由外层决定布局 */}
       <div className="settings-actions" style={{ marginTop: 12, alignItems: 'center' }}>
-        <button type="button" className="btn" onClick={() => void runTest()} disabled={!canTest || testing}>
+        <button
+          type="button"
+          className="btn"
+          onClick={() => void runTest()}
+          disabled={!canTest || testing}
+        >
           {testing ? t('connectionForm.testing') : t('connectionForm.testConnection')}
         </button>
         {testResult && (
diff --git a/apps/desktop/src/renderer/src/components/features/settings/LlmProfileForm.tsx b/apps/desktop/src/renderer/src/components/features/settings/LlmProfileForm.tsx
index f4f52b2..5156fdd 100644
--- a/apps/desktop/src/renderer/src/components/features/settings/LlmProfileForm.tsx
+++ b/apps/desktop/src/renderer/src/components/features/settings/LlmProfileForm.tsx
@@ -2,7 +2,7 @@ import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import type { LlmProfile, LlmProvider } from '@meebox/shared';
 import i18n from '../../../i18n';
-import { EyeIcon, EyeOffIcon } from '../../common/icons';
+import { EyeIcon, EyeOffIcon } from '../../common';
 
 export interface ProviderMeta {
   value: LlmProvider;
@@ -201,7 +201,8 @@ export function LlmProfileForm({
   const providerMeta = getProviderMeta(draft.provider);
   const isCli = draft.provider === 'cli';
   const errors = validateProfile(draft, existing);
-  const showError = (k: keyof ProfileErrors): boolean => (forceShowErrors || touched[k]) && !!errors[k];
+  const showError = (k: keyof ProfileErrors): boolean =>
+    (forceShowErrors || touched[k]) && !!errors[k];
   const update = <K extends keyof LlmProfile>(field: K, value: LlmProfile[K]): void => {
     const next = { ...draft, [field]: value };
     onChange(next);
@@ -258,7 +259,9 @@ export function LlmProfileForm({
             value={draft.model}
             onChange={(e) => update('model', e.target.value)}
             onBlur={() => markTouched('model')}
-            placeholder={isCli ? t('llmProfileForm.cliCommandPlaceholder') : providerMeta.modelExample}
+            placeholder={
+              isCli ? t('llmProfileForm.cliCommandPlaceholder') : providerMeta.modelExample
+            }
           />
           {showError('model') && <p className="settings-field-error">{errors.model}</p>}
         </div>
@@ -266,7 +269,8 @@ export function LlmProfileForm({
         {!isCli && (
           <>
             <div className="modal-kv-key">
-              Base URL{!providerMeta.defaultBaseUrl && <span className="settings-required"> *</span>}
+              Base URL
+              {!providerMeta.defaultBaseUrl && <span className="settings-required"> *</span>}
             </div>
             <div className="modal-kv-val">
               <input
@@ -290,7 +294,9 @@ export function LlmProfileForm({
                   value={draft.api_key}
                   onChange={(e) => update('api_key', e.target.value)}
                   onBlur={() => markTouched('api_key')}
-                  placeholder={providerMeta.needsKey ? 'sk-...' : t('llmProfileForm.apiKeyOptionalPlaceholder')}
+                  placeholder={
+                    providerMeta.needsKey ? 'sk-...' : t('llmProfileForm.apiKeyOptionalPlaceholder')
+                  }
                   autoComplete="off"
                 />
                 <button
diff --git a/apps/desktop/src/renderer/src/components/features/settings/SettingsModal.tsx b/apps/desktop/src/renderer/src/components/features/settings/SettingsModal.tsx
index a7521f8..b0cc2d4 100644
--- a/apps/desktop/src/renderer/src/components/features/settings/SettingsModal.tsx
+++ b/apps/desktop/src/renderer/src/components/features/settings/SettingsModal.tsx
@@ -1,7 +1,6 @@
 import { useTranslation } from 'react-i18next';
 import type { AppInfo, AppPaths, Config, SupportedLanguage } from '@meebox/shared';
-import { ConfirmModal } from '../../common/ConfirmModal';
-import { Modal } from '../../common/Modal';
+import { ConfirmModal, Modal } from '../../common';
 import { useSettingsDraft } from './hooks/useSettingsDraft';
 import { ConnectionEditorModal } from './editors/ConnectionEditorModal';
 import { LlmEditorModal } from './editors/LlmEditorModal';
diff --git a/apps/desktop/src/renderer/src/components/features/settings/editors/ConnectionEditorModal.tsx b/apps/desktop/src/renderer/src/components/features/settings/editors/ConnectionEditorModal.tsx
index e75adff..fffacc3 100644
--- a/apps/desktop/src/renderer/src/components/features/settings/editors/ConnectionEditorModal.tsx
+++ b/apps/desktop/src/renderer/src/components/features/settings/editors/ConnectionEditorModal.tsx
@@ -1,5 +1,5 @@
 import { useTranslation } from 'react-i18next';
-import { Modal } from '../../../common/Modal';
+import { Modal } from '../../../common';
 import { ConnectionForm, connDraftCanSave, type ConnDraft } from '../ConnectionForm';
 
 export function ConnectionEditorModal({
diff --git a/apps/desktop/src/renderer/src/components/features/settings/editors/LlmEditorModal.tsx b/apps/desktop/src/renderer/src/components/features/settings/editors/LlmEditorModal.tsx
index 925056a..8e27181 100644
--- a/apps/desktop/src/renderer/src/components/features/settings/editors/LlmEditorModal.tsx
+++ b/apps/desktop/src/renderer/src/components/features/settings/editors/LlmEditorModal.tsx
@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import type { LlmProfile } from '@meebox/shared';
-import { Modal } from '../../../common/Modal';
+import { Modal } from '../../../common';
 import { LlmProfileForm, validateProfile } from '../LlmProfileForm';
 
 export function LlmEditorModal({
diff --git a/apps/desktop/src/renderer/src/components/features/settings/editors/ProxyEditorModal.tsx b/apps/desktop/src/renderer/src/components/features/settings/editors/ProxyEditorModal.tsx
index 982c919..7cf4c2b 100644
--- a/apps/desktop/src/renderer/src/components/features/settings/editors/ProxyEditorModal.tsx
+++ b/apps/desktop/src/renderer/src/components/features/settings/editors/ProxyEditorModal.tsx
@@ -1,8 +1,7 @@
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import type { Config } from '@meebox/shared';
-import { Modal } from '../../../common/Modal';
-import { EyeIcon, EyeOffIcon } from '../../../common/icons';
+import { Modal, EyeIcon, EyeOffIcon } from '../../../common';
 import { invoke } from '../../../../api';
 
 export function ProxyEditorModal({
@@ -110,7 +109,10 @@ export function ProxyEditorModal({
               </div>
             </div>
           </div>
-          <div className="settings-edit-row" style={{ marginTop: 10, alignItems: 'center', gap: 10 }}>
+          <div
+            className="settings-edit-row"
+            style={{ marginTop: 10, alignItems: 'center', gap: 10 }}
+          >
             <button
               type="button"
               className="btn"
@@ -138,7 +140,9 @@ export function ProxyEditorModal({
                   {t('settings.proxyOk')}
                 </span>
               ) : (
-                <span className="error-text">✗ {test.result.reason ?? t('settings.testFailed')}</span>
+                <span className="error-text">
+                  ✗ {test.result.reason ?? t('settings.testFailed')}
+                </span>
               ))}
           </div>
         </>
diff --git a/apps/desktop/src/renderer/src/components/features/settings/sections/AgentDirSection.tsx b/apps/desktop/src/renderer/src/components/features/settings/sections/AgentDirSection.tsx
index 13c10c9..982c13e 100644
--- a/apps/desktop/src/renderer/src/components/features/settings/sections/AgentDirSection.tsx
+++ b/apps/desktop/src/renderer/src/components/features/settings/sections/AgentDirSection.tsx
@@ -1,5 +1,5 @@
 import { useTranslation } from 'react-i18next';
-import { FolderIcon } from '../../../common/icons';
+import { FolderIcon } from '../../../common';
 import { invoke } from '../../../../api';
 
 export function AgentDirSection({
diff --git a/apps/desktop/src/renderer/src/components/features/settings/sections/CacheDirSection.tsx b/apps/desktop/src/renderer/src/components/features/settings/sections/CacheDirSection.tsx
index 7980d52..0e4eff4 100644
--- a/apps/desktop/src/renderer/src/components/features/settings/sections/CacheDirSection.tsx
+++ b/apps/desktop/src/renderer/src/components/features/settings/sections/CacheDirSection.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from 'react-i18next';
 import type { AppPaths } from '@meebox/shared';
-import { FolderIcon } from '../../../common/icons';
+import { FolderIcon } from '../../../common';
 import { formatBytes } from '../utils';
 
 export function CacheDirSection({
diff --git a/apps/desktop/src/renderer/src/components/features/settings/sections/ConnectionsSection.tsx b/apps/desktop/src/renderer/src/components/features/settings/sections/ConnectionsSection.tsx
index 374a640..43da312 100644
--- a/apps/desktop/src/renderer/src/components/features/settings/sections/ConnectionsSection.tsx
+++ b/apps/desktop/src/renderer/src/components/features/settings/sections/ConnectionsSection.tsx
@@ -1,7 +1,6 @@
 import { useTranslation } from 'react-i18next';
 import type { Config } from '@meebox/shared';
-import { PencilIcon, TrashIcon } from '../../../common/icons';
-import { PLATFORM_META } from '../../../common/PlatformIcon';
+import { PencilIcon, TrashIcon, PLATFORM_META } from '../../../common';
 
 export function ConnectionsSection({
   connections,
diff --git a/apps/desktop/src/renderer/src/components/features/settings/sections/LlmSection.tsx b/apps/desktop/src/renderer/src/components/features/settings/sections/LlmSection.tsx
index 557dc07..be90514 100644
--- a/apps/desktop/src/renderer/src/components/features/settings/sections/LlmSection.tsx
+++ b/apps/desktop/src/renderer/src/components/features/settings/sections/LlmSection.tsx
@@ -1,7 +1,6 @@
 import { useTranslation } from 'react-i18next';
 import type { Config } from '@meebox/shared';
-import { PencilIcon, TrashIcon } from '../../../common/icons';
-import { LlmProviderIcon } from '../../../common/LlmProviderIcon';
+import { PencilIcon, TrashIcon, LlmProviderIcon } from '../../../common';
 import { providerLabel } from '../LlmProfileForm';
 
 export function LlmSection({
@@ -55,7 +54,10 @@ export function LlmSection({
                   <div className="llm-profile-title">
                     <span className="llm-profile-title-text">{titleText}</span>
                     {isCli && (
-                      <span className="badge-experimental" title={t('settings.cliExperimentalHint')}>
+                      <span
+                        className="badge-experimental"
+                        title={t('settings.cliExperimentalHint')}
+                      >
                         {t('settings.experimental')}
                       </span>
                     )}
diff --git a/apps/desktop/src/renderer/src/components/features/settings/sections/RuntimeSection.tsx b/apps/desktop/src/renderer/src/components/features/settings/sections/RuntimeSection.tsx
index 493e35b..eb1fc5d 100644
--- a/apps/desktop/src/renderer/src/components/features/settings/sections/RuntimeSection.tsx
+++ b/apps/desktop/src/renderer/src/components/features/settings/sections/RuntimeSection.tsx
@@ -1,16 +1,10 @@
 import { useTranslation } from 'react-i18next';
 import type { AppInfo } from '@meebox/shared';
-import { GitHubMarkIcon, IssueIcon, TagIcon } from '../../../common/icons';
+import { GitHubMarkIcon, IssueIcon, TagIcon } from '../../../common';
 import { invoke } from '../../../../api';
 import { UpdateCheckButton } from '../elements/UpdateCheckButton';
 
-export function RuntimeSection({
-  info,
-  updateEnabled,
-}: {
-  info: AppInfo;
-  updateEnabled: boolean;
-}) {
+export function RuntimeSection({ info, updateEnabled }: { info: AppInfo; updateEnabled: boolean }) {
   const { t } = useTranslation();
   return (
     <section className="modal-section">
diff --git a/apps/desktop/src/renderer/src/components/features/settings/statusbar/LlmChip.tsx b/apps/desktop/src/renderer/src/components/features/settings/statusbar/LlmChip.tsx
index eea4fc7..ad3e09b 100644
--- a/apps/desktop/src/renderer/src/components/features/settings/statusbar/LlmChip.tsx
+++ b/apps/desktop/src/renderer/src/components/features/settings/statusbar/LlmChip.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import type { Config } from '@meebox/shared';
-import { StatusChip } from '../../../common/StatusChip';
+import { StatusChip } from '../../../common';
 
 /**
  * 当前 active LLM profile 概要。点击展开下拉，列出所有 profile 直接切换。
diff --git a/apps/desktop/src/renderer/src/components/features/settings/statusbar/UserChip.tsx b/apps/desktop/src/renderer/src/components/features/settings/statusbar/UserChip.tsx
index 6674a6f..5fb3a6a 100644
--- a/apps/desktop/src/renderer/src/components/features/settings/statusbar/UserChip.tsx
+++ b/apps/desktop/src/renderer/src/components/features/settings/statusbar/UserChip.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from 'react-i18next';
 import type { ConnectionSummary } from '@meebox/ipc';
-import { PersonIcon } from '../../../common/icons';
+import { PersonIcon } from '../../../common';
 
 /** 当前连接的登录用户概要（多连接时带连接名前缀）。无可识别用户时不渲染。 */
 export function UserChip({ connections }: { connections: ConnectionSummary[] }) {
diff --git a/apps/desktop/src/renderer/src/components/layout/StatusBar.tsx b/apps/desktop/src/renderer/src/components/layout/StatusBar.tsx
index 912a657..84626c2 100644
--- a/apps/desktop/src/renderer/src/components/layout/StatusBar.tsx
+++ b/apps/desktop/src/renderer/src/components/layout/StatusBar.tsx
@@ -2,8 +2,7 @@ import { useTranslation } from 'react-i18next';
 import type { ConnectionSummary } from '@meebox/ipc';
 import type { Config, PrAgentStatus, UpdateCheckResult } from '@meebox/shared';
 import { invoke } from '../../api';
-import { PanelToggleIcon, SettingsIcon } from '../common/icons';
-import { StatusChip } from '../common/StatusChip';
+import { PanelToggleIcon, SettingsIcon, StatusChip } from '../common';
 import { PrAgentActiveChip } from '../features/chat/statusbar/PrAgentActiveChip';
 import { AutopilotChip } from '../features/chat/statusbar/AutopilotChip';
 import { LlmChip } from '../features/settings/statusbar/LlmChip';
@@ -95,7 +94,9 @@ export function StatusBar({
         className="icon-btn"
         onClick={onToggleSidebar}
         title={sidebarCollapsed ? t('statusBar.expandSidebar') : t('statusBar.collapseSidebar')}
-        aria-label={sidebarCollapsed ? t('statusBar.expandSidebar') : t('statusBar.collapseSidebar')}
+        aria-label={
+          sidebarCollapsed ? t('statusBar.expandSidebar') : t('statusBar.collapseSidebar')
+        }
         aria-pressed={!sidebarCollapsed}
       >
         <PanelToggleIcon side="left" collapsed={sidebarCollapsed} />